Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b07166b2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-next' 

Amir Vadai says:

====================
cpumask,net: Affinity hint helper function

This patchset will set affinity hint to influence IRQs to be allocated on the
same NUMA node as the one where the card resides. As discussed in
http://www.spinics.net/lists/netdev/msg271497.html



If the number of IRQs allocated is greater than the number of local NUMA cores, all
local cores will be used first, and the rest of the IRQs will be on a remote
NUMA node.
If no NUMA support - IRQ's and cores will be mapped 1:1

Since the utility function to calculate the mapping could be useful in other mq
drivers in the kernel, it was added to cpumask.[ch]

This patchset was tested and applied on top of net-next since the first
consumer is a network device (mlx4_en).  Over commit 506724c4: "tg3: Override
clock, link aware and link idle mode during NVRAM dump"

I couldn't find a maintainer for cpumask.c, so only added the kernel mailing
list

Amir

Changes from V5:
- Moved the utility function from kernel/irq/manage.c to lib/cpumask.c, and
  renamed it's name accordingly to cpumask_set_cpu_local_first()
- Added some comments as Thomas Gleixner suggested
- Changed -EINVAL to -EAGAIN, that describes the error situtation better.

Changes from V4:
- Patch 1/2: irq: Utility function to get affinity_hint by policy
  Thank you Ben for the great review:
  - Moved the function it kernel/irq/manage.c since it could be useful for
    block mq devices
  - Fixed Typo's
  - Use cpumask_t * instead of cpumask_var_t in function header
  - Restructured the function to remove NULL assignment in a cpumask_var_t
  - Fix for offline local CPU's

Changes from V3:
- Patch 2/2: net/mlx4_en: Use affinity hint
  - somehow patch file was corrupted

Changes from V2:
- Patch 1/2: net: Utility function to get affinity_hint by policy
  - Fixed style issues

Changes from V1:
- Patch 1/2: net: Utility function to get affinity_hint by policy
  - Fixed error flow to return -EINVAL on error (thanks govind)
- Patch 2/2: net/mlx4_en: Use affinity hint
  - Set ring->affinity_hint to NULL on error

Changes from V0:
- Fixed small style issues
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 90d0e08e 70a640d0

drivers/infiniband/hw/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev) 
				 i, j, dev->pdev->bus->name);

			/* Set IRQ for specific name (per ring) */

			if (mlx4_assign_eq(dev, name, NULL,

					   &ibdev->eq_table[eq])) {

					   &ibdev->eq_table[eq], NULL)) {

				/* Use legacy (same as mlx4_en driver) */

				pr_warn("Can't allocate EQ %d; reverting to legacy\n", eq);

				ibdev->eq_table[eq] =

drivers/net/ethernet/mellanox/mlx4/en_cq.c

+5 −1
Original line number Diff line number Diff line
@@ -118,11 +118,15 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
	if (cq->is_tx == RX) {

		if (mdev->dev->caps.comp_pool) {

			if (!cq->vector) {

				struct mlx4_en_rx_ring *ring =

					priv->rx_ring[cq->ring];



				sprintf(name, "%s-%d", priv->dev->name,

					cq->ring);

				/* Set IRQ for specific name (per ring) */

				if (mlx4_assign_eq(mdev->dev, name, rmap,

						   &cq->vector)) {

						   &cq->vector,

						   ring->affinity_mask)) {

					cq->vector = (cq->ring + 1 + priv->port)

					    % mdev->dev->caps.num_comp_vectors;

					mlx4_warn(mdev, "Failed assigning an EQ to %s, falling back to legacy EQ's\n",

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+30 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,32 @@ static void mlx4_en_linkstate(struct work_struct *work) 
	mutex_unlock(&mdev->state_lock);

}



static void mlx4_en_init_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)

{

	struct mlx4_en_rx_ring *ring = priv->rx_ring[ring_idx];

	int numa_node = priv->mdev->dev->numa_node;



	if (numa_node == -1)

		return;



	if (!zalloc_cpumask_var(&ring->affinity_mask, GFP_KERNEL)) {

		en_err(priv, "Failed to allocate core mask\n");

		return;

	}



	if (cpumask_set_cpu_local_first(ring_idx, numa_node,

					ring->affinity_mask)) {

		en_err(priv, "Failed setting affinity hint\n");

		free_cpumask_var(ring->affinity_mask);

		ring->affinity_mask = NULL;

	}

}



static void mlx4_en_free_affinity_hint(struct mlx4_en_priv *priv, int ring_idx)

{

	free_cpumask_var(priv->rx_ring[ring_idx]->affinity_mask);

	priv->rx_ring[ring_idx]->affinity_mask = NULL;

}



int mlx4_en_start_port(struct net_device *dev)

{
@@ -1567,6 +1593,8 @@ int mlx4_en_start_port(struct net_device *dev) 


		mlx4_en_cq_init_lock(cq);



		mlx4_en_init_affinity_hint(priv, i);



		err = mlx4_en_activate_cq(priv, cq, i);

		if (err) {

			en_err(priv, "Failed activating Rx CQ\n");
@@ -1847,6 +1875,8 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 
			msleep(1);

		mlx4_en_deactivate_rx_ring(priv, priv->rx_ring[i]);

		mlx4_en_deactivate_cq(priv, cq);



		mlx4_en_free_affinity_hint(priv, i);

	}

}

drivers/net/ethernet/mellanox/mlx4/eq.c

+12 −1
Original line number Diff line number Diff line
@@ -1376,7 +1376,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev) 
EXPORT_SYMBOL(mlx4_test_interrupts);



int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap,

		   int *vector)

		   int *vector, cpumask_var_t cpu_hint_mask)

{



	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -1411,6 +1411,15 @@ int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap, 
			}

			mlx4_assign_irq_notifier(priv, dev,

						 priv->eq_table.eq[vec].irq);

			if (cpu_hint_mask) {

				err = irq_set_affinity_hint(

						priv->eq_table.eq[vec].irq,

						cpu_hint_mask);

				if (err) {

					mlx4_warn(dev, "Failed setting affinity hint\n");

					/*we dont want to break here*/

				}

			}



			eq_set_ci(&priv->eq_table.eq[vec], 1);

		}
@@ -1441,6 +1450,8 @@ void mlx4_release_eq(struct mlx4_dev *dev, int vec) 
			irq_set_affinity_notifier(

				priv->eq_table.eq[vec].irq,

				NULL);

			irq_set_affinity_hint(priv->eq_table.eq[vec].irq,

					      NULL);

			free_irq(priv->eq_table.eq[vec].irq,

				 &priv->eq_table.eq[vec]);

			priv->msix_ctl.pool_bm &= ~(1ULL << i);

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ struct mlx4_en_rx_ring { 
	unsigned long csum_ok;

	unsigned long csum_none;

	int hwtstamp_rx_filter;

	cpumask_var_t affinity_mask;

};



struct mlx4_en_cq {