* [PATCH v3] misc: fastrpc: Pass proper scm arguments for static process init
@ 2023-08-02 5:02 Ekansh Gupta
2023-08-02 13:37 ` Srinivas Kandagatla
0 siblings, 1 reply; 3+ messages in thread
From: Ekansh Gupta @ 2023-08-02 5:02 UTC (permalink / raw)
To: srinivas.kandagatla, linux-arm-msm
Cc: Ekansh Gupta, ekangupt, gregkh, linux-kernel, fastrpc.upstream,
stable
Memory is allocated for dynamic loading when audio daemon is trying
to attach to audioPD on DSP side. This memory is allocated from
reserved CMA memory region and needs ownership assignment to
new VMID in order to use it from audioPD.
In the current implementation, arguments are not correctly passed
to the scm call which might result in failure of dynamic loading
on audioPD. Added changes to pass correct arguments during daemon
attach request.
Fixes: 0871561055e6 ("misc: fastrpc: Add support for audiopd")
Cc: stable <stable@kernel.org>
Tested-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
---
Changes in v2:
- Removed redundant code
Changes in v3:
- Reuse channel context perms for source perms
drivers/misc/fastrpc.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index 30d4d04..5a1268f 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -1280,8 +1280,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
if (fl->cctx->vmcount) {
err = qcom_scm_assign_mem(fl->cctx->remote_heap->phys,
(u64)fl->cctx->remote_heap->size,
- &fl->cctx->perms,
- fl->cctx->vmperms, fl->cctx->vmcount);
+ &fl->cctx->perms, fl->cctx->vmperms, fl->cctx->vmcount);
if (err) {
dev_err(fl->sctx->dev, "Failed to assign memory with phys 0x%llx size 0x%llx err %d",
fl->cctx->remote_heap->phys, fl->cctx->remote_heap->size, err);
@@ -1322,13 +1321,18 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
return 0;
err_invoke:
if (fl->cctx->vmcount) {
- struct qcom_scm_vmperm perm;
+ u64 src_perms = 0;
+ struct qcom_scm_vmperm dst_perms;
+ u32 i;
- perm.vmid = QCOM_SCM_VMID_HLOS;
- perm.perm = QCOM_SCM_PERM_RWX;
+ 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->phys,
(u64)fl->cctx->remote_heap->size,
- &fl->cctx->perms, &perm, 1);
+ &src_perms, &dst_perms, 1);
if (err)
dev_err(fl->sctx->dev, "Failed to assign memory phys 0x%llx size 0x%llx err %d",
fl->cctx->remote_heap->phys, fl->cctx->remote_heap->size, err);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] misc: fastrpc: Pass proper scm arguments for static process init
2023-08-02 5:02 [PATCH v3] misc: fastrpc: Pass proper scm arguments for static process init Ekansh Gupta
@ 2023-08-02 13:37 ` Srinivas Kandagatla
2023-08-02 13:47 ` Ekansh Gupta
0 siblings, 1 reply; 3+ messages in thread
From: Srinivas Kandagatla @ 2023-08-02 13:37 UTC (permalink / raw)
To: Ekansh Gupta, linux-arm-msm
Cc: ekangupt, gregkh, linux-kernel, fastrpc.upstream, stable
On 02/08/2023 06:02, Ekansh Gupta wrote:
> Memory is allocated for dynamic loading when audio daemon is trying
> to attach to audioPD on DSP side. This memory is allocated from
> reserved CMA memory region and needs ownership assignment to
> new VMID in order to use it from audioPD.
>
> In the current implementation, arguments are not correctly passed
> to the scm call which might result in failure of dynamic loading
> on audioPD. Added changes to pass correct arguments during daemon
> attach request.
>
> Fixes: 0871561055e6 ("misc: fastrpc: Add support for audiopd")
> Cc: stable <stable@kernel.org>
> Tested-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
> Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
> ---
> Changes in v2:
> - Removed redundant code
> Changes in v3:
> - Reuse channel context perms for source perms
>
> drivers/misc/fastrpc.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
> index 30d4d04..5a1268f 100644
> --- a/drivers/misc/fastrpc.c
> +++ b/drivers/misc/fastrpc.c
> @@ -1280,8 +1280,7 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
> if (fl->cctx->vmcount) {
> err = qcom_scm_assign_mem(fl->cctx->remote_heap->phys,
> (u64)fl->cctx->remote_heap->size,
> - &fl->cctx->perms,
> - fl->cctx->vmperms, fl->cctx->vmcount);
> + &fl->cctx->perms, fl->cctx->vmperms, fl->cctx->vmcount);
this change does not look correct, Looks totally like converting
multiple lines to a single line.
--srini
> if (err) {
> dev_err(fl->sctx->dev, "Failed to assign memory with phys 0x%llx size 0x%llx err %d",
> fl->cctx->remote_heap->phys, fl->cctx->remote_heap->size, err);
> @@ -1322,13 +1321,18 @@ static int fastrpc_init_create_static_process(struct fastrpc_user *fl,
> return 0;
> err_invoke:
> if (fl->cctx->vmcount) {
> - struct qcom_scm_vmperm perm;
> + u64 src_perms = 0;
> + struct qcom_scm_vmperm dst_perms;
> + u32 i;
>
> - perm.vmid = QCOM_SCM_VMID_HLOS;
> - perm.perm = QCOM_SCM_PERM_RWX;
> + 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->phys,
> (u64)fl->cctx->remote_heap->size,
> - &fl->cctx->perms, &perm, 1);
> + &src_perms, &dst_perms, 1);
> if (err)
> dev_err(fl->sctx->dev, "Failed to assign memory phys 0x%llx size 0x%llx err %d",
> fl->cctx->remote_heap->phys, fl->cctx->remote_heap->size, err);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v3] misc: fastrpc: Pass proper scm arguments for static process init
2023-08-02 13:37 ` Srinivas Kandagatla
@ 2023-08-02 13:47 ` Ekansh Gupta
0 siblings, 0 replies; 3+ messages in thread
From: Ekansh Gupta @ 2023-08-02 13:47 UTC (permalink / raw)
To: Srinivas Kandagatla, linux-arm-msm
Cc: ekangupt, gregkh, linux-kernel, fastrpc.upstream, stable
On 8/2/2023 7:07 PM, Srinivas Kandagatla wrote:
>
>
> On 02/08/2023 06:02, Ekansh Gupta wrote:
>> Memory is allocated for dynamic loading when audio daemon is trying
>> to attach to audioPD on DSP side. This memory is allocated from
>> reserved CMA memory region and needs ownership assignment to
>> new VMID in order to use it from audioPD.
>>
>> In the current implementation, arguments are not correctly passed
>> to the scm call which might result in failure of dynamic loading
>> on audioPD. Added changes to pass correct arguments during daemon
>> attach request.
>>
>> Fixes: 0871561055e6 ("misc: fastrpc: Add support for audiopd")
>> Cc: stable <stable@kernel.org>
>> Tested-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
>> Signed-off-by: Ekansh Gupta <quic_ekangupt@quicinc.com>
>> ---
>> Changes in v2:
>> - Removed redundant code
>> Changes in v3:
>> - Reuse channel context perms for source perms
>>
>> drivers/misc/fastrpc.c | 16 ++++++++++------
>> 1 file changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
>> index 30d4d04..5a1268f 100644
>> --- a/drivers/misc/fastrpc.c
>> +++ b/drivers/misc/fastrpc.c
>> @@ -1280,8 +1280,7 @@ static int
>> fastrpc_init_create_static_process(struct fastrpc_user *fl,
>> if (fl->cctx->vmcount) {
>> err = qcom_scm_assign_mem(fl->cctx->remote_heap->phys,
>> (u64)fl->cctx->remote_heap->size,
>> - &fl->cctx->perms,
>> - fl->cctx->vmperms, fl->cctx->vmcount);
>> + &fl->cctx->perms, fl->cctx->vmperms,
>> fl->cctx->vmcount);
>
> this change does not look correct, Looks totally like converting
> multiple lines to a single line.
Thanks for pointing this out, I might have missed keeping the correct
formatting while reverting the change. I will update this in next patch.
>
> --srini
>
>> if (err) {
>> dev_err(fl->sctx->dev, "Failed to assign memory with
>> phys 0x%llx size 0x%llx err %d",
>> fl->cctx->remote_heap->phys,
>> fl->cctx->remote_heap->size, err);
>> @@ -1322,13 +1321,18 @@ static int
>> fastrpc_init_create_static_process(struct fastrpc_user *fl,
>> return 0;
>> err_invoke:
>> if (fl->cctx->vmcount) {
>> - struct qcom_scm_vmperm perm;
>> + u64 src_perms = 0;
>> + struct qcom_scm_vmperm dst_perms;
>> + u32 i;
>> - perm.vmid = QCOM_SCM_VMID_HLOS;
>> - perm.perm = QCOM_SCM_PERM_RWX;
>> + 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->phys,
>> (u64)fl->cctx->remote_heap->size,
>> - &fl->cctx->perms, &perm, 1);
>> + &src_perms, &dst_perms, 1);
>> if (err)
>> dev_err(fl->sctx->dev, "Failed to assign memory phys
>> 0x%llx size 0x%llx err %d",
>> fl->cctx->remote_heap->phys,
>> fl->cctx->remote_heap->size, err);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-02 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-02 5:02 [PATCH v3] misc: fastrpc: Pass proper scm arguments for static process init Ekansh Gupta
2023-08-02 13:37 ` Srinivas Kandagatla
2023-08-02 13:47 ` Ekansh Gupta
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox