From nobody Wed Mar 23 18:11:54 2022 X-Original-To: freebsd-arm@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 49F0E1A2E2CE for ; Wed, 23 Mar 2022 18:12:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic304-24.consmr.mail.gq1.yahoo.com (sonic304-24.consmr.mail.gq1.yahoo.com [98.137.68.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNxJk2gtmz3kJt for ; Wed, 23 Mar 2022 18:12:06 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1648059119; bh=Bt0EEmKx87+xhcs3v5xNJ1QtX+ANzM/98s0L8qDibEU=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=so1P8FXujwwpQUOlVO8FIiMg8pC7alrXppJQkotH25PjyNrRNobJ4Rr8NqkRXoKgfPWeouhguqd9sc4Dkk/v1ObddfvxcNUmF3NjVnT0PCquO3vVzgW+Lp1h9ihWxhKC6Mw/RWTLI9AJnyxTqM6tuYLCZFiaUNV/2P6Fq0DaZvCqbOM8k5InSm4X+eLDaJp6M9zNQQjfy/l+6RAU9FSAqQfZcIgK8naRBwFt1PX3gtfuNEnki/gyEWq58hljx46fY54a4wgeK719CuU0Gi6BFyxRIYAxKbWWYmbV1CoOS2WjWAirp6TzwIfW4YDm4yFmnq9KCNB38pzP0ZqeuuvDOQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1648059119; bh=UMuh83lzo9wpDQKtJOHcESEN2ICcnaV3Zm3XB5gAmuY=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=i9tdG8XGO9GqIcKDn8okAsd+n9GG7FZDnN3rhQcb26COzMWHGhlvLpw4CU14eLm3OTIxVGX6k97lFmy7o1d34y69wZ747qEaYBgq7L2x9nQoF8pWa/bvh9gqqIcuU93w80CYfEeUUgDdRaX0qgttYhxNdKCOqvU6bHHgeB+pVoOTLwl78jBWCMP5nP/xPNhd5otM0Rt5x5BilarPM+bET1HTJLgWDaRQpzA1Vm8h0285oJkrQ0kNW7jHmph7N68VutnTwKZkueta3BaIyytlCCokY4BP0TgVvkZpmprmMhGl48ciyODUvMVbeRvxjPfMJRqtvi61/us1711gBD6XLA== X-YMail-OSG: Iv7FN.EVM1nuNapPG9z.YL8KIN4dhVUImUPDlkfJgluwdBVUCKiHGTTgZJ17Asj QBREWROE.U0WApy7x5tMdNmOWsAZP.SyWl4pHknr1LEKnRzyvDUoELX1x3Tlf.4.3UXdmwgALD_k _fPtIsYLkZRneLC7RWImzHIGKohWGv0scOEPTYt_dPsi65rWkMoKA3u9EUBiQdbKCFjPma7jANgh rvTA4neCP2XHrJm_sYXcDZbvHXFyKc0FE3IzBOHAuj3JO6Q3ZPqDbQZreHN6jixxuy09jLhPORra dOGzEtcUj3_on20Kz4VECQdyhoDeiO4bGFXzEVfWxFwxsc4gTZ.NMioBCi6Em343pkQCYdbv6TY4 bNbSIlOVrDW8qsvyjAJFvvDkU_5ECNJsuj7pwqVyShkTcq6z4GPuX1oGV.BSKjUpjs9_gZHm9skO L1drruHdhqQNSdhdBP1J2C0Du6xZQqwUtjXmDw3Srhj8ayJjsXFTVO349AD1_aZ4r0Fv8xiSJXb5 6D5IS_kWjGg.thJTvOQDasE6xpZXjq8RzFZDlKQ_r3Gm0XB0L2zqdGilUizseRmslXLFJ.CXmrsb 6sWEPFdnqZ0hDCoFWYTOAYPTgmypiTBkTYgbb71K.wuw9ApQPXL9ymbhPEFJvYvmkks1Xmnsv9BK mIhlAwGLOVtFaYLpSAj4FgDGqMIthSS2Q_3fQKXWRY4dsAtz0f_Squg2r8Of.YEFZh849.eoh2kf iTD.212XzV9oucNe8kiaO7uq9VKF3kw4s0AENPGosYKvtb2BXIXuR8FF25XFq_WIC3gCh4z2P1Gk WmKmwoWLAHjUsXWjpAJ8CdUcDK0_PaURt9kbKVDO70bumpscmbcWmiEk7N3r_Q_0VlEo5MaaJ5fu qKZvH_CzMJYSHW2xxF5AeHmAebzXQyj1w0Ym5s0XLDOZ4NeVkMSkzCYbK1aQ7QaTIocPgrEeoVfg Ti7PerDrb99N_niN_q7ufg9.Dio88TS4Qmvf7OfI9vIXsWrYN828rnyEDk5hhi9Vu0exfoNFzebK jVnUw00.y4rAs__5M422zbhtY5BuQLolPNN1VFMy0V.1lqV.Br0mwV7RjJzmg0Tp0oadSJE_3CBr Na7XLpV8BDzX4o_bOvKTEkhH0Fs2DANjxmAFXzF1ckSdAx2fNSZ92uzIcBuRNxYTLW13Mx8a8iEr y9R76fmNpGeEqmnj0FyehCkQbUjqhzNSgZS_OzI2VnUjnvFkduuIogEElQUykFWbk_wm9ACjS_y6 GpBMPRK8Aaw2e75Lmr7yl6eVIRqIm3rdPMlk5f_RXIDAgUR7Iskx608UelPDIRfIMku4OsaSq4Q1 5C.v3MD99ZEbXZGE.jYvMnMRzTryQyF.moFED2aS_92gH4YhRT85naElPdn5VI9dnHjfI9J9dVtf HGObzvtks8XSmjSIqSooVJ4Mn9GwrUCuCkIFUpvG5b1ev26ObPPjQ.7h2J_BSgujEP_cBLfJ.Vaa RmCtypsJRZdJ0iBo4Y2jSGojqHASk3dlt2Dbo2doNS9S6S7z7nNCygim.ewWHvgdx2acGfwNgkDP 5f0Irx.QJrO9JBnh.WYaz.twk1b4VXCM6ASkU2lgRzZETvGnsi_cT3uZlX7Lhq.Ltvd6J_xqGjL6 KGtZbGuRm.QFhXop59VbZM_HAXry_.PTDVF3fQeQOcUR_jKYeJlyLB2xpeZUjGCasWar70Yv1c01 HBz3TSixNsioHHDwSloEYFLJZVMkoI5893Pu03qqGnPbIRgubXTaJHTX28qF4rl.p6A5x0M7amnX s9WrRWV8NNVCTpxiBaH6Fs.FADOypLi1xSXH0ZXT1P98sA2WNy3YRHftHKm5gbnx6UTIdgv5wNNy CYUh7OXjDXr7OYbg6nhJCbNbHGxcHtpiNj8GZ5Z2O8F8HknTWKekGquMb6BX3JET5oqYxlu3LHRG 50ozKOGEZ0y8ZuMfKiFL4I3NX5i556c0Z1avMSoG3_Vs6I4nGD_MrASKmvTITdlLjrBAIWkQ0YOp MxcazuBmSYaCBDUwotZj_dC9aJFolt9xxUybs5x5AbhKRYBbMA40t.CLenoqgLpuHyFwq1wyKwV7 YwSyraOo6S4hhftaNwgbS7FI2LSzor9MjFGFCqVypVHwlrGi5PGolHcr4YpiEW7bxPzGbpK3dq5v yx1hkIsHVCp191Ku6JAylgE58rc1GM8XTC5WAR5BXC4n9DGN9yGyygqkpPOuH79XUPAFENC0Isai pXioQq39mlGHpnT8N3gKGL1K1AvAAmYo4YiDdYpwnyrEUWPh2LHCrwQ0SnLdpXTvzL2Mk1obpWKX QwuECZ0pj6Eh.C_8vPXMAZXDO4aI- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.gq1.yahoo.com with HTTP; Wed, 23 Mar 2022 18:11:59 +0000 Received: by hermes--canary-production-bf1-665cdb9985-l8dtt (VZM Hermes SMTP Server) with ESMTPA ID a3b8abc0db4c67bee1f6529601d3d983; Wed, 23 Mar 2022 18:11:57 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Porting FreeBSD to ARM processors List-Archive: https://lists.freebsd.org/archives/freebsd-arm List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-arm@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: /usr/src/sys/net/if_epair.c:181:6: error: ... From: Mark Millard In-Reply-To: <20220323155947.GA96051@www.zefox.net> Date: Wed, 23 Mar 2022 11:11:54 -0700 Cc: Kristof Provost , grembo@freebsd.org, Free BSD Content-Transfer-Encoding: quoted-printable Message-Id: <2185A67E-1B69-4F47-B125-87C15B042491@yahoo.com> References: <20220323012657.GA82109@www.zefox.net> <43A846B1-4AD4-48C7-ADAB-82D1CAFF6DDB@yahoo.com> <3049B57B-CDEC-4EE8-A33D-97B833BB4A78@yahoo.com> <4782B40F-EEB3-4051-A345-FE73708C51E4@FreeBSD.org> <20220323155947.GA96051@www.zefox.net> To: bob prohaska X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Rspamd-Queue-Id: 4KNxJk2gtmz3kJt X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=so1P8FXu; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.205 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-3.41 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-0.91)[-0.908]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.205:from]; MLMMJ_DEST(0.00)[freebsd-arm]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.205:from]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N On 2022-Mar-23, at 08:59, bob prohaska wrote: > On Wed, Mar 23, 2022 at 11:51:17AM +0100, Kristof Provost wrote: >>=20 >> 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). >>=20 >=20 > Trying it now. >=20 > 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 >=20 > Running make buildkernel -DWITH_META_MODE anyway to see if anything=20 > else goes wrong. Half an hour in so far and no errors. If it fails=20 > I'll delete the altered files, run svnlite up again and try over.=20 >=20 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=20 /usr/home/root/12S.diff:289: trailing whitespace. }=20 /usr/home/root/12S.diff:677: trailing whitespace. =09 /usr/home/root/12S.diff:721: trailing whitespace. =09 /usr/home/root/12S.diff:800: trailing whitespace. =09 /usr/home/root/12S.diff:876: trailing whitespace. =09 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=20 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |=46rom cd13085b06296f5ce9079abfba5b52e2877398d3 Mon Sep 17 00:00:00 = 2001 |From: Kristof Provost |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. =3D=3D=3D Mark Millard marklmi at yahoo.com