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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 918B4C433EF for ; Wed, 13 Jul 2022 07:08:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234738AbiGMHI2 (ORCPT ); Wed, 13 Jul 2022 03:08:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234690AbiGMHH5 (ORCPT ); Wed, 13 Jul 2022 03:07:57 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA513E3C2F for ; Wed, 13 Jul 2022 00:07:46 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id v7so7418263pfb.0 for ; Wed, 13 Jul 2022 00:07:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+3iHP3kFYerWpm4anlOzhvJFyDBNIHOmpXweRrXpfF4=; b=QbAGsusVhx8+fbRwlWVo0U/NEcEq/fLo3kHRcH+iEZzRkjCSaljSKXFHfpcvhqwRdf JPTjfMQc79HIXOG0AMiVjWZtc6ghvzMGfRF1mSvWezMUWPb5R5HaNWq61KGGKoYbtsiw sy2o+NmDX0IbNxxnY9sjaudNVCxffRG5+EOVR9eIyYIh6Hr4OUxdDr7BsrDuJgUhUX4+ zckClmeSbA8Oa2wTa62iLsGIix8hKUSrUp0cuF31whtwvXwt6tFKvA+5PFvnYx4WPsoe X/9BYMbMAkXi7fXeBsg4vLdh/RFWfrqYjfCPOMIYfqDnGMpm+3A5QKBE9M7FvNw6nXHe +utQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+3iHP3kFYerWpm4anlOzhvJFyDBNIHOmpXweRrXpfF4=; b=gccngcwImS5cvql1ZgGeD0msbTLSZatbwP3Kw4mt7FKq2uSbdUz13Ou9T7N+dpD7Hp raph2EjC3kHJdBFXF7fVw4utuqNqQ2JylqnkzmRt+tl7WDJTVOjk6bAYdLqaJnNL1m3s tQK92f0JdL6BfeCV32gwIxl6Te+ycumGG0mgpcUAI8z14NOo072Cw13Gd+esKF7NZB5f 43dfr6zEZPbzIOrn8bqGEAtJg0ohGHB4HkbyvkJJiCjyCBzfgj3DeGhRb4E0h/E+Bi15 kUKAoB4z168XMdRUfihbUK2FMESb3qCRLkjwkyUik41HhKGrqRqYVdK9JDXz6nFXghEa q48A== X-Gm-Message-State: AJIora9lOkuJh26qT+CMnPfNFoxnF75nKrDgN2jgWKQTaauhFWvoSSH6 Q7f8/3T8/Jmb99mCc2afiCo= X-Google-Smtp-Source: AGRyM1spF0j9huppBaC9iXGIk+uwQ/Cb5zKJgLFCCRqR17G3ERr9+3uvaBshfFn1pE3WMNgvrvRnkA== X-Received: by 2002:a05:6a00:2347:b0:52a:cf39:59a5 with SMTP id j7-20020a056a00234700b0052acf3959a5mr1737736pfj.28.1657696066155; Wed, 13 Jul 2022 00:07:46 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-203-247.tpgi.com.au. [193.116.203.247]) by smtp.gmail.com with ESMTPSA id d11-20020a170902cecb00b0016bd5da20casm8099061plg.134.2022.07.13.00.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 00:07:45 -0700 (PDT) From: Nicholas Piggin To: Peter Zijlstra Cc: Nicholas Piggin , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , "linux-kernel @ vger . kernel . org" Subject: [PATCH v2 09/12] locking/qspinlock: rename __pv_init_lock_hash to pv_spinlocks_init Date: Wed, 13 Jul 2022 17:07:01 +1000 Message-Id: <20220713070704.308394-10-npiggin@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220713070704.308394-1-npiggin@gmail.com> References: <20220713070704.308394-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The caller should not have to be aware what the implementation initialisation does. Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/qspinlock.h | 7 ------- arch/powerpc/include/asm/spinlock.h | 2 +- arch/x86/hyperv/hv_spinlock.c | 2 +- arch/x86/include/asm/qspinlock.h | 1 - arch/x86/kernel/kvm.c | 2 +- arch/x86/xen/spinlock.c | 2 +- include/asm-generic/qspinlock.h | 6 ++++++ kernel/locking/qspinlock.c | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/include/asm/qspinlock.h b/arch/powerpc/include/asm/qspinlock.h index dd231c756233..39c1c7f80579 100644 --- a/arch/powerpc/include/asm/qspinlock.h +++ b/arch/powerpc/include/asm/qspinlock.h @@ -53,13 +53,6 @@ static __always_inline void pv_kick(int cpu) prod_cpu(cpu); } -extern void __pv_init_lock_hash(void); - -static inline void pv_spinlocks_init(void) -{ - __pv_init_lock_hash(); -} - #endif /* diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h index bd75872a6334..7dafca8e3f02 100644 --- a/arch/powerpc/include/asm/spinlock.h +++ b/arch/powerpc/include/asm/spinlock.h @@ -13,7 +13,7 @@ /* See include/linux/spinlock.h */ #define smp_mb__after_spinlock() smp_mb() -#ifndef CONFIG_PARAVIRT_SPINLOCKS +#ifndef CONFIG_PPC_QUEUED_SPINLOCKS static inline void pv_spinlocks_init(void) { } #endif diff --git a/arch/x86/hyperv/hv_spinlock.c b/arch/x86/hyperv/hv_spinlock.c index 91cfe698bde0..c7b5c3211c79 100644 --- a/arch/x86/hyperv/hv_spinlock.c +++ b/arch/x86/hyperv/hv_spinlock.c @@ -76,7 +76,7 @@ void __init hv_init_spinlocks(void) } pr_info("PV spinlocks enabled\n"); - __pv_init_lock_hash(); + pv_spinlocks_init(); pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; pv_ops.lock.queued_spin_unlock = PV_CALLEE_SAVE(__pv_queued_spin_unlock); pv_ops.lock.wait = hv_qlock_wait; diff --git a/arch/x86/include/asm/qspinlock.h b/arch/x86/include/asm/qspinlock.h index 603ad61e9dfe..9a03fcc1b2b7 100644 --- a/arch/x86/include/asm/qspinlock.h +++ b/arch/x86/include/asm/qspinlock.h @@ -29,7 +29,6 @@ static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lo #ifdef CONFIG_PARAVIRT_SPINLOCKS extern void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val); -extern void __pv_init_lock_hash(void); extern void __pv_queued_spin_lock_slowpath(struct qspinlock *lock, u32 val); extern void __raw_callee_save___pv_queued_spin_unlock(struct qspinlock *lock); extern bool nopvspin; diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 1a3658f7e6d9..98a2c4d3e91d 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -1106,7 +1106,7 @@ void __init kvm_spinlock_init(void) pr_info("PV spinlocks enabled\n"); - __pv_init_lock_hash(); + pv_spinlocks_init(); pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; pv_ops.lock.queued_spin_unlock = PV_CALLEE_SAVE(__pv_queued_spin_unlock); diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index 043c73dfd2c9..5145c4aec4ea 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c @@ -135,7 +135,7 @@ void __init xen_init_spinlocks(void) } printk(KERN_DEBUG "xen: PV spinlocks enabled\n"); - __pv_init_lock_hash(); + pv_spinlocks_init(); pv_ops.lock.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath; pv_ops.lock.queued_spin_unlock = PV_CALLEE_SAVE(__pv_queued_spin_unlock); diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 995513fa2690..e0fb29ee1adc 100644 --- a/include/asm-generic/qspinlock.h +++ b/include/asm-generic/qspinlock.h @@ -147,4 +147,10 @@ static __always_inline bool virt_spin_lock(struct qspinlock *lock) #define arch_spin_trylock(l) queued_spin_trylock(l) #define arch_spin_unlock(l) queued_spin_unlock(l) +#ifdef CONFIG_PARAVIRT_SPINLOCKS +void pv_spinlocks_init(void); +#else +static inline void pv_spinlocks_init(void) { } +#endif + #endif /* __ASM_GENERIC_QSPINLOCK_H */ diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c index 4785a32a6fd2..df6d8af8f2a9 100644 --- a/kernel/locking/qspinlock.c +++ b/kernel/locking/qspinlock.c @@ -405,7 +405,7 @@ static unsigned int pv_lock_hash_bits __read_mostly; * This function should be called from the paravirt spinlock initialization * routine. */ -void __init __pv_init_lock_hash(void) +void __init pv_spinlocks_init(void) { int pv_hash_size = ALIGN(4 * num_possible_cpus(), PV_HE_PER_LINE); -- 2.35.1