From patchwork Fri Feb 9 16:40:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp992997dyd; Fri, 9 Feb 2024 09:05:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIIIZeXkwANzbO8jDb4LRY0tUTBrTesn0tn3zqUdii3EnExHmpwXfOElfb8fTz+CQpiWuy X-Received: by 2002:a05:6a00:2f97:b0:6da:14f3:53e8 with SMTP id fm23-20020a056a002f9700b006da14f353e8mr2276159pfb.24.1707498333516; Fri, 09 Feb 2024 09:05:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707498333; cv=pass; d=google.com; s=arc-20160816; b=j+AhWsGhP/gw2Oilgj2ZM8HSrjF++oIePrAYoZaKnuZFo0wpwFFGl86HVo0UaMQKff HpbfAU6URJgMYJ+ra5ptiRr3Ln/aH1Fn6aviRG1v9roHa4g1gGuKxcgH5S1vhXWhddEo ZpQIVLJvwaITdD42n42IB6XGaR+Td/LirsGX3NZ0L+nN/XkkKGBI9hf6PeisUXn13zOR +TVQTdKG3ilOnt8GqVJx3gn2EUleuh9SgBFMhinNjaVhU5AgrKSEh9imfomyeV6+3Xsk T7A7gKHt94f47FsZZCT1TXQ3FQZY1qyBdcIKVQWY+iZCeapj0GNwZuikGeqbXro4754a C0mQ== 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=3aGSUgEoaSxD8Wnq2siQ6MwOZ/81RxBpHb5g/H05JE8=; fh=H7RdkIYbnZlNigUbUSWnSQWyLE1tfp1ZtQ0XvnfaTw8=; b=M3TzNGUAzlHYkOEY9F/qw0koWg7G/CPhvHmj8xSIxu8RsqZGug6ivxItHZGv0OziPI 98iO6mSmNBvHjLjfPoNQdfztGyE0JryUBTxffHPbg1E0XbokM/uGsLuEkUFTI/gZAc0G OdPGLT4TdFjnSFs3Jwj2DKIGs/cx002+Gruh50lFmk8mR0fy4MMRHVdgplbGmW96veIi O9rxS3HS+sVvQyw/9v9Ef+v4RqFk1xXCjt3Xm70bG4dbaRyVNRCFJbcwxKqXfxqZAjA1 1Y+dLAayMZWJgJ1fmg83soNgQWVzhfpHI3Xxw9Euz0+JzGkE7nDPS9EemHosZcxk/inQ sy7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=JvJ5FJjU; 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-59635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59635-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCWY/weLHTK+A2fSzpietVC6SOWgLJ65h+cyzEjTE0jeEdy+szYtJGJhCNuKPsfSXGakPc7CqLnOgxsj5cyvdggXB/I00w== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id l15-20020a65680f000000b005dc12a99c6esi1956748pgt.355.2024.02.09.09.05.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 09:05:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=JvJ5FJjU; 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-59635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59635-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id DA13A28A4C6 for ; Fri, 9 Feb 2024 16:45:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4C90812A15D; Fri, 9 Feb 2024 16:41:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="JvJ5FJjU" Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 5E2E380BED for ; Fri, 9 Feb 2024 16:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496868; cv=none; b=W2v7vbHezUf4LYCTziEUq9/k9Snb03jevIyBHuKkvX6gWkTkQFFScrWOvKpj0Ry9WE4y+zygN51QKGP6CFPW8ctEiehgmU/fIndl+v7ek3GnIScG0jQxRwe5SKAXLAbRtFs3OmewZ+mFwtvd4ZVaKPyQ8hybvMdxj2bEQrJ0un0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496868; c=relaxed/simple; bh=ksB6Hw/gRhmpDEm9p0F3Nd/QWj2mSxCXzPil0t2rrzI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NuKK/8WKUPdBZ/z7zQa8iXT2kv2+/fP7po1FHegyed692xXlDkCCWVMlYlRa8SoUIMZ6EGVlwu06PSmlgZPVGmyPnm6evKSjWU3eJu4ufnTLiMTOJ8lbiGrCASZYW7Q71wKJIrGvfFsgr6haqqD/3ylM17vjW3ZgcbbfZkMTSHA= 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=JvJ5FJjU; arc=none smtp.client-ip=209.85.208.41 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-f41.google.com with SMTP id 4fb4d7f45d1cf-561519f8698so486228a12.0 for ; Fri, 09 Feb 2024 08:41:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707496862; x=1708101662; 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=3aGSUgEoaSxD8Wnq2siQ6MwOZ/81RxBpHb5g/H05JE8=; b=JvJ5FJjUIWUQ9rtnomnwwId9u7VDcI0e4rOZ7CzDcRqtiDDdbXcxnT05njNmb81Ogv jJiywoHzzHqR74aNQSVvjJkSIp/ge6TWHDQnMepMMT17/sIIq5ZIk45VWYRMKrWEHqJM 5QsVDXI1Kyu5H1GeQQbL+dMP3h+jsOAnKHwswTzHGokoG/wPVk/ZmBhrD0cL6hY4XaVy vItxYkNRbqLPU6bhDWflEZT5dXYmt4XY/nFFz6s3VUKUlz970R9M6wbR1gUJw6tCnfFJ Acx6ez6fdhz6QjnCYXfRyoYUNH493yYowzy22FR+Rbui3VUzm0QGa6HBMPmkR51Jki46 TFEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707496862; x=1708101662; 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=3aGSUgEoaSxD8Wnq2siQ6MwOZ/81RxBpHb5g/H05JE8=; b=QdYrBLfvImjqvD0ZAXlE4YnxQ+R3xi9ihsNQ73Aex7PznAWftYL9XgjCOw6iZBJG5t 8tL9xxG5DPIribUTma1wPUUsS9YEtAt58TcrV07z8/0CBwbEwO64fB6bDRDSYPCmQS7/ TBIvgIJYi0ksNUx3TojmDyqW2gH7kYs/eGWit7/H5x+Ik+g16nDcINP5oVuNh7Cx/z1/ SwGvPv2J3wxvxWJ1+l1Idz9rFyKwKbuF05mwJzk60oKzTg1WQWRSTXduzMwr5Dcn1g51 fsaP3YqOmzyUaQYQRbXe80YdxWa4GSA501TXcV5PnaLbB72f50qM1DOSBxBz9+ExNUNV b/lw== X-Gm-Message-State: AOJu0Yyhdh/YvrujUMufnJ9LKOR1aEzbqeBdbLXfjX20WdAi4PShtL9+ 3fZcVNPz7+RQ3tvNM5VXzRB9TRwxFWX/0H7bkZXvVH7dv7KNLEPsstqJlPkNFKVC8ZwkBwh+cam M X-Received: by 2002:a17:906:3491:b0:a3b:da68:4824 with SMTP id g17-20020a170906349100b00a3bda684824mr1504881ejb.6.1707496861701; Fri, 09 Feb 2024 08:41:01 -0800 (PST) Received: from raven.intern.cm-ag (p200300dc6f267100023064fffe740809.dip0.t-ipconnect.de. [2003:dc:6f26:7100:230:64ff:fe74:809]) by smtp.gmail.com with ESMTPSA id tl27-20020a170907c31b00b00a3bfe97fe27sm477724ejc.218.2024.02.09.08.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:41:00 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 17/35] xarray.h: move declarations to xarray_types.h Date: Fri, 9 Feb 2024 17:40:09 +0100 Message-Id: <20240209164027.2582906-18-max.kellermann@ionos.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240209164027.2582906-1-max.kellermann@ionos.com> References: <20240209164027.2582906-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: 1790441772730668470 X-GMAIL-MSGID: 1790441772730668470 By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- include/drm/gpu_scheduler.h | 2 +- include/linux/blkdev.h | 2 +- include/linux/list_lru.h | 5 ++- include/linux/mlx5/driver.h | 2 +- include/linux/msi.h | 2 +- include/linux/pci.h | 2 +- include/linux/xarray.h | 56 +---------------------------- include/linux/xarray_types.h | 70 ++++++++++++++++++++++++++++++++++++ include/net/net_namespace.h | 2 +- include/net/sch_generic.h | 2 +- include/sound/core.h | 5 ++- 11 files changed, 86 insertions(+), 64 deletions(-) create mode 100644 include/linux/xarray_types.h diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 9a89f72a3bac..f2fb8931cb17 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7e1fc101a5c3..e67298984913 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -23,7 +23,7 @@ #include #include // for iov_iter_is_aligned() #include -#include +#include struct module; struct request_queue; diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index 792b67ceb631..5e8cd106dae4 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -11,7 +11,10 @@ #include #include #include -#include + +#ifdef CONFIG_MEMCG_KMEM +#include +#endif struct mem_cgroup; diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index d9b99aca9e72..07956bd2e55b 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/msi.h b/include/linux/msi.h index 04fd2c856287..a3969b00a793 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/pci.h b/include/linux/pci.h index a0fee72c45a4..f2a5638503a3 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -44,7 +44,7 @@ #include #ifdef CONFIG_PCI_DOE -#include +#include #endif #ifndef CONFIG_PCI_IOV diff --git a/include/linux/xarray.h b/include/linux/xarray.h index fd6ada66f6b5..ff1e63ec4865 100644 --- a/include/linux/xarray.h +++ b/include/linux/xarray.h @@ -9,10 +9,10 @@ * See Documentation/core-api/xarray.rst for how to use the XArray. */ +#include #include #include #include -#include #include #include #include // for DIV_ROUND_UP() @@ -225,37 +225,12 @@ static inline int xa_err(void *entry) return 0; } -/** - * struct xa_limit - Represents a range of IDs. - * @min: The lowest ID to allocate (inclusive). - * @max: The maximum ID to allocate (inclusive). - * - * This structure is used either directly or via the XA_LIMIT() macro - * to communicate the range of IDs that are valid for allocation. - * Three common ranges are predefined for you: - * * xa_limit_32b - [0 - UINT_MAX] - * * xa_limit_31b - [0 - INT_MAX] - * * xa_limit_16b - [0 - USHRT_MAX] - */ -struct xa_limit { - u32 max; - u32 min; -}; - #define XA_LIMIT(_min, _max) (struct xa_limit) { .min = _min, .max = _max } #define xa_limit_32b XA_LIMIT(0, UINT_MAX) #define xa_limit_31b XA_LIMIT(0, INT_MAX) #define xa_limit_16b XA_LIMIT(0, USHRT_MAX) -typedef unsigned __bitwise xa_mark_t; -#define XA_MARK_0 ((__force xa_mark_t)0U) -#define XA_MARK_1 ((__force xa_mark_t)1U) -#define XA_MARK_2 ((__force xa_mark_t)2U) -#define XA_PRESENT ((__force xa_mark_t)8U) -#define XA_MARK_MAX XA_MARK_2 -#define XA_FREE_MARK XA_MARK_0 - enum xa_lock_type { XA_LOCK_IRQ = 1, XA_LOCK_BH = 2, @@ -278,35 +253,6 @@ enum xa_lock_type { #define XA_FLAGS_ALLOC (XA_FLAGS_TRACK_FREE | XA_FLAGS_MARK(XA_FREE_MARK)) #define XA_FLAGS_ALLOC1 (XA_FLAGS_TRACK_FREE | XA_FLAGS_ZERO_BUSY) -/** - * struct xarray - The anchor of the XArray. - * @xa_lock: Lock that protects the contents of the XArray. - * - * To use the xarray, define it statically or embed it in your data structure. - * It is a very small data structure, so it does not usually make sense to - * allocate it separately and keep a pointer to it in your data structure. - * - * You may use the xa_lock to protect your own data structures as well. - */ -/* - * If all of the entries in the array are NULL, @xa_head is a NULL pointer. - * If the only non-NULL entry in the array is at index 0, @xa_head is that - * entry. If any other entry in the array is non-NULL, @xa_head points - * to an @xa_node. - */ -struct xarray { - spinlock_t xa_lock; -/* private: The rest of the data structure is not to be used directly. */ - gfp_t xa_flags; - void __rcu * xa_head; -}; - -#define XARRAY_INIT(name, flags) { \ - .xa_lock = __SPIN_LOCK_UNLOCKED(name.xa_lock), \ - .xa_flags = flags, \ - .xa_head = NULL, \ -} - /** * DEFINE_XARRAY_FLAGS() - Define an XArray with custom flags. * @name: A string that names your XArray. diff --git a/include/linux/xarray_types.h b/include/linux/xarray_types.h new file mode 100644 index 000000000000..ff241ce647a9 --- /dev/null +++ b/include/linux/xarray_types.h @@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef _LINUX_XARRAY_TYPES_H +#define _LINUX_XARRAY_TYPES_H +/* + * eXtensible Arrays + * Copyright (c) 2017 Microsoft Corporation + * Author: Matthew Wilcox + * + * See Documentation/core-api/xarray.rst for how to use the XArray. + */ + +#include +#include +#include + +/** + * struct xa_limit - Represents a range of IDs. + * @min: The lowest ID to allocate (inclusive). + * @max: The maximum ID to allocate (inclusive). + * + * This structure is used either directly or via the XA_LIMIT() macro + * to communicate the range of IDs that are valid for allocation. + * Three common ranges are predefined for you: + * * xa_limit_32b - [0 - UINT_MAX] + * * xa_limit_31b - [0 - INT_MAX] + * * xa_limit_16b - [0 - USHRT_MAX] + */ +struct xa_limit { + u32 max; + u32 min; +}; + +typedef unsigned __bitwise xa_mark_t; +#define XA_MARK_0 ((__force xa_mark_t)0U) +#define XA_MARK_1 ((__force xa_mark_t)1U) +#define XA_MARK_2 ((__force xa_mark_t)2U) +#define XA_PRESENT ((__force xa_mark_t)8U) +#define XA_MARK_MAX XA_MARK_2 +#define XA_FREE_MARK XA_MARK_0 + +/** + * struct xarray - The anchor of the XArray. + * @xa_lock: Lock that protects the contents of the XArray. + * + * To use the xarray, define it statically or embed it in your data structure. + * It is a very small data structure, so it does not usually make sense to + * allocate it separately and keep a pointer to it in your data structure. + * + * You may use the xa_lock to protect your own data structures as well. + */ +/* + * If all of the entries in the array are NULL, @xa_head is a NULL pointer. + * If the only non-NULL entry in the array is at index 0, @xa_head is that + * entry. If any other entry in the array is non-NULL, @xa_head points + * to an @xa_node. + */ +struct xarray { + spinlock_t xa_lock; +/* private: The rest of the data structure is not to be used directly. */ + gfp_t xa_flags; + void __rcu * xa_head; +}; + +#define XARRAY_INIT(name, flags) { \ + .xa_lock = __SPIN_LOCK_UNLOCKED(name.xa_lock), \ + .xa_flags = flags, \ + .xa_head = NULL, \ +} + +#endif /* _LINUX_XARRAY_TYPES_H */ diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 7a92421640be..50826b5e7b85 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include struct user_namespace; struct proc_dir_entry; diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 6ec5064156d9..9845ea172382 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include struct Qdisc_ops; struct qdisc_walker; diff --git a/include/sound/core.h b/include/sound/core.h index f95f6863986f..7dcba88b2fb7 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -14,7 +14,10 @@ #include #include #include -#include + +#ifdef CONFIG_SND_CTL_FAST_LOOKUP +#include +#endif /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS