From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20E2D36DA03 for ; Mon, 27 Jul 2026 08:43:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785141785; cv=none; b=a9SVoNITzRB3Ukz/lsdcUlALpp4uFEvm8318iXFg6dxdoo1mlOm+sPdreRixBsrCegVxYHtw/7k7YiWpRf+3F0DTTCCxUMcDFWCWpG66s/8u8oh7Gf+5uZ1zmUEeNNHIvPX7zMb42Q/zjbdtzjJnsvm1jq0YCdRLrehAnutbD2Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785141785; c=relaxed/simple; bh=QuSJzxEun27I+S0fyidi/Nwh2/MldM0vLmfhIKSGC08=; h=Message-ID:Date:MIME-Version:Subject:To:References:Cc:From: In-Reply-To:Content-Type; b=cgNNVYp4m4tHtg6XR6oY9kqYZWeu86ACq74v+XCQ+2C3vf9P8aG6g4qxdjUawRo9bvtsBV7Wzk4zHT7yyIxgWQBwklGjmky7Jj9JYD71cJFhs1mT/mxdizYrnYAnx10T2WBtjtay3uNq4Js/QEEukCfBlLOqxBtzI7o/1wKWRrA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=g3uQ4b29; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cHb2Wf4W; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="g3uQ4b29"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cHb2Wf4W" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66R8h3Gd3532576 for ; Mon, 27 Jul 2026 08:43:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= C+s8G2ux4SOx1ikW+oZADB+m5m7O1veSyxYJwy+RyAU=; b=g3uQ4b29v2viCjV8 3TBjCVHPGZWR/x6BhDRoeRAnSk58kFWWNVaCqbg9OZBvVPQazTOrXnD4jAJE1XDb gpDMq3iMhSyebt60Y+Hh4IVpzq93QzLCs4Fk4nfaRtMBgTj6vENWdwWu6j5U5d4D NyniB/Km8YM93MZMngfzUITRCNNnU17j1lE+A4NdVHAuqUMFruVRGEzytsYLYmqy asq9IYXCvKpC0MhkQGpVi93lZLdLxUYlyJTNDMuv4RPulK+6QzelsXdSH7Gdvrez ll0Um+MLOeLBxfLGrgnLADoYfwOEUh2TCtKAqXde4M3cdIkgF3zrR+1MmiMZBicA v/XrkQ== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fmm3sdfmp-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 27 Jul 2026 08:43:00 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cfbf3e4a63so71631665ad.0 for ; Mon, 27 Jul 2026 01:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785141731; x=1785746531; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from:cc :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to:content-type; bh=C+s8G2ux4SOx1ikW+oZADB+m5m7O1veSyxYJwy+RyAU=; b=cHb2Wf4WalNDcUFKnJR5/qtj36NoKGnpDyd2tgR15pMAGtOkcsdqr3+hmYztX0PIFl 1xFNFFFplgPntUSW6dYGjqafH2hNXcvpnoiVPQN7MVOjsARU1lCn/Jx+xs0yDbr7jc4f 0DvL0cmMgaw3zjvnT4k+ql65AxaxQGK4hOgftXrCz3MiwpqpLbeGQKBr9+aStLs0qw+k a8QQh6Be+JogZTKP0cqzaxZB/7z6NBdtvBHissc5L9cN5vJ7wVwUoy4fD6tsJcEleHAa SUPLWh6k9MTjqmM6lsLVnz0iG6l5CTY9RdGdodcExuNDjvwaL3i2ei+wc9aWhkeX5Tjp ieLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785141731; x=1785746531; h=content-transfer-encoding:content-type:in-reply-to:from:cc :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C+s8G2ux4SOx1ikW+oZADB+m5m7O1veSyxYJwy+RyAU=; b=MHflV6r6U1Yu5NQjeSerQOThn8GQdBR4EJbJciPXUVKkz/D8T7AEAsuFsS7Ooe3AjC 97nZyd7YpvSwOCjw2VMFwZlQXqAwBUDogyTMPu/jWWFJVttxSBkyZisDdhv5qcEGGybH OZiD2drpT18RLBzMlMb6AkbqHlN67UV6/8YnfD3bpGmn/fwNAuDvObZ6gjLc8gE3YzZv 83FXayIPjL1PRDTR7ZgHpK8EmKyzdzRvsxcZ9YOaWMjlTZ/xIN9FD4lRAoD230L+uWki Ajsi8WkgZQicIz5M0ZvMCnrLodyzDYHh2NcVVQuQD4iWaLxo0n85OaG7HQdXQkXxQ6ay EEww== X-Forwarded-Encrypted: i=1; AHgh+RrIONZEIVfngGqubBVTWI/JiTEHVk6Hnse9sXnQzh8HSrBfkYudYtc9IOtNkjsMp/fou7z/dhZr57Z3+d4=@vger.kernel.org X-Gm-Message-State: AOJu0YzE9PNrD1xwVzfNjfchUHsqt9UkAPbMUAUncH4xoflqwQnwovYc DhayiR1sEAmKpwjHPt7Ux0LNnLNrYZmR4DoyeCQhfjkvGfVBILXROFEGLpdIyAakKTGeuQ3SG2c 9zbS+uV5JOqfueX1rw6dOrRJ6QikqDeybq/cMH6lIrmYhWl8hglSFmiy/tePZzFY/0A4= X-Gm-Gg: AR+sD10g8l05WSP5kv0LyMRCAmwEplSjRvB8qLt56XHhORcIpwmtZow5WZd0CZowH2+ PBI4SjjVvwnqoCwRd1gIBZRu2OGhB2x0Z4BboNlNtP1HvKKoh7wHlUD0U8gAE1stbzHas2eLj9b 8WqXtHgE1Ur40dxvGDJdOm499awuDq/gy0z2b9dyvX/IRj/iIeXbVTiza7o1aqYLrXwcTWosuk2 NX1SD2PG0o9P0kgLPYAzT7eQJH/K1GknCNoFfxWJUWDYeOt6EtoZTWBXzXB/2Xzf/58NK7gHtkj zf6atXM5zcBtm+X7irazJgmcqMspdVlaa5XZ6sKxg+yyKqz1VnxEmcE7iMOjH32iPussr6krzAC GIfg/TUMEAZne5PCQ71xOgtMDq9FKSIhns/yNSH5vqEqG9y/0cyh2njJl7uPA1YRG9Gx9Ag== X-Received: by 2002:a17:903:1a28:b0:2c9:b2c1:13ec with SMTP id d9443c01a7336-2cfde7ae5fbmr76200955ad.11.1785141731056; Mon, 27 Jul 2026 01:42:11 -0700 (PDT) X-Received: by 2002:a17:903:1a28:b0:2c9:b2c1:13ec with SMTP id d9443c01a7336-2cfde7ae5fbmr76200575ad.11.1785141730526; Mon, 27 Jul 2026 01:42:10 -0700 (PDT) Received: from [10.249.29.51] (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfde7bbdacsm31607085ad.47.2026.07.27.01.42.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Jul 2026 01:42:10 -0700 (PDT) Message-ID: Date: Mon, 27 Jul 2026 16:42:04 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10] misc: fastrpc: Allocate entire reserved memory for Audio PD in probe To: Ekansh Gupta , srini@kernel.org References: <20260716095847.479-1-jianping.li@oss.qualcomm.com> <1bfd9503-ebcb-4613-943a-f6b31676f8e5@oss.qualcomm.com> Content-Language: en-US Cc: arnd@arndb.de, Greg KH , abelvesa@kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, quic_chennak@quicinc.com, stable@kernel.org From: Jianping In-Reply-To: <1bfd9503-ebcb-4613-943a-f6b31676f8e5@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI3MDA4NSBTYWx0ZWRfX/nUIEvaFfQQS HZywyhhTbOpqbowya5hb2HlsPjOx/IrrlBlkLLyM8hS4/W2Wu9Kg3F8m2CuxKV+aLxNwQv+vei5 TLJ/tlJ5QOqLqyIRfcrhpJrU00Ku+TR3R68NAq7s14cgDufJpnwQrDbyvdVWH+Wgm+Gv00C7qxh sJiIDhhckmtEow3UepDGQS84+x+zg0UCWi/YZxhPSzgD/ZZGGcXYCSM6HsM6adQOHf6Fugzx6QY 76f85rJXh91tA4XRvEB4cogBdCzbIx0gdS4RFHmKMDX4uJqID5f/X3GkFO+16+dWqKhiKiielMv GBkaPJoEbbCLGa+ZxLHufwjPIVfgxxxDsIT5lDWEqhfIR60kCCWbXoV7/ilHHp/+4J2J3RjU58k jurjKkeJJG+W9p+AllHK9rieqMd66cA45b6SahZnAOj+iMPHb3efLaBDF/9urYz5da4jaeIxXpL bkOoVKu3/3TUa9bEeGQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI3MDA4NSBTYWx0ZWRfX0h7s1e7slfcb U20VUZ36BhW6swx2leIiR6bxleakqAWLngou94O2VDmAWmKRYZyvdyUFHwPWZuLCbtjAvOXhxQZ nPJe1+bbohUctMsXiLWC6DL1HPg0P08= X-Proofpoint-ORIG-GUID: avq-obZ97zbn9u8P_lHMK6K8OfOeTY6O X-Proofpoint-GUID: avq-obZ97zbn9u8P_lHMK6K8OfOeTY6O X-Authority-Analysis: v=2.4 cv=KanidwYD c=1 sm=1 tr=0 ts=6a671a16 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=PJDYU9TqTllFh3ubuRkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-27_02,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 phishscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607270085 在 2026/7/27 14:19, Ekansh Gupta 写道: > On 16-07-2026 15:28, Jianping Li wrote: >> 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. >> >> Add explicit validation for remote_heap presence and size before sending >> the memory to DSP, and fail early if the reserved-memory region is >> missing or incomplete. > Can you also drop ADSP_MMAP_REMOTE_HEAP_ADDR support from > fastrpc_req_mmap as we don't intend user process to grow/shrink audio > PD's remote heap.> Agreed. I'll drop ADSP_MMAP_REMOTE_HEAP_ADDR support from fastrpc_req_mmap() in next version. >> Fixes: 0871561055e66 ("misc: fastrpc: Add support for audiopd") >> Cc: stable@kernel.org >> Signed-off-by: Jianping Li >> >> Patch [v9]: https://lore.kernel.org/all/20260707061733.495-1-jianping.li@oss.qualcomm.com/ >> >> Changes in v10: >> - Move Audio PD remote heap validation into >> fastrpc_rpmsg_probe(). >> >> - Treat Audio PD remote heap as a mandatory >> resource and fail probe if the reserved >> memory region is missing. >> >> Changes in v9: >> - Make sure fastrpc_init_create_static_process() >> only sets audio_init_mem to false when the sent >> address is actually invalid. >> --- >> drivers/misc/fastrpc.c | 121 +++++++++++++++++++++++------------------ >> 1 file changed, 69 insertions(+), 52 deletions(-) >> >> diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c >> index d86e79134c68..03f633028c00 100644 >> --- a/drivers/misc/fastrpc.c >> +++ b/drivers/misc/fastrpc.c >> @@ -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,17 @@ 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; >> + bool sent_heap = false; >> >> args = kzalloc_objs(*args, FASTRPC_CREATE_STATIC_PROCESS_NARGS); >> if (!args) >> @@ -1376,31 +1380,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; >> >> @@ -1412,8 +1391,25 @@ 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; >> + /* >> + * Audio PD is a static PD and retains the remote heap >> + * information across daemon restarts. Therefore only >> + * the first attach should provide heap information to >> + * DSP. Subsequent attaches reuse the previously >> + * initialized memory pool. >> + */ >> + spin_lock_irqsave(&cctx->lock, flags); >> + if (!cctx->audio_init_mem) { >> + pages[0].addr = cctx->remote_heap->dma_addr; >> + pages[0].size = cctx->remote_heap->size; >> + cctx->audio_init_mem = true; >> + inbuf.pageslen = 1; >> + sent_heap = true; >> + } 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); >> @@ -1431,27 +1427,11 @@ 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); >> + if (sent_heap) { >> + spin_lock_irqsave(&cctx->lock, flags); >> + cctx->audio_init_mem = false; >> + spin_unlock_irqrestore(&cctx->lock, flags); >> } >> -err_map: >> - fastrpc_buf_free(fl->cctx->remote_heap); >> - fl->cctx->remote_heap = NULL; >> -err_name: >> kfree(name); >> err: >> kfree(args); >> @@ -2418,12 +2398,29 @@ 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 && domain_id == ADSP_DOMAIN_ID) { >> + dev_err(rdev, "missing mandatory remote heap memory-region\n"); >> + goto err_free_data; >> + } >> + >> if (!err) { >> + if (domain_id == ADSP_DOMAIN_ID) { >> + data->remote_heap = >> + kzalloc_obj(*data->remote_heap); >> + if (!data->remote_heap) { >> + err = -ENOMEM; >> + goto err_free_data; >> + } >> + >> + data->remote_heap->dma_addr = res.start; >> + data->remote_heap->size = resource_size(&res); > other struct fastrpc_buf members are not initialized here. Either > initialize all or better just add remote_heap_addr and remote_heap_size > to fastrpc_channel_ctx structure.> + } You're right. I'll replace the remote_heap fastrpc_buf pointer with dedicated remote_heap_addr and remote_heap_size fields in fastrpc_channel_ctx in the next revision. >> src_perms = BIT(QCOM_SCM_VMID_HLOS); >> >> err = qcom_scm_assign_mem(res.start, resource_size(&res), &src_perms, >> @@ -2431,7 +2428,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")); >> @@ -2490,6 +2486,7 @@ static int fastrpc_rpmsg_probe(struct rpmsg_device *rpdev) >> misc_deregister(&data->secure_fdevice->miscdev); >> >> err_free_data: >> + kfree(data->remote_heap); >> kfree(data); >> return err; >> } >> @@ -2512,6 +2509,7 @@ static void fastrpc_rpmsg_remove(struct rpmsg_device *rpdev) >> struct fastrpc_buf *buf, *b; >> struct fastrpc_user *user; >> unsigned long flags; >> + int err, i; >> >> /* No invocations past this point */ >> spin_lock_irqsave(&cctx->lock, flags); >> @@ -2529,8 +2527,27 @@ 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 (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) >> + 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; >> >> of_platform_depopulate(&rpdev->dev); >> >