From: Ido Schimmel <idosch@nvidia.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@kernel.org, dsahern@kernel.org, horms@kernel.org,
rostedt@goodmis.org, mhiramat@kernel.org,
mathieu.desnoyers@efficios.com, daniel@iogearbox.net,
petrm@nvidia.com, ferenc@fejes.dev,
Ido Schimmel <idosch@nvidia.com>
Subject: [PATCH net-next v2 2/3] ipv4: Pass netns to fib_table_lookup()
Date: Thu, 8 Oct 2026 16:31:57 +0300 [thread overview]
Message-ID: <20261008133158.1438907-3-idosch@nvidia.com> (raw)
In-Reply-To: <20261008133158.1438907-1-idosch@nvidia.com>
The next patch will report the network namespace cookie in the
fib_table_lookup tracepoint. As a preparation, pass the namespace to
fib_table_lookup() and from there to the tracepoint, like the
fib6_table_lookup tracepoint. All the callers already have the namespace
at hand.
Add the namespace as the last tracepoint argument so that the positions
of the existing arguments do not change and BPF programs that attach to
the raw tracepoint are not affected.
No functional changes intended.
Assisted-by: LLM
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ferenc Fejes <ferenc@fejes.dev>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
include/net/ip_fib.h | 12 +++++++-----
include/trace/events/fib.h | 5 +++--
net/core/filter.c | 2 +-
net/ipv4/devinet.c | 3 ++-
net/ipv4/fib_frontend.c | 6 ++++--
net/ipv4/fib_rules.c | 2 +-
net/ipv4/fib_semantics.c | 2 +-
net/ipv4/fib_trie.c | 14 ++++++++------
8 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 0a35355fb0f3..fb446f01a65d 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -275,8 +275,9 @@ struct fib_dump_filter {
struct net_device *dev;
};
-int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
- struct fib_result *res, int fib_flags);
+int fib_table_lookup(struct net *net, struct fib_table *tb,
+ const struct flowi4 *flp, struct fib_result *res,
+ int fib_flags);
int fib_table_insert(struct net *, struct fib_table *, struct fib_config *,
struct netlink_ext_ack *extack);
int fib_table_delete(struct net *, struct fib_table *, struct fib_config *,
@@ -323,7 +324,8 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
tb = fib_get_table(net, RT_TABLE_MAIN);
if (tb)
- err = fib_table_lookup(tb, flp, res, flags | FIB_LOOKUP_NOREF);
+ err = fib_table_lookup(net, tb, flp, res,
+ flags | FIB_LOOKUP_NOREF);
if (err == -EAGAIN)
err = -ENETUNREACH;
@@ -387,14 +389,14 @@ static inline int fib_lookup(struct net *net, struct flowi4 *flp,
tb = rcu_dereference_rtnl(net->ipv4.fib_main);
if (tb)
- err = fib_table_lookup(tb, flp, res, flags);
+ err = fib_table_lookup(net, tb, flp, res, flags);
if (err != -EAGAIN)
goto out;
tb = rcu_dereference_rtnl(net->ipv4.fib_default);
if (tb)
- err = fib_table_lookup(tb, flp, res, flags);
+ err = fib_table_lookup(net, tb, flp, res, flags);
if (err == -EAGAIN)
err = -ENETUNREACH;
diff --git a/include/trace/events/fib.h b/include/trace/events/fib.h
index feb28b359eff..341905b5edf3 100644
--- a/include/trace/events/fib.h
+++ b/include/trace/events/fib.h
@@ -15,9 +15,10 @@
TRACE_EVENT(fib_table_lookup,
TP_PROTO(u32 tb_id, const struct flowi4 *flp,
- const struct fib_nh_common *nhc, int err),
+ const struct fib_nh_common *nhc, int err,
+ const struct net *net),
- TP_ARGS(tb_id, flp, nhc, err),
+ TP_ARGS(tb_id, flp, nhc, err, net),
TP_STRUCT__entry(
__field( u32, tb_id )
diff --git a/net/core/filter.c b/net/core/filter.c
index 70dc621672f2..3ee1a093337e 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6413,7 +6413,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
if (unlikely(!tb))
return BPF_FIB_LKUP_RET_NOT_FWDED;
- err = fib_table_lookup(tb, &fl4, &res, FIB_LOOKUP_NOREF);
+ err = fib_table_lookup(net, tb, &fl4, &res, FIB_LOOKUP_NOREF);
} else {
if (flags & BPF_FIB_LOOKUP_MARK)
fl4.flowi4_mark = params->mark;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 2ed4c706ca9e..c106d56eb2f7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -157,7 +157,8 @@ struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref)
*/
local = fib_get_table(net, RT_TABLE_LOCAL);
if (local &&
- !fib_table_lookup(local, &fl4, &res, FIB_LOOKUP_NOREF) &&
+ !fib_table_lookup(net, local, &fl4, &res,
+ FIB_LOOKUP_NOREF) &&
res.type == RTN_LOCAL)
result = FIB_RES_DEV(res);
} else {
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 8a3dc04e8cac..c80c1b36f1fd 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -243,7 +243,8 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,
table = fib_get_table(net, tb_id);
if (table) {
ret = RTN_UNICAST;
- if (!fib_table_lookup(table, &fl4, &res, FIB_LOOKUP_NOREF)) {
+ if (!fib_table_lookup(net, table, &fl4, &res,
+ FIB_LOOKUP_NOREF)) {
struct fib_nh_common *nhc = fib_info_nhc(res.fi, 0);
if (!dev || dev == nhc->nhc_dev)
@@ -1400,7 +1401,8 @@ static void nl_fib_lookup(struct net *net, struct fib_result_nl *frn)
local_bh_disable();
frn->tb_id = tb->tb_id;
- frn->err = fib_table_lookup(tb, &fl4, &res, FIB_LOOKUP_NOREF);
+ frn->err = fib_table_lookup(net, tb, &fl4, &res,
+ FIB_LOOKUP_NOREF);
if (!frn->err) {
frn->prefixlen = res.prefixlen;
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 060501b376a8..28ba35125383 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -136,7 +136,7 @@ INDIRECT_CALLABLE_SCOPE int fib4_rule_action(struct fib_rule *rule,
tb_id = fib_rule_get_table(rule, arg);
tbl = fib_get_table(rule->fr_net, tb_id);
if (tbl)
- err = fib_table_lookup(tbl, &flp->u.ip4,
+ err = fib_table_lookup(rule->fr_net, tbl, &flp->u.ip4,
(struct fib_result *)arg->result,
arg->flags);
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 235c51a6f8e5..24def626739b 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1221,7 +1221,7 @@ static int fib_check_nh_v4_gw(struct net *net, struct fib_nh *nh, u32 table,
tbl = fib_get_table(net, table);
if (tbl)
- err = fib_table_lookup(tbl, &fl4, &res,
+ err = fib_table_lookup(net, tbl, &fl4, &res,
FIB_LOOKUP_IGNORE_LINKSTATE |
FIB_LOOKUP_NOREF);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index acb1e4385914..9ad76de68081 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1417,8 +1417,9 @@ bool fib_lookup_good_nhc(const struct fib_nh_common *nhc, int fib_flags,
}
/* should be called with rcu_read_lock */
-int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
- struct fib_result *res, int fib_flags)
+int fib_table_lookup(struct net *net, struct fib_table *tb,
+ const struct flowi4 *flp, struct fib_result *res,
+ int fib_flags)
{
struct trie *t = (struct trie *) tb->tb_data;
#ifdef CONFIG_IP_FIB_TRIE_STATS
@@ -1435,7 +1436,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
n = get_child_rcu(pn, cindex);
if (!n) {
- trace_fib_table_lookup(tb->tb_id, flp, NULL, -EAGAIN);
+ trace_fib_table_lookup(tb->tb_id, flp, NULL, -EAGAIN, net);
return -EAGAIN;
}
@@ -1522,7 +1523,8 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
*/
if (IS_TRIE(pn)) {
trace_fib_table_lookup(tb->tb_id, flp,
- NULL, -EAGAIN);
+ NULL, -EAGAIN,
+ net);
return -EAGAIN;
}
#ifdef CONFIG_IP_FIB_TRIE_STATS
@@ -1569,7 +1571,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
#ifdef CONFIG_IP_FIB_TRIE_STATS
this_cpu_inc(stats->semantic_match_passed);
#endif
- trace_fib_table_lookup(tb->tb_id, flp, NULL, err);
+ trace_fib_table_lookup(tb->tb_id, flp, NULL, err, net);
return err;
}
if (fi->fib_flags & RTNH_F_DEAD)
@@ -1610,7 +1612,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
#ifdef CONFIG_IP_FIB_TRIE_STATS
this_cpu_inc(stats->semantic_match_passed);
#endif
- trace_fib_table_lookup(tb->tb_id, flp, nhc, err);
+ trace_fib_table_lookup(tb->tb_id, flp, nhc, err, net);
return err;
}
--
2.55.0
next prev parent reply other threads:[~2026-10-08 13:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-08 13:31 [PATCH net-next v2 0/3] Report netns cookie in FIB lookup tracepoints Ido Schimmel
2026-10-08 13:31 ` [PATCH net-next v2 1/3] ipv6: Report netns cookie in fib6_table_lookup tracepoint Ido Schimmel
2026-10-08 13:31 ` Ido Schimmel [this message]
2026-10-08 13:31 ` [PATCH net-next v2 3/3] ipv4: Report netns cookie in fib_table_lookup tracepoint Ido Schimmel
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=20261008133158.1438907-3-idosch@nvidia.com \
--to=idosch@nvidia.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@kernel.org \
--cc=ferenc@fejes.dev \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=rostedt@goodmis.org \
/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