misc: fastrpc: Add missing bug fixes
v7 cover misc: fastrpc: Add missing bug fixes
Add missing bug fixes in memory areas. This patch series fixes multiple memory handling issues in the FastRPC driver, primarily around the Audio PD remote heap.
The Audio PD uses a reserved memory-region that is shared between HLOS and the DSP. Allocating and freeing this memory from userspace is unsafe, as the kernel cannot reliably determine when the DSP has finished using the buffers.
To address this, the entire reserved memory-region for the Audio PD is now fully assigned to the DSP during remoteproc boot-up, and its lifetime is tied to the rpmsg channel.
Patch [v6]: https://lore.kernel.org/all/[email protected]/
Change in v7:
- Removed duplicate remote heap validation check; keep it only at the beginning of fastrpc_init_create_static_process()
Change in v6:
- Separate the handling of err_copy
- Place the check for remote_heap at the beginning of the function
Change in v5:
- Split reserved-memory handling into separate patches
Change in v4:
- Fail Audio PD static process creation when no reserved memory-region is present, instead of silently proceeding
Change in v3:
- Adjusted the order of the series, placing NULL check changes that are not bug fixes at the end
- Modified the commit message to describe the bug background in detail
- Switch buf->list_lock back to fl->lock
- Add locking to the operation of audio_init_mem
Changes in v2:
- Remove the if check outside fastrpc_buf_free
- Store the spinlock pointer in the struct fastrpc_buf instead
- Allocate entire reserved memory to audio PD through remote heap
Ekansh Gupta (3):
misc: fastrpc: Fix initial memory allocation for Audio PD memory pool
misc: fastrpc: Remove buffer from list prior to unmap operation
misc: fastrpc: Allow fastrpc_buf_free() to accept NULL
Jianping Li (2):
misc: fastrpc: Fail Audio PD init when reserved memory is missing
misc: fastrpc: Allocate entire reserved memory for Audio PD in probe
drivers/misc/fastrpc.c | 128 +++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 62 deletions(-)
Signature · 1 line
2.43.0
PATCH v7 1/5 misc: fastrpc: Fix initial memory allocation for Audio PD memory pool
From: Ekansh Gupta <[email protected]>
The initial buffer allocated for the Audio PD memory pool is never added to the pool because pageslen is set to 0. As a result, the buffer is not registered with Audio PD and is never used, causing a memory leak. Audio PD immediately falls back to allocating memory from the remote heap since the pool starts out empty.
Fix this by setting pageslen to 1 so that the initially allocated buffer is correctly registered and becomes part of the Audio PD memory pool.
--- drivers/misc/fastrpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/misc/fastrpc.c +4 -4
@@ -1373,7 +1373,9 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, err =PTR_ERR (name); goto err; } - + inbuf.client_id = fl->client_id; + inbuf.namelen = init.namelen; + inbuf.pageslen =0 ;if (!fl->cctx->remote_heap) { err =fastrpc_remote_heap_alloc (fl, fl->sctx->dev, init.memlen, &fl->cctx->remote_heap);
@@ -1396,12 +1398,10 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, goto err_map; } scm_done = true; + inbuf.pageslen =1 ; } } - inbuf.client_id = fl->client_id; - inbuf.namelen = init.namelen; - inbuf.pageslen =0 ; fl->pd =USER_PD ; args[0 ].ptr = (u64)(uintptr_t)&inbuf;
Signature · 1 line
2.43.0
Re: [PATCH v7 1/5] misc: fastrpc: Fix initial memory allocation for Audio PD memory pool
Quoted 11 lines · Jianping Li
From: Ekansh Gupta <[email protected]>
The initial buffer allocated for the Audio PD memory pool is never added to the pool because pageslen is set to 0. As a result, the buffer is not registered with Audio PD and is never used, causing a memory leak. Audio PD immediately falls back to allocating memory from the remote heap since the pool starts out empty.
Fix this by setting pageslen to 1 so that the initially allocated buffer is correctly registered and becomes part of the Audio PD memory pool.
Quoted 8 lines
Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Ekansh Gupta <[email protected]>Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v7 2/5 misc: fastrpc: Remove buffer from list prior to unmap operation
In reply to Jianping LiFrom: Ekansh Gupta <[email protected]>
fastrpc_req_munmap_impl() is called to unmap any buffer. The buffer is getting removed from the list after it is unmapped from DSP. This can create potential race conditions if multiple threads invoke unmap concurrently, where one thread may remove the entry from the list while another thread's unmap operation is still ongoing.
Fix this by removing the buffer entry from the list before calling the unmap operation. If the unmap fails, the entry is re-added to the list so that userspace can retry the unmap, or alternatively, the buffer will be cleaned up during device release when the DSP process is torn down and all DSP-side mappings are freed along with remaining buffers in the list.
--- drivers/misc/fastrpc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/misc/fastrpc.c +10 -4
@@ -1892,9 +1892,6 @@ static int fastrpc_req_munmap_impl(struct fastrpc_user *fl, struct fastrpc_buf * &args[0]);if (!err) {dev_dbg (dev,"unmmap\tpt 0x%09lx OK\n" , buf->raddr); -spin_lock (&fl->lock); -list_del (&buf->node); -spin_unlock (&fl->lock);fastrpc_buf_free (buf); }else {dev_err (dev,"unmmap\tpt 0x%09lx ERROR\n" , buf->raddr);
@@ -1908,6 +1905,7 @@ static int fastrpc_req_munmap(struct fastrpc_user *fl, char __user *argp)struct fastrpc_buf *buf =NULL , *iter, *b;struct fastrpc_req_munmap req;struct device *dev = fl->sctx->dev; +int err;if (copy_from_user (&req, argp,sizeof (req)))return -EFAULT ;
@@ -1915,6 +1913,7 @@ static int fastrpc_req_munmap(struct fastrpc_user *fl, char __user *argp)spin_lock (&fl->lock);list_for_each_entry_safe (iter, b, &fl->mmaps, node) {if ((iter->raddr == req.vaddrout) && (iter->size == req.size)) { +list_del (&iter->node); buf = iter;break ; }
@@ -1927,7 +1926,14 @@ static int fastrpc_req_munmap(struct fastrpc_user *fl, char __user *argp)return -EINVAL ; } -return fastrpc_req_munmap_impl (fl, buf); + err =fastrpc_req_munmap_impl (fl, buf); +if (err) { +spin_lock (&fl->lock); +list_add_tail (&buf->node, &fl->mmaps); +spin_unlock (&fl->lock); + } + +return err; }static int fastrpc_req_mmap (struct fastrpc_user *fl,char __user *argp)
Signature · 1 line
2.43.0
Re: [PATCH v7 2/5] misc: fastrpc: Remove buffer from list prior to unmap operation
Quoted 15 lines · Jianping Li
From: Ekansh Gupta <[email protected]>
fastrpc_req_munmap_impl()is called to unmap any buffer. The buffer is getting removed from the list after it is unmapped from DSP. This can create potential race conditions if multiple threads invoke unmap concurrently, where one thread may remove the entry from the list while another thread's unmap operation is still ongoing.Fix this by removing the buffer entry from the list before calling the unmap operation. If the unmap fails, the entry is re-added to the list so that userspace can retry the unmap, or alternatively, the buffer will be cleaned up during device release when the DSP process is torn down and all DSP-side mappings are freed along with remaining buffers in the list.
Quoted 8 lines
Fixes 2419e55e532de ("misc: fastrpc: add mmap/unmap support")Signed-off-by Ekansh Gupta <[email protected]>Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
Signature · 2 lines
With best wishes Dmitry
PATCH v7 3/5 misc: fastrpc: Fail Audio PD init when reserved memory is missing
In reply to Jianping LiAudio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via cctx->remote_heap.
If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for remote_heap presence and size before sending the memory to DSP, and fail early if the configuration is invalid.
--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/misc/fastrpc.c +7 -0
@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc; +if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" ); +return err; + } args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;
Signature · 1 line
2.43.0
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
Quoted 23 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/misc/fastrpc.c +0
-0
drivers/misc/fastrpc.c static int fastrpc_init_create_static_process(struct fastrpc_user *fl, · line 1361
Quoted 8 lines
drivers/misc/fastrpc.c +5
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc; +if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" );
should be an error instead of dbg info.
Thanks,
Jie
Quoted 5 lines
drivers/misc/fastrpc.c +2
-0+return err; + } args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
Quoted 38 lines · Jie Gan
Quoted 26 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>---
drivers/misc/fastrpc.c| 7 +++++++1 file changed, 7 insertions(+)drivers/misc/fastrpc.c +0
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf; u32 sc;Quoted 6 lines
+ if (!fl->cctx->remote_heap ||
+ !fl->cctx->remote_heap->dma_addr ||
+ !fl->cctx->remote_heap->size) {
+ err =-ENOMEM;
+dev_dbg(fl->sctx->dev, "remote heap memory region is not added\n");should be an error instead of dbg info.
Quoted 2 lines
Thanks,
Jie
I will use dev_err to print this log.
Thanks,
Jianping.
Quoted 7 lines
Quoted 6 lines
+ return err;
+ }
args =kzalloc_objs(*args, FASTRPC_CREATE_STATIC_PROCESS_NARGS); if (!args)
return-ENOMEM;
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
In reply to Jianping LiQuoted 23 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/misc/fastrpc.c +0
-0
drivers/misc/fastrpc.c static int fastrpc_init_create_static_process(struct fastrpc_user *fl, · line 1363
Quoted 10 lines
drivers/misc/fastrpc.c +7
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc; +if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" ); +return err; + }
Won't this check without the next commit break the kernel? I don't see where else the remote heap is being allocated.
Quoted 6 lines
drivers/misc/fastrpc.c +0
-0args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;Signature · 1 line
2.43.0
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
Quoted 27 lines · Dmitry Baryshkov
Quoted 26 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/misc/fastrpc.c +0
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc;
Quoted 9 lines
drivers/misc/fastrpc.c static int fastrpc_init_create_static_process(struct fastrpc_user *fl, · line 1363
Quoted 7 lines
drivers/misc/fastrpc.c +7
-0+if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" ); +return err; + }Won't this check without the next commit break the kernel? I don't see where else the remote heap is being allocated.
Yes, this check depends on remote_heap being populated during rpmsg probe from the reserved-memory region, introduced in a subsequent patch in this series.
If there is no dependency on the next series, the remote_heap allocation here after the if check. The logic will be wrong.
Quoted 7 lines
Quoted 7 lines
drivers/misc/fastrpc.c +0
-0args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;Signature · 1 line
2.43.0
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
Quoted 38 lines · Jianping Li
Quoted 19 lines · Dmitry Baryshkov
Quoted 18 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)Quoted 16 lines
Quoted 5 lines
drivers/misc/fastrpc.c +0
-0drivers/misc/fastrpc.c static int fastrpc_init_create_static_process(struct fastrpc_user *fl, · line 1362
Quoted 9 lines
drivers/misc/fastrpc.c +7
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc; +if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" ); +return err; + }Won't this check without the next commit break the kernel? I don't see where else the remote heap is being allocated.
Quoted 6 lines
Yes, this check depends on
remote_heapbeing populated during rpmsg probe from the reserved-memory region, introduced in a subsequent patch in this series.If there is no dependency on the next series, the
remote_heapallocation here after the if check. The logic will be wrong.
So, at least you need to squash those two together.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/misc/fastrpc.c +0
-0args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;Signature · 1 line
2.43.0
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v7 3/5] misc: fastrpc: Fail Audio PD init when reserved memory is missing
Quoted 37 lines · Dmitry Baryshkov
Quoted 36 lines · Jianping Li
Quoted 35 lines · Dmitry Baryshkov
Quoted 23 lines · Jianping Li
Audio PD static process creation assumes that a reserved-memory region is defined in DT and exposed via
cctx->remote_heap.If reserved-memory is missing or incomplete, the driver may pass invalid address/size information to the DSP, leading to undefined behavior or crashes.
Add explicit validation for
remote_heappresence and size before sending the memory to DSP, and fail early if the configuration is invalid.Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/misc/fastrpc.c +0
-0drivers/misc/fastrpc.c static int fastrpc_init_create_static_process(struct fastrpc_user *fl, · line 1362
Quoted 9 lines
drivers/misc/fastrpc.c +7
-0@@ -1354,6 +1354,13 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, } inbuf;u32 sc; +if (!fl->cctx->remote_heap || + !fl->cctx->remote_heap->dma_addr || + !fl->cctx->remote_heap->size) { + err = -ENOMEM ; +dev_dbg (fl->sctx->dev,"remote heap memory region is not added\n" ); +return err; + }Won't this check without the next commit break the kernel? I don't see where else the remote heap is being allocated.
Quoted 7 lines
Quoted 6 lines
Yes, this check depends on
remote_heapbeing populated during rpmsg probe from the reserved-memory region, introduced in a subsequent patch in this series.If there is no dependency on the next series, the
remote_heapallocation here after the if check. The logic will be wrong.So, at least you need to squash those two together.
ACK.
I'll squash those two patches together in the next revision.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/misc/fastrpc.c +0
-0args =kzalloc_objs (*args,FASTRPC_CREATE_STATIC_PROCESS_NARGS );if (!args)return -ENOMEM ;Signature · 1 line
2.43.0
PATCH v7 4/5 misc: fastrpc: Allocate entire reserved memory for Audio PD in probe
In reply to Jianping LiAllocating and freeing Audio PD memory from userspace is unsafe because the kernel cannot reliably determine when the DSP has finished using the memory. Userspace may free buffers while they are still in use by the DSP, and remote free requests cannot be safely trusted.
Additionally, the current implementation allows userspace to repeatedly grow the Audio PD heap, but does not support shrinking it. This can lead to unbounded memory usage over time, effectively causing a memory leak.
Fix this by allocating the entire Audio PD reserved-memory region during rpmsg probe and tying its lifetime to the rpmsg channel. This removes userspace-controlled alloc/free and ensures that memory is reclaimed only when the DSP process is torn down.
--- drivers/misc/fastrpc.c | 96 +++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 53 deletions(-)
drivers/misc/fastrpc.c +43 -53
@@ -276,6 +276,8 @@ struct fastrpc_channel_ctx {struct kref refcount;/* Flag if dsp attributes are cached */ bool valid_attributes; +/* Flag if audio PD init mem was allocated */ +bool audio_init_mem;u32 dsp_attributes[FASTRPC_MAX_DSP_ATTRIBUTES ];struct fastrpc_device *secure_fdevice;struct fastrpc_device *fdevice;
@@ -1344,15 +1346,16 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,struct fastrpc_init_create_static init;struct fastrpc_invoke_args *args;struct fastrpc_phy_page pages[1 ]; +struct fastrpc_channel_ctx *cctx = fl->cctx;char *name;int err; -bool scm_done = false;struct {int client_id;u32 namelen;u32 pageslen; } inbuf;u32 sc; +unsigned long flags; if (!fl->cctx->remote_heap || !fl->cctx->remote_heap->dma_addr ||
@@ -1383,31 +1386,6 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, inbuf.client_id = fl->client_id; inbuf.namelen = init.namelen; inbuf.pageslen =0 ; -if (!fl->cctx->remote_heap) { - err =fastrpc_remote_heap_alloc (fl, fl->sctx->dev, init.memlen, - &fl->cctx->remote_heap); -if (err) - goto err_name; - -/* Map if we have any heap VMIDs associated with this ADSP Static Process. */ -if (fl->cctx->vmcount) { -u64 src_perms =BIT (QCOM_SCM_VMID_HLOS ); - - err =qcom_scm_assign_mem (fl->cctx->remote_heap->dma_addr, - (u64 )fl->cctx->remote_heap->size, - &src_perms, - fl->cctx->vmperms, fl->cctx->vmcount); -if (err) { -dev_err (fl->sctx->dev, -"Failed to assign memory with dma_addr %pad size 0x%llx err %d\n" , - &fl->cctx->remote_heap->dma_addr, - fl->cctx->remote_heap->size, err); - goto err_map; - } - scm_done = true; - inbuf.pageslen =1 ; - } - } fl->pd =USER_PD ;
@@ -1419,8 +1397,17 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, args[1 ].length = inbuf.namelen; args[1 ].fd =-1 ; - pages[0 ].addr = fl->cctx->remote_heap->dma_addr; - pages[0 ].size = fl->cctx->remote_heap->size; +spin_lock_irqsave (&cctx->lock, flags); +if (!fl->cctx->audio_init_mem) { + pages[0 ].addr = fl->cctx->remote_heap->dma_addr; + pages[0 ].size = fl->cctx->remote_heap->size; + fl->cctx->audio_init_mem = true; + inbuf.pageslen =1 ; + }else { + pages[0 ].addr =0 ; + pages[0 ].size =0 ; + } +spin_unlock_irqrestore (&cctx->lock, flags); args[2 ].ptr = (u64 )(uintptr_t ) pages; args[2 ].length =sizeof (*pages);
@@ -1438,27 +1425,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,return 0 ; err_invoke: -if (fl->cctx->vmcount && scm_done) { -u64 src_perms =0 ; -struct qcom_scm_vmperm dst_perms; -u32 i; - -for (i =0 ; i < fl->cctx->vmcount; i++) - src_perms |=BIT (fl->cctx->vmperms[i].vmid); - - dst_perms.vmid =QCOM_SCM_VMID_HLOS ; - dst_perms.perm =QCOM_SCM_PERM_RWX ; - err =qcom_scm_assign_mem (fl->cctx->remote_heap->dma_addr, - (u64 )fl->cctx->remote_heap->size, - &src_perms, &dst_perms,1 ); -if (err) -dev_err (fl->sctx->dev,"Failed to assign memory dma_addr %pad size 0x%llx err %d\n" , - &fl->cctx->remote_heap->dma_addr, fl->cctx->remote_heap->size, err); - } -err_map: -fastrpc_buf_free (fl->cctx->remote_heap); - fl->cctx->remote_heap =NULL ; -err_name: + fl->cctx->audio_init_mem = false;kfree (name); err:kfree (args);
@@ -2425,12 +2392,21 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) } } -if (domain_id ==SDSP_DOMAIN_ID ) { +if (domain_id ==SDSP_DOMAIN_ID || domain_id ==ADSP_DOMAIN_ID ) {struct resource res;u64 src_perms; err =of_reserved_mem_region_to_resource (rdev->of_node,0 , &res);if (!err) { +if (domain_id ==ADSP_DOMAIN_ID ) { + data->remote_heap = +kzalloc_obj (*data->remote_heap,GFP_KERNEL ); +if (!data->remote_heap) +return -ENOMEM ; + + data->remote_heap->dma_addr = res.start; + data->remote_heap->size =resource_size (&res); + } src_perms =BIT (QCOM_SCM_VMID_HLOS ); err = qcom_scm_assign_mem(res.start, resource_size(&res), &src_perms,
@@ -2438,7 +2414,6 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)if (err) goto err_free_data; } - } secure_dsp = !(of_property_read_bool (rdev->of_node,"qcom,non-secure-domain" ));
@@ -2519,6 +2494,7 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev)struct fastrpc_buf *buf, *b;struct fastrpc_user *user;unsigned long flags; +int err;/* No invocations past this point */ spin_lock_irqsave (&cctx->lock, flags);
@@ -2536,8 +2512,22 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev)list_for_each_entry_safe (buf, b, &cctx->invoke_interrupted_mmaps, node)list_del (&buf->node); -if (cctx->remote_heap) -fastrpc_buf_free (cctx->remote_heap); +if (cctx->remote_heap && cctx->vmcount) { +u64 src_perms =0 ; +struct qcom_scm_vmperm dst_perms; + +for (u32 i =0 ; i < cctx->vmcount; i++) + src_perms |=BIT (cctx->vmperms[i].vmid); + + dst_perms.vmid =QCOM_SCM_VMID_HLOS ; + dst_perms.perm =QCOM_SCM_PERM_RWX ; + + err =qcom_scm_assign_mem (cctx->remote_heap->dma_addr, + cctx->remote_heap->size, &src_perms, + &dst_perms,1 ); +if (!err) +kfree (cctx->remote_heap); + }of_platform_depopulate (&rpdev->dev);
Signature · 1 line
2.43.0
Re: [PATCH v7 4/5] misc: fastrpc: Allocate entire reserved memory for Audio PD in probe
Quoted 139 lines · Jianping Li
Allocating and freeing Audio PD memory from userspace is unsafe because the kernel cannot reliably determine when the DSP has finished using the memory. Userspace may free buffers while they are still in use by the DSP, and remote free requests cannot be safely trusted.
Additionally, the current implementation allows userspace to repeatedly grow the Audio PD heap, but does not support shrinking it. This can lead to unbounded memory usage over time, effectively causing a memory leak.
Fix this by allocating the entire Audio PD reserved-memory region during rpmsg probe and tying its lifetime to the rpmsg channel. This removes userspace-controlled alloc/free and ensures that memory is reclaimed only when the DSP process is torn down.
Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>--- drivers/misc/fastrpc.c | 96 +++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 53 deletions(-)drivers/misc/fastrpc.c +17
-50@@ -276,6 +276,8 @@ struct fastrpc_channel_ctx {struct kref refcount;/* Flag if dsp attributes are cached */ bool valid_attributes; +/* Flag if audio PD init mem was allocated */ +bool audio_init_mem;u32 dsp_attributes[FASTRPC_MAX_DSP_ATTRIBUTES ];struct fastrpc_device *secure_fdevice;struct fastrpc_device *fdevice;@@ -1344,15 +1346,16 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,struct fastrpc_init_create_static init;struct fastrpc_invoke_args *args;struct fastrpc_phy_page pages[1 ]; +struct fastrpc_channel_ctx *cctx = fl->cctx;char *name;int err; -bool scm_done = false;struct {int client_id;u32 namelen;u32 pageslen; } inbuf;u32 sc; +unsigned long flags; if (!fl->cctx->remote_heap || !fl->cctx->remote_heap->dma_addr ||@@ -1383,31 +1386,6 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, inbuf.client_id = fl->client_id; inbuf.namelen = init.namelen; inbuf.pageslen =0 ; -if (!fl->cctx->remote_heap) { - err =fastrpc_remote_heap_alloc (fl, fl->sctx->dev, init.memlen, - &fl->cctx->remote_heap); -if (err) - goto err_name; - -/* Map if we have any heap VMIDs associated with this ADSP Static Process. */ -if (fl->cctx->vmcount) { -u64 src_perms =BIT (QCOM_SCM_VMID_HLOS ); - - err =qcom_scm_assign_mem (fl->cctx->remote_heap->dma_addr, - (u64 )fl->cctx->remote_heap->size, - &src_perms, - fl->cctx->vmperms, fl->cctx->vmcount); -if (err) { -dev_err (fl->sctx->dev, -"Failed to assign memory with dma_addr %pad size 0x%llx err %d\n" , - &fl->cctx->remote_heap->dma_addr, - fl->cctx->remote_heap->size, err); - goto err_map; - } - scm_done = true; - inbuf.pageslen =1 ; - } - } fl->pd =USER_PD ;@@ -1419,8 +1397,17 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, args[1 ].length = inbuf.namelen; args[1 ].fd =-1 ; - pages[0 ].addr = fl->cctx->remote_heap->dma_addr; - pages[0 ].size = fl->cctx->remote_heap->size; +spin_lock_irqsave (&cctx->lock, flags); +if (!fl->cctx->audio_init_mem) { + pages[0 ].addr = fl->cctx->remote_heap->dma_addr; + pages[0 ].size = fl->cctx->remote_heap->size; + fl->cctx->audio_init_mem = true; + inbuf.pageslen =1 ; + }else { + pages[0 ].addr =0 ; + pages[0 ].size =0 ; + } +spin_unlock_irqrestore (&cctx->lock, flags); args[2 ].ptr = (u64 )(uintptr_t ) pages; args[2 ].length =sizeof (*pages);@@ -1438,27 +1425,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,return 0 ; err_invoke: -if (fl->cctx->vmcount && scm_done) { -u64 src_perms =0 ; -struct qcom_scm_vmperm dst_perms; -u32 i; - -for (i =0 ; i < fl->cctx->vmcount; i++) - src_perms |=BIT (fl->cctx->vmperms[i].vmid); - - dst_perms.vmid =QCOM_SCM_VMID_HLOS ; - dst_perms.perm =QCOM_SCM_PERM_RWX ; - err =qcom_scm_assign_mem (fl->cctx->remote_heap->dma_addr, - (u64 )fl->cctx->remote_heap->size, - &src_perms, &dst_perms,1 ); -if (err) -dev_err (fl->sctx->dev,"Failed to assign memory dma_addr %pad size 0x%llx err %d\n" , - &fl->cctx->remote_heap->dma_addr, fl->cctx->remote_heap->size, err); - } -err_map: -fastrpc_buf_free (fl->cctx->remote_heap); - fl->cctx->remote_heap =NULL ; -err_name: + fl->cctx->audio_init_mem = false;kfree (name); err:kfree (args);@@ -2425,12 +2392,21 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) } } -if (domain_id ==SDSP_DOMAIN_ID ) { +if (domain_id ==SDSP_DOMAIN_ID || domain_id ==ADSP_DOMAIN_ID ) {
drivers/misc/fastrpc.c static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) · line 2405
Quoted 10 lines
drivers/misc/fastrpc.c +5
-0struct resource res;u64 src_perms; err =of_reserved_mem_region_to_resource (rdev->of_node,0 , &res);if (!err) { +if (domain_id ==ADSP_DOMAIN_ID ) { + data->remote_heap = +kzalloc_obj (*data->remote_heap,GFP_KERNEL ); +if (!data->remote_heap) +return -ENOMEM ;
allocated data never free with directly return.
goto err_free_data;
Beside, we also need free data->remote_heap in err_free_data path as you added new memory allocation.
Quoted 24 lines
drivers/misc/fastrpc.c +5
-1+ + data->remote_heap->dma_addr = res.start; + data->remote_heap->size =resource_size (&res); + } src_perms =BIT (QCOM_SCM_VMID_HLOS ); err = qcom_scm_assign_mem(res.start, resource_size(&res), &src_perms,@@ -2438,7 +2414,6 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev)if (err) goto err_free_data; } - } secure_dsp = !(of_property_read_bool (rdev->of_node,"qcom,non-secure-domain" ));@@ -2519,6 +2494,7 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev)struct fastrpc_buf *buf, *b;struct fastrpc_user *user;unsigned long flags; +int err;/* No invocations past this point */ spin_lock_irqsave (&cctx->lock, flags);
drivers/misc/fastrpc.c static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev) · line 2540
Quoted 5 lines
drivers/misc/fastrpc.c +0
-2@@ -2536,8 +2512,22 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev)list_for_each_entry_safe (buf, b, &cctx->invoke_interrupted_mmaps, node)list_del (&buf->node); -if (cctx->remote_heap) -fastrpc_buf_free (cctx->remote_heap);
after removed the code, the cctx->remote_heap is not freed:
1. cctx->vmcount == 0
2. if (!err) is false
we should free the cctx->remote_heap unconditionally if it exists.
Thanks,
Jie
Quoted 19 lines
drivers/misc/fastrpc.c +16
-0+if (cctx->remote_heap && cctx->vmcount) { +u64 src_perms =0 ; +struct qcom_scm_vmperm dst_perms; + +for (u32 i =0 ; i < cctx->vmcount; i++) + src_perms |=BIT (cctx->vmperms[i].vmid); + + dst_perms.vmid =QCOM_SCM_VMID_HLOS ; + dst_perms.perm =QCOM_SCM_PERM_RWX ; + + err =qcom_scm_assign_mem (cctx->remote_heap->dma_addr, + cctx->remote_heap->size, &src_perms, + &dst_perms,1 ); +if (!err) +kfree (cctx->remote_heap); + }of_platform_depopulate (&rpdev->dev);
Re: [PATCH v7 4/5] misc: fastrpc: Allocate entire reserved memory for Audio PD in probe
Quoted 155 lines · Jie Gan
Quoted 139 lines · Jianping Li
Allocating and freeing Audio PD memory from userspace is unsafe because the kernel cannot reliably determine when the DSP has finished using the memory. Userspace may free buffers while they are still in use by the DSP, and remote free requests cannot be safely trusted.
Additionally, the current implementation allows userspace to repeatedly grow the Audio PD heap, but does not support shrinking it. This can lead to unbounded memory usage over time, effectively causing a memory leak.
Fix this by allocating the entire Audio PD reserved-memory region during rpmsg probe and tying its lifetime to the rpmsg channel. This removes userspace-controlled alloc/free and ensures that memory is reclaimed only when the DSP process is torn down.
Fixes 0871561055e66 ("misc: fastrpc: Add support for audiopd")Signed-off-by Jianping Li <[email protected]>---
drivers/misc/fastrpc.c| 96 +++++++++++++++++++-----------------------1 file changed, 43 insertions(+), 53 deletions(-)drivers/misc/fastrpc.c +4
-1@@ -276,6 +276,8 @@ struct fastrpc_channel_ctx { struct kref refcount; /* Flag if dsp attributes are cached */ bool valid_attributes; + /* Flag if audio PD init mem was allocated */ + bool audio_init_mem; u32 dsp_attributes[FASTRPC_MAX_DSP_ATTRIBUTES]; struct fastrpc_device *secure_fdevice; struct fastrpc_device *fdevice;@@ -1344,15 +1346,16 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, struct fastrpc_init_create_static init; struct fastrpc_invoke_args *args; struct fastrpc_phy_page pages[1]; + struct fastrpc_channel_ctx *cctx = fl->cctx; char *name; int err; - bool scm_done = false; struct { int client_id; u32 namelen; u32 pageslen; } inbuf; u32 sc; + unsigned long flags;if (!fl->cctx->remote_heap ||
!fl->cctx->remote_heap->dma_addr ||drivers/misc/fastrpc.c +0
-7@@ -1383,31 +1386,6 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, inbuf.client_id = fl->client_id; inbuf.namelen = init.namelen; inbuf.pageslen = 0; - if (!fl->cctx->remote_heap) { - err = fastrpc_remote_heap_alloc(fl, fl->sctx->dev, init.memlen, - &fl->cctx->remote_heap); - if (err) - goto err_name; - - /* Map if we have any heap VMIDs associated with this ADSPStatic Process. */
- if (fl->cctx->vmcount) {
- u64src_perms=BIT(QCOM_SCM_VMID_HLOS);
-
- err = qcom_scm_assign_mem(fl->cctx->remote_heap->dma_addr,
- (u64)fl->cctx->remote_heap->size,
-&src_perms,
-fl->cctx->vmperms,fl->cctx->vmcount);
- if (err) {
- dev_err(fl->sctx->dev,
- "Failed to assign memory withdma_addr%pad size
0x%llx err %d\n",
-&fl->cctx->remote_heap->dma_addr,
-fl->cctx->remote_heap->size, err);
- gotoerr_map;
- }
-scm_done= true;
- inbuf.pageslen = 1;
- }
- }
fl->pd=USER_PD;
@@ -1419,8 +1397,17 @@ static int fastrpc_init_create_static_process(structfastrpc_user*fl, args[1].length = inbuf.namelen;
args[1].fd = -1;
- pages[0].addr =fl->cctx->remote_heap->dma_addr;
- pages[0].size =fl->cctx->remote_heap->size;
+spin_lock_irqsave(&cctx->lock, flags);
+ if (!fl->cctx->audio_init_mem) {
+ pages[0].addr =fl->cctx->remote_heap->dma_addr;
+ pages[0].size =fl->cctx->remote_heap->size;
+fl->cctx->audio_init_mem= true;
+ inbuf.pageslen = 1;
+ } else {
+ pages[0].addr = 0;
+ pages[0].size = 0;
+ }
+spin_unlock_irqrestore(&cctx->lock, flags);
args[2].ptr = (u64)(uintptr_t) pages;
args[2].length =sizeof(*pages);drivers/misc/fastrpc.c +0
-0@@ -1438,27 +1425,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl, return 0;
err_invoke:
- if (fl->cctx->vmcount&&scm_done) {
- u64src_perms= 0;
- structqcom_scm_vmpermdst_perms;
- u32 i;drivers/misc/fastrpc.c +0
-11- - for (i = 0; i < fl->cctx->vmcount; i++) - src_perms |= BIT(fl->cctx->vmperms[i].vmid); - - dst_perms.vmid = QCOM_SCM_VMID_HLOS; - dst_perms.perm = QCOM_SCM_PERM_RWX; - err = qcom_scm_assign_mem(fl->cctx->remote_heap->dma_addr, - (u64 )fl->cctx->remote_heap->size, - &src_perms, &dst_perms, 1); - if (err) - dev_err(fl->sctx->dev, "Failed to assign memory dma_addr%pad size 0x%llx err %d\n",
-&fl->cctx->remote_heap->dma_addr,fl->cctx->remote_heap->size, err);
- }drivers/misc/fastrpc.c +1
-4-err_map: - fastrpc_buf_free(fl->cctx->remote_heap); - fl->cctx->remote_heap = NULL; -err_name: + fl->cctx->audio_init_mem = false;kfree(name);
err:
kfree(args);drivers/misc/fastrpc.c +0
-0@@ -2425,12 +2392,21 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) } } - if (domain_id == SDSP_DOMAIN_ID) {drivers/misc/fastrpc.c static int fastrpc_rpmsg_probe(struct · line 2405
Quoted 10 lines
drivers/misc/fastrpc.c +6
-0+ if (domain_id == SDSP_DOMAIN_ID || domain_id == ADSP_DOMAIN_ID) { struct resource res; u64 src_perms; err = of_reserved_mem_region_to_resource(rdev->of_node, 0, &res); if (!err) { + if (domain_id == ADSP_DOMAIN_ID) { + data->remote_heap = + kzalloc_obj(*data->remote_heap, GFP_KERNEL); + if (!data->remote_heap) + return -ENOMEM;allocated data never free with directly return.
Quoted 3 lines
goto
err_free_data;Beside, we also need free
data->remote_heapinerr_free_datapath as you added new memory allocation.
I will adjust goto err_free_data, and add free(data->remote_heap) in err_free_data.
err_free_data:
kfree(data->remote_heap);
kfree(data);
Quoted 34 lines
Quoted 24 lines
drivers/misc/fastrpc.c +5
-1+ + data->remote_heap->dma_addr = res.start; + data->remote_heap->size = resource_size(&res); + } src_perms = BIT(QCOM_SCM_VMID_HLOS); err = qcom_scm_assign_mem(res.start, resource_size(&res), &src_perms,@@ -2438,7 +2414,6 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) if (err) goto err_free_data; } - } secure_dsp = !(of_property_read_bool(rdev->of_node, "qcom,non-secure-domain"));@@ -2519,6 +2494,7 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev) struct fastrpc_buf *buf, *b; struct fastrpc_user *user; unsigned long flags; + int err; /* No invocations past this point */ spin_lock_irqsave(&cctx->lock, flags);drivers/misc/fastrpc.c static void fastrpc_rpmsg_remove(struct · line 2540
Quoted 5 lines
drivers/misc/fastrpc.c +0
-1@@ -2536,8 +2512,22 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev) list_for_each_entry_safe(buf, b, &cctx->invoke_interrupted_mmaps, node) list_del(&buf->node); - if (cctx->remote_heap) - fastrpc_buf_free(cctx->remote_heap);after removed the code, the
cctx->remote_heapis not freed:
1.cctx->vmcount== 0
2. if (!err) is false
Quoted 4 lines
we should free the
cctx->remote_heapunconditionally if it exists.Thanks,
Jie
You are right, after changing this to kfree here, the lifecycle should not be tied to whether the assignment is successful
so here we should kfree remote_heap every time.
err = qcom_scm_assign_mem(cctx->remote_heap->dma_addr, cctx->remote_heap->size, &src_perms, &dst_perms, 1);
if (err)
dev_err(&rpdev->dev,
"Failed to assign memory back to HLOS: dma_addr %pad size %#llx err %d\n", &cctx->remote_heap->dma_addr,
cctx->remote_heap->size, err);
}
kfree(cctx->remote_heap);
cctx->remote_heap = NULL;
Quoted 19 lines
Quoted 18 lines
drivers/misc/fastrpc.c +16
-0+ if (cctx->remote_heap && cctx->vmcount) { + u64 src_perms = 0; + struct qcom_scm_vmperm dst_perms; + + for (u32 i = 0; i < cctx->vmcount; i++) + src_perms |= BIT(cctx->vmperms[i].vmid); + + dst_perms.vmid = QCOM_SCM_VMID_HLOS; + dst_perms.perm = QCOM_SCM_PERM_RWX; + + err = qcom_scm_assign_mem(cctx->remote_heap->dma_addr, + cctx->remote_heap->size, &src_perms, + &dst_perms, 1); + if (!err) + kfree(cctx->remote_heap); + } of_platform_depopulate(&rpdev->dev);
PATCH v7 5/5 misc: fastrpc: Allow fastrpc_buf_free() to accept NULL
In reply to Jianping LiFrom: Ekansh Gupta <[email protected]>
Make fastrpc_buf_free() a no-op when passed a NULL pointer, allowing callers to avoid open-coded NULL checks.
--- drivers/misc/fastrpc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/misc/fastrpc.c +5 -4
@@ -418,6 +418,9 @@ static int fastrpc_map_lookup(struct fastrpc_user *fl, int fd,static void fastrpc_buf_free (struct fastrpc_buf *buf) { +if (!buf) +return ; +dma_free_coherent (buf->dev, buf->size, buf->virt,fastrpc_ipa_to_dma_addr (buf->fl->cctx, buf->dma_addr));kfree (buf);
@@ -510,8 +513,7 @@ static void fastrpc_user_free(struct kref *ref)struct fastrpc_map *map, *m;struct fastrpc_buf *buf, *b; -if (fl->init_mem) -fastrpc_buf_free (fl->init_mem); +fastrpc_buf_free (fl->init_mem);list_for_each_entry_safe (ctx, n, &fl->pending, node) {list_del (&ctx->node);
@@ -556,8 +558,7 @@ static void fastrpc_context_free(struct kref *ref)for (i =0 ; i < ctx->nbufs; i++)fastrpc_map_put (ctx->maps[i]); -if (ctx->buf) -fastrpc_buf_free (ctx->buf); +fastrpc_buf_free (ctx->buf);spin_lock_irqsave (&cctx->lock, flags);idr_remove (&cctx->ctx_idr, ctx->ctxid >>4 );
Signature · 1 line
2.43.0