Skip to content

Commit c98974e

Browse files
author
CKI KWF Bot
committed
Merge: ipv4: stable backport for 10.2 phase 1
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1568 JIRA: https://issues.redhat.com/browse/RHEL-115577 Upstream Status: linux.git Upstream fixes for ipv4. Signed-off-by: Guillaume Nault <gnault@redhat.com> Approved-by: Hangbin Liu <haliu@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents fdc953c + 0353be3 commit c98974e

File tree

5 files changed

+72
-15
lines changed

5 files changed

+72
-15
lines changed

‎include/net/ip.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,11 @@ static inline unsigned int ipv4_addr_hash(__be32 ip)
692692
return (__force unsigned int) ip;
693693
}
694694

695+
static inline u32 __ipv4_addr_hash(const __be32 ip, const u32 initval)
696+
{
697+
return jhash_1word((__force u32)ip, initval);
698+
}
699+
695700
static inline u32 ipv4_portaddr_hash(const struct net *net,
696701
__be32 saddr,
697702
unsigned int port)

‎net/ipv4/devinet.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static struct hlist_head inet_addr_lst[IN4_ADDR_HSIZE];
123123

124124
static u32 inet_addr_hash(const struct net *net, __be32 addr)
125125
{
126-
u32 val = (__force u32) addr ^ net_hash_mix(net);
126+
u32 val = __ipv4_addr_hash(addr, net_hash_mix(net));
127127

128128
return hash_32(val, IN4_ADDR_HSIZE_SHIFT);
129129
}
@@ -351,14 +351,13 @@ static void inetdev_destroy(struct in_device *in_dev)
351351

352352
static int __init inet_blackhole_dev_init(void)
353353
{
354-
int err = 0;
354+
struct in_device *in_dev;
355355

356356
rtnl_lock();
357-
if (!inetdev_init(blackhole_netdev))
358-
err = -ENOMEM;
357+
in_dev = inetdev_init(blackhole_netdev);
359358
rtnl_unlock();
360359

361-
return err;
360+
return PTR_ERR_OR_ZERO(in_dev);
362361
}
363362
late_initcall(inet_blackhole_dev_init);
364363

‎net/ipv4/nexthop.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,6 +2375,13 @@ static int replace_nexthop_single(struct net *net, struct nexthop *old,
23752375
return -EINVAL;
23762376
}
23772377

2378+
if (!list_empty(&old->grp_list) &&
2379+
rtnl_dereference(new->nh_info)->fdb_nh !=
2380+
rtnl_dereference(old->nh_info)->fdb_nh) {
2381+
NL_SET_ERR_MSG(extack, "Cannot change nexthop FDB status while in a group");
2382+
return -EINVAL;
2383+
}
2384+
23782385
err = call_nexthop_notifiers(net, NEXTHOP_EVENT_REPLACE, new, extack);
23792386
if (err)
23802387
return err;

‎net/ipv4/ping.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ static inline struct hlist_head *ping_hashslot(struct ping_table *table,
7777

7878
int ping_get_port(struct sock *sk, unsigned short ident)
7979
{
80+
struct net *net = sock_net(sk);
8081
struct inet_sock *isk, *isk2;
8182
struct hlist_head *hlist;
8283
struct sock *sk2 = NULL;
@@ -90,9 +91,10 @@ int ping_get_port(struct sock *sk, unsigned short ident)
9091
for (i = 0; i < (1L << 16); i++, result++) {
9192
if (!result)
9293
result++; /* avoid zero */
93-
hlist = ping_hashslot(&ping_table, sock_net(sk),
94-
result);
94+
hlist = ping_hashslot(&ping_table, net, result);
9595
sk_for_each(sk2, hlist) {
96+
if (!net_eq(sock_net(sk2), net))
97+
continue;
9698
isk2 = inet_sk(sk2);
9799

98100
if (isk2->inet_num == result)
@@ -108,8 +110,10 @@ int ping_get_port(struct sock *sk, unsigned short ident)
108110
if (i >= (1L << 16))
109111
goto fail;
110112
} else {
111-
hlist = ping_hashslot(&ping_table, sock_net(sk), ident);
113+
hlist = ping_hashslot(&ping_table, net, ident);
112114
sk_for_each(sk2, hlist) {
115+
if (!net_eq(sock_net(sk2), net))
116+
continue;
113117
isk2 = inet_sk(sk2);
114118

115119
/* BUG? Why is this reuse and not reuseaddr? ping.c
@@ -129,7 +133,7 @@ int ping_get_port(struct sock *sk, unsigned short ident)
129133
pr_debug("was not hashed\n");
130134
sk_add_node_rcu(sk, hlist);
131135
sock_set_flag(sk, SOCK_RCU_FREE);
132-
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
136+
sock_prot_inuse_add(net, sk->sk_prot, 1);
133137
}
134138
spin_unlock(&ping_table.lock);
135139
return 0;
@@ -188,6 +192,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)
188192
}
189193

190194
sk_for_each_rcu(sk, hslot) {
195+
if (!net_eq(sock_net(sk), net))
196+
continue;
191197
isk = inet_sk(sk);
192198

193199
pr_debug("iterate\n");

‎tools/testing/selftests/net/fib_nexthops.sh‎

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,8 @@ ipv6_fdb_grp_fcnal()
467467
log_test $? 0 "Get Fdb nexthop group by id"
468468

469469
# fdb nexthop group can only contain fdb nexthops
470-
run_cmd "$IP nexthop add id 63 via 2001:db8:91::4"
471-
run_cmd "$IP nexthop add id 64 via 2001:db8:91::5"
470+
run_cmd "$IP nexthop add id 63 via 2001:db8:91::4 dev veth1"
471+
run_cmd "$IP nexthop add id 64 via 2001:db8:91::5 dev veth1"
472472
run_cmd "$IP nexthop add id 103 group 63/64 fdb"
473473
log_test $? 2 "Fdb Nexthop group with non-fdb nexthops"
474474

@@ -494,6 +494,26 @@ ipv6_fdb_grp_fcnal()
494494
run_cmd "$IP nexthop add id 69 encap mpls 101 via 2001:db8:91::8 dev veth1 fdb"
495495
log_test $? 2 "Fdb Nexthop with encap"
496496

497+
# Replace FDB nexthop to non-FDB and vice versa
498+
run_cmd "$IP nexthop add id 70 via 2001:db8:91::2 fdb"
499+
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 dev veth1"
500+
log_test $? 0 "Replace FDB nexthop to non-FDB nexthop"
501+
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 fdb"
502+
log_test $? 0 "Replace non-FDB nexthop to FDB nexthop"
503+
504+
# Replace FDB nexthop address while in a group
505+
run_cmd "$IP nexthop add id 71 group 70 fdb"
506+
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::3 fdb"
507+
log_test $? 0 "Replace FDB nexthop address while in a group"
508+
509+
# Cannot replace FDB nexthop to non-FDB and vice versa while in a group
510+
run_cmd "$IP nexthop replace id 70 via 2001:db8:91::2 dev veth1"
511+
log_test $? 2 "Replace FDB nexthop to non-FDB nexthop while in a group"
512+
run_cmd "$IP nexthop add id 72 via 2001:db8:91::2 dev veth1"
513+
run_cmd "$IP nexthop add id 73 group 72"
514+
run_cmd "$IP nexthop replace id 72 via 2001:db8:91::2 fdb"
515+
log_test $? 2 "Replace non-FDB nexthop to FDB nexthop while in a group"
516+
497517
run_cmd "$IP link add name vx10 type vxlan id 1010 local 2001:db8:91::9 remote 2001:db8:91::10 dstport 4789 nolearning noudpcsum tos inherit ttl 100"
498518
run_cmd "$BRIDGE fdb add 02:02:00:00:00:13 dev vx10 nhid 102 self"
499519
log_test $? 0 "Fdb mac add with nexthop group"
@@ -547,15 +567,15 @@ ipv4_fdb_grp_fcnal()
547567
log_test $? 0 "Get Fdb nexthop group by id"
548568

549569
# fdb nexthop group can only contain fdb nexthops
550-
run_cmd "$IP nexthop add id 14 via 172.16.1.2"
551-
run_cmd "$IP nexthop add id 15 via 172.16.1.3"
570+
run_cmd "$IP nexthop add id 14 via 172.16.1.2 dev veth1"
571+
run_cmd "$IP nexthop add id 15 via 172.16.1.3 dev veth1"
552572
run_cmd "$IP nexthop add id 103 group 14/15 fdb"
553573
log_test $? 2 "Fdb Nexthop group with non-fdb nexthops"
554574

555575
# Non fdb nexthop group can not contain fdb nexthops
556576
run_cmd "$IP nexthop add id 16 via 172.16.1.2 fdb"
557577
run_cmd "$IP nexthop add id 17 via 172.16.1.3 fdb"
558-
run_cmd "$IP nexthop add id 104 group 14/15"
578+
run_cmd "$IP nexthop add id 104 group 16/17"
559579
log_test $? 2 "Non-Fdb Nexthop group with fdb nexthops"
560580

561581
# fdb nexthop cannot have blackhole
@@ -574,6 +594,26 @@ ipv4_fdb_grp_fcnal()
574594
run_cmd "$IP nexthop add id 17 encap mpls 101 via 172.16.1.2 dev veth1 fdb"
575595
log_test $? 2 "Fdb Nexthop with encap"
576596

597+
# Replace FDB nexthop to non-FDB and vice versa
598+
run_cmd "$IP nexthop add id 18 via 172.16.1.2 fdb"
599+
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 dev veth1"
600+
log_test $? 0 "Replace FDB nexthop to non-FDB nexthop"
601+
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 fdb"
602+
log_test $? 0 "Replace non-FDB nexthop to FDB nexthop"
603+
604+
# Replace FDB nexthop address while in a group
605+
run_cmd "$IP nexthop add id 19 group 18 fdb"
606+
run_cmd "$IP nexthop replace id 18 via 172.16.1.3 fdb"
607+
log_test $? 0 "Replace FDB nexthop address while in a group"
608+
609+
# Cannot replace FDB nexthop to non-FDB and vice versa while in a group
610+
run_cmd "$IP nexthop replace id 18 via 172.16.1.2 dev veth1"
611+
log_test $? 2 "Replace FDB nexthop to non-FDB nexthop while in a group"
612+
run_cmd "$IP nexthop add id 20 via 172.16.1.2 dev veth1"
613+
run_cmd "$IP nexthop add id 21 group 20"
614+
run_cmd "$IP nexthop replace id 20 via 172.16.1.2 fdb"
615+
log_test $? 2 "Replace non-FDB nexthop to FDB nexthop while in a group"
616+
577617
run_cmd "$IP link add name vx10 type vxlan id 1010 local 10.0.0.1 remote 10.0.0.2 dstport 4789 nolearning noudpcsum tos inherit ttl 100"
578618
run_cmd "$BRIDGE fdb add 02:02:00:00:00:13 dev vx10 nhid 102 self"
579619
log_test $? 0 "Fdb mac add with nexthop group"
@@ -582,7 +622,7 @@ ipv4_fdb_grp_fcnal()
582622
run_cmd "$BRIDGE fdb add 02:02:00:00:00:14 dev vx10 nhid 12 self"
583623
log_test $? 255 "Fdb mac add with nexthop"
584624

585-
run_cmd "$IP ro add 172.16.0.0/22 nhid 15"
625+
run_cmd "$IP ro add 172.16.0.0/22 nhid 16"
586626
log_test $? 2 "Route add with fdb nexthop"
587627

588628
run_cmd "$IP ro add 172.16.0.0/22 nhid 103"

0 commit comments

Comments
 (0)