2022-12-12 03:29:29

by Yunsheng Lin

Subject: [PATCH net-next v2] net: tso: inline tso_count_descs()

tso_count_descs() is a small function doing simple calculation,
and tso_count_descs() is used in fast path, so inline it to
reduce the overhead of calls.

Signed-off-by: Yunsheng Lin <[email protected]>
---
V2: include skbuff.h explicitly and refactor comment as jakub's
suggestion.
---
include/net/tso.h | 8 +++++++-
net/core/tso.c | 8 --------
2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/net/tso.h b/include/net/tso.h
index 62c98a9c60f1..e7e157ae0526 100644
--- a/include/net/tso.h
+++ b/include/net/tso.h
@@ -2,6 +2,7 @@
#ifndef _TSO_H
#define _TSO_H

+#include <linux/skbuff.h>
#include <net/ip.h>

#define TSO_HEADER_SIZE 256
@@ -16,7 +17,12 @@ struct tso_t {
u32 tcp_seq;
};

-int tso_count_descs(const struct sk_buff *skb);
+/* Calculate the worst case buffer count */
+static inline int tso_count_descs(const struct sk_buff *skb)
+{
+ return skb_shinfo(skb)->gso_segs * 2 + skb_shinfo(skb)->nr_frags;
+}
+
void tso_build_hdr(const struct sk_buff *skb, char *hdr, struct tso_t *tso,
int size, bool is_last);
void tso_build_data(const struct sk_buff *skb, struct tso_t *tso, int size);
diff --git a/net/core/tso.c b/net/core/tso.c
index 4148f6d48953..e00796e3b146 100644
--- a/net/core/tso.c
+++ b/net/core/tso.c
@@ -5,14 +5,6 @@
#include <net/tso.h>
#include <asm/unaligned.h>

-/* Calculate expected number of TX descriptors */
-int tso_count_descs(const struct sk_buff *skb)
-{
- /* The Marvell Way */
- return skb_shinfo(skb)->gso_segs * 2 + skb_shinfo(skb)->nr_frags;
-}
-EXPORT_SYMBOL(tso_count_descs);
-
void tso_build_hdr(const struct sk_buff *skb, char *hdr, struct tso_t *tso,
int size, bool is_last)
{
--
2.33.0

2022-12-13 00:16:40

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net-next v2] net: tso: inline tso_count_descs()

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:

On Mon, 12 Dec 2022 11:24:26 +0800 you wrote:
> tso_count_descs() is a small function doing simple calculation,
> and tso_count_descs() is used in fast path, so inline it to
> reduce the overhead of calls.
>
> Signed-off-by: Yunsheng Lin <[email protected]>
> ---
> V2: include skbuff.h explicitly and refactor comment as jakub's
> suggestion.
>
> [...]

Here is the summary with links:
- [net-next,v2] net: tso: inline tso_count_descs()
https://git.kernel.org/netdev/net-next/c/d7b061b80ee6

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html