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 0DB0F2E7F1D for ; Tue, 30 Dec 2025 11:02:39 +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=1767092560; cv=none; b=q8UH3WrLMOFjUnzS6P5tj1qN/goF7Bei/chxZbbExne7MKx2RhP0B5GL5+XELltbgqpo/ZyAjrFFoexnim3HB2Gd65BS9Ep63OcwULNIaUMnXV2q+i5KTaCEzEUT6WhU1FdcPJ5ypk6Y/rMbL6e73tGai485dnLtDoB+ysZT7cI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767092560; c=relaxed/simple; bh=ZlvwGRaijfFW5xTAaesXx212yCTlRoStI6gpLYYYj5w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mmAL8dGMzJDK2VoBrmT6BAbVFzM5pVIxiZBxgHxTO7o8DEttvqYDqtmZU9AEssq72yCgZtr9L0v8H8xDc/0GKbxVndoxrL6bURX+d9J7sBUNhl4xrUQUsN968SSEnCKugRzTHqDn2L0qFTDXrZ+QD4ilHh0i3IIlyTJ787KpDAo= 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=kgfVR2nk; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FWEw8U1B; 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="kgfVR2nk"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FWEw8U1B" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BUB0WjV956323 for ; Tue, 30 Dec 2025 11:02:38 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=uZ7b55cvQjq GpVCER9aO23V8m+uhwWqcKo+IPNZIPA8=; b=kgfVR2nkirmq64dlE3pnaxzpPnq RpZdbyS+US0wzqfuYlw2iS/bSAIuwhLQyn3QIoZFSmhOJzjWvyvosfUIDZY/E6UQ jM3mH0Vtzh26u6lgThbM3oewzj1oZ6YDd9plpej129x1JwuMJzj758a+AB93bREN cOG+h26/ip8kHSgwFDThXPPdJtTPKp7kPESajMptS4ILuis1/NSyztS6jmuvcULS BZtA8EIq2zVjYf0KyIrtIUVnX0z1sbMdxkruJA4/NRff4RlYKxkKxcUrSYWeSZvh ZWrGZ5eLTIbQMoEHFqSBVttHoboNZs3JuK7dnJDqQZ4PUXCVCB51Q+9BXlA== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bbqk1ax9b-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 30 Dec 2025 11:02:38 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-34c704d5d15so19375539a91.1 for ; Tue, 30 Dec 2025 03:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1767092557; x=1767697357; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uZ7b55cvQjqGpVCER9aO23V8m+uhwWqcKo+IPNZIPA8=; b=FWEw8U1BdTVd8ZyCHBfOn6zJrlykyeo+n1QNrFpM49DqRSPN08/6gG2GSW7VCmSUBr 1dx91sDvAq8ya7L6TZLvLNFZC8DDEvmgQgTfilJDmxDWRYOiBIBgMwuq1P2Tj7qRHih8 S6EmtTJAxBT2UKfQ93XHI9h9FsAoS8V3aMvlZQPx0F7sA2zub2QJnb/f52lOmf+aCkQa qJ2LaEk3BHtBM2mmPpWgZNPjWKxo7Lq6yF+UOVkDlfxd9DcLXizhRI+Ao+W8bo82M3rU LcVkZSfmd1yjU/rDMDB2rJrdvDtv93p7ZJRvhsuwV867aXdIvVRDuM8UE4Tx6khY7nei hC5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767092557; x=1767697357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uZ7b55cvQjqGpVCER9aO23V8m+uhwWqcKo+IPNZIPA8=; b=MA2yzWfifSrHWVS7tdFfDI+0GaNLrAP8As/R4iDBxTv91xihO+PwsiQOETLQaQORym 6uCxQSvyXneJ7itFIw13XGBdpoEQodk4rzWCByhUgDZ1X2+8FnUpBJEjJNOe5xVAL9xE BrudJrBR80xw8qEwKBNw1YohJ2QWN6dup4+bh3gmNFigKTHHGpRos4AlbJgESIlbQy+x hkGtGkuSuHMhKbDHYfcGtyLc4M96vOFYIbFe6QlH0kAgbtJQF8TAn4T5qEG+UT85hEA6 yLNdXDGC82KDcJP2+9rYrOMireFyuB5rxOpwRaHaOIxoIA0Ylpqij1KO4DzSkaL+UjLT bscQ== X-Forwarded-Encrypted: i=1; AJvYcCVUV6DKw/Xv5ipIMUerYWrN/LXqRBnlhtnH0m5A+m3/h045Oza81D+aZhpLkRVMKZYeCZEdj8EvzZGhE6M=@vger.kernel.org X-Gm-Message-State: AOJu0YwygaKBE0XTeejg76qhRJfZbmH3nOJbiZmCkZ1nmYM/5s1Iz8/j rYR4wdb0sxURcib9zWTUKi2sSHF0wqWxA97xxXH5veiB8aU5OwyQlibkFe8E7eaG/6Tlrtp6AI0 YLdCqaS/eHrA610ucYdN9GPAeICCD2zh872FkWO6A3N/Z0Br6GDGjn8drshUupEam3z8= X-Gm-Gg: AY/fxX7PeMsHMoxEDzPcBPnrr/zuDp3FQ+CRazx2u5GJDTkUY77Fi+OXdNhQ4B7Zz7M RDVgU6T9lI68FX2vDcmAb/k5wml4IjDGqLu29ADJ+XL9QRCa8LtviYTXT+YCkJR6uI05GBULOOP VZGi0XSFYDcNFIcDRLpU7lr+7eAnBrTTUku49Fl6xefPSe9095TGQHKiCzyJOqKE28/touGLkCO b5lws6ul5ixrVHj3156BjSHD6WNYZWYegkOCf1MVuIgb+y+1JWBI1U/BR7fFmWz6PY0Y+cG2Kyk mg7cqoOE1hWMZYgmuQJh96pikh2lYKJxwdPqZxWkWhQl0GHjnA3VzCcGQzS8nIaIWYdfRcqSya/ 7OLdudMtJ7IxhXOI2QN3Mfq9Tp1ZLwxnwr01rxxO5Zw== X-Received: by 2002:a05:6a20:6a09:b0:371:d67d:e56a with SMTP id adf61e73a8af0-376a9ae2989mr33085237637.57.1767092557440; Tue, 30 Dec 2025 03:02:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IG1CkBNPOEDBq7uLze8A3MeLEdvhLojl1SQfevGINRj4fuvJbn/fzelF4LuaAuwutBx4iWerw== X-Received: by 2002:a05:6a20:6a09:b0:371:d67d:e56a with SMTP id adf61e73a8af0-376a9ae2989mr33085211637.57.1767092556872; Tue, 30 Dec 2025 03:02:36 -0800 (PST) Received: from hu-ekangupt-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c3a4deb6f17sm2556908a12.22.2025.12.30.03.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Dec 2025 03:02:36 -0800 (PST) From: Ekansh Gupta To: srini@kernel.org, linux-arm-msm@vger.kernel.org Cc: gregkh@linuxfoundation.org, quic_bkumar@quicinc.com, linux-kernel@vger.kernel.org, quic_chennak@quicinc.com, dri-devel@lists.freedesktop.org, arnd@arndb.de, dmitry.baryshkov@oss.qualcomm.com Subject: [PATCH v3 2/3] misc: fastrpc: Refactor mmap and munmap logic into helper functions Date: Tue, 30 Dec 2025 16:32:24 +0530 Message-Id: <20251230110225.3655707-3-ekansh.gupta@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251230110225.3655707-1-ekansh.gupta@oss.qualcomm.com> References: <20251230110225.3655707-1-ekansh.gupta@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: X5B-mX8ciRW1OPp0lRBDqdHqjU_7yg2d X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjMwMDA5OSBTYWx0ZWRfX21MsAjpEz/gS +VoHV8u1aooMaprEqFbEVTlqqyQ+ZG5VrFC72f3AYcbuwXLNELCazdIhKiS4dQDgj1E6kmO9YXM hs0TjNhpDT1FJj0ZoQQZUw6d99cbi0FVOIlvcq+9VrQ5dB9QkTagd4dND7O53Js+XyObkpJFENc V+tI1L7PybVUDZptV995zxKH6F3OLW6ckJjEKZ4DN17Tof3ovmAl5LTf8rG8dmUZdpSO6uakUoz 5osYwstgN6JAqT0pHpNRkJBOqwJaFBV/v8oyBZS+SBGyTY69XAEiTJEQN1EheGmQ5EhU9weblZi uHZE3FeokdwzuiZkxCZoUMPFayzzBr9QQeV+L1unIh+TlnaiGqA0c3A4+5junq3Ce0ETX5BEclt JcKL170OI6fG1z2icuyAdrfL4r2xZLinl1GamZX65luxJfpDYyH7nMlsAMrnPcPmXgup3gJ21iz lhqkojGC7txZPJiMX2Q== X-Authority-Analysis: v=2.4 cv=Tf6bdBQh c=1 sm=1 tr=0 ts=6953b14e cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=wP3pNCr1ah4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=04dbU8GgqVRi9gjLVHMA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-GUID: X5B-mX8ciRW1OPp0lRBDqdHqjU_7yg2d X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-29_07,2025-12-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2512120000 definitions=main-2512300099 Refactor FastRPC mmap and munmap handling by introducing dedicated helper functions for DSP-side operations. This change improves code readability and separates DSP invocation logic from buffer allocation and cleanup. Signed-off-by: Ekansh Gupta --- drivers/misc/fastrpc.c | 110 +++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 36 deletions(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 408fe47e9db7..24064efe5dd8 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -1811,24 +1811,33 @@ static int fastrpc_get_dsp_info(struct fastrpc_user *fl, char __user *argp) return 0; } -static int fastrpc_req_munmap_impl(struct fastrpc_user *fl, struct fastrpc_buf *buf) +static int fastrpc_req_munmap_dsp(struct fastrpc_user *fl, u64 raddr, u64 size) { struct fastrpc_invoke_args args[1] = { [0] = { 0 } }; struct fastrpc_munmap_req_msg req_msg; - struct device *dev = fl->sctx->dev; int err; u32 sc; req_msg.client_id = fl->client_id; - req_msg.size = buf->size; - req_msg.vaddr = buf->raddr; + req_msg.size = size; + req_msg.vaddr = raddr; - args[0].ptr = (u64) (uintptr_t) &req_msg; + args[0].ptr = (u64)(unsigned long)&req_msg; args[0].length = sizeof(req_msg); sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_MUNMAP, 1, 0); err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc, &args[0]); + + return err; +} + +static int fastrpc_req_munmap_impl(struct fastrpc_user *fl, struct fastrpc_buf *buf) +{ + struct device *dev = fl->sctx->dev; + int err; + + err = fastrpc_req_munmap_dsp(fl, buf->raddr, buf->size); if (!err) { dev_dbg(dev, "unmap OK: raddr=%p\n", (void *)(unsigned long)buf->raddr); spin_lock(&fl->lock); @@ -1869,26 +1878,54 @@ static int fastrpc_req_munmap(struct fastrpc_user *fl, char __user *argp) return fastrpc_req_munmap_impl(fl, buf); } -static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) +static int fastrpc_req_map_dsp(struct fastrpc_user *fl, u64 phys, + u64 size, u32 flag, u64 vaddrin, + u64 *raddr) { struct fastrpc_invoke_args args[3] = { [0 ... 2] = { 0 } }; - struct fastrpc_buf *buf = NULL; struct fastrpc_mmap_req_msg req_msg; struct fastrpc_mmap_rsp_msg rsp_msg; struct fastrpc_phy_page pages; - struct fastrpc_req_mmap req; - struct device *dev = fl->sctx->dev; int err; u32 sc; - if (copy_from_user(&req, argp, sizeof(req))) - return -EFAULT; + req_msg.client_id = fl->client_id; + req_msg.flags = flag; + req_msg.vaddr = vaddrin; + req_msg.num = sizeof(pages); - if (req.flags != ADSP_MMAP_ADD_PAGES && req.flags != ADSP_MMAP_REMOTE_HEAP_ADDR) { - dev_err(dev, "flag not supported 0x%x\n", req.flags); + args[0].ptr = (u64)(unsigned long)&req_msg; + args[0].length = sizeof(req_msg); - return -EINVAL; + pages.addr = phys; + pages.size = size; + + args[1].ptr = (u64)(unsigned long)&pages; + args[1].length = sizeof(pages); + + args[2].ptr = (u64)(unsigned long)&rsp_msg; + args[2].length = sizeof(rsp_msg); + sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_MMAP, 2, 1); + err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc, + &args[0]); + + if (err) { + dev_err(fl->sctx->dev, "mmap error (len 0x%08llx)\n", size); + return err; } + *raddr = rsp_msg.vaddr; + + return 0; +} + +static int fastrpc_req_buf_alloc(struct fastrpc_user *fl, + struct fastrpc_req_mmap req, + char __user *argp) +{ + struct device *dev = fl->sctx->dev; + struct fastrpc_buf *buf = NULL; + u64 raddr = 0; + int err; if (req.vaddrin) { dev_err(dev, "adding user allocated pages is not supported\n"); @@ -1905,26 +1942,8 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) return err; } - req_msg.client_id = fl->client_id; - req_msg.flags = req.flags; - req_msg.vaddr = req.vaddrin; - req_msg.num = sizeof(pages); - - args[0].ptr = (u64) (uintptr_t) &req_msg; - args[0].length = sizeof(req_msg); - - pages.addr = buf->phys; - pages.size = buf->size; - - args[1].ptr = (u64) (uintptr_t) &pages; - args[1].length = sizeof(pages); - - args[2].ptr = (u64) (uintptr_t) &rsp_msg; - args[2].length = sizeof(rsp_msg); - - sc = FASTRPC_SCALARS(FASTRPC_RMID_INIT_MMAP, 2, 1); - err = fastrpc_internal_invoke(fl, true, FASTRPC_INIT_HANDLE, sc, - &args[0]); + err = fastrpc_req_map_dsp(fl, buf->phys, buf->size, req.flags, + req.vaddrin, &raddr); if (err) { dev_err(dev, "mmap error (len 0x%08llx)\n", buf->size); fastrpc_buf_free(buf); @@ -1932,10 +1951,10 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) } /* update the buffer to be able to deallocate the memory on the DSP */ - buf->raddr = (uintptr_t) rsp_msg.vaddr; + buf->raddr = (uintptr_t)raddr; /* let the client know the address to use */ - req.vaddrout = rsp_msg.vaddr; + req.vaddrout = raddr; /* Add memory to static PD pool, protection thru hypervisor */ if (req.flags == ADSP_MMAP_REMOTE_HEAP_ADDR && fl->cctx->vmcount) { @@ -1970,6 +1989,25 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) return err; } +static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp) +{ + struct fastrpc_req_mmap req; + int err; + + if (copy_from_user(&req, argp, sizeof(req))) + return -EFAULT; + + if (req.flags != ADSP_MMAP_ADD_PAGES && req.flags != ADSP_MMAP_REMOTE_HEAP_ADDR) { + dev_err(fl->sctx->dev, "flag not supported 0x%x\n", req.flags); + + return -EINVAL; + } + + err = fastrpc_req_buf_alloc(fl, req, argp); + + return err; +} + static int fastrpc_req_mem_unmap_impl(struct fastrpc_user *fl, struct fastrpc_mem_unmap *req) { struct fastrpc_invoke_args args[1] = { [0] = { 0 } }; -- 2.34.1