Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp242252rdb; Mon, 15 Jan 2024 20:54:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSRqECQDK/IImSbQIM5ZqsXTxAwL/tL29cR2DrUFAt+lxI2PSftal3GQtWUxv3Vuv4aUVQ X-Received: by 2002:a17:903:11cf:b0:1d4:32a9:f682 with SMTP id q15-20020a17090311cf00b001d432a9f682mr7771667plh.41.1705380873969; Mon, 15 Jan 2024 20:54:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705380873; cv=none; d=google.com; s=arc-20160816; b=00EN/Qpec1+N/n5XDLNTJwgPuQojJ61USkbvVgLDrc3wco416945zJVDMx71MlPwzI //sBc5S28Ku+KRlRUfbj2MHskjxPDa12kTNuTUYe9wKvbJqKjma93TWEvhMGVQXextbk noVUUzF15puqWYy9btAEvDjmd3TL5hxGLSkhH+sSVrTs34INbCtsr/gyFpXHuDWrPw48 SRvxP++I58eS3GhlxPk6V/LsLCOkGfwO5W5r1uT88U9y3FdDz2ZS0Rzg1cazUDIvJIZS lAWexjg/r+mFWt9xaO7UBk0Bd167WQPqqzpPHqAU2cHscvLwnW8XIh9yn+i7IbuOKCnB 7TOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=tfYfa41u/7oLWwEpnWwgU7/IOCr2bq0en0mYgLQ/Gek=; fh=Ihj+noE0ngrP5ERgpJLNpgkJHbXCRrws3ThCzn0GRXU=; b=tt2WES9K9rN8kIUh90aXxTDKVXJ1BU4xnNAJsi1UsyLBx95M5RYz+y330xA/hA8Mz8 FIrw+laMaRLaN4sF4uEZCk07nYGOo6vfnxcJ74vaDiaZ2CxsGLnVCk5zWPbj/vSxBpm3 WVweh0ATFsZV9NRnndWLMm7AkUIka4AC13uJTBdCpOBH70Cvg5lIKDlh2A46EIUTlEhO SJwlYFxPM47fContrTtr2pAvorEBJSqVsK47M1iKZCM+SpZA77tWAITRUgh81mZK96VH g6q+XNWOWrMiHMpyWVVMmsvdUrHAkeFC18RV3tJdin+9514sqpLKoBfrNVqehsGJRNLE P7Vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26969-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26969-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id jd7-20020a170903260700b001d5e99d8f75si362518plb.316.2024.01.15.20.54.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 20:54:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26969-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26969-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26969-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A39C128436B for ; Tue, 16 Jan 2024 04:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BCC5812E6D; Tue, 16 Jan 2024 04:52:29 +0000 (UTC) Received: from esa1.hc1455-7.c3s2.iphmx.com (esa1.hc1455-7.c3s2.iphmx.com [207.54.90.47]) (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 A524612B88; Tue, 16 Jan 2024 04:52:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fujitsu.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fujitsu.com X-IronPort-AV: E=McAfee;i="6600,9927,10954"; a="146090984" X-IronPort-AV: E=Sophos;i="6.04,198,1695654000"; d="scan'208";a="146090984" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa1.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2024 13:52:18 +0900 Received: from oym-m1.gw.nic.fujitsu.com (oym-nat-oym-m1.gw.nic.fujitsu.com [192.168.87.58]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 8A64ED7AE3; Tue, 16 Jan 2024 13:52:15 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by oym-m1.gw.nic.fujitsu.com (Postfix) with ESMTP id B1440D8AD9; Tue, 16 Jan 2024 13:52:14 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab4.gw.nic.fujitsu.com (Postfix) with ESMTP id 3DF706B4C5; Tue, 16 Jan 2024 13:52:14 +0900 (JST) Received: from localhost.localdomain (unknown [10.167.226.45]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 705411A015F; Tue, 16 Jan 2024 12:52:13 +0800 (CST) From: Li Zhijian To: linux-kernel@vger.kernel.org Cc: Li Zhijian , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , linux-perf-users@vger.kernel.org Subject: [PATCH 04/42] arch/x86/events/core: Convert snprintf to sysfs_emit Date: Tue, 16 Jan 2024 12:51:13 +0800 Message-Id: <20240116045151.3940401-2-lizhijian@fujitsu.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240116045151.3940401-1-lizhijian@fujitsu.com> References: <20240116041129.3937800-1-lizhijian@fujitsu.com> <20240116045151.3940401-1-lizhijian@fujitsu.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-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28122.005 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28122.005 X-TMASE-Result: 10--11.121000-10.000000 X-TMASE-MatchedRID: 1RpOuHOu+mY4ibokZ3+Q0CoiRKlBVkYIBXngI6jFvpfvd49YGReckE1N J2MN+nPkgxCMf8A0YpR5sRK06wHV4ZsFQA+TKYc0rMZ+BqQt2No4ptE5KnVLXsC5DTEMxpeQfiq 1gj2xET8vYRhsicUjm84WYLmQfXYmIZX/EQ6MTcXfSQNpZkETVH0tCKdnhB589yM15V5aWpj6C0 ePs7A07R/88i/oAaosuYcdmoyrJzz1P5VqHmsbEk6KdBdqOri6dN4gcED4I9I= X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 Per filesystems/sysfs.rst, show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. coccinelle complains that there are still a couple of functions that use snprintf(). Convert them to sysfs_emit(). > ./arch/x86/events/core.c:1895:11-19: WARNING: please use sysfs_emit > ./arch/x86/events/core.c:2542:8-16: WARNING: please use sysfs_emit > ./arch/x86/events/core.c:2600:8-16: WARNING: please use sysfs_emit No functional change intended CC: Peter Zijlstra CC: Ingo Molnar CC: Arnaldo Carvalho de Melo CC: Mark Rutland CC: Alexander Shishkin CC: Jiri Olsa CC: Namhyung Kim CC: Ian Rogers CC: Adrian Hunter CC: Thomas Gleixner CC: Borislav Petkov CC: Dave Hansen CC: x86@kernel.org CC: "H. Peter Anvin" CC: linux-perf-users@vger.kernel.org Signed-off-by: Li Zhijian --- arch/x86/events/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 40ad1425ffa2..52e5707be03b 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -1892,7 +1892,7 @@ ssize_t events_hybrid_sysfs_show(struct device *dev, if (x86_pmu.hybrid_pmu[i].pmu_type & pmu->pmu_type) { next_str = strchr(str, ';'); if (next_str) - return snprintf(page, next_str - str + 1, "%s", str); + return sysfs_emit(page, "%s", str); else return sprintf(page, "%s", str); } @@ -2539,7 +2539,7 @@ static ssize_t get_attr_rdpmc(struct device *cdev, struct device_attribute *attr, char *buf) { - return snprintf(buf, 40, "%d\n", x86_pmu.attr_rdpmc); + return sysfs_emit(buf, "%d\n", x86_pmu.attr_rdpmc); } static ssize_t set_attr_rdpmc(struct device *cdev, @@ -2597,7 +2597,7 @@ static ssize_t max_precise_show(struct device *cdev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", x86_pmu_max_precise()); + return sysfs_emit(buf, "%d\n", x86_pmu_max_precise()); } static DEVICE_ATTR_RO(max_precise); -- 2.29.2