From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCD74C433B4 for ; Sun, 11 Apr 2021 16:02:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9EF446105A for ; Sun, 11 Apr 2021 16:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236381AbhDKQC4 (ORCPT ); Sun, 11 Apr 2021 12:02:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235781AbhDKQCz (ORCPT ); Sun, 11 Apr 2021 12:02:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7563C61041; Sun, 11 Apr 2021 16:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618156958; bh=TJw038FUfkWYVYkaVmTwRcX8gW1Hrtqnv9rYV52PKrI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=u0O8VVf8zy1PR2e25z0pJKozdIHbQJxa0IL1m2ShcIfesaiUzFtGRvrmSFOHMxSZs c8KgKfrywOtTgpLIESrsI/Cs4Vn9WkeLFbOe8EwqA2c1g1KPx8Wp9plKR8cHtNf3Qo IB2sDtZW0hA2ZzPXlkDLl7rGNxhR4rugm6fZ/8o3xXmWeFHiOtIOxfAo3Oue+bBzWz mt9+HpTF1RUm1fVm9AMrigkEsuBMzxUkJi9gampcR1e8Yd91Lwk++MgYmeehC82jRQ 85sY8hTUkTJ4v4kPjgzC7K/is4TbgtljQug0d3sWsK4KICaiyVwBkJjBGig+VFgbnz 6ZRNnnGckXNrA== Received: by mail-lj1-f180.google.com with SMTP id u9so12279562ljd.11; Sun, 11 Apr 2021 09:02:38 -0700 (PDT) X-Gm-Message-State: AOAM531nSr0g36iaPAgj0ngXej7VM5EWm65uy4sNdYL0dL1uZJxxR7xO tfjeLI+aP7Exnzdaovm0SOWTKhY0NJ9zpLEKzqc= X-Google-Smtp-Source: ABdhPJwBbonxz+gck6Cl5q5ziKW6g+nADEkFDKCdplfaEDt09lBYiLD8iBC6rcF3SKmLf+EgR6MFZf5Na1JfSr6rJDU= X-Received: by 2002:a2e:8182:: with SMTP id e2mr13024419ljg.238.1618156956863; Sun, 11 Apr 2021 09:02:36 -0700 (PDT) MIME-Version: 1.0 References: <1617201040-83905-1-git-send-email-guoren@kernel.org> <1617201040-83905-4-git-send-email-guoren@kernel.org> In-Reply-To: <1617201040-83905-4-git-send-email-guoren@kernel.org> From: Guo Ren Date: Mon, 12 Apr 2021 00:02:24 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v6 3/9] riscv: locks: Introduce ticket-based spinlock implementation To: Guo Ren Cc: linux-riscv , Linux Kernel Mailing List , linux-csky@vger.kernel.org, linux-arch , linuxppc-dev@lists.ozlabs.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux , Guo Ren , Peter Zijlstra , Anup Patel , Arnd Bergmann Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 31, 2021 at 10:32 PM wrote: > > From: Guo Ren > > This patch introduces a ticket lock implementation for riscv, along the > same lines as the implementation for arch/arm & arch/csky. > > We still use qspinlock as default. > > Signed-off-by: Guo Ren > Cc: Peter Zijlstra > Cc: Anup Patel > Cc: Arnd Bergmann > --- > arch/riscv/Kconfig | 7 ++- > arch/riscv/include/asm/spinlock.h | 84 +++++++++++++++++++++++++ > arch/riscv/include/asm/spinlock_types.h | 17 +++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 67cc65ba1ea1..34d0276f01d5 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -34,7 +34,7 @@ config RISCV > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_HUGE_PMD_SHARE if 64BIT > select ARCH_USE_QUEUED_RWLOCKS > - select ARCH_USE_QUEUED_SPINLOCKS > + select ARCH_USE_QUEUED_SPINLOCKS if !RISCV_TICKET_LOCK > select ARCH_USE_QUEUED_SPINLOCKS_XCHG32 > select CLONE_BACKWARDS > select CLINT_TIMER if !MMU > @@ -344,6 +344,11 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK > def_bool y > depends on NUMA > > +config RISCV_TICKET_LOCK > + bool "Ticket-based spin-locking" > + help > + Say Y here to use ticket-based spin-locking. > + > config RISCV_ISA_C > bool "Emit compressed instructions when building Linux" > default y > diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/include/asm/spinlock.h > index a557de67a425..90b7eaa950cf 100644 > --- a/arch/riscv/include/asm/spinlock.h > +++ b/arch/riscv/include/asm/spinlock.h > @@ -7,7 +7,91 @@ > #ifndef _ASM_RISCV_SPINLOCK_H > #define _ASM_RISCV_SPINLOCK_H > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#ifdef CONFIG_32BIT > +#define __ASM_SLLIW "slli\t" > +#define __ASM_SRLIW "srli\t" > +#else > +#define __ASM_SLLIW "slliw\t" > +#define __ASM_SRLIW "srliw\t" > +#endif > + > +/* > + * Ticket-based spin-locking. > + */ > +static inline void arch_spin_lock(arch_spinlock_t *lock) > +{ > + arch_spinlock_t lockval; > + u32 tmp; > + > + asm volatile ( > + "1: lr.w %0, %2 \n" > + " mv %1, %0 \n" > + " addw %0, %0, %3 \n" > + " sc.w %0, %0, %2 \n" > + " bnez %0, 1b \n" > + : "=&r" (tmp), "=&r" (lockval), "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT) > + : "memory"); > + > + smp_cond_load_acquire(&lock->tickets.owner, > + VAL == lockval.tickets.next); It's wrong, blew is fixup: diff --git a/arch/csky/include/asm/spinlock.h b/arch/csky/include/asm/spinlock.h index fe98ad8ece51..2be627ceb9df 100644 --- a/arch/csky/include/asm/spinlock.h +++ b/arch/csky/include/asm/spinlock.h @@ -27,7 +27,8 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) : "r"(p), "r"(ticket_next) : "cc"); - smp_cond_load_acquire(&lock->tickets.owner, + if (lockval.owner != lockval.tickets.next) + smp_cond_load_acquire(&lock->tickets.owner, VAL == lockval.tickets.next); > +} > + > +static inline int arch_spin_trylock(arch_spinlock_t *lock) > +{ > + u32 tmp, contended, res; > + > + do { > + asm volatile ( > + " lr.w %0, %3 \n" > + __ASM_SRLIW "%1, %0, %5 \n" > + __ASM_SLLIW "%2, %0, %5 \n" > + " or %1, %2, %1 \n" > + " li %2, 0 \n" > + " sub %1, %1, %0 \n" > + " bnez %1, 1f \n" > + " addw %0, %0, %4 \n" > + " sc.w %2, %0, %3 \n" > + "1: \n" > + : "=&r" (tmp), "=&r" (contended), "=&r" (res), > + "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT), "I" (TICKET_NEXT) > + : "memory"); > + } while (res); > + > + if (!contended) > + __atomic_acquire_fence(); > + > + return !contended; > +} > + > +static inline void arch_spin_unlock(arch_spinlock_t *lock) > +{ > + smp_store_release(&lock->tickets.owner, lock->tickets.owner + 1); > +} > + > +static inline int arch_spin_value_unlocked(arch_spinlock_t lock) > +{ > + return lock.tickets.owner == lock.tickets.next; > +} > + > +static inline int arch_spin_is_locked(arch_spinlock_t *lock) > +{ > + return !arch_spin_value_unlocked(READ_ONCE(*lock)); > +} > + > +static inline int arch_spin_is_contended(arch_spinlock_t *lock) > +{ > + struct __raw_tickets tickets = READ_ONCE(lock->tickets); > + > + return (tickets.next - tickets.owner) > 1; > +} > +#define arch_spin_is_contended arch_spin_is_contended > +#else /* CONFIG_RISCV_TICKET_LOCK */ > #include > +#endif /* CONFIG_RISCV_TICKET_LOCK */ > + > #include > > #endif /* _ASM_RISCV_SPINLOCK_H */ > diff --git a/arch/riscv/include/asm/spinlock_types.h b/arch/riscv/include/asm/spinlock_types.h > index d033a973f287..afbb19841d0f 100644 > --- a/arch/riscv/include/asm/spinlock_types.h > +++ b/arch/riscv/include/asm/spinlock_types.h > @@ -10,7 +10,24 @@ > # error "please don't include this file directly" > #endif > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#define TICKET_NEXT 16 > + > +typedef struct { > + union { > + u32 lock; > + struct __raw_tickets { > + /* little endian */ > + u16 owner; > + u16 next; > + } tickets; > + }; > +} arch_spinlock_t; > + > +#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } > +#else > #include > +#endif > #include > > #endif /* _ASM_RISCV_SPINLOCK_TYPES_H */ > -- > 2.17.1 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE347C433B4 for ; Sun, 11 Apr 2021 16:02:55 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D4D161041 for ; Sun, 11 Apr 2021 16:02:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D4D161041 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=y80uFi/R6nXZ/r2/hW72i3Z7sjbSu82cPGxl3MshkT4=; b=COKr48WQu8P7NJYPdjO7bGAzL 0sWH6paiSz/QqDF78VBWFzXUhwo+OyvNItZ7+WbhDiTfMs10Aj3b5bUEWpdEMYk35iJ92zywyoesk bsF8uwDWnuU9fbmJ78ScCVM+0wnjcb7cGRX+hzGRdv9E4R36iIRgB+lV3gbl3WCpCsof9cqDI+9+u Pu38/R/073skdchhyvg7sUCUruiLTbIwsUhP4W66dosac7Y1ugLb3NelkLc5XfAuF/9/OEc3rQlXQ dIcVgC8Itz5z7ICdNDr0dNDQep4YN3xuxA6tiYNO1wuiEuilluiGK7d1bq2l1zw/SFWSaU5A/5F1P ymCh36Crw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVcXu-004g4P-Ka; Sun, 11 Apr 2021 16:02:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVcXq-004g4D-Bd for linux-riscv@desiato.infradead.org; Sun, 11 Apr 2021 16:02:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References:MIME-Version:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=O6mWWoI5ypnfZoD5KfS4ZYg/oL1ydWtM6ROOj1yZNXo=; b=U0J8TjwZVo+x8kkZkmhASWzaX9 7jmr3iFrsqnB3/afkfaGztDMI29lcYmxckwts6neRlPxkt3l9b/du5BeIIXyjzqB1bfmTN8/5MCUJ w69wLX492N+c932IfyhkbZmQwIhAZJyonp1yk+0aqafdEqsvPQhc+Xks+5iA0URrkZBHuAH/u7Ye6 aUEhbWuLffnnlb5T6fufinDd9yu4xMu4QaxG7YakWpBlKO5fNgdSOgse88Z1Ln47u7dOJF5eyP6oQ K4OCaaXlaGNxhl5dYEdpDCpi6Cbo4dlrKSRm3YDu+XepOK0C2fdVDjNK6uXBb9C0sH/3A3lEShGTN EdkQyd2g==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVcXn-005aUk-9i for linux-riscv@lists.infradead.org; Sun, 11 Apr 2021 16:02:41 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7C5A8611AD for ; Sun, 11 Apr 2021 16:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618156958; bh=TJw038FUfkWYVYkaVmTwRcX8gW1Hrtqnv9rYV52PKrI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=u0O8VVf8zy1PR2e25z0pJKozdIHbQJxa0IL1m2ShcIfesaiUzFtGRvrmSFOHMxSZs c8KgKfrywOtTgpLIESrsI/Cs4Vn9WkeLFbOe8EwqA2c1g1KPx8Wp9plKR8cHtNf3Qo IB2sDtZW0hA2ZzPXlkDLl7rGNxhR4rugm6fZ/8o3xXmWeFHiOtIOxfAo3Oue+bBzWz mt9+HpTF1RUm1fVm9AMrigkEsuBMzxUkJi9gampcR1e8Yd91Lwk++MgYmeehC82jRQ 85sY8hTUkTJ4v4kPjgzC7K/is4TbgtljQug0d3sWsK4KICaiyVwBkJjBGig+VFgbnz 6ZRNnnGckXNrA== Received: by mail-lj1-f171.google.com with SMTP id r22so1584658ljc.5 for ; Sun, 11 Apr 2021 09:02:38 -0700 (PDT) X-Gm-Message-State: AOAM532bBsPR42SeDY3W2DiJb0SCRf5m1xjyK6sHc1CnkI2Sec1DPvO7 VO7qRYRK53UEHe5TtCkTY8kF9su3yJ3DUc/5pVs= X-Google-Smtp-Source: ABdhPJwBbonxz+gck6Cl5q5ziKW6g+nADEkFDKCdplfaEDt09lBYiLD8iBC6rcF3SKmLf+EgR6MFZf5Na1JfSr6rJDU= X-Received: by 2002:a2e:8182:: with SMTP id e2mr13024419ljg.238.1618156956863; Sun, 11 Apr 2021 09:02:36 -0700 (PDT) MIME-Version: 1.0 References: <1617201040-83905-1-git-send-email-guoren@kernel.org> <1617201040-83905-4-git-send-email-guoren@kernel.org> In-Reply-To: <1617201040-83905-4-git-send-email-guoren@kernel.org> From: Guo Ren Date: Mon, 12 Apr 2021 00:02:24 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v6 3/9] riscv: locks: Introduce ticket-based spinlock implementation To: Guo Ren Cc: linux-riscv , Linux Kernel Mailing List , linux-csky@vger.kernel.org, linux-arch , linuxppc-dev@lists.ozlabs.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux , Guo Ren , Peter Zijlstra , Anup Patel , Arnd Bergmann X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210411_090239_409224_9DE77534 X-CRM114-Status: GOOD ( 26.62 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Wed, Mar 31, 2021 at 10:32 PM wrote: > > From: Guo Ren > > This patch introduces a ticket lock implementation for riscv, along the > same lines as the implementation for arch/arm & arch/csky. > > We still use qspinlock as default. > > Signed-off-by: Guo Ren > Cc: Peter Zijlstra > Cc: Anup Patel > Cc: Arnd Bergmann > --- > arch/riscv/Kconfig | 7 ++- > arch/riscv/include/asm/spinlock.h | 84 +++++++++++++++++++++++++ > arch/riscv/include/asm/spinlock_types.h | 17 +++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 67cc65ba1ea1..34d0276f01d5 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -34,7 +34,7 @@ config RISCV > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_HUGE_PMD_SHARE if 64BIT > select ARCH_USE_QUEUED_RWLOCKS > - select ARCH_USE_QUEUED_SPINLOCKS > + select ARCH_USE_QUEUED_SPINLOCKS if !RISCV_TICKET_LOCK > select ARCH_USE_QUEUED_SPINLOCKS_XCHG32 > select CLONE_BACKWARDS > select CLINT_TIMER if !MMU > @@ -344,6 +344,11 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK > def_bool y > depends on NUMA > > +config RISCV_TICKET_LOCK > + bool "Ticket-based spin-locking" > + help > + Say Y here to use ticket-based spin-locking. > + > config RISCV_ISA_C > bool "Emit compressed instructions when building Linux" > default y > diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/include/asm/spinlock.h > index a557de67a425..90b7eaa950cf 100644 > --- a/arch/riscv/include/asm/spinlock.h > +++ b/arch/riscv/include/asm/spinlock.h > @@ -7,7 +7,91 @@ > #ifndef _ASM_RISCV_SPINLOCK_H > #define _ASM_RISCV_SPINLOCK_H > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#ifdef CONFIG_32BIT > +#define __ASM_SLLIW "slli\t" > +#define __ASM_SRLIW "srli\t" > +#else > +#define __ASM_SLLIW "slliw\t" > +#define __ASM_SRLIW "srliw\t" > +#endif > + > +/* > + * Ticket-based spin-locking. > + */ > +static inline void arch_spin_lock(arch_spinlock_t *lock) > +{ > + arch_spinlock_t lockval; > + u32 tmp; > + > + asm volatile ( > + "1: lr.w %0, %2 \n" > + " mv %1, %0 \n" > + " addw %0, %0, %3 \n" > + " sc.w %0, %0, %2 \n" > + " bnez %0, 1b \n" > + : "=&r" (tmp), "=&r" (lockval), "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT) > + : "memory"); > + > + smp_cond_load_acquire(&lock->tickets.owner, > + VAL == lockval.tickets.next); It's wrong, blew is fixup: diff --git a/arch/csky/include/asm/spinlock.h b/arch/csky/include/asm/spinlock.h index fe98ad8ece51..2be627ceb9df 100644 --- a/arch/csky/include/asm/spinlock.h +++ b/arch/csky/include/asm/spinlock.h @@ -27,7 +27,8 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) : "r"(p), "r"(ticket_next) : "cc"); - smp_cond_load_acquire(&lock->tickets.owner, + if (lockval.owner != lockval.tickets.next) + smp_cond_load_acquire(&lock->tickets.owner, VAL == lockval.tickets.next); > +} > + > +static inline int arch_spin_trylock(arch_spinlock_t *lock) > +{ > + u32 tmp, contended, res; > + > + do { > + asm volatile ( > + " lr.w %0, %3 \n" > + __ASM_SRLIW "%1, %0, %5 \n" > + __ASM_SLLIW "%2, %0, %5 \n" > + " or %1, %2, %1 \n" > + " li %2, 0 \n" > + " sub %1, %1, %0 \n" > + " bnez %1, 1f \n" > + " addw %0, %0, %4 \n" > + " sc.w %2, %0, %3 \n" > + "1: \n" > + : "=&r" (tmp), "=&r" (contended), "=&r" (res), > + "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT), "I" (TICKET_NEXT) > + : "memory"); > + } while (res); > + > + if (!contended) > + __atomic_acquire_fence(); > + > + return !contended; > +} > + > +static inline void arch_spin_unlock(arch_spinlock_t *lock) > +{ > + smp_store_release(&lock->tickets.owner, lock->tickets.owner + 1); > +} > + > +static inline int arch_spin_value_unlocked(arch_spinlock_t lock) > +{ > + return lock.tickets.owner == lock.tickets.next; > +} > + > +static inline int arch_spin_is_locked(arch_spinlock_t *lock) > +{ > + return !arch_spin_value_unlocked(READ_ONCE(*lock)); > +} > + > +static inline int arch_spin_is_contended(arch_spinlock_t *lock) > +{ > + struct __raw_tickets tickets = READ_ONCE(lock->tickets); > + > + return (tickets.next - tickets.owner) > 1; > +} > +#define arch_spin_is_contended arch_spin_is_contended > +#else /* CONFIG_RISCV_TICKET_LOCK */ > #include > +#endif /* CONFIG_RISCV_TICKET_LOCK */ > + > #include > > #endif /* _ASM_RISCV_SPINLOCK_H */ > diff --git a/arch/riscv/include/asm/spinlock_types.h b/arch/riscv/include/asm/spinlock_types.h > index d033a973f287..afbb19841d0f 100644 > --- a/arch/riscv/include/asm/spinlock_types.h > +++ b/arch/riscv/include/asm/spinlock_types.h > @@ -10,7 +10,24 @@ > # error "please don't include this file directly" > #endif > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#define TICKET_NEXT 16 > + > +typedef struct { > + union { > + u32 lock; > + struct __raw_tickets { > + /* little endian */ > + u16 owner; > + u16 next; > + } tickets; > + }; > +} arch_spinlock_t; > + > +#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } > +#else > #include > +#endif > #include > > #endif /* _ASM_RISCV_SPINLOCK_TYPES_H */ > -- > 2.17.1 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/ _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E41D4C433B4 for ; Sun, 11 Apr 2021 16:03:08 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E2AD60C3D for ; Sun, 11 Apr 2021 16:03:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E2AD60C3D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4FJGqZ6NhJz3bvs for ; Mon, 12 Apr 2021 02:03:06 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=u0O8VVf8; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=guoren@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=u0O8VVf8; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4FJGq50q05z2xMd for ; Mon, 12 Apr 2021 02:02:41 +1000 (AEST) Received: by mail.kernel.org (Postfix) with ESMTPSA id 7DBAE611C9 for ; Sun, 11 Apr 2021 16:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618156958; bh=TJw038FUfkWYVYkaVmTwRcX8gW1Hrtqnv9rYV52PKrI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=u0O8VVf8zy1PR2e25z0pJKozdIHbQJxa0IL1m2ShcIfesaiUzFtGRvrmSFOHMxSZs c8KgKfrywOtTgpLIESrsI/Cs4Vn9WkeLFbOe8EwqA2c1g1KPx8Wp9plKR8cHtNf3Qo IB2sDtZW0hA2ZzPXlkDLl7rGNxhR4rugm6fZ/8o3xXmWeFHiOtIOxfAo3Oue+bBzWz mt9+HpTF1RUm1fVm9AMrigkEsuBMzxUkJi9gampcR1e8Yd91Lwk++MgYmeehC82jRQ 85sY8hTUkTJ4v4kPjgzC7K/is4TbgtljQug0d3sWsK4KICaiyVwBkJjBGig+VFgbnz 6ZRNnnGckXNrA== Received: by mail-lj1-f174.google.com with SMTP id z8so12275647ljm.12 for ; Sun, 11 Apr 2021 09:02:38 -0700 (PDT) X-Gm-Message-State: AOAM5314AKEKWuGbBrA/+YFPwQzP7tThqIE5Q1gESbFhreOFcFVMHIjz ROnjE5PY7IimvODlsbZZZ2lJVflDaf3i2isQY9Q= X-Google-Smtp-Source: ABdhPJwBbonxz+gck6Cl5q5ziKW6g+nADEkFDKCdplfaEDt09lBYiLD8iBC6rcF3SKmLf+EgR6MFZf5Na1JfSr6rJDU= X-Received: by 2002:a2e:8182:: with SMTP id e2mr13024419ljg.238.1618156956863; Sun, 11 Apr 2021 09:02:36 -0700 (PDT) MIME-Version: 1.0 References: <1617201040-83905-1-git-send-email-guoren@kernel.org> <1617201040-83905-4-git-send-email-guoren@kernel.org> In-Reply-To: <1617201040-83905-4-git-send-email-guoren@kernel.org> From: Guo Ren Date: Mon, 12 Apr 2021 00:02:24 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v6 3/9] riscv: locks: Introduce ticket-based spinlock implementation To: Guo Ren Content-Type: text/plain; charset="UTF-8" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch , linux-xtensa@linux-xtensa.org, Guo Ren , Arnd Bergmann , Peter Zijlstra , Anup Patel , Linux Kernel Mailing List , linux-csky@vger.kernel.org, openrisc@lists.librecores.org, sparclinux , linux-riscv , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, Mar 31, 2021 at 10:32 PM wrote: > > From: Guo Ren > > This patch introduces a ticket lock implementation for riscv, along the > same lines as the implementation for arch/arm & arch/csky. > > We still use qspinlock as default. > > Signed-off-by: Guo Ren > Cc: Peter Zijlstra > Cc: Anup Patel > Cc: Arnd Bergmann > --- > arch/riscv/Kconfig | 7 ++- > arch/riscv/include/asm/spinlock.h | 84 +++++++++++++++++++++++++ > arch/riscv/include/asm/spinlock_types.h | 17 +++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 67cc65ba1ea1..34d0276f01d5 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -34,7 +34,7 @@ config RISCV > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_HUGE_PMD_SHARE if 64BIT > select ARCH_USE_QUEUED_RWLOCKS > - select ARCH_USE_QUEUED_SPINLOCKS > + select ARCH_USE_QUEUED_SPINLOCKS if !RISCV_TICKET_LOCK > select ARCH_USE_QUEUED_SPINLOCKS_XCHG32 > select CLONE_BACKWARDS > select CLINT_TIMER if !MMU > @@ -344,6 +344,11 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK > def_bool y > depends on NUMA > > +config RISCV_TICKET_LOCK > + bool "Ticket-based spin-locking" > + help > + Say Y here to use ticket-based spin-locking. > + > config RISCV_ISA_C > bool "Emit compressed instructions when building Linux" > default y > diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/include/asm/spinlock.h > index a557de67a425..90b7eaa950cf 100644 > --- a/arch/riscv/include/asm/spinlock.h > +++ b/arch/riscv/include/asm/spinlock.h > @@ -7,7 +7,91 @@ > #ifndef _ASM_RISCV_SPINLOCK_H > #define _ASM_RISCV_SPINLOCK_H > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#ifdef CONFIG_32BIT > +#define __ASM_SLLIW "slli\t" > +#define __ASM_SRLIW "srli\t" > +#else > +#define __ASM_SLLIW "slliw\t" > +#define __ASM_SRLIW "srliw\t" > +#endif > + > +/* > + * Ticket-based spin-locking. > + */ > +static inline void arch_spin_lock(arch_spinlock_t *lock) > +{ > + arch_spinlock_t lockval; > + u32 tmp; > + > + asm volatile ( > + "1: lr.w %0, %2 \n" > + " mv %1, %0 \n" > + " addw %0, %0, %3 \n" > + " sc.w %0, %0, %2 \n" > + " bnez %0, 1b \n" > + : "=&r" (tmp), "=&r" (lockval), "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT) > + : "memory"); > + > + smp_cond_load_acquire(&lock->tickets.owner, > + VAL == lockval.tickets.next); It's wrong, blew is fixup: diff --git a/arch/csky/include/asm/spinlock.h b/arch/csky/include/asm/spinlock.h index fe98ad8ece51..2be627ceb9df 100644 --- a/arch/csky/include/asm/spinlock.h +++ b/arch/csky/include/asm/spinlock.h @@ -27,7 +27,8 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) : "r"(p), "r"(ticket_next) : "cc"); - smp_cond_load_acquire(&lock->tickets.owner, + if (lockval.owner != lockval.tickets.next) + smp_cond_load_acquire(&lock->tickets.owner, VAL == lockval.tickets.next); > +} > + > +static inline int arch_spin_trylock(arch_spinlock_t *lock) > +{ > + u32 tmp, contended, res; > + > + do { > + asm volatile ( > + " lr.w %0, %3 \n" > + __ASM_SRLIW "%1, %0, %5 \n" > + __ASM_SLLIW "%2, %0, %5 \n" > + " or %1, %2, %1 \n" > + " li %2, 0 \n" > + " sub %1, %1, %0 \n" > + " bnez %1, 1f \n" > + " addw %0, %0, %4 \n" > + " sc.w %2, %0, %3 \n" > + "1: \n" > + : "=&r" (tmp), "=&r" (contended), "=&r" (res), > + "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT), "I" (TICKET_NEXT) > + : "memory"); > + } while (res); > + > + if (!contended) > + __atomic_acquire_fence(); > + > + return !contended; > +} > + > +static inline void arch_spin_unlock(arch_spinlock_t *lock) > +{ > + smp_store_release(&lock->tickets.owner, lock->tickets.owner + 1); > +} > + > +static inline int arch_spin_value_unlocked(arch_spinlock_t lock) > +{ > + return lock.tickets.owner == lock.tickets.next; > +} > + > +static inline int arch_spin_is_locked(arch_spinlock_t *lock) > +{ > + return !arch_spin_value_unlocked(READ_ONCE(*lock)); > +} > + > +static inline int arch_spin_is_contended(arch_spinlock_t *lock) > +{ > + struct __raw_tickets tickets = READ_ONCE(lock->tickets); > + > + return (tickets.next - tickets.owner) > 1; > +} > +#define arch_spin_is_contended arch_spin_is_contended > +#else /* CONFIG_RISCV_TICKET_LOCK */ > #include > +#endif /* CONFIG_RISCV_TICKET_LOCK */ > + > #include > > #endif /* _ASM_RISCV_SPINLOCK_H */ > diff --git a/arch/riscv/include/asm/spinlock_types.h b/arch/riscv/include/asm/spinlock_types.h > index d033a973f287..afbb19841d0f 100644 > --- a/arch/riscv/include/asm/spinlock_types.h > +++ b/arch/riscv/include/asm/spinlock_types.h > @@ -10,7 +10,24 @@ > # error "please don't include this file directly" > #endif > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#define TICKET_NEXT 16 > + > +typedef struct { > + union { > + u32 lock; > + struct __raw_tickets { > + /* little endian */ > + u16 owner; > + u16 next; > + } tickets; > + }; > +} arch_spinlock_t; > + > +#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } > +#else > #include > +#endif > #include > > #endif /* _ASM_RISCV_SPINLOCK_TYPES_H */ > -- > 2.17.1 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guo Ren Date: Mon, 12 Apr 2021 00:02:24 +0800 Subject: [OpenRISC] [PATCH v6 3/9] riscv: locks: Introduce ticket-based spinlock implementation In-Reply-To: <1617201040-83905-4-git-send-email-guoren@kernel.org> References: <1617201040-83905-1-git-send-email-guoren@kernel.org> <1617201040-83905-4-git-send-email-guoren@kernel.org> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: openrisc@lists.librecores.org On Wed, Mar 31, 2021 at 10:32 PM wrote: > > From: Guo Ren > > This patch introduces a ticket lock implementation for riscv, along the > same lines as the implementation for arch/arm & arch/csky. > > We still use qspinlock as default. > > Signed-off-by: Guo Ren > Cc: Peter Zijlstra > Cc: Anup Patel > Cc: Arnd Bergmann > --- > arch/riscv/Kconfig | 7 ++- > arch/riscv/include/asm/spinlock.h | 84 +++++++++++++++++++++++++ > arch/riscv/include/asm/spinlock_types.h | 17 +++++ > 3 files changed, 107 insertions(+), 1 deletion(-) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 67cc65ba1ea1..34d0276f01d5 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -34,7 +34,7 @@ config RISCV > select ARCH_WANT_FRAME_POINTERS > select ARCH_WANT_HUGE_PMD_SHARE if 64BIT > select ARCH_USE_QUEUED_RWLOCKS > - select ARCH_USE_QUEUED_SPINLOCKS > + select ARCH_USE_QUEUED_SPINLOCKS if !RISCV_TICKET_LOCK > select ARCH_USE_QUEUED_SPINLOCKS_XCHG32 > select CLONE_BACKWARDS > select CLINT_TIMER if !MMU > @@ -344,6 +344,11 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK > def_bool y > depends on NUMA > > +config RISCV_TICKET_LOCK > + bool "Ticket-based spin-locking" > + help > + Say Y here to use ticket-based spin-locking. > + > config RISCV_ISA_C > bool "Emit compressed instructions when building Linux" > default y > diff --git a/arch/riscv/include/asm/spinlock.h b/arch/riscv/include/asm/spinlock.h > index a557de67a425..90b7eaa950cf 100644 > --- a/arch/riscv/include/asm/spinlock.h > +++ b/arch/riscv/include/asm/spinlock.h > @@ -7,7 +7,91 @@ > #ifndef _ASM_RISCV_SPINLOCK_H > #define _ASM_RISCV_SPINLOCK_H > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#ifdef CONFIG_32BIT > +#define __ASM_SLLIW "slli\t" > +#define __ASM_SRLIW "srli\t" > +#else > +#define __ASM_SLLIW "slliw\t" > +#define __ASM_SRLIW "srliw\t" > +#endif > + > +/* > + * Ticket-based spin-locking. > + */ > +static inline void arch_spin_lock(arch_spinlock_t *lock) > +{ > + arch_spinlock_t lockval; > + u32 tmp; > + > + asm volatile ( > + "1: lr.w %0, %2 \n" > + " mv %1, %0 \n" > + " addw %0, %0, %3 \n" > + " sc.w %0, %0, %2 \n" > + " bnez %0, 1b \n" > + : "=&r" (tmp), "=&r" (lockval), "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT) > + : "memory"); > + > + smp_cond_load_acquire(&lock->tickets.owner, > + VAL == lockval.tickets.next); It's wrong, blew is fixup: diff --git a/arch/csky/include/asm/spinlock.h b/arch/csky/include/asm/spinlock.h index fe98ad8ece51..2be627ceb9df 100644 --- a/arch/csky/include/asm/spinlock.h +++ b/arch/csky/include/asm/spinlock.h @@ -27,7 +27,8 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) : "r"(p), "r"(ticket_next) : "cc"); - smp_cond_load_acquire(&lock->tickets.owner, + if (lockval.owner != lockval.tickets.next) + smp_cond_load_acquire(&lock->tickets.owner, VAL == lockval.tickets.next); > +} > + > +static inline int arch_spin_trylock(arch_spinlock_t *lock) > +{ > + u32 tmp, contended, res; > + > + do { > + asm volatile ( > + " lr.w %0, %3 \n" > + __ASM_SRLIW "%1, %0, %5 \n" > + __ASM_SLLIW "%2, %0, %5 \n" > + " or %1, %2, %1 \n" > + " li %2, 0 \n" > + " sub %1, %1, %0 \n" > + " bnez %1, 1f \n" > + " addw %0, %0, %4 \n" > + " sc.w %2, %0, %3 \n" > + "1: \n" > + : "=&r" (tmp), "=&r" (contended), "=&r" (res), > + "+A" (lock->lock) > + : "r" (1 << TICKET_NEXT), "I" (TICKET_NEXT) > + : "memory"); > + } while (res); > + > + if (!contended) > + __atomic_acquire_fence(); > + > + return !contended; > +} > + > +static inline void arch_spin_unlock(arch_spinlock_t *lock) > +{ > + smp_store_release(&lock->tickets.owner, lock->tickets.owner + 1); > +} > + > +static inline int arch_spin_value_unlocked(arch_spinlock_t lock) > +{ > + return lock.tickets.owner == lock.tickets.next; > +} > + > +static inline int arch_spin_is_locked(arch_spinlock_t *lock) > +{ > + return !arch_spin_value_unlocked(READ_ONCE(*lock)); > +} > + > +static inline int arch_spin_is_contended(arch_spinlock_t *lock) > +{ > + struct __raw_tickets tickets = READ_ONCE(lock->tickets); > + > + return (tickets.next - tickets.owner) > 1; > +} > +#define arch_spin_is_contended arch_spin_is_contended > +#else /* CONFIG_RISCV_TICKET_LOCK */ > #include > +#endif /* CONFIG_RISCV_TICKET_LOCK */ > + > #include > > #endif /* _ASM_RISCV_SPINLOCK_H */ > diff --git a/arch/riscv/include/asm/spinlock_types.h b/arch/riscv/include/asm/spinlock_types.h > index d033a973f287..afbb19841d0f 100644 > --- a/arch/riscv/include/asm/spinlock_types.h > +++ b/arch/riscv/include/asm/spinlock_types.h > @@ -10,7 +10,24 @@ > # error "please don't include this file directly" > #endif > > +#ifdef CONFIG_RISCV_TICKET_LOCK > +#define TICKET_NEXT 16 > + > +typedef struct { > + union { > + u32 lock; > + struct __raw_tickets { > + /* little endian */ > + u16 owner; > + u16 next; > + } tickets; > + }; > +} arch_spinlock_t; > + > +#define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } > +#else > #include > +#endif > #include > > #endif /* _ASM_RISCV_SPINLOCK_TYPES_H */ > -- > 2.17.1 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/