[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <168564134580.7284.16867711571036004706.stgit@anambiarhost.jf.intel.com>
Date: Thu, 01 Jun 2023 10:42:25 -0700
From: Amritha Nambiar <amritha.nambiar@...el.com>
To: netdev@...r.kernel.org, kuba@...nel.org, davem@...emloft.net
Cc: sridhar.samudrala@...el.com, amritha.nambiar@...el.com
Subject: [net-next/RFC PATCH v1 1/4] net: Introduce new napi fields for
rx/tx queues
Introduce new napi fields 'napi_rxq_list' and 'napi_txq_list'
for rx and tx queue set associated with the napi and
initialize them. Handle their removal as well.
This enables a mapping of each napi instance with the
queue/queue-set on the corresponding irq line.
Signed-off-by: Amritha Nambiar <amritha.nambiar@...el.com>
---
include/linux/netdevice.h | 7 +++++++
net/core/dev.c | 21 +++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 08fbd4622ccf..49f64401af7c 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -342,6 +342,11 @@ struct gro_list {
*/
#define GRO_HASH_BUCKETS 8
+struct napi_queue {
+ struct list_head q_list;
+ u16 queue_index;
+};
+
/*
* Structure for NAPI scheduling similar to tasklet but with weighting
*/
@@ -376,6 +381,8 @@ struct napi_struct {
/* control-path-only fields follow */
struct list_head dev_list;
struct hlist_node napi_hash_node;
+ struct list_head napi_rxq_list;
+ struct list_head napi_txq_list;
};
enum {
diff --git a/net/core/dev.c b/net/core/dev.c
index 3393c2f3dbe8..9ee8eb3ef223 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6401,6 +6401,9 @@ void netif_napi_add_weight(struct net_device *dev, struct napi_struct *napi,
*/
if (dev->threaded && napi_kthread_create(napi))
dev->threaded = 0;
+
+ INIT_LIST_HEAD(&napi->napi_rxq_list);
+ INIT_LIST_HEAD(&napi->napi_txq_list);
}
EXPORT_SYMBOL(netif_napi_add_weight);
@@ -6462,6 +6465,23 @@ static void flush_gro_hash(struct napi_struct *napi)
}
}
+static void __napi_del_queue(struct napi_queue *napi_queue)
+{
+ list_del_rcu(&napi_queue->q_list);
+ kfree(napi_queue);
+}
+
+static void napi_del_queues(struct napi_struct *napi)
+{
+ struct napi_queue *napi_queue, *n;
+
+ list_for_each_entry_safe(napi_queue, n, &napi->napi_rxq_list, q_list)
+ __napi_del_queue(napi_queue);
+
+ list_for_each_entry_safe(napi_queue, n, &napi->napi_txq_list, q_list)
+ __napi_del_queue(napi_queue);
+}
+
/* Must be called in process context */
void __netif_napi_del(struct napi_struct *napi)
{
@@ -6479,6 +6499,7 @@ void __netif_napi_del(struct napi_struct *napi)
kthread_stop(napi->thread);
napi->thread = NULL;
}
+ napi_del_queues(napi);
}
EXPORT_SYMBOL(__netif_napi_del);
Powered by blists - more mailing lists