Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp892575lqj; Mon, 3 Jun 2024 04:21:16 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWcUcVtuTyODfYHgS1bEBg3yPbshgfjOlVU5jSEKMr0j39H8vPi+ZZcFVSdL3OuBdItkHkezWnsXUc9Gr3YvWFrf4NoPK8jsbyz1SRglw== X-Google-Smtp-Source: AGHT+IHar11nXfCRdH5sg9QrRu+IixF50DcOEwD/IzwR8u2j/xO8IXJkLescZUAwWi7tMWEzNf4A X-Received: by 2002:a17:90b:1c0c:b0:2c1:e9e4:c6ea with SMTP id 98e67ed59e1d1-2c1e9e4cbcemr6819441a91.31.1717413676368; Mon, 03 Jun 2024 04:21:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717413676; cv=pass; d=google.com; s=arc-20160816; b=m7uQCaFEwRtw6MEp2wCyW2qnzq01rJW8wRhMVswM98VuXhZj9jEZdILSJCyycTptNt IGmO3yDy5dbPMKUH16D7u2tUeNwwShXlYUdDaubcqdzkPkBl4my2wj1qq43seGRNSp0q uHVQAC8hC1E3OaBAa9jJREsmVhp/t8SOd+WDZSNZq0luMh+sFwZXpN+6j+cwB6SDgYbb szT8hs8lvfZ7tx/saVVYrjm4/nfJqEOplQ8uYy/5qSJKImJahK1MW6jnRgcTs7g4Fk9n 9CI+v6VKyyOVLc6egyYYCd39vWCoeUAPoyru1dYPB2iefBnCLE55Yg4h3lpRgQjEvNQ5 OmdQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:dkim-signature; bh=WpGmjLXe2XDZeSDokGNc+BF0EY7VLOunSNG2u9oX47E=; fh=nPKkagwkEBK6KBNDZBEqzHFH0EgyANJqU2+c9CESwFs=; b=0hbnp5v71bgkr57bYnAv+lUEwVjl3OHltksmzJCr2GYRHTXzlyKhE/LFzNmrf+RCOW So5EC2Au8kzGuXHkN2Hou8xKEzX1LJx2LJYKka76C8/dPdYLSTU4Zh0aI7XPG83NFI3z 9dKOQPqYO3aRHOhkOvzD2af3tEGUz1KXsnb5nq0pYjzKgVeeQ8t9S5POSto1TtkkxrJo fuXeruigGI3lKO1KlTvSSS9Xq2CFQhA/Vy4pOL1RvZ0ztrjkd15c3uhjg4+zgqFvy+Aq KGkaa3vQxmPU7r+SoBgtOc8KKQfp+81ir+vSq1OkeAy8KFyKC8YnyeEK+sJB5+j74jvu u6BA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QxiTsHEp; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-199021-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199021-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c1c282b756si6348114a91.119.2024.06.03.04.21.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 04:21:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-199021-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QxiTsHEp; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-199021-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199021-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 4E50BB2529E for ; Mon, 3 Jun 2024 11:11:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0877584A35; Mon, 3 Jun 2024 11:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QxiTsHEp" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A1E17FBBE; Mon, 3 Jun 2024 11:11:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717413100; cv=none; b=MUiaJ0j1spiFiLKirGNj8tqZxrbDQ3xbNIgTBiYdZO2jnj7QF2nsk+yZ6MU3abn4dAoo9fPQuP3cWf/+1IM2Rb7xJ3z9gDRmlEO1B3fiTXZZYcpiejldhh4wORWPCn8a7wx9juVzCXS4zCP7Vn03ZiZqXeOIcSeCyqYaUjm0R0w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717413100; c=relaxed/simple; bh=tcxyK9s71QfV3xdgpdXvkdxY2UQhXIcW7RSsBnk8yWk=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=s1EAwKZvYOwBDHn9lvfLH6Fx3Rs8kWvGq4NmfCg91eVdHnNKjkwohXyXsx0NbVoUOdbpiAcaZJvqnNNdbT23CovFa1IX9akTmFR+SCrbwPXs5oBFbMpvHn+1lC8xugQIOTzA94eye21RRNIF/8tnf22e4Sp9nj1KRn/U950sCAE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QxiTsHEp; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEE86C4AF0D; Mon, 3 Jun 2024 11:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717413100; bh=tcxyK9s71QfV3xdgpdXvkdxY2UQhXIcW7RSsBnk8yWk=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=QxiTsHEpmnORVD70dARG5m/I2/VzRsjDh8gCXcSaPaXFwtZNQ2BHT9TDi5XDT3Xi/ 160UYP2BVok3/Jxsi+5V/0+5rZPaAGE+psXr6JxLzN/kaUWpDV3TJTkxwpYOIe37+N 5wMVw8TZ7iBGC4xqag68D3DB8bTOgibHXHHOCPm+kNKhEVNczoSBaYU/edY41hKKXH rx+dXQesPQXilyth3/Qmjkt96L/eHgIEEYDQ+zUxcM1/COfa3kUJQBCx6McE9D/DXk +WHuzREeY2i4R6i/ZTgPIoChvfTKA64hy+PCJAd5NEGLWH7NsDEvWzhVpTvcSzGINb F1tPpThk7O0VA== Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-52b7ffd9f6eso3922789e87.3; Mon, 03 Jun 2024 04:11:39 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCWHOdO/NorDi2Tb1aboEwbKpvvNyS75QSDTCRewf/7I2aDWNXhWm0gu5EJV7kOBG5nKHbkWzXQhITLbeOvDpUr6WGO6v0BjQRS+vvf2jKEJJgWrXhLZyaxsFGXLQha3F3/QKoEoUbO2pnUhcUF8zEvV/LRCEzjnVxUjsDii0fF72OqMeQ== X-Gm-Message-State: AOJu0YyGP95v/oJN71TfrYaYgDh84GgNhGcikgiotFnWsFWtkIv2zsIs +0YEAnkJR9iUYz8tSzLboFbbF6FTsCJvEsOZZptAgSSMogGmTnu84XqDqHLCd0GwcFzxMjD/53D qUNsbxM8T6L5txisCRZ0Uyv+C7QM= X-Received: by 2002:ac2:5633:0:b0:52b:70c3:45f7 with SMTP id 2adb3069b0e04-52b8955963amr5195863e87.3.1717413097981; Mon, 03 Jun 2024 04:11:37 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20240528151052.313031-1-alexghiti@rivosinc.com> <20240528151052.313031-8-alexghiti@rivosinc.com> <6adf71fb-287b-490c-b7b0-4f8fa4fc1560@ghiti.fr> In-Reply-To: <6adf71fb-287b-490c-b7b0-4f8fa4fc1560@ghiti.fr> From: Guo Ren Date: Mon, 3 Jun 2024 19:11:24 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 7/7] riscv: Add qspinlock support based on Zabha extension To: Alexandre Ghiti Cc: Alexandre Ghiti , Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Arnd Bergmann , Leonardo Bras , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arch@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jun 3, 2024 at 5:22=E2=80=AFPM Alexandre Ghiti wrot= e: > > Hi Guo, > > On 31/05/2024 08:42, Guo Ren wrote: > > On Fri, May 31, 2024 at 2:22=E2=80=AFPM Alexandre Ghiti wrote: > >> On Fri, May 31, 2024 at 3:57=E2=80=AFAM Guo Ren wr= ote: > >>> On Thu, May 30, 2024 at 1:30=E2=80=AFPM Alexandre Ghiti wrote: > >>>> Hi Guo, > >>>> > >>>> On Thu, May 30, 2024 at 3:55=E2=80=AFAM Guo Ren = wrote: > >>>>> On Wed, May 29, 2024 at 9:03=E2=80=AFPM Alexandre Ghiti wrote: > >>>>>> Hi Guo, > >>>>>> > >>>>>> On Wed, May 29, 2024 at 11:24=E2=80=AFAM Guo Ren wrote: > >>>>>>> On Tue, May 28, 2024 at 11:18=E2=80=AFPM Alexandre Ghiti wrote: > >>>>>>>> In order to produce a generic kernel, a user can select > >>>>>>>> CONFIG_QUEUED_SPINLOCKS which will fallback at runtime to the ti= cket > >>>>>>>> spinlock implementation if Zabha is not present. > >>>>>>>> > >>>>>>>> Note that we can't use alternatives here because the discovery o= f > >>>>>>>> extensions is done too late and we need to start with the qspinl= ock > >>>>>>>> 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: Alexandre Ghiti > >>>>>>>> --- > >>>>>>>> .../locking/queued-spinlocks/arch-support.txt | 2 +- > >>>>>>>> arch/riscv/Kconfig | 1 + > >>>>>>>> arch/riscv/include/asm/Kbuild | 4 +- > >>>>>>>> arch/riscv/include/asm/spinlock.h | 39 +++++++++++= ++++++++ > >>>>>>>> arch/riscv/kernel/setup.c | 18 +++++++++ > >>>>>>>> include/asm-generic/qspinlock.h | 2 + > >>>>>>>> include/asm-generic/ticket_spinlock.h | 2 + > >>>>>>>> 7 files changed, 66 insertions(+), 2 deletions(-) > >>>>>>>> create mode 100644 arch/riscv/include/asm/spinlock.h > >>>>>>>> > >>>>>>>> diff --git a/Documentation/features/locking/queued-spinlocks/arc= h-support.txt b/Documentation/features/locking/queued-spinlocks/arch-suppor= t.txt > >>>>>>>> index 22f2990392ff..cf26042480e2 100644 > >>>>>>>> --- a/Documentation/features/locking/queued-spinlocks/arch-suppo= rt.txt > >>>>>>>> +++ b/Documentation/features/locking/queued-spinlocks/arch-suppo= rt.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 184a9edb04e0..ccf1703edeb9 100644 > >>>>>>>> --- a/arch/riscv/Kconfig > >>>>>>>> +++ b/arch/riscv/Kconfig > >>>>>>>> @@ -59,6 +59,7 @@ config RISCV > >>>>>>>> select ARCH_SUPPORTS_SHADOW_CALL_STACK if HAVE_SHADOW_C= ALL_STACK > >>>>>>>> select ARCH_USE_MEMTEST > >>>>>>>> select ARCH_USE_QUEUED_RWLOCKS > >>>>>>>> + select ARCH_USE_QUEUED_SPINLOCKS if TOOLCHAIN_HAS_ZABHA > >>>>>>> Using qspinlock or not depends on real hardware capabilities, not= the > >>>>>>> compiler flag. That's why I introduced combo-spinlock, ticket-spi= nlock > >>>>>>> & qspinlock three Kconfigs, and the combo-spinlock would compat a= ll > >>>>>>> hardware platforms but waste some qspinlock code size. > >>>>>> You're right, and I think your comment matches what Conor mentione= d > >>>>>> about the lack of clarity with some extensions: TOOLCHAIN_HAS_ZABH= A > >>>>>> will allow a platform with Zabha capability to use qspinlocks. But= if > >>>>>> the hardware does not, it will fallback to the ticket spinlocks. > >>>>>> > >>>>>> But I agree that looking at the config alone may be misleading, ev= en > >>>>>> though it will work as expected at runtime. So I agree with you: > >>>>>> unless anyone is strongly against the combo spinlocks, I will do w= hat > >>>>>> you suggest and add them. > >>>>> The problem with the v12 combo-spinlock is using a static_branch > >>>>> instead of the full ALTERNATIVE. Frankly, that's a bad example that > >>>>> costs more code space. I found that your cmpxchg32/64 also uses a > >>>>> condition branch, which has a similar problem, right? > >>>>> > >>>>> Anyway, your patch series inspired me to update the v13 > >>>>> combo-spinlock. My plan is: > >>>>> 1. Separate native-qspinlock out of paravirt-qspinlock. > >>>>> 2. Re-design an ALTERNATIVE(asm) code instead of static_branch gene= ric > >>>>> ticket-lock or qspinlock. > >>>> What's your plan to make use of alternatives here? The alternatives > >>>> patching depends on the discovery of the extensions, which is done t= oo > >>>> late, at least after the first use of a spinlock (the printk > >>>> spinlock). So you'd need to find a way to first use qspinlocks (but > >>>> without knowing Zabha is available) and then do the correct patching= : > >>> I do that in v12: > >>> 1. Use qspinlock as init. > >>> 2. Change to ticket-lock or not. > >>> (Only qspinlock -> ticket-lock, No reverse direction) > >>> > >>> If there is no contention, Qspinlock is okay for all platforms before > >>> smp bringup & no-irq environment. > >>> > >> Yes, by using static keys not alternatives. My question was: how do > >> you plan to use alternatives here instead of static keys? To me, it's > >> not that simple, hence my suggestions in my previous answer. > > Yes, it's not that simple. The current framework doesn't support that > > and has two problems: > > 1. We need to re-implement ticket-lock & qspinlock-fast-path with assem= bly code. > > 2. Current alternatives patching only for extensions, but qspinlock is > > not a formal extension. Could we accept > > __RISCV_ISA_EXT_DATA(xqspinlock, RISCV_ISA_EXT_XQSPINLOCK)? > > > But the problem is that the alternatives needs to patch the code very > early in the boot process which is not possible since we don't have the > list of extensions yet (for ACPI systems), so your > RISCV_ISA_EXT_XQSPINLOCK proposal would not help. I think the setup_arch()->apply_boot_alternatives() is okay. I can do that in v13. > > Thanks, > > Alex > > > > > >> Thanks, > >> > >> Alex > >> > >>>> an idea here could be to add an "init" value to the alternatives and > >>>> let the patching process do the right thing when the extensions are > >>>> known. > >>>> > >>>> Another solution would be the early discovery of the extensions, but= I > >>>> took a look and it's easy with a device tree, but not with ACPI. > >>>> > >>>> Let me know what you plan to do and how I can help! > >>>> > >>>> Thanks, > >>>> > >>>> Alex > >>>> > >>>>> What do you think? > >>>>> > >>>>> > >>>>>> Thanks again for your initial work, > >>>>>> > >>>>>> Alex > >>>>>> > >>>>>>>> select ARCH_USES_CFI_TRAPS if CFI_CLANG > >>>>>>>> select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP && MMU > >>>>>>>> select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU > >>>>>>>> diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/= asm/Kbuild > >>>>>>>> index 504f8b7e72d4..ad72f2bd4cc9 100644 > >>>>>>>> --- a/arch/riscv/include/asm/Kbuild > >>>>>>>> +++ b/arch/riscv/include/asm/Kbuild > >>>>>>>> @@ -2,10 +2,12 @@ > >>>>>>>> generic-y +=3D early_ioremap.h > >>>>>>>> generic-y +=3D flat.h > >>>>>>>> generic-y +=3D kvm_para.h > >>>>>>>> +generic-y +=3D mcs_spinlock.h > >>>>>>>> generic-y +=3D parport.h > >>>>>>>> -generic-y +=3D spinlock.h > >>>>>>>> generic-y +=3D spinlock_types.h > >>>>>>>> +generic-y +=3D ticket_spinlock.h > >>>>>>>> generic-y +=3D qrwlock.h > >>>>>>>> generic-y +=3D qrwlock_types.h > >>>>>>>> +generic-y +=3D qspinlock.h > >>>>>>>> generic-y +=3D user.h > >>>>>>>> generic-y +=3D vmlinux.lds.h > >>>>>>>> diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/incl= ude/asm/spinlock.h > >>>>>>>> new file mode 100644 > >>>>>>>> index 000000000000..e00429ac20ed > >>>>>>>> --- /dev/null > >>>>>>>> +++ b/arch/riscv/include/asm/spinlock.h > >>>>>>>> @@ -0,0 +1,39 @@ > >>>>>>>> +/* SPDX-License-Identifier: GPL-2.0 */ > >>>>>>>> + > >>>>>>>> +#ifndef __ASM_RISCV_SPINLOCK_H > >>>>>>>> +#define __ASM_RISCV_SPINLOCK_H > >>>>>>>> + > >>>>>>>> +#ifdef CONFIG_QUEUED_SPINLOCKS > >>>>>>>> +#define _Q_PENDING_LOOPS (1 << 9) > >>>>>>>> + > >>>>>>>> +#define __no_arch_spinlock_redefine > >>>>>>>> +#include > >>>>>>>> +#include > >>>>>>>> +#include > >>>>>>>> + > >>>>>>>> +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); = \ > >>>>>>>> +} > >>>>>>>> + > >>>>>>>> +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) > >>>>>>>> + > >>>>>>>> +#else > >>>>>>>> + > >>>>>>>> +#include > >>>>>>>> + > >>>>>>>> +#endif > >>>>>>>> + > >>>>>>>> +#include > >>>>>>>> + > >>>>>>>> +#endif /* __ASM_RISCV_SPINLOCK_H */ > >>>>>>>> diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup= .c > >>>>>>>> index 4f73c0ae44b2..31ce75522fd4 100644 > >>>>>>>> --- a/arch/riscv/kernel/setup.c > >>>>>>>> +++ b/arch/riscv/kernel/setup.c > >>>>>>>> @@ -244,6 +244,23 @@ static void __init parse_dtb(void) > >>>>>>>> #endif > >>>>>>>> } > >>>>>>>> > >>>>>>>> +DEFINE_STATIC_KEY_TRUE(qspinlock_key); > >>>>>>>> +EXPORT_SYMBOL(qspinlock_key); > >>>>>>>> + > >>>>>>>> +static void __init riscv_spinlock_init(void) > >>>>>>>> +{ > >>>>>>>> + asm goto(ALTERNATIVE("nop", "j %[qspinlock]", 0, RISCV_I= SA_EXT_ZABHA, 1) > >>>>>>>> + : : : : qspinlock); > >>>>>>>> + > >>>>>>>> + static_branch_disable(&qspinlock_key); > >>>>>>>> + pr_info("Ticket spinlock: enabled\n"); > >>>>>>>> + > >>>>>>>> + return; > >>>>>>>> + > >>>>>>>> +qspinlock: > >>>>>>>> + pr_info("Queued spinlock: enabled\n"); > >>>>>>>> +} > >>>>>>>> + > >>>>>>>> extern void __init init_rt_signal_env(void); > >>>>>>>> > >>>>>>>> void __init setup_arch(char **cmdline_p) > >>>>>>>> @@ -295,6 +312,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-gener= ic/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(s= truct qspinlock *lock) > >>>>>>>> } > >>>>>>>> #endif > >>>>>>>> > >>>>>>>> +#ifndef __no_arch_spinlock_redefine > >>>>>>>> /* > >>>>>>>> * Remapping spinlock architecture specific functions to the c= orresponding > >>>>>>>> * queued spinlock functions. > >>>>>>>> @@ -146,5 +147,6 @@ static __always_inline bool virt_spin_lock(s= truct 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_cont= ended(arch_spinlock_t *lock) > >>>>>>>> return (s16)((val >> 16) - (val & 0xffff)) > 1; > >>>>>>>> } > >>>>>>>> > >>>>>>>> +#ifndef __no_arch_spinlock_redefine > >>>>>>>> /* > >>>>>>>> * Remapping spinlock architecture specific functions to the c= orresponding > >>>>>>>> * ticket spinlock functions. > >>>>>>>> @@ -99,5 +100,6 @@ static __always_inline int ticket_spin_is_con= tended(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 > >>>>>>>> > >>>>>>> > >>>>>>> -- > >>>>>>> Best Regards > >>>>>>> Guo Ren > >>>>> > >>>>> > >>>>> -- > >>>>> Best Regards > >>>>> Guo Ren > >>> > >>> > >>> -- > >>> Best Regards > >>> Guo Ren > > > > --=20 Best Regards Guo Ren