Skip to content

Commit 0a30d69

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge branch 'irq/for-block' into irq/core
Add the new irq spreading infrastructure.
2 parents 16217dc + ee8d41e commit 0a30d69

File tree

9 files changed

+293
-123
lines changed

9 files changed

+293
-123
lines changed

‎drivers/base/platform-msi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,12 @@ static int platform_msi_alloc_descs_with_irq(struct device *dev, int virq,
142142
}
143143

144144
for (i = 0; i < nvec; i++) {
145-
desc = alloc_msi_entry(dev);
145+
desc = alloc_msi_entry(dev, 1, NULL);
146146
if (!desc)
147147
break;
148148

149149
desc->platform.msi_priv_data = data;
150150
desc->platform.msi_index = base + i;
151-
desc->nvec_used = 1;
152151
desc->irq = virq ? virq + i : 0;
153152

154153
list_add_tail(&desc->list, dev_to_msi_list(dev));

‎drivers/pci/msi.c

Lines changed: 103 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -550,15 +550,23 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
550550
return ret;
551551
}
552552

553-
static struct msi_desc *msi_setup_entry(struct pci_dev *dev, int nvec)
553+
static struct msi_desc *
554+
msi_setup_entry(struct pci_dev *dev, int nvec, bool affinity)
554555
{
555-
u16 control;
556+
struct cpumask *masks = NULL;
556557
struct msi_desc *entry;
558+
u16 control;
559+
560+
if (affinity) {
561+
masks = irq_create_affinity_masks(dev->irq_affinity, nvec);
562+
if (!masks)
563+
pr_err("Unable to allocate affinity masks, ignoring\n");
564+
}
557565

558566
/* MSI Entry Initialization */
559-
entry = alloc_msi_entry(&dev->dev);
567+
entry = alloc_msi_entry(&dev->dev, nvec, masks);
560568
if (!entry)
561-
return NULL;
569+
goto out;
562570

563571
pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
564572

@@ -569,8 +577,6 @@ static struct msi_desc *msi_setup_entry(struct pci_dev *dev, int nvec)
569577
entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */
570578
entry->msi_attrib.multi_cap = (control & PCI_MSI_FLAGS_QMASK) >> 1;
571579
entry->msi_attrib.multiple = ilog2(__roundup_pow_of_two(nvec));
572-
entry->nvec_used = nvec;
573-
entry->affinity = dev->irq_affinity;
574580

575581
if (control & PCI_MSI_FLAGS_64BIT)
576582
entry->mask_pos = dev->msi_cap + PCI_MSI_MASK_64;
@@ -581,6 +587,8 @@ static struct msi_desc *msi_setup_entry(struct pci_dev *dev, int nvec)
581587
if (entry->msi_attrib.maskbit)
582588
pci_read_config_dword(dev, entry->mask_pos, &entry->masked);
583589

590+
out:
591+
kfree(masks);
584592
return entry;
585593
}
586594

@@ -609,15 +617,15 @@ static int msi_verify_entries(struct pci_dev *dev)
609617
* an error, and a positive return value indicates the number of interrupts
610618
* which could have been allocated.
611619
*/
612-
static int msi_capability_init(struct pci_dev *dev, int nvec)
620+
static int msi_capability_init(struct pci_dev *dev, int nvec, bool affinity)
613621
{
614622
struct msi_desc *entry;
615623
int ret;
616624
unsigned mask;
617625

618626
pci_msi_set_enable(dev, 0); /* Disable MSI during set up */
619627

620-
entry = msi_setup_entry(dev, nvec);
628+
entry = msi_setup_entry(dev, nvec, affinity);
621629
if (!entry)
622630
return -ENOMEM;
623631

@@ -680,28 +688,29 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)
680688
}
681689

682690
static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,
683-
struct msix_entry *entries, int nvec)
691+
struct msix_entry *entries, int nvec,
692+
bool affinity)
684693
{
685-
const struct cpumask *mask = NULL;
694+
struct cpumask *curmsk, *masks = NULL;
686695
struct msi_desc *entry;
687-
int cpu = -1, i;
688-
689-
for (i = 0; i < nvec; i++) {
690-
if (dev->irq_affinity) {
691-
cpu = cpumask_next(cpu, dev->irq_affinity);
692-
if (cpu >= nr_cpu_ids)
693-
cpu = cpumask_first(dev->irq_affinity);
694-
mask = cpumask_of(cpu);
695-
}
696+
int ret, i;
697+
698+
if (affinity) {
699+
masks = irq_create_affinity_masks(dev->irq_affinity, nvec);
700+
if (!masks)
701+
pr_err("Unable to allocate affinity masks, ignoring\n");
702+
}
696703

697-
entry = alloc_msi_entry(&dev->dev);
704+
for (i = 0, curmsk = masks; i < nvec; i++) {
705+
entry = alloc_msi_entry(&dev->dev, 1, curmsk);
698706
if (!entry) {
699707
if (!i)
700708
iounmap(base);
701709
else
702710
free_msi_irqs(dev);
703711
/* No enough memory. Don't try again */
704-
return -ENOMEM;
712+
ret = -ENOMEM;
713+
goto out;
705714
}
706715

707716
entry->msi_attrib.is_msix = 1;
@@ -712,12 +721,14 @@ static int msix_setup_entries(struct pci_dev *dev, void __iomem *base,
712721
entry->msi_attrib.entry_nr = i;
713722
entry->msi_attrib.default_irq = dev->irq;
714723
entry->mask_base = base;
715-
entry->nvec_used = 1;
716-
entry->affinity = mask;
717724

718725
list_add_tail(&entry->list, dev_to_msi_list(&dev->dev));
726+
if (masks)
727+
curmsk++;
719728
}
720-
729+
ret = 0;
730+
out:
731+
kfree(masks);
721732
return 0;
722733
}
723734

@@ -746,8 +757,8 @@ static void msix_program_entries(struct pci_dev *dev,
746757
* single MSI-X irq. A return of zero indicates the successful setup of
747758
* requested MSI-X entries with allocated irqs or non-zero for otherwise.
748759
**/
749-
static int msix_capability_init(struct pci_dev *dev,
750-
struct msix_entry *entries, int nvec)
760+
static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
761+
int nvec, bool affinity)
751762
{
752763
int ret;
753764
u16 control;
@@ -762,7 +773,7 @@ static int msix_capability_init(struct pci_dev *dev,
762773
if (!base)
763774
return -ENOMEM;
764775

765-
ret = msix_setup_entries(dev, base, entries, nvec);
776+
ret = msix_setup_entries(dev, base, entries, nvec, affinity);
766777
if (ret)
767778
return ret;
768779

@@ -942,22 +953,8 @@ int pci_msix_vec_count(struct pci_dev *dev)
942953
}
943954
EXPORT_SYMBOL(pci_msix_vec_count);
944955

945-
/**
946-
* pci_enable_msix - configure device's MSI-X capability structure
947-
* @dev: pointer to the pci_dev data structure of MSI-X device function
948-
* @entries: pointer to an array of MSI-X entries (optional)
949-
* @nvec: number of MSI-X irqs requested for allocation by device driver
950-
*
951-
* Setup the MSI-X capability structure of device function with the number
952-
* of requested irqs upon its software driver call to request for
953-
* MSI-X mode enabled on its hardware device function. A return of zero
954-
* indicates the successful configuration of MSI-X capability structure
955-
* with new allocated MSI-X irqs. A return of < 0 indicates a failure.
956-
* Or a return of > 0 indicates that driver request is exceeding the number
957-
* of irqs or MSI-X vectors available. Driver should use the returned value to
958-
* re-send its request.
959-
**/
960-
int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
956+
static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries,
957+
int nvec, bool affinity)
961958
{
962959
int nr_entries;
963960
int i, j;
@@ -989,7 +986,27 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
989986
dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
990987
return -EINVAL;
991988
}
992-
return msix_capability_init(dev, entries, nvec);
989+
return msix_capability_init(dev, entries, nvec, affinity);
990+
}
991+
992+
/**
993+
* pci_enable_msix - configure device's MSI-X capability structure
994+
* @dev: pointer to the pci_dev data structure of MSI-X device function
995+
* @entries: pointer to an array of MSI-X entries (optional)
996+
* @nvec: number of MSI-X irqs requested for allocation by device driver
997+
*
998+
* Setup the MSI-X capability structure of device function with the number
999+
* of requested irqs upon its software driver call to request for
1000+
* MSI-X mode enabled on its hardware device function. A return of zero
1001+
* indicates the successful configuration of MSI-X capability structure
1002+
* with new allocated MSI-X irqs. A return of < 0 indicates a failure.
1003+
* Or a return of > 0 indicates that driver request is exceeding the number
1004+
* of irqs or MSI-X vectors available. Driver should use the returned value to
1005+
* re-send its request.
1006+
**/
1007+
int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
1008+
{
1009+
return __pci_enable_msix(dev, entries, nvec, false);
9931010
}
9941011
EXPORT_SYMBOL(pci_enable_msix);
9951012

@@ -1042,6 +1059,7 @@ EXPORT_SYMBOL(pci_msi_enabled);
10421059
static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
10431060
unsigned int flags)
10441061
{
1062+
bool affinity = flags & PCI_IRQ_AFFINITY;
10451063
int nvec;
10461064
int rc;
10471065

@@ -1070,19 +1088,17 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
10701088
nvec = maxvec;
10711089

10721090
for (;;) {
1073-
if (flags & PCI_IRQ_AFFINITY) {
1074-
dev->irq_affinity = irq_create_affinity_mask(&nvec);
1091+
if (affinity) {
1092+
nvec = irq_calc_affinity_vectors(dev->irq_affinity,
1093+
nvec);
10751094
if (nvec < minvec)
10761095
return -ENOSPC;
10771096
}
10781097

1079-
rc = msi_capability_init(dev, nvec);
1098+
rc = msi_capability_init(dev, nvec, affinity);
10801099
if (rc == 0)
10811100
return nvec;
10821101

1083-
kfree(dev->irq_affinity);
1084-
dev->irq_affinity = NULL;
1085-
10861102
if (rc < 0)
10871103
return rc;
10881104
if (rc < minvec)
@@ -1114,26 +1130,24 @@ static int __pci_enable_msix_range(struct pci_dev *dev,
11141130
struct msix_entry *entries, int minvec, int maxvec,
11151131
unsigned int flags)
11161132
{
1117-
int nvec = maxvec;
1118-
int rc;
1133+
bool affinity = flags & PCI_IRQ_AFFINITY;
1134+
int rc, nvec = maxvec;
11191135

11201136
if (maxvec < minvec)
11211137
return -ERANGE;
11221138

11231139
for (;;) {
1124-
if (flags & PCI_IRQ_AFFINITY) {
1125-
dev->irq_affinity = irq_create_affinity_mask(&nvec);
1140+
if (affinity) {
1141+
nvec = irq_calc_affinity_vectors(dev->irq_affinity,
1142+
nvec);
11261143
if (nvec < minvec)
11271144
return -ENOSPC;
11281145
}
11291146

1130-
rc = pci_enable_msix(dev, entries, nvec);
1147+
rc = __pci_enable_msix(dev, entries, nvec, affinity);
11311148
if (rc == 0)
11321149
return nvec;
11331150

1134-
kfree(dev->irq_affinity);
1135-
dev->irq_affinity = NULL;
1136-
11371151
if (rc < 0)
11381152
return rc;
11391153
if (rc < minvec)
@@ -1257,6 +1271,37 @@ int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
12571271
}
12581272
EXPORT_SYMBOL(pci_irq_vector);
12591273

1274+
/**
1275+
* pci_irq_get_affinity - return the affinity of a particular msi vector
1276+
* @dev: PCI device to operate on
1277+
* @nr: device-relative interrupt vector index (0-based).
1278+
*/
1279+
const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr)
1280+
{
1281+
if (dev->msix_enabled) {
1282+
struct msi_desc *entry;
1283+
int i = 0;
1284+
1285+
for_each_pci_msi_entry(entry, dev) {
1286+
if (i == nr)
1287+
return entry->affinity;
1288+
i++;
1289+
}
1290+
WARN_ON_ONCE(1);
1291+
return NULL;
1292+
} else if (dev->msi_enabled) {
1293+
struct msi_desc *entry = first_pci_msi_entry(dev);
1294+
1295+
if (WARN_ON_ONCE(!entry || nr >= entry->nvec_used))
1296+
return NULL;
1297+
1298+
return &entry->affinity[nr];
1299+
} else {
1300+
return cpu_possible_mask;
1301+
}
1302+
}
1303+
EXPORT_SYMBOL(pci_irq_get_affinity);
1304+
12601305
struct pci_dev *msi_desc_to_pci_dev(struct msi_desc *desc)
12611306
{
12621307
return to_pci_dev(desc->dev);

‎drivers/staging/fsl-mc/bus/mc-msi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,14 @@ static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count)
213213
struct msi_desc *msi_desc;
214214

215215
for (i = 0; i < irq_count; i++) {
216-
msi_desc = alloc_msi_entry(dev);
216+
msi_desc = alloc_msi_entry(dev, 1, NULL);
217217
if (!msi_desc) {
218218
dev_err(dev, "Failed to allocate msi entry\n");
219219
error = -ENOMEM;
220220
goto cleanup_msi_descs;
221221
}
222222

223223
msi_desc->fsl_mc.msi_index = i;
224-
msi_desc->nvec_used = 1;
225224
INIT_LIST_HEAD(&msi_desc->list);
226225
list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
227226
}

‎include/linux/interrupt.h

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ extern int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m);
278278
extern int
279279
irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify);
280280

281-
struct cpumask *irq_create_affinity_mask(unsigned int *nr_vecs);
281+
struct cpumask *irq_create_affinity_masks(const struct cpumask *affinity, int nvec);
282+
int irq_calc_affinity_vectors(const struct cpumask *affinity, int maxvec);
282283

283284
#else /* CONFIG_SMP */
284285

@@ -311,11 +312,18 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
311312
return 0;
312313
}
313314

314-
static inline struct cpumask *irq_create_affinity_mask(unsigned int *nr_vecs)
315+
static inline struct cpumask *
316+
irq_create_affinity_masks(const struct cpumask *affinity, int nvec)
315317
{
316-
*nr_vecs = 1;
317318
return NULL;
318319
}
320+
321+
static inline int
322+
irq_calc_affinity_vectors(const struct cpumask *affinity, int maxvec)
323+
{
324+
return maxvec;
325+
}
326+
319327
#endif /* CONFIG_SMP */
320328

321329
/*

‎include/linux/msi.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct msi_desc {
6868
unsigned int nvec_used;
6969
struct device *dev;
7070
struct msi_msg msg;
71-
const struct cpumask *affinity;
71+
struct cpumask *affinity;
7272

7373
union {
7474
/* PCI MSI/X specific data */
@@ -123,7 +123,8 @@ static inline void *msi_desc_to_pci_sysdata(struct msi_desc *desc)
123123
}
124124
#endif /* CONFIG_PCI_MSI */
125125

126-
struct msi_desc *alloc_msi_entry(struct device *dev);
126+
struct msi_desc *alloc_msi_entry(struct device *dev, int nvec,
127+
const struct cpumask *affinity);
127128
void free_msi_entry(struct msi_desc *entry);
128129
void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
129130
void __pci_write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);

0 commit comments

Comments
 (0)