4.4-st-rc updated with patches up-to 4.9.328

From: Pavel Machek <pavel@denx.de>
To: cip-dev@lists.cip-project.org
Subject: 4.4-st-rc updated with patches up-to 4.9.328
Date: Sun, 13 Nov 2022 17:27:13 +0100	[thread overview]
Message-ID: <Y3Ea4T2hx8Sq/CdK@duo.ucw.cz> (raw)

[-- Attachment #1: Type: text/plain, Size: 1665 bytes --]

Hi!

Results were pushed to -st-rc.

I have added "KNOWN-BUGS" with ... well.. some documentation, and
commit f077ac447faf72436e0a7e153695bbf1fccbcd68 is worth
checking. Unfortunately, that tcp stuff is rather "random" and I'm not
sure if we are testing it efficiently.

Best regards,
								Pavel

commit 3564fad7204ed8fc2e8b7eea19bface6e1fabfd7
Author: Pavel Machek <pavel@ucw.cz>
Date:   Thu Nov 10 22:01:55 2022 +0100

    tcp: Fix missmerge in perturb table handling
    
    I left duplicate code after the merge, and it was causing a
    warning. This should fix it, but I'm not sure how to test it.
    
    Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 73bebd4239b15..ee9a76ac24fed 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -597,16 +597,8 @@ ok:
 		 * it may be inexistent.
 		 */
 		i = max_t(int, i, (prandom_u32() & 7) * 2);
-		WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + i + 2);
+		WRITE_ONCE(table_perturb[index], (READ_ONCE(table_perturb[index]) + i + 2) & ~1);
 		
-		/* If our first attempt found a candidate, skip next candidate
-		 * in 1/16 of cases to add some noise.
-		 */
-		if (!i && !(prandom_u32() % 16))
-			i = 2;
-
-		WRITE_ONCE(table_perturb[index], READ_ONCE(table_perturb[index]) + (i + 2) & ~1);
-
 		/* Head lock still held and bh's disabled */
 		inet_bind_hash(sk, tb, port);
 		if (sk_unhashed(sk)) {

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
