From nobody Sun Jun 28 06:42:49 2026 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 BD0D6C433EF for ; Fri, 11 Feb 2022 11:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349399AbiBKLRQ (ORCPT ); Fri, 11 Feb 2022 06:17:16 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349349AbiBKLRE (ORCPT ); Fri, 11 Feb 2022 06:17:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8DA8E5E; Fri, 11 Feb 2022 03:17:03 -0800 (PST) Date: Fri, 11 Feb 2022 11:17:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1644578222; h=from:from:sender:sender:reply-to: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=rRgfufVdSUKCP2kKHyjfDkGXkNj1dZAV5GKsRie9cWw=; b=M/WEd5p0pMBVpw3CVRdS4qmdCzqg2LmPnKawKMOmGo7zJ1avbJ8LmCNNpcixKxrIw5ssKR NI90vN2Txb+O9e1HyNUo2wqKNz8GsW4NXdKi5IqVBRkTnRVRRoCnoytNbYG+W4PzaUXPyQ 46ukgT5/hVRUpzM08gG+ffrnz+rM0m75PNEbj5jSNE2/McuQcBixdgIXa2G6b2f2azEjOX qN5r/oVmO+crUvt1ePlpNscm3PfMDAoISYwDs1GCleKiY/XcIRNyZBGuNIpFcyfqBVXGqK eu//QssycG4FfOVNI5hcrMWHudAQBUKcBfjgRnk8CbTR6EhOLZuZUU3eOOkEWA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1644578222; h=from:from:sender:sender:reply-to: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=rRgfufVdSUKCP2kKHyjfDkGXkNj1dZAV5GKsRie9cWw=; b=TUkKY39eIN4hFuaG1yFNvCSa0cw6a3oGrVgHZaW3ZJnG73ckqm9i3XvZ8cX/A4TDu8HFc2 YbxMQv/jOzT1icDQ== From: "tip-bot2 for Minchan Kim" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking: Add missing __sched attributes Cc: Minchan Kim , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220115231657.84828-1-minchan@kernel.org> References: <20220115231657.84828-1-minchan@kernel.org> MIME-Version: 1.0 Message-ID: <164457822108.16921.12490199519648748991.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: c441e934b604a3b5f350a9104124cf6a3ba07a34 Gitweb: https://git.kernel.org/tip/c441e934b604a3b5f350a9104124cf6a3= ba07a34 Author: Minchan Kim AuthorDate: Sat, 15 Jan 2022 15:16:57 -08:00 Committer: Peter Zijlstra CommitterDate: Fri, 11 Feb 2022 12:13:55 +01:00 locking: Add missing __sched attributes This patch adds __sched attributes to a few missing places to show blocked function rather than locking function in get_wchan. Signed-off-by: Minchan Kim Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20220115231657.84828-1-minchan@kernel.org --- kernel/locking/percpu-rwsem.c | 5 +++-- kernel/locking/rwsem.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c index 70a32a5..c9fdae9 100644 --- a/kernel/locking/percpu-rwsem.c +++ b/kernel/locking/percpu-rwsem.c @@ -7,6 +7,7 @@ #include #include #include +#include #include =20 int __percpu_init_rwsem(struct percpu_rw_semaphore *sem, @@ -162,7 +163,7 @@ static void percpu_rwsem_wait(struct percpu_rw_semaphor= e *sem, bool reader) __set_current_state(TASK_RUNNING); } =20 -bool __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) +bool __sched __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) { if (__percpu_down_read_trylock(sem)) return true; @@ -211,7 +212,7 @@ static bool readers_active_check(struct percpu_rw_semap= hore *sem) return true; } =20 -void percpu_down_write(struct percpu_rw_semaphore *sem) +void __sched percpu_down_write(struct percpu_rw_semaphore *sem) { might_sleep(); rwsem_acquire(&sem->dep_map, 0, 0, _RET_IP_); diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 69aba4a..acde5d6 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -1048,7 +1048,7 @@ out_nolock: /* * Wait until we successfully acquire the write lock */ -static struct rw_semaphore * +static struct rw_semaphore __sched * rwsem_down_write_slowpath(struct rw_semaphore *sem, int state) { long count;