From patchwork Sun Feb 11 23:15:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2143788dyd; Sun, 11 Feb 2024 15:23:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXctZS2KsM+VcH7/SnVrVoGibxHMW7n32IiTgTCBXjR8u/4VoNVhmbGvgCsDmagOKp7V/a6m4m8Wex0IrfLnmVhyercSQ== X-Google-Smtp-Source: AGHT+IG+3zIKZRM1nUe/qe1md6ZiCHKmOUHD/lfWtEMFELaScl6rLkMHGD2IVEGC1a3hzgcvlVrl X-Received: by 2002:a05:6870:200c:b0:219:3dae:4605 with SMTP id o12-20020a056870200c00b002193dae4605mr5484771oab.32.1707693808390; Sun, 11 Feb 2024 15:23:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693808; cv=pass; d=google.com; s=arc-20160816; b=k5iXa0sh9rpbQ3ex4/vo1k5hxlW7E8q95J41Ji6NOYaQsrnmVZn9MxTJ2v6CPpw/ak BbFT55jlPK3wCPDWqLAl7K+mubmvlVnPTPSC+ghGi3CMBhXXKCRWEZVanOrcpLAdpZIw 93FtFraBaPM2kVUEuhalDuIshPEHNI/CttyEITNNFB2fC6FwvV2XO/u79NIJGQKkD0LI 0dixuE7RPaoF8II0fAROAtd2XSX9KSVyBGxiWzY7TVbLqfID/708HZGCesWfIEurQRUx P/pW1jBvy9qoJ5aPVokvs7pWxjbBKDiwknGQSfsMHEQKNosId+sqey6kJ6jZwe3DLRUw +WWg== ARC-Message-Signature: i=2; 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:dkim-signature; bh=fKk+aGvc2YUoK3OFau8iqg4ZDHFtN8sLbkkpKq6ClNw=; fh=asoPoEuTS9YeUpm8SlipHUYUzhFGJg3F4SRaURFYjyo=; b=gDtxGNpP8hI91fJ0khM+ZDnvk64bOhELS3CItkafIZioMfdOz6nOXu+tlOUgT1SjVa XRVRSoXoFa7wiSzp3M6dhBhbMWH8UF+qb1uJE2wszpUWMFJpPKJm7PXgsldyIiIf+rfj /lGcQwG5BJX/XDqLyeOZL0PV/GO6E8qo7mtaeB1oL7uo+z6Bz1O8VLVVIMPwOxecuzce gfYUYa9C8hv5WyBwD8DQLd6OaC37j5yDR1h0ui1mgjdj9d7hVdfqDS5tKLkKWgrwvdOU 3hBO/y8r7NR9ertaiDKVBvZzZ0VBJJqqWBphqG9hGRyxc87oU3hnazUpixRiUW7Jzjzf sf8Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=CV21k42S; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-61014-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61014-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCXRgy9JWoLvlYNEll0au9v9ir38IR1fhdfH/RM+/5MnXWPQF74VGBqPPjvw5ctuMKBze1kHGHDvAe94tK9r9uvgkMpEOw== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id u6-20020ac858c6000000b0042c51230ca2si7525700qta.536.2024.02.11.15.23.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:23:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61014-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=CV21k42S; arc=pass (i=1 spf=pass spfdomain=ionos.com dkim=pass dkdomain=ionos.com dmarc=pass fromdomain=ionos.com); spf=pass (google.com: domain of linux-kernel+bounces-61014-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61014-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.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 20DCA1C20F1B for ; Sun, 11 Feb 2024 23:23:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 699973BB55; Sun, 11 Feb 2024 23:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="CV21k42S" Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 5942F37710 for ; Sun, 11 Feb 2024 23:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693368; cv=none; b=lfTAqvgD933qOiQ8BD4YmBi6P1o4j981N3z7QfhA41KozHIU8dwC3GIEJlgWmH0GcAP7AAIT9KCRB3Fo8aQHE2WIGEbcy0u3YSYwhb4S67oVQ8chfJb7ZVwvcIkYZiHE2l6nteWdGLpdkGoVNJH+iyKCLvOXuPHzfefSwuz/Up4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693368; c=relaxed/simple; bh=5WoLQ+20FuNzDTgx6dlWdeAOXVkYHDqU6RsL5tdTmfc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ahowo7W1VoPfnf5ACLx41/8d8GWIGLqVdSyapJf7RVj2AHFmIeOl7I4M7ysikytyGCXb0pcYUxZ3L4uXfJ+jx7FSoswPLZ2X9DV9hZAK1zkc9MD4tNNT3QtaxfnyYoq0qclvHisTrby0Gx0J3prqIPFi7yYp3hO3MchY7/RAmN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com; spf=pass smtp.mailfrom=ionos.com; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b=CV21k42S; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ionos.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ionos.com Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-56001d49cc5so3259180a12.2 for ; Sun, 11 Feb 2024 15:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707693363; x=1708298163; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fKk+aGvc2YUoK3OFau8iqg4ZDHFtN8sLbkkpKq6ClNw=; b=CV21k42S6wgX/WcXy2QCKLtzNQX1m779FgTQRWlBKqlC4rjSnO0P9qf+yiWkFEfZdd UPtFO7shfCb5u7fxHL56OL/qNA5HrULabb3AIcjjkFWYRlGlr1DMs+WKwJv5cbXmRKqA KXBNadG7Pc9LsClJZhiwa1N0oLwIYVfQGzlAtjxoV1EQQhKrs5jNaqEra5zDxSWfuEao qwojpu40GzhCYhNTngnrLlIq+0gpkxVfZuHIH/oIefE9rH2PSW2c1DOgy+bax1uYFI7s tWlg6/arDm+Sy1DsxMWX2WrwmfNXikUC6d21DJ/FaRQw0t0v7yqbx5x47JfDR6AJ4D42 7eow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693363; x=1708298163; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fKk+aGvc2YUoK3OFau8iqg4ZDHFtN8sLbkkpKq6ClNw=; b=XK4bXUoT3hzHtNTIKEXVpgEaXoy+2dleQJlPAsa2H5EDkx1FOOENetMWidSTbngTsM uBOMgfstBmkqArYaCcueQklSSuaPX+Q1ZTUwWUIDLCG0MMctWhQkfG6B5cSYJuXJ4K/4 wpdOESs6rXFB/UOWBy+ctOOWurIVx7UaY5OST6aZ0PxUPtuXLeW+iRhpw1HcdRG1g1Nc xNthNmM5Jh3H8AnSdFqLUs3e5tB5TlTVxN3UCePvJXnQf61ZfrKluUNPQlojS0cJ6a22 3Mc1XSFQ7HQ6Ts2jPLlZcpV5IZNE4oxU30HOteT39qs+JNa6u0N+o+0NnQZe+KT65Qgy YBOA== X-Gm-Message-State: AOJu0YyCBPB9s2l6plx/9HltFcrrvhAFTNP1RtXCK+sH15WpXW8Rrv/K 7Q2Iyo+4CZ3VcC+dlxukXLwjUTsyJzX2EuxOdUJA1n31W05XCOoP8x0sYx1/i2Tp455MJ6ZZWAB 2 X-Received: by 2002:aa7:d8ce:0:b0:55f:a309:172f with SMTP id k14-20020aa7d8ce000000b0055fa309172fmr4271070eds.15.1707693363055; Sun, 11 Feb 2024 15:16:03 -0800 (PST) Received: from raven.blarg.de (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id et13-20020a056402378d00b0055d19c9daf2sm2170180edb.15.2024.02.11.15.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:16:02 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v4 32/35] linux/kernel.h: move VERIFY_OCTAL_PERMISSIONS() to octal_permissions.h Date: Mon, 12 Feb 2024 00:15:15 +0100 Message-Id: <20240211231518.349442-33-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240211231518.349442-1-max.kellermann@ionos.com> References: <20240211231518.349442-1-max.kellermann@ionos.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790646742862113231 X-GMAIL-MSGID: 1790646742862113231 Reducing dependencies on the header linux/kernel.h. Signed-off-by: Max Kellermann --- arch/arc/kernel/perf_event.c | 1 + drivers/edac/thunderx_edac.c | 1 + drivers/hwmon/occ/common.c | 1 + drivers/media/platform/amphion/vpu_dbg.c | 1 + drivers/soc/aspeed/aspeed-uart-routing.c | 1 + fs/xfs/xfs_error.c | 1 + include/linux/kernel.h | 13 ------------- include/linux/moduleparam.h | 2 +- include/linux/octal_permissions.h | 20 ++++++++++++++++++++ include/linux/sysfs.h | 2 +- 10 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 include/linux/octal_permissions.h diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c index 9d43a9988812..dbc24c9351d1 100644 --- a/arch/arc/kernel/perf_event.c +++ b/arch/arc/kernel/perf_event.c @@ -9,6 +9,7 @@ #include #include // for upper_32_bits(), lower_32_bits() #include +#include #include #include #include diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index e99ce19e6574..c610d99dceda 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -21,6 +21,7 @@ #include #include #include +#include #include diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c index f7b89b880339..1a4f1a90c2c5 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/amphion/vpu_dbg.c index bed0ed4fb8a0..ef5658b492cf 100644 --- a/drivers/media/platform/amphion/vpu_dbg.c +++ b/drivers/media/platform/amphion/vpu_dbg.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/soc/aspeed/aspeed-uart-routing.c b/drivers/soc/aspeed/aspeed-uart-routing.c index a2195f062e01..6b091df7775a 100644 --- a/drivers/soc/aspeed/aspeed-uart-routing.c +++ b/drivers/soc/aspeed/aspeed-uart-routing.c @@ -5,6 +5,7 @@ */ #include #include +#include #include #include #include diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index 8d558f0f1b3b..a225860d272a 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c @@ -14,6 +14,7 @@ #include "xfs_error.h" #include "xfs_sysfs.h" #include "xfs_inode.h" +#include #include #include #include diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5d088ce30045..ac332f4deed9 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -308,16 +307,4 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD #endif -/* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */ -#define VERIFY_OCTAL_PERMISSIONS(perms) \ - (BUILD_BUG_ON_ZERO((perms) < 0) + \ - BUILD_BUG_ON_ZERO((perms) > 0777) + \ - /* USER_READABLE >= GROUP_READABLE >= OTHER_READABLE */ \ - BUILD_BUG_ON_ZERO((((perms) >> 6) & 4) < (((perms) >> 3) & 4)) + \ - BUILD_BUG_ON_ZERO((((perms) >> 3) & 4) < ((perms) & 4)) + \ - /* USER_WRITABLE >= GROUP_WRITABLE */ \ - BUILD_BUG_ON_ZERO((((perms) >> 6) & 2) < (((perms) >> 3) & 2)) + \ - /* OTHER_WRITABLE? Generally considered a bad idea. */ \ - BUILD_BUG_ON_ZERO((perms) & 2) + \ - (perms)) #endif diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index a285e74ec028..860b0ea1f3b3 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -4,7 +4,7 @@ /* (C) Copyright 2001, 2002 Rusty Russell IBM Corporation */ #include #include -#include // for VERIFY_OCTAL_PERMISSIONS() +#include /* You can override this manually, but generally this should match the module name. */ diff --git a/include/linux/octal_permissions.h b/include/linux/octal_permissions.h new file mode 100644 index 000000000000..57d4d6a5b66d --- /dev/null +++ b/include/linux/octal_permissions.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_OCTAL_PERMISSIONS_H +#define _LINUX_OCTAL_PERMISSIONS_H + +#include + +/* Permissions on a sysfs file: you didn't miss the 0 prefix did you? */ +#define VERIFY_OCTAL_PERMISSIONS(perms) \ + (BUILD_BUG_ON_ZERO((perms) < 0) + \ + BUILD_BUG_ON_ZERO((perms) > 0777) + \ + /* USER_READABLE >= GROUP_READABLE >= OTHER_READABLE */ \ + BUILD_BUG_ON_ZERO((((perms) >> 6) & 4) < (((perms) >> 3) & 4)) + \ + BUILD_BUG_ON_ZERO((((perms) >> 3) & 4) < ((perms) & 4)) + \ + /* USER_WRITABLE >= GROUP_WRITABLE */ \ + BUILD_BUG_ON_ZERO((((perms) >> 6) & 2) < (((perms) >> 3) & 2)) + \ + /* OTHER_WRITABLE? Generally considered a bad idea. */ \ + BUILD_BUG_ON_ZERO((perms) & 2) + \ + (perms)) + +#endif diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 0500b023b5cc..a4b752b24329 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -15,10 +15,10 @@ #include #include -#include // for VERIFY_OCTAL_PERMISSIONS() #include #include #include +#include struct kobject; struct module;