From patchwork Sun Feb 11 23:14:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Kellermann X-Patchwork-Id: 199528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp2141939dyd; Sun, 11 Feb 2024 15:17:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUyn0gh+hfzNW18iGA/6LxUYGiIPm7RttYMWHdbXL0HGCQsbCoAdSxNvhY2uunr0snkhGSBvjTPXeJAx3rcTQ6Tr08GWw== X-Google-Smtp-Source: AGHT+IE3HduDI25fDpKoaiu3Dgjmvko6MnVko+1Kw/VeVoiXS+5pXbDLtjnUDDf0MKEw6qEbT1dz X-Received: by 2002:a05:6870:514f:b0:21a:323e:f392 with SMTP id z15-20020a056870514f00b0021a323ef392mr5012857oak.27.1707693439039; Sun, 11 Feb 2024 15:17:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707693439; cv=pass; d=google.com; s=arc-20160816; b=nnjb2rVsrSz+wJj0uNDIhV3sbLkeeBUQ27EYkwUmjDxaeD1K73Dg2uFcB/RS0qHGDn w/twWqQdU2XdEV6i62g1CMjvQLB3mGhaEsHexl001AgQgmm8hb7alhWSymx7yEKP4pwW f9OGo+lrdKvgn+jd8ntOQ/Xkn43/vzTzO/SSRoKBZjWyy+Gh/u0fC+kANauWtOMazW8U BRr0W9T/B6I9BAZVsZClgyosqzkUbrlMwbd0ygrKPvtaMKsmD2CvqZzyu8SXuwkOnRda dS3lHBekXUKWJXeMGSopyy3iC4MHq+7TbMuABV5khrTSfxkqOPJSwYnXT1sagFJ+n3+G xLYQ== 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=Pm4S8MMJuDiJYTUlIfFoKRXT+fyg5s4MEb8ozY5r7Vw=; b=S1dpd4+ZxkVRsm0m0/5J3WTziQ7zJip/g/YOdLdD9tzLRbEfWiqAOnic4qrG8yIcPQ mguUphEbLtMvGLf1UKB1MY3Gv3MBEGxhLo9vD8wTW/pZ1Uzv4MrLhbEtk5JP7rABrZj5 /K2nrncRiMznnpCw/Qq6B8652aTnIP8lhsECok9obmdSo6sCuzKuIUnbc3WjJPZcXIsz qDzfkt2Gk0QHnVm3C1Pof2C54BPRL8VuMf5cjDzv4rfCEQQko1qMBljeNSUGirsU9DZi w0oOlrSTn9S9DU8f5C0LU9LMKs0vbU4JV6t3t6PDHlUY2tOCyTzldRE74pcmFzZ6ZDx/ lDbA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ionos.com header.s=google header.b=Wcs0cfzu; 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-60992-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60992-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=ionos.com X-Forwarded-Encrypted: i=2; AJvYcCWTP08Ghd5+PW46TpSzKZZPQDG0mrAPx6dumUBKqQFSWWd6vvOeUYWreJmkR13Bga/FyeUqAjNmYx2aApvzgT7lBjENyA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id s2-20020a05622a018200b0042c23be6994si7332322qtw.488.2024.02.11.15.17.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:17:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60992-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=Wcs0cfzu; 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-60992-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60992-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 C0DD21C20D7F for ; Sun, 11 Feb 2024 23:17:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 93C281EA76; Sun, 11 Feb 2024 23:15:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ionos.com header.i=@ionos.com header.b="Wcs0cfzu" Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 5542D1774A for ; Sun, 11 Feb 2024 23:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693346; cv=none; b=qYZQcEZK8OkaD4UErVnJCXXczOvhPkufQaBdn7JDMVvFNToAkt36tqiMg4dVUnvRiaTu1yeDUD9mJHRnMvj6tna8zvagL7FHLuvN1W/+6hyRK67olDRgRgC/b141eeGJmYHwQ2y7aogzlv0vOeAlmkGUmKUqrudnauskT7kISr8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707693346; c=relaxed/simple; bh=NuvTgovw/JWaOMSHbB+w3CvxRolTgHSjratxs4id3F8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i0a9kSJQWD6BmjZlY/NKg7d6nlxtSsuvNct9hJEXNGlCEdd/bf8MhicwWxOki6Oddl/LH+DSHvesRzLBgvw75bz2EUzbxvElCoCeHU04MAfsmQmZjKZvb9y1mWAAIlTXYmGHi2jZNTirv+kd2xEPpGoN1QquK5gFuOlCfWrB5GY= 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=Wcs0cfzu; arc=none smtp.client-ip=209.85.208.175 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-f175.google.com with SMTP id 38308e7fff4ca-2d0f1ec376bso8475231fa.1 for ; Sun, 11 Feb 2024 15:15:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ionos.com; s=google; t=1707693340; x=1708298140; 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=Wcs0cfzuve0p0rD0S/4skwKenLXTUtb7WDP3B+Pzhmnmd4Krmr9bTIZ8iHR0EJyGw+ rsfV5i48uhOYm9WqPH1RM9peclta/8X30GP1OhQnaYP1hMPIUqNJT3g4xdxML4+jz63e D2QJ9JzG19lKXQlEliEp3k/1FuaPc13u9GYE1p/SoxsTeWVcZUc5NCWqcux2LZk4/3EB m0Bromy+8uSK9FyGGewBJdI6ElRXyJx6adFDY7+PIWl2JqhSszjuFT1HqGBpAR+o07Jn IojgbAdL9TONOq1wSiBNT/+ULXt8h0oCwQ2TL06B/QCvCe8rkwuJyMFjUdqFlg3ieH7v Ayow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707693340; x=1708298140; 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=COCbP1O9DrOsBF4sK5rj/9eEkvkr3TaxRbfWkSvMIhfrTnPTIJia0FPLr1078J5Tl5 eDkeGdTowWwnCEnxEE7/Dh2kEMoKZm6+tb7KBtavHIbUZLX2HUP2/hitBBNE0pTbW/Mf 1Xhe6s/0yRydqd0ffY5yLMFLC2RCpkl+y6EdjspcXzxNd7BxbKvLll86neLptW1lNWnm zmMQOtcsO5eqFdG4l7X+Vtn/+sNocVQ6h42YXqIFoqpJX/Uzwn0NdM64L6xM8aSewQWX d+fNPE5CrekN7Gc9+d+xAsd9zZXjNL22MB4pR1tX8Yco14dNj3/OsX6ef6oXT+mpoBsO X/xQ== X-Gm-Message-State: AOJu0YwOKHWd4e1MexoGwVvC/dSsHe+AGJ+yCsS5Lp5oI3gZHKAQkFTU Vjs9jwUs5GML8Z7gvWaIfjP5KHtxyjQ7+/eUM9XbPbM9AzpnHGZ/n6Rls0zSyS0Pjql5B2Hoa7L D X-Received: by 2002:a2e:9bd3:0:b0:2d0:c273:669a with SMTP id w19-20020a2e9bd3000000b002d0c273669amr3105272ljj.46.1707693340607; Sun, 11 Feb 2024 15:15:40 -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.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Feb 2024 15:15:40 -0800 (PST) From: Max Kellermann To: linux-kernel@vger.kernel.org Cc: Max Kellermann Subject: [PATCH v4 09/35] rwsem.h: move declarations to rwsem_types.h Date: Mon, 12 Feb 2024 00:14:52 +0100 Message-Id: <20240211231518.349442-10-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: 1790646355590417805 X-GMAIL-MSGID: 1790646355590417805 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