Skip to contentSkip to conversation

udp: reduce merge conflict on udp[46]_lib_lookup2

PATCH In review Willem de Bruijn 3 participants 3 messages Jul 25, 2020 – Jul 26, 2020

Subsystems (4)
lore
Share & tools
lore

Willem de Bruijn

author maintainer
#0 lore raw

PATCH 1/1 udp: reduce merge conflict on udp[46]_lib_lookup2

From: Willem de Bruijn <[email protected]>

Commit efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.")

in net conflicts with

Commit 72f7e9440e9b ("udp: Run SK_LOOKUP BPF program on socket lookup")

in bpf-next.

Commit 4a0e87bb1836 ("udp: Don't discard reuseport selection when group has connections")

also in bpf-next reduces the conflict.

Further simplify by applying the main change of the first commit to bpf-next. After this a conflict remains, but the bpf-next side can be taken as is.

Now unused variable reuseport_result added in net must also be removed. That applies without a conflict, so is harder to spot.

---
 net/ipv4/udp.c | 3 ++-
 net/ipv6/udp.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
net/ipv4/udp.c +2 -1
index 9397690b3737..67f8e880d7f3 100644
@@ -448,7 +448,8 @@ static struct sock *udp4_lib_lookup2(struct net *net,
 				return result;
 
 			badness = score;
-			result = sk;
+			if (!result)
+				result = sk;
 		}
 	}
 	return result;
net/ipv6/udp.c +2 -1
index ed282b0fe8ac..827a01b50b9b 100644
@@ -180,8 +180,9 @@ static struct sock *udp6_lib_lookup2(struct net *net,
 			if (result && !reuseport_has_conns(sk, false))
 				return result;
 
-			result = sk;
 			badness = score;
+			if (!result)
+				result = sk;
 		}
 	}
 	return result;
Signature · 1 line
2.28.0.rc0.142.g3c755180ce-goog
Acked-by on v1 1/1
#1 lore raw
From:   Willem de Bruijn <[email protected]>
Date:   Fri, 24 Jul 2020 22:54:57 -0400
Quoted 19 lines

From: Willem de Bruijn <[email protected]>

Commit efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.")

in net conflicts with

Commit 72f7e9440e9b ("udp: Run SK_LOOKUP BPF program on socket lookup")

in bpf-next.

Commit 4a0e87bb1836 ("udp: Don't discard reuseport selection when group has connections")

also in bpf-next reduces the conflict.

Further simplify by applying the main change of the first commit to bpf-next. After this a conflict remains, but the bpf-next side can be taken as is.

Quoted 5 lines

Now unused variable reuseport_result added in net must also be removed. That applies without a conflict, so is harder to spot.

Thank you for the follow up patch!

Best Regards,
Kuniyuki

#2 lore raw
Quoted 25 lines · Kuniyuki Iwashima
From:   Willem de Bruijn <[email protected]>
Date:   Fri, 24 Jul 2020 22:54:57 -0400
Quoted 22 lines

From: Willem de Bruijn <[email protected]>

Commit efc6b6f6c311 ("udp: Improve load balancing for SO_REUSEPORT.")

in net conflicts with

Commit 72f7e9440e9b ("udp: Run SK_LOOKUP BPF program on socket lookup")

in bpf-next.

Commit 4a0e87bb1836 ("udp: Don't discard reuseport selection when group has connections")

also in bpf-next reduces the conflict.

Further simplify by applying the main change of the first commit to bpf-next. After this a conflict remains, but the bpf-next side can be taken as is.

Now unused variable reuseport_result added in net must also be removed. That applies without a conflict, so is harder to spot.

Quoted 6 lines
Quoted 2 lines

Thank you for the follow up patch!

net is being merged into net-next. I think this one is no longer necessary.