Commit 9d42ea0d authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Peter Zijlstra
Browse files

pci: Decouple HK_FLAG_WQ and HK_FLAG_DOMAIN cpumask fetch 



To prepare for supporting each feature of the housekeeping cpumask
toward cpuset, prepare each of the HK_FLAG_* entries to move to their
own cpumask with enforcing to fetch them individually. The new
constraint is that multiple HK_FLAG_* entries can't be mixed together
anymore in a single call to housekeeping cpumask().

This will later allow, for example, to runtime modify the cpulist passed
through "isolcpus=", "nohz_full=" and "rcu_nocbs=" kernel boot
parameters.

Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Reviewed-by: default avatarPhil Auld <pauld@redhat.com>
Link: https://lore.kernel.org/r/20220207155910.527133-2-frederic@kernel.org
parent e6df4ead

drivers/pci/pci-driver.c

+16 −5
Original line number Diff line number Diff line
@@ -350,7 +350,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 };



	/*
@@ -368,17 +367,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;