From patchwork Mon Jul 31 04:10:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 128342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1809256vqg; Sun, 30 Jul 2023 22:27:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlEti1c+J0FzfQbULgpcIgoYGkld5kJqGDEpKvaB9Ccb/V5aQpcBJ6QY1v7WP8thLsI2Dn0G X-Received: by 2002:a17:906:51ca:b0:99b:49a6:952d with SMTP id v10-20020a17090651ca00b0099b49a6952dmr5848625ejk.65.1690781225366; Sun, 30 Jul 2023 22:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690781225; cv=none; d=google.com; s=arc-20160816; b=LMO8VpC0y9C6ID5oT7D3VbXXj9aPCinzJ+8xXKiJXWaT5HsSBrr0lTIXwT8peCRN8G mgoKEw3AIiD1IVHJe+HSIb2iY6/CWoc7R8LexnF5xzErt/B5spGIQwlWaPkHtHAHrQNf esmw5KnOQmtSGORSHUwVC/BfhZ7ch6IEgcFIc7X5TRPtSyTIX9C7sUB+1jskULLN8Bb9 N6XLJWbYr+2rhKecfAzgTYKbYgOm9QGZ1q0neq162QWgxDib2vlBfcA5X96FCuHP+uLa m36H6Pt/w3LvzT4fBA4TBwT3UihKIlqh5+lrExoVMxWfW2ae+m758yF9zeChecMLEsAX 3SZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gp9XD6CZd39XpaMXUChOFVUeON8Mza7FQOgDoLLrBuk=; fh=rCBE8/kXWBaCp7P5CIBGqD11Aa0ik5RvwLHhauCkNFk=; b=niGCYj3c6+7VRmj3LIZWwmquulbAt+hmd6qg2yYi8zOK7ClKVqmlPgdkWAWZ25za9H ncyVeGZXIRWJ0CCWwZxZ4A7JiC4Hw5gU9ccvsxGGnuy88ITvgW+HKfxl1PWHzEcOrxVc DmHKbOdH83PH1EukaUysiWLxkMWQ0snwouhqJcEuVhs7DPv7CsaNPCxOaw9vD2jLCd3E uzbGoeQFjH+vuMDTV4lAZw8EK6aSDxNkBPJB4OM+Pq96pbsBtbQv8HibyPSBHD+0tsBt mrIClxcpHjTvRsTeOUcj7Cwt7B4Jxy0Dt/vp6NeVlogNC4oCFkJMMi3uX1f2JckqAHMr NHsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=m+cfC8ou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk20-20020a170907767400b00987dc76f82fsi1924569ejc.285.2023.07.30.22.26.40; Sun, 30 Jul 2023 22:27:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=m+cfC8ou; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229921AbjGaEKs (ORCPT + 99 others); Mon, 31 Jul 2023 00:10:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229887AbjGaEKi (ORCPT ); Mon, 31 Jul 2023 00:10:38 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3D4E1BE; Sun, 30 Jul 2023 21:10:31 -0700 (PDT) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36V21xQt023385; Mon, 31 Jul 2023 04:10:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=gp9XD6CZd39XpaMXUChOFVUeON8Mza7FQOgDoLLrBuk=; b=m+cfC8ouoS9AvGZ3TXRvTk/xLGt5Vtauu/X7P0PrCykQMaTADEHtCYuKmNPKWnNajGX2 9riFHsj0j0Qg3lrMTJFYQ1j/is7RIG5Nxbw5d841MXQGVzSNeX0fS9wJc4eJET3qTN24 y3I8T9Z/2aLCmMJNddcsjqa0LeCwIfATA1055yzBvooFbgNxyrmanMbPp7IulcIWc6MR kaHxOIf1AKEYQ6eHrstXXGmXOuSPiQD7wrWAA3RSa3B6R0kbKa72yz5/dJ6fxqVSblmi m69O8OoJrg6XtTyUK1yairlY4CcFjoW1aFtc+QJE31ptnScV7w60GUxvjXT21UKXBIQg jw== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s4ug22k11-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Jul 2023 04:10:21 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36V4AKav006152 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 31 Jul 2023 04:10:20 GMT Received: from hu-bjorande-lv.qualcomm.com (10.49.16.6) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Sun, 30 Jul 2023 21:10:19 -0700 From: Bjorn Andersson To: Bjorn Andersson , Konrad Dybcio , Chris Lew CC: Alex Elder , "David S. Miller" , Jakub Kicinski , Mathieu Poirier , , , , Subject: [PATCH 3/4] soc: qcom: aoss: Format string in qmp_send() Date: Sun, 30 Jul 2023 21:10:12 -0700 Message-ID: <20230731041013.2950307-4-quic_bjorande@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230731041013.2950307-1-quic_bjorande@quicinc.com> References: <20230731041013.2950307-1-quic_bjorande@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Nwq8Mjb-FgW-ItEpkpAUcI8Dv5ZyPl__ X-Proofpoint-ORIG-GUID: Nwq8Mjb-FgW-ItEpkpAUcI8Dv5ZyPl__ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-27_10,2023-07-26_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 clxscore=1015 mlxscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307310037 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772912613951034177 X-GMAIL-MSGID: 1772912613951034177 The majority of callers to qmp_send() composes the message dynamically using some form of sprintf(), resulting in unnecessary complication and stack usage. By changing the interface of qmp_send() to take a format string and arguments, the duplicated composition of the commands can be moved to a single location. Signed-off-by: Bjorn Andersson Reviewed-by: Konrad Dybcio --- drivers/soc/qcom/qcom_aoss.c | 22 ++++++++++++++-------- include/linux/soc/qcom/qcom_aoss.h | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c index 4c5bb7034fff..b59c8681bcfe 100644 --- a/drivers/soc/qcom/qcom_aoss.c +++ b/drivers/soc/qcom/qcom_aoss.c @@ -207,27 +207,33 @@ static bool qmp_message_empty(struct qmp *qmp) /** * qmp_send() - send a message to the AOSS * @qmp: qmp context - * @data: message to be sent + * @fmt: format string for message to be sent + * @...: arguments for the format string * - * Transmit @data to AOSS and wait for the AOSS to acknowledge the message. + * Transmit message to AOSS and wait for the AOSS to acknowledge the message. * data must not be longer than the mailbox size. Access is synchronized by * this implementation. * * Return: 0 on success, negative errno on failure */ -int qmp_send(struct qmp *qmp, const void *data) +int qmp_send(struct qmp *qmp, const char *fmt, ...) { long time_left; + va_list args; char buf[QMP_MSG_LEN]; + int len; int ret; - if (WARN_ON(IS_ERR_OR_NULL(qmp) || !data)) + if (WARN_ON(IS_ERR_OR_NULL(qmp) || !fmt)) return -EINVAL; - if (WARN_ON(strlen(data) >= sizeof(buf))) - return -EINVAL; + memset(buf, 0, sizeof(buf)); + va_start(args, fmt); + len = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); - strscpy_pad(buf, data, sizeof(buf)); + if (WARN_ON(len >= sizeof(buf))) + return -EINVAL; mutex_lock(&qmp->tx_lock); @@ -491,7 +497,7 @@ static ssize_t qmp_debugfs_write(struct file *file, const char __user *userstr, return -EFAULT; buf[len] = '\0'; - ret = qmp_send(qmp, buf); + ret = qmp_send(qmp, "%s", buf); if (ret < 0) return ret; diff --git a/include/linux/soc/qcom/qcom_aoss.h b/include/linux/soc/qcom/qcom_aoss.h index 7a71406b6050..7361ca028752 100644 --- a/include/linux/soc/qcom/qcom_aoss.h +++ b/include/linux/soc/qcom/qcom_aoss.h @@ -13,13 +13,13 @@ struct qmp; #if IS_ENABLED(CONFIG_QCOM_AOSS_QMP) -int qmp_send(struct qmp *qmp, const void *data); +int qmp_send(struct qmp *qmp, const char *fmt, ...); struct qmp *qmp_get(struct device *dev); void qmp_put(struct qmp *qmp); #else -static inline int qmp_send(struct qmp *qmp, const void *data) +static inline int qmp_send(struct qmp *qmp, const char *fmt, ...) { return -ENODEV; }