Re: /usr/src/sys/net/if_epair.c:181:6: error: ...

On 2022-Mar-23, at 08:59, bob prohaska <[email protected]> wrote:

> On Wed, Mar 23, 2022 at 11:51:17AM +0100, Kristof Provost wrote:
>> 
>> Can you try the attached patch? I???m not going to argue with the MI code about the atomic_testandclear_int, but instead revert the new if_epair code (in stable/12 only, of course).
>> 
> 
> Trying it now.
> 
> Patch reported:
> Patching file sys/net/if_epair.c using Plan A...
> Hunk #1 succeeded at 2.
> Hunk #2 failed at 37.
> Hunk #3 succeeded at 61.
> Hunk #4 succeeded at 78.
> Hunk #5 succeeded at 201.
> Hunk #6 succeeded at 517.
> Hunk #7 succeeded at 540.
> Hunk #8 succeeded at 701.
> Hunk #9 succeeded at 791.
> Hunk #10 succeeded at 809.
> Hunk #11 succeeded at 862.
> Hunk #12 succeeded at 876.
> Hunk #13 succeeded at 904.
> Hunk #14 succeeded at 932.
> Hunk #15 succeeded at 947.
> Hunk #16 succeeded at 975.
> Hunk #17 succeeded at 999.
> Hunk #18 succeeded at 1010.
> Hunk #19 succeeded at 1061.
> 1 out of 19 hunks failed--saving rejects to sys/net/if_epair.c.rej
> 
> Running make buildkernel -DWITH_META_MODE anyway to see if anything 
> else goes wrong. Half an hour in so far and no errors. If it fails 
> I'll delete the altered files, run svnlite up again and try over. 
> 

I do not have an svn tree around. So my checking below is
just via git and patch.

I created a /usr/12S-src git worktree with the identified
version (that happened to match were my git was last fetched).
I tried:

# git -C /usr/12S-src/ apply ~/12S.diff 
/usr/home/root/12S.diff:289: trailing whitespace.
	} 
/usr/home/root/12S.diff:677: trailing whitespace.
	
/usr/home/root/12S.diff:721: trailing whitespace.
			
/usr/home/root/12S.diff:800: trailing whitespace.
	
/usr/home/root/12S.diff:876: trailing whitespace.
	
warning: 5 lines add whitespace errors.

So: no problem. I then did:

# git -C /usr/12S-src/ restore .
# git -C /usr/12S-src/ status
On branch stable/12
Your branch is up to date with 'freebsd/stable/12'.

nothing to commit, working tree clean
# cd /usr/12S-src/
# patch -p1 < ~/12S.diff 
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From cd13085b06296f5ce9079abfba5b52e2877398d3 Mon Sep 17 00:00:00 2001
|From: Kristof Provost <[email protected]>
|Date: Mon, 21 Mar 2022 15:41:32 +0100
|Subject: [PATCH] Revert "if_epair: rework"
|
|Revert the recent performance rework of if_epair. It relies on functions like
|atomic_testandclear_long() which are not available on all platforms in
|stable/12.
|
|This reverts commits b1a3f8dccb6203036b7ee81201fd5b5a8de36f0d,
|fb3644ab2afe777fdd2539bc996a390443f052f1,
|ca7af63e88f8cc96865d45e020a57b3062631388,
|092da35a0d80af7a3e5c5c22cbeddb6cffbd9524,
|and 7c2b681b33fc78ed06c7e9e65eeebb2ab5420586.
|
|This is a direct commit to stable/12.
|---
| sys/modules/if_epair/Makefile |   2 +-
| sys/net/if_epair.c            | 832 +++++++++++++++++++++-------------
| 2 files changed, 509 insertions(+), 325 deletions(-)
|
|diff --git a/sys/modules/if_epair/Makefile b/sys/modules/if_epair/Makefile
|index 8b063623f2e8..3e102413bfe2 100644
|--- a/sys/modules/if_epair/Makefile
|+++ b/sys/modules/if_epair/Makefile
--------------------------
Patching file sys/modules/if_epair/Makefile using Plan A...
Hunk #1 succeeded at 3.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
|index 4b01e97c354d..cd11036ad028 100644
|--- a/sys/net/if_epair.c
|+++ b/sys/net/if_epair.c
--------------------------
Patching file sys/net/if_epair.c using Plan A...
Hunk #1 succeeded at 2.
Hunk #2 succeeded at 37.
Hunk #3 succeeded at 61.
Hunk #4 succeeded at 78.
Hunk #5 succeeded at 201.
Hunk #6 succeeded at 517.
Hunk #7 succeeded at 540.
Hunk #8 succeeded at 701.
Hunk #9 succeeded at 791.
Hunk #10 succeeded at 809.
Hunk #11 succeeded at 862.
Hunk #12 succeeded at 876.
Hunk #13 succeeded at 904.
Hunk #14 succeeded at 932.
Hunk #15 succeeded at 947.
Hunk #16 succeeded at 975.
Hunk #17 succeeded at 999.
Hunk #18 succeeded at 1010.
Hunk #19 succeeded at 1061.
Hmm...  Ignoring the trailing garbage.
done

So, again, no problem.

Looks like something was likely odd on your end.

===
Mark Millard
marklmi at yahoo.com