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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5F1CCC07E9A for ; Wed, 14 Jul 2021 13:54:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 487A5613BF for ; Wed, 14 Jul 2021 13:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239364AbhGNN5Z (ORCPT ); Wed, 14 Jul 2021 09:57:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:45154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231941AbhGNN5W (ORCPT ); Wed, 14 Jul 2021 09:57:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 763F7613BE; Wed, 14 Jul 2021 13:54:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626270870; bh=t+6P8ruMEieGtHTBjM2M2aNiGF22kEbrvG+svMNP+AI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u7w58994SAuYUULuNNKE9wHQEbF243glAKHGQhS4i2VBpa9s0uONXPgE++p8edcgi s3IkO48btLm/ozz1XY4qULf7ThaL8djeIgGhgqFSgABu12d12pyy7GwSbf831pXHXp sS/NXX2S+jrHVBGpfnYzYb1vOBLvcNJtzrQL74ORG7kX3wCZfDrYGSRxq1DuZUWBNP XykgYEe9CseC6Yg4ZZ0WAHAQnYeEXRtX1q/V0kb3iu8VXVhM10sF59Cc2latwh1DBo Nplw2wge8CMwVUfKRdgDou909WDHuFrQWaxDKDfjPkG31DhS5w27PX7Ir+HLq7sOuJ JGpxMGBf4l6MQ== From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Tejun Heo , Peter Zijlstra , Juri Lelli , Alex Belits , Nitesh Lal , Thomas Gleixner , Nicolas Saenz , Christoph Lameter , Marcelo Tosatti , "Zefan Li cgroups @ vger . kernel . org" Subject: [RFC PATCH 1/6] pci: Decouple HK_FLAG_WQ and HK_FLAG_DOMAIN cpumask fetch Date: Wed, 14 Jul 2021 15:54:15 +0200 Message-Id: <20210714135420.69624-2-frederic@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210714135420.69624-1-frederic@kernel.org> References: <20210714135420.69624-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To prepare for supporting each feature of the housekeeping cpumask toward cpuset, prepare for HK_FLAG_DOMAIN to move to its own cpumask. This will allow to modify the set passed through "isolcpus=" kernel boot parameter on runtime. Signed-off-by: Frederic Weisbecker Cc: Thomas Gleixner Cc: Juri Lelli Cc: Marcelo Tosatti Cc: Nitesh Lal Cc: Nicolas Saenz Cc: Peter Zijlstra Cc: Christoph Lameter Cc: Tejun Heo Cc: Zefan Li Cc: Alex Belits --- drivers/pci/pci-driver.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 3a72352aa5cf..ab84fa81c29a 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -336,7 +336,6 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, const struct pci_device_id *id) { int error, node, cpu; - int hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ; struct drv_dev_and_id ddi = { drv, dev, id }; /* @@ -354,17 +353,29 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, * device is probed from work_on_cpu() of the Physical device. */ if (node < 0 || node >= MAX_NUMNODES || !node_online(node) || - pci_physfn_is_probed(dev)) + pci_physfn_is_probed(dev)) { cpu = nr_cpu_ids; - else + } else { + cpumask_var_t wq_domain_mask; + + if (!zalloc_cpumask_var(&wq_domain_mask, GFP_KERNEL)) { + error = -ENOMEM; + goto out; + } + cpumask_and(wq_domain_mask, + housekeeping_cpumask(HK_FLAG_WQ), + housekeeping_cpumask(HK_FLAG_DOMAIN)); + cpu = cpumask_any_and(cpumask_of_node(node), - housekeeping_cpumask(hk_flags)); + wq_domain_mask); + free_cpumask_var(wq_domain_mask); + } if (cpu < nr_cpu_ids) error = work_on_cpu(cpu, local_pci_probe, &ddi); else error = local_pci_probe(&ddi); - +out: dev->is_probed = 0; cpu_hotplug_enable(); return error; -- 2.25.1