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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CC5DC4361B for ; Mon, 14 Dec 2020 14:56:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 20FEA225AB for ; Mon, 14 Dec 2020 14:56:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408282AbgLNO4B (ORCPT ); Mon, 14 Dec 2020 09:56:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407519AbgLNOzO (ORCPT ); Mon, 14 Dec 2020 09:55:14 -0500 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B6C9C061794 for ; Mon, 14 Dec 2020 06:54:34 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id bj5so8740485plb.4 for ; Mon, 14 Dec 2020 06:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gr/OoPXaa+oMOOqoTeQgIX1kGl7nyIAZNwq/czVTG+c=; b=tBaDI1MeFA62gW+5BuVUZQbPX1LG/Aj/eHXk8LhZ+Tx28eGT0D9CUdSK45AWKgh+kG af7RUCPllH8EMOGXlJ4i4ETbhuI5pUCjhoHG0qvJxn6wojdpJcgaCkujNKkvalvhwgKb 7kxsF99B7bsFW7hMBie9cpU1d/VWI+E37pVqiceS4mneW9gCUk/+zw4eyNnINyKpDkfa xoixOtsIOEKU4uKWO4VbOTn4n+56v5NSKW9OTc96Joa/54NOv9Fg9M+KOPMZGR+JojHr HmBB0l2NKC3S3hEMU5In1LEVQ8fGDz8uK19rAyZTA91tM4JMGlNelHPqRDjKz6/msJty YNrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gr/OoPXaa+oMOOqoTeQgIX1kGl7nyIAZNwq/czVTG+c=; b=OJBF3RNvTAA1or/1flpWkFt7dPbp+TqAmswfw9p7bWoYKk1/TQqErnKA75LHA1IEnZ gZeg6bMLNUCa9r8nE/i0ml3wUO7iq7d3Ocm68cOriShR1LMClWL6mHMF4XK2e4WpMHdm awefEhIrGh1hzouzBihl+eXLKT1NHc7U8IG4ZJJZl/MTMBDzm7agO0Pu7b+oQqJroKVp KOalUFgepQWsCjyidD2PS4tYGRwCG4OlWFzk6AuLRbhIh1tP81TzP2o+5HrUs7ST+uox bnS3v0dnmAPbVi+4cV1KSpMo3iC2wXvldj7qPVlpaj+M8B2xaJw9/9VN+lOBVuXz1reo HDRw== X-Gm-Message-State: AOAM531ewtdUzndoMOXGmA4DSgO3P5he3aNGVlC5+5j3tGIjs3Lc/Du4 X9tlkbhvEgDhAY/mWYVIZfgRO0voYl7cPw== X-Google-Smtp-Source: ABdhPJxywAfiBgwyQp4XWT62rjlQSDi/1okr6iF9BYhXyjdoGBMRAVMkSgA6rJkpIg/TriwaL2oYUg== X-Received: by 2002:a17:90b:1918:: with SMTP id mp24mr24977047pjb.45.1607957674004; Mon, 14 Dec 2020 06:54:34 -0800 (PST) Received: from localhost ([47.88.5.130]) by smtp.gmail.com with ESMTPSA id 82sm20991092pfv.117.2020.12.14.06.54.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Dec 2020 06:54:33 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Tejun Heo , Lai Jiangshan , Peter Zijlstra , Valentin Schneider , Daniel Bristot de Oliveira Subject: [PATCH 03/10] workqueue: Manually break affinity on pool detachment Date: Mon, 14 Dec 2020 23:54:50 +0800 Message-Id: <20201214155457.3430-4-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20201214155457.3430-1-jiangshanlai@gmail.com> References: <20201214155457.3430-1-jiangshanlai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lai Jiangshan Don't rely on the scheduler to force break affinity for us -- it will stop doing that for per-cpu-kthreads. Fixes: 06249738a41a ("workqueue: Manually break affinity on hotplug") Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 1f5b8385c0cf..1f6cb83e0bc5 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1885,6 +1885,16 @@ static void worker_detach_from_pool(struct worker *worker) if (list_empty(&pool->workers)) detach_completion = pool->detach_completion; + + /* + * The cpus of pool->attrs->cpumask might all go offline after + * detachment, and the scheduler may not force break affinity + * for us, so we do it on our own and unbind this worker which + * can't be unbound by workqueue_offline_cpu() since it doesn't + * belong to any pool after it. + */ + set_cpus_allowed_ptr(worker->task, cpu_possible_mask); + mutex_unlock(&wq_pool_attach_mutex); /* clear leftover flags without pool->lock after it is detached */ -- 2.19.1.6.gb485710b