From patchwork Fri Aug 4 08:26:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp135059vqb; Fri, 4 Aug 2023 02:25:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGBDXe1tO61HZrv8G3T4Ds7QCIk6UtrsKM5xKx75zQTgpDV5pHShH++c/eC8abeNCCwLzJp X-Received: by 2002:a05:6830:1d58:b0:6b7:4efe:a9a4 with SMTP id p24-20020a0568301d5800b006b74efea9a4mr1282077oth.23.1691141155326; Fri, 04 Aug 2023 02:25:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691141155; cv=none; d=google.com; s=arc-20160816; b=skhfAVfUOJCj6mI2Om9X3vXu7zeB/7Sof8rxiGOofTYFShB/+9vuzh7xroJ6x11Mtj j84o4pdpX0pbMZJgUIgUKazFoa058yF97qsOElDVsh89+X2ZRWazFRJYQVOdr2w6CIPY 6KoXmPBpBrf2aw6LJecJP9Z8wDDsabfVT0q4+9mCSuMkICJBb6lXTQMDBwxWruY1bep6 VqO5J3bJZU1HIxiOToMpuc+y2vQHQmLoTbJpcX+3q6oCZXYDtHlGahqXAHOQNoofRRlE nSFsghFI2ByOmeR93WLR2mDC0Xsh7nDasqd/Ps6Hshhrv5IiyYcR1bil9++AqN7KQ15D WjUw== 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=zA/dH5Y7WcTQ2A6+oZfsEez4kkDuyoFFdNy1mTJzEFY=; fh=ubSGe9Pf/KxTId9rGYzy0xYsiY5Gj5OI3uWYUzuWZkk=; b=Ul4yYCMduWDIZoOrcFYExmJWQEZ7XVzM1IuNk0lkaGaGzJdm9OPSauMG6zwNK+Lixs ZgKm00dIjHv3a+lnimXFvVRVWjeJUhCviBK6CK2b8BFGcVkJcgPPfWnPAiaaGcaL4csC 58IL5scd/HwbJ3EhNxcqn29mfYoFNFC+npTNZKqQxO9OmLvqEdQScT0LhCNaiRt81FoB 0WUmdj112S9K1f+fsfYFXKR/rNUTggqRdWwB5CgjZeLDBX+vjbBKS66QitSly+shpY1w 6iVfl3PKFhg5q1yZ3tUubMxBc+9qQW1igghl6u9FOXLmcKEkpugHqH/xn+TFwOrRqFoP A1ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mC848biG; 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 nu6-20020a17090b1b0600b0024e4ace1a41si1719295pjb.183.2023.08.04.02.25.42; Fri, 04 Aug 2023 02:25:55 -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=mC848biG; 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 S233677AbjHDI0t (ORCPT + 99 others); Fri, 4 Aug 2023 04:26:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234559AbjHDI01 (ORCPT ); Fri, 4 Aug 2023 04:26:27 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C07C468C for ; Fri, 4 Aug 2023 01:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691137586; x=1722673586; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uw2Ld+AeDxNhMI9Z37vKGF4a6VjahNfcrZb6asDNsiE=; b=mC848biGolxTU//b5meWB1Si295wqlpxTsgNzpPxOWQuNK8qmhZNl3m1 +NbiUoebLllBnC3c+h7/6X77HYD+Mqyf13croL4qJUS3JSuqDCY27lWWl Lwl0DBuMVJuN456tDHuLpLY1SSGFVkMeztR7s5CcVmRPDpoFtRFg4zySH 9Zx0l+ui1hwbmYdCQ/Gz/kc4Y0X2Rr0ve9ZXdjCw9UcQsK8pXHxTildHJ lEMmIdJqJaX0HuEzVsb8c8wtVk1eBOVuJaFOO0yxZj39uyHm7dA7Py1yu FwPwGvC1VwMV/3LX9ayBbiR3rCmrEt4eUZKu7TMEwDTTFFWVcn+xu4y8H w==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="433952152" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="433952152" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2023 01:26:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="706907756" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="706907756" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 04 Aug 2023 01:26:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 78DB16A6; Fri, 4 Aug 2023 11:26:32 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v1 1/4] lib/vsprintf: Declare no_hash_pointers in a local header Date: Fri, 4 Aug 2023 11:26:16 +0300 Message-Id: <20230804082619.61833-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230804082619.61833-1-andriy.shevchenko@linux.intel.com> References: <20230804082619.61833-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: 1773290027559722439 X-GMAIL-MSGID: 1773290027559722439 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 local header. Signed-off-by: Andy Shevchenko --- lib/test_printf.c | 4 ++-- lib/vsprintf.c | 1 + lib/vsprintf.h | 7 +++++++ mm/kfence/report.c | 3 +-- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 lib/vsprintf.h diff --git a/lib/test_printf.c b/lib/test_printf.c index 7677ebccf3c3..9e04b5f7244a 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -24,6 +24,8 @@ #include +#include "vsprintf.h" + #include "../tools/testing/selftests/kselftest_module.h" #define BUF_SIZE 256 @@ -41,8 +43,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/lib/vsprintf.c b/lib/vsprintf.c index 40f560959b16..6774cf84e623 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -54,6 +54,7 @@ #include #include "kstrtox.h" +#include "vsprintf.h" /* Disable pointer hashing if requested */ bool no_hash_pointers __ro_after_init; diff --git a/lib/vsprintf.h b/lib/vsprintf.h new file mode 100644 index 000000000000..ddffde905824 --- /dev/null +++ b/lib/vsprintf.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LIB_VSPRINTF_H +#define _LIB_VSPRINTF_H + +extern bool no_hash_pointers; + +#endif diff --git a/mm/kfence/report.c b/mm/kfence/report.c index 197430a5be4a..fb28c6abd58e 100644 --- a/mm/kfence/report.c +++ b/mm/kfence/report.c @@ -19,6 +19,7 @@ #include +#include "../../lib/vsprintf.h" #include "kfence.h" /* May be overridden by . */ @@ -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, ...) From patchwork Fri Aug 4 08:26:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131067 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp158089vqb; Fri, 4 Aug 2023 03:16:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHtRR6VchML0wt+yRtYqRvlhVZdG2WL2iBdPPjaw0mTxLS/1dr9BvFi+9QSEssBvVQNRUju X-Received: by 2002:a17:903:188:b0:1bb:3498:9caa with SMTP id z8-20020a170903018800b001bb34989caamr1536230plg.58.1691144178406; Fri, 04 Aug 2023 03:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691144178; cv=none; d=google.com; s=arc-20160816; b=Fzx7CIqJ7MMcdUzAYeGUlJ5VSVuwXT/aXqz65vr6I9IYH3pmIMhVuJJFD2LZO2akjl XT2HPaFgdClCzzy2vTtnHA3xetL37tGTeqpOEZYzJbirLigWPVyiZOwno1vN4NAnwWDP mXVU860ImRb3UDr5idBVZyVGgs1Hy9WIL2JoqXVyVWM5tDpRhU1H0XBXgiX+rNuz5a6+ EcaFGXeMmfp7mucrRQKt4Gpe+tzm2Pmk3Kf/V0XeT9HWCUZAFMqySsBjfmao7iT4Akbe wOgqksL2XAeHmPJ7oMvuhFntnCXdkeBzAgfe2I4rSBg4gEsryZHyFbmyRHUy60zSSciX Ri3A== 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=J1mmLG9dNVbbXWxrtX+A+p/h0rMc/GZ2hwewP+0fv7Y=; fh=ubSGe9Pf/KxTId9rGYzy0xYsiY5Gj5OI3uWYUzuWZkk=; b=hDIABA7vGSeXrQeg+nhMLzlhE0ZnokJ4kJLo8coWadK92CXqCC0SDFciLI7gjFB4vU z4Rgo/l+i9nX0PQHgrhC6/ALjgG8gRz2OPkpho2XE7B1wZntKxPQrXu70NS9osPtpBtu 1/OUZjRrZ8WM8JvhDhTMxkClVvIYc/uxkX9HG0On9f6ZUKyVX4lzXQnLP+cQDtiUSdr8 gRHl8b5wjY9G8aGtKQTEr+OZWIfPCDHrpyJrhynKnWGqK5y2EomcLPhlZ0Jm0Ba0+tUZ YrJWnfkLDnhObSCxRGo5GXsG0yvz5avWc/5pnleTqg1RZGIWG5Wcqh+igkMSJBF3lX8E a2JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mlSVorM3; 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 y15-20020a17090322cf00b001bbd5fa7d66si1585292plg.164.2023.08.04.03.16.04; Fri, 04 Aug 2023 03:16: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=mlSVorM3; 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 S234083AbjHDI0v (ORCPT + 99 others); Fri, 4 Aug 2023 04:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234564AbjHDI02 (ORCPT ); Fri, 4 Aug 2023 04:26:28 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF24A4696 for ; Fri, 4 Aug 2023 01:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691137586; x=1722673586; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9je9OUfnXEviEXKQNXB4gUKmQR3Ey4mpBgwuRjMpZ5o=; b=mlSVorM3xUk2ULomzOf0Uwsstg78ZW3bu6sMBjntjXgz+1fTepacBxxB 6a1P3PaHrbyKC/BW+Cps4hGSJjm+obUMtoxQPH9coDf/HFr6qqsTDxYon /xKr+8F5Nh6Z975giawYu8Q+3+EN2oBlyTQi/QiqTuMOgVaI6+t6DCqC0 UGeEUU4ifKVIAwfV+k0/QcKDV6pYAgN5fDTS/gLtBF3vRqsla0sUiqM8Q 4tmwPhI2eJuxet6FIOO5Neh1kUs8GO7hWtK4a/QTVCF2vytpO36EKZ5TP EjJhH2BHRxvcsK0IcPS/uD+4ITs5FC/E2c2KY3Y3lTW9cpUNeipG6SSem Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="370090221" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="370090221" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2023 01:26:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="733132238" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="733132238" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 04 Aug 2023 01:26:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 868F8F4D; Fri, 4 Aug 2023 11:26:32 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v1 2/4] lib/vsprintf: Sort headers alphabetically Date: Fri, 4 Aug 2023 11:26:17 +0300 Message-Id: <20230804082619.61833-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230804082619.61833-1-andriy.shevchenko@linux.intel.com> References: <20230804082619.61833-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: 1773293198137162323 X-GMAIL-MSGID: 1773293198137162323 Sorting headers alphabetically helps locating duplicates, and make it easier to figure out where to insert new headers. Signed-off-by: Andy Shevchenko --- lib/vsprintf.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 6774cf84e623..63afffab4249 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" #include "vsprintf.h" From patchwork Fri Aug 4 08:26:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131060 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp151888vqb; Fri, 4 Aug 2023 03:04:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzL+zJxaic6V71pR8lHXofT3HLgyGEq9ndKtV6NLjyImEod8CCqHkeES9PFjaaPXoF9t90 X-Received: by 2002:a05:6512:3685:b0:4f8:5886:186d with SMTP id d5-20020a056512368500b004f85886186dmr862313lfs.9.1691143453110; Fri, 04 Aug 2023 03:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691143453; cv=none; d=google.com; s=arc-20160816; b=lzkLvikEWU6rWZOpBfb+VYP0ctRtzjEU7cvwJ3OyI0KezzZNmnmFNYUCqDV3L/OaJM NzWappt1TLEmixDUgWwQ6sWd8lY4WG/nv8AoeiCaqUF/so/LU54g84QxudXhL9TIU3Np 5VYi5rJlgUahbY4rdV0jehGgcRr46Q85+MczcBG5lXkNomPBHegKua+0+q/EoztTjihg HgVy/P8nUJ7jKApASoAlVY5sgcZvooGxE0B89D4P5qmgFvd7YchRgBjY+A9oD2AUBjgr QDJ50hCPArvNi50SNUO3boodU/ADxPO/pDCy62VRc6PSKvua+uuvjbXv4rCLra1pg+Bp Anew== 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=LiQZHN/gFI7kOzFyx0EOhyFHwRC/sfDcBQ2mnTPX6fM=; fh=ubSGe9Pf/KxTId9rGYzy0xYsiY5Gj5OI3uWYUzuWZkk=; b=mi+3F4KoQs/aCIGyTmJjbA62MLci+r0FJMJ6UyzixEz2Jp6SiTtQR1/B4CZGJSJV5w m03BcptEseCo0xudpn8qb/wMgJQFtM9yA3hIaBgq9H0QmxxfYsotiuEv2RsNGBiGNvUd WDBYKXVNKZHCQhFHF9lUMg9B7oxiJKzgBE8HaXfERhqGu8ilLorDCxlXPXLvjDS/rLpg YGRLJg3bgzI1XiF9ZoBkUh2+dSk+N1mT4HJK0qaYjUslEH8e7VvqAO087CaQ7/xfeeX9 byDU+IEnSOFlB6QcV5HQSRYBjvvESqlgDTq4f9vXN8lyHLmIj1YkW1pV5YezeREEbIpg U5Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LK86CKOJ; 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 mj11-20020a170906af8b00b0099ca6e1b1f1si449929ejb.1055.2023.08.04.03.03.34; Fri, 04 Aug 2023 03:04:13 -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=LK86CKOJ; 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 S234678AbjHDI0z (ORCPT + 99 others); Fri, 4 Aug 2023 04:26:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234565AbjHDI02 (ORCPT ); Fri, 4 Aug 2023 04:26:28 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E38A4698 for ; Fri, 4 Aug 2023 01:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691137587; x=1722673587; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GrsynOg2xgorKiT0iE4UnCXSWHQ9xboHF2x1Jg9/Yuk=; b=LK86CKOJjzgIs5ylME9YVbqixUVTCj0xjeCMI2JA8KO7IbMutQW9YNiC QeHxkHvpxAGwxweQCVtdIdGMmZQoEOFrkImhi5DY12Wx0NXK4l/U4mfu7 XJhirmGYD1mmRfEbRHp3jOMqpu3IOHpCPc/XYeIiPDAKmGnFaKqRxlCZf JWe+OjPeX2gE8x2KNT0c616SCEzemPAIV3+U0W9zUAJsUeZm1di9S8fyf h+21KmupxrB9B1TAs76ijYlHTKySjNqSxPIDtQz4bK0ARA9cyPtKn/95I yr1Tf8J7MEBIsmIFIdxbeCF8peZQfOerS7ZJBS4FBNxfaGTCc4ua82xmS A==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="433952161" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="433952161" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2023 01:26:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="706907757" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="706907757" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 04 Aug 2023 01:26:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8F3DF1341; Fri, 4 Aug 2023 11:26:32 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v1 3/4] lib/vsprintf: Remove implied inclusions Date: Fri, 4 Aug 2023 11:26:18 +0300 Message-Id: <20230804082619.61833-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230804082619.61833-1-andriy.shevchenko@linux.intel.com> References: <20230804082619.61833-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: 1773292437421554882 X-GMAIL-MSGID: 1773292437421554882 Remove inclusions that are implied and guaranteed to be provided by others: compiler.h by types.h string.hi by string_helpers.h Signed-off-by: Andy Shevchenko --- lib/vsprintf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 63afffab4249..eb0934d02722 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -36,7 +35,6 @@ #include #include #include -#include #include #include #include From patchwork Fri Aug 4 08:26:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 131022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:44a:b0:3f2:4152:657d with SMTP id ez10csp118971vqb; Fri, 4 Aug 2023 01:49:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvqogXW8bj8qYgVy8jt2fcZRnjs/3N7a5T5phGkOts4gXVZBwY7KHtjJOvOa/xQPScQsj/ X-Received: by 2002:a05:6a20:3950:b0:133:712e:f700 with SMTP id r16-20020a056a20395000b00133712ef700mr917719pzg.51.1691138942241; Fri, 04 Aug 2023 01:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691138942; cv=none; d=google.com; s=arc-20160816; b=hjaO27QmAdYFjCby2TM/3AXQad9MNugTnpxoLPIBrXSW6KIFv68+/3pkpt9QvmC5JJ uyya71gnakLgVG0pOoQ0SPaUZdgf+Vdh5DohRQ7iKFm12RPWmdIkapPXj3oHBV4NM/cP apPWyvam9B5oFc3nymBiexoVqGaEFxFvQBeav30tE1BLHwnhAsqVAME5zDfZtdWAB0cA eN34zx8upxKzJhJfaowRIJaj8VOX1ppAzc2AL230X/C3iISHjaZIRdB/lZ5XzdXdAnah mNnigevKMifzsUT+eZc/rGT+Q/jKBDTrPkZWaUi5ciAMRzb43GxO+LvbWINMQyrjy3dT nGQQ== 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=xN1TF/cqSYy8egconCIVN+MATNViZmMKhKgDRHlEMBE=; fh=ubSGe9Pf/KxTId9rGYzy0xYsiY5Gj5OI3uWYUzuWZkk=; b=1JGuRt1HiRVf5SACYkyYlbidGd9h7tw74GD93sqtUsp/jPSZ+zobPeTYG65MvKJbqU a3Np177I0Y/qeI+PdmwVUmFcFxmpNohxP3SSccjwgk/WEdO466pbqfh9Oy/lDKS8lmBq OFY/L0XWhRnbwCBvCWJix3BR5+RXwgR4RnfIBobGoXEWzkMnI1FPGAYO3mdj8nHUbw7t 3c/N6BoRNZavoxRJFH1/5QvkCLLX2FtUTF6PmtVGmy6nzd3w6pSCa7+elDrxIiVAwJoL yFC10v87dU3s6zVkZi8ZTStoxOFOWnknRYCS8ZhVlBfiUVVXsTn58ww5U5LavV2MtFbB rt3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ResE7mYA; 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 c10-20020a170903234a00b001b89b63b877si1495550plh.446.2023.08.04.01.48.48; Fri, 04 Aug 2023 01:49:02 -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=ResE7mYA; 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 S234585AbjHDI0m (ORCPT + 99 others); Fri, 4 Aug 2023 04:26:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234558AbjHDI00 (ORCPT ); Fri, 4 Aug 2023 04:26:26 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8695730E0 for ; Fri, 4 Aug 2023 01:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691137585; x=1722673585; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oOKhR2UGvbPRHxNgYwLaRfSIwQ0Gyd6LYZcMKMFhKWQ=; b=ResE7mYAXbqhbH0c3BBb9SaOuQIeXhH9h3nAgnc/kpTMlgkIgOJ1OeBe N6x3p6yscqtG+Tm6K6DLlkH0/Wnfn3puSUJld+6p/NBECV+tzOte3A1CU /TGBbeVNELxROIDrQK8eRX9qczFA4D0ozhX1D8lvgLDY4sueuw+SDi4uu WE2F1K5An4IQGoFOrx2hd0bgMv07UA0ZDj7/M2inj9hQLGJaHV6Jq3YP1 QaTv1CqK9SAcieZBvOSRzX/93lfJPsPZPkkRMQdqKdoQbLhy3gkN9BaGu IeKWf3762c0juWNkivmehS30w/k4HKPO26C+m+oC4D60M6fz4JlMkJ1pu A==; X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="370090212" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="370090212" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2023 01:26:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10791"; a="733132237" X-IronPort-AV: E=Sophos;i="6.01,254,1684825200"; d="scan'208";a="733132237" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 04 Aug 2023 01:26:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 99899F12; Fri, 4 Aug 2023 11:26:32 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Marco Elver , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Cc: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Alexander Potapenko , Dmitry Vyukov , Andrew Morton Subject: [PATCH v1 4/4] lib/vsprintf: Split out sprintf() and friends Date: Fri, 4 Aug 2023 11:26:19 +0300 Message-Id: <20230804082619.61833-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230804082619.61833-1-andriy.shevchenko@linux.intel.com> References: <20230804082619.61833-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: 1773287707599256653 X-GMAIL-MSGID: 1773287707599256653 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 | 24 ++++++++++++++++++++++++ lib/vsprintf.c | 1 + 3 files changed, 26 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..00d1fdc70a3e --- /dev/null +++ b/include/linux/sprintf.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_KERNEL_SPRINTF_H_ +#define _LINUX_KERNEL_SPRINTF_H_ + +#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/vsprintf.c b/lib/vsprintf.c index eb0934d02722..e553bc9e18f3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include