p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pci/msi' into next 

* pci/msi:
  PCI/MSI: Ignore affinity if pre/post vector count is more than min_vecs
This commit is contained in:
Bjorn Helgaas 2017-07-02 18:48:49 -05:00
parent 91bbec655f 6f9a22bc57
commit 6a1c1d553e
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pci/msi.c
View File

@ -1058,7 +1058,7 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
for (;;) { for (;;) {
if (affd) { if (affd) {
nvec = irq_calc_affinity_vectors(nvec, affd); nvec = irq_calc_affinity_vectors(minvec, nvec, affd);
if (nvec < minvec) if (nvec < minvec)
return -ENOSPC; return -ENOSPC;
} }
@ -1097,7 +1097,7 @@ static int __pci_enable_msix_range(struct pci_dev *dev,
for (;;) { for (;;) {
if (affd) { if (affd) {
nvec = irq_calc_affinity_vectors(nvec, affd); nvec = irq_calc_affinity_vectors(minvec, nvec, affd);
if (nvec < minvec) if (nvec < minvec)
return -ENOSPC; return -ENOSPC;
} }
@ -1165,16 +1165,6 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
if (flags & PCI_IRQ_AFFINITY) { if (flags & PCI_IRQ_AFFINITY) {
if (!affd) if (!affd)
affd = &msi_default_affd; affd = &msi_default_affd;
if (affd->pre_vectors + affd->post_vectors > min_vecs)
return -EINVAL;
/*
* If there aren't any vectors left after applying the pre/post
* vectors don't bother with assigning affinity.
*/
if (affd->pre_vectors + affd->post_vectors == min_vecs)
affd = NULL;
} else { } else {
if (WARN_ON(affd)) if (WARN_ON(affd))
affd = NULL; affd = NULL;

4
include/linux/interrupt.h
View File

@ -291,7 +291,7 @@ extern int
irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify); irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify);
struct cpumask *irq_create_affinity_masks(int nvec, const struct irq_affinity *affd); struct cpumask *irq_create_affinity_masks(int nvec, const struct irq_affinity *affd);
int irq_calc_affinity_vectors(int maxvec, const struct irq_affinity *affd); int irq_calc_affinity_vectors(int minvec, int maxvec, const struct irq_affinity *affd);
#else /* CONFIG_SMP */ #else /* CONFIG_SMP */
@ -331,7 +331,7 @@ irq_create_affinity_masks(int nvec, const struct irq_affinity *affd)
} }
static inline int static inline int
irq_calc_affinity_vectors(int maxvec, const struct irq_affinity *affd) irq_calc_affinity_vectors(int minvec, int maxvec, const struct irq_affinity *affd)
{ {
return maxvec; return maxvec;
} }

13
kernel/irq/affinity.c
View File

@ -66,6 +66,13 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
struct cpumask *masks; struct cpumask *masks;
cpumask_var_t nmsk; cpumask_var_t nmsk;
/*
* If there aren't any vectors left after applying the pre/post
* vectors don't bother with assigning affinity.
*/
if (!affv)
return NULL;
if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL)) if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL))
return NULL; return NULL;
@ -140,15 +147,19 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
/** /**
* irq_calc_affinity_vectors - Calculate the optimal number of vectors * irq_calc_affinity_vectors - Calculate the optimal number of vectors
* @minvec: The minimum number of vectors available
* @maxvec: The maximum number of vectors available * @maxvec: The maximum number of vectors available
* @affd: Description of the affinity requirements * @affd: Description of the affinity requirements
*/ */
int irq_calc_affinity_vectors(int maxvec, const struct irq_affinity *affd) int irq_calc_affinity_vectors(int minvec, int maxvec, const struct irq_affinity *affd)
{ {
int resv = affd->pre_vectors + affd->post_vectors; int resv = affd->pre_vectors + affd->post_vectors;
int vecs = maxvec - resv; int vecs = maxvec - resv;
int cpus; int cpus;
if (resv > minvec)
return 0;
/* Stabilize the cpumasks */ /* Stabilize the cpumasks */
get_online_cpus(); get_online_cpus();
cpus = cpumask_weight(cpu_online_mask); cpus = cpumask_weight(cpu_online_mask);