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

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

[Pavel Machek]

[-- 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 --]

Re: [cip-dev] 4.4-st-rc updated with patches up-to 4.9.328

[Ulrich Hecht]

> On 11/13/2022 5:27 PM CET Pavel Machek <pavel@denx.de> wrote:
> Results were pushed to -st-rc.

I have reviewed the new commits.

"fbdev: fb_pm2fb: Avoid potential divide by zero error" has been applied twice.

Other than that, everything looks good to me.

CU
Uli

Re: [cip-dev] 4.4-st-rc updated with patches up-to 4.9.328

[Pavel Machek]

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

Hi!

> > Results were pushed to -st-rc.
> 
> I have reviewed the new commits.
> 
> "fbdev: fb_pm2fb: Avoid potential divide by zero error" has been applied twice.
> 
> Other than that, everything looks good to me.

Thanks a lot for the review. And... good catch, problem seems to be in
4.9, too. Do you want to talk to Greg to get it fixed? (I can do it,
but this way you get the credit :-) ). It is just a bit of extra code,
so I will not specifically fix it here. (Should mean faster 4.4
release).


        if (lpitch * var->yres_virtual > info->fix.smem_len) {
                DPRINTK("no memory for screen (%ux%ux%u)\n",
                        var->xres, var->yres_virtual, var->bits_per_pixel);
                return -EINVAL;
        }

	if (!var->pixclock) {
                DPRINTK("pixclock is zero\n");
	        return -EINVAL;
        }

        if (!var->pixclock) {
                DPRINTK("pixclock is zero\n");
                return -EINVAL;
	}

	if (PICOS2KHZ(var->pixclock) > PM2_MAX_PIXCLOCK) {


Thanks and best regards,
								Pavel
-- 
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 --]