From patchwork Fri Feb 9 16:40:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 198981 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp978886dyd; Fri, 9 Feb 2024 08:42:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWah1OOJnI7cECHiU0k6QFbhZer1JfBPsdfcvOcpaau1E0fkkZgJfWQzfWj+93JH9jzPowdnipAW0yygjLtqQefy6L+vA== X-Google-Smtp-Source: AGHT+IHc1qiAxI5dN2AuQNHRaZMz3ftlPms5iQVyy+EHXwaoi4ystn76UmY4oSNPGB1T3bdVVB8p X-Received: by 2002:a2e:a26a:0:b0:2d0:d802:8592 with SMTP id k10-20020a2ea26a000000b002d0d8028592mr1699406ljm.25.1707496959460; Fri, 09 Feb 2024 08:42:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707496959; cv=pass; d=google.com; s=arc-20160816; b=DYvXvccIvK0RfQES3nLTz/KFLBuxXE6OUA8Av8YPs+3jhqe0bf9hOU1yqsiJj0UK4o 22Tch7RnaxKH3Y1gfWds3X2v1WOepjqgje509xgGpLYO/iCWp0C/3B6kjjdKe/bP4vmh HV4qXD/UxrhtvoozPvox7xDpUBRwjeYkfMRrhiNr41TT5X4oRo/EBqVGqHonqSUJMHGY 7D/A/RgRs13kSmE0zqerIfk459NVc21Q5WvGFi5/C91f7AD4b/OinlsAT73ttsSrUpAc sIgJ2X+MY7WT9i6cA7e0AywYo58/CfYsraesKn2XQJorMqHwBCyIUKuFEnvGKUnzQq7J jqJA== 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=BaklDAN1W3lUYoF0lQYhzt4Y/cAwOrNfc1YQYVWzhR8=; fh=/TU9UNZEoVnrlM2DKl6z0JuabLcehgnpOWkkVm2uWaw=; b=raXXHeVpamlEYhatNFCG1JPXFqHqY8QPnDoeP95PzXkclNHbt4yKcaF8kTyYT0id86 VM+p2XCl+//1IdOf2Ct2q+2dyP+pt0btu2dgh0dycYTr/6S2uD5MXb7vRhN8fnsp8dqW CrIryFrn0gzXjCV8H/Utty2xkr/LXhrb5ZJXx+0NQm34zE4/uYiM7kaveI1//Ckb8IJ/ 0P6Q1TXlK2L73YHPPr6bhsHnC7xT3l+2ewy13Xst+AgTx1AN4iEuDc3QVsOCn/0wdmK5 BlUyKldJxVm4cEAdETCv0eB7v9sA5ScqfEhzVcf6/q9dzKu4Tu1FNN09sqzeKTR1zXGv /PvA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=HxjnameC; 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-59627-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59627-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCXfeW7qlJz0WktYcfuG3MflPR5JjX/Fvnib9mnJq8S4BNSXP7A5/aTsBc/YOR9zAXWY1MY50ODxXqaJhtxsM2i3uPbhlA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id co15-20020a0564020c0f00b0056104612c93si1004661edb.588.2024.02.09.08.42.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:42:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59627-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=HxjnameC; 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-59627-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59627-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 am.mirrors.kernel.org (Postfix) with ESMTPS id E167A1F228D3 for ; Fri, 9 Feb 2024 16:42:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D9B2383CB9; Fri, 9 Feb 2024 16:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="HxjnameC" Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (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 E2CD77BB15 for ; Fri, 9 Feb 2024 16:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496859; cv=none; b=NYnJgbZ30f9uy3EV/T6UdQMokvMnvMigMvIMhEspNfmScGMKfxQyweTHtZB5dvtBSzGywzDN1uqzdzYC15KrRpXTDjKJzrRXKJGL6/1DghDsDYWNOdRxpiFnOUHLYCAApwirGxlcWMTaPKz0IxRVQXtHi9BEgEr6rpm3sT1WOwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707496859; c=relaxed/simple; bh=NuvTgovw/JWaOMSHbB+w3CvxRolTgHSjratxs4id3F8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QBhnB5oVpFAlq6r4yVBvRO2CcptnK9KTHEEdEZv7qQTUJn6nd+7sLiu9GsR1YuFAfoKjn+5r8Da/pDOHiCMAKX3as+mPdFQo/6/C7vtkAAYzrHK/TL0tTnwV/LuYbG0aNjKhYBNcBmNuJteBdJRCOJbsitlkEISejSK+jppSI7k= 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=HxjnameC; arc=none smtp.client-ip=209.85.208.177 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-lj1-f177.google.com with SMTP id 38308e7fff4ca-2d066b532f0so16469751fa.1 for ; Fri, 09 Feb 2024 08:40:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707496853; x=1708101653; 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=BaklDAN1W3lUYoF0lQYhzt4Y/cAwOrNfc1YQYVWzhR8=; b=HxjnameCIWUKUIRQ5VFnXDSU7m08enQy9R0n2IXz0T+CGIqCsLfx2kxzK2qEqtHteU UwASfqC+Wn37JIePMiG/x6G7N9esMgCCbfPQ0ekwzcDM1AFB6AVz7PTqBGyOtDivjPgu 8bQeFcwGgi/LJCTcy+gq8PdzIIP4sKUM7KTGbh1rC9BSp43y/frAdJXvYm/gDO1oet3a +HFw3jNF1k6bZ2aHDDZBal7xRz0AxHpMCHmmUHoe8pbeWlzpNUaRUu7LQEnj0Peh3Rni S6HnOhdHvTXnduE8TLHlwbtBMKiA1rqs2ENaChy35Y4fX/k+3HcHDJhK2cuIhTOHuZSx eXnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707496853; x=1708101653; 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=BaklDAN1W3lUYoF0lQYhzt4Y/cAwOrNfc1YQYVWzhR8=; b=eSorm2E7wxSgNOVckytXt2F7P/3s/avz/nI2k+FvsdmrgWagpqw7Kc19po2BSyv55i 4JNUjin/Qlv6eI8XrbjQZbm3IEdB2oyi6fQueGY0CrESInVDa7tQEpy5tBLhxx//R1ga BlKS3BCoLog/hG/yUbmFQXlml4H4F+Bux3uZvDoplj4qI0YbNZ7YT6bnYgbborm0E4DL tTJBrTb8QXM1BqDsJO0DliS1s2BU73XZgIPA9OabUS9dq3VJlKX1KkPxsBWT0twdKERl O+zZiwN98rwp7fPeWIc4cpWPmYo7WqUHqIcf1UhREGmGRX8T+45yTixkazehRlI+fp/r U27A== X-Gm-Message-State: AOJu0YxYtS/eCi7Y21iTiGXodIS3zNDxiZBrfIHluBxtyk3iV5XpI1nk J1lf6HczXaqg1VhKPkUietJHRARM5pNwhxkZpbU46wYmrd+pth4iSYL+mzOzmiwE6fh/t0Zndh6 r X-Received: by 2002:a05:651c:210a:b0:2d0:a069:72a1 with SMTP id a10-20020a05651c210a00b002d0a06972a1mr1925234ljq.22.1707496853666; Fri, 09 Feb 2024 08:40:53 -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.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 08:40:53 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v2 09/35] rwsem.h: move declarations to rwsem_types.h Date: Fri, 9 Feb 2024 17:40:01 +0100 Message-Id: <20240209164027.2582906-10-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: 1790440331346664344 X-GMAIL-MSGID: 1790440331346664344 By providing declarations in a lean header, we can reduce header dependencies. Signed-off-by: Max Kellermann --- include/linux/backing-dev-defs.h | 2 +- include/linux/comedi/comedidev.h | 2 +- include/linux/gnss.h | 2 +- include/linux/i3c/master.h | 2 +- include/linux/ipc_namespace.h | 2 +- include/linux/leds.h | 2 +- include/linux/mfd/intel-m10-bmc.h | 2 +- include/linux/mm_types.h | 2 +- include/linux/nfs_fs.h | 2 +- include/linux/posix-clock.h | 2 +- include/linux/quota.h | 2 +- include/linux/rwsem.h | 48 +------------------ include/linux/rwsem_types.h | 78 +++++++++++++++++++++++++++++++ include/linux/tty.h | 2 +- include/linux/user_namespace.h | 2 +- include/net/sch_generic.h | 2 +- include/rdma/ib_verbs.h | 2 +- include/sound/core.h | 2 +- 18 files changed, 95 insertions(+), 63 deletions(-) create mode 100644 include/linux/rwsem_types.h diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h index b379687434fa..68fdec049456 100644 --- a/include/linux/backing-dev-defs.h +++ b/include/linux/backing-dev-defs.h @@ -15,7 +15,7 @@ #include #ifdef CONFIG_CGROUP_WRITEBACK -#include +#include #endif struct page; diff --git a/include/linux/comedi/comedidev.h b/include/linux/comedi/comedidev.h index d7a75b15c6f7..a3c2268f7ae5 100644 --- a/include/linux/comedi/comedidev.h +++ b/include/linux/comedi/comedidev.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/linux/gnss.h b/include/linux/gnss.h index 8fc4bdd38dc6..9f38ff948d78 100644 --- a/include/linux/gnss.h +++ b/include/linux/gnss.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/linux/i3c/master.h b/include/linux/i3c/master.h index 16cc81e55b12..0e456edeebbf 100644 --- a/include/linux/i3c/master.h +++ b/include/linux/i3c/master.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #define I3C_HOT_JOIN_ADDR 0x2 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index e8240cf2611a..a0011b6cd5d1 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/linux/leds.h b/include/linux/leds.h index bec1c2fa5b26..6a50c2ea10e2 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h index ee66c9751003..3500f5fa8057 100644 --- a/include/linux/mfd/intel-m10-bmc.h +++ b/include/linux/mfd/intel-m10-bmc.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #define M10BMC_N3000_LEGACY_BUILD_VER 0x300468 #define M10BMC_N3000_SYS_BASE 0x300800 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index ff5d33ace0f9..ed764511bc23 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 4511d8a50e15..8f14fce5d7e2 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h index ef8619f48920..f8e0c65d262d 100644 --- a/include/linux/posix-clock.h +++ b/include/linux/posix-clock.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include struct posix_clock; struct posix_clock_context; diff --git a/include/linux/quota.h b/include/linux/quota.h index bf16d9d2866c..956281c84850 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 9c29689ff505..ba9532734bf6 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -8,10 +8,10 @@ #ifndef _LINUX_RWSEM_H #define _LINUX_RWSEM_H +#include #include #include -#include #include #include #include @@ -29,43 +29,6 @@ #ifndef CONFIG_PREEMPT_RT -#ifdef CONFIG_RWSEM_SPIN_ON_OWNER -#include -#endif - -/* - * For an uncontended rwsem, count and owner are the only fields a task - * needs to touch when acquiring the rwsem. So they are put next to each - * other to increase the chance that they will share the same cacheline. - * - * In a contended rwsem, the owner is likely the most frequently accessed - * field in the structure as the optimistic waiter that holds the osq lock - * will spin on owner. For an embedded rwsem, other hot fields in the - * containing structure should be moved further away from the rwsem to - * reduce the chance that they will share the same cacheline causing - * cacheline bouncing problem. - */ -struct rw_semaphore { - atomic_long_t count; - /* - * Write owner or one of the read owners as well flags regarding - * the current state of the rwsem. Can be used as a speculative - * check to see if the write owner is running on the cpu. - */ - atomic_long_t owner; -#ifdef CONFIG_RWSEM_SPIN_ON_OWNER - struct optimistic_spin_queue osq; /* spinner MCS lock */ -#endif - raw_spinlock_t wait_lock; - struct list_head wait_list; -#ifdef CONFIG_DEBUG_RWSEMS - void *magic; -#endif -#ifdef CONFIG_DEBUG_LOCK_ALLOC - struct lockdep_map dep_map; -#endif -}; - /* In all implementations count != 0 means locked */ static inline int rwsem_is_locked(struct rw_semaphore *sem) { @@ -124,15 +87,6 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem) #else /* !CONFIG_PREEMPT_RT */ -#include - -struct rw_semaphore { - struct rwbase_rt rwbase; -#ifdef CONFIG_DEBUG_LOCK_ALLOC - struct lockdep_map dep_map; -#endif -}; - #define __RWSEM_INITIALIZER(name) \ { \ .rwbase = __RWBASE_INITIALIZER(name), \ diff --git a/include/linux/rwsem_types.h b/include/linux/rwsem_types.h new file mode 100644 index 000000000000..105142147b9b --- /dev/null +++ b/include/linux/rwsem_types.h @@ -0,0 +1,78 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* rwsem.h: R/W semaphores, public interface + * + * Written by David Howells (dhowells@redhat.com). + * Derived from asm-i386/semaphore.h + */ + +#ifndef _LINUX_RWSEM_TYPES_H +#define _LINUX_RWSEM_TYPES_H + +#include +#include +#include + +#ifdef CONFIG_DEBUG_LOCK_ALLOC +#include +# define __RWSEM_DEP_MAP_INIT(lockname) \ + .dep_map = { \ + .name = #lockname, \ + .wait_type_inner = LD_WAIT_SLEEP, \ + }, +#else +# define __RWSEM_DEP_MAP_INIT(lockname) +#endif + +#ifndef CONFIG_PREEMPT_RT + +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER +#include +#endif + +/* + * For an uncontended rwsem, count and owner are the only fields a task + * needs to touch when acquiring the rwsem. So they are put next to each + * other to increase the chance that they will share the same cacheline. + * + * In a contended rwsem, the owner is likely the most frequently accessed + * field in the structure as the optimistic waiter that holds the osq lock + * will spin on owner. For an embedded rwsem, other hot fields in the + * containing structure should be moved further away from the rwsem to + * reduce the chance that they will share the same cacheline causing + * cacheline bouncing problem. + */ +struct rw_semaphore { + atomic_long_t count; + /* + * Write owner or one of the read owners as well flags regarding + * the current state of the rwsem. Can be used as a speculative + * check to see if the write owner is running on the cpu. + */ + atomic_long_t owner; +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER + struct optimistic_spin_queue osq; /* spinner MCS lock */ +#endif + raw_spinlock_t wait_lock; + struct list_head wait_list; +#ifdef CONFIG_DEBUG_RWSEMS + void *magic; +#endif +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; +#endif +}; + +#else /* !CONFIG_PREEMPT_RT */ + +#include + +struct rw_semaphore { + struct rwbase_rt rwbase; +#ifdef CONFIG_DEBUG_LOCK_ALLOC + struct lockdep_map dep_map; +#endif +}; + +#endif /* CONFIG_PREEMPT_RT */ + +#endif /* _LINUX_RWSEM_TYPES_H */ diff --git a/include/linux/tty.h b/include/linux/tty.h index 5a3815e7d73d..da820609bc77 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 7d0e3418d497..c82e1b50dfcb 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index bab44a435a62..6ec5064156d9 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 64b62d1388a4..7d6216e85b0e 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/sound/core.h b/include/sound/core.h index 0c512acac050..f95f6863986f 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -10,7 +10,7 @@ #include #include /* wake_up() */ #include /* struct mutex */ -#include /* struct rw_semaphore */ +#include /* struct rw_semaphore */ #include #include #include