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=-3.5 required=3.0 tests=FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 3AAABC2D0C5 for ; Wed, 11 Dec 2019 10:59:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C99F12073B for ; Wed, 11 Dec 2019 10:59:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C99F12073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sina.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 648026B3190; Wed, 11 Dec 2019 05:59:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F9BB6B3191; Wed, 11 Dec 2019 05:59:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50EA26B3192; Wed, 11 Dec 2019 05:59:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0160.hostedemail.com [216.40.44.160]) by kanga.kvack.org (Postfix) with ESMTP id 3AE706B3190 for ; Wed, 11 Dec 2019 05:59:37 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id DFDEC2495 for ; Wed, 11 Dec 2019 10:59:36 +0000 (UTC) X-FDA: 76252564752.06.house97_8dea7b80e963d X-HE-Tag: house97_8dea7b80e963d X-Filterd-Recvd-Size: 2152 Received: from mail3-165.sinamail.sina.com.cn (mail3-165.sinamail.sina.com.cn [202.108.3.165]) by imf33.hostedemail.com (Postfix) with SMTP for ; Wed, 11 Dec 2019 10:59:34 +0000 (UTC) Received: from unknown (HELO localhost.localdomain)([221.219.0.244]) by sina.com with ESMTP id 5DF0CC110002931E; Wed, 11 Dec 2019 18:59:30 +0800 (CST) X-Sender: hdanton@sina.com X-Auth-ID: hdanton@sina.com X-SMAIL-MID: 602631629981 From: Hillf Danton To: linux-kernel Cc: linux-mm , Hillf Danton Subject: [RFC 1/4] workqueue: fix selecting cpu for queuing work Date: Wed, 11 Dec 2019 18:59:19 +0800 Message-Id: <20191211105919.10652-1-hdanton@sina.com> In-Reply-To: <20191211104601.16468-1-hdanton@sina.com> References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.189958, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Round robin is needed only for unbound workqueue and wq_unbound_cpumask has nothing to do with standard workqueues, so we have to select cpu in case of WORK_CPU_UNBOUND also with workqueue type taken into account. Fixes: ef557180447f ("workqueue: schedule WORK_CPU_UNBOUND work on wq_unb= ound_cpumask CPUs") Signed-off-by: Hillf Danton --- --- a/kernel/workqueue.c +++ c/kernel/workqueue.c @@ -1409,16 +1409,19 @@ static void __queue_work(int cpu, struct if (unlikely(wq->flags & __WQ_DRAINING) && WARN_ON_ONCE(!is_chained_work(wq))) return; + rcu_read_lock(); retry: - if (req_cpu =3D=3D WORK_CPU_UNBOUND) - cpu =3D wq_select_unbound_cpu(raw_smp_processor_id()); - /* pwq which will be used unless @work is executing elsewhere */ - if (!(wq->flags & WQ_UNBOUND)) - pwq =3D per_cpu_ptr(wq->cpu_pwqs, cpu); - else + if (wq->flags & WQ_UNBOUND) { + if (req_cpu =3D=3D WORK_CPU_UNBOUND) + cpu =3D wq_select_unbound_cpu(raw_smp_processor_id()); pwq =3D unbound_pwq_by_node(wq, cpu_to_node(cpu)); + } else { + if (req_cpu =3D=3D WORK_CPU_UNBOUND) + cpu =3D raw_smp_processor_id(); + pwq =3D per_cpu_ptr(wq->cpu_pwqs, cpu); + } =20 /* * If @work was previously on a different pool, it might still be