UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juri Lelli <juri.lelli@redhat.com>
Reviewed-by: Phil Auld <pauld@redhat.com>
Link: https://lore.kernel.org/r/20220207155910.527133-2-frederic@kernel.org
This commit is contained in:
Frederic Weisbecker 2022-02-07 16:59:03 +01:00 committed by Peter Zijlstra
parent e6df4ead85
commit 9d42ea0d69
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/pci/pci-driver.c
View File

@ -350,7 +350,6 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int error, node, cpu; int error, node, cpu;
int hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ;
struct drv_dev_and_id ddi = { drv, dev, id }; 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. * device is probed from work_on_cpu() of the Physical device.
*/ */
if (node < 0 || node >= MAX_NUMNODES || !node_online(node) || if (node < 0 || node >= MAX_NUMNODES || !node_online(node) ||
pci_physfn_is_probed(dev)) pci_physfn_is_probed(dev)) {
cpu = nr_cpu_ids; 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), 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) if (cpu < nr_cpu_ids)
error = work_on_cpu(cpu, local_pci_probe, &ddi); error = work_on_cpu(cpu, local_pci_probe, &ddi);
else else
error = local_pci_probe(&ddi); error = local_pci_probe(&ddi);
out:
dev->is_probed = 0; dev->is_probed = 0;
cpu_hotplug_enable(); cpu_hotplug_enable();
return error; return error;