2022-07-11 07:57:40

by shaozhengchao

Subject: [PATCH] net: change the type of ip_route_input_rcu to static

The type of ip_route_input_rcu should be static.

Signed-off-by: Zhengchao Shao <[email protected]>
---
include/net/route.h | 4 ----
net/ipv4/route.c | 34 +++++++++++++++++-----------------
2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/include/net/route.h b/include/net/route.h
index b6743ff88e30..4929a710c24b 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -201,10 +201,6 @@ int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,
struct in_device *in_dev, u32 *itag);
int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin);
-int ip_route_input_rcu(struct sk_buff *skb, __be32 dst, __be32 src,
- u8 tos, struct net_device *devin,
- struct fib_result *res);
-
int ip_route_use_hint(struct sk_buff *skb, __be32 dst, __be32 src,
u8 tos, struct net_device *devin,
const struct sk_buff *hint);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bd351fab46e6..328beff85a1e 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2432,24 +2432,9 @@ out: return err;
goto out;
}

-int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
- u8 tos, struct net_device *dev)
-{
- struct fib_result res;
- int err;
-
- tos &= IPTOS_RT_MASK;
- rcu_read_lock();
- err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);
- rcu_read_unlock();
-
- return err;
-}
-EXPORT_SYMBOL(ip_route_input_noref);
-
/* called with rcu_read_lock held */
-int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,
- u8 tos, struct net_device *dev, struct fib_result *res)
+static int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+ u8 tos, struct net_device *dev, struct fib_result *res)
{
/* Multicast recognition logic is moved from route cache to here.
* The problem was that too many Ethernet cards have broken/missing
@@ -2498,6 +2483,21 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,
return ip_route_input_slow(skb, daddr, saddr, tos, dev, res);
}

+int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+ u8 tos, struct net_device *dev)
+{
+ struct fib_result res;
+ int err;
+
+ tos &= IPTOS_RT_MASK;
+ rcu_read_lock();
+ err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);
+ rcu_read_unlock();
+
+ return err;
+}
+EXPORT_SYMBOL(ip_route_input_noref);
+
/* called with rcu_read_lock() */
static struct rtable *__mkroute_output(const struct fib_result *res,
const struct flowi4 *fl4, int orig_oif,
--
2.17.1

2022-07-12 13:30:50

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: change the type of ip_route_input_rcu to static

Hello:

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

On Mon, 11 Jul 2022 15:35:49 +0800 you wrote:
> The type of ip_route_input_rcu should be static.
>
> Signed-off-by: Zhengchao Shao <[email protected]>
> ---
> include/net/route.h | 4 ----
> net/ipv4/route.c | 34 +++++++++++++++++-----------------
> 2 files changed, 17 insertions(+), 21 deletions(-)

Here is the summary with links:
- net: change the type of ip_route_input_rcu to static
https://git.kernel.org/netdev/net-next/c/5022e221c98a

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