From patchwork Tue Dec 19 18:47:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanzir Hasan X-Patchwork-Id: 13498873 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8369E381A4 for ; Tue, 19 Dec 2023 18:48:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tanzirh.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="k0ibUbA+" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbd7389572dso583885276.1 for ; Tue, 19 Dec 2023 10:48:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1703011685; x=1703616485; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xbybSsV/bS+3WyIy5bQjflj1d8kB/aeheYO00KzfCc4=; b=k0ibUbA+WFfOqLoeNglvZ9mkuddQovKw1lLFXQffRxzqLwRspUl3PHYGWHcF2l9Bi9 EkQKR9sBFzc9SCk2GRaVWQhBy+3mZNEHkZT/eJ8/kqr8E/4806M6j+yMHUK9Zgxw2jhD YkplWMIrE/L+9cYPnNFV+vieEXdTz5kCrQK8893pi1yt40/7KlFHOQ0gqMcOQuP++6SM F0cafn7BvXr7JkcwekeHsYkeAY16TfIcaxVM+9JrrLtO8DQ2k5r9UO0rWFUNBRDBfasF qFzu2MX0ekz+YDXQ32/sd2j7EZjVePOclgyJzOql19Z1zE/6JLXqnYBgUxT0s+BKER1E T36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703011685; x=1703616485; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xbybSsV/bS+3WyIy5bQjflj1d8kB/aeheYO00KzfCc4=; b=ddRBQl+784QjGFFFNAeocTr0aaw4BtCWFP6PHsH3sSxd15QVCFjDdPE8267ciF6lBs lTxuEsdZ+k13pJkrzgdtsu7etmb54weVKxSPjnTkjFjrqfKb+yXUsuTNgDM78va/CCuU dMCrbxNZgPIj3wYZhzLKjnJy2UOzoqBT72wY2idRseKejsw8nzvc9UNUpS2mQABV1iHw JAjYsgd4VV5GK+2hFGpRuhnrQw7US1dsQfox1zCvaF60OuEZkZpJt5Qve+sr/fqnCiw/ DyO0EqkRFKQ5yJz5FIkbDyzq6OJ/mz23aRsJ5pnlvwovSqmzoexuQq9KLbsJ+HaYud5U J5cg== X-Gm-Message-State: AOJu0YyZBKplaFKZai+cI9WdWkXfceWXfgMv3Rza9y45Y2/agsaZCLsg Vv4E9Mv6gOYOHgmx0u4M6DDZihqAmb+0FCBDXmE= X-Google-Smtp-Source: AGHT+IHOG8gufTHHonMi2Xc/wBkaLbrjdmS+i6td2TKm2vZG7Cm8N7oobhSCfLeoBzlJOo2TyvRazqeUhxV0 X-Received: from tanz.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:c4a]) (user=tanzirh job=sendgmr) by 2002:a05:6902:f04:b0:dbc:decd:3c7d with SMTP id et4-20020a0569020f0400b00dbcdecd3c7dmr557649ybb.6.1703011685613; Tue, 19 Dec 2023 10:48:05 -0800 (PST) Date: Tue, 19 Dec 2023 18:47:53 +0000 In-Reply-To: <20231219-libstringheader-v5-0-206d4afd309a@google.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20231219-libstringheader-v5-0-206d4afd309a@google.com> X-Developer-Key: i=tanzirh@google.com; a=ed25519; pk=UeRjcUcv5W9AeLGEbAe2+0LptQpcY+o1Zg0LHHo7VN4= X-Developer-Signature: v=1; a=ed25519-sha256; t=1703011682; l=6067; i=tanzirh@google.com; s=20231204; h=from:subject:message-id; bh=2//M5tR0AMdNBe14AksDgWdDSCB4lFtXwH0yxJGuKqc=; b=0wmsNcdXgytnPMUQvnsztAk4CPsOO6DiKEvruiUTRlJ1Ec/U96tpLNk6uO1ykcSCazR27+OH1 V7GtQSZN5kdB9PuFsG3n3TZ5PPGH978S7Q18bokVz9NK9uJm3d82VHu X-Mailer: b4 0.12.4 Message-ID: <20231219-libstringheader-v5-1-206d4afd309a@google.com> Subject: [PATCH v5 1/2] kernel.h: removed REPEAT_BYTE from kernel.h From: Tanzir Hasan To: Kees Cook , Nick Desaulniers Cc: Andy Shevchenko , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Greg KH , llvm@lists.linux.dev, Al Viro , Andy Shevchenko , Tanzir Hasan This patch creates wordpart.h and includes it in asm/word-at-a-time.h for the all architectures. WORD_AT_A_TIME_CONSTANTS depends on kernel.h because of REPEAT_BYTE. Moving this to another header and including it where necessary allows us to not include the bloated kernel.h. Making this implicit dependency on REPEAT_BYTE explicit allows for later improvements in the lib/string.c inclusion list. Suggested-by: Al Viro Suggested-by: Andy Shevchenko Signed-off-by: Tanzir Hasan --- arch/arm/include/asm/word-at-a-time.h | 2 +- arch/arm64/include/asm/word-at-a-time.h | 2 +- arch/powerpc/include/asm/word-at-a-time.h | 2 +- arch/riscv/include/asm/word-at-a-time.h | 2 +- arch/s390/include/asm/word-at-a-time.h | 2 +- arch/sh/include/asm/word-at-a-time.h | 1 + arch/x86/include/asm/word-at-a-time.h | 1 + fs/namei.c | 2 +- include/asm-generic/word-at-a-time.h | 2 +- include/linux/kernel.h | 7 ------- include/linux/wordpart.h | 14 ++++++++++++++ 11 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm/include/asm/word-at-a-time.h b/arch/arm/include/asm/word-at-a-time.h index 352ab213520d..e08304996121 100644 --- a/arch/arm/include/asm/word-at-a-time.h +++ b/arch/arm/include/asm/word-at-a-time.h @@ -8,7 +8,7 @@ * Little-endian word-at-a-time zero byte handling. * Heavily based on the x86 algorithm. */ -#include +#include struct word_at_a_time { const unsigned long one_bits, high_bits; diff --git a/arch/arm64/include/asm/word-at-a-time.h b/arch/arm64/include/asm/word-at-a-time.h index f3b151ed0d7a..bd8cfbc2b9c3 100644 --- a/arch/arm64/include/asm/word-at-a-time.h +++ b/arch/arm64/include/asm/word-at-a-time.h @@ -9,7 +9,7 @@ #ifndef __AARCH64EB__ -#include +#include struct word_at_a_time { const unsigned long one_bits, high_bits; diff --git a/arch/powerpc/include/asm/word-at-a-time.h b/arch/powerpc/include/asm/word-at-a-time.h index 30a12d208687..26e4f718a674 100644 --- a/arch/powerpc/include/asm/word-at-a-time.h +++ b/arch/powerpc/include/asm/word-at-a-time.h @@ -5,7 +5,7 @@ * Word-at-a-time interfaces for PowerPC. */ -#include +#include #include #include diff --git a/arch/riscv/include/asm/word-at-a-time.h b/arch/riscv/include/asm/word-at-a-time.h index 7c086ac6ecd4..94bec2f7ba53 100644 --- a/arch/riscv/include/asm/word-at-a-time.h +++ b/arch/riscv/include/asm/word-at-a-time.h @@ -9,7 +9,7 @@ #define _ASM_RISCV_WORD_AT_A_TIME_H -#include +#include struct word_at_a_time { const unsigned long one_bits, high_bits; diff --git a/arch/s390/include/asm/word-at-a-time.h b/arch/s390/include/asm/word-at-a-time.h index 2579f1694b82..55e66d9371d6 100644 --- a/arch/s390/include/asm/word-at-a-time.h +++ b/arch/s390/include/asm/word-at-a-time.h @@ -2,7 +2,7 @@ #ifndef _ASM_WORD_AT_A_TIME_H #define _ASM_WORD_AT_A_TIME_H -#include +#include #include #include diff --git a/arch/sh/include/asm/word-at-a-time.h b/arch/sh/include/asm/word-at-a-time.h index 4aa398455b94..663658cea69a 100644 --- a/arch/sh/include/asm/word-at-a-time.h +++ b/arch/sh/include/asm/word-at-a-time.h @@ -5,6 +5,7 @@ #ifdef CONFIG_CPU_BIG_ENDIAN # include #else +#include /* * Little-endian version cribbed from x86. */ diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h index 46b4f1f7f354..c002c864a63e 100644 --- a/arch/x86/include/asm/word-at-a-time.h +++ b/arch/x86/include/asm/word-at-a-time.h @@ -3,6 +3,7 @@ #define _ASM_WORD_AT_A_TIME_H #include +#include /* * This is largely generic for little-endian machines, but the diff --git a/fs/namei.c b/fs/namei.c index 71c13b2990b4..03db8ca3f394 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/asm-generic/word-at-a-time.h b/include/asm-generic/word-at-a-time.h index 95a1d214108a..6f088b2b0b03 100644 --- a/include/asm-generic/word-at-a-time.h +++ b/include/asm-generic/word-at-a-time.h @@ -2,7 +2,7 @@ #ifndef _ASM_WORD_AT_A_TIME_H #define _ASM_WORD_AT_A_TIME_H -#include +#include #include #ifdef __BIG_ENDIAN diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d9ad21058eed..162660af5b7d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -39,13 +39,6 @@ #define STACK_MAGIC 0xdeadbeef -/** - * REPEAT_BYTE - repeat the value @x multiple times as an unsigned long value - * @x: value to repeat - * - * NOTE: @x is not checked for > 0xff; larger values produce odd results. - */ -#define REPEAT_BYTE(x) ((~0ul / 0xff) * (x)) /* generic data direction definitions */ #define READ 0 diff --git a/include/linux/wordpart.h b/include/linux/wordpart.h new file mode 100644 index 000000000000..43c1a8ae5152 --- /dev/null +++ b/include/linux/wordpart.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_WORDPART_H +#define _LINUX_WORDPART_H +/** + * REPEAT_BYTE - repeat the value @x multiple times as an unsigned long value + * @x: value to repeat + * + * NOTE: @x is not checked for > 0xff; larger values produce odd results. + */ +#define REPEAT_BYTE(x) ((~0ul / 0xff) * (x)) + +#endif // _LINUX_WORDPART_H + From patchwork Tue Dec 19 18:47:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanzir Hasan X-Patchwork-Id: 13498874 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7400837D3C for ; Tue, 19 Dec 2023 18:48:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tanzirh.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RunE1/9+" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbd4806205fso1524717276.0 for ; Tue, 19 Dec 2023 10:48:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1703011687; x=1703616487; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GQnopqwXCPJwf1o31D0QkbeUw9iOW+EHq9+aREsG9fw=; b=RunE1/9+CTYXmKrJpmkGpJ8E3KqXHpu56BPWX8/0TXWRu2wM8yd88OX0z9GUBWnIf0 Wwxlc9NEJG6DbWYniUPrDDgiIDyZOA56bmluFz82k58PjOpS7C90ObamA4lprFIj747x rCPqLnZ1ExkRsTil4Sjkxs8iGL4JIxtPsy4CVQlM/Yb+lfVbG4B0QS+EU4jhEx+x7qvD 9QbgoIacH++xBY6I/OOU9mJYIGD00TDpG8j66R80ULtYFE5f31r2qOaDBRqkFlGv/Aom sNGlHoZIGXAJKJRj6MMRtR07l77FNK1Jn75hG8ZjMdzAYS6/tM3l9hXScPGNMC6I37lc FG2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703011687; x=1703616487; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GQnopqwXCPJwf1o31D0QkbeUw9iOW+EHq9+aREsG9fw=; b=aroKrmqc5vR2IC6QIlpRf2kecB6QLnqOO5Eeelo0Ogf4dZflKnRLxJC+51Evimu42D fw3iVRSitd2l6OugFOjlOd1i/LvD0POLnAWuKkMsDpo+LjgxGINDXYgbEpDHA1Uj/lxs DfWf5DsWtiI5gpSFsDs5VmLcBAaUl/1sCnBi5bmAE84VRQFa8uhz1oPhynqGUc/JmR6J tlikaK1kIMBt7mLfH8SJ18Zuh7raec5JdaWxZs/llGGyKJPMA6Qj3rdg19KODHav4Ecf Cb/oIbedEkvZqg5M+PLMzCCkV9VS0an6ji37egA63E1f4JSpNHS1pRbh256o66dMZz8a maYg== X-Gm-Message-State: AOJu0Yy7iZXMnFwoxScbbtieyYhAAohLzVOsg4awnTi2oJ0lNkapFSJX LSuvZdH72oneS/gGFLFJ44y8Q97B3mOq X-Google-Smtp-Source: AGHT+IHBA+KH6ttcAcCFFF4DpkEvaI+VOlFNhCHPim/Q48y/kMnBB99Abloesqsd9Mz74KHJnLFXqzFVhpxC X-Received: from tanz.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:c4a]) (user=tanzirh job=sendgmr) by 2002:a25:ef0c:0:b0:dbc:d4c9:bbcc with SMTP id g12-20020a25ef0c000000b00dbcd4c9bbccmr173651ybd.8.1703011687539; Tue, 19 Dec 2023 10:48:07 -0800 (PST) Date: Tue, 19 Dec 2023 18:47:54 +0000 In-Reply-To: <20231219-libstringheader-v5-0-206d4afd309a@google.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20231219-libstringheader-v5-0-206d4afd309a@google.com> X-Developer-Key: i=tanzirh@google.com; a=ed25519; pk=UeRjcUcv5W9AeLGEbAe2+0LptQpcY+o1Zg0LHHo7VN4= X-Developer-Signature: v=1; a=ed25519-sha256; t=1703011682; l=1528; i=tanzirh@google.com; s=20231204; h=from:subject:message-id; bh=kLkju4pFci+nx2b0Vi+mSe3j1L2n+dGn+lmNlbPb2hw=; b=b0jsU9dP77fa4yf1ZBmjDzAgZG7P8A4zLkwrshRlIytJsSBs6DmwQmw8P9xNcLRozgOVkFZKB c9540TlKe4QDsPqQQGaAoMFGfuUGIw9TqLNSGRIYgTfRJd1i6ynudEf X-Mailer: b4 0.12.4 Message-ID: <20231219-libstringheader-v5-2-206d4afd309a@google.com> Subject: [PATCH v5 2/2] lib/string: shrink lib/string.i via IWYU From: Tanzir Hasan To: Kees Cook , Nick Desaulniers Cc: Andy Shevchenko , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton , Greg KH , llvm@lists.linux.dev, Tanzir Hasan This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times. This change to lib/string.c resulted in a preprocessed size of lib/string.i from 26371 lines to 5321 lines (-80%) for the x86 defconfig. Link: https://github.com/ClangBuiltLinux/IWYUScripts Reviewed-by: Kees Cook Signed-off-by: Tanzir Hasan Reviewed-by: Andy Shevchenko --- lib/string.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/string.c b/lib/string.c index be26623953d2..06d9b46875ef 100644 --- a/lib/string.c +++ b/lib/string.c @@ -15,19 +15,20 @@ */ #define __NO_FORTIFY -#include -#include -#include -#include -#include +#include #include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include #include -#include #ifndef __HAVE_ARCH_STRNCASECMP /**