From: Edward Cree <ecree@solarflare•com>
To: <netdev@vger•kernel.org>, David Miller <davem@davemloft•net>
Cc: Jesper Dangaard Brouer <brouer@redhat•com>,
<linux-net-drivers@solarflare•com>
Subject: [RFC PATCH net-next 4/8] net: core: Another step of skb receive list processing
Date: Tue, 19 Apr 2016 14:35:51 +0100 [thread overview]
Message-ID: <57163437.2060002@solarflare.com> (raw)
In-Reply-To: <5716338E.4050003@solarflare.com>
netif_receive_skb_list_internal() now processes a list and hands it
on to the next function.
The code duplication is unfortunate, but the common part between the list
and non-list versions of the function takes a lock (rcu_read_lock()), so
factoring it out would be a little ugly.
Signed-off-by: Edward Cree <ecree@solarflare•com>
---
net/core/dev.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 4bb6724..586807d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4241,6 +4241,14 @@ static int __netif_receive_skb(struct sk_buff *skb)
return ret;
}
+static void __netif_receive_skb_list(struct sk_buff_head *list)
+{
+ struct sk_buff *skb;
+
+ while ((skb = __skb_dequeue(list)) != NULL)
+ __netif_receive_skb(skb);
+}
+
static int netif_receive_skb_internal(struct sk_buff *skb)
{
int ret;
@@ -4269,6 +4277,41 @@ static int netif_receive_skb_internal(struct sk_buff *skb)
return ret;
}
+static void netif_receive_skb_list_internal(struct sk_buff_head *list)
+{
+ struct sk_buff_head sublist;
+ struct sk_buff *skb;
+
+ __skb_queue_head_init(&sublist);
+
+ rcu_read_lock();
+ while ((skb = __skb_dequeue(list)) != NULL) {
+ net_timestamp_check(netdev_tstamp_prequeue, skb);
+ if (skb_defer_rx_timestamp(skb)) {
+ /* Handled, don't add to sublist */
+ continue;
+ }
+
+#ifdef CONFIG_RPS
+ if (static_key_false(&rps_needed)) {
+ struct rps_dev_flow voidflow, *rflow = &voidflow;
+ int cpu = get_rps_cpu(skb->dev, skb, &rflow);
+
+ if (cpu >= 0) {
+ enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
+ /* Handled, don't add to sublist */
+ continue;
+ }
+ }
+#endif
+ __skb_queue_tail(&sublist, skb);
+ }
+
+ __netif_receive_skb_list(&sublist);
+ rcu_read_unlock();
+ return;
+}
+
/**
* netif_receive_skb - process receive buffer from network
* @skb: buffer to process
@@ -4297,8 +4340,8 @@ EXPORT_SYMBOL(netif_receive_skb);
* @list: list of skbs to process. Must not be shareable (e.g. it may
* be on the stack)
*
- * For now, just calls netif_receive_skb() in a loop, ignoring the
- * return value.
+ * Since return value of netif_receive_skb() is normally ignored, and
+ * wouldn't be meaningful for a list, this function returns void.
*
* This function may only be called from softirq context and interrupts
* should be enabled.
@@ -4309,8 +4352,7 @@ void netif_receive_skb_list(struct sk_buff_head *list)
skb_queue_for_each(skb, list)
trace_netif_receive_skb_list_entry(skb);
- while ((skb = __skb_dequeue(list)) != NULL)
- netif_receive_skb_internal(skb);
+ netif_receive_skb_list_internal(list);
}
EXPORT_SYMBOL(netif_receive_skb_list);
next prev parent reply other threads:[~2016-04-19 13:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 13:33 [RFC PATCH net-next 0/8] Handle multiple received packets at each stage Edward Cree
2016-04-19 13:34 ` [RFC PATCH net-next 1/8] net: core: trivial netif_receive_skb_list() entry point Edward Cree
2016-04-19 13:35 ` [RFC PATCH net-next 2/8] sfc: batch up RX delivery on EF10 Edward Cree
2016-04-19 14:47 ` Eric Dumazet
2016-04-19 16:36 ` Edward Cree
2016-04-19 17:20 ` Eric Dumazet
2016-04-19 17:42 ` Edward Cree
2016-04-19 18:02 ` Eric Dumazet
2016-04-19 13:35 ` [RFC PATCH net-next 3/8] net: core: unwrap skb list receive slightly further Edward Cree
2016-04-19 13:35 ` Edward Cree [this message]
2016-04-19 13:36 ` [RFC PATCH net-next 5/8] net: core: another layer of lists, around PF_MEMALLOC skb handling Edward Cree
2016-04-19 13:36 ` [RFC PATCH net-next 6/8] net: core: propagate SKB lists through packet_type lookup Edward Cree
2016-04-19 13:37 ` [RFC PATCH net-next 7/8] net: ipv4: listified version of ip_rcv Edward Cree
2016-04-19 14:50 ` Eric Dumazet
2016-04-19 15:46 ` Tom Herbert
2016-04-19 16:54 ` Eric Dumazet
2016-04-19 17:12 ` Edward Cree
2016-04-19 17:54 ` Eric Dumazet
2016-04-19 18:38 ` Tom Herbert
2016-04-19 16:50 ` Edward Cree
2016-04-19 18:06 ` Eric Dumazet
2016-04-21 17:24 ` Edward Cree
2016-04-19 13:37 ` [RFC PATCH net-next 8/8] net: ipv4: listify ip_rcv_finish Edward Cree
2016-04-19 19:11 ` [RFC PATCH net-next 0/8] Handle multiple received packets at each stage Jesper Dangaard Brouer
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=57163437.2060002@solarflare.com \
--to=ecree@solarflare$(echo .)com \
--cc=brouer@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-net-drivers@solarflare$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox