From patchwork Mon Jan 9 10:45:49 2023 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: 40790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2085495wrt; Mon, 9 Jan 2023 02:52:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfk12X9NWo+XlapnMIf6xy0OkeCm3vWynfFJ51tmS0xAhEbnArR2G1nbhb4Beht1EB+lTD X-Received: by 2002:a17:902:caca:b0:192:f281:b933 with SMTP id y10-20020a170902caca00b00192f281b933mr15639961pld.9.1673261534295; Mon, 09 Jan 2023 02:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673261534; cv=none; d=google.com; s=arc-20160816; b=t8nro1pJunoW4txfyEQ/HkreO4+Nv/YAMDWDT84u4CFdzT8YSFqkxxt9eBRncdCEg1 xvyrrNqIKeh0F9fgvP7ooXcCNBDKsgC4yy2PTNjVMkh+JOlecc0knjSfKlcMFJ8mRmNR F6tQ4UhlS9T8o6eRNHvj7NdQd8+b2Rlo42IMUL3smzBLNpz3p6zYsXs9ihnmCA6RTTBZ RbhDD8qvW2U1WBd9urZ7FEfMgwWJlDbjTdxS5rU2odpP7OzPSZJ2mBP5gl6yKX7Rq/+R 76hYyUgH0Q1oCWG8SHpyyH5VeBL+NJWo4RaVb/RtuX3mdIpzi3ZvfBHHu6PAkKcTY+Qz cN7A== 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=BPZb9ukPZTcxAtrvj1QdbsugeI7W3VLo/9zdEGtVAGw=; b=Bo/90lBouPksqh3GqF/mr80siyBaiG56YxzPpZyZK+Ckmlc4q/2jK2lMlExwl3VZ72 KxAtyISPQHp+YGvCOYwGR7xeU1BoldH2pHlxX4XiqA4tgaog+411ZppErQ27Jjalx37h +I3Zjf6Qz9z7yuEt7O7lDoGrjhu4KQxpC3kUhzAi67H4fLR7yVC5k/s8UePF6OomC5QB weAvyfuno+rcEbAK6AWiu0zt8hKf+WcSzKjKCwXJJsudFsJmWfRM2ZN6zRGPVtis2Uns eN6/GEUcfei5P+W7xiFMAhQK1rgLRvsd1iI2+Ld6UBBjgBlYMTD2NTrdEj+ULMCXDM+j eGWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=dH5Fwsqq; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 q71-20020a632a4a000000b004a3ed20c3dbsi9806043pgq.454.2023.01.09.02.52.01; Mon, 09 Jan 2023 02:52:14 -0800 (PST) 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=dH5Fwsqq; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S234257AbjAIKqR (ORCPT + 99 others); Mon, 9 Jan 2023 05:46:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234288AbjAIKpx (ORCPT ); Mon, 9 Jan 2023 05:45:53 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A5652615; Mon, 9 Jan 2023 02:45:52 -0800 (PST) Date: Mon, 09 Jan 2023 10:45:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673261150; 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=BPZb9ukPZTcxAtrvj1QdbsugeI7W3VLo/9zdEGtVAGw=; b=dH5FwsqqlyRCwg3sN9ZpbF3c+X3DE5SyVn32kURsg0bAqT5QaUKUmKbz68nhFB0kJIQHkr PNNQDoa4nibUmYhuHUxJd572YSSpx5gd0rGefy7lZ9esMdoM/L5qcnEWKrEnQj2kl7i7DK q3BhvVCAU0mE3nXTbCiH1oVlnk0ols711r3GTh7tXuqpnhW4NYsZ5tfSAIzSwYDbJrJ3dK mSWpNEvTon5zKxGJ8q3xlw7hqx85521MJX+lATzQ32VVSQiNQ75Pq9ck9+wcyzwb2JEYWw iyPrqdUFbyPG0w52mXuU1WGFoRYiWos6E/xkeIWONgNcA+jJLSjGJHAu7ZgZSw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673261150; 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=BPZb9ukPZTcxAtrvj1QdbsugeI7W3VLo/9zdEGtVAGw=; b=/G6eqSBW1UBko61m+yk6ua8qoRdcvRGfjqztX+pEu/Di6+K71vq8429WWZYK0zuc8KiF75 OOIAOcUBed9ijDCA== 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/urgent] sched/core: Use kfree_rcu() in do_set_cpus_allowed() Cc: Peter Zijlstra , Waiman Long , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221231041120.440785-3-longman@redhat.com> References: <20221231041120.440785-3-longman@redhat.com> MIME-Version: 1.0 Message-ID: <167326114997.4906.573601630756814284.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?1754541886584471893?= X-GMAIL-MSGID: =?utf-8?q?1754541886584471893?= The following commit has been merged into the sched/urgent branch of tip: Commit-ID: 9a5418bc48babb313d2a62df29ebe21ce8c06c59 Gitweb: https://git.kernel.org/tip/9a5418bc48babb313d2a62df29ebe21ce8c06c59 Author: Waiman Long AuthorDate: Fri, 30 Dec 2022 23:11:20 -05:00 Committer: Ingo Molnar CommitterDate: Mon, 09 Jan 2023 11:43:23 +01:00 sched/core: Use kfree_rcu() in do_set_cpus_allowed() Commit 851a723e45d1 ("sched: Always clear user_cpus_ptr in do_set_cpus_allowed()") may call kfree() if user_cpus_ptr was previously set. Unfortunately, some of the callers of do_set_cpus_allowed() may have pi_lock held when calling it. So the following splats may be printed especially when running with a PREEMPT_RT kernel: WARNING: possible circular locking dependency detected BUG: sleeping function called from invalid context To avoid these problems, kfree_rcu() is used instead. An internal cpumask_rcuhead union is created for the sole purpose of facilitating the use of kfree_rcu() to free the cpumask. Since user_cpus_ptr is not being used in non-SMP configs, the newly introduced alloc_user_cpus_ptr() helper will return NULL in this case and sched_setaffinity() is modified to handle this special case. Fixes: 851a723e45d1 ("sched: Always clear user_cpus_ptr in do_set_cpus_allowed()") Suggested-by: Peter Zijlstra Signed-off-by: Waiman Long Signed-off-by: Ingo Molnar Reviewed-by: Peter Zijlstra Link: https://lore.kernel.org/r/20221231041120.440785-3-longman@redhat.com --- kernel/sched/core.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f9f6e54..bb1ee6d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2604,9 +2604,29 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) .user_mask = NULL, .flags = SCA_USER, /* clear the user requested mask */ }; + union cpumask_rcuhead { + cpumask_t cpumask; + struct rcu_head rcu; + }; __do_set_cpus_allowed(p, &ac); - kfree(ac.user_mask); + + /* + * Because this is called with p->pi_lock held, it is not possible + * to use kfree() here (when PREEMPT_RT=y), therefore punt to using + * kfree_rcu(). + */ + kfree_rcu((union cpumask_rcuhead *)ac.user_mask, rcu); +} + +static cpumask_t *alloc_user_cpus_ptr(int node) +{ + /* + * See do_set_cpus_allowed() above for the rcu_head usage. + */ + int size = max_t(int, cpumask_size(), sizeof(struct rcu_head)); + + return kmalloc_node(size, GFP_KERNEL, node); } int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, @@ -2629,7 +2649,7 @@ int dup_user_cpus_ptr(struct task_struct *dst, struct task_struct *src, if (data_race(!src->user_cpus_ptr)) return 0; - user_mask = kmalloc_node(cpumask_size(), GFP_KERNEL, node); + user_mask = alloc_user_cpus_ptr(node); if (!user_mask) return -ENOMEM; @@ -3605,6 +3625,11 @@ static inline bool rq_has_pinned_tasks(struct rq *rq) return false; } +static inline cpumask_t *alloc_user_cpus_ptr(int node) +{ + return NULL; +} + #endif /* !CONFIG_SMP */ static void @@ -8265,8 +8290,8 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) if (retval) goto out_put_task; - user_mask = kmalloc(cpumask_size(), GFP_KERNEL); - if (!user_mask) { + user_mask = alloc_user_cpus_ptr(NUMA_NO_NODE); + if (IS_ENABLED(CONFIG_SMP) && !user_mask) { retval = -ENOMEM; goto out_put_task; }