Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp242195rdb; Mon, 15 Jan 2024 20:54:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUvO3syp63pbKx096dW2inT9DvJxBdhTIsbfORFHtQcSfFcmvpCwR43W8QF1m9sX1uBIle X-Received: by 2002:a05:622a:1443:b0:429:b97c:1c33 with SMTP id v3-20020a05622a144300b00429b97c1c33mr10968208qtx.84.1705380864490; Mon, 15 Jan 2024 20:54:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705380864; cv=none; d=google.com; s=arc-20160816; b=NRtsnHaatzq3S8UEYgC1Ub+GIfUKwbfneUg3WqrvZbSL6C2lzfWJVGAKtL+zxXX2Kg DFTWZ620VR1zKUO4nMld/F/k1kFZPCTRzRYdDco3NAu1EBKuEeKZpiBV52hsicCSKcgd E2qZkjMdNlcDsCLcm8wLVRrzmMWmCV1VPr1npqMmhiAxkCrLmybTxHmLoT2YFiIOEms+ Iddx65rHFhBsxFHHwIXsPyAWlIVVK2O+HSnXqYm56y3obGmsiiFW0yy2qFS/pZDIse0I AtJC3qYH/8cKhMC58djFiod0J1aKKgz1tblZdKcHX5pyOPPRfvsA2bHKEsW2qRRobwf/ IGkg== 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=5RQwycPkIQxzUyD/zrdr2R5wp8pO6WjJsjgrtzoMt8Y=; fh=Ihj+noE0ngrP5ERgpJLNpgkJHbXCRrws3ThCzn0GRXU=; b=uwzP+LefBjThD8q/i5iPOfLFkHPSl9V6stxRbnPogiyxx9Y4cN+TgzLfJpPZ0stgE2 Xu1LWQgdzprPa25ZK2GjvHVbcFvFRFNateMf0E/MnYKGbTzrHcDVWHOkwnoxlVcbJ42Z Texjd2wE57pnEw7lrxgrmY0H13/Xy+FGp3RDd9bBhTI0dehoYG1JxR1gJAbVY4Ph+4M7 hqvV2ontson118/WttZK/zdXcTF/WLzlczDSzzn/VktlFU04MP4MTeLbh4QfnhNYIiBw j6EYHchY1vIXnMwrBEqkPiOS3ZmdcLfNtBViD0pBHT89G3iqkOWh5PsBYbbZPYKHhXLU eh8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26968-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=fujitsu.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id s16-20020ac85cd0000000b0042a075e4da6si134494qta.313.2024.01.15.20.54.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 20:54:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26968-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26968-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 42E141C22BA9 for ; Tue, 16 Jan 2024 04:54:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 760711118F; Tue, 16 Jan 2024 04:52:29 +0000 (UTC) Received: from esa2.hc1455-7.c3s2.iphmx.com (esa2.hc1455-7.c3s2.iphmx.com [207.54.90.48]) (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 A561C12B89; 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="146236932" X-IronPort-AV: E=Sophos;i="6.04,198,1695654000"; d="scan'208";a="146236932" Received: from unknown (HELO oym-r4.gw.nic.fujitsu.com) ([210.162.30.92]) by esa2.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2024 13:52:19 +0900 Received: from oym-m2.gw.nic.fujitsu.com (oym-nat-oym-m2.gw.nic.fujitsu.com [192.168.87.59]) by oym-r4.gw.nic.fujitsu.com (Postfix) with ESMTP id 5B30FD9D90; Tue, 16 Jan 2024 13:52:16 +0900 (JST) Received: from kws-ab4.gw.nic.fujitsu.com (kws-ab4.gw.nic.fujitsu.com [192.51.206.22]) by oym-m2.gw.nic.fujitsu.com (Postfix) with ESMTP id 83F56BF3FF; Tue, 16 Jan 2024 13:52:15 +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 ECAFD6B4CA; 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 230561A0160; Tue, 16 Jan 2024 12:52:14 +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 05/42] arch/x86/events/intel: Convert snprintf to sysfs_emit Date: Tue, 16 Jan 2024 12:51:14 +0800 Message-Id: <20240116045151.3940401-3-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--9.097500-10.000000 X-TMASE-MatchedRID: e6WPXQD7Ri84ibokZ3+Q0CoiRKlBVkYIBXngI6jFvpfvd49YGReckE1N J2MN+nPkgxCMf8A0YpR5sRK06wHV4ZsFQA+TKYc0rMZ+BqQt2No4ptE5KnVLXjoUdFbHYUawvwU evDt+uW5/XjpbSJS7a0NziVKCujClC2Anznh4fA6HmRpBdG9H1zexY0PszFIeR6RHdVK85hU3U1 4kSxupDgOvPn6zMZtLZd7aQCHVPPQfE8yM4pjsDwtuKBGekqUpI/NGWt0UYPD+g9ZptlFQ2FT75 KevbdCMo4C9/4njWLA1aAM/OPY/K4uX/sx5DfTn 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/intel/core.c:5496:8-16: WARNING: please use sysfs_emit > ./arch/x86/events/intel/core.c:5530:8-16: WARNING: please use sysfs_emit > ./arch/x86/events/intel/core.c:5546:8-16: WARNING: please use sysfs_emit > ./arch/x86/events/intel/pt.c:99: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/intel/core.c | 6 +++--- arch/x86/events/intel/pt.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 0f2786d4e405..aa5fa64a923b 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -5493,7 +5493,7 @@ static ssize_t show_sysctl_tfa(struct device *cdev, struct device_attribute *attr, char *buf) { - return snprintf(buf, 40, "%d\n", allow_tsx_force_abort); + return sysfs_emit(buf, "%d\n", allow_tsx_force_abort); } static ssize_t set_sysctl_tfa(struct device *cdev, @@ -5527,7 +5527,7 @@ static ssize_t branches_show(struct device *cdev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", x86_pmu.lbr_nr); + return sysfs_emit(buf, "%d\n", x86_pmu.lbr_nr); } static DEVICE_ATTR_RO(branches); @@ -5543,7 +5543,7 @@ static ssize_t pmu_name_show(struct device *cdev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%s\n", pmu_name_str); + return sysfs_emit(buf, "%s\n", pmu_name_str); } static DEVICE_ATTR_RO(pmu_name); diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index 8e2a12235e62..30bba5f3a840 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -96,7 +96,7 @@ static ssize_t pt_cap_show(struct device *cdev, container_of(attr, struct dev_ext_attribute, attr); enum pt_capabilities cap = (long)ea->var; - return snprintf(buf, PAGE_SIZE, "%x\n", intel_pt_validate_hw_cap(cap)); + return sysfs_emit(buf, "%x\n", intel_pt_validate_hw_cap(cap)); } static struct attribute_group pt_cap_group __ro_after_init = { -- 2.29.2