Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1efb63a authored by Yuanfang Zhang's avatar Yuanfang Zhang
Browse files

coresight-tmc-etr: fix memory leak 



When a new sys_buf needs to be allocated, the previously sys_buf
will not be freed. this will cause a memory leak. This change fix
this issue.

Change-Id: Ie5c2270b736271e5724cc83f76d9d9f4cd943088
Signed-off-by: default avatarYuanfang Zhang <zhangyuanfang@codeaurora.org>
parent 9d6eaf90

drivers/hwtracing/coresight/coresight-tmc-etr.c

+7 −7
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ ssize_t tmc_etr_get_sysfs_trace(struct tmc_drvdata *drvdata, 
static struct etr_buf *

tmc_etr_setup_sysfs_buf(struct tmc_drvdata *drvdata)

{

	struct etr_buf *sysfs_buf = NULL;

	struct etr_buf *sysfs_buf = NULL, *new_buf = NULL;



	/*

	 * If we are enabling the ETR from disabled state, we need to make
@@ -1110,16 +1110,16 @@ tmc_etr_setup_sysfs_buf(struct tmc_drvdata *drvdata) 


		if (drvdata->out_mode == TMC_ETR_OUT_MODE_USB

			&& drvdata->byte_cntr->sw_usb)

			sysfs_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_SW_USB_BUF_SIZE,

			new_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_SW_USB_BUF_SIZE,

					 0, cpu_to_node(0), NULL);

		else if (drvdata->out_mode == TMC_ETR_OUT_MODE_PCIE)

			sysfs_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_PCIE_MEM_SIZE,

			new_buf = tmc_alloc_etr_buf(drvdata, TMC_ETR_PCIE_MEM_SIZE,

					 0, cpu_to_node(0), NULL);

		else

			sysfs_buf = tmc_alloc_etr_buf(drvdata, drvdata->size,

			new_buf = tmc_alloc_etr_buf(drvdata, drvdata->size,

					 0, cpu_to_node(0), NULL);

	}

	return sysfs_buf;

	return new_buf;

}



static void
@@ -1603,7 +1603,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) 
	int ret = 0;

	unsigned long flags;

	struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

	struct etr_buf *sysfs_buf = NULL, *new_buf = NULL, *free_buf = NULL;

	struct etr_buf *new_buf = NULL, *free_buf = NULL;



	spin_lock_irqsave(&drvdata->spinlock, flags);

	if (drvdata->reading) {
@@ -1647,7 +1647,7 @@ static int tmc_enable_etr_sink_sysfs(struct coresight_device *csdev) 
		 * use the buffer allocated above. Otherwise reuse the existing buffer.

		 */

		if (new_buf) {

			free_buf = sysfs_buf;

			free_buf = drvdata->sysfs_buf;

			drvdata->sysfs_buf = new_buf;

		}

		ret = tmc_etr_enable_hw(drvdata, drvdata->sysfs_buf);