From patchwork Mon Jul 22 08:01:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekansh Gupta X-Patchwork-Id: 13738495 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 53936282FE; Mon, 22 Jul 2024 08:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635349; cv=none; b=sgCbqvx04eyRTqSgIdD51FadXgeqVzO50PjO8PC989eBMd3+KLMjjuj5SdhrQGC65J8Trnz9ZirSzxV1VDgtgX/JgWdG58T/IP7QrRI3P2GOMbOEM9IwEfd9iKikGRZP1+uUf6G1SfN7QqDA327ZxTGfUX9+Bdl6rbb9UMN0/O8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635349; c=relaxed/simple; bh=QoDp8B79aB0QCr7pceizv7MEMUy3CC9Ljxczhl9yHOM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bN+BEY8LhzGeEIuu3JAvPjDF6BKwo7uLBVLlpdzRrJO1GCUGL8rhL74Tty+NvwKrfL6VOJ+n5U9fzD3UztjtwtKXmROlcAKlcOfBk6XgVClZ7TNYBOzVmRqdPTF5xYAKJw8V+4cmArkXIaPgZ4vfUq/xTOCnmmv0iuIXvB7Aiiw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=YC01+ABD; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="YC01+ABD" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46LMeEEu024250; Mon, 22 Jul 2024 08:02:17 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= w21bLn/sM//2yqBSdEO7pBEmdqCH3Ao4IzhOqtksR/Q=; b=YC01+ABDicPBT5gU EjWNqWvHEBrDLa9KbojeLrShPrM61dZaW5HIV8BhOSIG/HhqwMmnnHgjd4OEBuAC TN/nSQZMEkb2s6wUKc2ZZdV24r/Cx176+aW3HedX0f0vnumZB06ywNPmrwbErD6p 7EqngomuVyKVbs0Kd0SImsyIskafc6zSNA2annBpA6eeODZWd6J5xjTsbQnxX2Us 3MOtuR2dvMZpqGNQYAytEFQuhI5e9S6Ri2BwkKVLxnlLK2qFZllmKWT4ieBdjf94 ShDdXnp0QtF0hZZt6jsN1cREvZUw6hSIJ83JWSd3iKsIb9PUKLQacA9D2aK/BOIn /1s4bg== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40g487b29c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jul 2024 08:02:16 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA01.qualcomm.com (8.17.1.19/8.17.1.19) with ESMTPS id 46M82FZd027414 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jul 2024 08:02:15 GMT Received: from hu-ekangupt-hyd.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Mon, 22 Jul 2024 01:02:12 -0700 From: Ekansh Gupta To: , CC: , , , , , , stable Subject: [PATCH v6 1/2] misc: fastrpc: Define a new initmem size for user PD Date: Mon, 22 Jul 2024 13:31:59 +0530 Message-ID: <20240722080200.3530850-2-quic_ekangupt@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240722080200.3530850-1-quic_ekangupt@quicinc.com> References: <20240722080200.3530850-1-quic_ekangupt@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: tYWglpIH9Ny2Ow6LJDuFGV7vCLQIZhO3 X-Proofpoint-GUID: tYWglpIH9Ny2Ow6LJDuFGV7vCLQIZhO3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-22_04,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 suspectscore=0 phishscore=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 adultscore=0 impostorscore=0 clxscore=1015 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2407220061 For user PD initialization, initmem is allocated and sent to DSP for initial memory requirements like shell loading. The size of this memory is decided based on the shell size that is passed by the user space. With the current implementation, a minimum of 2MB is always allocated for initmem even if the size passed by user is less than that. For this a MACRO is being used which is intended for shell size bound check. This minimum size of 2MB is not recommended as the PD will have very less memory for heap and will have to request HLOS again for memory. Define a new macro for initmem minimum length of 3MB. Fixes: d73f71c7c6ee ("misc: fastrpc: Add support for create remote init process") Cc: stable Signed-off-by: Ekansh Gupta --- drivers/misc/fastrpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index a7a2bcedb37e..a3a5b745936e 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -39,6 +39,7 @@ #define FASTRPC_DSP_UTILITIES_HANDLE 2 #define FASTRPC_CTXID_MASK (0xFF0) #define INIT_FILELEN_MAX (2 * 1024 * 1024) +#define FASTRPC_INITLEN_MIN (3 * 1024 * 1024) #define INIT_FILE_NAMELEN_MAX (128) #define FASTRPC_DEVICE_NAME "fastrpc" @@ -1410,7 +1411,7 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl, goto err; } - memlen = ALIGN(max(INIT_FILELEN_MAX, (int)init.filelen * 4), + memlen = ALIGN(max(FASTRPC_INITLEN_MIN, (int)init.filelen * 4), 1024 * 1024); err = fastrpc_buf_alloc(fl, fl->sctx->dev, memlen, &imem); From patchwork Mon Jul 22 08:02:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ekansh Gupta X-Patchwork-Id: 13738496 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 B42802BD19; Mon, 22 Jul 2024 08:02:29 +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=1721635351; cv=none; b=b5AvVivS6uqPsqI9p/x47/Ugj4N5ldfqctrEuG6ZQoW3wM7F/Vx7eflsKIiyQOHWINuWOJEZqN0ssiUINX70Yz6dssL5VDa24YGG77jdDRgZi9NTuWLP810m1KDuG9tNckX6iU1kuVxiI6PrN1pIRsAs+6bMaI9jX/W5Km7NbXc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721635351; c=relaxed/simple; bh=cMF+VgBjEYjzDLfuj/vm/Xm4Gsu1tOAq/3UZsjrt8jo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CAHSKa3hReoyxTLqaiMRUu65DqZtssT+W0txqBiIbqQXTkkxYeitQd4Mq46hwlxQWa1btOy0RWnJRja11DdqL3omwCIvTjaVCAUyZX5g2keIZRpLwTCspfatLoMzexXSLzYJcG6u7n+1g0GZDNpIJ2yASi0DdKb3bmZqDPJzswg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=hD9a6OWv; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="hD9a6OWv" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46M0hSHI019032; Mon, 22 Jul 2024 08:02:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= R6rDmevpspTo4e2w7t1idKO6q/ovGrfS7kPM2SwT32w=; b=hD9a6OWvg+ptBUSi vKTud1K8c3Lc5M21hbvLhIqUMFyDcSRX1vbO8To36+6hetYKlimonCDgIiLc5rnX xyMtHKkAwL29koCHB2MgXGOuT2nMP4fc9DMI7cmp+TBCja7xtvl88fke+l8uxPOn 4c9q6HJPbjYr9LKahE5U/9ZWmPRwlkgBnLZdulem4MJ/+QoeZEKkRveRBomH/Aab zTDDj94Jmp1cqnSUuIl8ra1vGCleErbbFFUMdxOvRbpd6w5LSv2XZUb7V12fUdr+ 3k9x6xuLWRCLIPj4GYrJCQWiYfrAt3tGn/GNDayqrffieEELSx8eiwmb1+qRbfdH hB9zfw== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 40g60jtvya-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jul 2024 08:02:19 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA01.qualcomm.com (8.17.1.19/8.17.1.19) with ESMTPS id 46M82Joi027452 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 Jul 2024 08:02:19 GMT Received: from hu-ekangupt-hyd.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Mon, 22 Jul 2024 01:02:15 -0700 From: Ekansh Gupta To: , CC: , , , , , , stable Subject: [PATCH v6 2/2] misc: fastrpc: Increase unsigned PD initmem size Date: Mon, 22 Jul 2024 13:32:00 +0530 Message-ID: <20240722080200.3530850-3-quic_ekangupt@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240722080200.3530850-1-quic_ekangupt@quicinc.com> References: <20240722080200.3530850-1-quic_ekangupt@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: CgdwRxgxyExIaY_5IDW6EMcO2Wvz5gnB X-Proofpoint-GUID: CgdwRxgxyExIaY_5IDW6EMcO2Wvz5gnB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-22_04,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxlogscore=999 priorityscore=1501 bulkscore=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 suspectscore=0 phishscore=0 clxscore=1015 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2407110000 definitions=main-2407220061 For unsigned PD offloading requirement, additional memory is required because of additional static heap initialization. Without this additional memory, PD initialization would fail. Increase the initmem size by 2MB for unsigned PD initmem buffer allocation. Any additional memory sent to DSP during PD init is used as the PD heap. Fixes: 7f1f481263c3 ("misc: fastrpc: check before loading process to the DSP") Cc: stable Signed-off-by: Ekansh Gupta --- drivers/misc/fastrpc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index a3a5b745936e..9daeb039c2a2 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -40,6 +40,7 @@ #define FASTRPC_CTXID_MASK (0xFF0) #define INIT_FILELEN_MAX (2 * 1024 * 1024) #define FASTRPC_INITLEN_MIN (3 * 1024 * 1024) +#define FASTRPC_UNSIGNED_EXTRA_LEN (2 * 1024 * 1024) #define INIT_FILE_NAMELEN_MAX (128) #define FASTRPC_DEVICE_NAME "fastrpc" @@ -1411,8 +1412,15 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl, goto err; } + /* + * Allocate buffer in kernel for donating to remote process. + * Unsigned PD requires additional memory because of the + * additional static heap initialized within the process. + */ memlen = ALIGN(max(FASTRPC_INITLEN_MIN, (int)init.filelen * 4), 1024 * 1024); + if (unsigned_module) + memlen += FASTRPC_UNSIGNED_EXTRA_LEN; err = fastrpc_buf_alloc(fl, fl->sctx->dev, memlen, &imem); if (err)