From patchwork Fri Apr 14 05:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13210936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A1D7C77B6E for ; Fri, 14 Apr 2023 05:13:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ACF7900008; Fri, 14 Apr 2023 01:13:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 483D8900003; Fri, 14 Apr 2023 01:13:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3728C900008; Fri, 14 Apr 2023 01:13:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 28C33900003 for ; Fri, 14 Apr 2023 01:13:58 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 026A2140129 for ; Fri, 14 Apr 2023 05:13:58 +0000 (UTC) X-FDA: 80678829756.24.72D306E Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf13.hostedemail.com (Postfix) with ESMTP id 5E48A20008 for ; Fri, 14 Apr 2023 05:13:56 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=BULy9RaW; spf=none (imf13.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681449236; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=TqXpp0mGR6pbQr82UrkZafoUwwcLEWn2SwPyhW5ccH4=; b=bWQnbVtlM+W1/8eJ6fgEPcgAb28+KlEVQW+aGwfN5lMNgBAXVuxPMSg2f8YTMmOJCun7c/ NQFkRa7HzL/kzUK7rw/0iYNYgr5uq0EGWp/01tKbatl6vyAWF/v6PDlAOG3B22lVW0v1xx tfvJ4EcpmJkLFGlMB74aEkEvpgrni1E= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=BULy9RaW; spf=none (imf13.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681449236; a=rsa-sha256; cv=none; b=T4zmms2yrfMMFTkM/JzT2k69hQoZs4cBUFXs9QKkjXYhDMEzXK942hQp6pzEZUVt0dP900 FPr0q5h7s2f/AFpLGWYTDrWPBHbKOCh/3KUOfprd1ZiqYfr5qGhP5qANzVrjatCs4sLExs N2fvTxFrj4d5NU4h9TLbGMSj7se5dkM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=TqXpp0mGR6pbQr82UrkZafoUwwcLEWn2SwPyhW5ccH4=; b=BULy9RaW0sKW34wI3U/nRTevOf V0tgtZ290N5EdoMsGO+8NDiJVaASzqH6NnwzHjt+znHVdAzMWAQviQWj7W0Eh+bybvF7e6318lbaZ 47SMRm6aT4/b8vm6PNa5qB1IL61I28sOPN59euF6eERPv5v8MEOEQ8DEAeN2KmXBCIhVlrI0ampgU TRujx2Cb1m/mFuRfnmbwKsAnEETCoICQ3LJmrbZgH+Rji3h77gXLKwHMvJF1WSP3StQpy3vqLVet/ jLTd/xj4oEWZOr0ci4I/LWQnwf9vNmcdFRPImQKN+Qv/8d4yCsy+ay5wqn8Xg7+76VTJ3TEwXZQRk T0WrQzPg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pnBks-008KqV-1k; Fri, 14 Apr 2023 05:13:50 +0000 From: Luis Chamberlain To: david@redhat.com, patches@lists.linux.dev, linux-modules@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, pmladek@suse.com, petr.pavlu@suse.com, prarit@redhat.com, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rafael@kernel.org Cc: christophe.leroy@csgroup.eu, tglx@linutronix.de, peterz@infradead.org, song@kernel.org, rppt@kernel.org, dave@stgolabs.net, willy@infradead.org, vbabka@suse.cz, mhocko@suse.com, dave.hansen@linux.intel.com, colin.i.king@gmail.com, jim.cromie@gmail.com, catalin.marinas@arm.com, jbaron@akamai.com, rick.p.edgecombe@intel.com, mcgrof@kernel.org Subject: [PATCH v3 1/2] Change DEFINE_SEMAPHORE() to take a number argument Date: Thu, 13 Apr 2023 22:13:48 -0700 Message-Id: <20230414051349.1986744-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230414051349.1986744-1-mcgrof@kernel.org> References: <20230414051349.1986744-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 5E48A20008 X-Stat-Signature: 5cc5nbpu9yh9qxaeuj5f6fhcryne193c X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1681449236-174600 X-HE-Meta: U2FsdGVkX181BOkj/hhK+miI1hKuGyPzMrGfFD41e+xwmyCQKHEOA2AZ0rBid/cBZYt5NW+FnQYPsP3fDH6YiKe4nvb0usFOygJ1I8xiT67mXHq76/1uTrbzfmvPKV3Tb2dMkpFbqNZ9Wx6FOB0nSsyDEp+v1yqaYzWgEFZ7t/SeCwV69fvQsAj6B7uCbB1oziHEIU1i0qJ9Rbpw21oUXpYtLoXsMrawlFTucuMaUnQfnlRZvcjeIi0cxeTDFOoZV+SykyP+Y9JnEd+NYm3TkZzXRjyF5qwHMSmf179TAsnM8ln/hTAsw5SGJ1n5TjF5V08gMTX0XG9Z35ArxakJ7ksPOLVU7/bJvgWsSpUxplKfk/+/39Upr91nxn/mlWhkBMMwfnTtU5u03FF7OfLTiZWY8NOia6N4xVw7ZQSsT8tRHI0hy13tIuHQixwVKPPK0MfYsH7SgdNgLF9B88s1+QQQ8KnrhNyKZhKkHHXAH3j6JwkK71opEUFGgkcUcXhXyiylWgaJNugEkrHUwJZXbnwXrCqAJrDMgkaFr0KvXgbPPCEaZglzDPelXZWF5yL+rK6qmmvhvjZzcBlgs7B+Q0VLHLXhazrvBPRUmK9EeJ5cXtqpFJwWS0bqSMMBq0Q7eKA0Sz1uBeN9RrQFVWLmX9RX5MGb8xB95d6gh0Q2XwOKwz+WSzOsgle4m8U4i7YIly0ScljRkYL11w4PnZSJIruCsRJeGd9JD7oj8FKJA3RNRFbTKObr/fbH+Nm1fUI6wStY/7YTIU3HsvO1CSAOfnLGhGrx7b5efBVmTskITCvp0uzUDdqK41Rc3dh7/XzM9bnXi4OXRIZTQo5/DqdSpzLCeuHJHUQ/rHFofnQrQ+OsbmMV2Q+vmX6Cy8ttdvGg124m9yTYByjOYs2HwkRbBZbtYJXpiR6SklpnDZsDT3Qy/kTLH/SW0xMIC8wgFQPofxau/2BwfcFLETHY9wB j2XxHV53 Sk1gJuIo6roayIO4ghET81ek9yCEuFunkELEBZX8WogzAZV0IZem86+hOBGHHW/rO6evlj8V9Z7VbY2Ss4G/0s2HsEAPFlVmIGqrvOtfKrfPnxNbQ4BwG3lbYhtydoM+TuEBc1wSFYDx1ViGee6vEZTLcAUAwiBxeOVUDU+OUt4vE8vwfNdHs0ZO1RxXZszoF6n/mJZKKKM4N/erqg4yNfKXcZOg5VDJOdXUli75eCr3quYP6DJi5v4mcanaDs67vWMlCfx1JVoWHfN7t1ZYFkZbW8TCptuhtthN2qc9YByQ02lTzL3Kox6maeEXdea3fw/92AQhFW53aUBxvpTAX00w4dpSx1ubqQXn5a40XWRLTrU91coIyipqfhnnLVxx30b0WuP1ja3Mk7ftIHM8Ya1ZQbN/js+gMWAkzUzjR4iqGkGkfmHo58CUDm7tKOUWyCIzkAzwuZlYVlvttUaX1CtKulHhufbhiji8RrWQEjTdxv2SlvnrqbY+Vp1kNVBo9BTV9hve0rfUAbakCLZmTXvlswzhb2ENCbZobA1jifKwa3zT7+YGWsSdOY3xCNgvQXhtbU9mDTsVZ08TCTqvI+H5LoA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Peter Zijlstra Fundamentally semaphores are a counted primitive, but DEFINE_SEMAPHORE() does not expose this and explicitly creates a binary semaphore. Change DEFINE_SEMAPHORE() to take a number argument and use that in the few places that open-coded it using __SEMAPHORE_INITIALIZER(). Signed-off-by: Peter Zijlstra (Intel) [mcgrof: add some tribal knowledge about why some folks prefer binary sempahores over mutexes] Signed-off-by: Luis Chamberlain --- arch/mips/cavium-octeon/setup.c | 2 +- arch/x86/kernel/cpu/intel.c | 2 +- drivers/firmware/efi/runtime-wrappers.c | 2 +- drivers/firmware/efi/vars.c | 2 +- drivers/macintosh/adb.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/platform/x86/intel/ifs/sysfs.c | 2 +- drivers/scsi/esas2r/esas2r_ioctl.c | 2 +- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- include/linux/semaphore.h | 11 +++++++++-- kernel/printk/printk.c | 2 +- net/rxrpc/call_object.c | 6 ++---- 12 files changed, 21 insertions(+), 16 deletions(-) diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index a71727f7a608..c5561016f577 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -72,7 +72,7 @@ extern void pci_console_init(const char *arg); static unsigned long long max_memory = ULLONG_MAX; static unsigned long long reserve_low_mem; -DEFINE_SEMAPHORE(octeon_bootbus_sem); +DEFINE_SEMAPHORE(octeon_bootbus_sem, 1); EXPORT_SYMBOL(octeon_bootbus_sem); static struct octeon_boot_descriptor *octeon_boot_desc_ptr; diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 291d4167fab8..12bad63822f0 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -1177,7 +1177,7 @@ static const struct { static struct ratelimit_state bld_ratelimit; static unsigned int sysctl_sld_mitigate = 1; -static DEFINE_SEMAPHORE(buslock_sem); +static DEFINE_SEMAPHORE(buslock_sem, 1); #ifdef CONFIG_PROC_SYSCTL static struct ctl_table sld_sysctls[] = { diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 1fba4e09cdcf..a400c4312c82 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -158,7 +158,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) * none of the remaining functions are actually ever called at runtime. * So let's just use a single lock to serialize all Runtime Services calls. */ -static DEFINE_SEMAPHORE(efi_runtime_lock); +static DEFINE_SEMAPHORE(efi_runtime_lock, 1); /* * Expose the EFI runtime lock to the UV platform diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index bd75b87f5fc1..bfc5fa6aa47b 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c @@ -21,7 +21,7 @@ /* Private pointer to registered efivars */ static struct efivars *__efivars; -static DEFINE_SEMAPHORE(efivars_lock); +static DEFINE_SEMAPHORE(efivars_lock, 1); static efi_status_t check_var_size(bool nonblocking, u32 attributes, unsigned long size) diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 23bd0c77ac1a..56599515d51a 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -80,7 +80,7 @@ static struct adb_driver *adb_controller; BLOCKING_NOTIFIER_HEAD(adb_client_list); static int adb_got_sleep; static int adb_inited; -static DEFINE_SEMAPHORE(adb_probe_mutex); +static DEFINE_SEMAPHORE(adb_probe_mutex, 1); static int sleepy_trackpad; static int autopoll_devs; int __adb_probe_sync; diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 5d1e4fe335aa..5a105bab4387 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -298,7 +298,7 @@ const u32 dmae_reg_go_c[] = { /* Global resources for unloading a previously loaded device */ #define BNX2X_PREV_WAIT_NEEDED 1 -static DEFINE_SEMAPHORE(bnx2x_prev_sem); +static DEFINE_SEMAPHORE(bnx2x_prev_sem, 1); static LIST_HEAD(bnx2x_prev_list); /* Forward declaration */ diff --git a/drivers/platform/x86/intel/ifs/sysfs.c b/drivers/platform/x86/intel/ifs/sysfs.c index ee636a76b083..4c3c642ee19a 100644 --- a/drivers/platform/x86/intel/ifs/sysfs.c +++ b/drivers/platform/x86/intel/ifs/sysfs.c @@ -13,7 +13,7 @@ * Protects against simultaneous tests on multiple cores, or * reloading can file while a test is in progress */ -static DEFINE_SEMAPHORE(ifs_sem); +static DEFINE_SEMAPHORE(ifs_sem, 1); /* * The sysfs interface to check additional details of last test diff --git a/drivers/scsi/esas2r/esas2r_ioctl.c b/drivers/scsi/esas2r/esas2r_ioctl.c index e003d923acbf..055d2e87a2c8 100644 --- a/drivers/scsi/esas2r/esas2r_ioctl.c +++ b/drivers/scsi/esas2r/esas2r_ioctl.c @@ -56,7 +56,7 @@ dma_addr_t esas2r_buffered_ioctl_addr; u32 esas2r_buffered_ioctl_size; struct pci_dev *esas2r_buffered_ioctl_pcid; -static DEFINE_SEMAPHORE(buffered_ioctl_semaphore); +static DEFINE_SEMAPHORE(buffered_ioctl_semaphore, 1); typedef int (*BUFFERED_IOCTL_CALLBACK)(struct esas2r_adapter *, struct esas2r_request *, struct esas2r_sg_context *, diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index cddcd3c596c9..1a656fdc9445 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -149,7 +149,7 @@ static char *g_fragments_base; static char *g_free_fragments; static struct semaphore g_free_fragments_sema; -static DEFINE_SEMAPHORE(g_free_fragments_mutex); +static DEFINE_SEMAPHORE(g_free_fragments_mutex, 1); static int vchiq_blocking_bulk_transfer(struct vchiq_instance *instance, unsigned int handle, void *data, diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h index 6694d0019a68..2d6aa3fd7861 100644 --- a/include/linux/semaphore.h +++ b/include/linux/semaphore.h @@ -25,8 +25,15 @@ struct semaphore { .wait_list = LIST_HEAD_INIT((name).wait_list), \ } -#define DEFINE_SEMAPHORE(name) \ - struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1) +/* + * There is a big difference between a binary semaphore and a mutex. + * You cannot call mutex_unlock() from IRQ context because it takes an + * internal mutex spin_lock in a non-IRQ-safe manner. Both try_lock() + * and unlock() can be called from IRQ context. A mutex must also be + * released in the same context that locked it. + */ +#define DEFINE_SEMAPHORE(_name, _n) \ + struct semaphore _name = __SEMAPHORE_INITIALIZER(_name, _n) static inline void sema_init(struct semaphore *sem, int val) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fd0c9f913940..76987aaa5a45 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -89,7 +89,7 @@ static DEFINE_MUTEX(console_mutex); * console_sem protects updates to console->seq and console_suspended, * and also provides serialization for console printing. */ -static DEFINE_SEMAPHORE(console_sem); +static DEFINE_SEMAPHORE(console_sem, 1); HLIST_HEAD(console_list); EXPORT_SYMBOL_GPL(console_list); DEFINE_STATIC_SRCU(console_srcu); diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index e9f1f49d18c2..3e5cc70884dd 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -40,10 +40,8 @@ const char *const rxrpc_call_completions[NR__RXRPC_CALL_COMPLETIONS] = { struct kmem_cache *rxrpc_call_jar; -static struct semaphore rxrpc_call_limiter = - __SEMAPHORE_INITIALIZER(rxrpc_call_limiter, 1000); -static struct semaphore rxrpc_kernel_call_limiter = - __SEMAPHORE_INITIALIZER(rxrpc_kernel_call_limiter, 1000); +static DEFINE_SEMAPHORE(rxrpc_call_limiter, 1000); +static DEFINE_SEMAPHORE(rxrpc_kernel_call_limiter, 1000); void rxrpc_poke_call(struct rxrpc_call *call, enum rxrpc_call_poke_trace what) {