From nobody Thu Oct 17 18:56:00 2024 X-Original-To: dev-commits-src-main@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 4XTxrG6Nzmz5ZLh4 for ; Thu, 17 Oct 2024 18:56:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTxrG2pMZz4Prb for ; Thu, 17 Oct 2024 18:56:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-20cdb889222so13921855ad.3 for ; Thu, 17 Oct 2024 11:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1729191372; x=1729796172; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=3TmtRkc4fIGIWeZ3Tia4qU0Ev/HoM+o8qxgVJWbJOFw=; b=yY50OwF7xBMd6Ne1yElGgPneJkyiyuxwaCZJJCOJCEPm9abESJ5E/s3Zl9P7sFU2UU YQoKPJqOpWkHzo6p/HV/qqp4s4xnzjGYEMcS1iNxCaQgOzxsJ+Uxzklb2l2PWhw7unhy bpJY7qg9AyB3YGxS5+05cTIu7erMly9nL/P+7DrzicyRWvZ4El0FRYSd7ImYBedni1+m UfeCTTIoF8ctqqr986mMh87Qa+0FslaL4mWfs1VR06Tb6pGFzi6OA4fpxwT7bZ+vwmWO X+o2O0esuQGZFdmQdZQkCKOmTkHdLePbaYXkTnQd3ImxiIJ3tqtC8JPR/xgff00ZDTCE em0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729191372; x=1729796172; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3TmtRkc4fIGIWeZ3Tia4qU0Ev/HoM+o8qxgVJWbJOFw=; b=d5NwaRQzi6uCzoqRVtIGgGw9b7sek4ywWisi8Q1zt2HdONKpxWSeQ+zXQJWXOZKubc g7zl93gUQRzN7yQ7R60tAzsJasZ6ztV29XWqAyGKxOz4R1ZN6F8s9lOHtf+JqCMeBVt+ rakpQ6bu4yDz1/WIdBaTNj0Rx9c4Etx6lD3Z2ePa18kgGiwgTOvhDcyHqiKw6a8kTNYQ hbd5OK3kis75IRroMl0ZGECo+plL5adcnGUleoJnEVRxlFHuEi/yOapgrVllsOC4V5Ll DYhYe+GAOBOSzwB3KrrV9+Q9c/10xP6hNOZhUytq/cDr9oCkW0UOYZBu1dsIuCg4ZvRP 51Ww== X-Forwarded-Encrypted: i=1; AJvYcCX56llbVCUTH3lHSgDkjt3cfVTaulhwczGotmU7jh7l06bRWmhKu/Fn3M7JoUNhm2guYmcgi73DGE/mw0unDfMPM4dRbw==@freebsd.org X-Gm-Message-State: AOJu0YwYOaLermAadr2cu/5x5GKwrVfysmMOIql7on4WGZq5In9nQwJ/ NFXc9dHbZ48vFUBLQTr9x8qnobVCOkAUpTmJ/GE8g7ey0s6M20HPtrcJrXYgno6b4d5qVgabmfX AfLTK8kc7gNf5eQwYofPA6GTW8OA82HEx4JrmDg== X-Google-Smtp-Source: AGHT+IFqC/zoc+dyHRcP1E9JR5vtWhunFMT8yfqlCI8+95VeJSdhXm2uz41SWWm1cF9wtGT0Hj0r00+VXlKyASC7UjA= X-Received: by 2002:a05:6a21:150c:b0:1d9:2453:4343 with SMTP id adf61e73a8af0-1d9245346aemr2843211637.41.1729191372434; Thu, 17 Oct 2024 11:56:12 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202410122058.49CKwkrP038188@gitrepo.freebsd.org> <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org> In-Reply-To: <8549EB6C-DB57-4ECC-8020-C799F9789D5F@freebsd.org> From: Warner Losh Date: Thu, 17 Oct 2024 12:56:00 -0600 Message-ID: Subject: Re: git: 1a37caeb076b - main - modules: Add missing opt_*.h files for stand-alone compile To: Jessica Clarke Cc: Wolfram Schneider , Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000080cc240624b0bdcc" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4XTxrG2pMZz4Prb X-Spamd-Bar: ---- --00000000000080cc240624b0bdcc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Oct 17, 2024 at 12:26=E2=80=AFPM Jessica Clarke wrote: > On 17 Oct 2024, at 19:20, Warner Losh wrote: > > > > > > > > On Thu, Oct 17, 2024, 11:29=E2=80=AFAM Wolfram Schneider > wrote: > >> On Sat, 12 Oct 2024 at 22:58, Warner Losh wrote: > >> > > >> > The branch main has been updated by imp: > >> > > >> > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D1a37caeb076b9d31e13c54691d7f1ee= b589798bb > >> > > >> > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb > >> > Author: Warner Losh > >> > AuthorDate: 2024-10-12 20:40:41 +0000 > >> > Commit: Warner Losh > >> > CommitDate: 2024-10-12 20:40:41 +0000 > >> > > >> > modules: Add missing opt_*.h files for stand-alone compile > >> > > >> > Standalone compile that we at least create these opt_*.h files. > >> > > >> > Sponsored by: Netflix > >> > --- > >> > sys/modules/linux/Makefile | 2 ++ > >> > sys/modules/linux64/Makefile | 5 ++++- > >> > 2 files changed, 6 insertions(+), 1 deletion(-) > >> > > >> > diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile > >> > index eb4e17ec706b..36dfbbe2192f 100644 > >> > --- a/sys/modules/linux/Makefile > >> > +++ b/sys/modules/linux/Makefile > >> > @@ -33,6 +33,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \ > >> > linux_uid16.c \ > >> > linux_vdso.c \ > >> > linux_xattr.c \ > >> > + opt_compat.h \ > >> > opt_inet.h \ > >> > opt_inet6.h \ > >> > opt_ktrace.h \ > >> > @@ -41,6 +42,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \ > >> > bus_if.h \ > >> > device_if.h \ > >> > vnode_if.h > >> > + > >> > .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "= amd64" > >> > SRCS+=3D linux_dummy_x86.c > >> > VDSODEPS=3Dlinux_vdso_gettc_x86.inc > >> > diff --git a/sys/modules/linux64/Makefile > b/sys/modules/linux64/Makefile > >> > index b23891a65a4f..119d90126ab3 100644 > >> > --- a/sys/modules/linux64/Makefile > >> > +++ b/sys/modules/linux64/Makefile > >> > @@ -28,14 +28,17 @@ SRCS=3D linux_dummy_machdep.c \ > >> > linux_vdso.c \ > >> > linux_timer.c \ > >> > linux_xattr.c \ > >> > - opt_ktrace.h \ > >> > + opt_compat.h \ > >> > opt_inet6.h \ > >> > + opt_ktrace.h \ > >> > opt_posix.h \ > >> > + opt_usb.h \ > >> > bus_if.h \ > >> > device_if.h \ > >> > vnode_if.h \ > >> > linux_support.S \ > >> > linux_vdso_inc.S > >> > + > >> > .if ${MACHINE_CPUARCH} =3D=3D "amd64" > >> > SRCS+=3D linux_dummy_x86.c > >> > .endif > >> > >> After this commit I get stale symlinks in /usr/obj > >> > >> make -j$(nproc) buildworld > log.buildworld 2>&1; make -j$(nproc) > >> buildkernel >& log.buildkernel; > >> ./tools/build/stale-symlink-buildworld.sh > >> > >> amd64: > >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 > >> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sy= s/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/opt_com= pat.h > >> -> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sy= s/GENERIC/opt_compat.h > >> > >> stale symlink detected: lrwxrwxr-x 1 wosch wheel 95 Oct 17 17:00 > >> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sy= s/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux64/opt_c= ompat.h > >> -> > /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.amd64/sy= s/GENERIC/opt_compat.h > >> > >> arm64: > >> stale symlink detected: lrwxr-xr-x 1 root wheel 73 Oct 17 17:18 > >> > /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modules/home= /projects/freebsd-src/sys/modules/linux64/opt_compat.h > >> -> > /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/opt_compat.h > >> > >> see also PR: 276235 > > > > The symlinks look right to me. What makes them stale? > > Given the script does find -H -type l, it=E2=80=99ll be that they point t= o > non-existent files. I don=E2=80=99t know what opt_compat.h is for Netflix= but > there=E2=80=99s no such thing in-tree, these are the only references to i= t. > Ah, but there use to be... I rebased a tree that had a number of similar cleanups across its removal and didn't notice. And my checks of my tree turned that file up, but I didn't notice it was in a tree I'd not built out of since before the change: commit 06c07e1203324bfe8ab4526c82dbb750864272d5 Author: Dmitry Chagin Date: Mon Feb 13 19:07:38 2023 +0300 Complete removal of opt_compat.h Since Linux emulation layer build options was removed there is no reaso= n to keep opt_compat.h. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38548 MFC after: 2 weeks So I've reverted since opt_usb.h was also removed from linuxulator. Warner --00000000000080cc240624b0bdcc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Oct 17, 2024 at 12:26=E2=80= =AFPM Jessica Clarke <jrtc27@freeb= sd.org> wrote:
On 17 Oct 2024, at 19:20, Warner Losh <imp@bsdimp.com> wrote:
>
>
>
> On Thu, Oct 17, 2024, 11:29=E2=80=AFAM Wolfram Schneider <wosch@freebsd.org> w= rote:
>> On Sat, 12 Oct 2024 at 22:58, Warner Losh <imp@freebsd.org> wrote:
>> >
>> > The branch main has been updated by imp:
>> >
>> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1a37caeb076b9d31e13c54691d7f1eeb= 589798bb
>> >
>> > commit 1a37caeb076b9d31e13c54691d7f1eeb589798bb
>> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > AuthorDate: 2024-10-12 20:40:41 +0000
>> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
>> > CommitDate: 2024-10-12 20:40:41 +0000
>> >
>> >=C2=A0 =C2=A0 =C2=A0modules: Add missing opt_*.h files for sta= nd-alone compile
>> >
>> >=C2=A0 =C2=A0 =C2=A0Standalone compile that we at least create= these opt_*.h files.
>> >
>> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0Netflix
>> > ---
>> >=C2=A0 sys/modules/linux/Makefile=C2=A0 =C2=A0| 2 ++
>> >=C2=A0 sys/modules/linux64/Makefile | 5 ++++-
>> >=C2=A0 2 files changed, 6 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/M= akefile
>> > index eb4e17ec706b..36dfbbe2192f 100644
>> > --- a/sys/modules/linux/Makefile
>> > +++ b/sys/modules/linux/Makefile
>> > @@ -33,6 +33,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_uid16.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_xattr.c \
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_compat.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet6.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
>> > @@ -41,6 +42,7 @@ SRCS=3D linux${SFX}_dummy_machdep.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bus_if.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_if.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vnode_if.h
>> > +
>> >=C2=A0 .if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MAC= HINE_CPUARCH} =3D=3D "amd64"
>> >=C2=A0 SRCS+=3D linux_dummy_x86.c
>> >=C2=A0 VDSODEPS=3Dlinux_vdso_gettc_x86.inc
>> > diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux= 64/Makefile
>> > index b23891a65a4f..119d90126ab3 100644
>> > --- a/sys/modules/linux64/Makefile
>> > +++ b/sys/modules/linux64/Makefile
>> > @@ -28,14 +28,17 @@ SRCS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0linux_d= ummy_machdep.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_timer.c \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_xattr.c \
>> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_compat.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_inet6.h \
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_ktrace.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0opt_posix.h \
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0opt_usb.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0bus_if.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_if.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vnode_if.h \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_support.S \
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0linux_vdso_inc.S
>> > +
>> >=C2=A0 .if ${MACHINE_CPUARCH} =3D=3D "amd64"
>> >=C2=A0 SRCS+=3D linux_dummy_x86.c
>> >=C2=A0 .endif
>>
>> After this commit I get stale symlinks in /usr/obj
>>
>> make -j$(nproc) buildworld=C2=A0 > log.buildworld 2>&1; = make -j$(nproc)
>> buildkernel >& log.buildkernel;
>> ./tools/build/stale-symlink-buildworld.sh
>>
>> amd64:
>> stale symlink detected: lrwxrwxr-x=C2=A0 1 wosch wheel 95 Oct 17 1= 7:00
>> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.a= md64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux/= opt_compat.h
>> -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/a= md64.amd64/sys/GENERIC/opt_compat.h
>>
>> stale symlink detected: lrwxrwxr-x=C2=A0 1 wosch wheel 95 Oct 17 1= 7:00
>> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/amd64.a= md64/sys/GENERIC/modules/home/wosch/projects/freebsd-src/sys/modules/linux6= 4/opt_compat.h
>> -> /scratch/tmp/wosch/freebsd/home/wosch/projects/freebsd-src/a= md64.amd64/sys/GENERIC/opt_compat.h
>>
>> arm64:
>> stale symlink detected: lrwxr-xr-x=C2=A0 1 root wheel 73 Oct 17 17= :18
>> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC/modul= es/home/projects/freebsd-src/sys/modules/linux64/opt_compat.h
>> -> /usr/obj/home/projects/freebsd-src/arm64.aarch64/sys/GENERIC= /opt_compat.h
>>
>> see also PR: 276235
>
> The symlinks look right to me. What makes them stale?

Given the script does find -H -type l, it=E2=80=99ll be that they point to<= br> non-existent files. I don=E2=80=99t know what opt_compat.h is for Netflix b= ut
there=E2=80=99s no such thing in-tree, these are the only references to it.=

Ah, but there use to be...=C2=A0 I reb= ased a tree that had a number of similar cleanups across
its remo= val and didn't notice. And my checks of my tree turned that file up, bu= t I didn't
notice it was in a tree I'd not built out of s= ince before the change:

commit 06c07e1203324bfe8ab= 4526c82dbb750864272d5
Author: Dmitry Chagin <dchagin@FreeBSD.org><= br>Date: =C2=A0 Mon Feb 13 19:07:38 2023 +0300

=C2=A0 =C2=A0 Complet= e removal of opt_compat.h

=C2=A0 =C2=A0 Since Linux emulation layer = build options was removed there is no reason
=C2=A0 =C2=A0 to keep opt_c= ompat.h.

=C2=A0 =C2=A0 Reviewed by: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0emaste
=C2=A0 =C2=A0 Differential Revision: =C2=A0https://reviews.freebsd.org/D38548=C2=A0 =C2=A0 MFC after: =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= 2 weeks

So I've reverted since opt_usb.h w= as also removed from linuxulator.

Warner
--00000000000080cc240624b0bdcc--