bnxt_en: assign CPU affinity hints to bnxt_en IRQs

This patch provides hints to irqbalance to map bnxt_en device IRQs
to specific CPU cores. cpumask_local_spread() is used, which first
maps IRQs to near NUMA cores; when those cores are exhausted, IRQs
are mapped to far NUMA cores.

Signed-off-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4b0a80721c898b16b6f8802927099eeb12e19219..9657bfbeb816a4aa8b419f4fbe3654c82a8ece28 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -49,6 +49,7 @@
 #include <linux/aer.h>
 #include <linux/bitmap.h>
 #include <linux/cpu_rmap.h>
+#include <linux/cpumask.h>
 
 #include "bnxt_hsi.h"
 #include "bnxt.h"
@@ -5554,8 +5555,15 @@ static void bnxt_free_irq(struct bnxt *bp)
 
        for (i = 0; i < bp->cp_nr_rings; i++) {
                irq = &bp->irq_tbl[i];
-               if (irq->requested)
+               if (irq->requested) {
+                       if (irq->have_cpumask) {
+                               irq_set_affinity_hint(irq->vector, NULL);
+                               free_cpumask_var(irq->cpu_mask);
+                               irq->have_cpumask = 0;
+                       }
                        free_irq(irq->vector, bp->bnapi[i]);
+               }
+
                irq->requested = 0;
        }
 }
@@ -5588,6 +5596,21 @@ static int bnxt_request_irq(struct bnxt *bp)
                        break;
 
                irq->requested = 1;
+
+               if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) {
+                       int numa_node = dev_to_node(&bp->pdev->dev);
+
+                       irq->have_cpumask = 1;
+                       cpumask_set_cpu(cpumask_local_spread(i, numa_node),
+                                       irq->cpu_mask);
+                       rc = irq_set_affinity_hint(irq->vector, irq->cpu_mask);
+                       if (rc) {
+                               netdev_warn(bp->dev,
+                                           "Set affinity failed, IRQ = %d\n",
+                                           irq->vector);
+                               break;
+                       }
+               }
        }
        return rc;
 }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 568516f9e36e7de330e1376470a8c612189eda92..801c0f77d4a51414875c192707bab92888b18371 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -701,8 +701,10 @@ struct bnxt_napi {
 struct bnxt_irq {
        irq_handler_t   handler;
        unsigned int    vector;
-       u8              requested;
+       u8              requested:1;
+       u8              have_cpumask:1;
        char            name[IFNAMSIZ + 2];
+       cpumask_var_t   cpu_mask;
 };
 
 #define HWRM_RING_ALLOC_TX     0x1