All of lore.kernel.org
 help / color / mirror / Atom feed
From: Salil Mehta <salil.mehta@huawei.com>
To: <davem@davemloft.net>
Cc: <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
	<mehta.salil.lnk@gmail.com>, <netdev@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>, <linuxarm@huawei.com>,
	lipeng <lipeng321@huawei.com>, Kejian Yan <yankejian@huawei.com>
Subject: [PATCH net 01/19] net: hns: Fix the implementation of irq affinity function
Date: Thu, 30 Mar 2017 16:30:48 +0100	[thread overview]
Message-ID: <20170330153106.14344-2-salil.mehta@huawei.com> (raw)
In-Reply-To: <20170330153106.14344-1-salil.mehta@huawei.com>

From: lipeng <lipeng321@huawei.com>

This patch fixes the implementation of the IRQ affinity
function. This function is used to create the cpu mask
which eventually is used to initialize the cpu<->queue
association for XPS(Transmit Packet Steering).

Signed-off-by: lipeng <lipeng321@huawei.com>
Signed-off-by: Kejian Yan <yankejian@huawei.com>
Reviewed-by: Yisen Zhuang <yisen.zhuang@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 75 +++++++++++----------------
 drivers/net/ethernet/hisilicon/hns/hns_enet.h |  1 +
 2 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index fca37e2..73ec8c8 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -1196,54 +1196,31 @@ static void hns_nic_ring_close(struct net_device *netdev, int idx)
 	napi_disable(&priv->ring_data[idx].napi);
 }
 
-static void hns_set_irq_affinity(struct hns_nic_priv *priv)
+static int hns_nic_init_affinity_mask(int q_num, int ring_idx,
+				      struct hnae_ring *ring, cpumask_t *mask)
 {
-	struct hnae_handle *h = priv->ae_handle;
-	struct hns_nic_ring_data *rd;
-	int i;
 	int cpu;
-	cpumask_var_t mask;
 
-	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-		return;
-
-	/*diffrent irq banlance for 16core and 32core*/
-	if (h->q_num == num_possible_cpus()) {
-		for (i = 0; i < h->q_num * 2; i++) {
-			rd = &priv->ring_data[i];
-			if (cpu_online(rd->queue_index)) {
-				cpumask_clear(mask);
-				cpu = rd->queue_index;
-				cpumask_set_cpu(cpu, mask);
-				(void)irq_set_affinity_hint(rd->ring->irq,
-							    mask);
-			}
-		}
+	/* Diffrent irq banlance between 16core and 32core.
+	 * The cpu mask set by ring index according to the ring flag
+	 * which indicate the ring is tx or rx.
+	 */
+	if (q_num == num_possible_cpus()) {
+		if (is_tx_ring(ring))
+			cpu = ring_idx;
+		else
+			cpu = ring_idx - q_num;
 	} else {
-		for (i = 0; i < h->q_num; i++) {
-			rd = &priv->ring_data[i];
-			if (cpu_online(rd->queue_index * 2)) {
-				cpumask_clear(mask);
-				cpu = rd->queue_index * 2;
-				cpumask_set_cpu(cpu, mask);
-				(void)irq_set_affinity_hint(rd->ring->irq,
-							    mask);
-			}
-		}
-
-		for (i = h->q_num; i < h->q_num * 2; i++) {
-			rd = &priv->ring_data[i];
-			if (cpu_online(rd->queue_index * 2 + 1)) {
-				cpumask_clear(mask);
-				cpu = rd->queue_index * 2 + 1;
-				cpumask_set_cpu(cpu, mask);
-				(void)irq_set_affinity_hint(rd->ring->irq,
-							    mask);
-			}
-		}
+		if (is_tx_ring(ring))
+			cpu = ring_idx * 2;
+		else
+			cpu = (ring_idx - q_num) * 2 + 1;
 	}
 
-	free_cpumask_var(mask);
+	cpumask_clear(mask);
+	cpumask_set_cpu(cpu, mask);
+
+	return cpu;
 }
 
 static int hns_nic_init_irq(struct hns_nic_priv *priv)
@@ -1252,6 +1229,7 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv)
 	struct hns_nic_ring_data *rd;
 	int i;
 	int ret;
+	int cpu;
 
 	for (i = 0; i < h->q_num * 2; i++) {
 		rd = &priv->ring_data[i];
@@ -1261,7 +1239,7 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv)
 
 		snprintf(rd->ring->ring_name, RCB_RING_NAME_LEN,
 			 "%s-%s%d", priv->netdev->name,
-			 (i < h->q_num ? "tx" : "rx"), rd->queue_index);
+			 (is_tx_ring(rd->ring) ? "tx" : "rx"), rd->queue_index);
 
 		rd->ring->ring_name[RCB_RING_NAME_LEN - 1] = '\0';
 
@@ -1273,12 +1251,17 @@ static int hns_nic_init_irq(struct hns_nic_priv *priv)
 			return ret;
 		}
 		disable_irq(rd->ring->irq);
+
+		cpu = hns_nic_init_affinity_mask(h->q_num, i,
+						 rd->ring, &rd->mask);
+
+		if (cpu_online(cpu))
+			irq_set_affinity_hint(rd->ring->irq,
+					      &rd->mask);
+
 		rd->ring->irq_init_flag = RCB_IRQ_INITED;
 	}
 
-	/*set cpu affinity*/
-	hns_set_irq_affinity(priv);
-
 	return 0;
 }
 
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.h b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
index 5b412de..fff8f8a 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.h
@@ -37,6 +37,7 @@ enum hns_nic_state {
 struct hns_nic_ring_data {
 	struct hnae_ring *ring;
 	struct napi_struct napi;
+	cpumask_t mask; /* affinity mask */
 	int queue_index;
 	int (*poll_one)(struct hns_nic_ring_data *, int, void *);
 	void (*ex_process)(struct hns_nic_ring_data *, struct sk_buff *);
-- 
2.7.4

  reply	other threads:[~2017-03-30 15:32 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-30 15:30 [PATCH net 00/19] net: hns: Misc. HNS Bug Fixes & Code Improvements Salil Mehta
2017-03-30 15:30 ` Salil Mehta [this message]
2017-03-30 15:30 ` [PATCH net 02/19] net: hns: Modify GMAC init TX threshold value Salil Mehta
2017-03-30 15:30 ` [PATCH net 03/19] net: hns: Optimize the code for GMAC pad and crc Config Salil Mehta
2017-03-30 15:30 ` [PATCH net 04/19] net: hns: Change the TX queue selection algorithm Salil Mehta
2017-03-30 15:30 ` [PATCH net 05/19] net: hns: Remove redundant memset during buffer release Salil Mehta
2017-03-30 15:30 ` [PATCH net 06/19] net: hns: bug fix of ethtool show the speed Salil Mehta
2017-03-30 15:30 ` [PATCH net 07/19] net: hns: Optimize hns_nic_common_poll for better performance Salil Mehta
2017-03-30 15:30 ` [PATCH net 08/19] net: hns: Fix to adjust buf_size of ring according to mtu Salil Mehta
2017-03-31 23:50   ` kbuild test robot
2017-03-31 23:50   ` [PATCH] net: hns: fix boolreturn.cocci warnings kbuild test robot
2017-04-03  2:44     ` David Miller
2017-04-03  2:52       ` [kbuild-all] " Fengguang Wu
2017-03-30 15:30 ` [PATCH net 09/19] net: hns: Replace netif_tx_lock to ring spin lock Salil Mehta
2017-03-30 15:30 ` [PATCH net 10/19] net: hns: Correct HNS RSS key set function Salil Mehta
2017-03-30 15:30 ` [PATCH net 11/19] net: hns: Remove the redundant adding and deleting mac function Salil Mehta
2017-03-30 15:30 ` [PATCH net 12/19] net: hns: Remove redundant mac_get_id() Salil Mehta
2017-03-30 15:31 ` [PATCH net 13/19] net: hns: Remove redundant mac table operations Salil Mehta
2017-03-30 15:31 ` [PATCH net 14/19] net: hns: Clean redundant code from hns_mdio.c file Salil Mehta
2017-03-30 15:31 ` [PATCH net 15/19] net: hns: Optimise the code in hns_mdio_wait_ready() Salil Mehta
2017-03-30 15:31 ` [PATCH net 16/19] net: hns: Simplify the exception sequence in hns_ppe_init() Salil Mehta
2017-03-30 15:31 ` [PATCH net 17/19] net: hns: Adjust the SBM module buffer threshold Salil Mehta
2017-03-30 15:31 ` [PATCH net 18/19] net: hns: Avoid Hip06 chip TX packet line bug Salil Mehta
2017-03-30 15:31 ` [PATCH net 19/19] net: hns: Some checkpatch.pl script & warning fixes Salil Mehta
2017-03-30 17:08 ` [PATCH net 00/19] net: hns: Misc. HNS Bug Fixes & Code Improvements David Miller
2017-03-30 17:19   ` Salil Mehta
2017-03-30 17:22     ` David Miller
2017-03-30 17:23       ` Salil Mehta
2017-03-31  3:03 ` David Miller
2017-03-31  9:58   ` Salil Mehta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170330153106.14344-2-salil.mehta@huawei.com \
    --to=salil.mehta@huawei.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=lipeng321@huawei.com \
    --cc=mehta.salil.lnk@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=yankejian@huawei.com \
    --cc=yisen.zhuang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.