From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, eric.dumazet@gmail.com,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH v2 net-next 2/8] net: move dev_xmit_recursion() helpers to net/core/dev.h
Date: Fri, 29 Mar 2024 15:42:19 +0000 [thread overview]
Message-ID: <20240329154225.349288-3-edumazet@google.com> (raw)
In-Reply-To: <20240329154225.349288-1-edumazet@google.com>
Move dev_xmit_recursion() and friends to net/core/dev.h
They are only used from net/core/dev.c and net/core/filter.c.
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
include/linux/netdevice.h | 17 -----------------
net/core/dev.h | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index cb37817d6382c29117afd8ce54db6dba94f8c930..70775021cc269e0983f538619115237b0067d408 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3270,23 +3270,6 @@ static inline int dev_recursion_level(void)
return this_cpu_read(softnet_data.xmit.recursion);
}
-#define XMIT_RECURSION_LIMIT 8
-static inline bool dev_xmit_recursion(void)
-{
- return unlikely(__this_cpu_read(softnet_data.xmit.recursion) >
- XMIT_RECURSION_LIMIT);
-}
-
-static inline void dev_xmit_recursion_inc(void)
-{
- __this_cpu_inc(softnet_data.xmit.recursion);
-}
-
-static inline void dev_xmit_recursion_dec(void)
-{
- __this_cpu_dec(softnet_data.xmit.recursion);
-}
-
void __netif_schedule(struct Qdisc *q);
void netif_schedule_queue(struct netdev_queue *txq);
diff --git a/net/core/dev.h b/net/core/dev.h
index 9d0f8b4587f81f4c12487f1783d8ba5cc49fc1d6..8572d2c8dc4adce75c98868c888363e6a32e0f52 100644
--- a/net/core/dev.h
+++ b/net/core/dev.h
@@ -150,4 +150,21 @@ static inline void xdp_do_check_flushed(struct napi_struct *napi) { }
struct napi_struct *napi_by_id(unsigned int napi_id);
void kick_defer_list_purge(struct softnet_data *sd, unsigned int cpu);
+#define XMIT_RECURSION_LIMIT 8
+static inline bool dev_xmit_recursion(void)
+{
+ return unlikely(__this_cpu_read(softnet_data.xmit.recursion) >
+ XMIT_RECURSION_LIMIT);
+}
+
+static inline void dev_xmit_recursion_inc(void)
+{
+ __this_cpu_inc(softnet_data.xmit.recursion);
+}
+
+static inline void dev_xmit_recursion_dec(void)
+{
+ __this_cpu_dec(softnet_data.xmit.recursion);
+}
+
#endif
--
2.44.0.478.gd926399ef9-goog
next prev parent reply other threads:[~2024-03-29 15:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 15:42 [PATCH v2 net-next 0/8] net: rps: misc changes Eric Dumazet
2024-03-29 15:42 ` [PATCH v2 net-next 1/8] net: move kick_defer_list_purge() to net/core/dev.h Eric Dumazet
2024-03-29 15:42 ` Eric Dumazet [this message]
2024-03-29 15:42 ` [PATCH v2 net-next 3/8] net: enqueue_to_backlog() change vs not running device Eric Dumazet
2024-03-29 15:42 ` [PATCH v2 net-next 4/8] net: make softnet_data.dropped an atomic_t Eric Dumazet
2024-03-29 15:42 ` [PATCH v2 net-next 5/8] net: enqueue_to_backlog() cleanup Eric Dumazet
2024-03-29 15:42 ` [PATCH v2 net-next 6/8] net: rps: change input_queue_tail_incr_save() Eric Dumazet
2024-03-30 14:46 ` Jason Xing
2024-03-30 16:01 ` Eric Dumazet
2024-03-30 16:07 ` Jason Xing
2024-03-30 16:07 ` Jason Xing
2024-04-12 15:09 ` Jason Xing
2024-03-29 15:42 ` [PATCH v2 net-next 7/8] net: rps: add rps_input_queue_head_add() helper Eric Dumazet
2024-03-29 15:42 ` [PATCH v2 net-next 8/8] net: rps: move received_rps field to a better location Eric Dumazet
2024-03-30 16:11 ` [PATCH v2 net-next 0/8] net: rps: misc changes Jason Xing
2024-04-02 4:31 ` Jakub Kicinski
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=20240329154225.349288-3-edumazet@google.com \
--to=edumazet@google.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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 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).