From: Alexander Lobakin <alobakin@dlink.ru>
To: Edward Cree <ecree@solarflare.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>,
Eric Dumazet <edumazet@google.com>,
Ido Schimmel <idosch@mellanox.com>,
Paolo Abeni <pabeni@redhat.com>,
Petr Machata <petrm@mellanox.com>,
Sabrina Dubroca <sd@queasysnail.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Jassi Brar <jaswinder.singh@linaro.org>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next1/2] net: core: use listified Rx for GRO_NORMAL in napi_gro_receive()
Date: Fri, 11 Oct 2019 10:26:25 +0300 [thread overview]
Message-ID: <e7eaf0a1d236dda43f5cd73887ecfb9d@dlink.ru> (raw)
In-Reply-To: <bb454c3c-1d86-f81e-a03e-86f8de3e9822@solarflare.com>
Edward Cree wrote 10.10.2019 21:23:
> On 10/10/2019 15:42, Alexander Lobakin wrote:
>> Commit 323ebb61e32b4 ("net: use listified RX for handling GRO_NORMAL
>> skbs") made use of listified skb processing for the users of
>> napi_gro_frags().
>> The same technique can be used in a way more common napi_gro_receive()
>> to speed up non-merged (GRO_NORMAL) skbs for a wide range of drivers,
>> including gro_cells and mac80211 users.
>>
>> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
>> ---
>> net/core/dev.c | 49 +++++++++++++++++++++++++------------------------
>> 1 file changed, 25 insertions(+), 24 deletions(-)
>>
>> diff --git a/net/core/dev.c b/net/core/dev.c
>> index 8bc3dce71fc0..a33f56b439ce 100644
>> --- a/net/core/dev.c
>> +++ b/net/core/dev.c
>> @@ -5884,6 +5884,26 @@ struct packet_offload
>> *gro_find_complete_by_type(__be16 type)
>> }
>> EXPORT_SYMBOL(gro_find_complete_by_type);
>>
>> +/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */
>> +static void gro_normal_list(struct napi_struct *napi)
>> +{
>> + if (!napi->rx_count)
>> + return;
>> + netif_receive_skb_list_internal(&napi->rx_list);
>> + INIT_LIST_HEAD(&napi->rx_list);
>> + napi->rx_count = 0;
>> +}
>> +
>> +/* Queue one GRO_NORMAL SKB up for list processing. If batch size
>> exceeded,
>> + * pass the whole batch up to the stack.
>> + */
>> +static void gro_normal_one(struct napi_struct *napi, struct sk_buff
>> *skb)
>> +{
>> + list_add_tail(&skb->list, &napi->rx_list);
>> + if (++napi->rx_count >= gro_normal_batch)
>> + gro_normal_list(napi);
>> +}
>> +
>> static void napi_skb_free_stolen_head(struct sk_buff *skb)
>> {
>> skb_dst_drop(skb);
>> @@ -5891,12 +5911,13 @@ static void napi_skb_free_stolen_head(struct
>> sk_buff *skb)
>> kmem_cache_free(skbuff_head_cache, skb);
>> }
>>
>> -static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff
>> *skb)
>> +static gro_result_t napi_skb_finish(struct napi_struct *napi,
>> + struct sk_buff *skb,
>> + gro_result_t ret)
> Any reason why the argument order here is changed around?
Actually yes: to match napi_skb_finish() and napi_frags_finish()
prototypes, as gro_normal one() required an addition of napi
argument anyway.
>
> -Ed
>> {
>> switch (ret) {
>> case GRO_NORMAL:
>> - if (netif_receive_skb_internal(skb))
>> - ret = GRO_DROP;
>> + gro_normal_one(napi, skb);
>> break;
>>
>> case GRO_DROP:
>> @@ -5928,7 +5949,7 @@ gro_result_t napi_gro_receive(struct napi_struct
>> *napi, struct sk_buff *skb)
>>
>> skb_gro_reset_offset(skb);
>>
>> - ret = napi_skb_finish(dev_gro_receive(napi, skb), skb);
>> + ret = napi_skb_finish(napi, skb, dev_gro_receive(napi, skb));
>> trace_napi_gro_receive_exit(ret);
>>
>> return ret;
>> @@ -5974,26 +5995,6 @@ struct sk_buff *napi_get_frags(struct
>> napi_struct *napi)
>> }
>> EXPORT_SYMBOL(napi_get_frags);
>>
>> -/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */
>> -static void gro_normal_list(struct napi_struct *napi)
>> -{
>> - if (!napi->rx_count)
>> - return;
>> - netif_receive_skb_list_internal(&napi->rx_list);
>> - INIT_LIST_HEAD(&napi->rx_list);
>> - napi->rx_count = 0;
>> -}
>> -
>> -/* Queue one GRO_NORMAL SKB up for list processing. If batch size
>> exceeded,
>> - * pass the whole batch up to the stack.
>> - */
>> -static void gro_normal_one(struct napi_struct *napi, struct sk_buff
>> *skb)
>> -{
>> - list_add_tail(&skb->list, &napi->rx_list);
>> - if (++napi->rx_count >= gro_normal_batch)
>> - gro_normal_list(napi);
>> -}
>> -
>> static gro_result_t napi_frags_finish(struct napi_struct *napi,
>> struct sk_buff *skb,
>> gro_result_t ret)
Regards,
ᚷ ᛖ ᚢ ᚦ ᚠ ᚱ
next prev parent reply other threads:[~2019-10-11 7:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 14:42 [PATCH net-next 0/2] net: core: use listified Rx for GRO_NORMAL in napi_gro_receive() Alexander Lobakin
2019-10-10 14:42 ` [PATCH net-next1/2] " Alexander Lobakin
2019-10-10 18:23 ` Edward Cree
2019-10-11 7:26 ` Alexander Lobakin [this message]
2019-10-11 9:20 ` Edward Cree
2019-10-11 9:24 ` Alexander Lobakin
2019-10-10 14:42 ` [PATCH net-next 2/2] net: core: increase the default size of GRO_NORMAL skb lists to flush Alexander Lobakin
2019-10-10 18:16 ` Edward Cree
2019-10-11 7:23 ` Alexander Lobakin
2019-10-12 9:22 ` Alexander Lobakin
2019-10-12 11:18 ` Eric Dumazet
2019-10-12 11:51 ` Alexander Lobakin
2019-10-11 12:23 ` [PATCH net-next 0/2] net: core: use listified Rx for GRO_NORMAL in napi_gro_receive() Ilias Apalodimas
2019-10-11 12:27 ` Alexander Lobakin
2019-10-11 12:32 ` Ilias Apalodimas
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=e7eaf0a1d236dda43f5cd73887ecfb9d@dlink.ru \
--to=alobakin@dlink.ru \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=idosch@mellanox.com \
--cc=ilias.apalodimas@linaro.org \
--cc=jaswinder.singh@linaro.org \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@mellanox.com \
--cc=sd@queasysnail.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).