Linux ARM-MSM sub-architecture
 help / color / mirror / Atom feed
From: Dikshita Agarwal <quic_dikshita@quicinc.com>
To: Vikash Garodia <quic_vgarodia@quicinc.com>,
	Abhinav Kumar <quic_abhinavk@quicinc.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Stefan Schmidt <stefan.schmidt@linaro.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>, Joel Stanley <joel@jms.id.au>,
	<linux-media@vger.kernel.org>, <linux-arm-msm@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Dikshita Agarwal <quic_dikshita@quicinc.com>,
	<20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com>
Subject: [PATCH 2/2] media: iris: fix memory leak while freeing queue memory
Date: Thu, 9 Jan 2025 16:56:41 +0530	[thread overview]
Message-ID: <20250109-iris-driver-fixes-v1-2-789a0f5dd7ee@quicinc.com> (raw)
In-Reply-To: <20250109-iris-driver-fixes-v1-0-789a0f5dd7ee@quicinc.com>

Memory allocated for shared queues is not freed completely in tear down
sequence. Fix it by passing the correct value while freeing the queue
memory.

Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
---
 drivers/media/platform/qcom/iris/iris_hfi_queue.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/qcom/iris/iris_hfi_queue.c b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
index 9195715c5d5a..d1113708644b 100644
--- a/drivers/media/platform/qcom/iris/iris_hfi_queue.c
+++ b/drivers/media/platform/qcom/iris/iris_hfi_queue.c
@@ -292,6 +292,7 @@ int iris_hfi_queues_init(struct iris_core *core)
 
 void iris_hfi_queues_deinit(struct iris_core *core)
 {
+	u32 queue_size;
 	if (!core->iface_q_table_vaddr)
 		return;
 
@@ -305,9 +306,10 @@ void iris_hfi_queues_deinit(struct iris_core *core)
 	core->sfr_vaddr = NULL;
 	core->sfr_daddr = 0;
 
-	dma_free_attrs(core->dev, sizeof(struct iris_hfi_queue_table_header),
-		       core->iface_q_table_vaddr, core->iface_q_table_daddr,
-		       DMA_ATTR_WRITE_COMBINE);
+	queue_size = ALIGN(sizeof(struct iris_hfi_queue_table_header) +
+		(IFACEQ_QUEUE_SIZE * IFACEQ_NUMQ), SZ_4K);
+	dma_free_attrs(core->dev, queue_size, core->iface_q_table_vaddr,
+		       core->iface_q_table_daddr, DMA_ATTR_WRITE_COMBINE);
 
 	core->iface_q_table_vaddr = NULL;
 	core->iface_q_table_daddr = 0;

-- 
2.34.1


  parent reply	other threads:[~2025-01-09 11:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-09 11:26 [PATCH 0/2] media: iris: fix memory leak and improve driver Dikshita Agarwal
2025-01-09 11:26 ` [PATCH 1/2] media: iris: represent dma_mask in more readable form Dikshita Agarwal
2025-01-09 11:26 ` Dikshita Agarwal [this message]
2025-01-09 12:47 ` [PATCH 0/2] media: iris: fix memory leak and improve driver Hans Verkuil
2025-01-09 13:21   ` Hans Verkuil
2025-01-09 15:17 ` Johan Hovold
2025-01-10 17:32   ` Dikshita Agarwal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250109-iris-driver-fixes-v1-2-789a0f5dd7ee@quicinc.com \
    --to=quic_dikshita@quicinc.com \
    --cc=20241212-qcom-video-iris-v9-0-e8c2c6bd4041@quicinc.com \
    --cc=hverkuil@xs4all.nl \
    --cc=joel@jms.id.au \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=quic_abhinavk@quicinc.com \
    --cc=quic_vgarodia@quicinc.com \
    --cc=stefan.schmidt@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox