From mboxrd@z Thu Jan 1 00:00:00 1970 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 CD7C51531ED for ; Wed, 21 Aug 2024 14:51:49 +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=1724251912; cv=none; b=JLjD92NS3XQi+5lpFPDB03km9rnkWhCOxdGmaf6E5VlM2nDQ2EBUyFt9pRSE9/uRI00LqR6c7xge5xETPuj58rKQQEU3zf1GJ0SyHKD8QYizxfnabV9Dv4zGwpBS43hUINJAnAoo9AsbwnTg2nRrr2PAWXFoapwGPtf8SDtZ8mM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724251912; c=relaxed/simple; bh=+/iqDUdNtBZcdvep0mmLMlp3fOL2oTvyuwkykFcr7G8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=N7yuFlGNS57XwPzrtrRcaAT33wyoReTj5MLiqX727Rd6dlI1Ikste8EoZUVBYVkVFI5YSVAmEdanfwfYJ6+d7/dpAmou1A1CO/8zZpGhW6pEjBnzcE5r7LHY4vzykCjHfhPGZSNzH4J9914uSqgNeggZGxvpxyuDAlduHz+yoyQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=o2/UQo7p; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="o2/UQo7p" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5becd359800so5827297a12.0 for ; Wed, 21 Aug 2024 07:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1724251908; x=1724856708; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=/9z45COXiOa8Ur7PNvfAex0dKJEUmq0VNfjSEwtXU3g=; b=o2/UQo7p9dIUxAnHK9wbKh3q046P1airZkEc439nFPm0hmyty2Ie65gkVxobl+3qrR hoKweGcv2NgYZf8QAVqNTFkzQZE89ZRLkbMdlNtc0YNPefpb5dpt2O5lVNNIquPR8NBj 1BKXlo9h9bnvfabE4kaKLhsZAnDjFqujlR3hjhjFmGCatpGh0Vno5e1fUehbIdbd3siw BNMPQHXgPYNGdE+g6KRMT8ecgj86em+rjiZ1BoKib0fo/ZljdUdaqF8aQ1k0N6bIraT+ H1Bh/F8vvePOpxqjubOsYOBnyM3oP7oJvoMbjgoUVbKXe2svoLc6tQ3F6f0lOQ5nZ/FQ D/Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724251908; x=1724856708; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/9z45COXiOa8Ur7PNvfAex0dKJEUmq0VNfjSEwtXU3g=; b=CoJsFHdDS0qePqoJPIb/W/qEhmujDwlnkKzRLwaIugFJB9ytxVyjRPi1yPo6U+/6Z/ Xv0JqDXduLtw0TAFdxcmi62F4m4aQ7HkJHRGbvhmZh4ZsPiXoQMGa0XgqWWvHHx7OX/k NKVQs/tivSkeLwNUaI5VFiAPEy3P+5uQ7NKJ7GZQYkaDyLyb/rDBTlJc9sFZeaXGgjCk d4qcF/TaP/Z8P9LnNGma1CS8KZ99EH/Y8EuzPlfXeA/mdYM2Yx1dfHHOm574Wcvfm2lS t6dqeIbI0qykThZcCfA9xNq8tqr9iZMRRah5Q1gyTszVou1l+mZ7v+VnOLmkRyWZfWoL 2AoA== X-Forwarded-Encrypted: i=1; AJvYcCX/bO6PCAz8z/rvpMnBV9g1Cbw0I75iBir+tuYGvNCkRs8vEN76rojD4zS9JhNpUbS/NIaXLSdDsJ8=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8VtdjLoHsaq4hleFK68jT9vIF5UHtmV1nD61GKsPrc552x9Iv oTTy/N0xzwFfeCZvu7zfTWnVxMCPaOOLbwkAKATAMHUwRhNC0TEwOc1XWyro7cQ= X-Google-Smtp-Source: AGHT+IFaIncl/DtJadX96lKhBGv1TThBKGu6LlRSGCmIs0kZEeAJeyIHSe6bPyWgF2jtKC9PjY8pKQ== X-Received: by 2002:a17:906:c149:b0:a77:dd1c:6273 with SMTP id a640c23a62f3a-a866f136a88mr179111066b.12.1724251907406; Wed, 21 Aug 2024 07:51:47 -0700 (PDT) Received: from localhost (cst2-173-13.cust.vodafone.cz. [31.30.173.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a83838c6ac5sm918850266b.18.2024.08.21.07.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2024 07:51:47 -0700 (PDT) Date: Wed, 21 Aug 2024 16:51:45 +0200 From: Andrew Jones To: Alexandre Ghiti Cc: Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Andrea Parri , Nathan Chancellor , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Arnd Bergmann , Leonardo Bras , Guo Ren , linux-doc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arch@vger.kernel.org Subject: Re: [PATCH v5 13/13] riscv: Add qspinlock support Message-ID: <20240821-ec1ec92842570050429621d1@orel> References: <20240818063538.6651-1-alexghiti@rivosinc.com> <20240818063538.6651-14-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240818063538.6651-14-alexghiti@rivosinc.com> On Sun, Aug 18, 2024 at 08:35:38AM GMT, Alexandre Ghiti wrote: > In order to produce a generic kernel, a user can select > CONFIG_COMBO_SPINLOCKS which will fallback at runtime to the ticket > spinlock implementation if Zabha or Ziccrse are not present. > > Note that we can't use alternatives here because the discovery of > extensions is done too late and we need to start with the qspinlock > implementation because the ticket spinlock implementation would pollute > the spinlock value, so let's use static keys. > > This is largely based on Guo's work and Leonardo reviews at [1]. > > Link: https://lore.kernel.org/linux-riscv/20231225125847.2778638-1-guoren@kernel.org/ [1] > Signed-off-by: Guo Ren > Signed-off-by: Alexandre Ghiti > --- > .../locking/queued-spinlocks/arch-support.txt | 2 +- > arch/riscv/Kconfig | 34 ++++++++++++++ > arch/riscv/include/asm/Kbuild | 4 +- > arch/riscv/include/asm/spinlock.h | 47 +++++++++++++++++++ > arch/riscv/kernel/setup.c | 37 +++++++++++++++ > include/asm-generic/qspinlock.h | 2 + > include/asm-generic/ticket_spinlock.h | 2 + > 7 files changed, 126 insertions(+), 2 deletions(-) > create mode 100644 arch/riscv/include/asm/spinlock.h > > diff --git a/Documentation/features/locking/queued-spinlocks/arch-support.txt b/Documentation/features/locking/queued-spinlocks/arch-support.txt > index 22f2990392ff..cf26042480e2 100644 > --- a/Documentation/features/locking/queued-spinlocks/arch-support.txt > +++ b/Documentation/features/locking/queued-spinlocks/arch-support.txt > @@ -20,7 +20,7 @@ > | openrisc: | ok | > | parisc: | TODO | > | powerpc: | ok | > - | riscv: | TODO | > + | riscv: | ok | > | s390: | TODO | > | sh: | TODO | > | sparc: | ok | > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index ef55ab94027e..201d0669db7f 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -79,6 +79,7 @@ config RISCV > select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP > select ARCH_WANTS_NO_INSTR > select ARCH_WANTS_THP_SWAP if HAVE_ARCH_TRANSPARENT_HUGEPAGE > + select ARCH_WEAK_RELEASE_ACQUIRE if ARCH_USE_QUEUED_SPINLOCKS Hi Alex, Did you get a chance to experiment this as suggested by Andrea? > select BINFMT_FLAT_NO_DATA_START_OFFSET if !MMU > select BUILDTIME_TABLE_SORT if MMU > select CLINT_TIMER if RISCV_M_MODE > @@ -488,6 +489,39 @@ config NODES_SHIFT > Specify the maximum number of NUMA Nodes available on the target > system. Increases memory reserved to accommodate various tables. > > +choice > + prompt "RISC-V spinlock type" > + default RISCV_COMBO_SPINLOCKS > + > +config RISCV_TICKET_SPINLOCKS > + bool "Using ticket spinlock" > + > +config RISCV_QUEUED_SPINLOCKS > + bool "Using queued spinlock" > + depends on SMP && MMU && NONPORTABLE > + select ARCH_USE_QUEUED_SPINLOCKS > + help > + The queued spinlock implementation requires the forward progress > + guarantee of cmpxchg()/xchg() atomic operations: CAS with Zabha or > + LR/SC with Ziccrse provide such guarantee. > + > + Select this if and only if Zabha or Ziccrse is available on your > + platform, RISCV_QUEUED_SPINLOCKS must not be selected for platforms > + without one of those extensions. > + > + If unsure, select RISCV_COMBO_SPINLOCKS, which will use qspinlocks > + when supported and otherwise ticket spinlocks. > + > +config RISCV_COMBO_SPINLOCKS > + bool "Using combo spinlock" > + depends on SMP && MMU > + select ARCH_USE_QUEUED_SPINLOCKS > + help > + Embed both queued spinlock and ticket lock so that the spinlock > + implementation can be chosen at runtime. > + > +endchoice > + > config RISCV_ALTERNATIVE > bool > depends on !XIP_KERNEL > diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild > index 5c589770f2a8..1c2618c964f0 100644 > --- a/arch/riscv/include/asm/Kbuild > +++ b/arch/riscv/include/asm/Kbuild > @@ -5,10 +5,12 @@ syscall-y += syscall_table_64.h > generic-y += early_ioremap.h > generic-y += flat.h > generic-y += kvm_para.h > +generic-y += mcs_spinlock.h > generic-y += parport.h > -generic-y += spinlock.h > generic-y += spinlock_types.h > +generic-y += ticket_spinlock.h > generic-y += qrwlock.h > generic-y += qrwlock_types.h > +generic-y += qspinlock.h > generic-y += user.h > generic-y += vmlinux.lds.h > diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/include/asm/spinlock.h > new file mode 100644 > index 000000000000..e5121b89acea > --- /dev/null > +++ b/arch/riscv/include/asm/spinlock.h > @@ -0,0 +1,47 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef __ASM_RISCV_SPINLOCK_H > +#define __ASM_RISCV_SPINLOCK_H > + > +#ifdef CONFIG_RISCV_COMBO_SPINLOCKS > +#define _Q_PENDING_LOOPS (1 << 9) > + > +#define __no_arch_spinlock_redefine > +#include > +#include > +#include > + > +/* > + * TODO: Use an alternative instead of a static key when we are able to parse > + * the extensions string earlier in the boot process. > + */ > +DECLARE_STATIC_KEY_TRUE(qspinlock_key); > + > +#define SPINLOCK_BASE_DECLARE(op, type, type_lock) \ > +static __always_inline type arch_spin_##op(type_lock lock) \ > +{ \ > + if (static_branch_unlikely(&qspinlock_key)) \ > + return queued_spin_##op(lock); \ > + return ticket_spin_##op(lock); \ > +} I guess there were still a couple questions on the kernel size impact of this. > + > +SPINLOCK_BASE_DECLARE(lock, void, arch_spinlock_t *) > +SPINLOCK_BASE_DECLARE(unlock, void, arch_spinlock_t *) > +SPINLOCK_BASE_DECLARE(is_locked, int, arch_spinlock_t *) > +SPINLOCK_BASE_DECLARE(is_contended, int, arch_spinlock_t *) > +SPINLOCK_BASE_DECLARE(trylock, bool, arch_spinlock_t *) > +SPINLOCK_BASE_DECLARE(value_unlocked, int, arch_spinlock_t) > + > +#elif defined(CONFIG_RISCV_QUEUED_SPINLOCKS) > + > +#include > + > +#else > + > +#include > + > +#endif > + > +#include > + > +#endif /* __ASM_RISCV_SPINLOCK_H */ > diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c > index a2cde65b69e9..438e4f6ad2ad 100644 > --- a/arch/riscv/kernel/setup.c > +++ b/arch/riscv/kernel/setup.c > @@ -244,6 +244,42 @@ static void __init parse_dtb(void) > #endif > } > > +#if defined(CONFIG_RISCV_COMBO_SPINLOCKS) > +DEFINE_STATIC_KEY_TRUE(qspinlock_key); > +EXPORT_SYMBOL(qspinlock_key); > +#endif > + > +static void __init riscv_spinlock_init(void) > +{ > + char *using_ext = NULL; > + > + if (IS_ENABLED(CONFIG_RISCV_TICKET_SPINLOCKS)) { > + pr_info("Ticket spinlock: enabled\n"); > + return; > + } > + > + if (IS_ENABLED(CONFIG_RISCV_ISA_ZABHA) && > + IS_ENABLED(CONFIG_RISCV_ISA_ZACAS) && > + riscv_isa_extension_available(NULL, ZABHA) && > + riscv_isa_extension_available(NULL, ZACAS)) { > + using_ext = "using Zabha"; > + } else if (riscv_isa_extension_available(NULL, ZICCRSE)) { > + using_ext = "using Ziccrse"; > + } > +#if defined(CONFIG_RISCV_COMBO_SPINLOCKS) > + else { > + static_branch_disable(&qspinlock_key); > + pr_info("Ticket spinlock: enabled\n"); > + return; > + } > +#endif > + > + if (!using_ext) > + pr_err("Queued spinlock without Zabha or Ziccrse"); > + else > + pr_info("Queued spinlock %s: enabled\n", using_ext); > +} > + > extern void __init init_rt_signal_env(void); > > void __init setup_arch(char **cmdline_p) > @@ -297,6 +333,7 @@ void __init setup_arch(char **cmdline_p) > riscv_set_dma_cache_alignment(); > > riscv_user_isa_enable(); > + riscv_spinlock_init(); > } > > bool arch_cpu_is_hotpluggable(int cpu) > diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h > index 0655aa5b57b2..bf47cca2c375 100644 > --- a/include/asm-generic/qspinlock.h > +++ b/include/asm-generic/qspinlock.h > @@ -136,6 +136,7 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock) > } > #endif > > +#ifndef __no_arch_spinlock_redefine > /* > * Remapping spinlock architecture specific functions to the corresponding > * queued spinlock functions. > @@ -146,5 +147,6 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock) > #define arch_spin_lock(l) queued_spin_lock(l) > #define arch_spin_trylock(l) queued_spin_trylock(l) > #define arch_spin_unlock(l) queued_spin_unlock(l) > +#endif > > #endif /* __ASM_GENERIC_QSPINLOCK_H */ > diff --git a/include/asm-generic/ticket_spinlock.h b/include/asm-generic/ticket_spinlock.h > index cfcff22b37b3..325779970d8a 100644 > --- a/include/asm-generic/ticket_spinlock.h > +++ b/include/asm-generic/ticket_spinlock.h > @@ -89,6 +89,7 @@ static __always_inline int ticket_spin_is_contended(arch_spinlock_t *lock) > return (s16)((val >> 16) - (val & 0xffff)) > 1; > } > > +#ifndef __no_arch_spinlock_redefine > /* > * Remapping spinlock architecture specific functions to the corresponding > * ticket spinlock functions. > @@ -99,5 +100,6 @@ static __always_inline int ticket_spin_is_contended(arch_spinlock_t *lock) > #define arch_spin_lock(l) ticket_spin_lock(l) > #define arch_spin_trylock(l) ticket_spin_trylock(l) > #define arch_spin_unlock(l) ticket_spin_unlock(l) > +#endif > > #endif /* __ASM_GENERIC_TICKET_SPINLOCK_H */ > -- > 2.39.2 > The patch looks good to me, so Reviewed-by: Andrew Jones It'd still be good to hear more about ARCH_WEAK_RELEASE_ACQUIRE and the kernel size though. Thanks, drew