From patchwork Fri Oct 28 06:42:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 12103 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp659028wru; Thu, 27 Oct 2022 23:44:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vR/GtWCirAI8Y/KGoJyAKiplt2b9XAdZPs0hjJJGDs412TFjPyE9HnxDWUJ6AVrFQSSvw X-Received: by 2002:a63:5c08:0:b0:46e:e211:5694 with SMTP id q8-20020a635c08000000b0046ee2115694mr26607138pgb.441.1666939467524; Thu, 27 Oct 2022 23:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666939467; cv=none; d=google.com; s=arc-20160816; b=J3038gtFLGuxCKciBtHqQnIvFMuT7P7Ze3zYp/rwquatUw6z2tVLLxgXvgCdEuNKj+ dcFq9VGg323bDgPEAXTqXDak5iYt5nvFkkCzWMJRQG8bboCeeHmWC6JSDyMoOQYC/CwA FRTHYtkeXTTgL7oBPb+dORLvPhQwVfo8JjYQ1HounUTURhCFK61ya/wrSdaD/+QhFNvT +P+dD2R/XfZc43crLrs48Ayupp7IoG403C+lhjD9Vix07EnJputujccXX6H0niSjH+bJ yOfM9k97CB4Vg5Snldx2xKljmfFURFtu+g+Uflmvj2Q5NxUG80fqVleqXcMpGtN7ldrc JtRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=EDLKi+FR9oLa+dB38spl3lqT0imIoZKy5gwaFYje73A=; b=HOZcnjcZcz2tqrbZWYdE4gmXv05Yk6xxA/fpq6RGUYLUJHSilEwn/zT5zvouavRcVX SPGwaS3TXOCGyseM12EVy+7F1C9ItUAoC/dQLkPXZ8++NLWbBn/aFVRij1piDejxJgDo DdSRxu6+LwjvNswzYuvauzX4gUKCQjT3t+3wJeh39tiv8O8N3w+MUhuU3cE7r/wHQ7cN n/vOKnDPVld1/ZnYXwMFVz0lO9IRlznVkP+UOSmcPeic4/u7CPeLb8KzDj9gI1XdqAGt G6F+BAQ5ZzqJ3Kvu4mSXhar7HBcURc+t3sDcAx6PZml5A7iWRGvftaC1VJ0CVW80pD+Z L9FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GFDEWk26; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a632009000000b0044b5e15db73si4233532pgg.249.2022.10.27.23.44.14; Thu, 27 Oct 2022 23:44:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=GFDEWk26; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230055AbiJ1Gng (ORCPT + 99 others); Fri, 28 Oct 2022 02:43:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229938AbiJ1GmT (ORCPT ); Fri, 28 Oct 2022 02:42:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3725D1BA1FC; Thu, 27 Oct 2022 23:42:17 -0700 (PDT) Date: Fri, 28 Oct 2022 06:42:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666939335; 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=EDLKi+FR9oLa+dB38spl3lqT0imIoZKy5gwaFYje73A=; b=GFDEWk26Fi6G9EfrotAPmMG+IipvAgOGi81ll86kVEcDw7zxq2JafMs5BA4MAl6XVB8dF3 WmUDdje4UC8b5rBfcaE9W9yiuG0UKe+vPwqXGLZnEQ+1POiHBh3DiGk0d6Vgq3DeKby0IF U09e6HxodxddKtVcHVKT1pv7Gy3QOOCEdgL2ezraPYd/YrYPM8YTxfjDohBbNAmoLIW8DH Bue3gHcg88sqGQz3GZJo+ZPlSFiYrTBpFTFFeORordzJTSF+Ia9ld+ZKZlmUAORmIknXU6 PGSXAcKCh/DsJnhn0WrsFLOSvh3UtVQJADfPtZRWNicPo8LPtJsfaEFiIRZ5xw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666939335; 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=EDLKi+FR9oLa+dB38spl3lqT0imIoZKy5gwaFYje73A=; b=wbyU5WjyyQ+2VdmDRqVN97GTyiWjmYQrxY9fnOd/901GF/pYTODanlW6p2zSkkJ9mfqSPu EEXJ58PFc5vGWZBg== From: "tip-bot2 for Waiman Long" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched: Add __releases annotations to affine_move_task() Cc: Waiman Long , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220922180041.1768141-2-longman@redhat.com> References: <20220922180041.1768141-2-longman@redhat.com> MIME-Version: 1.0 Message-ID: <166693933445.29415.8756864522023842425.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747912719239215874?= X-GMAIL-MSGID: =?utf-8?q?1747912719239215874?= The following commit has been merged into the sched/core branch of tip: Commit-ID: 5584e8ac2c68280e5ac31d231c23cdb7dfa225db Gitweb: https://git.kernel.org/tip/5584e8ac2c68280e5ac31d231c23cdb7dfa225db Author: Waiman Long AuthorDate: Thu, 22 Sep 2022 14:00:37 -04:00 Committer: Peter Zijlstra CommitterDate: Thu, 27 Oct 2022 11:01:21 +02:00 sched: Add __releases annotations to affine_move_task() affine_move_task() assumes task_rq_lock() has been called and it does an implicit task_rq_unlock() before returning. Add the appropriate __releases annotations to make this clear. A typo error in comment is also fixed. Signed-off-by: Waiman Long Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20220922180041.1768141-2-longman@redhat.com --- kernel/sched/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 069da4a..f6f2807 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2690,6 +2690,8 @@ void release_user_cpus_ptr(struct task_struct *p) */ static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flags *rf, int dest_cpu, unsigned int flags) + __releases(rq->lock) + __releases(p->pi_lock) { struct set_affinity_pending my_pending = { }, *pending = NULL; bool stop_pending, complete = false; @@ -2999,7 +3001,7 @@ err_unlock: /* * Restrict the CPU affinity of task @p so that it is a subset of - * task_cpu_possible_mask() and point @p->user_cpu_ptr to a copy of the + * task_cpu_possible_mask() and point @p->user_cpus_ptr to a copy of the * old affinity mask. If the resulting mask is empty, we warn and walk * up the cpuset hierarchy until we find a suitable mask. */