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 ED5C7C19F2D for ; Tue, 9 Aug 2022 15:06:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244887AbiHIPGX (ORCPT ); Tue, 9 Aug 2022 11:06:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244945AbiHIPFq (ORCPT ); Tue, 9 Aug 2022 11:05:46 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C02F9B16 for ; Tue, 9 Aug 2022 08:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660057543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GOrNPfzx0xECymBE6UzgxDM4IxWAjaVnZWiIiwsL06k=; b=PXBhRw7O/opv/k+mEDaU14f6H3OIw5M+1AdAFurKM9+deV2hbkwhC3X1ELOgTiTiZPT1V0 lLuJkIObZ2osqikIsbZJ79xk3yKfpKhRsoNmFS9R1pUk3a3TM4H1KyNFHy1WUmWAyiwoRy t0q3sBOCeB5y+OuxGpcrXxhrXjePquc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-zDKWRoxlO72Lu82OxM-LPw-1; Tue, 09 Aug 2022 11:05:34 -0400 X-MC-Unique: zDKWRoxlO72Lu82OxM-LPw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3E1861C0756B; Tue, 9 Aug 2022 15:05:32 +0000 (UTC) Received: from [10.22.18.32] (unknown [10.22.18.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB53940C1288; Tue, 9 Aug 2022 15:05:31 +0000 (UTC) Message-ID: <7b1c463c-c912-ba08-bac4-99d45e45f7e1@redhat.com> Date: Tue, 9 Aug 2022 11:05:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] locking: Add __lockfunc to slow path functions Content-Language: en-US To: Namhyung Kim , Peter Zijlstra , Ingo Molnar , Will Deacon Cc: Boqun Feng , LKML References: <20220808175956.592707-1-namhyung@kernel.org> From: Waiman Long In-Reply-To: <20220808175956.592707-1-namhyung@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/8/22 13:59, Namhyung Kim wrote: > So that we can skip the functions in the perf lock contention and other > places like /proc/PID/wchan. > > Signed-off-by: Namhyung Kim > --- > kernel/locking/qrwlock.c | 4 ++-- > kernel/locking/qspinlock.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/kernel/locking/qrwlock.c b/kernel/locking/qrwlock.c > index 2e1600906c9f..d2ef312a8611 100644 > --- a/kernel/locking/qrwlock.c > +++ b/kernel/locking/qrwlock.c > @@ -18,7 +18,7 @@ > * queued_read_lock_slowpath - acquire read lock of a queued rwlock > * @lock: Pointer to queued rwlock structure > */ > -void queued_read_lock_slowpath(struct qrwlock *lock) > +void __lockfunc queued_read_lock_slowpath(struct qrwlock *lock) > { > /* > * Readers come here when they cannot get the lock without waiting > @@ -63,7 +63,7 @@ EXPORT_SYMBOL(queued_read_lock_slowpath); > * queued_write_lock_slowpath - acquire write lock of a queued rwlock > * @lock : Pointer to queued rwlock structure > */ > -void queued_write_lock_slowpath(struct qrwlock *lock) > +void __lockfunc queued_write_lock_slowpath(struct qrwlock *lock) > { > int cnts; > > diff --git a/kernel/locking/qspinlock.c b/kernel/locking/qspinlock.c > index 65a9a10caa6f..2b23378775fe 100644 > --- a/kernel/locking/qspinlock.c > +++ b/kernel/locking/qspinlock.c > @@ -313,7 +313,7 @@ static __always_inline u32 __pv_wait_head_or_lock(struct qspinlock *lock, > * contended : (*,x,y) +--> (*,0,0) ---> (*,0,1) -' : > * queue : ^--' : > */ > -void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val) > +void __lockfunc queued_spin_lock_slowpath(struct qspinlock *lock, u32 val) > { > struct mcs_spinlock *prev, *next, *node; > u32 old, tail; For completeness, I think you should also add it to the __pv_queued_spin_unlock() and __pv_queued_spin_unlock_slowpath() function in kernel/locking/qspinlock_paravirt.h. Perhaps even the assembly code in arch/x86/include/asm/qspinlock_paravirt.h. Cheers, Longman