From patchwork Sat Aug 5 17:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp622651vqr; Sat, 5 Aug 2023 13:27:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHF9sBJImCRteNkqe8X6Wh4urdAHWOBmh4v8ekSC1fkxFgoK5i0dIQ4gRZjh7ZhS3fXtTxH X-Received: by 2002:a17:903:210b:b0:1bb:1523:b2d7 with SMTP id o11-20020a170903210b00b001bb1523b2d7mr4458906ple.14.1691267272003; Sat, 05 Aug 2023 13:27:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691267271; cv=none; d=google.com; s=arc-20160816; b=JBbLYWq5zUrh33EvJJqEcMJiUurFSEMuJbLTU4Tw70pdD7ha8oEwE6BNDKqfyWDnYF j/gOmSCBWw/Tx5g2oiYGaXwZjLtN3n6pEMutoCoPa9zF6RbPAduJ0nUB0BsrnIfWRDjO PQgGmVe3TFBkRpngH3J7UE0BDvzBarWkxu9+sXGtVqrix3Q0FQ97bOKsrd9EBLgFMBWi Ugbu5S3PE6Wd3Trp3/l/PVeH+bnsIm4gL9NYPiEJFCMATVHXiJQjfxNyIQZSYpm00u+/ nPw4NV5U+ciTbTwOWkK+d9Iw+QmYxdFB0dFb/r6293U+8PVV57eULKXJdxxrekdDVuIz +rcA== 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=Nl4rJPbf9lJRqy1FTNc3L1ii3wsmDMe6b6YFfzVSNO8=; fh=RoWWTRK1ZrXNP/VtEBcCDaK18unRqwp2i1mhxrenPO0=; b=IxozfdVfSgvP9a3HFWs7kiqNdgdboVQUFEvedlox1iRBZ0y6L2kLFl4E6m5ToX9viu B2p/Bkqa+KV7mIvqIBRWQDv9cGVmjZx5t3LxQpu1MjXomRzNKYg067emSvPrUWmpsv6P Sa+MUSQXf5oDmiGe/IK3bzDt8Jo3HqVfrDl+RH9HSdnAuiXzPvTF447A13XJWZVsPfcR iVmEubzIRPEWosvHZzsbgGykOsSq6pp2hhfygcJrAj8dmi9lDVD505t8Zvaqq3C8od6S 2rCP+YuXqeusey+nKlGagmIJmiKS8dX9nLjMKthotDiZYZpZ1/f2E8e4jCcHkKWp/YB8 OpTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="g/CpRM8x"; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pm9-20020a17090b3c4900b00268b0001dcdsi239591pjb.1.2023.08.05.13.27.39; Sat, 05 Aug 2023 13:27:51 -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=@intel.com header.s=Intel header.b="g/CpRM8x"; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229653AbjHERtf (ORCPT + 99 others); Sat, 5 Aug 2023 13:49:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjHERtd (ORCPT ); Sat, 5 Aug 2023 13:49:33 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00F91113 for ; Sat, 5 Aug 2023 10:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691257772; x=1722793772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TaWK1Xu3PSHBh+Y6Cr3TB9YkGt2K3wWn+qk8w07ZH0o=; b=g/CpRM8xlQOPLXmAGYKhV8OPTNIvdJobFPwILj/+rklUMyglYZgNPqUu snPru4u7ezWyTUsREw52VHkK4uoV7RgfCEoLRD47WIlGDeXRQyePYt0zq EU2rCTEotJDFnVYb/hgd45vM18czwYOWHeDueRWATtCKuVeGCHgbz9vrV c6KzAavNlX1ILE3lJq374ePu58n+5uiH7ae7N3Ch1+Y0eDXBbngj1HCGv c/IIbI9rB/xPvFH/vpLRt/aFR2FcdhwpRjYMtkXXUWHDmxKr/XTeNY4Rb TumKo2I+r9OCAXzGSMjp6xQJmLl6bZunI3pwfXoiQvpdUTC6xfK0839qS Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="401292528" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="401292528" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2023 10:49:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="820494257" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="820494257" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2023 10:49:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 905ABF7; Sat, 5 Aug 2023 20:50:29 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Petr Mladek , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v2 1/3] lib/vsprintf: Sort headers alphabetically Date: Sat, 5 Aug 2023 20:50:25 +0300 Message-Id: <20230805175027.50029-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> References: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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: 1773422271203759756 X-GMAIL-MSGID: 1773422271203759756 Sorting headers alphabetically helps locating duplicates, and make it easier to figure out where to insert new headers. Signed-off-by: Andy Shevchenko --- lib/test_printf.c | 17 +++++++---------- lib/vsprintf.c | 38 ++++++++++++++++++++------------------ 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/lib/test_printf.c b/lib/test_printf.c index 7677ebccf3c3..2ab09a0dc841 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -5,24 +5,21 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include +#include +#include +#include #include #include +#include #include #include +#include #include #include #include -#include - -#include -#include #include -#include - -#include -#include - -#include +#include #include "../tools/testing/selftests/kselftest_module.h" diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 40f560959b16..b17e0744a7bc 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -17,42 +17,44 @@ * - scnprintf and vscnprintf */ -#include #include #include #include -#include -#include /* for KSYM_SYMBOL_LEN */ -#include -#include +#include +#include #include -#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include +#include /* for KSYM_SYMBOL_LEN */ +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include #include -#include -#include -#include -#include -#include -#include + #ifdef CONFIG_BLOCK #include #endif +#include + #include "../mm/internal.h" /* For the trace_print_flags arrays */ -#include /* for PAGE_SIZE */ #include /* cpu_to_le16 */ +#include /* for PAGE_SIZE */ #include -#include #include "kstrtox.h" /* Disable pointer hashing if requested */ From patchwork Sat Aug 5 17:50:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp576799vqr; Sat, 5 Aug 2023 11:06:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPEXzj8JRXmj5jWoLB39SxqsAbHGHA7U35Vf5B+I8vjv25m2sFPE/HDvnm8pN+kLp/jNHK X-Received: by 2002:a17:906:9bec:b0:99c:3bb:fd96 with SMTP id de44-20020a1709069bec00b0099c03bbfd96mr4701266ejc.52.1691258778108; Sat, 05 Aug 2023 11:06:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691258778; cv=none; d=google.com; s=arc-20160816; b=Egh438qv5ViTQUpMbTG+e7VASOG1A8AOFcZll2WUdgITlKGzl6bGqzak1a7gNdNBAo KzJd8X0iAjTV6iuIao3EyS/4+68MrHVjIAlQqeNpaOsMaeZiHsv7raxf3ky0pfb9MXIG jTR0Potpop9b0WIZZweRj78ieHcOYB+PhrRG/LLo9O4vBtEXNZHJe2c0pcIDPt6VrS4n 9ofd1tvsuApd8QToDDj8wKb4kv3iYvWBuVLsle6AoupSFQPiS28CW329xCLTapOF8vJU K40IN0mBFROWdNAKLDtOciiiim5WMTR7Jbvl1mIPuB52AkIEqww8i1EZfOCDu+oLYh/E KnuQ== 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=APFaLpzRvkmsd23+nAQve4IWVf1KVk54bqCwJXd8ZvA=; fh=RoWWTRK1ZrXNP/VtEBcCDaK18unRqwp2i1mhxrenPO0=; b=ivp+n7nJxXaVuhs+j6Tg6XWCEUVp2J0oFLdgy4LgWAaENKSH9KcSpdDapb7hXwAlmy 4fUFdsnGOnNbzEuVscOt9bvXYRm+c5HINezo1/k38GadIPC2LmPLs9wf86vmEuC7nQhF 7uIUKeIJYQ3hqtETf2GuL6IKi8JWWvgOJN4TSI9Pu8Z9rH31yG9p15Qefwhp5vGlM+Ms 0gUIDikJHcHCVg2QD4EQLjUwTO9PSMnCmfXYV5eUuraiOQ25k9itNThRzM/eIfCRjNCc wXu3iPAi9GrRCM90od79cLRE07COqfQ3U5MxkkL1ewSy3VcICzLMXDeKwH5KiL9s+kM6 lFHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=VktCQzVr; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a1709066dd400b0099bce4aa78dsi3385186ejt.865.2023.08.05.11.05.54; Sat, 05 Aug 2023 11:06:18 -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=@intel.com header.s=Intel header.b=VktCQzVr; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbjHERti (ORCPT + 99 others); Sat, 5 Aug 2023 13:49:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjHERtd (ORCPT ); Sat, 5 Aug 2023 13:49:33 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 942F3DD for ; Sat, 5 Aug 2023 10:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691257772; x=1722793772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WwFlBTMWGP/2Noo8uToUlcYjMLDc5ySAvwUDql7sE7Y=; b=VktCQzVraHQflL90VqPaKT29niMae3bJ3bcYpuhKTEcLy/zfyV0fQWjt u1ltQK6AAYrX2MEg+R9XfQicleOZGR/dKivsbAgYlhxt4Xw5iTUl3uJlR fdUDIdLH/F232gA3cwhT9ocTkgXC9/BLwQmGrIqQAMqtc91WjZ2yR19Hc y0LuqmoP4ejM8M3UQLkHS+oUu4JCNvGaQK9PUs16dxLCjn7fFkZ1rAejG IFuzDSfVL660xj40lxaPhTmfkkW5X6w6CgZmoCMPA1wjXz7FyUGAgBdB3 gTTloxX0eowU/LELPXD4TtuW876rOpU99YAC1bZFF5kka9LWG7dYLsPHl w==; X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="350638993" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="350638993" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2023 10:49:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="733622471" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="733622471" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 05 Aug 2023 10:49:28 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 9F9D5BAB; Sat, 5 Aug 2023 20:50:29 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Petr Mladek , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v2 2/3] lib/vsprintf: Split out sprintf() and friends Date: Sat, 5 Aug 2023 20:50:26 +0300 Message-Id: <20230805175027.50029-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> References: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,URIBL_BLOCKED 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: 1773413364264708157 X-GMAIL-MSGID: 1773413364264708157 kernel.h is being used as a dump for all kinds of stuff for a long time. sprintf() and friends are used in many drivers without need of the full kernel.h dependency train with it. Here is the attempt on cleaning it up by splitting out sprintf() and friends. Signed-off-by: Andy Shevchenko --- include/linux/kernel.h | 30 +----------------------------- include/linux/sprintf.h | 25 +++++++++++++++++++++++++ lib/test_printf.c | 1 + lib/vsprintf.c | 1 + 4 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 include/linux/sprintf.h diff --git a/include/linux/kernel.h b/include/linux/kernel.h index b9e76f717a7e..cee8fe87e9f4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -203,35 +204,6 @@ static inline void might_fault(void) { } void do_exit(long error_code) __noreturn; -extern int num_to_str(char *buf, int size, - unsigned long long num, unsigned int width); - -/* lib/printf utilities */ - -extern __printf(2, 3) int sprintf(char *buf, const char * fmt, ...); -extern __printf(2, 0) int vsprintf(char *buf, const char *, va_list); -extern __printf(3, 4) -int snprintf(char *buf, size_t size, const char *fmt, ...); -extern __printf(3, 0) -int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); -extern __printf(3, 4) -int scnprintf(char *buf, size_t size, const char *fmt, ...); -extern __printf(3, 0) -int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); -extern __printf(2, 3) __malloc -char *kasprintf(gfp_t gfp, const char *fmt, ...); -extern __printf(2, 0) __malloc -char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); -extern __printf(2, 0) -const char *kvasprintf_const(gfp_t gfp, const char *fmt, va_list args); - -extern __scanf(2, 3) -int sscanf(const char *, const char *, ...); -extern __scanf(2, 0) -int vsscanf(const char *, const char *, va_list); - -extern int no_hash_pointers_enable(char *str); - extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(const char *ptr, char **retptr); diff --git a/include/linux/sprintf.h b/include/linux/sprintf.h new file mode 100644 index 000000000000..9ca23bcf9f42 --- /dev/null +++ b/include/linux/sprintf.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_KERNEL_SPRINTF_H_ +#define _LINUX_KERNEL_SPRINTF_H_ + +#include +#include + +int num_to_str(char *buf, int size, unsigned long long num, unsigned int width); + +__printf(2, 3) int sprintf(char *buf, const char * fmt, ...); +__printf(2, 0) int vsprintf(char *buf, const char *, va_list); +__printf(3, 4) int snprintf(char *buf, size_t size, const char *fmt, ...); +__printf(3, 0) int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); +__printf(3, 4) int scnprintf(char *buf, size_t size, const char *fmt, ...); +__printf(3, 0) int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); +__printf(2, 3) __malloc char *kasprintf(gfp_t gfp, const char *fmt, ...); +__printf(2, 0) __malloc char *kvasprintf(gfp_t gfp, const char *fmt, va_list args); +__printf(2, 0) const char *kvasprintf_const(gfp_t gfp, const char *fmt, va_list args); + +__scanf(2, 3) int sscanf(const char *, const char *, ...); +__scanf(2, 0) int vsscanf(const char *, const char *, va_list); + +int no_hash_pointers_enable(char *str); + +#endif /* _LINUX_KERNEL_SPRINTF_H */ diff --git a/lib/test_printf.c b/lib/test_printf.c index 2ab09a0dc841..5adca19d34e2 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "../tools/testing/selftests/kselftest_module.h" diff --git a/lib/vsprintf.c b/lib/vsprintf.c index b17e0744a7bc..c89719586d0c 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include From patchwork Sat Aug 5 17:50:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp590802vqr; Sat, 5 Aug 2023 11:46:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3MPDOIBkEG0u1lUg7cvLtoJv271Ho2yols3eM5+OlurD/y83CY4psYMHdx78Q7fZ1KawR X-Received: by 2002:a05:6a21:3e01:b0:132:9d0:1492 with SMTP id bk1-20020a056a213e0100b0013209d01492mr3782268pzc.35.1691261160624; Sat, 05 Aug 2023 11:46:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691261160; cv=none; d=google.com; s=arc-20160816; b=Xu92kzGClkTvAZ2PO26hXB28bFZtAShloOBux4coGpPFNfBrct0OixBfkFO/53vEua 8WGTGbcFznpFePuNOQoxrRPB77p2YWCm4jp9j8bkl6XeG3NeyoYCMreFbE4loFqfDnGd zvrZPu9EMlQYvPujtGNNnQf6b35MW/zdXuQ4Gpudc6DetzI7ilVHTVz5DIM0J+BOnYsd eeGo7NqH10poMSJZ7sndTY7AW7jSxvYzImMjweoSFBEthJLNicFRUgnXTkEvEldxoiKb VKpHXMdIFRWJYa/xPyo9WFXfH9C79x8/eqTsClAK+aXaVrbqBjPMJ+d9u4rqJmm63JAl 1fQA== 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=YiDRN4KLkDxtCAumuHw+kaAhuG4xOP0mLOcBIaK9ECQ=; fh=RoWWTRK1ZrXNP/VtEBcCDaK18unRqwp2i1mhxrenPO0=; b=v0Qwngd2YxDGuS/KIebrd/lWyieWE9ycf+cflIPYH7BrlsRFad2/AtOImiwptGSQfw raRt3dFiZnN9RmF2SeuQiYLE+fQ56Sz3H91fgYWIDLSEdcwc/b1HfoJZclpRYaLoLguu uAZ/dqLO8EkerIg7nim8KT0IiovFiVCXA8ZNCAtjefaCrmFrJvs4Phs1FFOIj+UD6eZf 6UU/fTkpTVNA6N9wQdABD9o3jUh1a4Cnz0KLGwSGs/tjUsRXRB8p2EoTlxqPSFeH8MO0 bCCqboGnmP6mHlblgEzK8iyDNiAQ6Q3MliEOpH7eakBDZvrs+hVwC6kFm3kZG3tHOoDz 5dFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PxSrXk2j; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020a63fc08000000b00563da4d2a70si3214883pgi.364.2023.08.05.11.45.47; Sat, 05 Aug 2023 11:46:00 -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=@intel.com header.s=Intel header.b=PxSrXk2j; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbjHERtk (ORCPT + 99 others); Sat, 5 Aug 2023 13:49:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbjHERte (ORCPT ); Sat, 5 Aug 2023 13:49:34 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C675E115 for ; Sat, 5 Aug 2023 10:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691257773; x=1722793773; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9t4+UHB5bV6ky/Acf0xEikn59MqZgagOLuXamRB5Rw0=; b=PxSrXk2jjMjoRUK+6Z/XTpumOW/8SiD/OwZIvQtEVE6n5fCf0UdnL1qh mscqpilvz6bLkwiCspLsijBZEbkAbhQjqrKmRDV1N1cWY/9Plr8eWsN0c pAp2GAzQxa9MthRN+P0ulpqdaeycIXO15FvVvRg8CWdSvUyrjarfYdZH6 gf0QD9O04VNeLtD3XFEtOaJbNNfxqpx9FmIE76TST8TAJWwTKhaZE6vsQ 29e6dTS4/LcbaIoUwCKeN8ul541IvyderNZd6iArFy5Avhe1eKCu7WhSC Isy5HQgQL1ytF+mMy4s66i9kYG9PmiX+JRwbEWUZZ4/WWiPkqoso2UuFp w==; X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="401292537" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="401292537" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2023 10:49:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10793"; a="820494258" X-IronPort-AV: E=Sophos;i="6.01,258,1684825200"; d="scan'208";a="820494258" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 05 Aug 2023 10:49:29 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id AA2F4F12; Sat, 5 Aug 2023 20:50:29 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Petr Mladek , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v2 3/3] lib/vsprintf: Declare no_hash_pointers in sprintf.h Date: Sat, 5 Aug 2023 20:50:27 +0300 Message-Id: <20230805175027.50029-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> References: <20230805175027.50029-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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: 1773415862672135883 X-GMAIL-MSGID: 1773415862672135883 Sparse is not happy to see non-static variable without declaration: lib/vsprintf.c:61:6: warning: symbol 'no_hash_pointers' was not declared. Should it be static? Declare respective variable in the sprintf.h. With this, add a comment to discourage its use if no real need. Signed-off-by: Andy Shevchenko Acked-by: Marco Elver --- include/linux/sprintf.h | 2 ++ lib/test_printf.c | 2 -- mm/kfence/report.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/linux/sprintf.h b/include/linux/sprintf.h index 9ca23bcf9f42..33dcbec71925 100644 --- a/include/linux/sprintf.h +++ b/include/linux/sprintf.h @@ -20,6 +20,8 @@ __printf(2, 0) const char *kvasprintf_const(gfp_t gfp, const char *fmt, va_list __scanf(2, 3) int sscanf(const char *, const char *, ...); __scanf(2, 0) int vsscanf(const char *, const char *, va_list); +/* These are for specific cases, do not use without real need */ +extern bool no_hash_pointers; int no_hash_pointers_enable(char *str); #endif /* _LINUX_KERNEL_SPRINTF_H */ diff --git a/lib/test_printf.c b/lib/test_printf.c index 5adca19d34e2..cf861dc22169 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -39,8 +39,6 @@ KSTM_MODULE_GLOBALS(); static char *test_buffer __initdata; static char *alloced_buffer __initdata; -extern bool no_hash_pointers; - static int __printf(4, 0) __init do_test(int bufsize, const char *expect, int elen, const char *fmt, va_list ap) diff --git a/mm/kfence/report.c b/mm/kfence/report.c index 197430a5be4a..c509aed326ce 100644 --- a/mm/kfence/report.c +++ b/mm/kfence/report.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -26,8 +27,6 @@ #define ARCH_FUNC_PREFIX "" #endif -extern bool no_hash_pointers; - /* Helper function to either print to a seq_file or to console. */ __printf(2, 3) static void seq_con_printf(struct seq_file *seq, const char *fmt, ...)