[PATCH net-next] tcp: Split BUG_ON() in tcp_tso_should_defer() into two assertions

[PATCH net-next] tcp: Split BUG_ON() in tcp_tso_should_defer() into two assertions

[Stefano Brivio]

The two conditions triggering BUG_ON() are somewhat unrelated:
the tcp_skb_pcount() check is meant to catch TSO flaws, the
second one checks sanity of congestion window bookkeeping.

Split them into two separate BUG_ON() assertions on two lines,
so that we know which one actually triggers, when they do.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 net/ipv4/tcp_output.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 04be9f833927..95461f02ac9a 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1944,7 +1944,8 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
 
 	in_flight = tcp_packets_in_flight(tp);
 
-	BUG_ON(tcp_skb_pcount(skb) <= 1 || (tp->snd_cwnd <= in_flight));
+	BUG_ON(tcp_skb_pcount(skb) <= 1);
+	BUG_ON(tp->snd_cwnd <= in_flight);
 
 	send_win = tcp_wnd_end(tp) - TCP_SKB_CB(skb)->seq;
 
-- 
2.9.4

Re: [PATCH net-next] tcp: Split BUG_ON() in tcp_tso_should_defer() into two assertions

[David Miller]

From: Stefano Brivio <sbrivio@redhat.com>
Date: Fri,  5 Jan 2018 00:38:05 +0100

> The two conditions triggering BUG_ON() are somewhat unrelated:
> the tcp_skb_pcount() check is meant to catch TSO flaws, the
> second one checks sanity of congestion window bookkeeping.
> 
> Split them into two separate BUG_ON() assertions on two lines,
> so that we know which one actually triggers, when they do.
> 
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Applied.