shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

misc: fastrpc: Free DMA handles for RPC calls with no arguments

Browse Source 
commit 2064843038 upstream.

The FDs for DMA handles to be freed is updated in fdlist by DSP over
a remote call. This holds true even for remote calls with no
arguments. To handle this, get_args and put_args are needed to
be called for remote calls with no arguments also as fdlist
is allocated in get_args and FDs updated in fdlist is freed
in put_args.

Fixes: 8f6c1d8c4f ("misc: fastrpc: Add fdlist implementation")
Cc: stable <stable@kernel.org>
Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20231013122007.174464-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ekansh Gupta
2023-10-13 13:20:05 +01:00
committed by Greg Kroah-Hartman
parent 1e8851b513
commit 7737e9384e
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/misc/fastrpc.c
View File

@@ -1036,6 +1036,7 @@ static int fastrpc_put_args(struct fastrpc_invoke_ctx *ctx,
} }
} }
/* Clean up fdlist which is updated by DSP */
for (i = 0; i < FASTRPC_MAX_FDLIST; i++) { for (i = 0; i < FASTRPC_MAX_FDLIST; i++) {
if (!fdlist[i]) if (!fdlist[i])
break; break;
@@ -1100,11 +1101,9 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel,
if (IS_ERR(ctx)) if (IS_ERR(ctx))
return PTR_ERR(ctx); return PTR_ERR(ctx);
if (ctx->nscalars) { err = fastrpc_get_args(kernel, ctx);
err = fastrpc_get_args(kernel, ctx); if (err)
if (err) goto bail;
goto bail;
}
/* make sure that all CPU memory writes are seen by DSP */ /* make sure that all CPU memory writes are seen by DSP */
dma_wmb(); dma_wmb();
@@ -1128,14 +1127,12 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel,
if (err) if (err)
goto bail; goto bail;
if (ctx->nscalars) { /* make sure that all memory writes by DSP are seen by CPU */
/* make sure that all memory writes by DSP are seen by CPU */ dma_rmb();
dma_rmb(); /* populate all the output buffers with results */
/* populate all the output buffers with results */ err = fastrpc_put_args(ctx, kernel);
err = fastrpc_put_args(ctx, kernel); if (err)
if (err) goto bail;
goto bail;
}
bail: bail:
if (err != -ERESTARTSYS && err != -ETIMEDOUT) { if (err != -ERESTARTSYS && err != -ETIMEDOUT) {