From nobody Sun Jul 9 00:18:02 2023 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 4Qz75M3yztz4mDmW for ; Sun, 9 Jul 2023 00:18:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qz75M2FYkz4J3Z for ; Sun, 9 Jul 2023 00:18:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-3fc0aecf107so4106905e9.2 for ; Sat, 08 Jul 2023 17:18:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688861893; x=1691453893; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DNr6UYmpeozju2aV5dEP1Cd/L8HwhjJU/A/u1YO3yOM=; b=Ui+3T/e2tJ4+mxVCvGJ5vKbcl932l3NWzHGcpVIg5ONBzN7674Ckms5aWnHqLpIspY KUFxupWBVJj1BEePlpsDuMZ64jZMpb39YmAGHabz0ML7wMKr7iDb+elnB/zE8pvjOyVX WUpeUbCb7rP3f/zrM+x0yQZFr1yEpNrBJ0qwpOQExNwwMK+poUihZwwdGzdZ2CrBDj7N /+QknsSpmjnyP4efM3gV6IAV/qrGnC5reoB9Q9Qb1KvqldjAEP8nDUO4W0rW8W13SbJI q0Dt64BPclmd09w7F7Tm07nYVX5U+VQJ0EnfE+Y917p1hYfzeuZH2sgxDBChGAYAq9+8 YiWg== X-Gm-Message-State: ABy/qLbsG9cylxEP3pRtI3BWbnrxuPLIdeD/Svu1b84GgemSo/TPyqkj uW3GF12nduQUO79aOMqlK+oXww== X-Google-Smtp-Source: APBJJlGB77Jqk5dWc+2OF15A94q7bQFnczjdfFA+fq1G5x31o+AUJe3OWAOCO7hcJCGOYjB6KRDnJg== X-Received: by 2002:a7b:c3d5:0:b0:3f6:91c:4e86 with SMTP id t21-20020a7bc3d5000000b003f6091c4e86mr6534043wmj.3.1688861893422; Sat, 08 Jul 2023 17:18:13 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id t22-20020a7bc3d6000000b003fc02218d6csm4020124wmj.25.2023.07.08.17.18.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jul 2023 17:18:12 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: e64780fbc394 - main - xinstall: do not use copy_file_range(2) when BOOTSTRAPPING From: Jessica Clarke In-Reply-To: <202307082348.368Nm3TN074666@gitrepo.freebsd.org> Date: Sun, 9 Jul 2023 01:18:02 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <471FD215-B307-4116-9E92-4D84D6FB2B66@freebsd.org> References: <202307082348.368Nm3TN074666@gitrepo.freebsd.org> To: Martin Matuska X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4Qz75M2FYkz4J3Z X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 9 Jul 2023, at 00:48, Martin Matuska wrote: >=20 > The branch main has been updated by mm: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3De64780fbc394b10581e50a850cc06c1c= 12a8e4f9 >=20 > commit e64780fbc394b10581e50a850cc06c1c12a8e4f9 > Author: Martin Matuska > AuthorDate: 2023-07-08 23:24:38 +0000 > Commit: Martin Matuska > CommitDate: 2023-07-08 23:25:23 +0000 >=20 > xinstall: do not use copy_file_range(2) when BOOTSTRAPPING >=20 > Reported by: arichardson > --- > usr.bin/xinstall/Makefile | 5 +++++ > usr.bin/xinstall/xinstall.c | 4 ++++ > 2 files changed, 9 insertions(+) >=20 > diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile > index 9969ef104e98..3b49cb39d27a 100644 > --- a/usr.bin/xinstall/Makefile > +++ b/usr.bin/xinstall/Makefile > @@ -17,6 +17,11 @@ CFLAGS+=3D -I${SRCTOP}/lib/libnetbsd > LIBADD=3D md > CFLAGS+=3D -DWITH_MD5 -DWITH_RIPEMD160 >=20 > +.ifdef BOOTSTRAPPING > +# For the bootstrap we disable copy_file_range() > +CFLAGS+=3D -DBOOTSTRAP_XINSTALL If the bootstrap xinstall is allowed to use copy_file_range on FreeBSD (i.e. it=E2=80=99s guaranteed to exist) this is overly restrictive and = should be: .if defined(BOOTSTRAPPING) && ${.MAKE.OS} !=3D "FreeBSD" > +.endif > + > HAS_TESTS=3D > SUBDIR.${MK_TESTS}+=3D tests >=20 > diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c > index 8dace862ef1e..6c269bbb5d91 100644 > --- a/usr.bin/xinstall/xinstall.c > +++ b/usr.bin/xinstall/xinstall.c > @@ -1300,7 +1300,9 @@ copy(int from_fd, const char *from_name, int = to_fd, const char *to_name, > static size_t bufsize; > int nr, nw; > int serrno; > +#ifndef BOOTSTRAP_XINSTALL > ssize_t ret; > +#endif > char *p; > int done_copy; > DIGEST_CTX ctx; > @@ -1311,6 +1313,7 @@ copy(int from_fd, const char *from_name, int = to_fd, const char *to_name, > if (lseek(to_fd, (off_t)0, SEEK_SET) =3D=3D (off_t)-1) > err(EX_OSERR, "lseek: %s", to_name); >=20 > +#ifndef BOOTSTRAP_XINSTALL > /* Try copy_file_range() if no digest is requested */ > if (digesttype =3D=3D DIGEST_NONE) { > ret =3D 1; > @@ -1331,6 +1334,7 @@ copy(int from_fd, const char *from_name, int = to_fd, const char *to_name, > /* Fall back */ > } >=20 > +#endif This looks to be in the wrong place wrt whitespace? Jess > digest_init(&ctx); >=20 > done_copy =3D 0; From nobody Sun Jul 9 00:29:40 2023 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 4Qz7Ln3Zrhz4mHMg; Sun, 9 Jul 2023 00:29:53 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qz7Ln1y60z4KqW; Sun, 9 Jul 2023 00:29:53 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ua1-f53.google.com with SMTP id a1e0cc1a2514c-783eef15004so894644241.3; Sat, 08 Jul 2023 17:29:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688862592; x=1691454592; 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=SEofZSY1SqM4g0GJuFpWDRnQR2ZvGeZt0RlSkyzOwrM=; b=a0JMN3Q97GJT5daK7+6Oj0FUFEICMGNY2u6P1Mf+EdUOQ5EvDWoQe5E0b3Ihm7NK6b /z0XfYh7VDQbwPTalpCts0DXj/DuMAyeAdF6XSS2dpgnSC7lMNbDE8RdoSmpVhd75vFd k+52j0+Y1/n7Bu3zQn27IYnKKY6oJ/ARwb1TSdcl85VZLCu1JJNtykbJRm0Pl5Ebnuxs KK+nOXxDI6jhrDsdql4xV9Y0XZgtxLLiwQAKdr1GKtiKHHUr5o56yURHfqoOjImlw88g +LzXLjVDEACT24LswvlttXMzRFyzSG3brkP+jyHsmBgseQ2j5GVML/YGE0e0pyXLFDj1 e9Pg== X-Gm-Message-State: ABy/qLZMTVkSYqB6cZlwgrwPmn8yx7FUvnWzvZhJVu9YNZGL0wlmkvbU p5O3OiraIKuVNQByBvTgzOuhg+bpCOA= X-Google-Smtp-Source: APBJJlH+FyIsbTS9l79DQUCdTMTLRlzcujWpvB2ekTXbcLr/NKbV3/13WBx4FROXzbS/1l0uGgg41w== X-Received: by 2002:a1f:5e4c:0:b0:47e:5744:21c5 with SMTP id s73-20020a1f5e4c000000b0047e574421c5mr2788495vkb.16.1688862592148; Sat, 08 Jul 2023 17:29:52 -0700 (PDT) Received: from mail-ua1-f41.google.com (mail-ua1-f41.google.com. [209.85.222.41]) by smtp.gmail.com with ESMTPSA id q22-20020a056122005600b00477429dda11sm694025vkn.55.2023.07.08.17.29.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jul 2023 17:29:51 -0700 (PDT) Received: by mail-ua1-f41.google.com with SMTP id a1e0cc1a2514c-7919342c456so894887241.2; Sat, 08 Jul 2023 17:29:51 -0700 (PDT) X-Received: by 2002:a1f:d0c2:0:b0:471:7d9d:99d5 with SMTP id h185-20020a1fd0c2000000b004717d9d99d5mr3253820vkg.5.1688862591522; Sat, 08 Jul 2023 17:29:51 -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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202307082348.368Nm3TN074666@gitrepo.freebsd.org> <471FD215-B307-4116-9E92-4D84D6FB2B66@freebsd.org> In-Reply-To: <471FD215-B307-4116-9E92-4D84D6FB2B66@freebsd.org> From: Alexander Richardson Date: Sat, 8 Jul 2023 17:29:40 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: e64780fbc394 - main - xinstall: do not use copy_file_range(2) when BOOTSTRAPPING To: Jessica Clarke Cc: Martin Matuska , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d7a004060002f6da" X-Rspamd-Queue-Id: 4Qz7Ln1y60z4KqW X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000d7a004060002f6da Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks for the quick fix. I'm not sure if it matters for performance but it is a bit too restrictive: modern Linux also has the function so it works just fine there (GitHub CI was happy with this commit on Linux just not MacOS). And as Jess pointed out we should probably use it on FreeBSD as well. Alex On Sat, 8 Jul 2023, 17:18 Jessica Clarke, wrote: > On 9 Jul 2023, at 00:48, Martin Matuska wrote: > > > > The branch main has been updated by mm: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3De64780fbc394b10581e50a850cc06c1= c12a8e4f9 > > > > commit e64780fbc394b10581e50a850cc06c1c12a8e4f9 > > Author: Martin Matuska > > AuthorDate: 2023-07-08 23:24:38 +0000 > > Commit: Martin Matuska > > CommitDate: 2023-07-08 23:25:23 +0000 > > > > xinstall: do not use copy_file_range(2) when BOOTSTRAPPING > > > > Reported by: arichardson > > --- > > usr.bin/xinstall/Makefile | 5 +++++ > > usr.bin/xinstall/xinstall.c | 4 ++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile > > index 9969ef104e98..3b49cb39d27a 100644 > > --- a/usr.bin/xinstall/Makefile > > +++ b/usr.bin/xinstall/Makefile > > @@ -17,6 +17,11 @@ CFLAGS+=3D -I${SRCTOP}/lib/libnetbsd > > LIBADD=3D md > > CFLAGS+=3D -DWITH_MD5 -DWITH_RIPEMD160 > > > > +.ifdef BOOTSTRAPPING > > +# For the bootstrap we disable copy_file_range() > > +CFLAGS+=3D -DBOOTSTRAP_XINSTALL > > If the bootstrap xinstall is allowed to use copy_file_range on FreeBSD > (i.e. it=E2=80=99s guaranteed to exist) this is overly restrictive and sh= ould > be: > > .if defined(BOOTSTRAPPING) && ${.MAKE.OS} !=3D "FreeBSD" > > > +.endif > > + > > HAS_TESTS=3D > > SUBDIR.${MK_TESTS}+=3D tests > > > > diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c > > index 8dace862ef1e..6c269bbb5d91 100644 > > --- a/usr.bin/xinstall/xinstall.c > > +++ b/usr.bin/xinstall/xinstall.c > > @@ -1300,7 +1300,9 @@ copy(int from_fd, const char *from_name, int > to_fd, const char *to_name, > > static size_t bufsize; > > int nr, nw; > > int serrno; > > +#ifndef BOOTSTRAP_XINSTALL > > ssize_t ret; > > +#endif > > char *p; > > int done_copy; > > DIGEST_CTX ctx; > > @@ -1311,6 +1313,7 @@ copy(int from_fd, const char *from_name, int > to_fd, const char *to_name, > > if (lseek(to_fd, (off_t)0, SEEK_SET) =3D=3D (off_t)-1) > > err(EX_OSERR, "lseek: %s", to_name); > > > > +#ifndef BOOTSTRAP_XINSTALL > > /* Try copy_file_range() if no digest is requested */ > > if (digesttype =3D=3D DIGEST_NONE) { > > ret =3D 1; > > @@ -1331,6 +1334,7 @@ copy(int from_fd, const char *from_name, int > to_fd, const char *to_name, > > /* Fall back */ > > } > > > > +#endif > > This looks to be in the wrong place wrt whitespace? > > Jess > > > digest_init(&ctx); > > > > done_copy =3D 0; > > --000000000000d7a004060002f6da Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks for the quick fix. I'm not sure if it mat= ters for performance but it is a bit too restrictive: modern Linux also has= the function so it works just fine there (GitHub CI was happy with this co= mmit on Linux just not MacOS). And as Jess pointed out we should probably u= se it on FreeBSD as well.

Alex=


On Sat, 8 Jul 2023, 17:18 Jessica Clarke, <jrtc27@freebsd.org> wrote:
On 9 Jul 2023, at 00:48, Martin Matuska <mm@FreeBSD.org>= ; wrote:
>
> The branch main has been updated by mm:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3De64780fbc394b10581e50a850cc06c= 1c12a8e4f9
>
> commit e64780fbc394b10581e50a850cc06c1c12a8e4f9
> Author:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org>
> AuthorDate: 2023-07-08 23:24:38 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Martin Matuska <mm@FreeBSD.org>
> CommitDate: 2023-07-08 23:25:23 +0000
>
>=C2=A0 =C2=A0 xinstall: do not use copy_file_range(2) when BOOTSTRAPPIN= G
>
>=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 arichardson
> ---
> usr.bin/xinstall/Makefile=C2=A0 =C2=A0| 5 +++++
> usr.bin/xinstall/xinstall.c | 4 ++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
> index 9969ef104e98..3b49cb39d27a 100644
> --- a/usr.bin/xinstall/Makefile
> +++ b/usr.bin/xinstall/Makefile
> @@ -17,6 +17,11 @@ CFLAGS+=3D -I${SRCTOP}/lib/libnetbsd
> LIBADD=3D md
> CFLAGS+=3D -DWITH_MD5 -DWITH_RIPEMD160
>
> +.ifdef BOOTSTRAPPING
> +# For the bootstrap we disable copy_file_range()
> +CFLAGS+=3D -DBOOTSTRAP_XINSTALL

If the bootstrap xinstall is allowed to use copy_file_range on FreeBSD
(i.e. it=E2=80=99s guaranteed to exist) this is overly restrictive and shou= ld
be:

.if defined(BOOTSTRAPPING) && ${.MAKE.OS} !=3D "FreeBSD"<= br>
> +.endif
> +
> HAS_TESTS=3D
> SUBDIR.${MK_TESTS}+=3D tests
>
> diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c=
> index 8dace862ef1e..6c269bbb5d91 100644
> --- a/usr.bin/xinstall/xinstall.c
> +++ b/usr.bin/xinstall/xinstall.c
> @@ -1300,7 +1300,9 @@ copy(int from_fd, const char *from_name, int to_= fd, const char *to_name,
> static size_t bufsize;
> int nr, nw;
> int serrno;
> +#ifndef BOOTSTRAP_XINSTALL
> ssize_t ret;
> +#endif
> char *p;
> int done_copy;
> DIGEST_CTX ctx;
> @@ -1311,6 +1313,7 @@ copy(int from_fd, const char *from_name, int to_= fd, const char *to_name,
> if (lseek(to_fd, (off_t)0, SEEK_SET) =3D=3D (off_t)-1)
> err(EX_OSERR, "lseek: %s", to_name);
>
> +#ifndef BOOTSTRAP_XINSTALL
> /* Try copy_file_range() if no digest is requested */
> if (digesttype =3D=3D DIGEST_NONE) {
> ret =3D 1;
> @@ -1331,6 +1334,7 @@ copy(int from_fd, const char *from_name, int to_= fd, const char *to_name,
> /* Fall back */
> }
>
> +#endif

This looks to be in the wrong place wrt whitespace?

Jess

> digest_init(&ctx);
>
> done_copy =3D 0;

--000000000000d7a004060002f6da-- From nobody Sun Jul 9 10:26:05 2023 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 4QzNZk1PlKz4lgkN; Sun, 9 Jul 2023 10:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzNZk0zVxz3rjJ; Sun, 9 Jul 2023 10:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688898366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+va+ZhyVvCbNYLkKfBYYEqgh/pgzXGtuit4qs9/2JE=; b=IE9oNEvTNgBEhJwNDqzLGJe9zj+WGFUHBR7KMwtqum+2Yt5XDZ9vBtWC5wC/qkWyilMhqC GW7eqG6RYHh/JOw0d1kE4nWkyb/e4MxdvDyizkISWmBxCn0nx4OUBWdUSKVzT2ydLb29Rm aDuiZNDxoO6EM4hvysuiVTTXLOlNNu/dRGDJi7GxOkTOzAio7bAgs5JwUQaoFAM7KgNqgV qsEO93l1IDivedzNxCS6fZIWZXngsTLJdWmIHySFc4GtJWGljSqYMxCQj4NMbts5u6XhRI FwdI+qgMMBnW0gnGHku/lrcFtHSgXdDYb2guPLSdXUt34CYaHkWr4BXbIQesQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688898366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+va+ZhyVvCbNYLkKfBYYEqgh/pgzXGtuit4qs9/2JE=; b=AIStljhOOqwVyHO3yiSh2wGR8NTfY1Nv9jXiFrJmaCsoaaDWn/CrkOcVNvw6uzqbwrTCM0 cVf1LzFLbHvl5XxIBwEt7V/AM+wHR2QUCsXgeCLGLsbhMMpDvJo9S/IhVJEDnYMNfW16FW DHleeYy45xPCBXJEWsJf18jeBEnb68TrQen8KgbWS4HFX2FHhHLCY2mGxt6mqBhzegsaZY RRwPKiuBcieXC1IMVG4HVgHql20Kgqr92wB7SSTo0pwpEoPtFiPG9j5YbBw6A9BZaExvUQ Osx0cIzyR1xJf9KN/pdclF879igNY1YhXh9xeIFNE9l+IY0uHsiX/fOgpFVMIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688898366; a=rsa-sha256; cv=none; b=YhV3STstWLaX17lNUy1GzoTEoxb2ITGVAUivyUUPRu6trbF09tHY8wBTT69U+nuYjGb17k ilfFhq66Spm5HLObY1oA2OYjnlHN/iZdpU0e6rZrqhxGYFbqvPUwxEEhI5dmAV8ph7MuAC WS88NKNqimFspBdHGBeOoHQsgNnp4QO5ezRKj02lw2je17h5c9SPqBbYtopPofb4Cj6ZIp FAtV30PYSTipPgEM8ZKbsOxwsoFtAx9Uf505vze9EPy1Gkb3Nyouyb7VyyX89OpJ6PeIbP SCwAJYJttmgYbHXkQi2UGik/wU1kgbAvE+Ul1D3zosV6CF2GDDOBVOA8F1SGxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzNZk056Rz10Cl; Sun, 9 Jul 2023 10:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AQ5oJ033477; Sun, 9 Jul 2023 10:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AQ5nL033476; Sun, 9 Jul 2023 10:26:05 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:26:05 GMT Message-Id: <202307091026.369AQ5nL033476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christian Brueffer Subject: git: d32210ef16ab - main - ath10k.4: mdoc cleanup 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brueffer X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d32210ef16ab95ce65c2fd0a3bd4a8a99d8250b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brueffer: URL: https://cgit.FreeBSD.org/src/commit/?id=d32210ef16ab95ce65c2fd0a3bd4a8a99d8250b5 commit d32210ef16ab95ce65c2fd0a3bd4a8a99d8250b5 Author: Christian Brueffer AuthorDate: 2023-07-09 10:23:58 +0000 Commit: Christian Brueffer CommitDate: 2023-07-09 10:25:57 +0000 ath10k.4: mdoc cleanup --- share/man/man4/ath10k.4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man4/ath10k.4 b/share/man/man4/ath10k.4 index a88a460c811b..e3f0d902a157 100644 --- a/share/man/man4/ath10k.4 +++ b/share/man/man4/ath10k.4 @@ -62,7 +62,6 @@ provides support for the following PCI chipsets: .It QCA99X0 .El .Pp -.Pp This driver requires firmware to be loaded before it will work. The package .Pa wifi-firmware-ath10k-kmod @@ -90,8 +89,6 @@ While supports all 802.11 a/b/g/n and ac the compatibility code currently only supports 802.11 a/b/g modes. Support for 802.11 n/ac is to come. -.Sh BUGS -Certainly. .Sh SEE ALSO .Xr wlan 4 , .Xr ifconfig 8 , @@ -101,3 +98,5 @@ The .Nm driver first appeared in .Fx 14.0 . +.Sh BUGS +Certainly. From nobody Sun Jul 9 10:52:18 2023 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 4QzP8z0tSvz4lqNS; Sun, 9 Jul 2023 10:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzP8z0Gs4z3j53; Sun, 9 Jul 2023 10:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqvZR8QrCJsgp7tR8dYUJQH9Eu1ofgHOt7g/DZ8aNvc=; b=qzcUOsKhGCirvHtHbkjwDFVAtNYjXgvgnG+kIqJO7dIwUokjR8sdLcJhx1pJG/FQfSgc3X 4SXssoxTTidb0joEXNY3WywvmcPv33hJY0Vfca+kF282UK0dKsMHR23rlROaO+pfBO8GuV r6vWX+FZCvF/UXuzSzLzSQwjkrup5Asgv29/QQhcgCF6xCpj4tlcEWBt6uYU6AT+vtVFoY Fw8F6xtwqQ7Q7itG2pmBYtakPZNbc6ld9ddCmdtApEvYDJ5mvWlN2IH8k6s0TEoUo3tFc2 MOkdzjCxY7ErBGcSOFbbLfTcBOlfrexb1lIyRx5N7LoECs9bmXsxJLW9v874AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688899939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sqvZR8QrCJsgp7tR8dYUJQH9Eu1ofgHOt7g/DZ8aNvc=; b=iJA9Zw5bQf4AM4TAqHAl4WCUkGeoGFmwJXr+IImrLZoB/gdL89cEE6NltDWMnzQp4ZkB82 OQ3WzdHNvy7rltBOsbPa7SPOXD68Y39vLhVCBFBYW7/+VS20+QsRZ5oRP3nWjE+qENfPSx 4UMnssrHzGrtjsHroHXA99j51iukak+I+XYDtbPZFr8+jEE4gvuoN0BkPtk1uszVr9mhQX nt8bSMaKQF/tyWdMEP6AtXr4nIrwOwAMvsHBfBWNRxgIFMgNVGyDX+Vl5F7xRlaqXinmG4 R7p0FCfi6mJhK/Q4imq/Dy/Ul1fhnB0UWRKD7TKB3LP/j3XjMFn2un26lwq2lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688899939; a=rsa-sha256; cv=none; b=rvKE9bYBpmU6znx3RjyiaRIK0VWQgdD0dG2tH497Nn+Ixq6aulc6/ARu8nVRgLUInMZFxl rDZg0YJKEea1WCU4Qk2Vzvw/Iu5xdePbwCvqZI4MNdaej5Qvl1Pp76eLozzOuzBoMHmoz7 xXakxP3vxo9iq3lNOwRMNvRmjBsqlrBv7MfrzlnTVyw33NL4LOGqclRGPvHu2oSNuG6aZj b0VaEBkDqyJ2GB9QFOvNE2cADxqz0Xiu+RnqkhjVgDRYpkdVcWKQ4zC66XarE3XiZfTmYc 8x5h8ihY1oJZ1TqUy7U/6k4wqEUE5TaRvEFbUw+Xxe22WpTaDDG/q3VuFhCVew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzP8y6SPLz10nM; Sun, 9 Jul 2023 10:52:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369AqIeB002531; Sun, 9 Jul 2023 10:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369AqIF3002530; Sun, 9 Jul 2023 10:52:18 GMT (envelope-from git) Date: Sun, 9 Jul 2023 10:52:18 GMT Message-Id: <202307091052.369AqIF3002530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christian Brueffer Subject: git: acb3e99faa03 - main - superio.4: mdoc cleanup 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brueffer X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acb3e99faa038d5464616f936edc666d726fd1ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brueffer: URL: https://cgit.FreeBSD.org/src/commit/?id=acb3e99faa038d5464616f936edc666d726fd1ad commit acb3e99faa038d5464616f936edc666d726fd1ad Author: Christian Brueffer AuthorDate: 2023-07-09 10:51:16 +0000 Commit: Christian Brueffer CommitDate: 2023-07-09 10:51:16 +0000 superio.4: mdoc cleanup --- share/man/man4/superio.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man4/superio.4 b/share/man/man4/superio.4 index 2608f5331b05..d1127e496da4 100644 --- a/share/man/man4/superio.4 +++ b/share/man/man4/superio.4 @@ -50,6 +50,7 @@ superio_load="YES" Super I/O is an I/O controller that combines various low-bandwidth devices that can be functionally unrelated otherwise. A typical Super I/O can contain devices such as +.Pp .Bl -bullet -compact .It a floppy disk controller @@ -101,8 +102,8 @@ controllers and a bus driver for supported devices in those controllers. The .Nm driver supports a multitude of Super I/O controllers produced by Nuvoton, -formerly known as Winbond, and ITE. Namely: - +formerly known as Winbond, and ITE, namely: +.Pp .Bl -bullet -compact .It Fintek F81803 @@ -141,7 +142,6 @@ Winbond 83687THF .It Winbond 83697HF/UG .El - .Sh SEE ALSO .Xr superio 9 .Sh HISTORY From nobody Sun Jul 9 16:18:09 2023 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 4QzXNy0QDdz4m3WM; Sun, 9 Jul 2023 16:18:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzXNx5S4rz3HYj; Sun, 9 Jul 2023 16:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688919489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ijp7tWMIkHWV96pu57P4DqzWKr84c393k7wJrRZWweE=; b=xaz7mCH+IY6g4sxAVKbJiY8Ogw6qLElxkjnoA81lkQ4c5xJZ8a0CwHepcjyqoT8oeFgiEY i1+b5lhW4aVgww8EDaVjWTncpWo6ddhQJSeYcQtSyXjhYSCBjTJziimxurpVEmCYxuWnGe yOQ5Zl2/k3uIlfNVOLtZcV1NDMDnFA9wtSQ2hcdURWGB795GF+mVthgVUliLrbEKzMw2gI EptQLXknQXyI3Wx72CVdynBQmpVQB9llSSmte78NR2qrjYv+DAu7NnJt6ENz5t+KLiWS0+ s5E90is9xJrD2/EnlNZKiOO8PdQ1OTV11HPZT9Fb8Cb5fqh14G59KBfXpqNw9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688919489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ijp7tWMIkHWV96pu57P4DqzWKr84c393k7wJrRZWweE=; b=oa/N58DTCnUB5fax4mvp+wA0plN0XMqISbCeduAg5/vqghqCyHXQ4opyt5RfJQB9QnxeIs ADFcucjYULot8Sx6fb37o/0aB9QaskH0f5V0Zkbf9YFy2OvqtftH7ICWKz0YGUBaSJUPhJ f9mgcnsQay5Oamlax3FFNnwuExCRvJgVauKfviqb+Qt1Rrar8B+4FktMw7G8Hkr1HrhKwi jn7L4sF4vznBlUtPPYbKrpByAPXz59oxGcPkanmlxgdKE/k/S07N4EqiGRM8uVLtxNGWgL Ca6T3TODypPBUDue4R61MUrCZqw0N2bF1V897k0bVQUAFDdViR3sK6vhTF8lkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688919489; a=rsa-sha256; cv=none; b=kNDtB+VVFIEJRfb9huUcS/MmA6SGICyofSRU0zQ0VBzqiqxr1vEejUpj2fFofi5cObrOqF 2+dmJqF9NnJPSy0sfhRDplWdp8enRkyTnJgo4XDwaXF68WtdENfnyFKXsuS+8+Zm8NA0lN OvJU8fMRaErQvfSIsv+4L/8UCB6FcoNMYFKKMD5WxDSq8SMYCGKkjkQTTowxSea+kJWodJ Mm6zAtWFgsp08Bb7eRVKpu6INjJk81h9YD0/91pKgRsmU8IBD/NwIHdMeSOK9Bp2R4PDT/ 3APBJYAkNXZMvyzET7nbDA4lQ+kotXgNkM7lTW/EUFn4Wk4y0vqcP+WuXna93Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzXNx3vysz180C; Sun, 9 Jul 2023 16:18:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369GI9qs036947; Sun, 9 Jul 2023 16:18:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369GI9O5036946; Sun, 9 Jul 2023 16:18:09 GMT (envelope-from git) Date: Sun, 9 Jul 2023 16:18:09 GMT Message-Id: <202307091618.369GI9O5036946@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebd508a0b2719e15575e8a2224f0730c4d37afec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f0730c4d37afec commit ebd508a0b2719e15575e8a2224f0730c4d37afec Author: Kristof Provost AuthorDate: 2023-07-07 19:25:34 +0000 Commit: Kristof Provost CommitDate: 2023-07-09 13:18:21 +0000 openssl: include d2i_KeyParams() and d2i_KeyParams_bio() These functions are new, and some ports (e.g.opensc) expect to have them available. Add the file they're defined in to the build, and add them to Version.map. PR: 270076 Reviewed by: markj, emaste, pierre Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40914 --- secure/lib/libcrypto/Makefile | 4 ++-- secure/lib/libcrypto/Version.map | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 4421ea0b0855..89f330ca2800 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -69,8 +69,8 @@ SRCS+= a_int.c a_mbstr.c a_object.c a_octet.c a_print.c a_sign.c a_strex.c SRCS+= a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c a_verify.c SRCS+= ameth_lib.c asn1_err.c asn1_gen.c asn1_item_list.c asn1_lib.c SRCS+= asn1_parse.c asn_mime.c asn_moid.c asn_mstbl.c asn_pack.c bio_asn1.c -SRCS+= bio_ndef.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_string.c i2d_evp.c -SRCS+= n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c +SRCS+= bio_ndef.c d2i_param.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_string.c +SRCS+= i2d_evp.c n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c SRCS+= t_bitst.c t_pkey.c t_spki.c tasn_dec.c tasn_enc.c tasn_fre.c SRCS+= tasn_new.c tasn_prn.c tasn_scn.c tasn_typ.c tasn_utl.c x_algor.c SRCS+= x_bignum.c x_info.c x_int64.c x_long.c x_pkey.c x_sig.c x_spki.c diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version.map index 421819324961..93dbdcb7f1cb 100644 --- a/secure/lib/libcrypto/Version.map +++ b/secure/lib/libcrypto/Version.map @@ -5490,6 +5490,8 @@ OPENSSL_3_0_9 { b2i_PVK_bio_ex; d2i_AutoPrivateKey_ex; d2i_ISSUER_SIGN_TOOL; + d2i_KeyParams; + d2i_KeyParams_bio; d2i_OSSL_CMP_MSG; d2i_OSSL_CMP_MSG_bio; d2i_OSSL_CMP_PKIHEADER; From nobody Sun Jul 9 17:51:52 2023 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 4QzZT51gNtz4mVg4; Sun, 9 Jul 2023 17:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT517TGz3t6M; Sun, 9 Jul 2023 17:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0dCDHhzjNoQwDC57scgcYKXTub8GV/XxwKphmrxzkM=; b=cGckJLZ6FPfcwmFnpPkLYXZDQ2mE7wHtxw+waZ15FQmsWkfA73JklKTP5uBH+1pUR6X7UO 9jAk2F4rngJp6TltbeymYMz35u1ayVld7OC9jBuKgWLLxRPHkY/HKiIGER7CDsP5hObnRK 9ASmjUbidWnbaWruC76sW5aiy2ulmou7tmupMYdluY6pZ2FldNCJLAY/VjjNgaOh+TyUp7 leCFk/Sn/O7uq7hnT4F9fMabJm3Nq7X/uLtTh6ELyckR9DR0Y/VE/oGQQluAtjoCVDvOlc U1QWcAGOYQuTSheXv02onmWTz6VHacZueIjKpO8OHqoA4/7r0S54YgU9gdhIEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V0dCDHhzjNoQwDC57scgcYKXTub8GV/XxwKphmrxzkM=; b=RPWlV3hhsGkwTDdYv3fwvzmq0S90tHZ4sDgHY3Bmugb2P54t3+r42UgItw4OyoRIts8W6B ATsThqKTJh+2kcO1v8JXCs1srsynp1ZECI/8edWzYQ22P4mYmFv3vW/rH4/cRm23Vln8Rv RxG3w5ey3P1LkGen/hwK0wdF4+2R98rdswdp+REWwe40ZWEgmsJMb9VX4Bw8QXRS7pS1Zh 1ERawoAfcTVzHM/7mgQiCXOhiRrZeu6IR9wT5AB0EYUaedckC0ki662cIjW92/hZHIjQqO tg6bs7VqIXilrjHbqV2PZAp27vYfMjfbghZP+TEdwnRdkzugFh4q910xB5oyNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925113; a=rsa-sha256; cv=none; b=yz6UzuhxVpj8JSwCFivaomiEuhCzfl4Eb0Qn319accc8LK4p9CRRLIrFFl3GRbgOu23m98 p3+Z4yPgNrjsU8otof/xNRWd+jkNBetMiB8m+N3Bm32ojHEDLQMryTN59Iuc6RIQM7NvhD RjACWxRQnazi8cW/tXJ484asCSimjFvKksxPPLkZ9fET5I9GbcwjCQsAOXYSN1Zn46nSKa /Z3vur52/N4jdQ5fYHFeU7KkEo5n90PNIFsXU7O6NHuF6z5VGLUX31DIt8mU5VHwFZ5ZAo czUxfk1koVALqJm/4swmD38P25tgjj+OOIqz3Xe1q05RpP1+UBnc5cSbFx6+Gw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT50F3Bz1Bys; Sun, 9 Jul 2023 17:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HpqEk096327; Sun, 9 Jul 2023 17:51:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpqWH096326; Sun, 9 Jul 2023 17:51:52 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:52 GMT Message-Id: <202307091751.369HpqWH096326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3d96c005dd29 - main - libsysdecode: Drop dead __amd64__ && COMPAT_32BIT code 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d96c005dd29543ad5d882bf68b2e357ad46636e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3d96c005dd29543ad5d882bf68b2e357ad46636e commit 3d96c005dd29543ad5d882bf68b2e357ad46636e Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:23 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:23 +0000 libsysdecode: Drop dead __amd64__ && COMPAT_32BIT code Under COMPAT_32BIT we are compiling 32-bit code and so __amd64__ is not defined, __i386__ is, and we use the real i386 headers. Reviewed by: brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40916 --- lib/libsysdecode/linux.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/libsysdecode/linux.c b/lib/libsysdecode/linux.c index 44de91ef66cb..4a0c8a602728 100644 --- a/lib/libsysdecode/linux.c +++ b/lib/libsysdecode/linux.c @@ -41,11 +41,7 @@ __FBSDID("$FreeBSD$"); #elif __i386__ #include #elif __amd64__ -#ifdef COMPAT_32BIT -#include -#else #include -#endif #else #error "Unsupported Linux arch" #endif From nobody Sun Jul 9 17:51:54 2023 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 4QzZT62vRZz4mVdG; Sun, 9 Jul 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT627NZz3stD; Sun, 9 Jul 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/X4uae3QFHN+pEFepqGeudkVNcP/6zqBFu6L8kfZjI=; b=qDA8kd+4eIgBvoA/0yqX0FJ1hOzoHx83inlTGKu9bwTMz/eGFPulK/v8MFwfKDN6UhAwLH xSZTKs2wQ0tvfCVXmNNsdwevbaP1z2WVpw8mc0njqR9MGWQK006fw9JN6DaXRf3et88WD/ 3oBrZQZ2P/ZmMlCVnZAQhFPKHXJAnIEslWQGupDYmUMS1YXVEEd6bG9psxiKL1SL+4jydR ADBOLvbLbZgTPpuHmAFrsdkWe5ZMBuwSm2LEr/XSRrIIoF+P/+uwIPSzmi6I43baPn0hSz XG0rBDoe1Ng5bKZvT2krakxdDOTRkWlaqF+9sGFqkg3L7m2TpaimA/68l7mVUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/X4uae3QFHN+pEFepqGeudkVNcP/6zqBFu6L8kfZjI=; b=FJIe0un13pje9RjXr6E3avxS+yENtN1YlcuhWW6iqkIByCZHtGDqF9hXxfS/F0fwAjn9S2 7WPnQm6D4O6Kx7Wh1rLbNLv6sAlUeMeAcBb3m7VabpbeKpFD4tregdwvZInIx3ThoWItRy lm4NL4LTZtADxM7v2UGRc+8WhOvTLCqeMhO1WjdHkjR2jqG0ChJXBleiRS47+wohPbUiHI 76GN6afGjrjQboLKGzbcwsDhWgnPa973KBCCwa+Y6cVovqd2x2b68ojo1yM3ZuGRDsDoHR OPHVL1EarKAhwj2dOusIJc2aidPfcJOGfVP1k5Ea5SUOX211hgKUu+VBUqDG9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925114; a=rsa-sha256; cv=none; b=I4Mr6igmWP4KOOqBRnExBps4Wi23pzSuQeArrFMCQLfq6AYdKE56tWLgrtEZMenpudh2dM GJ9ADfyld/tc+sf/xeO3/hpCe8ghVcbLj3pbx45/Bon5B7m25yyxKzMqH3qhiqeYwvTQlc IBXkzwCTAM2SciiGUb+a5GpkLuuEFCzoPps/GLxgThplwDI2+QI1ihgcpDYjYVN83MAR+0 8/aRgrpkrcUrEDbZT15Ww54rPFfF9uBc14x9rA/AENuYNf9N5oMTnlo5nNqdvEyPson41D sCiMuZbJY2hIXdQI7HvH7ueSMzdA0ZnsvMQWjBBhsszxdZn8dFuUu5pqj81GKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT619l7z1Bcm; Sun, 9 Jul 2023 17:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HpsFL096346; Sun, 9 Jul 2023 17:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpsG4096345; Sun, 9 Jul 2023 17:51:54 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:54 GMT Message-Id: <202307091751.369HpsG4096345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c63c4e694cfb - main - Don't bother to check COMPAT_32BIT when __LP64__ is defined 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c63c4e694cfb0a2cba46b91869f7630e2afd80ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c63c4e694cfb0a2cba46b91869f7630e2afd80ae commit c63c4e694cfb0a2cba46b91869f7630e2afd80ae Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:32 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:32 +0000 Don't bother to check COMPAT_32BIT when __LP64__ is defined Under COMPAT_32BIT we are compiling 32-bit code and so __LP64__ is not defined, __ILP32__ is, and thus the check is completely redundant. Reviewed by: brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40917 --- sys/cddl/compat/opensolaris/sys/atomic.h | 4 ++-- sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/atomic.h b/sys/cddl/compat/opensolaris/sys/atomic.h index 674ca5b1ff24..68929f701a24 100644 --- a/sys/cddl/compat/opensolaris/sys/atomic.h +++ b/sys/cddl/compat/opensolaris/sys/atomic.h @@ -157,7 +157,7 @@ atomic_dec_64_nv(volatile uint64_t *target) return (atomic_add_64_nv(target, -1)); } -#if !defined(COMPAT_32BIT) && defined(__LP64__) +#ifdef __LP64__ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { @@ -171,6 +171,6 @@ atomic_cas_ptr(volatile void *target, void *cmp, void *newval) return ((void *)atomic_cas_32((volatile uint32_t *)target, (uint32_t)cmp, (uint32_t)newval)); } -#endif /* !defined(COMPAT_32BIT) && defined(__LP64__) */ +#endif /* __LP64__ */ #endif /* !_OPENSOLARIS_SYS_ATOMIC_H_ */ diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h index ccbf6d3293c4..40a67704fde0 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/atomic.h @@ -167,7 +167,7 @@ atomic_dec_64_nv(volatile uint64_t *target) return (atomic_add_64_nv(target, -1)); } -#if !defined(COMPAT_32BIT) && defined(__LP64__) +#ifdef __LP64__ static __inline void * atomic_cas_ptr(volatile void *target, void *cmp, void *newval) { @@ -181,7 +181,7 @@ atomic_cas_ptr(volatile void *target, void *cmp, void *newval) return ((void *)atomic_cas_32((volatile uint32_t *)target, (uint32_t)cmp, (uint32_t)newval)); } -#endif /* !defined(COMPAT_32BIT) && defined(__LP64__) */ +#endif /* __LP64__ */ #else /* _STANDALONE */ /* From nobody Sun Jul 9 17:51:55 2023 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 4QzZT73dDLz4mVrK; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT73Bxfz3t0Y; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evR+BmHReQ5UMzDpD1QegmgPXk/OBBXW0322hYJkj7g=; b=FuOHVxaaR4B5BLpIyEqZ6l5TmbDA6W4tuYLWjxUbPjPZ6u8JvsKyHxXkPyreATkg2N1MC6 AEZMvhPf5FydqE+KkURn1vO/nI0Ym6buWolkO/DfvyibEME5RWoaE9JO5BB+bkzk9Lkd8U 0VX8xDIEI66tfRgzpt3OLOoyFzXt+VH7gWYL/qz82L1Z1v/kf7Y2/4dhl6Dee9ffIrYQ/i PpvKFn9xPzzBubvhXRWsPy8viPv3/4wUO4O1Pm3jU9mOqaUxrpYzCWXuvjeUM+hqsmmxNs ka5goHDD3wm3h/iL2VGJ7Y3TxyHzl994eSRhuHVuVxNzPH/GPxqtqPNf1dUR1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evR+BmHReQ5UMzDpD1QegmgPXk/OBBXW0322hYJkj7g=; b=vbH/v0CQd7/hA5p3wfA2jzhXJxcl4ONNQjynEwrTjm0/y08G4eUdh4kTpsHo0ifXP5fP6i arIIWn+kQbaPwu+hdMgyU4D7bgnhiqjDtRcJCLDJMPei3RcGahMv4a/3aXTZYIJG72EqmA bnlIyVX5SssUJl9YSVqjOm9ax8PJcv5NV/4aoUmfvFXh7Pl1BF8lR5owNdjZQCFDjPuFWD hr1Qfe53yDiRkX7/3O5Ndu/h6brKOCiE+rd6b3neVEAVgn+DNCl9tV5Jn1IW/IMno4mvBs gG2ceKV/kONxIZD8U4/crcssDJXg45oPeW1+9YbX33rrSOaPpZ/1dL4bFOqkZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925115; a=rsa-sha256; cv=none; b=e/dTdZ/w1epqcVpyQXcpT43YF+aW/wZD9ImOsJ/W+TPKFzLmipRKlZ43Q/cAY9v5Nn0JRi 85npvsKftrzWlmxjkQWsxq0qtCJxMnABhksCc4BrYEmqaeJkdW8vOQYCl4Rjr9/xWONiJw 4SsWsbLZwaHAFwY0vW+mnS68jcHWxQKOxiljXNG21+xfq5IARwgQ8XJcbv8CY/LWiAG9BR SK514E842jUc7rNvs97xTSikhkk9A5Kv1fZbv3hnqeMKGhoJ2LIjZQyai+2/QMWKsuu1YX k/pZDsq4Kbk72/PxNq/KEqeM44wBa1x6pAhQagZCc1bxwNQd65zeAc30XFb88g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT72652z1BrF; Sun, 9 Jul 2023 17:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HptGv096371; Sun, 9 Jul 2023 17:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HptjF096370; Sun, 9 Jul 2023 17:51:55 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:55 GMT Message-Id: <202307091751.369HptjF096370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: be01082b86ef - main - elf-hints.h: Allow rtld_paths.h to be included before it 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be01082b86ef06382177106dd43c39a048bb231f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=be01082b86ef06382177106dd43c39a048bb231f commit be01082b86ef06382177106dd43c39a048bb231f Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:42 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:42 +0000 elf-hints.h: Allow rtld_paths.h to be included before it Currently rtld_paths.h will #undef _PATH_ELF_HINTS in order to override this to the right value if included afterwards, but the other way round does not work as elf-hints.h tries to define an already-defined macro to a potentially different value. Thus, guard the definition here so that rtld_paths.h's definition continues to take precedence. Note that, although all in-tree uses of _PATH_ELF_HINTS have included rtld_paths.h already, pax-utils wants _PATH_ELF_HINTS from elf-hints.h and so we cannot just drop the define. In-tree uses must just continue to make sure that they include rtld_paths.h to get the right value for libcompat builds as is already required. Reviewed by: kib, brooks, jhb, imp Differential Revision: https://reviews.freebsd.org/D40918 --- include/elf-hints.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/elf-hints.h b/include/elf-hints.h index e1ded3788a81..fa3bc407b1d1 100644 --- a/include/elf-hints.h +++ b/include/elf-hints.h @@ -47,6 +47,8 @@ struct elfhints_hdr { #define ELFHINTS_MAGIC 0x746e6845 +#ifndef _PATH_ELF_HINTS #define _PATH_ELF_HINTS "/var/run/ld-elf.so.hints" +#endif #endif /* !_ELF_HINTS_H_ */ From nobody Sun Jul 9 17:51:56 2023 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 4QzZT84Hwqz4mVdQ; Sun, 9 Jul 2023 17:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT83YzSz3tXv; Sun, 9 Jul 2023 17:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oM+C8fgSYtUix5EeN1Sysl4adZM1By66KHMFXqjAOL4=; b=fF3zfr8j3AaDi0BCtJmK9fw5R80SXyue4mD3qaDDHR8gJJn8iF/GMpLfAXktOT7bUo7izh vHPQbzMBrkOfPCGUAGFcM6iPRv1qSZfsmRuyh1g13cBCsDofHuza+iaOrobtgt/2qJDoxz O8VoodoqZmhD8G0u3hgVPqsaBMnlMKA87zXgxien6Z6yuBFHOh7RGNDyiLrbWiDH6uvDhS dxFPuOFNo38yHd6YuQOsVSaoXs2E0Fdb1OOEWFNspg9YYwWGHQ5coOaQPLihM9Q3P9kNoZ i/uJO3b3TDu6yZek9l1iubecD0WY4gCy+rzTi4F8di+k3uJbVKpgg1Yto9ravw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oM+C8fgSYtUix5EeN1Sysl4adZM1By66KHMFXqjAOL4=; b=fqFNXGnRwj8wA+C3DFy17HYHREh6UrNv3oKX3yxl2ebZe6rYw9IP5d37v5T5GAkxZBKHKY KGCzjjkYsFywQwpCDPBRgmw1tr/ICN5PL9KAYukjb6TVADe0zxIpZMUBnS2UP0/G0bQoCK TY0ZXQmWtmUROGSngL8JbEBXugMVN3i8Sk4iQxEskvwhQJmpAP50U8XmHTWSynY9s+rZm2 LKgwmgkvxXxNXuk0kcz48Z8cNCFPEHV4tcme9/V/tWu49b6cW/sbpcRYe0wqG2yVIjTZu8 v6Adk5cJvEEbvYb1C97l8H3iVt1VSS0s/VMTpf9bnozr18r42X1SUbTyM5NHlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925116; a=rsa-sha256; cv=none; b=YD516nDREvmFt+xmoMDVaAZUczXSe7tznbS+e70zYoZSX28UnyYognHixant8yggIYLGNF 6nPnn7PSIykXO1XV6ZvEDkeNqwvckO2xnvAlLKFOnHDmYghuEbHVupj9V6wqHhzQ7hIU40 dtFmNz83mDLUAB9q+71ihTRHVg9LBNreKCfTCLwUbDE2kS7HfI93qbN5QDVJ3DT+MeR0FE pG6buVXJeuh7uQx+FZ9PBmBWQSeHQno2YFpGqRw/jyjye4p+GzM/VgVBS0Sm+uRMyoESvX IozMeYh9mHe9VWaWkSx5CqfyF4ftpgB6kV/hFcOWnVNk+nFGcfXlog1gnvq7Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT82h2wz1BNc; Sun, 9 Jul 2023 17:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HpuHW096392; Sun, 9 Jul 2023 17:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hpuhw096391; Sun, 9 Jul 2023 17:51:56 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:56 GMT Message-Id: <202307091751.369Hpuhw096391@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5181fe24b2d4 - main - rtld-elf: Reuse _BASENAME_RTLD for debug.h rather than duplicating logic 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5181fe24b2d4f0e2daba180b6f36477cd8fe31d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5181fe24b2d4f0e2daba180b6f36477cd8fe31d7 commit 5181fe24b2d4f0e2daba180b6f36477cd8fe31d7 Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:49 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:49 +0000 rtld-elf: Reuse _BASENAME_RTLD for debug.h rather than duplicating logic Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40919 --- libexec/rtld-elf/debug.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h index 95c06c7babc3..513e017aa35c 100644 --- a/libexec/rtld-elf/debug.h +++ b/libexec/rtld-elf/debug.h @@ -37,6 +37,7 @@ #include #include +#include "rtld_paths.h" #include "rtld_printf.h" void debug_printf(const char *, ...) __printflike(1, 2); @@ -48,17 +49,11 @@ extern int debug; #define dbg(...) ((void) 0) #endif -#ifndef COMPAT_32BIT -#define _MYNAME "ld-elf.so.1" -#else -#define _MYNAME "ld-elf32.so.1" -#endif - -#define assert(cond) ((cond) ? (void) 0 : \ - (msg(_MYNAME ": assert failed: " __FILE__ ":" \ +#define assert(cond) ((cond) ? (void) 0 : \ + (msg(_BASENAME_RTLD ": assert failed: " __FILE__ ":" \ __XSTRING(__LINE__) "\n"), abort())) #define msg(s) rtld_putstr(s) -#define trace() msg(_MYNAME ": " __XSTRING(__LINE__) "\n") +#define trace() msg(_BASENAME_RTLD ": " __XSTRING(__LINE__) "\n") #endif /* DEBUG_H */ From nobody Sun Jul 9 17:51:57 2023 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 4QzZT95DCpz4mVrM; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZT94XWSz3t84; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRwd3gjfWX5NKrkcJQlMbIRoe2/obw44BKOLgfraY0U=; b=CkhAQvtmCHWSM28P/MMmDk7cZnlIiUW+kSTRSJLrMJG4SQeJlL+DPGrF1BPpCN+gLR9kB9 yBvlL82ySIf9OZjqHnrByZhMo1Q/yx6LJpAQFhoM8qRheayZONGT/UdYVKHaCBmjBaNunO BJBAg619nMo5/BVirxgASiAbttQwdRyI1qGKdCeXOGy2rKnH+ylzzdTBdtvvXB9FwlQU9t XkM/5R6xZ5NdZcgvQQo9CZv3/0+336SK29XVQse5s3cMM0IdC26yRnIiufAZurW+I8A+Nn 00rqkZsp8ivlY7u+hd4lQ5gVn8NA6Lg2dU71EGxcluD3GthSgqysoDFLG5jiOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NRwd3gjfWX5NKrkcJQlMbIRoe2/obw44BKOLgfraY0U=; b=nUWm/VIkHPSQsmNKFUP5bRUklT+7zEEH+cAxFZZuJY1PN2bQ2YomO9CKiOessjvUFMz5lA 2LFOT/og2XargmTeYqg7KuH31JQYtk4wgnE60ZhpcCdU8c8dYd15MTaLPgzA0NMwt+C+Jr MQMDjOH/4oI0Ucn9Cmh7rhtWaL02MTiZjzRhV3J+kjIxJp6zg5ELr6EmdfkcRox/rkniTz xUplZux3x6PFEj6nAssoQihQCdUNoojZsLULEiYvSnp/VnIG2ZVfeZeGOlWhbGoAMUF86O Cpweak/GHHkrZUU9SirmP21k6e0hDgqo3Dyw8ONsBbJz6OEsIp5Oj80shHVvFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925117; a=rsa-sha256; cv=none; b=Gx1wxg2ixkSG7KibvWE/iZPJ9fGRWh9AFa9XZDzqrCknYk/ikpBTFkQvUoHz+/imvjSN2x yBoq7oz/n7SsukhZZyoTUmz8wfY6hsJ8K7a51bf3YMmAlnHnax5OuRwOOG9X9Y7zyUqH8Q R9xYMCywvLKBxHXylXtCJkvVTYARN5qzu/bgWEk37madVsX7cI3tRn90TluJMhXic7whnI I8ampAt0bTzbCZ2ExSQ+jrmYEnLLWeN1sxscYCLYtDp3RlEtBSql/ngR22tx//0N48mxsi a3plVlAW2Hi8wgG79dlSx/q8bkAePBpc+/4V8mUKOeoGEx/wzcww84etNKOoZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZT93cQ8z1Byv; Sun, 9 Jul 2023 17:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hpvfh096418; Sun, 9 Jul 2023 17:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hpv88096417; Sun, 9 Jul 2023 17:51:57 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:57 GMT Message-Id: <202307091751.369Hpv88096417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 6adfb8155e17 - main - lib: Enable libcbor and libfido2 for COMPAT_32BIT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6adfb8155e17d94de0aac39a5965c137bad10e93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6adfb8155e17d94de0aac39a5965c137bad10e93 commit 6adfb8155e17d94de0aac39a5965c137bad10e93 Author: Jessica Clarke AuthorDate: 2023-07-09 17:45:56 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:45:56 +0000 lib: Enable libcbor and libfido2 for COMPAT_32BIT We no longer have COMPAT_32BIT hacks for libusb, instead supporting the normal 32-bit ioctls for freebsd32 processes, so we can enable these for the lib32 build. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40920 --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 982cff8a29f9..d82fca7c5c69 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -206,7 +206,7 @@ SUBDIR.${MK_BHYVE}+= libvmmapi .if ${MACHINE_ARCH} != "powerpc" SUBDIR.${MK_OPENMP}+= libomp .endif -.if !defined(COMPAT_32BIT) && ${MK_USB} != "no" +.if ${MK_USB} != "no" SUBDIR.${MK_OPENSSH}+= libcbor libfido2 .endif SUBDIR.${MK_OPENSSL}+= libmp From nobody Sun Jul 9 17:51:58 2023 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 4QzZTC1lLmz4mW15; Sun, 9 Jul 2023 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTB593Pz3tVx; Sun, 9 Jul 2023 17:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=op8CHgAFzeqi95d2KRALKtr1PZwBiVe1M7XzmwxRjks=; b=s7IeTlFNOIe7rwk8aybXJN/NIaQWcLZZQ3+6Qy37J9jNJHzEDBcOWywbDR2/FXfYle1vRU I87lK3+cA2Pae3l8lAhWoRmCa7JCTjsGEn2YQHLQO5pAIFTdTV4qDts/nxsxYCN0R+7TPg qzKcPIif2V4UOvvWV01iek1eJk7XBybMNGQHKfj/iOy+lXbNotaj3M1a38TGJyYlc5yhgV jd+MpiYt118dbfkALjR0w1jqC+fViouPaCFSELBa7uHsjS6I6cVAtX2n3g6Mj0LXF2wBK7 3/fu4Jd3OK3mYxi0oY2sAr9vMMj2i0av3oUnqN6N8Sai4gV9h3RlhMOaZS1zDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=op8CHgAFzeqi95d2KRALKtr1PZwBiVe1M7XzmwxRjks=; b=bjQlK2XCJeNrBte3hZRtyodhzSdgZKrvxNItJagCUMKsw5yhs5gNX/YentfPfCNnvVGM0Q 9bqARZma+xaDvb1VattNkifwU7ks7l3T0N1A60WzJoYpLj5wZ1l3nwwUi5082jUrjQr+Tu G9eOYPW9qFg2vGNj6/Q53Vk0IB67NbHHaRXEU3vIfUiYG3Hqr2mHWX/AvIV7Zr45uV9JUT HfVkRA9SbkwvLwn3ZP9vuYuFXQa48UKfcSKqjOGjmePzDpkKSOK8LE6vJSwVdSyxC2aF2w +AEi1E20bmlf6MgzJkBY+iifatK3N6K9mmSVSjmOekzAcC8Y25/WtEkRHOrZhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925118; a=rsa-sha256; cv=none; b=bJ+wI6STuJZpZvc0sXHQpT3MEqKDqD/T9jgMv5eCFWaOfgcxRa+j72Ltbs5Exp9TID3mPf IR1bvcG4vIYlhgSpp79XefTCt+U1YE6ekqDpE44vg8AI74/7rgJVTCY6wSaBUXsP/3hP/m c4fRWA1gxTBNPRe87sFth1x1D7FbsOiU7y0nO/TkKHIHQLAXE59/PpB6Fn5EEcEBFyuiem aqaX/4B/n2AC5M2ye8qcxk8sIa9eTufcNKHgCeFD48CKApWcpBZ106sy0k4mz7KExeg3HV QfZJu8o1UozO80KHvUdHNHU7dUKd8CnDI6jE1GFFTJOzO8sAxmWqPvPwluz7sQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTB4GLCz1Bv2; Sun, 9 Jul 2023 17:51:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HpwN0096438; Sun, 9 Jul 2023 17:51:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hpwcd096437; Sun, 9 Jul 2023 17:51:58 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:58 GMT Message-Id: <202307091751.369Hpwcd096437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0fbb77c3ef8e - main - libc: Build all i386 sources for amd64 lib32 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fbb77c3ef8eecb91caad8997a325a17c5fb374e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0fbb77c3ef8eecb91caad8997a325a17c5fb374e commit 0fbb77c3ef8eecb91caad8997a325a17c5fb374e Author: Jessica Clarke AuthorDate: 2023-07-09 17:46:03 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:46:03 +0000 libc: Build all i386 sources for amd64 lib32 Having the symbols exported by libc differ between i386 and amd64 lib32 is questionable. Since these files build just fine today, stop guarding them with !defined(COMPAT_32BIT). Whether or not they work at run time is a different matter, but an i386 jail would be similarly affected if not, so that's not a problem with lib32. Reviewed by: kib, jhb, imp Differential Revision: https://reviews.freebsd.org/D40937 --- lib/libc/i386/sys/Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libc/i386/sys/Makefile.inc b/lib/libc/i386/sys/Makefile.inc index cf5d390ca094..f2f4bae24648 100644 --- a/lib/libc/i386/sys/Makefile.inc +++ b/lib/libc/i386/sys/Makefile.inc @@ -1,11 +1,9 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD$ -.if !defined(COMPAT_32BIT) -SRCS+= i386_clr_watch.c i386_set_watch.c i386_vm86.c -.endif SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \ - i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c + i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \ + i386_clr_watch.c i386_set_watch.c i386_vm86.c MDASM= Ovfork.S cerror.S getcontext.S syscall.S From nobody Sun Jul 9 17:51:59 2023 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 4QzZTD2T0vz4mVdd; Sun, 9 Jul 2023 17:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTC5vpQz3tZG; Sun, 9 Jul 2023 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ll/XWFEhkjJ7dR9f4J8NE/wmjhd1z2AmwFTVoveJoE=; b=wRa+v4CLSFfUN0+DELN5HwvmbB4eiDvnpAzPpsCeSfz23QZmE2I7jgV65urSQ7tIcgkiMs ZsQAWSvdOBrce1cqnOhuOeKIA4uFFmA6XVtli0TZmEvM03JUUtL+NxgvIi0N3AO9oX1SHh XiCFPcjsAG7OuZ8kCg3Jt7zy2CFdEC8Le9D0YMNm2/yix1aA51a+M0B+fOD3u1MG/FteaS z2QXw91LCqzGx7iakVT2WQrtJndneiHFV88mZeUWEtYsYm0KSmEfqTeiQEIcM+bqHxIdZi MM2DwAkeFzlvUtdH2C2e/fHmY7DG1VSKzBhmcpZtXAFQQS49dLI5Ga1tMFtJnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Ll/XWFEhkjJ7dR9f4J8NE/wmjhd1z2AmwFTVoveJoE=; b=lotD855wMUXXYpQNyzIOfUlYPI5ocpTo8dqPzAyteIX5sJqXvceNPExULCLld38MGj8ux7 hAC3BYackvQK1xRRD522rnTb3Ygos0dFvfmv8U/Hll/IDmidy+9qWOyZAFdBJcySuY6rKo f6ZFqT5aqF+/yvX5I0jQ0VHEHShovkz6KZUMRBTZabBCFeEXUR7LhSn9H3Sw/pDsjkK5QF JEnuRu2ypROVpVgEli9D3P2Cuq1Jd4iEcEsHp3zfIacEv10AIngDOSuGKsPBrHVKZBxGCk 3INRYa5dHoJWkfRFpB4RSjXdMF0CdA1ywyH2d/5kER+QyO19IV7as6ZPEVexxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925119; a=rsa-sha256; cv=none; b=J6PIwJ6PFBk3oY+StviPAzHrQXFAt55n7jdRlezNyRm16AuAfEL4TUYPXqzqOmNgrflWw3 VY7I5puDAff4wZdVHm3zwLwkyQQ5jM/tINtl5oFqkK94YdKhCOJG6+bePBaT6qZD9B9ZeJ I/eQzhEAJyVw5zv3gRmzbmnRtra91hVgseClssfLJiC47goPu2FEHZp/9baCWjRcaLeBcF 6/YOSaAkIN1re++H86zZUAphAC/p+Ld00wLyh/iAL6n7aBzwqUSzZJ+L1XdqU+GjAOUOs7 j8tKIpfiIt+1JnQYoldljR+8/El5CMB3okIZtIEEduuf4lVzxaJURfO0LDMhdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTC50v3z1BNg; Sun, 9 Jul 2023 17:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hpx0H096605; Sun, 9 Jul 2023 17:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HpxbT096592; Sun, 9 Jul 2023 17:51:59 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:51:59 GMT Message-Id: <202307091751.369HpxbT096592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 537f945fc89f - main - Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537f945fc89fab53f60fee07ac42c8aeab704ce7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=537f945fc89fab53f60fee07ac42c8aeab704ce7 commit 537f945fc89fab53f60fee07ac42c8aeab704ce7 Author: Jessica Clarke AuthorDate: 2023-07-09 17:46:12 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:46:12 +0000 Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make Currently none of the words in these require quoting, but a future commit will add words that do, thus we should make sure to quote each word so the shell doesn't mangle them before calling the sub-make. (Note that :@var@expr@ is the bmake syntax for map, replacing each word with expr's evaluation, with var containing the input word) Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40921 --- Makefile.libcompat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 4bcb7479270c..72ea4d865647 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -25,9 +25,9 @@ LIB${_LIBCOMPAT}WMAKEENV+= \ # Don't rebuild build-tools targets during normal build. LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA .endif -LIB${_LIBCOMPAT}WMAKEFLAGS+= CC="${XCC} ${LIB${_LIBCOMPAT}CFLAGS}" \ - CXX="${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS} ${LIB${_LIBCOMPAT}CFLAGS}" \ - CPP="${XCPP} ${LIB${_LIBCOMPAT}CFLAGS}" \ +LIB${_LIBCOMPAT}WMAKEFLAGS+= CC="${XCC} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ + CXX="${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS:@v@${v:Q}@} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ + CPP="${XCPP} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ DESTDIR=${WORLDTMP} \ -DNO_CPU_CFLAGS \ MK_BOOT=no \ From nobody Sun Jul 9 17:52:00 2023 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 4QzZTF0xlQz4mVs2; Sun, 9 Jul 2023 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTD6xL1z3td6; Sun, 9 Jul 2023 17:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LhM1AyQwou3MAutMD1aHj+XvZ/0RVw+QcmMVVLeyoN4=; b=gMUj04ZySANZw2K1vaKYj6kCBZh+NVTcCY1nTSplTNTF3GRaZFGiAEFdwFYbraoXctsXQz w06+B1o0vs6GdAbfoXzRPZHMZSg/TTx6oz1dhbIqmBwtVCrMIZH/wnEAo10INuW8ldSN5q nE5z2720K9fxj6ZY1+uV91mWw7ozUzx/ot/2cxShFY1bupSj04DhYFNLP68SIJf1f0WTGT T4a4l/qpVQUexDUE+AcHrM3+XcJj5JpN/cpq2tgNDQf+HPPmvJQTaOku13J72JFSc9Bsgr jzP9dM8mRR1z5Y9npePUjDjPrkXxdH8sd+7W0uSsk91Lbs0zyHU41dTvaWCKBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LhM1AyQwou3MAutMD1aHj+XvZ/0RVw+QcmMVVLeyoN4=; b=EJhe4UotpCMgv8W3Rd1QYdjxBHPGbyoJHF1Zea4qvYpDajHQHsOMFdWYmhsZxRsXlM0oMQ SWT6oXMh/5WvlkdD0yeR+MmEch7u0hM9vW/BSpeADAPoJTk6wtoHZL1VLiVmZJNldxjbct XifgHF6vZ6esxQCHl7VD5EPefivfjZSfKwpGBGzZ66LOwt+bsRTWykuQBG2NiXfay0CgaZ 1KyT1KI1JEp63PzN0FRnbNrdEXhZ89EgipoBKunnOYa1k3/jibV3FvR0ExV9pMZsf0/Q53 hi29ZZKvGZJevVfDTeT1u/pTMQoFupiBWpnO1uTCuBscc0gV2Y8HGZPZAwIPpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925121; a=rsa-sha256; cv=none; b=MH6JRJ8nbk2vOdC6EqOkROLlkBOjscjh6gFb+HhazQ/IRU0eyBy8MiC4YKLQfTma7IUBCG ZiwOM/5Zz7GlCACCxT8QdK6/0sRBvYJwscAI1TQxTGCkTTks+6eAbplwsbq2hb1TPuJn1Y nQuO7nmfAOBUbSjhgd5ptYB8u8Cve2vs7essFUzEPiFZbq76kH9FRxg5bBgoEjvW1aJjZF Y34vMQ3fB04B0+oao6mWStnz+P9FWk9KteRXNihrpF9VCKNkOYkDOmPV3TDvpfXLnVnmxQ 0lsYmhwtM+4ckAK+6vk8MhHEMIGgwZRvvYIY5oO+ESn9F8QkpO6v2o9PU38gaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTD5KqQz1Bcp; Sun, 9 Jul 2023 17:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq02u097701; Sun, 9 Jul 2023 17:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq0EJ097689; Sun, 9 Jul 2023 17:52:00 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:00 GMT Message-Id: <202307091752.369Hq0EJ097689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 8fad2cda93c7 - main - bsd.compat.mk: Provide new CPP and sub-make variables 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fad2cda93c7930b01f25a2160e5c433085f13e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8fad2cda93c7930b01f25a2160e5c433085f13e3 commit 8fad2cda93c7930b01f25a2160e5c433085f13e3 Author: Jessica Clarke AuthorDate: 2023-07-09 17:47:42 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:47:42 +0000 bsd.compat.mk: Provide new CPP and sub-make variables Currently the only way to detect for a libcompat build is to consult whether COMPAT_32BIT is defined (or equivalent, for downstreams with other libcompats or past releases with libsoft as COMPAT_SOFTFP). There are two issues with this: 1. COMPAT_32BIT is a new naming scheme that doesn't match the libcompat name, which is unnecessary deviation. 2. When multiple libcompats exist, everywhere that needs to detect a libcompat must check each variable in turn, despite the fact that it normally just wants to know if this is a libcompat build and perhaps what ${LIBCOMPAT} and/or ${libcompat} are for it. As a result, far too many places in the tree need to know about the set of possible libcompats. Instead, introduce two new CPP and sub-make variables, COMPAT_LIBCOMPAT and COMPAT_libcompat, which give the values for ${LIBCOMPAT} and ${libcompat} respectively, so that uses can be made parameterised. For when code really does need to know the specific libcompat, Makefiles can perform a string comparison, but the C preprocessor cannot, so introduce an additional CPP-only COMPAT_LIB${LIBCOMPAT} which is intended to replace the inconsistently-named COMPAT_32BIT (which will be removed in future). Uses of this new variable should still be kept to a minimum, however, given the code duplication needed for new libcompats. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40922 --- share/mk/bsd.compat.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 444a25101357..4b9bd7b621d2 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -115,11 +115,17 @@ WORLDTMP?= ${SYSROOT} LIB${_LIBCOMPAT}_OBJTOP?= ${OBJTOP}/obj-lib${_libcompat} LIB${_LIBCOMPAT}CFLAGS+= ${LIB${_LIBCOMPAT}CPUFLAGS} \ + -DCOMPAT_LIBCOMPAT=\"${_LIBCOMPAT}\" \ + -DCOMPAT_libcompat=\"${_libcompat}\" \ + -DCOMPAT_LIB${_LIBCOMPAT} \ --sysroot=${WORLDTMP} \ ${BFLAGS} LIB${_LIBCOMPAT}LDFLAGS+= -L${WORLDTMP}/usr/lib${_libcompat} +LIB${_LIBCOMPAT}WMAKEFLAGS+= COMPAT_LIBCOMPAT=${_LIBCOMPAT} \ + COMPAT_libcompat=${_libcompat} + LIB${_LIBCOMPAT}WMAKEENV+= MACHINE=${LIB${_LIBCOMPAT}_MACHINE} LIB${_LIBCOMPAT}WMAKEENV+= MACHINE_ARCH=${LIB${_LIBCOMPAT}_MACHINE_ARCH} From nobody Sun Jul 9 17:52:01 2023 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 4QzZTG16PKz4mVbM; Sun, 9 Jul 2023 17:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTG03y4z3tnX; Sun, 9 Jul 2023 17:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+YB1RpLmawJBqM3q08V8JqFo28z4OSknBHySrv89Xk=; b=JtNCBaJYqbP4G/Y7tfwp5mgXvPLDbHJZHw6FessUgZK5qtBNPwPAKZt+XrS4ToDrT4i5Fc dejeWT1BRqdued2IZFv+8krbDug0jU5U7vtUmTkG2cJF66B/+eEWJwCVaj5LkGUpLks+Jd 4VFYr/p/1o1UvE4u91l2RhmGwM2AxFyrd3aq2nvdQY8H3F3KqhNjGjbXRAMmAUUYb5azTW ZgRD/Ikh/DUNDlw8nXUbgcPS8smPI/GpHO1ROZejFNFaKOqWjaS9bAQuK7yJmn4tpoZs14 xiySd3og7ZTR/nJKN4sE4WFE7tBRYoPVYouTU4fSjfT2F5fMfiPX9wUy6AcNeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D+YB1RpLmawJBqM3q08V8JqFo28z4OSknBHySrv89Xk=; b=v/+sS5HdAkWLgyhv3y1Db/YMOLj8+f35ar6aVNC5oIrqxAVQDobjKNPQbdOIBpYd5Q33sZ RtfI2Il3b7ZNTvBm9VOWe/jVuzRMCwVPM97gLiMqROcbNbCczjCpFDtPa0pHrSpIF+IbLa qI4Gy3SFCbJ8710RF5OwMKTMqx9QKv28jArr/iku/JniTHMnQN3Uz/ZVF2qWVZP76omiSG DOcdcZBwPXrGd0588pyIqyW+mRLclU2IfbBNNfoPed+SwcY2tYhG95BK04CwnSgJGz08jz 5UWslN8TkjWh3kh/xxgYyDfG/JMJJC2QoX3Nw5fzhgHJVIc4ne21Sgv2E+NO9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925122; a=rsa-sha256; cv=none; b=OXWjOjygfKAouNtrKHtrbb+ZsET6oL8UIhFDGJ1H1CVjOQEgXi9ftAIbraajA/pfxLFemW /XjanD0U/p70Ml2JlfhJeTKAqgnKbNNWPgSFgdbV2Vl0DcnLvhYbrfRaC++5mFr4mZd4z7 I1ktIJku214hf3Zdwr95SjxQj8NuSyl8oPWfq6RVo41xRJl0t51diXC0OwRkwbS5w2NgIT CfCFWVS9VXHFp3eVegYXu/ZwqUwfAGmI2H9uMJ3HeAGEzbfjsmdcIl/f03JobCcqqqbhnK eUs/7UPvAkj/OGxZ7jyPTw3X0Cdp5EeqsuzcCMhE3l6cl4tS4oAha3eZhZbvQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTF6Fdkz1Bv5; Sun, 9 Jul 2023 17:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq1CP098661; Sun, 9 Jul 2023 17:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq1KK098660; Sun, 9 Jul 2023 17:52:01 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:01 GMT Message-Id: <202307091752.369Hq1KK098660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0ade2f8cf78a - main - openpam: Migrate from COMPAT_32BIT to generic COMPAT_libcompat 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ade2f8cf78a3dbf66503e032682fb2c5d0677bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0ade2f8cf78a3dbf66503e032682fb2c5d0677bf commit 0ade2f8cf78a3dbf66503e032682fb2c5d0677bf Author: Jessica Clarke AuthorDate: 2023-07-09 17:48:17 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:48:17 +0000 openpam: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D40923 --- contrib/openpam/lib/libpam/openpam_constants.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/openpam/lib/libpam/openpam_constants.c b/contrib/openpam/lib/libpam/openpam_constants.c index 52f353570c40..ba92b49b6865 100644 --- a/contrib/openpam/lib/libpam/openpam_constants.c +++ b/contrib/openpam/lib/libpam/openpam_constants.c @@ -175,9 +175,9 @@ const char *openpam_policy_path[] = { const char *openpam_module_path[] = { #ifdef OPENPAM_MODULES_DIRECTORY OPENPAM_MODULES_DIRECTORY, -#elif COMPAT_32BIT - "/usr/lib32", - "/usr/local/lib32", +#elif defined(COMPAT_libcompat) + "/usr/lib" COMPAT_libcompat, + "/usr/local/lib" COMPAT_libcompat, #else "/usr/lib", "/usr/local/lib", From nobody Sun Jul 9 17:52:02 2023 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 4QzZTH1l4Fz4mVs6; Sun, 9 Jul 2023 17:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTH1Ckqz3twm; Sun, 9 Jul 2023 17:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymH+mh/dEsZCFfQBLJm0I3Tj17c3Tj+T+ipr9YE6zxw=; b=SmjtU7Y7dSa6YgtVec7MwWMhfNc7JhEb8hw503TUVo2roAcnZCsidbDIoMAqi9t1bmB0GE PlWa7zQ0uCHOGtvRuB/kyWl8yahAotoOSgBNk73JJgjaXKOxzFqkYeXdFqIhx832cAZMot K3yCmi3gyUIaGQYP2ggNDJJH4fS+IuQzUcPW3X1SV8qDA3ZDidNiHhY7uMMQhbdSAfvtrE 6bbDMaf5B16AswgJVHS1OiEOKzozQxG9utmU0Vmmev/42eLN4oPE3ZKNcKzgPjyK32nwfU 8Mfd96eV5Awf2ghw5Wn86AtztA4sPN/5D4aZwBkFZlV6crmpGgvpQXCR1MF7yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ymH+mh/dEsZCFfQBLJm0I3Tj17c3Tj+T+ipr9YE6zxw=; b=MzSQnifqzeXQxKvp1zA5pipBWOByMZwhUdjH9GGG+ajq+1KZRpT7Y6Wo8jKY6ZXPQg6a/x NGDcBepMNw3818YI7MOYPi5TbL2JRiW1cSq+T5ZCRD2McdThf5EO4WobOFhY2uF1aQS8zP SrWKtAHjaOinDRdfnTAEE5Ir34FHRSo8zJ/zdaldCs8HXyBoKgey/7m5oCtjD3sbOoDH0L 1R+vDY+wFJ60eZiJD+EsUAE/sjLmI8u3ZKH2wUjJ6ZYzSPKOeI5jJRZ1N+dISXEa6/TspX kmRZ2U4Nb8FdGj8SnGppOtsBOTVVEVYENqQs4dKv1JXqD76cTunNkoYz3tXRRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925123; a=rsa-sha256; cv=none; b=Jo2TrqAcTnew7oFfF3W14QGQ5j2JPbZOStsCJIru1Cl10suJ/z7wu7ICGHzV7niNW/Qjh9 26xYg3Unf9BD4UrBrf9A7E8OtLaBwzLZsBstZXRppWQKxN36e8Y/KjZxZAZA2f334+nYyb 7E4G5tPxj7DlaUC9F3qwberAxz4Qp6UujKqqzdbpsjIKUXP90Nyb3LyB7dGa0+RjbJnFlU 4QTT4LKY2o6p3TtKV8hhkzes0pbUeOdwGYycCZIzL1erLIww/XWThDE+K7ZpyeE1acBOmO O/MPg6BiKBSwMTTyyXv4X7+BtZ2r6VBwk4fSL/bQGD0iFc49ACSzDTYtYFfNzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTH0Htlz1C29; Sun, 9 Jul 2023 17:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq2I0098686; Sun, 9 Jul 2023 17:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq2G1098685; Sun, 9 Jul 2023 17:52:02 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:02 GMT Message-Id: <202307091752.369Hq2G1098685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d3748fc0c2b8 - main - include: Migrate from COMPAT_32BIT to generic COMPAT_libcompat 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3748fc0c2b860048cc15971e43dbb34bee8de7c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d3748fc0c2b860048cc15971e43dbb34bee8de7c commit d3748fc0c2b860048cc15971e43dbb34bee8de7c Author: Jessica Clarke AuthorDate: 2023-07-09 17:48:54 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:48:54 +0000 include: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40924 --- include/paths.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/paths.h b/include/paths.h index 9af602635552..a0c3c9de6136 100644 --- a/include/paths.h +++ b/include/paths.h @@ -67,8 +67,8 @@ #define _PATH_GBDE "/sbin/gbde" #define _PATH_GELI "/sbin/geli" #define _PATH_HALT "/sbin/halt" -#ifdef COMPAT_32BIT -#define _PATH_I18NMODULE "/usr/lib32/i18n" +#ifdef COMPAT_libcompat +#define _PATH_I18NMODULE "/usr/lib" COMPAT_libcompat "/i18n" #else #define _PATH_I18NMODULE "/usr/lib/i18n" #endif From nobody Sun Jul 9 17:52:04 2023 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 4QzZTJ5kBqz4mVgb; Sun, 9 Jul 2023 17:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTJ21FTz3tgP; Sun, 9 Jul 2023 17:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lAkll+FvetlLeVoB56CQOjKe0PvzR0enGfLDjEv6x0=; b=dROTd2YnEZ+GLoig0h1UgbzeqMTqsHKyXfaj8Y8ibvwLJCGeO3q1YTwWudlw4AMzquGzda triFK/XxfURnsC3y03BFQkANSSMgYwEHHaRhpc0ryCQwOKcTlhIqry9zqgqg9rgRmRFc12 yWyTvg47KVJdiI/R3P8uqzhOwQLKAIyWW8kGME38pdvCXfJPV/XJP1rJ02LEyNKssz2i47 gNNxQVLF39M94YAD6cLM+kwHYK6gTWmWqo8AyFgDp4tTaoEV7bLCVkc5PFz8lLdRpJynJf aqp/tdoAUx/QkeaIjRu8jZzpUFzVIJbXVr4v/p0tKDfRrzArdJNh0Qs7Q4cKdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/lAkll+FvetlLeVoB56CQOjKe0PvzR0enGfLDjEv6x0=; b=wMk0SXBD04K24wLopRu6SP1vdoW8suCVCqTQ5DIwZw4zMW3xLnbOZWdLTtI0xfjTQ6FzKd 7I/EEoFDgUeiKHtwfYJD+zg5ub/GgD7UpuOJcx0feviJH3JzshMgbhdXXJyhgP0OgJ+RvQ pDKps1BaiONEqCVNW3tH7fGfUeJqRPj23c0hwPpOwiEt2qZkumly+JfFZ4il8r1lyl2+O/ M9Z/meGHdhMyAEANF3RX1qyp+FrcfApebmLgSl38fFG2p79XvBHz6RMuJE5N2FJa9JuOyk lbLLCnfhFyCTBRl5a0BWxuA9/sARDJty30ew4ldXgPtJjOvCGMKR5sHVA7Q5oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925124; a=rsa-sha256; cv=none; b=fYQF/gF00hN8UJ5v383mMlqmb6AIk6VaJxcW6hbSx2NePV9ndQFh4F6feM32MdCtuIDyGs ADAC96YRbeLmHU0vdMjK6wszTT3wTOOIyRVagAmm6kKFsQYqC8sLOkT51Avah9Z29vPX5b tDkDQn/SHSo97Lutnih1y+qotWugwRxVSwD9tTkWeFEFuDZQ1/Kf2G/vcwHaFIk2nuwV8P lWYqJ5WsfEiAl3DZvfOcKm7qCWXqLxwyyEbgeTnU9Qj1yXLqua5BH8EpW6gm0zw+YZlOGY rief4pvPKFQTwp4TR73JO9MTWT4i0mO9PWvp8sH8OzoEFBRHS9EQowOvy71PAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTJ16FRz1BNj; Sun, 9 Jul 2023 17:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq4jL098706; Sun, 9 Jul 2023 17:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq4At098705; Sun, 9 Jul 2023 17:52:04 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:04 GMT Message-Id: <202307091752.369Hq4At098705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f940929d4111 - main - rtld-elf: Migrate from COMPAT_32BIT to generic COMPAT_libcompat/LIBCOMPAT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f940929d411102d6925e158de90d8d23b3774df6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f940929d411102d6925e158de90d8d23b3774df6 commit f940929d411102d6925e158de90d8d23b3774df6 Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:07 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:07 +0000 rtld-elf: Migrate from COMPAT_32BIT to generic COMPAT_libcompat/LIBCOMPAT We still have a tiny amount of libcompat-specific code in rtld_paths.h, but it's been deduplicated as much as possible, and in future we may wish to just push these variables down to the few consumers of them and make them use the double-underscore variants with a libcompat argument rather than give them names here. See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40925 --- libexec/rtld-elf/rtld.c | 2 +- libexec/rtld-elf/rtld_paths.h | 57 +++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 9a522bf721c5..5c96405be62c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -804,7 +804,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux_info[AT_STACKPROT]->a_un.a_val != 0) stack_prot = aux_info[AT_STACKPROT]->a_un.a_val; -#ifndef COMPAT_32BIT +#ifndef COMPAT_libcompat /* * Get the actual dynamic linker pathname from the executable if * possible. (It should always be possible.) That ensures that diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h index 759a610e6469..fd61da4507ee 100644 --- a/libexec/rtld-elf/rtld_paths.h +++ b/libexec/rtld-elf/rtld_paths.h @@ -31,53 +31,68 @@ #undef _PATH_ELF_HINTS -#ifndef _COMPAT32_BASENAME_RTLD -#define _COMPAT32_BASENAME_RTLD "ld-elf32.so.1" +#ifndef _RTLD_COMPAT_LIB_SUFFIX +#ifdef COMPAT_libcompat +#define _RTLD_COMPAT_LIB_SUFFIX COMPAT_libcompat +#else +#define _RTLD_COMPAT_LIB_SUFFIX "" +#endif #endif -#ifndef _PATH_ELF32_HINTS -#define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" +#ifndef _RTLD_COMPAT_ENV_SUFFIX +#ifdef COMPAT_LIBCOMPAT +#define _RTLD_COMPAT_ENV_SUFFIX COMPAT_LIBCOMPAT "_" +#else +#define _RTLD_COMPAT_ENV_SUFFIX "" +#endif #endif -#ifdef COMPAT_32BIT -#define _PATH_ELF_HINTS _PATH_ELF32_HINTS -#define _PATH_LIBMAP_CONF "/etc/libmap32.conf" -#define _BASENAME_RTLD _COMPAT32_BASENAME_RTLD -#define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" -#define LD_ "LD_32_" -#define TOKEN_LIB "lib32" +#ifndef __PATH_ELF_HINTS +#define __PATH_ELF_HINTS(_lc) "/var/run/ld-elf" _lc ".so.hints" #endif #ifndef _PATH_ELF_HINTS -#define _PATH_ELF_HINTS "/var/run/ld-elf.so.hints" +#define _PATH_ELF_HINTS __PATH_ELF_HINTS(_RTLD_COMPAT_LIB_SUFFIX) #endif #ifndef _PATH_LIBMAP_CONF -#define _PATH_LIBMAP_CONF "/etc/libmap.conf" +#define _PATH_LIBMAP_CONF "/etc/libmap" _RTLD_COMPAT_LIB_SUFFIX ".conf" +#endif + +#ifndef __BASENAME_RTLD +#define __BASENAME_RTLD(_lc) "ld-elf" _lc ".so.1" #endif #ifndef _BASENAME_RTLD -#define _BASENAME_RTLD "ld-elf.so.1" +#define _BASENAME_RTLD __BASENAME_RTLD(_RTLD_COMPAT_LIB_SUFFIX) #endif -#ifndef _PATH_RTLD -#define _PATH_RTLD "/libexec/" _BASENAME_RTLD +#ifndef __PATH_RTLD +#define __PATH_RTLD(_lc) "/libexec/" __BASENAME_RTLD(_lc) #endif -#ifndef _COMPAT32_PATH_RTLD -#define _COMPAT32_PATH_RTLD "/libexec/" _COMPAT32_BASENAME_RTLD +#ifndef _PATH_RTLD +#define _PATH_RTLD __PATH_RTLD(_RTLD_COMPAT_LIB_SUFFIX) #endif #ifndef STANDARD_LIBRARY_PATH -#define STANDARD_LIBRARY_PATH "/lib:/usr/lib" +#define STANDARD_LIBRARY_PATH "/lib" _RTLD_COMPAT_LIB_SUFFIX ":/usr/lib" _RTLD_COMPAT_LIB_SUFFIX #endif #ifndef LD_ -#define LD_ "LD_" +#define LD_ "LD_" _RTLD_COMPAT_ENV_SUFFIX #endif #ifndef TOKEN_LIB -#define TOKEN_LIB "lib" +#define TOKEN_LIB "lib" _RTLD_COMPAT_LIB_SUFFIX +#endif + +#ifndef _PATH_ELF32_HINTS +#define _PATH_ELF32_HINTS __PATH_ELF_HINTS("32") +#endif + +#ifndef _COMPAT32_PATH_RTLD +#define _COMPAT32_PATH_RTLD __PATH_RTLD("32") #endif #ifdef IN_RTLD From nobody Sun Jul 9 17:52:05 2023 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 4QzZTK42vNz4mW1V; Sun, 9 Jul 2023 17:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTK37mqz3tpp; Sun, 9 Jul 2023 17:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brwx+QA/Y/E5RCDxqXstAW90XzqfIXqf9DvHVUy35hg=; b=MM1FCcIuaiwQhlsEoSZIA4b4+zOSMYBXQln0yrKVN2K4ALmW+UjaFWu4Pnr2dB+pum338a LnetLne3E1XwvIFF7t3o1sY3EyWvItjehLE3DxjctDDOnCjQdq45hKmH66q2Kt0cH+Z0wF rk0VDBkhLfAuJ6My0SK0MohkK3grqI4GGId62P3KqIb0W48dGWV883rQaSYQ6JhpSiJLt8 WeZF+yz+VYL4Gyc07CckzFtoZh64bq04S0bh9stdCD9fb0FsbDvbrpPVIaUCuy6Fq08v2E 2yRNEgZTlILpL0VB195F+mzY/LJjHRvUgH1X8ox0/hE/H1yJUooRoixe67JfSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=brwx+QA/Y/E5RCDxqXstAW90XzqfIXqf9DvHVUy35hg=; b=o/atSv+otktYkVyrQbqqD6TvaKlpDggZHofiYQ6MVcs/jygUpNWKcpE9aNpWhsR3YbXmqX x73h3Hfu2KEywqqCVjwkc4FSeRFLVEHgKxuW6EQyRablYKPmqp9QeEp0XRKzskZix2Xxkt hTl4xdvDMg2GhjdCZGrUc6Kpj58C/YCBDGTFPbf967AfkUJAhRBZ7Dc00JfxvcKI5Z7uXC 1Q5YnQD1sjEVdMqhZBch95i8FdglvFvBK3bIGgkaMXkkXruCWuZInJ+0ruM/TQeQ2A8XEX J7BcVPwvfIpNgN4j9uIK2rD5B2bDEBb0R5bT0ddONZek5heiJ/gLuXxQQKdtmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925125; a=rsa-sha256; cv=none; b=ZkMDFL3wZRxDTO8hoi448biV8Yg/5Dkzd6I/GIEVtEr7etbpvhDZ+jxfZmENvSa6WsvTV/ LOZGPv33J9bpRmZzWLkH3dIRZ2cV3xxH+uby3cGDTe6R6UUaY1POZV5ICS5KsbncA9ZER4 70H9tKlFSoD6ZRj98n4Je1afwRkevOiysewr4cFKWyZrmTgfk65PWX2fMBbKn4pddblf6t drHSCJUaN5SyXuUP9wMIA65ExlWyKQXFSJSSW04Z5ZPxSbAmlz4d6dIVVUWbsHKFT1zEmo 2SkhXlNYtD0QTBGVC8W8klr8Di5z76g40kjGCJFkujlhbnFuvsXvSgYKQ2L65g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTK21xNz1Bgr; Sun, 9 Jul 2023 17:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq5Xm098725; Sun, 9 Jul 2023 17:52:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq5bv098724; Sun, 9 Jul 2023 17:52:05 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:05 GMT Message-Id: <202307091752.369Hq5bv098724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: cb2f2faa6dbd - main - kerberos5: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb2f2faa6dbd39ac97f6db540dfa8326f6c4ecca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2f2faa6dbd39ac97f6db540dfa8326f6c4ecca commit cb2f2faa6dbd39ac97f6db540dfa8326f6c4ecca Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:21 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:21 +0000 kerberos5: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40926 --- kerberos5/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 0d52313977ce..9d86711940ce 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -11,7 +11,7 @@ CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include WARNS?= 1 CWARNFLAGS.clang+= -Wno-absolute-value -.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) +.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_LIBCOMPAT) OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} From nobody Sun Jul 9 17:52:06 2023 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 4QzZTL6fxfz4mVxv; Sun, 9 Jul 2023 17:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTL4M4zz3v7M; Sun, 9 Jul 2023 17:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9WSacfbN6lHh5MMccYVcJUh7Q9X8VuP2kPFzI4bCfI=; b=PLQJYlbxc4flhYofk85CaVqvCZqlY51iz1SbWLrCB45dNIEWl/8tqCdQZrFMUJnYLbWt6e LWqUIFGj9JWeX+RCEWmhyliJubPIpKcG1uic0dPKQ+COGu5V+wT1ilCQhIke1kh24pcphj 0LlKpgjuvegqzyfKGJijD6PSP/5pg2wW6jw/8SOSQYEHkVh+I0CqV0TKtQKNhRuJs5dg7d xcONMSRvNjN3o+S8z78v02s+yBmY0ddh98ZfeQmPUwS2HORb2P7jmgtOL3QPX5naNFH84c WUvYJDX1wSMO0kmT7zIX8fBT6J/HSYXGBldHEKQ1Rcxx5DvA4npHiPiH+zR7uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9WSacfbN6lHh5MMccYVcJUh7Q9X8VuP2kPFzI4bCfI=; b=Q4vy7f3aEhtieWcs9DmkpaN/45y1hdyLi7D3uEMZ06QbUnS5s7R7xlyxjDJ8tRLX4A5XLe zmR1ZI1O7sL8jb6frgcHDEmgAvCk1hAHho2t3eLsRLd+bmoeCg0H6OivELgJYW++P9B6aM ZHec2UlYsszMhF0TJpAr7BHLmR9R35U8wg+udnzjoGxjsANlchFyHtmFzhCFWOnEttVZ+5 ZFSS55wd5rOp6nvUMAsDvlKBQHhZ2SaM3tfeyhg7zwJJmQ6aZC+njY3AGPj+jgEisEK4BG TVOtlF+fvuZp7lJtiZeXECOy3iStCKG51arvrvmc53AolV21Egolc0XUeUMKww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925126; a=rsa-sha256; cv=none; b=KR7VbAXv9ckWDGMMOtxSER3fiHELO1k764+g3eMFU4GiqKoGPoslcXRkA4s8bRX7CFLOgz VM4Clx9ZJn9Sxa3JPZdA5Ctk28CbmH85li4JYJoUM5IB267HGrTaQzwtH2xudDyIZfLzoZ MZCF9bME+6bHOqZ/93uF1cRigfoT1Qd29fRmRKPOuVxzvDmcodT9cs7Jj3cxFgmvdiYL83 MdDszx+XugpxC10U9gXLYS3ql3OE6vYUqE/zMF0r/sN9duHHoseLbZtqjw/kXgxPsi2Qdk YyhkfX6T0dATSLt4XPIm/Mdd6PH8cCzZgwghFWvPRIoUIk9nOldhMgr1gg/E4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTL2xLYz1Byx; Sun, 9 Jul 2023 17:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq6nY098744; Sun, 9 Jul 2023 17:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq6Dm098743; Sun, 9 Jul 2023 17:52:06 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:06 GMT Message-Id: <202307091752.369Hq6Dm098743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: daf2519ea2f4 - main - geom: Migrate from COMPAT_32BIT to generic COMPAT_libcompat 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daf2519ea2f4d3a1e397188d25f7f0a5377e6521 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=daf2519ea2f4d3a1e397188d25f7f0a5377e6521 commit daf2519ea2f4d3a1e397188d25f7f0a5377e6521 Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:28 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:28 +0000 geom: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40927 --- lib/geom/Makefile.classes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/geom/Makefile.classes b/lib/geom/Makefile.classes index d4e6f52e65ae..e6ac93294e1b 100644 --- a/lib/geom/Makefile.classes +++ b/lib/geom/Makefile.classes @@ -1,9 +1,9 @@ # $FreeBSD$ -.if !defined(COMPAT_32BIT) +.if !defined(COMPAT_libcompat) GEOM_CLASS_DIR?=/lib/geom .else -GEOM_CLASS_DIR?=/usr/lib32/geom +GEOM_CLASS_DIR?=/usr/lib${COMPAT_libcompat}/geom .endif GEOM_CLASSES= cache From nobody Sun Jul 9 17:52:08 2023 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 4QzZTf6XfDz4mW1Z; Sun, 9 Jul 2023 17:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTP1N3fz3v9y; Sun, 9 Jul 2023 17:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OviadEwt0Enl281sNYnh/mI1+9Qn9hYlrA3RQBNcAJA=; b=McNBaidOq/lA5lyG4Yc83tPbMeDWyvoy8kavf8/dyfSpr/Tky4giS+CIBqjeWfOyJKhL2D lVYhMyi0JyXyPS3YjwIRaZ6zb3fLh3lGIS2lSbNv/nYxBbJPrdnl9mCsbALNb3R99NfdLp XFZVuHzI7rem5OqUuqOBeAbSxA6R2DGnRf6YUBsSxdW2YRS66KZIOzgtVTCiH5g0wutSJy HCbQ4yOq9Fb6ObiP5nBkStparWWWCJMcG4ddMBEqSooKq9XH3hGtSrAq/r5ymkVqtcLs79 NbWGzcEebxKmvJaTxhBDcFF3c+R3ZL9LRAygJfuLVA+7PRPEzZ6DaxsFZ1cJNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OviadEwt0Enl281sNYnh/mI1+9Qn9hYlrA3RQBNcAJA=; b=JdKq7M0Q0h5v3GnzX+XAu9XlWYsbsAM5B10wtxAbNrboy7Ec/HoCXwD8EaVwhZbCIT9Nsx QBJjA98blJF+QNCak3OAproI1tkHlTqJOcyBMvgJ6Z4OcGjSRNaJshBw4xaZ9urEhm3Xa3 QTEwGu6vHxzLv6vu7kH6NXuyyYAwbgn5OlBcF6IKQdtrvnDht1fLT3+vMJL33Vjbt+cdWP a4jG0Vjd17g+b5PlmOGKHay4Il9+FjjSlh9hR0GEXF0PlU9cU2b08ZysIitUZaphLEwAJi YRItGdA4eJxT7mj1eY57KOTMXuooRKIZuTtNM73GRHtDrED8Yeuxet4FiUnwGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925129; a=rsa-sha256; cv=none; b=SIi3x8YdNykWezZOeeVLJuslrbXgh+nxeYfgVljWz5o8e6J+9ue+bFfe9p15GO+70/yWpM jWNjWBeMuf8IdS1JLp2iyrC1KkqI6rHM4VaRo+0vrW4+S9Rr+yatBcMAs5N5uzm1lbHf4v 4/IUEXjwQnSV1ia/x8FdN8SBHVAclrFRXznk2fG6UMEDEKFeAC4HQfkczKwhU8jRo5jr8v K4LKpjVYK32E3+E+UZw/gww437lMDYQ3Zloza80oUf6hap7luWstBO3G1dwPgccNAaKy0A Up9PDUxoQ9fgbNaCPgvgMpZBhetZKOK6ywGBRakqk6L4WCbuGQ6gDiz/lIHfQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTN5ZYyz1BNm; Sun, 9 Jul 2023 17:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq8CY098786; Sun, 9 Jul 2023 17:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq8xK098785; Sun, 9 Jul 2023 17:52:08 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:08 GMT Message-Id: <202307091752.369Hq8xK098785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 45be5010ce04 - main - libsysdecode: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45be5010ce04d254793ed97a1320249e347726b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=45be5010ce04d254793ed97a1320249e347726b0 commit 45be5010ce04d254793ed97a1320249e347726b0 Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:43 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:43 +0000 libsysdecode: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT The use isn't any more generic, just the variable itself, which will allow COMPAT_32BIT to be removed. The fact we even have to check COMPAT_LIBCOMPAT here in order to pass the right flags to CPP points at our libcompat infrastructure not suitably modifying the CPP variable (which we barely use for world; this and bsd.symver.mk are the two uses, and the latter could benefit from the right flags too), but this change doesn't attempt to fix that. See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40930 --- lib/libsysdecode/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 6fb32caebcb1..eb977c3564ac 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -112,7 +112,8 @@ MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ CLEANFILES= ioctl.c ioctl.c.tmp tables.h tables_linux.h -.if defined(COMPAT_32BIT) +# XXX: The flags should come from bsd.compat.mk / Makefile.libcompat +.if ${COMPAT_LIBCOMPAT:U} == "32" CPP+= -m32 .endif From nobody Sun Jul 9 17:52:10 2023 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 4QzZTg0C9Dz4mVxw; Sun, 9 Jul 2023 17:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTR06Z5z3v5H; Sun, 9 Jul 2023 17:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LnqNjCMQggKcnNYe90Fy3KcBdkC0vgdxC/8oCurBHo=; b=Y79+T/dtMu2rBQVzOoueaCRPFuzYJrHmZekOWaGMNUPnmtwZbFvcv8+BDxOvDwEv5EnmqB VzA1wO+wZ7GUq18exhASY55CSnyX8UfNTu4Ka1pW8eGx5wNN0BHRYEm133vmykBUjhjg8z kTnnKY2cjRIxJ4Oo0AX2igJSkaDe/hwHljZ/pQzgBKKaM/NbS+Xw4CpKq3K2iDi5NiXldD Wv9sqtjGRl8+OPhmm3Ww9PVoGK1wZfYwHrblIRLictecp1M3Okwzu7Q/ZuTf0RnljqOWqB AVEok3E/qfaLsB7wn5kajYCxT3TWIJD8BhCvQguEFwzN4u+dYsUFOCJMH6ifwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LnqNjCMQggKcnNYe90Fy3KcBdkC0vgdxC/8oCurBHo=; b=do+QW93Nws2b3aJsazu4IRrGjHp/sHmg2SftFYiGwBaCHR3b0agNPAm4WGXOkTT8gALkc3 oEjvq7qfP3wzynsB7Cw0P4CwyLMuJyIfoIL5OvCbWM1aIbeuXMUQDCqgzXORxDmfQ3wxET rdhcUcjgRTwz71CKYClNoXwn3SdqYqDlgMKX9ljQjurIa0+M3txghndyezcuQwE5CXW6Si Y4lwc6vbhJfr+t4lAvLJouBr8osGs/L6eTKWsS7Ujn2YHest/2OAHqe6+KDoj5suzyo5SF MFkI+n7x+iaM0vIAIUvb+t9vt7DWLDBCnvsRD4Yn+B8yd1A2vy8ZmCV1E5VjFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925131; a=rsa-sha256; cv=none; b=FOizeTOnXoGKKl0ZVpFHhqgOIVbkKIQUeimI5OdBH83A14ncfxuDi82rsozWx9/0YJW8cf aUndxNlmfB89KqwHAIhqrAbVSd3R7FdXHo1dKsXfJDCHUmi1wGo0rGnWxo1zidOgVDFJxN 0ivOqpLF//jESbePW9aiq4smVDmRejLIErLQ2AkcvJcyxKAljzBNHCK5rgu62tdqI5l5tq DHCLEKvNQpjx4rvQ+cIJxG/R9tw1hBpraZptCPKZNTd0ZFFDzg9PAmQBH5tuYXMmedNRsf sDtAo09gBk35jdpB9xLc+XkCNsVZpgwETMcYTm2F5qLzncat9bkcjMjux1tEqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTQ65kBz1C01; Sun, 9 Jul 2023 17:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HqAwO098830; Sun, 9 Jul 2023 17:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqApP098829; Sun, 9 Jul 2023 17:52:10 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:10 GMT Message-Id: <202307091752.369HqApP098829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1840dc06e135 - main - bsd.compat.mk: Remove obsolete COMPAT_32BIT now it's unused 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1840dc06e1355a1acb540f76390ff3497f54d1ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1840dc06e1355a1acb540f76390ff3497f54d1ff commit 1840dc06e1355a1acb540f76390ff3497f54d1ff Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:03 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:03 +0000 bsd.compat.mk: Remove obsolete COMPAT_32BIT now it's unused See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40932 --- share/mk/bsd.compat.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 4b9bd7b621d2..cda3efd6cd63 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -68,9 +68,7 @@ LIB32WMAKEFLAGS= \ LIB32WMAKEFLAGS+= NM="${XNM}" LIB32WMAKEFLAGS+= OBJCOPY="${XOBJCOPY}" -LIB32CFLAGS= -DCOMPAT_32BIT LIB32DTRACE= ${DTRACE} -32 -LIB32WMAKEFLAGS+= -DCOMPAT_32BIT LIB32_MACHINE_ABI= ${MACHINE_ABI:N*64} long32 ptr32 .if ${COMPAT_ARCH} == "amd64" LIB32_MACHINE_ABI+= time32 From nobody Sun Jul 9 17:52:14 2023 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 4QzZTm5dRZz4mVxx; Sun, 9 Jul 2023 17:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTV4Yz5z3tvt; Sun, 9 Jul 2023 17:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOUkyftvO7PYAT0TYPbz8BwBm8Y9bbj/7zvwcKk8+sc=; b=hdwTmgKMnmxQWX1Qo54S0ePshdTMKk2XyV5hCSXBLpkMhYmlOnmjq/Mq2h8QHjUNlXuBgl gGxMfha1QVQQtSxH5vkdjmbxy9Guk25bpbn6DU9To/ozx4jY9KH7k7XLmY1Dh3YqlHlXSp o36RDROwe3pwFmQCw1dxKoDDqFkBDQ8Wr0T5b8dYapYeDnvLB3xybdHwD4e/Y1H5N3rVhT Z5beD10hSPOWzQddVUWBiPnAGWpli/NZ8Rn7gmXA4bbykaPAbI5RDoNZlmRs1G/xoSliWL xY/FVxRdL0mLmY1lAYSszzwYMKQquz7q7wLVoPPZEhCJak6jG/38YGOHUT5gMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOUkyftvO7PYAT0TYPbz8BwBm8Y9bbj/7zvwcKk8+sc=; b=BUxRogziwDhfN5zC6Z7xNxur5RTOtFXpSKQ5khigBAzShkwOWaRCQTNj5skdTsYqNmN1da D6wmicotxBVofBsAyllWy7QNX+F5qUDk+Ra+6dfg+ffPTgRPof/YTM5qAWArp0Fo/ABTXm 8dmOSXVtOwPQt7q3iId+YFrKe9dqZJdbTFvWD4peCFTatX2TcJUs70mlyNLA4fbbZR/2ju vY4oF0j1a4NJan2HohVDuoU/LvAJ488rhHhsZwDRGxwZzpjLZnEK52FK2QGBlSqEuzAgZb edci6RkEeY7f9CUa+AMCbtl8SNK9xpIkylEoRUIolqfKCp/YCHQ3sR+pgyjknQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925134; a=rsa-sha256; cv=none; b=kM2s88qi3FplymacwxccPbxGoB9SsONMhXqfsb9LRS2HNiE5x0U33+r7ra8IdksM9isNg8 FTkRM/knqfJsH6HEv2sgMGvq5AQ9gZCabA2qs+vndqR696dftN2PXhK3M5F98fQ+hZygXU 91HLcpjqIq1acZXjNLzOWJYhopTBk0X2OfR1HfibtsqxkXpZWJCfrk4O454vvNMxhUjm7T 2mvVeRp/o/wdFvjxK1t4PhIFbd7kKEd6jEozjnuX1yVFBvsanpk8ApGe8/D61PMvNBn5ZK uDs5+q+2FM76mnfeXvpwefWecZ0KrniI2ompgnzO2wkiPJUyoEDz2PTMWJwoMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTV21mQz1BvB; Sun, 9 Jul 2023 17:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HqEIP098893; Sun, 9 Jul 2023 17:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqErX098892; Sun, 9 Jul 2023 17:52:14 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:14 GMT Message-Id: <202307091752.369HqErX098892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 076a4dc59b2b - main - rtld-elf: Remove _PATH_ELF32_HINTS and _COMPAT32_PATH_RTLD 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 076a4dc59b2baec42e395064da3bbdb2c5be6ad7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=076a4dc59b2baec42e395064da3bbdb2c5be6ad7 commit 076a4dc59b2baec42e395064da3bbdb2c5be6ad7 Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:30 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:30 +0000 rtld-elf: Remove _PATH_ELF32_HINTS and _COMPAT32_PATH_RTLD These are no longer referenced, with the one user of each now using the double-underscore version with "32" as an argument instead. Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40935 --- libexec/rtld-elf/rtld_paths.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libexec/rtld-elf/rtld_paths.h b/libexec/rtld-elf/rtld_paths.h index fd61da4507ee..35f30b1d831b 100644 --- a/libexec/rtld-elf/rtld_paths.h +++ b/libexec/rtld-elf/rtld_paths.h @@ -87,14 +87,6 @@ #define TOKEN_LIB "lib" _RTLD_COMPAT_LIB_SUFFIX #endif -#ifndef _PATH_ELF32_HINTS -#define _PATH_ELF32_HINTS __PATH_ELF_HINTS("32") -#endif - -#ifndef _COMPAT32_PATH_RTLD -#define _COMPAT32_PATH_RTLD __PATH_RTLD("32") -#endif - #ifdef IN_RTLD extern const char *ld_elf_hints_default; extern const char *ld_path_libmap_conf; From nobody Sun Jul 9 17:52:07 2023 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 4QzZTf72s2z4mVdv; Sun, 9 Jul 2023 17:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTM6sqzz3v3R; Sun, 9 Jul 2023 17:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvhh/2XrraeGUYIJ7HgjdnhnkzvlKRGQEdnKnwYP7MU=; b=J8rWm4z0fqc9P65sBT5VBn4q1nsMn5dkWLUdRhcBHqVz5uRNTvB1uzJxZABO/M5UfPfJkE OLwFTs/EYEh9x0FdBFRyMRKP9pLi2KcoEMtp3ycMEF4750DBpuJ9bdBdOXCFg69UnCtQU3 UhjJ1lgN6ijNYnecgvzS3gPbzvcwm6Fnwexe5jrc64DUZ58k2BspBpCR3ILfi+LA+lKf3O X5d05M6rvYD2Md+JNbz4hseeZmuLwPphLVxQd8UKHeGK67GB+ibCxQ4rq4bGVoCQr3cjZT YY14pwOh7Qo3rlSWS+VDBp+nEC7NyTCuhM5Ekjcmdvnv7zEfj75cPHrpa4Z+HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tvhh/2XrraeGUYIJ7HgjdnhnkzvlKRGQEdnKnwYP7MU=; b=GCTo+5YIkdffg0S9tLd8xyaVJ9On7osOyU9dUB4KPNlsKLNMbPtstbUEwY413+b5gjiUQk gjXxwAIFgabJPMNtv86CErEePRLmRKTLqX69WNCNQSqvURzNxMDLpo5PMCHfbWsp/OIt0I kNmRVct1Q1k7TDkDS4Ld1ooI3Thgc07M0We6IqEeGvp2OiRQS5+5SkRTrqRcpCc65DroXn R0Nw6qRUYNvSGjOEqFJZsj/eyWThWSXGrtriS+lSq+z7GIfQw54YOvO0ix+YnBq6dP9sgf 9Hl928pmpUksJzXrWLVXxPfaGq4yHqk9n7f9yUwC/VyNm5DIRfXsIAvbAF6r3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925128; a=rsa-sha256; cv=none; b=PylIzno3Ho36mDiZn8S3YS8xPDXt1e4OcENdF71cDhOE927RB/DAqGcAO0ouuN0xcNRM0U sA+0JGwqUNjCH+t1QijzqOhJM7jLtTr87EHtSEI8c7kWlroBVyi7z53hMTEf0Vqnc/cYg/ cAiqvO52ho68btkzfi5HcAfkXBaggdJiuN2R5uXVKe1v3gz7FbUTvgq8k5WT4BOyRUXZwo xlKZsUlcg1ZkJ0z/2OBHtK272eD7AKmhG50ht+aVeTEAFpQnlSMVPUviu8gfHGC/iwuKge 8H14CC9f7kS57wfxm4XHqtaksdTc80ircPjpoPNUavKrTPxpdVi822T3OsfEEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTM5KtNz1BNk; Sun, 9 Jul 2023 17:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq7nH098763; Sun, 9 Jul 2023 17:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq71M098762; Sun, 9 Jul 2023 17:52:07 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:07 GMT Message-Id: <202307091752.369Hq71M098762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d7be70f0ff9a - main - libiconv_modules: Migrate from COMPAT_32BIT to generic COMPAT_libcompat 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7be70f0ff9a2a3cf2a980e5c8214666d85a463b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d7be70f0ff9a2a3cf2a980e5c8214666d85a463b commit d7be70f0ff9a2a3cf2a980e5c8214666d85a463b Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:35 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:35 +0000 libiconv_modules: Migrate from COMPAT_32BIT to generic COMPAT_libcompat See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D40929 --- lib/libiconv_modules/Makefile.inc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 364e78c9bf85..85600c84576e 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -7,10 +7,6 @@ CFLAGS+= -I${SRCTOP}/lib/libc/iconv CFLAGS+= -Dbool=_Bool -.if !defined(COMPAT_32BIT) -SHLIBDIR= /usr/lib/i18n -.else -SHLIBDIR= /usr/lib32/i18n -.endif +SHLIBDIR= /usr/lib${COMPAT_libcompat:U}/i18n LIBDIR= ${SHLIBDIR} MK_PROFILE= no From nobody Sun Jul 9 17:52:09 2023 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 4QzZTf66PYz4mVdt; Sun, 9 Jul 2023 17:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTQ172Hz3tsX; Sun, 9 Jul 2023 17:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ieQV7/cMStoBXXP1CyuMzoT+gI8MOfRSUDkOG825AzM=; b=wnURqzIsvpPfjCEsADaNzJvmxpRhPAL5bvWj0A8hlSue3exekOZpn0iiz8AcvgOFAlGU8J 0nHmMhzJ6dpYlEft1ZqSlXWZ0tTTKeFi0VAb7jgyatAdE+hbZaHHiCr87fel9Dtc9B5dcs 2WsSWd14+nhhmy1VYqkkGL/sCcnqGaCGWiyXi2EGrAA32cDsQKU0ceYPXXHNzJZ5mUj4BL prtKfqnp/qU0r6yyI4ssFd5iGM7PHnVfQIp6d41mFSwsJpRdfsjB0bI1vXIJEF+PG04hZ/ Y8o7xoMbR3jArVpSuFgbM4/utJpsS5oBbf3fSwIACFYSU9sO0vf7nRcNnyxz+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ieQV7/cMStoBXXP1CyuMzoT+gI8MOfRSUDkOG825AzM=; b=DAgYRIOW7kYlsYCYM89v9JcJ+IaULcc+Sk22QirI8dz4l4uKzVNxo+HqqGP9+VqiB4/bsw fwA3P5BGzA4rmXChfD5fG1i6TVRL4YLivFJMbr4Zo1rQDowc6w26wF8Ew2RSSOF33Pe+JR 9pq8oEtlKKxxUfAg90e/NiX3/N1N+2KDzQP7cbbuIz02H2QdfMzDh0SrGbXmvK0nNAz9Ra q/QWfC420+qOW6qyVGTLK/KjR7EiRp0II0d9aBCI9KIy6bTmdD6srenqCSFt/Nd0Vhe4fT p5hhJYOBC0qTjd2UlY+mI1Mz/bbDQ+M+A5Q1AmlZNlpxrllfC2pJYVNVvJ1vKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925130; a=rsa-sha256; cv=none; b=a+C4lDBpWOQ7y8AX4sUhZRFbPzAeda56Jc9oCc8ZCNAnfLDo+zxeefLCFkmNyrir0YtIYc 6oJKuuTSamEVX9SUnEzQjuVlX6QJPafhHZMRbvWrCOU6azZ6tLvw9a7suF/CgswUtGgfsy 3Ngfj4lMZWLZg8bMDULklrS/3MgJpNVryoEBhz2X298RRfq2eBw7fUV/JDFR5yqPwepB0L 1iGF39CPRDKX5o+Fe3xzfz05J4ELEy5vW946CFQrfYlvo/FSw0p07nwbDKgJWRa8patb4w 1jW4CFrkDnRnNzl+hhdatu28kmpcEesv7jiwKT1yh4Xl/rUaWSgCdRwgg5FVBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTP5P5Vz1C00; Sun, 9 Jul 2023 17:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq9VB098808; Sun, 9 Jul 2023 17:52:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq9T7098807; Sun, 9 Jul 2023 17:52:09 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:09 GMT Message-Id: <202307091752.369Hq9T7098807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3864bd4fd217 - main - lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3864bd4fd217f46e4c9126ca2c48db96c44682ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3864bd4fd217f46e4c9126ca2c48db96c44682ef commit 3864bd4fd217f46e4c9126ca2c48db96c44682ef Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:53 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:53 +0000 lib: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT In the process, delete a COMPAT_SOFTFP remnant that was missed in previous sweeps. See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40931 --- lib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index d82fca7c5c69..47ff3cec7ebf 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -148,7 +148,7 @@ SUBDIR_DEPEND_libpcap= ofed .endif SUBDIR_DEPEND_nss_tacplus= libtacplus -.if !defined(COMPAT_32BIT) +.if !defined(COMPAT_LIBCOMPAT) SUBDIR+= flua SUBDIR_DEPEND_flua= libjail .endif @@ -160,7 +160,7 @@ SUBDIR.${MK_BLACKLIST}+=libblacklist SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp SUBDIR.${MK_BSNMP}+= libbsnmp -.if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP) +.if !defined(COMPAT_LIBCOMPAT) .if ${MK_CLANG} != "no" || ${MK_LLD} != "no" || \ ${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no" SUBDIR+= clang From nobody Sun Jul 9 17:52:11 2023 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 4QzZTm5LWxz4mW1b; Sun, 9 Jul 2023 17:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTS1lHcz3v8g; Sun, 9 Jul 2023 17:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwT+A1qAokLSRrfFfnRykXGlLpUQfZ/+eeHDe/FC/FQ=; b=McpxmrgNs95XuK93Y2oP6Bfrp7sbjjdDBfkJ2Cc7BWfa5JWp6CYW+W8df+R9Gm9Fs+ptXZ co2fJ+tR3lnHnm4HTGc70DpUswfAlfDhkFWsda/kClrotSFjruVMUu1gC0X/8CYeyjSmZJ kr5ZR1R3hQ0CZmeDrZMfWMIWKhFNaFhTyjFo/HMgfGLWfP+sRfJ610lCFYALuWE3Siqr49 adXgv1OkCDvQ7ABrvzglpcx0x5F20W1QMTXsRVyFbNRVApLOQU9BlroWP/VPpckZhE3XhZ 3IoloPaeLfIz9tuzisVFus3mB9wdhi2OjoNXBb+TbIunfzIRyrjylISdcJ7QYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qwT+A1qAokLSRrfFfnRykXGlLpUQfZ/+eeHDe/FC/FQ=; b=WsDSXqrhbXm+uAPyrXkIE/k6pZSvKoHtVnTAipAdm9rLlFMX1z3zAnaJk+fZRn5DVuxzi0 sUTpFP1oyG7XbnsGzA+xeJ+J+VaaA6dvxeFSO56vFIcfmd+8UZdCV0eQ4juvE4EFpWhal/ HSqccjEtvqN9zj24pTIPm5OLORLIiAfEIiOfyUzS94cGzs+QPvJhAhz1OIftZiuJo1zn3l T1cV0cFWlY1416E6BD8EcWiLP5+rA8ehmoKlArgyPURqIIQojKk/NJyaJXhPRQSUSREe0g RMQKPRU21KPfLs0XrXvdOyeHeNV8sX5U/yF2ohcGhUexA1Z4IKzF8+YQYY8XmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925132; a=rsa-sha256; cv=none; b=dwaRKn5zJsy44UJWQ9HZ5LZ++sZNcrRD4/iWEci1fQ+3teqCWXoTE62jwgSjOB5SOMSKTF 9jAefHvsidrus2zUoBORYQbf2j/C2VtxJHjKJJaoiOfJ9lALwoEdG5oDpitkimz4muCMie CXwwX4ijHdftclWF9rs1j7S0V63sbwQAPNV150Nh4SuhdM6o44qf67dKwa0SY0Y45nln5+ uwks8Ko0suIA1quErAI37+2LnTqdVpmwNMcXcwCHvyEK4bh+dN06/Aw+1KnXp3hkR0iyNJ wvKHmpiLFI7/zi/uH+4dgjpKR6mrH61Q59EVhFmT3+eswCE/DVb/RifniD9fCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTS0s7Tz1C2F; Sun, 9 Jul 2023 17:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HqBiE098849; Sun, 9 Jul 2023 17:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqBwf098848; Sun, 9 Jul 2023 17:52:11 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:11 GMT Message-Id: <202307091752.369HqBwf098848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1e635e87e3e2 - main - ldconfig: Use __PATH_ELF_HINTS("32") over _PATH_ELF32_HINTS 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 commit 1e635e87e3e2e1b5cdf2cbfe9a2a2900c60810a6 Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:15 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:15 +0000 ldconfig: Use __PATH_ELF_HINTS("32") over _PATH_ELF32_HINTS This will allow the latter to be removed, reducing the boilerplate needed for a new libcompat. Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40933 --- sbin/ldconfig/ldconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c index 47e26ad8367c..2f5cdbd6505e 100644 --- a/sbin/ldconfig/ldconfig.c +++ b/sbin/ldconfig/ldconfig.c @@ -77,7 +77,7 @@ main(int argc, char **argv) } if (is_32) - hints_file = _PATH_ELF32_HINTS; + hints_file = __PATH_ELF_HINTS("32"); else hints_file = _PATH_ELF_HINTS; while((c = getopt(argc, argv, "Rf:imrsv")) != -1) { From nobody Sun Jul 9 17:52:13 2023 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 4QzZTg052Cz4mVbT; Sun, 9 Jul 2023 17:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzZTT29kyz3v8j; Sun, 9 Jul 2023 17:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTVZsg2QDqnQWI2F/5IQTb1mRH30yVcDAGOT4kXBrts=; b=wr+j3hJ7gGIq5kXI35EEq1u+Ps5STZjQOQbnysSRMtw72tD/FIXhArpYmnMzvHzE1Uiv8p NXeO3PrAErYk5HdUhBRS0zRD2qzo+jDTo++kCojwjXNEdyUH4Z9k2o+fBVFYhZtrUTGJa6 FRxNiP0eUYjy7regrGIlHCuNfo18GPg1HrN46BaOkqkD01u7jx/oqhZE3E/7GxeEZUvK84 CZlcLgIxbcnoBlvY13cokwROkNlnD0ltaPLjmXIIk4MkDwY9vmuvZa1pk8ybQtHr/PCEp8 q16PvnHf19BSCwiJrtAAddL0pWwgOJtzXrNAS7JYyjmd5vqhhujstYv3BS9UEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PTVZsg2QDqnQWI2F/5IQTb1mRH30yVcDAGOT4kXBrts=; b=Sav1LfAiDWu5W+SL3dcuYCT248nVr+fL8IlIoW8KjJIUKmAFmcFwtQNjENNyKHmmVhivAe 9/I9R1UmY3Zb72e+74CWJBv4gs3Bdom2UslT0Mab2OzOfrA7UAbptgkMuPwDumEcK2iOer 4zE+yeBJtwWQ2Jzf29mDoI6h3Gw0T9pA2oTsl3gvC2xSiHu4bJiYu0gojoyMULW/qqssuD 2kBMqLtYB9tNOE2S4InLm8mxPvj1xxvXW2kdHA0CL8JNVVVEbIi7xALCgNUBLyUG2tOp9/ l+pSKiPz4JZBvNSq/aNzMsc+Bw9D7EYmQUSFdjd4bf2znPfGiKmIyrHSTl3pDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925133; a=rsa-sha256; cv=none; b=HfhLe4GhW15vEoax9UnHFRKNSrNLfGNVLz8iyVpyOH5CrC5/zk7WNEq5mo5N3vXVY9cDCj 91sXSxF+TqcYyYsodCRK5naxS3BgHMBbRJVwCS5O8IMNO1GKGifq/cM2kAOOPEyI40jQ4e 3SsYkEFucahC2kow0IKkzFtSoewOwZxrUw+/7AreKkyf7KS6yZTqXZucku9M6JnhwcL5GI zD1d3QfPEzwSBVuVtFkTpYXnl2NATG9xWPXvxDGnPG2X8vXVHmBRHJ6BijCOT6GtUshHH7 S76084gvJCbmgdRqv1hAmae8rM4IyMfaYh3U7j1wFko1u+M1hemnSc87WaCwHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzZTT0z5jz1Bgt; Sun, 9 Jul 2023 17:52:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369HqDwT098870; Sun, 9 Jul 2023 17:52:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369HqD5l098869; Sun, 9 Jul 2023 17:52:13 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:13 GMT Message-Id: <202307091752.369HqD5l098869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e17dd921a22e - main - ldd: Use __PATH_RTLD("32") over _COMPAT32_PATH_RTLD 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17dd921a22e846b31d99c15344ad8d0171bc7d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e17dd921a22e846b31d99c15344ad8d0171bc7d5 commit e17dd921a22e846b31d99c15344ad8d0171bc7d5 Author: Jessica Clarke AuthorDate: 2023-07-09 17:50:24 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:50:24 +0000 ldd: Use __PATH_RTLD("32") over _COMPAT32_PATH_RTLD This will allow the latter to be removed, reducing the boilerplate needed for a new libcompat. Reviewed by: kib, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40934 --- usr.bin/ldd/ldd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 4f5555e34610..148df2df9468 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -236,7 +236,7 @@ main(int argc, char *argv[]) rtld = _PATH_RTLD; #if __ELF_WORD_SIZE > 32 && defined(ELF32_SUPPORTED) if (type == TYPE_ELF32) - rtld = _COMPAT32_PATH_RTLD; + rtld = __PATH_RTLD("32"); #endif if (is_shlib == 0) { execl(rtld, rtld, "--", From nobody Sun Jul 9 19:04:19 2023 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 4Qzc4h0Gr9z4lNpy; Sun, 9 Jul 2023 19:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qzc4g6xrJz4FG8; Sun, 9 Jul 2023 19:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688929460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiXh16UZmUwQY3GNJfvKbOzBS8Tbq+bj9hl25jabtkk=; b=xJNOUhXTLSA6wt1Z+YT2jXhQJcuuFdOlbVfpheQ7qzdG1GutmAscFzUsyTntQfstI6TrRy wd+tD+LoQ8c7sZyuJAKDGxSMtDY6/CyedoUmikIO5ere7F39wI5ef9fC7Gh8/5kns0rKh5 CnFNViI0x2Nt2k3yX13Kwi/nBrV+PkJnisR+cxtW+be8vSbQOK50gt5N8M+6Gp4eIGtWty thSUkWpDuchQQgybnYlwxfoC03jx6Ts/lT1T9HbMCkJ8MaBGOIMDsYi396fBnd4Slw+ZOJ 9+EEghhP9tNRLF1V7l+H2FrkpxKRJstK5cFPS51ZSfwtoZNzaQbDTIVQzQNYlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688929460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jiXh16UZmUwQY3GNJfvKbOzBS8Tbq+bj9hl25jabtkk=; b=Mp8pv6PiRuPh3wgJ3EeU5ExzoM6cI6IcCKtPNCzVIXUoxTThMRN10NC1CeTJWy1oIWCF33 aMBJOhIXuvTQm5AlkWB8895kGuPhwi/7rG5S7uEsjSR1HPoHpNxYG9W+cbM4jt6hpkypMS vy61YG7al8nEGKWZxvkGEXNiCibTNa22dRfTcE0dj8lXmZpbEL6quMYd4VYyxTVTgfM5nC YfbDMjvW7glDFbPVJ7elXKZWghUyg20zelbp1JuG9syc22koRC6hVy3ahIBIEseyGPJHV2 N8mB8+l8JjKUYSxmSepGkGpLd9mFkmvJyjK+05GoNWNMNNaT1nhpBONtnbNCFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688929460; a=rsa-sha256; cv=none; b=fhGeoQSgnvZk8UtsKK7GsFd1A3Poms1xNfp3SReGqpq9PFfKVsglUFmK2ObtTtCuV/BvWI 9Q1FLWM2q/XPtZL83PlJaqW9OdlVGy/AiTK1HzMnwiWxjkiNRUXLBLj/lmmQYneohvJuTK uNOpbb2kYlaOLH5XCWa3C4q5EPrVCB+B2/URzEIubQdUwYAt7mnwj+YEbaVyEhQk/BUu71 xrfalPB1VLfVOxHb5jG0nyHeWWaiKks+ohbQv42+z2rwYNOBpacx/9dIh6VdHUItmbzmXJ oQLjIAUNVMA79A4RGo4EA1Hw6ksSpUkDTnKT7X7G3z7t2uvpgKT2/NA1sXy10A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qzc4g62BxzFQF; Sun, 9 Jul 2023 19:04:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369J4JCl017662; Sun, 9 Jul 2023 19:04:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369J4Jau017661; Sun, 9 Jul 2023 19:04:19 GMT (envelope-from git) Date: Sun, 9 Jul 2023 19:04:19 GMT Message-Id: <202307091904.369J4Jau017661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 89240e0ab60a - main - hwpmc(4): update DEBUGGING section details 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89240e0ab60a29a47c9af9f952a09a7f2e1bb72c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=89240e0ab60a29a47c9af9f952a09a7f2e1bb72c commit 89240e0ab60a29a47c9af9f952a09a7f2e1bb72c Author: Mitchell Horne AuthorDate: 2023-07-09 19:01:55 +0000 Commit: Mitchell Horne CommitDate: 2023-07-09 19:03:54 +0000 hwpmc(4): update DEBUGGING section details The examples I wrote previously do not work. We parse the flags using explicit names, not the shortened flag suffix. Fix the list of major flags, and add a compact list of minor flags. Fix the examples, and tweak some wording for clarity. Reviewed by: jkoshy, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Fixes: 5fc97cc32553 ("hwpmc(4): document debugging options") Differential Revision: https://reviews.freebsd.org/D40913 --- share/man/man4/hwpmc.4 | 68 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4 index 1794adb66460..1b99e8c8439c 100644 --- a/share/man/man4/hwpmc.4 +++ b/share/man/man4/hwpmc.4 @@ -558,32 +558,65 @@ logged to the trace buffer. .Pp .Nm trace events are grouped by 'major' and 'minor' flag types. -The major flag groups are as follows: +The major flag names are as follows: .Pp -.Bl -tag -compact -offset indent -.It CPU +.Bl -tag -width "sampling" -compact -offset indent +.It cpu CPU events -.It CSW +.It csw Context switch events -.It LOG +.It logging Logging events -.It MDP +.It md Machine-dependent/class-dependent events -.It MOD +.It module Miscellaneous events -.It OWN +.It owner PMC owner events -.It PMC +.It pmc PMC management events -.It PRC +.It process Process events -.It SAM +.It sampling Sampling events .El .Pp The minor flags for each major flag group can vary. -For the full list of flag groups, consult -.In sys/pmc.h . +The individual minor flag names are: +.Bd -ragged -offset indent +allocaterow, +allocate, +attach, +bind, +config, +exec, +exit, +find, +flush, +fork, +getbuf, +hook, +init, +intr, +linktarget, +mayberemove, +ops, +read, +register, +release, +remove, +sample, +scheduleio, +select, +signal, +swi, +swo, +start, +stop, +syscall, +unlinktarget, +write +.Ed .Pp The .Va kern.hwpmc.debugflags @@ -591,18 +624,19 @@ variable is a string with a custom format. The string should contain a space-separated list of event specifiers. Each event specifier consists of the major flag name, followed by an equal sign (=), followed by a comma-separated list of minor event types. -To track all events for a major group, an asterisk (*) can be given instead. +To track all events for a major group, an asterisk (*) can be given instead of +minor event names. .Pp For example, to trace all allocation and release events, set .Va debugflags as follows: .Bd -literal -offset indent -kern.hwpmc.debugflags="pmc=all,rel mdp=all,rel" +kern.hwpmc.debugflags="pmc=allocate,release md=allocate,release" .Ed .Pp -To trace all process events, as well as context switches: +To trace all events in the process and context switch major flag groups: .Bd -literal -offset indent -kern.hwpmc.debugflags="prc=* csw=*" +kern.hwpmc.debugflags="process=* csw=*" .Ed .Pp To disable all trace events, set the variable to an empty string. From nobody Sun Jul 9 20:07:00 2023 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 4QzdT04ZFFz4mNSF; Sun, 9 Jul 2023 20:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzdT046Bfz4PZm; Sun, 9 Jul 2023 20:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688933220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NO/lND5QITqyybQCjOo+G2S50+GawOtq7ThssV5oADA=; b=MHfG1mHeef1GIvfTpJQm8igzk7hOFqfcqz1QSmCvBnITBGtHoo1n7c5oBhF+haaIzKuL1u l11Zq09QvNBFSBZwZErwXhq8Zhsw5ogf5YHg+GNz/mt36C1KhmuUDAaNJAQQrcDYB1W8Aw Cp43EfvR5jL+3JAJ+2/KUEwoObbni7r0VlMq7phJbJPdIIFfcIaiqQhBeAQjJ8+PWb4tEx s38OrtY6LlFbHG+zqRd0Hu3pLUopo9zb6fUK+cHd5PjAp7Mu0YUg7CcZSs0Tb4sl7qU7rJ yqRwOh3+RXyO4+v2TPsE4xEUa5FcLIk7qVy1KOW/6mITMBi/VN92UMpKznvd5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688933220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NO/lND5QITqyybQCjOo+G2S50+GawOtq7ThssV5oADA=; b=q+v1Dd991HpwKaCuDDH5emdru9mWmwvFbg5ZJ33ytxTIbu739fdeadh+V0Alxwqt+RBNBZ OiPKxPY1EMugGcPwdtF6QKCf9pOKFZLgeLzqN108jdBAOvc85m0I7L+0Tuf6ZVXjCJ6cqO cIMYKti3b23KHf5DZ23b6eEpwaBVfgpBK2vQTJyFcWLGxSE1UH1ZlPKA72yb/MSQQtwgmf MrPJ5x9UfjcxE4qT9Gm2pHPuuciu7Zwy+08sFT26aJHeMlVl9oWgQpfc9hrPXrznDMPygz lj3asLVPWWr4nM95yOR0AK78Puh86xgJcGJ3IB+SN0FnG8HVu2CakkgmySpgYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688933220; a=rsa-sha256; cv=none; b=vExBEn41LJ4isxLQjGHZddrsfRvJ/l3LKik86IjrYzR6Iuoy/aLj7EZ8us+XPLE0XQBYDI W0visNoPaOKKmKGD3xXMGHPc6cePV0P+aHOAXZRRxrwYM8LTcI7K5H+oFjvDEzedpbBZKW VbcAS0susVXKIdgsz75LcjpHsC0riuORVv8M2zOD6stQ241X5cFYLmq4n8/9Ud1xzWzUbd E4cOT11XutXC7BSB1WtHNLO6Hw96V/+QIg2N4PYWzlJfyB9MepOHVfcV6mX08miDxCx8g8 6DwuZxxgLVKT/ZNnyW6Jen0Q0r2iWNXcL2xuGuUl0PVpDr08dPS8sKgfE5xTzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QzdT03BFlzGVF; Sun, 9 Jul 2023 20:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369K70H7016542; Sun, 9 Jul 2023 20:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369K703B016541; Sun, 9 Jul 2023 20:07:00 GMT (envelope-from git) Date: Sun, 9 Jul 2023 20:07:00 GMT Message-Id: <202307092007.369K703B016541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 16e01c05c09e - main - radix_trie: avoid code duplication in insert 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16e01c05c09e4223103fa36e4057f7ed3b92146b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=16e01c05c09e4223103fa36e4057f7ed3b92146b commit 16e01c05c09e4223103fa36e4057f7ed3b92146b Author: Doug Moore AuthorDate: 2023-07-09 20:06:02 +0000 Commit: Doug Moore CommitDate: 2023-07-09 20:06:02 +0000 radix_trie: avoid code duplication in insert Two cases in the insert routine are written differently, when they're really doing the same thing. Writing that case only once saves 208 bytes in the compiled vm_radix_insert code and reduces instructions executed by about 2%. Reviewed by: alc Tested by: pho Differential Revision: https://reviews.freebsd.org/D40807 --- sys/kern/subr_pctrie.c | 51 ++++++++++++++++++-------------------------------- sys/vm/vm_radix.c | 50 ++++++++++++++++++------------------------------- 2 files changed, 36 insertions(+), 65 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index cf09903556ec..ae8408a6e1ef 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -256,17 +256,16 @@ pctrie_toval(struct pctrie_node *node) } /* - * Adds the val as a child of the provided node. + * Make 'child' a child of 'node'. */ static __inline void -pctrie_addval(struct pctrie_node *node, uint64_t index, uint16_t clev, - uint64_t *val, enum pctrie_access access) +pctrie_addnode(struct pctrie_node *node, uint64_t index, uint16_t clev, + struct pctrie_node *child, enum pctrie_access access) { int slot; slot = pctrie_slot(index, clev); - pctrie_node_store(&node->pn_child[slot], - pctrie_toleaf(val), access); + pctrie_node_store(&node->pn_child[slot], child, access); node->pn_popmap ^= 1 << slot; KASSERT((node->pn_popmap & (1 << slot)) != 0, ("%s: bad popmap slot %d in node %p", __func__, slot, node)); @@ -361,13 +360,13 @@ int pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) { uint64_t index, newind; - struct pctrie_node *node, *tmp; + struct pctrie_node *leaf, *node, *tmp; smr_pctnode_t *parentp; - uint64_t *m; int slot; uint16_t clev; index = *val; + leaf = pctrie_toleaf(val); /* * The owner of record for root is not really important because it @@ -375,58 +374,44 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) */ node = pctrie_root_load(ptree, NULL, PCTRIE_LOCKED); if (node == NULL) { - ptree->pt_root = (uintptr_t)pctrie_toleaf(val); + ptree->pt_root = (uintptr_t)leaf; return (0); } - parentp = (smr_pctnode_t *)&ptree->pt_root; - for (;;) { + for (parentp = (smr_pctnode_t *)&ptree->pt_root;; node = tmp) { if (pctrie_isleaf(node)) { - m = pctrie_toval(node); - if (*m == index) + newind = *pctrie_toval(node); + if (newind == index) panic("%s: key %jx is already present", __func__, (uintmax_t)index); - clev = pctrie_keydiff(*m, index); - tmp = pctrie_node_get(ptree, allocfn, index, clev); - if (tmp == NULL) - return (ENOMEM); - /* These writes are not yet visible due to ordering. */ - pctrie_addval(tmp, index, clev, val, - PCTRIE_UNSERIALIZED); - pctrie_addval(tmp, *m, clev, m, PCTRIE_UNSERIALIZED); - /* Synchronize to make leaf visible. */ - pctrie_node_store(parentp, tmp, PCTRIE_LOCKED); - return (0); - } else if (pctrie_keybarr(node, index)) break; + } else if (pctrie_keybarr(node, index)) { + newind = node->pn_owner; + break; + } slot = pctrie_slot(index, node->pn_clev); parentp = &node->pn_child[slot]; tmp = pctrie_node_load(parentp, NULL, PCTRIE_LOCKED); if (tmp == NULL) { - pctrie_addval(node, index, node->pn_clev, val, + pctrie_addnode(node, index, node->pn_clev, leaf, PCTRIE_LOCKED); return (0); } - node = tmp; } /* * A new node is needed because the right insertion level is reached. * Setup the new intermediate node and add the 2 children: the - * new object and the older edge. + * new object and the older edge or object. */ - newind = node->pn_owner; clev = pctrie_keydiff(newind, index); tmp = pctrie_node_get(ptree, allocfn, index, clev); if (tmp == NULL) return (ENOMEM); - slot = pctrie_slot(newind, clev); /* These writes are not yet visible due to ordering. */ - pctrie_addval(tmp, index, clev, val, PCTRIE_UNSERIALIZED); - pctrie_node_store(&tmp->pn_child[slot], node, PCTRIE_UNSERIALIZED); - tmp->pn_popmap ^= 1 << slot; + pctrie_addnode(tmp, index, clev, leaf, PCTRIE_UNSERIALIZED); + pctrie_addnode(tmp, newind, clev, node, PCTRIE_UNSERIALIZED); /* Synchronize to make the above visible. */ pctrie_node_store(parentp, tmp, PCTRIE_LOCKED); - return (0); } diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index d2cd2c2536fd..f6bdda70539b 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -281,17 +281,16 @@ vm_radix_topage(struct vm_radix_node *rnode) } /* - * Adds the page as a child of the provided node. + * Make 'child' a child of 'rnode'. */ static __inline void -vm_radix_addpage(struct vm_radix_node *rnode, vm_pindex_t index, uint16_t clev, - vm_page_t page, enum vm_radix_access access) +vm_radix_addnode(struct vm_radix_node *rnode, vm_pindex_t index, uint16_t clev, + struct vm_radix_node *child, enum vm_radix_access access) { int slot; slot = vm_radix_slot(index, clev); - vm_radix_node_store(&rnode->rn_child[slot], - vm_radix_toleaf(page), access); + vm_radix_node_store(&rnode->rn_child[slot], child, access); rnode->rn_popmap ^= 1 << slot; KASSERT((rnode->rn_popmap & (1 << slot)) != 0, ("%s: bad popmap slot %d in rnode %p", __func__, slot, rnode)); @@ -401,13 +400,13 @@ int vm_radix_insert(struct vm_radix *rtree, vm_page_t page) { vm_pindex_t index, newind; - struct vm_radix_node *rnode, *tmp; + struct vm_radix_node *leaf, *rnode, *tmp; smrnode_t *parentp; - vm_page_t m; int slot; uint16_t clev; index = page->pindex; + leaf = vm_radix_toleaf(page); /* * The owner of record for root is not really important because it @@ -415,57 +414,44 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) */ rnode = vm_radix_root_load(rtree, LOCKED); if (rnode == NULL) { - rtree->rt_root = (uintptr_t)vm_radix_toleaf(page); + rtree->rt_root = (uintptr_t)leaf; return (0); } - parentp = (smrnode_t *)&rtree->rt_root; - for (;;) { + for (parentp = (smrnode_t *)&rtree->rt_root;; rnode = tmp) { if (vm_radix_isleaf(rnode)) { - m = vm_radix_topage(rnode); - if (m->pindex == index) + newind = vm_radix_topage(rnode)->pindex; + if (newind == index) panic("%s: key %jx is already present", __func__, (uintmax_t)index); - clev = vm_radix_keydiff(m->pindex, index); - tmp = vm_radix_node_get(index, clev); - if (tmp == NULL) - return (ENOMEM); - /* These writes are not yet visible due to ordering. */ - vm_radix_addpage(tmp, index, clev, page, UNSERIALIZED); - vm_radix_addpage(tmp, m->pindex, clev, m, UNSERIALIZED); - /* Synchronize to make leaf visible. */ - vm_radix_node_store(parentp, tmp, LOCKED); - return (0); - } else if (vm_radix_keybarr(rnode, index)) break; + } else if (vm_radix_keybarr(rnode, index)) { + newind = rnode->rn_owner; + break; + } slot = vm_radix_slot(index, rnode->rn_clev); parentp = &rnode->rn_child[slot]; tmp = vm_radix_node_load(parentp, LOCKED); if (tmp == NULL) { - vm_radix_addpage(rnode, index, rnode->rn_clev, page, + vm_radix_addnode(rnode, index, rnode->rn_clev, leaf, LOCKED); return (0); } - rnode = tmp; } /* * A new node is needed because the right insertion level is reached. * Setup the new intermediate node and add the 2 children: the - * new object and the older edge. + * new object and the older edge or object. */ - newind = rnode->rn_owner; clev = vm_radix_keydiff(newind, index); tmp = vm_radix_node_get(index, clev); if (tmp == NULL) return (ENOMEM); - slot = vm_radix_slot(newind, clev); /* These writes are not yet visible due to ordering. */ - vm_radix_addpage(tmp, index, clev, page, UNSERIALIZED); - vm_radix_node_store(&tmp->rn_child[slot], rnode, UNSERIALIZED); - tmp->rn_popmap ^= 1 << slot; + vm_radix_addnode(tmp, index, clev, leaf, UNSERIALIZED); + vm_radix_addnode(tmp, newind, clev, rnode, UNSERIALIZED); /* Serializing write to make the above visible. */ vm_radix_node_store(parentp, tmp, LOCKED); - return (0); } From nobody Mon Jul 10 03:06:42 2023 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 4QzpnN20dHz4dTjG for ; Mon, 10 Jul 2023 03:06:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzpnM4wqPz3Bwh for ; Mon, 10 Jul 2023 03:06:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20221208.gappssmtp.com header.s=20221208 header.b=MB1ZUTcN; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52b) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-51de9c2bc77so4688816a12.3 for ; Sun, 09 Jul 2023 20:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1688958406; x=1691550406; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=jHqaaayDAY40vfY4VazXVWRsz3dtsSzo6Ykik1KSfZc=; b=MB1ZUTcNN35pt6sEAgAR/wH2sD5N18igBz0leghgCIoJgQJ27/jXmPLiNUuZdyo57d MsHpbxQH4T/btlNLI3jjJRcA40QruvS9O3jJAcptGH88sx52PKKzVRAbuTSogqwMGaD0 bv3EYcoqthK/SfpT4+zjljzpPhgQz4WxHTJ6jMgHg+29wrVx0UxHc74EX0X58Vix2su8 Daz8Hh5kWWDwZs1ZdP3T3fRYXMoKkPbkL5RUZSrY6g70iPSC7pgS8Ci3Q7gYuEQnBSag 13PPkf8O/+EVrIcf8vxg1LhXxXIFG0zg3fzIEAeIIehx3xRJ0SWQ+BTJIXtXq+ty6bDC yhBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688958406; x=1691550406; 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=jHqaaayDAY40vfY4VazXVWRsz3dtsSzo6Ykik1KSfZc=; b=UAI03ZfTwPBnnNu7Ja10Andldk3xvTs60F/0y62QKGTRIV584jrvA3LQwGuN4uebRa Bq5x49AHGpjE+akkszc8g+wj71zfe815cDqBljKz9v6w/FAwVYt/xe/4R+tZARfnZWzU 4jXPosGjMyQ7tkvghQVTgliupHR+N1VeIhmKWZqZ8geLKB82Z+rdtbb12C5X/H/cO504 gDKGz86BRp1JiBcoBcOu7XAqBhGXmpp1WSXUg4plLMdJWJGH+VC/YeaFpx5oEa/QKh7J Q2dgitoD2pBxrj0GUytkecG0YkZQJkgfF9P/UlMYX+sKeqdF5gCvZMS/c1cqTaHVOV+G jh+Q== X-Gm-Message-State: ABy/qLY5K9Mel3csW6Kz3NXoR6UNKvprCL6VkhMLwNvTxoaf3rfcnTu8 KYWVbVMvvOo6PPvWUZeJWmdG8B3oCNq7rzv7YRXOxQ== X-Google-Smtp-Source: APBJJlEVE2HCzKNZ7Bg34NOn1qWidwtJjYhJlubxyXB//ZfQJilm1XTs4UsjgvnWHLFtR8Ywts+x0gJrZ567kvK0xXw= X-Received: by 2002:aa7:d751:0:b0:51e:36b8:34fa with SMTP id a17-20020aa7d751000000b0051e36b834famr10370467eds.4.1688958405872; Sun, 09 Jul 2023 20:06:45 -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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202307072123.367LNZ4J060993@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sun, 9 Jul 2023 21:06:42 -0600 Message-ID: Subject: Re: git: 29cbe944e928 - main - CONTRIBUTING.md: minor changes To: Alexey Dokuchaev Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000d29e0d06001945cf" X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.995]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20221208.gappssmtp.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52b:from]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20221208.gappssmtp.com:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4QzpnM4wqPz3Bwh X-Spamd-Bar: -- X-ThisMailContainsUnwantedMimeParts: N --000000000000d29e0d06001945cf Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Jul 8, 2023 at 12:15=E2=80=AFAM Alexey Dokuchaev wrote: > On Fri, Jul 07, 2023 at 09:23:35PM +0000, Warner Losh wrote: > > commit 29cbe944e9287c2e61928c456512d3990aaffdaa > > > > CONTRIBUTING.md: minor changes > > > > - Misspelled GitHub > > - angle bracket not escaped correctly > > - Double white spaces > > You've removed them, while they are typically used after full stops > as texts render better with them unless you're using proportional > font. > It's the modern way.... but WuerfelDev also had a commit that backed that part out that I didn't fold in... I'm still torn since I see so many conflicting things about it :( I'm leaning towards putting them back. Warner > ./danfe > --000000000000d29e0d06001945cf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Jul 8, 2023 at 12:15=E2=80=AF= AM Alexey Dokuchaev <danfe@freebsd.= org> wrote:
On Fri, Jul 07, 2023 at 09:23:35PM +0000, Warner Losh wrote:
> commit 29cbe944e9287c2e61928c456512d3990aaffdaa
>
>=C2=A0 =C2=A0CONTRIBUTING.md: minor changes
>
>=C2=A0 =C2=A0- Misspelled GitHub
>=C2=A0 =C2=A0- angle bracket not escaped correctly
>=C2=A0 =C2=A0- Double white spaces

You've removed them, while they are typically used after full stops
as texts render better with them unless you're using proportional
font.

It's the modern way....=C2=A0= =C2=A0 but=C2=A0 WuerfelDev also had a commit that backed that part out tha= t I didn't fold in...
I'm still torn since I see so many = conflicting things about it :(

I'm leaning tow= ards putting them back.

Warner
=C2= =A0
./danfe
--000000000000d29e0d06001945cf-- From nobody Mon Jul 10 05:05:10 2023 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 4QzsQ245qHzZWGp; Mon, 10 Jul 2023 05:05:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzsQ225Wmz3Q5N; Mon, 10 Jul 2023 05:05:14 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id ISutqVWF9LAoIIj5Fq9wW0; Mon, 10 Jul 2023 05:05:13 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id Ij5DqrKfjcyvuIj5EqDJHk; Mon, 10 Jul 2023 05:05:13 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=64ab9189 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=ws7JD89P4LkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=eHKdCDTTfJ6lRacp5KoA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id D7E1935ED; Sun, 9 Jul 2023 22:05:10 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id B5B503BC; Sun, 9 Jul 2023 22:05:10 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kristof Provost cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio() In-reply-to: <202307091618.369GI9O5036946@gitrepo.freebsd.org> References: <202307091618.369GI9O5036946@gitrepo.freebsd.org> Comments: In-reply-to Kristof Provost message dated "Sun, 09 Jul 2023 16:18:09 +0000." 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 09 Jul 2023 22:05:10 -0700 Message-Id: <20230710050510.B5B503BC@slippy.cwsent.com> X-CMAE-Envelope: MS4xfN3fPKg/M5hO/edYBBBAdSpaIJ3d+Zv7tfIQpL+7FdeDCyOyAWuJGNqv5aCMHoxPNouL0mqk5KV2ARhVAtDRJ211yuQ3052+A0gPSYFUTcCWHhWCx4FA LrXPkiCAXxPepg/YvHej5KYBJYIyJ0dsUxQV9QstC2bgq/AwC8YRIboAQ77jO4jdsaHC9z/APCu5cK0A3OA2JA9zmrz8fRxZPg/fB0KFY6+0/yABWI3R8yDO xClMmhdSi7Q7V2/kIU75kFS9/auB3Z6vp9ciM/OPRE6anCY+74zg6ZlWqYYcfVptdEBrwRVkxCq8OMeU7a0NNYrZRpjrDURbxfMuTKJoYpc= X-Rspamd-Queue-Id: 4QzsQ225Wmz3Q5N X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202307091618.369GI9O5036946@gitrepo.freebsd.org>, Kristof Provost w rites: > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f0730c > 4d37afec > > commit ebd508a0b2719e15575e8a2224f0730c4d37afec > Author: Kristof Provost > AuthorDate: 2023-07-07 19:25:34 +0000 > Commit: Kristof Provost > CommitDate: 2023-07-09 13:18:21 +0000 > > openssl: include d2i_KeyParams() and d2i_KeyParams_bio() > > These functions are new, and some ports (e.g.opensc) expect to have them > available. Add the file they're defined in to the build, and add them > to Version.map. > > PR: 270076 > Reviewed by: markj, emaste, pierre > Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") > Sponsored by: Rubicon Communications, LLC ("Netgate") > Differential Revision: https://reviews.freebsd.org/D40914 > --- > secure/lib/libcrypto/Makefile | 4 ++-- > secure/lib/libcrypto/Version.map | 2 ++ > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile > index 4421ea0b0855..89f330ca2800 100644 > --- a/secure/lib/libcrypto/Makefile > +++ b/secure/lib/libcrypto/Makefile > @@ -69,8 +69,8 @@ SRCS+= a_int.c a_mbstr.c a_object.c a_octet.c a_print. > c a_sign.c a_strex.c > SRCS+= a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c a_verify.c > SRCS+= ameth_lib.c asn1_err.c asn1_gen.c asn1_item_list.c asn1_lib.c > SRCS+= asn1_parse.c asn_mime.c asn_moid.c asn_mstbl.c asn_pack.c bio_a > sn1.c > -SRCS+= bio_ndef.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_string.c i2d_ > evp.c > -SRCS+= n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c > +SRCS+= bio_ndef.c d2i_param.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_s > tring.c > +SRCS+= i2d_evp.c n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_p > key.c > SRCS+= t_bitst.c t_pkey.c t_spki.c tasn_dec.c tasn_enc.c tasn_fre.c > SRCS+= tasn_new.c tasn_prn.c tasn_scn.c tasn_typ.c tasn_utl.c x_algor. > c > SRCS+= x_bignum.c x_info.c x_int64.c x_long.c x_pkey.c x_sig.c x_spki. > c > diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Version. > map > index 421819324961..93dbdcb7f1cb 100644 > --- a/secure/lib/libcrypto/Version.map > +++ b/secure/lib/libcrypto/Version.map > @@ -5490,6 +5490,8 @@ OPENSSL_3_0_9 { > b2i_PVK_bio_ex; > d2i_AutoPrivateKey_ex; > d2i_ISSUER_SIGN_TOOL; > + d2i_KeyParams; > + d2i_KeyParams_bio; > d2i_OSSL_CMP_MSG; > d2i_OSSL_CMP_MSG_bio; > d2i_OSSL_CMP_PKIHEADER; > This patch results in the following error: .pico x509_vfy.pico x509_vpm.pico x509cset.pico x509name.pico x509rset.pico x509spki.pico x509type.pico x_all.pico x_attrib.pico x_crl.pico x_exten.pico x_name.pico x_pubkey.pico x_req.pico x_x509.pico x_x509a.pico -lpthread ld: error: duplicate symbol: d2i_KeyParams >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:20) >>> d2i_param.pico:(d2i_KeyParams) >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:20) >>> d2i_param.pico:(.text+0x0) ld: error: duplicate symbol: d2i_KeyParams_bio >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:50) >>> d2i_param.pico:(d2i_KeyParams_bio) >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d 2i_param.c:50) >>> d2i_param.pico:(.text+0xE0) cc: error: linker command failed with exit code 1 (use -v to see invocation) *** [libcrypto.so.30.full] Error code 1 make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto --- all_subdir_secure/lib/libcrypto/engines --- --- all_subdir_secure/lib/libcrypto/engines/loader_attic --- make[5]: stopped in /opt/src/git-src/secure/lib/libcrypto/engines *** [all_subdir_secure/lib/libcrypto/engines] Error code 2 make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto 2 errors make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Jul 10 05:11:18 2023 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 4QzsY60R3PzZWT3; Mon, 10 Jul 2023 05:11:22 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QzsY54LZRz3QRM; Mon, 10 Jul 2023 05:11:21 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id IT3QqOUer6NwhIjBAqzfDv; Mon, 10 Jul 2023 05:11:20 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id IjB9qyPe33fOSIjBAqn0Th; Mon, 10 Jul 2023 05:11:20 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=64ab92f8 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=ws7JD89P4LkA:10 a=VxmjJ2MpAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=I9AIGisueR6QO5UAR_0A:9 a=CjuIK1q_8ugA:10 a=07TSrdiEtzkA:10 a=7gXAzLPJhVmCkEl4_tsf:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id DB3553654; Sun, 9 Jul 2023 22:11:18 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id A6B40448; Sun, 9 Jul 2023 22:11:18 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Cy Schubert cc: Kristof Provost , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ebd508a0b271 - main - openssl: include d2i_KeyParams() and d2i_KeyParams_bio() In-reply-to: <20230710050510.B5B503BC@slippy.cwsent.com> References: <202307091618.369GI9O5036946@gitrepo.freebsd.org> <20230710050510.B5B503BC@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Sun, 09 Jul 2023 22:05:10 -0700." 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 09 Jul 2023 22:11:18 -0700 Message-Id: <20230710051118.A6B40448@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJX8W5PQ6kBCIbSZXUHL8TnM+qn6IAbndXjgnONyv7uXOpcClpQPoYeXjiW2V83rvwRDXE0QUg1FrkIwSen4MhSZqq8EeOrSbnwHT5/UFjyxKYlTgiJR c5cgsctJAmjzDHPp+oxPe93VmwKBYqGNXc2yUwbmqXe1dwMsqRmDm3PdD1WZWifSs10Us9722DrgGI2207sSz7YmBf7oFg/M5KYFDN3DSgJcijRPTfWEajj5 U2LUFSCLI0qbnvWRxufOKHAL8PReWUFLvNDSkQR6lTTLfgHAcwI9DTA1jlJ7dd0vEpQd0b/XhZj4FgQl8RnHwwzTOhl8UcbiVQ3hiTl4wBo= X-Rspamd-Queue-Id: 4QzsY54LZRz3QRM X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <20230710050510.B5B503BC@slippy.cwsent.com>, Cy Schubert writes: > In message <202307091618.369GI9O5036946@gitrepo.freebsd.org>, Kristof > Provost w > rites: > > The branch main has been updated by kp: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=ebd508a0b2719e15575e8a2224f073 > 0c > > 4d37afec > > > > commit ebd508a0b2719e15575e8a2224f0730c4d37afec > > Author: Kristof Provost > > AuthorDate: 2023-07-07 19:25:34 +0000 > > Commit: Kristof Provost > > CommitDate: 2023-07-09 13:18:21 +0000 > > > > openssl: include d2i_KeyParams() and d2i_KeyParams_bio() > > > > These functions are new, and some ports (e.g.opensc) expect to have the > m > > available. Add the file they're defined in to the build, and add them > > to Version.map. > > > > PR: 270076 > > Reviewed by: markj, emaste, pierre > > Fixes: b077aed33b7b ("Merge OpenSSL 3.0.9") > > Sponsored by: Rubicon Communications, LLC ("Netgate") > > Differential Revision: https://reviews.freebsd.org/D40914 > > --- > > secure/lib/libcrypto/Makefile | 4 ++-- > > secure/lib/libcrypto/Version.map | 2 ++ > > 2 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile > > index 4421ea0b0855..89f330ca2800 100644 > > --- a/secure/lib/libcrypto/Makefile > > +++ b/secure/lib/libcrypto/Makefile > > @@ -69,8 +69,8 @@ SRCS+= a_int.c a_mbstr.c a_object.c a_octet.c a_print. > > c a_sign.c a_strex.c > > SRCS+= a_strnid.c a_time.c a_type.c a_utctm.c a_utf8.c a_verify.c > > SRCS+= ameth_lib.c asn1_err.c asn1_gen.c asn1_item_list.c asn1_lib.c > > SRCS+= asn1_parse.c asn_mime.c asn_moid.c asn_mstbl.c asn_pack.c bio_a > > sn1.c > > -SRCS+= bio_ndef.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_string.c i2d_ > > evp.c > > -SRCS+= n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_pkey.c > > +SRCS+= bio_ndef.c d2i_param.c d2i_pr.c d2i_pu.c evp_asn1.c f_int.c f_s > > tring.c > > +SRCS+= i2d_evp.c n_pkey.c nsseq.c p5_pbe.c p5_pbev2.c p5_scrypt.c p8_p > > key.c > > SRCS+= t_bitst.c t_pkey.c t_spki.c tasn_dec.c tasn_enc.c tasn_fre.c > > SRCS+= tasn_new.c tasn_prn.c tasn_scn.c tasn_typ.c tasn_utl.c x_algor. > > c > > SRCS+= x_bignum.c x_info.c x_int64.c x_long.c x_pkey.c x_sig.c x_spki. > > c > > diff --git a/secure/lib/libcrypto/Version.map b/secure/lib/libcrypto/Versio > n. > > map > > index 421819324961..93dbdcb7f1cb 100644 > > --- a/secure/lib/libcrypto/Version.map > > +++ b/secure/lib/libcrypto/Version.map > > @@ -5490,6 +5490,8 @@ OPENSSL_3_0_9 { > > b2i_PVK_bio_ex; > > d2i_AutoPrivateKey_ex; > > d2i_ISSUER_SIGN_TOOL; > > + d2i_KeyParams; > > + d2i_KeyParams_bio; > > d2i_OSSL_CMP_MSG; > > d2i_OSSL_CMP_MSG_bio; > > d2i_OSSL_CMP_PKIHEADER; > > > > This patch results in the following error: > > .pico x509_vfy.pico x509_vpm.pico x509cset.pico x509name.pico x509rset.pico > x509spki.pico x509type.pico x_all.pico x_attrib.pico x_crl.pico > x_exten.pico x_name.pico x_pubkey.pico x_req.pico x_x509.pico x_x509a.pico > -lpthread > ld: error: duplicate symbol: d2i_KeyParams > >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d > 2i_param.c:20) > >>> d2i_param.pico:(d2i_KeyParams) > >>> defined at d2i_param.c:20 (/opt/src/git-src/crypto/openssl/crypto/asn1/d > 2i_param.c:20) > >>> d2i_param.pico:(.text+0x0) > > ld: error: duplicate symbol: d2i_KeyParams_bio > >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d > 2i_param.c:50) > >>> d2i_param.pico:(d2i_KeyParams_bio) > >>> defined at d2i_param.c:50 (/opt/src/git-src/crypto/openssl/crypto/asn1/d > 2i_param.c:50) > >>> d2i_param.pico:(.text+0xE0) > cc: error: linker command failed with exit code 1 (use -v to see invocation) > *** [libcrypto.so.30.full] Error code 1 > > make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto > --- all_subdir_secure/lib/libcrypto/engines --- > --- all_subdir_secure/lib/libcrypto/engines/loader_attic --- > > make[5]: stopped in /opt/src/git-src/secure/lib/libcrypto/engines > *** [all_subdir_secure/lib/libcrypto/engines] Error code 2 > > make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto > 2 errors > > make[4]: stopped in /opt/src/git-src/secure/lib/libcrypto > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > > Never mind. I have a patch in my tree that addresses this same problem resulting in the above error. Sorry for the SPAM. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Jul 10 13:16:49 2023 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 4R04KG1fpBz2tv1h; Mon, 10 Jul 2023 13:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R04KG1BjWz45WL; Mon, 10 Jul 2023 13:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688995010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rNRoJOHtXw9SSVrB1/WsOs1LxbumYGkzCJ1cuTlGkI=; b=p5SSnPt+xwD5H9LqA1KEuh2WRjiafm3wvbgElXB+d/WWX0fll0YiE2XN/PG+IsUE50jNLQ GCd67yMBNkYBX1bzJUZp3YABVIeP17Igt+FxP2nd8Fm+pkdDakeJEbnCbzY4pd3OyAd4yT 61L65zcVGiulmn9Llovpw1nLWx5Smr2yqMQQAmDW5XK5C1/s/N5a+6YLiS4VHJQk5kq8Fk BVUG1bzw6xKqML0Ji2ainvwQgoyVWND0j0FbvihJCv3Q/9GU3AEizYknYC6U8jxo0IHss+ Um3ygZhG69hxTJWArRlUY9qGUcnJn/zoJvoH/netIsAakcPFRAT68TC2GFrW0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688995010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rNRoJOHtXw9SSVrB1/WsOs1LxbumYGkzCJ1cuTlGkI=; b=yPhUA7NqkV2XLw+yEMhFXhNg2AdUVDc8IO6wTaaqmtADmh9Qnigb3d+MD+liIg/b61Fr+5 OdjW1crz9tsUFHpn7Ym/cmtB7mcgoIiEMG+wm1R+SND4JRTZNW7nuXlpGSSdIuSXWur8qJ 1SscqcJXe57W9R+MsnbCUmftg34p/utgLFyDqb0Pvo/TyrARvHKCXf/DZCh/ZB6nbr3eFI f/Src61kkgHU5/TseszucEXx9UKQanfNADwfQX0BVwawatNfjyYJjh1WDUJG4aWMJaM9Xa R95galYALWulNE4gfklJ/HDJRRg4aMz1HP9a97+piQzXlL1jcfS2EggsRVe38w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688995010; a=rsa-sha256; cv=none; b=Xm9ybzc09ohQPB9TjSxxGOKW5rQzE+sbetyyZgy2/kY3XimrcCeRhv2sDiEUe1eeNJ3oFn tHZsas2VdJ5QwB4EwJwtQseawi3UpAtCpDoNuXVqfsEMpD/Aa/QW/Vv3vs8u5tuQgmoQL9 /Wyaa2QWCEXBtb6Qs4fdF7IsZ1td3Aq85G43a9smes+1uuB+Q+AVuh5OKQc4tlkthUE4Gd kvwxU1pV9c/WMlKK8bHi+p7nS3lw+dJ4gUS7CZETL6pXghg4FHcR8UIcJkiMfK6jir91h1 SBB5mHHw0UqzbVSZEciJ4gopGTZeX9xfqhrlQNrKNaw65Ks9Kw+GyRQVQSUTrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R04KG095rzlmZ; Mon, 10 Jul 2023 13:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ADGnDb040553; Mon, 10 Jul 2023 13:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ADGnQR040552; Mon, 10 Jul 2023 13:16:49 GMT (envelope-from git) Date: Mon, 10 Jul 2023 13:16:49 GMT Message-Id: <202307101316.36ADGnQR040552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 8ab2da68283b - main - Remove GCC 4.2 include dirs 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ab2da68283b7228f2caa7e7df173d6d46a224f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8ab2da68283b7228f2caa7e7df173d6d46a224f9 commit 8ab2da68283b7228f2caa7e7df173d6d46a224f9 Author: Mitchell Horne AuthorDate: 2023-07-10 13:16:13 +0000 Commit: Mitchell Horne CommitDate: 2023-07-10 13:16:13 +0000 Remove GCC 4.2 include dirs These are present (and empty) on a system installed post-GCC removal. Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D40878 --- ObsoleteFiles.inc | 2 ++ etc/mtree/BSD.include.dist | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 154f0d837599..bde97dfecb53 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -8427,6 +8427,8 @@ OLD_DIRS+=usr/include/c++/4.2/debug OLD_DIRS+=usr/include/c++/4.2/bits OLD_DIRS+=usr/include/c++/4.2/backward OLD_DIRS+=usr/include/c++/4.2 +OLD_DIRS+=usr/include/gcc/4.2 +OLD_DIRS+=usr/include/gcc # 20200220: Upgrade of ncurses, shlib bumped to version 9 OLD_LIBS+=lib/libncurses.so.8 diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 055c1f9485fa..3187bcca7e53 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -185,10 +185,6 @@ unionfs .. .. - gcc - 4.2 - .. - .. geom cache .. From nobody Mon Jul 10 14:14:12 2023 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 4R05bT0mG1z4dSQn; Mon, 10 Jul 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R05bT0J4xz4LCR; Mon, 10 Jul 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688998453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaKPCgbuK7CCJmN1KY+P3X0orBpHIzjmmbbfofWo43E=; b=nzlvHIG4M2AbuizMuvHLr6FoXwhdhucDODKeBevGkO//5g9Nj1z3FkxmIHL3YtImN1icCq rvCVjAJMR+I4Fp8Ek/9NGfF1dJI5R2Hf4r7+FalwnWO2QEhcc9giBz9PrF2IpAHXgRhq0m 0MZMIU3dGnyPBeNOSZDyacnmYItOieOCgYUk3eVmriXxK+w/8uux3aoe/1xQvMP45w0jET ghrj2TPfaRAhhQAOo8/swgEGmrJQog9E6GPLJnyRxASh2T9Ur3xyRPqNJaxR/wEZcGz0fj qnfO8zQzndSBUkeoRUCelkcdpszeGzEFuMSbGfAer229rJGGRiCyzvRGldeKUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688998453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaKPCgbuK7CCJmN1KY+P3X0orBpHIzjmmbbfofWo43E=; b=A8crSZwZAFfnkWXCk1/ZN4wMXFMIq2aFHjDau9x9VlLiZtO+MB3riiD8E6ZfyBUjGDqakS addsHR4yBcdH26rZhJv1cZ8csfofwLwwP3asc2o5L0VYIQkmdnbCS11IY+vbyWX5CAzR81 RfrsOfvp9pj4qOoWkQr6+Zg6S8Vt2KTq0hTwdvjz5GMB1UpjVMQ5f/EV3kv9w137mJW3OQ yoqSfkQGWxYD+NabM4t4XelUQo4z0o543HvmJiBNcxhFMB19x+fTZ4shqK54kviKJeUOVK 2L9orZb/TATVU+VMbI+TW5py6nKx7+wKnDWGDN5osYnMLBSjOX4dk/nR36q5RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688998453; a=rsa-sha256; cv=none; b=W56UmXL/VC3FReLx3AqKxEszV3KzUYo2/JKBXrXUZtmpcfBPaARIjC6xvwEjBUBlDR0QLr z0BdwZSkjFgDJuwk7Mqcr82SQ/V3udOiyPvhAP1xD+61dcioJbS3397OogbQ2DEnP/VoDj s9yqmX3P1bitoKJ1uY6M6v+0sRYulIGFDQj+yTbfDXLkZeARXxKNIG2wptj4xxI6TpbfFB WM+eayKuQJpfkZ/kiOX9yVuxANTtInnVSMOoTsiiQQBpJVgas/yXAFxBPV2mVmEP4DYG/P kEL5O//nrzHHKTXncez0vxONSBM+oSA+aMh/vOp+a+oYrpGMkfRFOlemvoUHuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R05bS6TJ9znrv; Mon, 10 Jul 2023 14:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AEECUh038955; Mon, 10 Jul 2023 14:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AEECfx038954; Mon, 10 Jul 2023 14:14:12 GMT (envelope-from git) Date: Mon, 10 Jul 2023 14:14:12 GMT Message-Id: <202307101414.36AEECfx038954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6c049996ec29 - main - During F_SETFL, don't change file flags on error 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c049996ec29bad4a913b019a28f211ab84b0d3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6c049996ec29bad4a913b019a28f211ab84b0d3d commit 6c049996ec29bad4a913b019a28f211ab84b0d3d Author: Alan Somers AuthorDate: 2023-07-09 20:48:10 +0000 Commit: Alan Somers CommitDate: 2023-07-10 14:13:58 +0000 During F_SETFL, don't change file flags on error Previously, even if the FIONBIO or FIOASYNC ioctl failed, the file's f_flags variable would still be changed. Now, kern_fcntl will restore the original flags if the ioctl fails. PR: 265736 Reported by: Yuval Pavel Zholkover MFC after: 2 weeks Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40955 --- sys/kern/kern_descrip.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 908c3352514b..ad1b86a0c76c 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -495,7 +495,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) struct vnode *vp; struct mount *mp; struct kinfo_file *kif; - int error, flg, kif_sz, seals, tmp; + int error, flg, kif_sz, seals, tmp, got_set, got_cleared; uint64_t bsize; off_t foffset; @@ -573,12 +573,12 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) tmp &= ~FCNTLFLAGS; tmp |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); + got_set = tmp & ~flg; + got_cleared = flg & ~tmp; tmp = fp->f_flag & FNONBLOCK; error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); - if (error != 0) { - fdrop(fp, td); - break; - } + if (error != 0) + goto revert_f_setfl; tmp = fp->f_flag & FASYNC; error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); if (error == 0) { @@ -588,6 +588,13 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) atomic_clear_int(&fp->f_flag, FNONBLOCK); tmp = 0; (void)fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); +revert_f_setfl: + do { + tmp = flg = fp->f_flag; + tmp &= ~FCNTLFLAGS; + tmp |= got_cleared; + tmp &= ~got_set; + } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); fdrop(fp, td); break; From nobody Mon Jul 10 16:00:54 2023 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 4R07yd39VFzZb57; Mon, 10 Jul 2023 16:00:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R07yd2lCDz4lDK; Mon, 10 Jul 2023 16:00:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689004857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x/LDJbeagjC9/1z0rNaBlnHfoC63PND1CwaGhaJWnLY=; b=oacUfdVzl3GIviqGMiFrSOH8fOSHynv7FvdetkgJigiTPmd0/3vaRiz2c25jivNmhOaRey xXmCp+OSSLeHZJtRcUCy8srFfauUYNT4Owm0Jy1ODyVcTCH00Z9TCB6xBWBNRxeqpj4qdS Q15gyVpt10JB21gCvZO2sSWKFfwVITTFYlbtEEaexrJoUyF+R8rNM2GAvI4j4mlW9w7NdQ KcmIR5g++5si/c+1QTj9VSbnDLMOd7LENoZwTC8hmKyri8EkecWb+6lhOuXNECTiFERD9x /cyDl3WyPmgorqMF8POGqb8DTJ3Q0ItG+XvPPZhll6Lw1/GTU+T20fKsJntP2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689004857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x/LDJbeagjC9/1z0rNaBlnHfoC63PND1CwaGhaJWnLY=; b=r6fOiJqLKbooi7askDQCo4FypaAHOVq0dzFhfLpKjoNC69mXrEMv9aqtNSbz4lbml9fZVF 8nU4lk5oPqcVIc2viba+PAsp+qtoFqfPHWo8SR+4bJz8v56A9vND1uSuqiV0aCYGW/bc1X ICzI98fcSYnlucsJy8majW5XnVetvHfd3s6if40vXpVgiKqk98E3RZAQHYidDj+kmEv+5Y e847HgHpC3OI0nBNZNiotVsvKf50u1naFAmWQTGt3NwKQz68iro7s9aPGrZyYrdjIGfN72 bkKrwyx49zb3G3qBXwiSAVhZhU2Zqh+8+5KIW+WzIYMgwUjTeYWsvMDnfHrxIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689004857; a=rsa-sha256; cv=none; b=Em6iX1I/hvB7eeT7+6RYfDDFZCsGG9DYCLVX33QY9UYhrEzIGiPF1p78EttPFBHoIMZ/qb zIpd0vs5FnhvdOGzxTmEeVGSh/7Tm5mff4MNqPpSQs7g2kA2eVR666E0HrzyNYO5rJ8sNU jmnlG7w3y7ScKwNVyOBuvHQ1a+GEcILfVK/zERzuc4ZaL3BP5pFkCmK4rw4o79K2WHJRis SWtrVlYHXZcsvTfv3141/wW5y3DOcGCLRpfJDdEsDTrWKpPMCHKArMtLyxriirTG/FYsVu 58Y0r7MXcF/jKAVwvC8N7I47ohkIsQFFS4X/TzkNeaX66ogdQKWx5aIoGHV6bQ== Received: from [IPV6:2601:648:8680:16b0:6966:ae6d:9848:4b0b] (unknown [IPv6:2601:648:8680:16b0:6966:ae6d:9848:4b0b]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R07yc4pnBz1DQm; Mon, 10 Jul 2023 16:00:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <1e07dc3f-071c-bd8d-3f15-4aaee60582f6@FreeBSD.org> Date: Mon, 10 Jul 2023 09:00:54 -0700 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: Warner Losh , Alexey Dokuchaev Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202307072123.367LNZ4J060993@gitrepo.freebsd.org> From: John Baldwin Subject: Re: git: 29cbe944e928 - main - CONTRIBUTING.md: minor changes In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 7/9/23 8:06 PM, Warner Losh wrote: > On Sat, Jul 8, 2023 at 12:15 AM Alexey Dokuchaev wrote: > >> On Fri, Jul 07, 2023 at 09:23:35PM +0000, Warner Losh wrote: >>> commit 29cbe944e9287c2e61928c456512d3990aaffdaa >>> >>> CONTRIBUTING.md: minor changes >>> >>> - Misspelled GitHub >>> - angle bracket not escaped correctly >>> - Double white spaces >> >> You've removed them, while they are typically used after full stops >> as texts render better with them unless you're using proportional >> font. >> > > It's the modern way.... but WuerfelDev also had a commit that backed > that part out that I didn't fold in... > I'm still torn since I see so many conflicting things about it :( > > I'm leaning towards putting them back. FWIW, I still use monospace fonts for code and thus still use double spaces for the reason Alexey stated. Reading code in proportional fonts (where spacing is naturally wider at sentence breaks) is not really viable with style(9) which mixes tabs with spaces for indentation. -- John Baldwin From nobody Mon Jul 10 16:00:59 2023 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 4R07yh3dLBzZZww; Mon, 10 Jul 2023 16:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R07yh1GCHz4lHG; Mon, 10 Jul 2023 16:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689004860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mDZBOiOlo4JVU32WyUuxOu6kRZt/h5Xwaa/LZrwDMc=; b=qsr4fTctKboFnYZVazDy3dJ3IWgAQ4Joktsl5pTyRn6LJwDralQCRtR8feaFRTysBqAtpq r4PqRuEhcfFq+HZSp15y/vBc9ol2QsjVwNg7bfx3Zzh0U2eKyPnCpOBKfxUoP4Cw5OiY95 6EeTpGHGXPIxKyEMp96Nq7N6rX1GOT/HRC5bevqZGbu5l/OJb3UVqmM+7zFxC/FVv6gnzJ s1PwytuwZ1zpcVQlqDcjHU9af5tShKz7bSnzVcIWazrSeoLLIJ4xVe7UvJCN6RwH7SbwJt U0rDDtCBprEfI7McddKM1f2mycdujtoqIzZLSURRbFrBBEdyiFVnYTKcwd4Slg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689004860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/mDZBOiOlo4JVU32WyUuxOu6kRZt/h5Xwaa/LZrwDMc=; b=vBU/MXuiIna5GwZgSCFC5ZP7ATWid96Q8nE79FXdvh7LWRdBd7gWG0h9tVdIsfrY4/uoUY NP9qo8sfdrcNMY+UY7XcwMADMaYl3Bm2zGCQoaTkDM0wNq4fAFGU0KO6AXhsnJAjBg7LtN dwqMOlXnbvWKuggugNs0kIOuSPy06+Vok76PMWnaxE2fYkt40JZ67JUje7TloiONgYmiDI 1dZpl59+d0LaeF4kJsrXg0scyfYuPCgaGYuhCabIG/MYs5LQdfo0zLChvR9HeQHHGkiB93 1KI5/lVPzhnvWqQ2AfTj4GW0VsmNx2+cDKqLLDz+REhGnMSRMPbJ+XaMq196TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689004860; a=rsa-sha256; cv=none; b=VGmhWQ0zrLL7JCrt11CWI2B9e8r6yk0HpjfLT9FxNkOREhr2Oea6S5PfPavXJljgSKkZgn aUQYUVPLgHWdmmv1Cjp0qk9Zz4Ld65EOBMJ+AXEgcx+oSd1ilpKhSyHS8RAT35Fdrl7BTU TNy+/o5mB+aEMEEY2pwvc7GlcxBKXosqQW3IEQDXPuJ8F5tA3iJ35lGfi+mGfHNf46k8aS 3tcjaA2QUJUwcr7RVIzVvw1xwrMoC50vRiGr2Ox/GdPYHTZGzN8dambg9Jy19oIByI0Xrm EPNPLyh8E052bF1zBsAldYd3srByO/EdaJt9CuE7yq0NhzG+Ndm5DExXv7INUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R07yh0MwtzqKp; Mon, 10 Jul 2023 16:01:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AG0xin015336; Mon, 10 Jul 2023 16:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AG0xNe015335; Mon, 10 Jul 2023 16:00:59 GMT (envelope-from git) Date: Mon, 10 Jul 2023 16:00:59 GMT Message-Id: <202307101600.36AG0xNe015335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: c210cac00f25 - main - dhclient: fix time parsing for leases expiring after 2038 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c210cac00f2584f031b56b4cdd2e801dbb9e1348 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=c210cac00f2584f031b56b4cdd2e801dbb9e1348 commit c210cac00f2584f031b56b4cdd2e801dbb9e1348 Author: Alex Bahm AuthorDate: 2023-07-10 15:56:05 +0000 Commit: Eric van Gyzen CommitDate: 2023-07-10 16:00:34 +0000 dhclient: fix time parsing for leases expiring after 2038 Convert lease parsing to timegm to calculate timestamp. For reference, when writing the lease, we use gmtime to convert the timestamp to struct tm. Reviewed By: markj, vangyzen MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D40760 --- sbin/dhclient/parse.c | 28 ++----------------- sbin/dhclient/tests/Makefile | 3 +- sbin/dhclient/tests/fake.c | 15 ++++++++++ sbin/dhclient/tests/option-domain-search.c | 45 ++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 27 deletions(-) diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c index 4018f70f3a5d..70e2013d0813 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -444,9 +444,7 @@ convert_num(unsigned char *buf, char *str, unsigned base, int size) time_t parse_date(FILE *cfile) { - static int months[11] = { 31, 59, 90, 120, 151, 181, - 212, 243, 273, 304, 334 }; - int guess, token; + int token; struct tm tm; char *val; @@ -570,27 +568,5 @@ parse_date(FILE *cfile) return (0); } - /* Guess the time value... */ - guess = ((((((365 * (tm.tm_year - 70) + /* Days in years since '70 */ - (tm.tm_year - 69) / 4 + /* Leap days since '70 */ - (tm.tm_mon /* Days in months this year */ - ? months[tm.tm_mon - 1] - : 0) + - (tm.tm_mon > 1 && /* Leap day this year */ - !((tm.tm_year - 72) & 3)) + - tm.tm_mday - 1) * 24) + /* Day of month */ - tm.tm_hour) * 60) + - tm.tm_min) * 60) + tm.tm_sec; - - /* - * This guess could be wrong because of leap seconds or other - * weirdness we don't know about that the system does. For - * now, we're just going to accept the guess, but at some point - * it might be nice to do a successive approximation here to get - * an exact value. Even if the error is small, if the server - * is restarted frequently (and thus the lease database is - * reread), the error could accumulate into something - * significant. - */ - return (guess); + return (timegm(&tm)); } diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile index ce4c7acb822e..790d3dbcccce 100644 --- a/sbin/dhclient/tests/Makefile +++ b/sbin/dhclient/tests/Makefile @@ -6,7 +6,8 @@ ATF_TESTS_SH= pcp PLAIN_TESTS_C= option-domain-search_test SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \ - tables.c fake.c option-domain-search.c + tables.c parse.c conflex.c tree.c fake.c \ + option-domain-search.c CFLAGS.option-domain-search_test+= -I${.CURDIR:H} LIBADD.option-domain-search_test= util diff --git a/sbin/dhclient/tests/fake.c b/sbin/dhclient/tests/fake.c index 6a170953beb0..17b721527f04 100644 --- a/sbin/dhclient/tests/fake.c +++ b/sbin/dhclient/tests/fake.c @@ -7,6 +7,7 @@ #include "dhcpd.h" extern jmp_buf env; +int warnings_occurred; void error(const char *fmt, ...) @@ -52,6 +53,20 @@ note(const char *fmt, ...) return ret; } +int +parse_warn(const char *fmt, ...) +{ + int ret; + va_list ap; + + va_start(ap, fmt); + ret = vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "\n"); + + return ret; +} + void bootp(struct packet *packet) { diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c index b79f9a560137..a3517c9c1dc1 100644 --- a/sbin/dhclient/tests/option-domain-search.c +++ b/sbin/dhclient/tests/option-domain-search.c @@ -303,6 +303,49 @@ multiple_domains_valid() free(option->data); } +static +void +parse_date_helper(const char *string, time_t timestamp) +{ + int ret = 0; + FILE *file = NULL; + time_t ts; + + file = fopen("/tmp/dhclient.test", "w"); + if (!file) + abort(); + + ret = fwrite(string, strlen(string), 1, file); + if (ret <= 0) + abort(); + + fclose(file); + + file = fopen("/tmp/dhclient.test", "r"); + if (!file) + abort(); + + new_parse("test"); + ts = parse_date(file); + if (ts != timestamp) + abort(); + + fclose(file); +} + +void +parse_date_valid(void) +{ + int ret; + + ret = setjmp(env); + if (ret != 0) + abort(); + + parse_date_helper(" 2 2024/7/2 20:25:50;\n", 1719951950); + parse_date_helper(" 1 2091/7/2 20:25:50;\n", 3834246350); +} + int main(int argc, char *argv[]) { @@ -324,5 +367,7 @@ main(int argc, char *argv[]) multiple_domains_valid(); + parse_date_valid(); + return (0); } From nobody Mon Jul 10 16:34:42 2023 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 4R08jd3ywXz2trj5; Mon, 10 Jul 2023 16:34:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R08jd20vSz3Jcp; Mon, 10 Jul 2023 16:34:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id IpF3qPEC96NwhItqWq0eWx; Mon, 10 Jul 2023 16:34:44 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id ItqVq0KJEHFsOItqVqdH6f; Mon, 10 Jul 2023 16:34:44 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64ac3324 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=ws7JD89P4LkA:10 a=6I5d2MoRAAAA:8 a=iLNU1ar6AAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=xwsD0MZEt68H0K3cZ-YA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A634A190; Mon, 10 Jul 2023 09:34:42 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8CE952D; Mon, 10 Jul 2023 09:34:42 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Eric van Gyzen cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c210cac00f25 - main - dhclient: fix time parsing for leases expiring after 2038 In-reply-to: <202307101600.36AG0xNe015335@gitrepo.freebsd.org> References: <202307101600.36AG0xNe015335@gitrepo.freebsd.org> Comments: In-reply-to Eric van Gyzen message dated "Mon, 10 Jul 2023 16:00:59 +0000." 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 10 Jul 2023 09:34:42 -0700 Message-Id: <20230710163442.8CE952D@slippy.cwsent.com> X-CMAE-Envelope: MS4xfCNacDWDiRf6AUChd4o0XVltRiPC93vulbk1UPccqxQgkGgEgI7/H2kjJWlwe8EbMGR724SWO7PJjDnkINU0RlDy1Ut+vvLF0gm1oyRovg0VaJ6rCQwK cIsTXWBlplrS1/1OGqxDVYgdyxCfUUbFhbAAqLvGI5oNe+vt4hjpaK9wbFLeyMXWkq8K+pI8nLnNF4dYmSAGqb5MM6E8UACro7nEI5Cl9Vorsu8WTWZF7aSY gUOEyGWMd6Tt8T9jIchKC0EJYAcS7OKh+b2EaPh0Dj6edjFrmy/ilShDiKepdSoQpbzM3YzEaRtWSdYIy5e+I3eryx1pZ/LtNVNocYA4SYA= X-Rspamd-Queue-Id: 4R08jd20vSz3Jcp X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202307101600.36AG0xNe015335@gitrepo.freebsd.org>, Eric van Gyzen wr ites: > The branch main has been updated by vangyzen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c210cac00f2584f031b56b4cdd2e801d > bb9e1348 > > commit c210cac00f2584f031b56b4cdd2e801dbb9e1348 > Author: Alex Bahm > AuthorDate: 2023-07-10 15:56:05 +0000 > Commit: Eric van Gyzen > CommitDate: 2023-07-10 16:00:34 +0000 > > dhclient: fix time parsing for leases expiring after 2038 > > Convert lease parsing to timegm to calculate timestamp. For reference, wh > en > writing the lease, we use gmtime to convert the timestamp to struct tm. > > Reviewed By: markj, vangyzen > MFC after: 2 weeks > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D40760 > --- > sbin/dhclient/parse.c | 28 ++----------------- > sbin/dhclient/tests/Makefile | 3 +- > sbin/dhclient/tests/fake.c | 15 ++++++++++ > sbin/dhclient/tests/option-domain-search.c | 45 ++++++++++++++++++++++++++++ > ++ > 4 files changed, 64 insertions(+), 27 deletions(-) > > diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c > index 4018f70f3a5d..70e2013d0813 100644 > --- a/sbin/dhclient/parse.c > +++ b/sbin/dhclient/parse.c > @@ -444,9 +444,7 @@ convert_num(unsigned char *buf, char *str, unsigned base, > int size) > time_t > parse_date(FILE *cfile) > { > - static int months[11] = { 31, 59, 90, 120, 151, 181, > - 212, 243, 273, 304, 334 }; > - int guess, token; > + int token; > struct tm tm; > char *val; > > @@ -570,27 +568,5 @@ parse_date(FILE *cfile) > return (0); > } > > - /* Guess the time value... */ > - guess = ((((((365 * (tm.tm_year - 70) + /* Days in years since '70 */ > - (tm.tm_year - 69) / 4 + /* Leap days since '70 */ > - (tm.tm_mon /* Days in months this year */ > - ? months[tm.tm_mon - 1] > - : 0) + > - (tm.tm_mon > 1 && /* Leap day this year */ > - !((tm.tm_year - 72) & 3)) + > - tm.tm_mday - 1) * 24) + /* Day of month */ > - tm.tm_hour) * 60) + > - tm.tm_min) * 60) + tm.tm_sec; > - > - /* > - * This guess could be wrong because of leap seconds or other > - * weirdness we don't know about that the system does. For > - * now, we're just going to accept the guess, but at some point > - * it might be nice to do a successive approximation here to get > - * an exact value. Even if the error is small, if the server > - * is restarted frequently (and thus the lease database is > - * reread), the error could accumulate into something > - * significant. > - */ > - return (guess); > + return (timegm(&tm)); > } > diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile > index ce4c7acb822e..790d3dbcccce 100644 > --- a/sbin/dhclient/tests/Makefile > +++ b/sbin/dhclient/tests/Makefile > @@ -6,7 +6,8 @@ ATF_TESTS_SH= pcp > > PLAIN_TESTS_C= option-domain-search_test > SRCS.option-domain-search_test= alloc.c convert.c hash.c option > s.c \ > - tables.c fake.c option-domain-search.c > + tables.c parse.c conflex.c tree.c fake. > c \ > + option-domain-search.c > CFLAGS.option-domain-search_test+= -I${.CURDIR:H} > LIBADD.option-domain-search_test= util > > diff --git a/sbin/dhclient/tests/fake.c b/sbin/dhclient/tests/fake.c > index 6a170953beb0..17b721527f04 100644 > --- a/sbin/dhclient/tests/fake.c > +++ b/sbin/dhclient/tests/fake.c > @@ -7,6 +7,7 @@ > #include "dhcpd.h" > > extern jmp_buf env; > +int warnings_occurred; > > void > error(const char *fmt, ...) > @@ -52,6 +53,20 @@ note(const char *fmt, ...) > return ret; > } > > +int > +parse_warn(const char *fmt, ...) > +{ > + int ret; > + va_list ap; > + > + va_start(ap, fmt); > + ret = vfprintf(stderr, fmt, ap); > + va_end(ap); > + fprintf(stderr, "\n"); > + > + return ret; > +} > + > void > bootp(struct packet *packet) > { > diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests > /option-domain-search.c > index b79f9a560137..a3517c9c1dc1 100644 > --- a/sbin/dhclient/tests/option-domain-search.c > +++ b/sbin/dhclient/tests/option-domain-search.c > @@ -303,6 +303,49 @@ multiple_domains_valid() > free(option->data); > } > > +static > +void > +parse_date_helper(const char *string, time_t timestamp) > +{ > + int ret = 0; > + FILE *file = NULL; > + time_t ts; > + > + file = fopen("/tmp/dhclient.test", "w"); > + if (!file) > + abort(); > + > + ret = fwrite(string, strlen(string), 1, file); > + if (ret <= 0) > + abort(); > + > + fclose(file); > + > + file = fopen("/tmp/dhclient.test", "r"); > + if (!file) > + abort(); > + > + new_parse("test"); > + ts = parse_date(file); > + if (ts != timestamp) > + abort(); > + > + fclose(file); > +} > + > +void > +parse_date_valid(void) > +{ > + int ret; > + > + ret = setjmp(env); > + if (ret != 0) > + abort(); > + > + parse_date_helper(" 2 2024/7/2 20:25:50;\n", 1719951950); > + parse_date_helper(" 1 2091/7/2 20:25:50;\n", 3834246350); > +} > + > int > main(int argc, char *argv[]) > { > @@ -324,5 +367,7 @@ main(int argc, char *argv[]) > > multiple_domains_valid(); > > + parse_date_valid(); > + > return (0); > } > This fails to build on i386. ===> libexec/bootpd/tools/bootptest (all) --- all_subdir_sbin --- /opt/src/git-src/sbin/dhclient/tests/option-domain-search.c:346:47: error: implicit conversion from 'long long' to 'time_t' (aka 'int') changes value from 3834246350 to -460720946 [-Werror,-Wconstant-conversion] parse_date_helper(" 1 2091/7/2 20:25:50;\n", 3834246350); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~ 1 error generated. 4.16 real 0.37 user 0.36 sys make[1]: stopped in /opt/src/git-src make: stopped in /opt/src/git-src _buildsys 58228 - - i386 build failed, continuing _buildsys 58233 - - i386 failed: build failure _buildsys 58238 - - exiting, RC=0: /usr/local/bin/_buildsys -x -uz -Nb -Ai386 -j8 Finished Mon Jul 10 09:31:24 PDT 2023, RC=0 -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Mon Jul 10 17:30:09 2023 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 4R09xZ04Ccz4dN40; Mon, 10 Jul 2023 17:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R09xY6gWkz3jyY; Mon, 10 Jul 2023 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nOnDaRXkcbBbTRVl3xCkK6jS+7syaDgar8NtPZdFato=; b=HcXsaBNHFDT0T3IauDshudV9nJJFs5pWArO+TXJxYUJ/eC+RwGhY+MnkQv4tn/nscKjORL y2IN9KkWJwIjdnCReNNt7NJv04YfaxoRACPhvJ3ip82lxWadqkap3lY7bJPJZUSKE1PyvB t42rLKMu53PzXw3/sh8gK9+0HgzCpy/6F/O0BngLXim6rQkGXMVuPOPPeZVQFCYT7YlC38 PWwDte6rEyVGZGY/OQSAHYJhbG9eTBAJ9ybIiM5jO03cZEF15VbMT340BPOtMUXGtJTy5+ 2Go5R2oT/pJ/T11Kdc7Dis7urKonmiB/OcZ2hPjoGeKIiJxF0XAP+QchzRHwng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nOnDaRXkcbBbTRVl3xCkK6jS+7syaDgar8NtPZdFato=; b=AFD5deL73Qi/bAPpLhX8sZCjeos+4af9/EotMxRFgmessZSJXQM7krf9JNVrtRn8kXeyLK d7yIutSsPGuq2P/sIHTLQXE/XMqCgs7On08DNo34OKmKtlgj6VmvHqdpFgIg+27t9S8iWu E8/0skUpp0s2yKPcXeGkuTNBtaKwDnsKLq5rHhLehrLo758HewSIpMcG2FsF8fdMh6ozUM 4oeX1bwwniwBtaybQ+Q7h4pt1JKfF3JwVLbSwpvCtCV5kyMyiw6PSxQhgE9gVBWgu7YcaR JfLx77jVvWtgX61H5Is7M/ZNqg0OhgYAKGKYzGv67NNZXktPWyPykzCb/dTzBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689010209; a=rsa-sha256; cv=none; b=akgBrScJLRLlBUQzkNKvQzOPEwl/my3tcSk1za6GPrC1aoNFocJeW8CVyFigIw6WWsLYuc IQPy1VWcXOICGX4BSvwTUytNmGqZVGGFR8yApC1ApwINc7bZglF7vSRmPS39ZBJQWcBEma xhodla+jHHcvT5LTgNMT9W24ONUJ6i3bP0N9XVKgV13eFtrcHpRZMt5MuqgGPoSVftUgsN jo8L5Sos6iA/kTqdNI0zjhzQG0T/saWdd1u+/vlNpeSDWofG5VwlKZSJL8cpQAa3/frJoz AWzK67G++VRXmTYx5Zc9C3OxpzpVW1yXYhVvj2xRY1WuPCKcYRnXnjbUhLt8XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R09xY5dYpzsXl; Mon, 10 Jul 2023 17:30:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AHU9D3057234; Mon, 10 Jul 2023 17:30:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AHU9tY057228; Mon, 10 Jul 2023 17:30:09 GMT (envelope-from git) Date: Mon, 10 Jul 2023 17:30:09 GMT Message-Id: <202307101730.36AHU9tY057228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 398fb4a592a3 - main - pmclog(3): Drop .Ud 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 398fb4a592a3509cc73c3fc99d44712b0505fb7a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=398fb4a592a3509cc73c3fc99d44712b0505fb7a commit 398fb4a592a3509cc73c3fc99d44712b0505fb7a Author: Mitchell Horne AuthorDate: 2023-07-10 17:20:54 +0000 Commit: Mitchell Horne CommitDate: 2023-07-10 17:30:03 +0000 pmclog(3): Drop .Ud This API is stable and should not be advertised as "currently under development". MFC after: 3 days Sponsored by: The FreeBSD Foundation --- lib/libpmc/pmclog.3 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/libpmc/pmclog.3 b/lib/libpmc/pmclog.3 index d60e97085831..45bb3bfcc15c 100644 --- a/lib/libpmc/pmclog.3 +++ b/lib/libpmc/pmclog.3 @@ -315,7 +315,5 @@ for a file based parser may fail with any of the errors returned by .Sh HISTORY The .Nm pmclog -API -.Ud -It first appeared in +API first appeared in .Fx 6.0 . From nobody Mon Jul 10 17:30:10 2023 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 4R09xb0jQwz4dN7t; Mon, 10 Jul 2023 17:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R09xZ6z2dz3jwk; Mon, 10 Jul 2023 17:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zTfyqnXHN0uxEHXxH+LnpJB0tltnyzFPdtBrFk3Ob4=; b=M2l3epN2ysryZHckspdEqdLZC/2zez8TrEK+74MULVFWUs5vRsfDRiPbYbstGmII9VnLWx +yK2jaVDkFCnB0IpqruFYIfHeAMQr6CgiYLMdA/aWxh8x+5QK2xsfZmS+0giFSaiLYEXi1 rmzB3H1RegzI1Ng+wYSVpAaHYkKLu3ocGLS+VmfRYbh1y6HHOn20vF4k3tRrKDJAaWTGrl 0nrkF7qZzINaJob6tH/V6DC5Nu/DeF+5aXOwdYHUIqv2ImrU1WGKztMUpXDeZPVFfWi+pK 80j3M6i9QBxYghYtai0rvDppAX0DbFR+Tyc3w4mEb3Ioq6LNv970cNmaTA7rdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zTfyqnXHN0uxEHXxH+LnpJB0tltnyzFPdtBrFk3Ob4=; b=TBSD98377XkTyh0PnblJJ/DIvG2/9FtEODgj2+J9h0UkOGZCMJlsTUNpW6Wooes91adD6J 9iLKAKE6rEKSRrIJAheETC5P4SM1ZJKOBOTe6CGMObx05BpoDkmiH8vtJvWYp5FLWU5QxA le36re2ITQpSvEI1Iayz1UahOBPhAn9bPMqgTTzuBSw6U91CphgNKD5xCB5U+v/ugp5L67 CpD/Q0lc4koITagWSrsV622F9MdHqULpOUeO4ixVo5cOcURi1c31UwinvwWd9Pypte/YKZ BLfUOqPXAuEjnjwpwWhnird2qtbf7vevmbXUpawhVDf3eIzqVdgkHXmFmvQqwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689010211; a=rsa-sha256; cv=none; b=KgBRVCvQ+/Xola2mYM1Xn+az3UAuQpTDycfbJW/OVQ/+Q4r7E+pdGVc6DvP3ncgdCPlBjS V7Sx6y80umtTEugrPXR96sQbOXpIM27Kr4EK/xye/+DeaDVGeTpix64uJgZST7W/xAOTRs jDbBEP1dlcfs3k3L8iTExpRpYoem2aG3vPZ3hyG/B62M0zj/pb2lRK721tghyZBpme2kxx PGutTTwZjvvvERkXm10tpDY3IcLVYgMhebD1J8TPWQEdo4tZFrJoCOLjt31H+XdoV8i/ld WhlPdkAPTnSrUIiUCGH2RnsMH6DJMM0mtBxkULKizuEY7ZUhejg4pL99oMYBeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R09xZ5nmGzsvl; Mon, 10 Jul 2023 17:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AHUAOk057826; Mon, 10 Jul 2023 17:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AHUAG9057823; Mon, 10 Jul 2023 17:30:10 GMT (envelope-from git) Date: Mon, 10 Jul 2023 17:30:10 GMT Message-Id: <202307101730.36AHUAG9057823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: a5b3e56330b0 - main - pmcstat(8): Drop .Ud 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5b3e56330b07c8163b4d62ec55edf37746c11cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b3e56330b07c8163b4d62ec55edf37746c11cf commit a5b3e56330b07c8163b4d62ec55edf37746c11cf Author: Mitchell Horne AuthorDate: 2023-07-10 17:23:36 +0000 Commit: Mitchell Horne CommitDate: 2023-07-10 17:30:03 +0000 pmcstat(8): Drop .Ud This utility has existed for a long time and should not be advertised as "currently under development". While here, fix the one other warning from igor about using a newline for a new sentence. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- usr.sbin/pmcstat/pmcstat.8 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8 index 8835ae3c8c7a..cf31a9cb4469 100644 --- a/usr.sbin/pmcstat/pmcstat.8 +++ b/usr.sbin/pmcstat/pmcstat.8 @@ -229,8 +229,8 @@ specified in .It Fl T Use a .Xr top 1 Ns -like -mode for sampling PMCs. The following hotkeys -can be used: +mode for sampling PMCs. +The following hotkeys can be used: .Pp .Bl -tag -compact -width "Ctrl+a" -offset 4n .It Ic A @@ -536,8 +536,6 @@ The .Nm utility first appeared in .Fx 6.0 . -It is -.Ud .Sh AUTHORS .An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .Sh BUGS From nobody Mon Jul 10 17:33:05 2023 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 4R0B0x4Y3cz4dNtd; Mon, 10 Jul 2023 17:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0B0x4588z3lVq; Mon, 10 Jul 2023 17:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcanVcnxWYPf7fFq9E3nvzWuDKFAmALYdmaVrbbnY1U=; b=hWsUFzKAmUHAexpq4Ur7RjameXs/PUbfjq3G6jKrpdka1VNl+9TUPzdb9bQG6BMfVJgz6B dHyVAT7rXpQvvRWVjcKfJQexALx4i5p6nKS8oYzmarqLLuQBMUtVXdmi4PirFNH9seuC78 L3ct1PS7Da7NpQFrfEZddfaK7eLq7lndrr+xc0C0ydzcbs3w4wKS4ZmWELc09Sx6Ya2Ozv 0SHlTybVUK2TN9rx0+i46gi3Ro7ovZHQprW2yFQWxgzCWcPTGklPBTFDyoi/Maq3gY3fXD sJXGDLUetbLdSdAbX7ga55S46iFqew3Hlxbhjc00H1dPkGmqWEhu/2/yTuTLrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689010385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcanVcnxWYPf7fFq9E3nvzWuDKFAmALYdmaVrbbnY1U=; b=uC4BaeNkQ9SrK3J+rSmv0QIcV1N7qj+FmWqAdMlqBQ9Z+ApEt0ZeDyhCJ5vg+hIRKOG8hR XbQc5pCIM6hCvn50oJVrMuHoXbBn5LcdZFYR2JwO5mSGBmRHR1Mt/gzD3BGAQVmBQI1ltr gbpP08OXO3D0pstrz2XnrYxLt0OZgCHcAtviFj53YpTH09djfNudc4wWTjtik6gwf2UU/G 2WqIxHhKXIxVGflYzT8XhaYfGrfmigAB4vf9qVWUpf976/czfGGv/wIxzlgHqiq8f883bD UM44GjgEod7iNF8g8pK8ZqEz6Ckoqi7UZdd4wwrTNysJWralAW7gtGIa41x+Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689010385; a=rsa-sha256; cv=none; b=lx/QrAKcSR0qXrhSzcvesYxmS6eHs6O/BbvIAB9kEW18q+zx8gCyzQ0g2K9JQnP3dDktes gUW1ylWszG9LuvS/6IJF4E5k8TnnXAcFJf55nKgx/pFWAxEuyPiAbdW7UVBd7URJ9np0bs GHRzlfPQepwVQ78sUS2u+psSV2lfgIj2zWiadYkEWB+iH3BMGCjfueOyPtHKgco4AjtGGL T9P/WZ1Y6A+frxWdGLyStKG7WcZldMCGrCjnMYbSY9EpByfnLWMKBZ2zCArl0Kx9+UQJ/c bPNshvaeKjOpZiMiDBpmSqJbBFgCWelGblacanwm3LbUkVB5tIcdnxsDkw7/Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0B0x38sqztRq; Mon, 10 Jul 2023 17:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AHX56E069312; Mon, 10 Jul 2023 17:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AHX5Ah069311; Mon, 10 Jul 2023 17:33:05 GMT (envelope-from git) Date: Mon, 10 Jul 2023 17:33:05 GMT Message-Id: <202307101733.36AHX5Ah069311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f7a217060608 - main - pmc_events.h: update top-level comment 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7a217060608b5fa9e7c59724a617b7241a3ee3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f7a217060608b5fa9e7c59724a617b7241a3ee3b commit f7a217060608b5fa9e7c59724a617b7241a3ee3b Author: Mitchell Horne AuthorDate: 2023-06-26 17:08:56 +0000 Commit: Mitchell Horne CommitDate: 2023-07-10 17:32:27 +0000 pmc_events.h: update top-level comment It points to non-existent documentation. The wiki page still contains a useful overview, so keep this link. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/dev/hwpmc/pmc_events.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h index 5cffe7691756..d64b599dace8 100644 --- a/sys/dev/hwpmc/pmc_events.h +++ b/sys/dev/hwpmc/pmc_events.h @@ -32,14 +32,12 @@ #define _DEV_HWPMC_PMC_EVENTS_H_ /* - * Note: Documentation on adding events can be found both in - * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms - * as well as on-line at: + * Note: Documentation on adding events can be found online at: * * https://wiki.freebsd.org/PmcTools/PmcHardwareHowTo * - * Please refer to those resources before you attempt to modify - * this file or the hwpmc driver/subsystem. + * Please refer to this resource before you attempt to modify this file or the + * hwpmc driver/subsystem. */ /* * PMC event codes. From nobody Mon Jul 10 18:25:26 2023 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 4R0C9M1tZdz4gh2f; Mon, 10 Jul 2023 18:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0C9M1Qwqz3wJZ; Mon, 10 Jul 2023 18:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689013527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIs8thV/sxUBRUuZxY4ANt/eqrFRxasmM2uJAQvo5Yc=; b=eNsG2TpluJB4oXeLPaPC9qat3C9hWBAkg+yf9aQ3JJemFIG3jJejtLR2TNgqS6RrxhJa6J QJA7o0UAfd+NiD8GlKB1xehwgDaW3+fLBr7jWUUwFWlUJeraFJWHCCka4d/G7IkiLbLamj VE+1gRxx1yoUrH3qqY0Iooe3x3xz3A85F/6qEr9H3m9ZImliv5cbxFXlCFdaTBeGSZWo7L SFKCICDuie/k3YmABh24kAHsT5tu4Q5c85WPcvArTM2bQ2i+lI4tD6GfVwtpUUUuuqyHGm eBJbIPGfLDt9wSXwyU2bODd7topEp3VWBFUbZHEKcKE6q0ImHBXBvH8a8ZFzbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689013527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIs8thV/sxUBRUuZxY4ANt/eqrFRxasmM2uJAQvo5Yc=; b=tQD6V5y0Rpma8wDPDKd2mDpRdqtDMSwIlLy08UKvXHVYPdcITm08m1pW5WqBDch7yYc4w5 pMGHVezolzhT9ptlcWvFg0SkoBBIunlfHEOdjd2KzWXuE1SI3XdgyAHXL3bBb6XqplsXwU BryNMkXT3X1k4vbwXOpZzJch+was/h1bDCkCC99CYgDQ/No1IobFK25HFB0xoa4j6g2sAQ aDfrG+vtfxsGbXiApUk6Y4kUYBAkOw0XGo+paWcOUkYAR0lPjuIcxuN5bqzlt8m73ST/L1 mBDzWpEZAIXFkKq+v8mmyA+c8RYR0fm/64V3YbOnejC3h8QKW32k/Rbu3rCYsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689013527; a=rsa-sha256; cv=none; b=N3bwHJ735PfbqayO13iZ9Sj3HsaqfZtL7XkV0vzzXTV0TBGo+nza84DA/u4CNEuWCEyeL9 j0z2Mm3ac2lz0hgs2za6BVxhHCIwKi3FJVXbtCa7TYquY/YYKB2hLZT1JI7DdQjptcmh5a Rn40H3xSXrDbc48NOaJo/BBYu8dkZZIkLYCsQWHAVi0ALbp+0gwDbEjQvrklbuxzwwjd9A mrkAzDYrVL1SQR0WlWulaNhuN8JqiJTkifs1FfZSWDiZOY9g/NGDy21MUrDUyg5o1s0cvI 89Fp3DqH0yFWjlGyWwfmCwsD7kY37JiQkfGhbxAWOMjkJ9M4kp1Ag7I9lmGJGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0C9M0NxLzvbN; Mon, 10 Jul 2023 18:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AIPQR3052664; Mon, 10 Jul 2023 18:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AIPQY7052663; Mon, 10 Jul 2023 18:25:26 GMT (envelope-from git) Date: Mon, 10 Jul 2023 18:25:26 GMT Message-Id: <202307101825.36AIPQY7052663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 46f59593c560 - main - CONTRIBUTING.md: reinsert double spaces 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46f59593c560adf41eb869882232f88922be751f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=46f59593c560adf41eb869882232f88922be751f commit 46f59593c560adf41eb869882232f88922be751f Author: WuerfelDev AuthorDate: 2023-07-05 08:27:16 +0000 Commit: Warner Losh CommitDate: 2023-07-10 18:24:24 +0000 CONTRIBUTING.md: reinsert double spaces Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/788 --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72da80389bd6..90c2a4bfab39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,14 +15,14 @@ FreeBSD accepts source code contributions using one of several methods: - Direct access to the [Git repository](https://cgit.freebsd.org/src/) The preferred method depends on a few factors including the size or scope of -the change. GitHub pull requests are preferred for relatively straightforward +the change. GitHub pull requests are preferred for relatively straightforward changes where the contributor already has a GitHub account. ## GitHub Pull Requests Presently, GitHub 'freebsd-src' repository is one of the publish-only services for the FreeBSD 'src' repository the project uses to promote collaboration and -contribution. Pull requests that need little developer time, are generally +contribution. Pull requests that need little developer time, are generally small, and have limited scope should be submitted. Do not submit pull requests that are security-related, problem reports, works in progress, changes that are controversial and need discussion, or changes that require specialized review. @@ -49,9 +49,9 @@ merge commit. More complex changes may be submitted as pull requests, but they may be closed if they are too large, too unwieldy, become inactive, need further discussion in -the community, or need extensive revision. Please avoid creating large, +the community, or need extensive revision. Please avoid creating large, wide-ranging cleanup patches: they are too large and lack the focus needed for a -good review. Misdirected patches may be redirected to a more appropriate forum +good review. Misdirected patches may be redirected to a more appropriate forum for the patch to be resolved. Please make sure that your submissions compile and work before submitting. If From nobody Mon Jul 10 18:26:01 2023 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 4R0CBH71Vzz4ghR0 for ; Mon, 10 Jul 2023 18:26:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0CBG65rJz3wys for ; Mon, 10 Jul 2023 18:26:14 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4fb7dc16ff0so7259452e87.2 for ; Mon, 10 Jul 2023 11:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1689013572; x=1691605572; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=hbCmgSFZ0xzd+1UOHNxqTHihT/u3OV2d4MwpsMAW+gs=; b=HRmhxDnOpxbC3PW3MKU50A4XepzwlCmLL4/vLTAzQWrvGms5/HJmik4WzyK6RlNRY3 Y9i+6lFT0+QKCqkt+KlLJBeNPGw1nrQCsTDBHQmNUGcZMljvB7O3ks46fSwaVmUrhTp7 yFVvUX9xgKQN5/+tGhmtTcKyugLMrA14akl2z8+jTpgT1BhhrCfi25RXNkVjkMPLL5sP 7cm+gtXYq0vcu52WIXBLlWeEhrOlyLmcrotAJTC+el2DHDc9vDBX1Ef20LB9ec1/oFX2 HW2G59azKD6i7dym2KViMvnmY3YEum/IS0/fd9U07eRmsQNqf5jdzNulsFeDk2DqU3DT Jnuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689013572; x=1691605572; 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=hbCmgSFZ0xzd+1UOHNxqTHihT/u3OV2d4MwpsMAW+gs=; b=lLK4lp3w6SxhFHPDAifUSrftfN5wgicfhkxqkvTKyklp1Gtpn6jfVWVXcZDSDr1ocG C9zzMShDaj2117MtBzd4R1s/5zadIUoUwM0+Ad0Ow2UExU1m5gB7T8wfvZASD233denE 1VxP+pIW0aOTvfRxu4odjLlg3SXCpb9pky4CjS3HcnDOXcgdknR3IAIZ8FRqLZzy5NtI GKGvcwK8eeH8vlal258bdXF3wk00uJVIEjUYUT/COsllPW/RCHgSEnX+LIooMTaNxUWW lmHiF7pRI2bal4bsB2+DDs7MLogV11XzogNaLjcREUQ8txkIWZ9wJa80CTcRIrzeGh9s dwKA== X-Gm-Message-State: ABy/qLb4VhZ8oRxVU/W1AVaCk/UY732Z41FYCkzT1K0f1xSn4bzvUk+y ZvSHmaWyAi1WLBCK3fq8+kSW2c3NscGbalmeApJIsg== X-Google-Smtp-Source: APBJJlGPxHtpwGZRQJCoIlPHWP3E/ztQoby7scgsNZsUeoWbMjTad8rgjPyASNOxE7GuH/Eh2vtNZ5V3RVOeoCxxcLo= X-Received: by 2002:a05:6512:2807:b0:4fb:cabd:2a66 with SMTP id cf7-20020a056512280700b004fbcabd2a66mr11858473lfb.21.1689013572098; Mon, 10 Jul 2023 11:26: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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202307072123.367LNZ4J060993@gitrepo.freebsd.org> <1e07dc3f-071c-bd8d-3f15-4aaee60582f6@FreeBSD.org> In-Reply-To: <1e07dc3f-071c-bd8d-3f15-4aaee60582f6@FreeBSD.org> From: Warner Losh Date: Mon, 10 Jul 2023 12:26:01 -0600 Message-ID: Subject: Re: git: 29cbe944e928 - main - CONTRIBUTING.md: minor changes To: John Baldwin Cc: Alexey Dokuchaev , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000fc7bb90600261dfa" X-Rspamd-Queue-Id: 4R0CBG65rJz3wys X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000fc7bb90600261dfa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jul 10, 2023 at 10:00=E2=80=AFAM John Baldwin wro= te: > On 7/9/23 8:06 PM, Warner Losh wrote: > > On Sat, Jul 8, 2023 at 12:15=E2=80=AFAM Alexey Dokuchaev > wrote: > > > >> On Fri, Jul 07, 2023 at 09:23:35PM +0000, Warner Losh wrote: > >>> commit 29cbe944e9287c2e61928c456512d3990aaffdaa > >>> > >>> CONTRIBUTING.md: minor changes > >>> > >>> - Misspelled GitHub > >>> - angle bracket not escaped correctly > >>> - Double white spaces > >> > >> You've removed them, while they are typically used after full stops > >> as texts render better with them unless you're using proportional > >> font. > >> > > > > It's the modern way.... but WuerfelDev also had a commit that backed > > that part out that I didn't fold in... > > I'm still torn since I see so many conflicting things about it :( > > > > I'm leaning towards putting them back. > > FWIW, I still use monospace fonts for code and thus still use double spac= es > for the reason Alexey stated. Reading code in proportional fonts (where > spacing is naturally wider at sentence breaks) is not really viable with > style(9) which mixes tabs with spaces for indentation. > OK. I've just pushed the other half of 788 where the submitter backed out the removal of the double spaces. And now I know why they should remain. Warner --000000000000fc7bb90600261dfa Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Jul 10, 2023 at 10:00=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 7/9/23 8:06 PM, Warner Losh wrote:
> On Sat, Jul 8, 2023 at 12:15=E2=80=AFAM Alexey Dokuchaev <danfe@freebsd.org> w= rote:
>
>> On Fri, Jul 07, 2023 at 09:23:35PM +0000, Warner Losh wrote:
>>> commit 29cbe944e9287c2e61928c456512d3990aaffdaa
>>>
>>>=C2=A0 =C2=A0 CONTRIBUTING.md: minor changes
>>>
>>>=C2=A0 =C2=A0 - Misspelled GitHub
>>>=C2=A0 =C2=A0 - angle bracket not escaped correctly
>>>=C2=A0 =C2=A0 - Double white spaces
>>
>> You've removed them, while they are typically used after full = stops
>> as texts render better with them unless you're using proportio= nal
>> font.
>>
>
> It's the modern way....=C2=A0 =C2=A0but=C2=A0 WuerfelDev also had = a commit that backed
> that part out that I didn't fold in...
> I'm still torn since I see so many conflicting things about it :(<= br> >
> I'm leaning towards putting them back.

FWIW, I still use monospace fonts for code and thus still use double spaces=
for the reason Alexey stated.=C2=A0 Reading code in proportional fonts (whe= re
spacing is naturally wider at sentence breaks) is not really viable with style(9) which mixes tabs with spaces for indentation.

OK. I've just pushed the other half of 788 where the su= bmitter backed out the removal
of the double spaces. And now I kn= ow why they should remain.

Warner=C2=A0
--000000000000fc7bb90600261dfa-- From nobody Mon Jul 10 19:56:19 2023 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 4R0FBF09Dxz2tlws; Mon, 10 Jul 2023 19:56:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0FBD6rnyz4FkZ; Mon, 10 Jul 2023 19:56:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689018981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o7e/DF8IEctvH3RSAHXs8DWm7MyHz0WbsHWJL15bHEA=; b=SKeWHD7Gy4BsA52Vwt3aZ4LSZMsDA9mWxl5gvuHV4Gu0tD8SHX2qC/mwVaYC852MuAzqpk U3IVr0ypVUtvdxGK4U6kot1M0ftr6plRlENiTbxvCESN7QI38FELwU8vB5ZlX4lahMZRJQ iEDX4zlyD7pe7iFt/Q8qAJdyYoZngcmXkJXTtQTbXmkNw2X8SKi9BUW3rstMX3+gxiF1ZJ qKMI4wHUMjKA10ETXAmbwJZhYUAlA4Ke1rirIyhM8mBz7sI6P5yLTDQno+nYEE4/GPUd3T NTxiLMFHtZSIJvl9VNx3fjqhOX8bs+S87r1SNmZEY7yqs3yNdI2R9mjwA6RecA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689018981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o7e/DF8IEctvH3RSAHXs8DWm7MyHz0WbsHWJL15bHEA=; b=nQ6QffjcXP28FSaxpP11v+zjNuPRfTmruCoCOZy4YxPKtnYUfShwHNGKqqia+C1+pqOC0x LlGYKqkZxyDeY8byaricrDqmKd3yAksSfguSM88HdTJJPD3Lpf74LFyc4ECwXFil2d5Vbd LxjhgpZIpQqqT7yYpl38CGgP9nQnFrRhh/984hqpqgPl2N74nGOh6zSxzYuHUYds2eVVmV lNT7uChfBUn8fJQgkokoWgFhVDS8GTTDNUO6C/PcW1YzsfEi6htILyPJ90iLnFJdu9CwKH /w305fFcwwAaREBmiA0ZFoVtHfh1sf2syV45EIQl33SyzENahl0mpXrWWzrXcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689018981; a=rsa-sha256; cv=none; b=szvg5j3bXvxCE3OnfdgrKqUqTsVrnKfQr+VgC2d02jmmO1qO8u69ZnzuLBqY1LV0p64Jp5 mqJKjSxvOJs1mIek5nP+qgZpFR83B7T8oWFHV+FEb66GQvRgBHNJvKqgwWY3auFWzT3+jh qXDsU1Ka1a6/fdRTl5KqpvdwG4J+VhMsqqpw3oLoYp8+wK8dC5SJIpHueuD/uMlV02EI4A JBaPJaMvGZk6/So2pDJvr1D7/CDcc35cpWlN6gGUMZbiQv7aVOG3uGxxvGtvq2s/AzbIEx KalvVmUveoDhrTlvuaWtppvOi9XjLk2+NJ5RVHPW49DoraKh/K8/WWgOVQzS/A== Received: from [IPV6:2601:648:8680:16b0:6966:ae6d:9848:4b0b] (unknown [IPv6:2601:648:8680:16b0:6966:ae6d:9848:4b0b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R0FBD2s08z1HFf; Mon, 10 Jul 2023 19:56:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 10 Jul 2023 12:56:19 -0700 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: Robert Clausecker , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307032023.363KNhu6031914@gitrepo.freebsd.org> From: John Baldwin Subject: Re: git: ee8b0c436d72 - main - lib/libc/string: replace ffs/fls implementations with clang builtins In-Reply-To: <202307032023.363KNhu6031914@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 7/3/23 1:23 PM, Robert Clausecker wrote: > The branch main has been updated by fuz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ee8b0c436d7221c25e8be3c3fe1f9da78b9d5b16 > > commit ee8b0c436d7221c25e8be3c3fe1f9da78b9d5b16 > Author: Robert Clausecker > AuthorDate: 2023-06-23 16:22:54 +0000 > Commit: Robert Clausecker > CommitDate: 2023-07-03 20:18:27 +0000 > > lib/libc/string: replace ffs/fls implementations with clang builtins > > Most architectures we support (except for riscv64) have instructions > to compute these functions very quickly. Replace old code with the > ffs and clz builtin functions, allowing clang to generate good code > for all architectures. > > As a consequence, toss out arm and i386 ffs() implementations. > > Sponsored by: FreeBSD Foundation > Approved by: mhorne > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D40730 > --- > lib/libc/arm/string/Makefile.inc | 1 - > lib/libc/arm/string/ffs.S | 57 --------------------------------------- > lib/libc/i386/string/Makefile.inc | 1 - > lib/libc/i386/string/ffs.S | 56 -------------------------------------- > lib/libc/string/ffs.c | 12 ++++----- > lib/libc/string/ffsl.c | 12 ++++----- > lib/libc/string/ffsll.c | 12 ++++----- > lib/libc/string/fls.c | 13 +++++---- > lib/libc/string/flsl.c | 14 +++++----- > lib/libc/string/flsll.c | 13 +++++---- > 10 files changed, 34 insertions(+), 157 deletions(-) > > diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c > index 738ef90ce091..c011b3390612 100644 > --- a/lib/libc/string/ffs.c > +++ b/lib/libc/string/ffs.c > @@ -3,6 +3,10 @@ > * > * Copyright (c) 1990, 1993 > * The Regents of the University of California. All rights reserved. > + * Copyright (c) 2023 The FreeBSD Foundation > + * > + * Portions of this software were developed by Robert Clausecker > + * under sponsorship from the FreeBSD Foundation. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions > @@ -43,11 +47,5 @@ __FBSDID("$FreeBSD$"); > int > ffs(int mask) > { > - int bit; > - > - if (mask == 0) > - return(0); > - for (bit = 1; !(mask & 1); bit++) > - mask = (unsigned int)mask >> 1; > - return (bit); > + return (__builtin_ffs(mask)); This breaks the build on GCC: /usr/home/john/work/freebsd/main/lib/libc/string/ffs.c: In function 'ffs': /usr/home/john/work/freebsd/main/lib/libc/string/ffs.c:48:1: error: infinite recursion detected [-Werror=infinite-recursion] 48 | ffs(int mask) | ^~~ /usr/home/john/work/freebsd/main/lib/libc/string/ffs.c:50:17: note: recursive call 50 | return (__builtin_ffs(mask)); | ~^~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors *** Error code 1 -- John Baldwin From nobody Mon Jul 10 20:08:28 2023 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 4R0FSD623cz2tqHK; Mon, 10 Jul 2023 20:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0FSD5ZXMz4HXH; Mon, 10 Jul 2023 20:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689019708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxE/lfZfwJIfy/vN3TbJGSu10Ceq/glE4+GJmCtICxs=; b=TQjJiJX7UOUlQTxpcvDPRbje35VaO3yg7Ewk+Z2eQOPAhRsAQAi/z5BdX8mJV6NHOPNTLJ eJbRfDZ3TaehUzzxJTWNWeFmIpcLjHg7dMfk/g0itzlVtz337JyJKhQSp6C75+ZlLZ3p/g JobRQe5gDBqam6BurZcBEk+xcuvWilKHl7gwBTmDwqu1+3TzhnccK7KZTV8cdKDKn4JqXI /ZSSgFz90tcdh5qWDM2hZBbAZBpoM29SoR+iZz139LO3yGqrS4DYUuNMlSHWiOQEu/7bG4 biwM0Ozk4dqnyoZHBcwBYKCnJTXIcdFQ8aCS8z9OQ1aJwuGwzfPpFoGrzQzyOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689019708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BxE/lfZfwJIfy/vN3TbJGSu10Ceq/glE4+GJmCtICxs=; b=FBfU/UONKmnlJ6yhfm0JB5rvYARrnpGIObVybGhpeHGj4NtFxJgAvwzJvHVjwKthTJDGOq trMyMnBTx/mo0CDIsQMLiO7gU0gp2i08taIURlZ9ZzqLl+SOwqTJXM7n3lXLk10KiyJeOT Yu2+dkibB3ztCNiPyD0s+6Ozdo4FbPSK9dl6T+syoohjZ22ZjiQEpVfFJovbf/xWXHqPUP B2SfF3vNxi92O0x1r91oLLfgvG+0uvKmoE3ZV+cbWXfkV7rjVMWOqHLdX96ZwknULiACIn t9Rxcs7ElaPHI/uqX/59mEQ7PBbBI6BPZ5OXzRhKcwkexVX4fokI3FcVq9SGlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689019708; a=rsa-sha256; cv=none; b=GQp9qSAj773gu8jPNvEiSs/A/PJX5XmjdA3MsK29A3nkOvtEHv0eN2PqlPoSEC6Zsv+aHB jtRlaFHLk4eyJS25ju/Na0ct18DvhBRCMVtG/FF8hx1VDi/suApDd18WXZZKOMLNhxPGR3 xzVB3LidzSDSJx2u9t0lLhwbqxcOhtjUTrlZZXhX2568Sz284yh8u/+9F+LmZCMdwJzXPX /VBlR8dgJKahJ1vTbAgpk9yRc1CoAnAHbWgTcS1ISlTnJy567bPrn7Af1QDVYsJi58+xZI XKqAlfMlu5JnnoigpcbFr2fdpkrfJT5jDIVV6NG/ZC8LKQmalpe5DM4MX7qw5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0FSD4c6LzyB5; Mon, 10 Jul 2023 20:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AK8SIQ019232; Mon, 10 Jul 2023 20:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AK8SHp019231; Mon, 10 Jul 2023 20:08:28 GMT (envelope-from git) Date: Mon, 10 Jul 2023 20:08:28 GMT Message-Id: <202307102008.36AK8SHp019231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: eb8d2e123d10 - main - dhclient: fix build on i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb8d2e123d109ac84230c8491f3b80f6d71a1dfd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8d2e123d109ac84230c8491f3b80f6d71a1dfd commit eb8d2e123d109ac84230c8491f3b80f6d71a1dfd Author: Eric van Gyzen AuthorDate: 2023-07-10 20:03:39 +0000 Commit: Eric van Gyzen CommitDate: 2023-07-10 20:03:39 +0000 dhclient: fix build on i386 Only i386 still uses a 32-bit time_t. I knew this, and I still failed to compile-test on i386. My bad. Reported by: cy Fixes: c210cac00f258 ("dhclient: fix time parsing for leases...") Sponsored by: Dell EMC Isilon --- sbin/dhclient/tests/option-domain-search.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/dhclient/tests/option-domain-search.c b/sbin/dhclient/tests/option-domain-search.c index a3517c9c1dc1..22a7998575af 100644 --- a/sbin/dhclient/tests/option-domain-search.c +++ b/sbin/dhclient/tests/option-domain-search.c @@ -343,7 +343,9 @@ parse_date_valid(void) abort(); parse_date_helper(" 2 2024/7/2 20:25:50;\n", 1719951950); +#ifndef __i386__ parse_date_helper(" 1 2091/7/2 20:25:50;\n", 3834246350); +#endif } int From nobody Mon Jul 10 22:19:53 2023 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 4R0JMs6P80z4kSmt; Mon, 10 Jul 2023 22:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0JMs5XJcz3hDw; Mon, 10 Jul 2023 22:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689027593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xU2i2t2elwleb8WRArX8OjaY3wW3snlzV7/D35UsZeQ=; b=PL5Y3iGcxTy64FW2YdGVLYWdDVM5oz0vYrwC0G7y43LQ84l0q0KTg/jgqZ+2iOd3jT57W9 uQBl/Ful6Tplow2GYt1IsZb6lIzYwMFv2XDopXeA74QeuouInOz76GjNwVa1fBMpOxQ8lV Ox/RR07RTENnU7wDkwYIb8gM1WUNdyqt2ubThzYTL9zE/rcVEttaQbuvs7bgXLDRVEiFl2 yqGHSpRSuYvLZx+fVueTybpa0uuQSEWo5tbDu9ekr1G6KFZLswftSMQZl0eupU6hEgxViL iaF5N47lmbkasc+qsqUVQoZWuCGSo9HT/hRuTjYD7PdoFlMlSGNaBA9qD3sH6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689027593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xU2i2t2elwleb8WRArX8OjaY3wW3snlzV7/D35UsZeQ=; b=lCs/dsaUV2seVwVi+KiZ0xkGiFGRFFvbYNMcKJVEFIe9FJBnlo1YIGHGczpPABNmEfEUh6 0juReKc22T5oAs+EssT2uAyXccXx9uBFgbWMmWwIM4Zp6NX25KbQPs6QFEwIuq84NbmrF0 yc5fpLIbZYKPBashyLD8OkvX7kwBy+eCrZB38hGieo9K0ZKcIy8+M3zQfGet3UUhnXLkHT 8uG3S6paYjkI1f96mTK3XSFppTFNxqdMKCzOw3qcm8dl0nCc5Ph18W+fK3LcF4CgaU4UZx PB8vMIiQHsWUY9YkBuHvQIImEF5RUwozyrClyROj5qn/Ww6TcgqHgaQhS2iTFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689027593; a=rsa-sha256; cv=none; b=I4wOeARUJUMf0m0ZHEmif/DDv1tNiGDezt2tAEuSpy72ZeWLbPo9KJ5LcGoxTWgrXjJx4q k1i4lx8BgqJcjSKpp6khyv/kDV3WEfIAogSCsWCI6Hjkem7Li5Hv+6FhvTIcB6N2FQRsgV pyorkyq2wf27blxog3HW7k4ChECXgzSwHkMjqaEwaDSZVV27DyJoTuuE208gKN2U7LCkE1 seCyJgYwMC9ui+wmMvhUKs1o8EN8Bn9tLaSM5D8xkKwEXdBRPt5xmlDHw7TEbmHY7dXANe T5igZJHNNExuo8Pv0duziFtYwmAVH+IVsx8GJvGhNqPoVubkUYzd1g8e9y2tPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0JMs4Tc8z12Kf; Mon, 10 Jul 2023 22:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AMJrNe034544; Mon, 10 Jul 2023 22:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AMJrcw034543; Mon, 10 Jul 2023 22:19:53 GMT (envelope-from git) Date: Mon, 10 Jul 2023 22:19:53 GMT Message-Id: <202307102219.36AMJrcw034543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 7acb53817ffc - main - release: Add code to make FreeBSD/Firecracker 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7acb53817ffcfcbe328f08a60f8087e6b88fa098 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7acb53817ffcfcbe328f08a60f8087e6b88fa098 commit 7acb53817ffcfcbe328f08a60f8087e6b88fa098 Author: Colin Percival AuthorDate: 2023-07-10 06:16:31 +0000 Commit: Colin Percival CommitDate: 2023-07-10 22:19:33 +0000 release: Add code to make FreeBSD/Firecracker This just stages the kernel and builds a stripped-down rootfs for use with the Firecracker VMM. At some point in the future the release engineering team might start publishing these, but initially it's just here to simplify FreeBSD/Firecracker development and testing. Note that the rootfs generated: * Uses an IP address of 10.0.0.2 with a gateway of 10.0.0.1, * Has sshd enabled, * Has user "freebsd" with password "freebsd" and a root password of "root", and * Is 1 GB in size (but has growfs enabled). All of those are subject to change without notice; anyone intending to use FreeBSD/Firecracker in anything remotely resembling a production environment should talk to cperciva first. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D40956 --- release/Makefile.firecracker | 58 ++++++++++++++++++++++++++++++++++++++++++++ release/Makefile.vm | 1 + 2 files changed, 59 insertions(+) diff --git a/release/Makefile.firecracker b/release/Makefile.firecracker new file mode 100644 index 000000000000..bb54db7da5db --- /dev/null +++ b/release/Makefile.firecracker @@ -0,0 +1,58 @@ +# +# Makefile for creating FreeBSD/Firecracker artifacts +# + +CLEANDIRS+= ${TARGET}/firecracker-kern ${TARGET}/firecracker-world + +# Bits related to hardware which won't exist in a VM. +WITHOUT_VM_ENOENT=WITHOUT_APM=YES WITHOUT_BLUETOOTH=YES WITHOUT_CXGBETOOL=YES \ + WITHOUT_FLOPPY=YES WITHOUT_GPIO=YES WITHOUT_MLX5TOOL=YES WITHOUT_USB=YES \ + WITHOUT_USB_GADGET_EXAMPLES=YES WITHOUT_VT=YES WITHOUT_WIRELESS=YES +# Bits related to software which doesn't exist in Firecracker specifically. +WITHOUT_FC_ENOENT=WITHOUT_ACPI=YES WITHOUT_BOOT=YES WITHOUT_BHYVE=YES \ + WITHOUT_EFI=YES WITHOUT_FDT=YES WITHOUT_HYPERV=YES \ + WITHOUT_LEGACY_CONSOLE=YES WITHOUT_SYSCONS=YES +# Bits which take up a lot of space and probably won't be wanted inside a +# Firecracker VM. +WITHOUT_FC_FEATURES=WITHOUT_DEBUG_FILES=YES WITHOUT_INCLUDES=YES \ + WITHOUT_INSTALLLIB=YES WITHOUT_TESTS=YES WITHOUT_TOOLCHAIN=YES +# All the excluded bits +WITHOUTS=${WITHOUT_VM_ENOENT} ${WITHOUT_FC_ENOENT} ${WITHOUT_FC_FEATURES} + +firecracker: firecracker-freebsd-kern.bin firecracker-freebsd-rootfs.bin + +FCKDIR= ${.OBJDIR}/${TARGET}/firecracker-kern +firecracker-freebsd-kern.bin: +.if !defined(DESTDIR) || !exists(${DESTDIR}) + @echo "--------------------------------------------------------------" + @echo ">>> DESTDIR must point to destination for Firecracker binaries" + @echo "--------------------------------------------------------------" + @false +.endif + mkdir -p ${FCKDIR} + ${MAKE} -C ${WORLDDIR} DESTDIR=${FCKDIR} \ + KERNCONF=FIRECRACKER TARGET=${TARGET} installkernel + cp ${FCKDIR}/boot/kernel/kernel ${DESTDIR}/freebsd-kern.bin + +FCWDIR= ${.OBJDIR}/${TARGET}/firecracker-world +firecracker-freebsd-rootfs.bin: + mkdir -p ${FCWDIR} + ${MAKE} -C ${WORLDDIR} DESTDIR=${FCWDIR} \ + ${WITHOUTS} TARGET=${TARGET} installworld distribution distrib-dirs + echo '/dev/ufs/rootfs / ufs rw 1 1' > ${FCWDIR}/etc/fstab + echo 'hostname="freebsd"' >> ${FCWDIR}/etc/rc.conf + echo 'ifconfig_vtnet0="inet 10.0.0.2 netmask 255.255.0.0"' >> ${FCWDIR}/etc/rc.conf + echo 'defaultrouter="10.0.0.1"' >> ${FCWDIR}/etc/rc.conf + echo 'sshd_enable="YES"' >> ${FCWDIR}/etc/rc.conf + echo 'sshd_rsa_enable="NO"' >> ${FCWDIR}/etc/rc.conf + echo 'growfs_enable="YES"' >> ${FCWDIR}/etc/rc.conf + echo 'nameserver 8.8.8.8' >> ${FCWDIR}/etc/resolv.conf + sed -i '' -e '/periodic/s/^/#/' ${FCWDIR}/etc/crontab + pw -R ${FCWDIR} groupadd freebsd -g 1001 + mkdir -p ${FCWDIR}/home/freebsd + pw -R ${FCWDIR} useradd freebsd -m -M 0755 -w yes -n freebsd \ + -u 1001 -g 1001 -G 0 -c "FreeBSD User" -d /home/freebsd -s /bin/sh + pw -R ${FCWDIR} usermod root -w yes + touch ${FCWDIR}/firstboot + makefs -s 1g -o label=rootfs -o version=2 -o softupdates=1 \ + ${DESTDIR}/freebsd-rootfs.bin ${FCWDIR} diff --git a/release/Makefile.vm b/release/Makefile.vm index 81f46a23b2ac..ce86fabdfe5e 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -181,6 +181,7 @@ cloudware-release: .include "${.CURDIR}/Makefile.azure" .include "${.CURDIR}/Makefile.ec2" +.include "${.CURDIR}/Makefile.firecracker" .include "${.CURDIR}/Makefile.gce" .include "${.CURDIR}/Makefile.vagrant" .include "${.CURDIR}/Makefile.inc1" From nobody Mon Jul 10 22:40:59 2023 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 4R0JrD4ttLzZNQ0; Mon, 10 Jul 2023 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0JrD1FJLz3m2l; Mon, 10 Jul 2023 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689028860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTQUR8JhxTPjRmHnykzkU1u5Ziw9sPEezpGS3KTj7pw=; b=amjo9khy8H/ewl8/bzg4pTfo67HThjpUG/EEBE59wad/ewBUwKNjfjjdJaLTyr+PfZKJnv UGPa4weK4RWhLBWaYaSrhfwK6fPoDeY7zlQP69u5hXyup6NVbc562iK1W1TajBqv7nzrXn 5N+P7q4LBon+/1x1M2POQPnErAk1x99sJB5EH0GDhC6Kf1wtTiLSaDs+0+D3iGPIpHjHli Xaj+V7PojJIs+pM2EC98S8GB6EoB3xdWVo9/hCrcP+TlXaanN+tvZIFcIx6iujUMbfjUzo Oy0+h3FAGFWjvgbCMKfJNrOirbb0LI/cpI9kmjxbKTr5o4VgCsLmQY+tL+QN9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689028860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rTQUR8JhxTPjRmHnykzkU1u5Ziw9sPEezpGS3KTj7pw=; b=ulhx1K1TUy7+WgPV155PWAlaO4CHjx3XDABnZ+vIEywXBP3ow1FAlEAtwUWI4/J8Uz4UXM 91XZiCono6o0FLnH2XZxUfSDFjk6TvRSOHBxXLQq4M3Jn6IQYQDH4QPWYQa/DCQr8dz5ny OVewoKbyJNtCEehOjC2D0X3DXUlhe2VhdlE6qNnzSmefB7Bf53+/V5plhLBjiCUnBW9UHn 4nZS5veuNHYUhoS1tDyLxTceG7MvvA98aO5BUx6FUhDlAItI+W9q7JVAV3aAubL383VbsZ ReSFDa6dFJwm80Q+r4LMAguzIvzlV6y+qlFuHWrRccDho5zQ38D9AmLp/5NqFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689028860; a=rsa-sha256; cv=none; b=cAFyaf8wF1SIQuSrKeiTCoYylVIv4RmOvKKtY5jhmjjW9Kb8T2fwg71iyp+3Ex/RuDvTML boCcMCP3hCuYC9W11WAHQ4AhYZkHxN1CIIneIaEM/I98QGsXR0Q8Zg6R8BKdgpA/1ifkcc MLhzkP88WrL6MvT2oJJm/Y4CTyQ2yLW0P9lvFsmt78l7PgP3C7FJ+CDWncck2+TmXMKH2H 8GdAxd2mHAA50035b/FO0rUZfd0jVcOuEAArAiQxjhs6emXMteq1n6NzM2Vgi3YBvvIsxL 8+YDW3qLCJNA2fKehhKLpGOpEBK1AUGgJSK8hOei/frWWoP3fEf715WYI0GEtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0JrD0Jy2z12bL; Mon, 10 Jul 2023 22:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AMexYd075926; Mon, 10 Jul 2023 22:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AMex5S075925; Mon, 10 Jul 2023 22:40:59 GMT (envelope-from git) Date: Mon, 10 Jul 2023 22:40:59 GMT Message-Id: <202307102240.36AMex5S075925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 92642bba4db4 - main - zfsd: listen for sysevent.fs.zfs instead of misc.fs.zfs 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92642bba4db4bf1719758ac7233468bc09a0bd59 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=92642bba4db4bf1719758ac7233468bc09a0bd59 commit 92642bba4db4bf1719758ac7233468bc09a0bd59 Author: Alan Somers AuthorDate: 2023-04-03 21:45:55 +0000 Commit: Alan Somers CommitDate: 2023-07-10 22:36:57 +0000 zfsd: listen for sysevent.fs.zfs instead of misc.fs.zfs At some point the names of these devd events changed. Probably it happened when importing OpenZFS. Before that, FreeBSD's sysevent_alloc method didn't create a "class" nvpair in the event, which led to log_sysevent using the event's ev_subclass field as its type. MFC after: 2 weeks Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D39437 --- cddl/usr.sbin/zfsd/case_file.cc | 6 +++--- cddl/usr.sbin/zfsd/zfsd.cc | 2 +- cddl/usr.sbin/zfsd/zfsd_event.cc | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index 5064d3c266dd..ef4d592b9602 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -388,7 +388,7 @@ CaseFile::ReEvaluate(const ZfsEvent &event) { bool consumed(false); - if (event.Value("type") == "misc.fs.zfs.vdev_remove") { + if (event.Value("type") == "sysevent.fs.zfs.vdev_remove") { /* * The Vdev we represent has been removed from the * configuration. This case is no longer of value. @@ -396,12 +396,12 @@ CaseFile::ReEvaluate(const ZfsEvent &event) Close(); return (/*consumed*/true); - } else if (event.Value("type") == "misc.fs.zfs.pool_destroy") { + } else if (event.Value("type") == "sysevent.fs.zfs.pool_destroy") { /* This Pool has been destroyed. Discard the case */ Close(); return (/*consumed*/true); - } else if (event.Value("type") == "misc.fs.zfs.config_sync") { + } else if (event.Value("type") == "sysevent.fs.zfs.config_sync") { RefreshVdevState(); if (VdevState() < VDEV_STATE_HEALTHY) consumed = ActivateSpare(); diff --git a/cddl/usr.sbin/zfsd/zfsd.cc b/cddl/usr.sbin/zfsd/zfsd.cc index 29c6b1ae22e2..16c02203b66b 100644 --- a/cddl/usr.sbin/zfsd/zfsd.cc +++ b/cddl/usr.sbin/zfsd/zfsd.cc @@ -248,7 +248,7 @@ ZfsDaemon::BuildCaseFiles() snprintf(evString, 160, "!system=ZFS subsystem=ZFS " - "type=misc.fs.zfs.config_sync sub_type=synthesized " + "type=sysevent.fs.zfs.config_sync sub_type=synthesized " "pool_name=%s pool_guid=%" PRIu64 "\n", poolname, poolGUID); event = Event::CreateEvent(GetFactory(), string(evString)); if (event != NULL) { diff --git a/cddl/usr.sbin/zfsd/zfsd_event.cc b/cddl/usr.sbin/zfsd/zfsd_event.cc index 45fc7adbb31b..5391aeb2997f 100644 --- a/cddl/usr.sbin/zfsd/zfsd_event.cc +++ b/cddl/usr.sbin/zfsd/zfsd_event.cc @@ -285,7 +285,7 @@ ZfsEvent::Process() const } /* On config syncs, replay any queued events first. */ - if (Value("type").find("misc.fs.zfs.config_sync") == 0) { + if (Value("type").find("sysevent.fs.zfs.config_sync") == 0) { /* * Even if saved events are unconsumed the second time * around, drop them. Any events that still can't be @@ -296,7 +296,7 @@ ZfsEvent::Process() const CaseFile::ReEvaluateByGuid(PoolGUID(), *this); } - if (Value("type").find("misc.fs.zfs.") == 0) { + if (Value("type").find("sysevent.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); return (false); @@ -409,7 +409,7 @@ ZfsEvent::ProcessPoolEvent() const bool degradedDevice(false); /* The pool is destroyed. Discard any open cases */ - if (Value("type") == "misc.fs.zfs.pool_destroy") { + if (Value("type") == "sysevent.fs.zfs.pool_destroy") { Log(LOG_INFO); CaseFile::ReEvaluateByGuid(PoolGUID(), *this); return; @@ -424,7 +424,7 @@ ZfsEvent::ProcessPoolEvent() const Log(LOG_INFO); caseFile->ReEvaluate(*this); } - else if (Value("type") == "misc.fs.zfs.resilver_finish") + else if (Value("type") == "sysevent.fs.zfs.resilver_finish") { /* * It's possible to get a resilver_finish event with no @@ -435,7 +435,7 @@ ZfsEvent::ProcessPoolEvent() const CleanupSpares(); } - if (Value("type") == "misc.fs.zfs.vdev_remove" + if (Value("type") == "sysevent.fs.zfs.vdev_remove" && degradedDevice == false) { /* See if any other cases can make use of this device. */ From nobody Mon Jul 10 22:41:01 2023 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 4R0JrF4W4rzZNF5; Mon, 10 Jul 2023 22:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0JrF2BpMz3mLW; Mon, 10 Jul 2023 22:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689028861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J05cR2IGG+UynO5503EaPcKSdgv/AB6XisYD++ifdzU=; b=X30cgx9AZ56Cq2TuqXWa4JLIrW47CQ39fewTZIojDXdmVeL0XxBfoNWEYSOZ5Pu5L90d9J gVKksngvIvcjzswarUzphiiy3B8yz++bdjMGkViKI+vCYmsowXh0Z4zwlbOwfvvV7GEMLq l3oCRPEwvHH4uiNMmqEBvtWOAnKPmOy3+kHPpnCZ1Qrxjg5n9kfHFGShBrnD7Miv9X6QGo KxrU/ucM1moOiQYRaljWLdO1ZFmw0ko6PDeQWMR/rtNdE46P+Su8rlIE2VRJYUNbKp9Gst +LNs+GByKi2WPhuL1TXQq4B9bb2r8Tehjkwg1fQI3qLUjeg84+NdyBFJw8vOXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689028861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J05cR2IGG+UynO5503EaPcKSdgv/AB6XisYD++ifdzU=; b=FD7VwBX83tN5xH0wtEy4lsrsNYE78G/wDm8eQn4BjSoDSpGDVaRQCKnTA856sCSSRiKYKC MlKsiwpGQfEc0H5bzQ/mwMFqGPDVtGFjF5pBJs6FEvB9hWwXif6FfHdBQRCncF3f5gv8ML 9slHAiC//XML9L3qjePm98Uu3KVzvXNCloufHumTrbDDngHD3l8ZE4kFdUhGLAYaYDVfxh /5FiZQ+74Oa0emb/+HmY7t+JZJOzROj+73wbsn32NEksSsG2ZH6sATwskeUajEoh4pkX67 kWfLS5IOZYJoyIQAcxVNEZM5wqgpmJllPut1YehPCm+jaI4ZlA19jRWpz3/znQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689028861; a=rsa-sha256; cv=none; b=WG9TLXthc9r8PhWsG0Dse2rD9Sx0AM7JLVEGAwvbPDMbiI/fs58B7C6Z/XuWBBVUsd2KDt qIrB51yzDSi3huFxsBFSRQyTZM7Iv1wJuufGFZx/o/RX4bSRoWXPDW4pTopKx+BbQgExny bZAQnS2EuMGAjn43PQOXp6TqohwlrKtW3dj9wU4k3SRA0/ObKLDJCcjQ9LIQqcV8nkueWy xp8zorSNIMgVgzCeyrbQye9+bSU9LlMRGK6ouFj36Hafw57auvEzlrvig7+j07F6w8fUdF ZPe/r2j62KbfgGroTOSPujr6ofGUAJkOWLhkcRu1bcD/Xyf2iJJp+H26a+IocA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0JrF1DtNz12Cc; Mon, 10 Jul 2023 22:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AMf1Ti075951; Mon, 10 Jul 2023 22:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AMf1Jo075950; Mon, 10 Jul 2023 22:41:01 GMT (envelope-from git) Date: Mon, 10 Jul 2023 22:41:01 GMT Message-Id: <202307102241.36AMf1Jo075950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: dba2e89ea7a1 - main - Multiple fixes to the zfsd test suite 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dba2e89ea7a13469ee2e47a2a1d627ca28bb94c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=dba2e89ea7a13469ee2e47a2a1d627ca28bb94c2 commit dba2e89ea7a13469ee2e47a2a1d627ca28bb94c2 Author: Alan Somers AuthorDate: 2023-04-03 21:43:17 +0000 Commit: Alan Somers CommitDate: 2023-07-10 22:36:57 +0000 Multiple fixes to the zfsd test suite * Wait for gnop devices to disappear after "gnop destroy". Apparently that process is asynchronous now, or maybe it's just slower than it used to be. Also, after removing a gnop wait for its pool to be degraded. That isn't instant. * The zfsd tests no longer require camcontrol. This was a harmless oversight from 11ed0a95bfa76791dc6428eb2d47a986c0c6f8a3 * Fix the zfsd_degrade_001_pos test for recent zfs versions. ZFS now rate limits checksum errors to about 20 per second. But zfsd's threshold for degrading a disk is 50 per minute. So we must alternately corrupt and scrub the pool to ensure that checksum errors are generated in multiple 1-second windows, so that zfsd will see enough of them. * Fix the zfsd_fault_001_pos test in VMs And, for that matter, when using NVME or SATA disks. As originally written, the test used the da driver to inject errors. Rewrite it to use gnop vdevs. gnop can also inject errors. It works on top of any disk device, and it's also faster than using da. MFC after: 2 weeks Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D39437 --- tests/sys/cddl/zfs/include/libgnop.kshlib | 6 ++ tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib | 29 ++++++--- .../zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh | 1 + .../zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh | 1 + .../sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh | 69 ++++------------------ .../cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh | 1 + tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh | 18 +++--- 7 files changed, 53 insertions(+), 72 deletions(-) diff --git a/tests/sys/cddl/zfs/include/libgnop.kshlib b/tests/sys/cddl/zfs/include/libgnop.kshlib index 1e285bb9f029..2a3a7eeb45b2 100644 --- a/tests/sys/cddl/zfs/include/libgnop.kshlib +++ b/tests/sys/cddl/zfs/include/libgnop.kshlib @@ -85,6 +85,12 @@ function destroy_gnop # Use "-f" so we can destroy a gnop with a consumer (like ZFS) gnop destroy -f ${disk}.nop + + # Wait for it to disappear + for i in `seq 5`; do + gnop status ${disk}.nop >/dev/null 2>/dev/null || break + sleep $i + done } # Destroy multiple gnop devices. Attempt to destroy them all, ignoring errors diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib index a14136677ba8..5e79365438aa 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib @@ -72,19 +72,32 @@ function corrupt_pool_vdev typeset pool=$1 typeset vdev=$2 typeset file=$3 + typeset -li start=0 + typeset -li now=0 + typeset -li timeout=60 # do some IO on the pool log_must $DD if=/dev/zero of=$file bs=1024k count=64 $FSYNC $file - # scribble on the underlying file to corrupt the vdev - log_must $DD if=/dev/urandom of=$vdev bs=1024k count=64 conv=notrunc + # ZFS rate limits checksum errors to about 20 per second. So in order + # to ensure that we reach zfsd's threshold, we must alternately + # scribble and scrub. + while (( "$now" - "$start" < "$timeout" )); do + # scribble on the underlying file to corrupt the vdev + log_must $DD if=/dev/urandom of=$vdev bs=1024k count=64 conv=notrunc - # Scrub the pool to detect the corruption - log_must $ZPOOL scrub $pool - wait_until_scrubbed $pool + # Scrub the pool to detect and repair the corruption + log_must $ZPOOL scrub $pool + wait_until_scrubbed $pool + now=`date +%s` + if [ "$start" -eq 0 ]; then + start=`date +%s` + fi + check_state "$pool" "$vdev" DEGRADED && return + $SLEEP 1 + done - # ZFSD can take up to 60 seconds to degrade an array in response to - # errors (though it's usually faster). - wait_for_pool_dev_state_change 60 $vdev DEGRADED + log_must $ZPOOL status "$pool" + log_fail "ERROR: Disk $vdev not marked as DEGRADED in $pool" } diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh index 64be3c05503e..03cccf566838 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh @@ -83,6 +83,7 @@ for keyword in "${MY_KEYWORDS[@]}" ; do log_must $ZPOOL set autoreplace=on $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL" diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh index 604071f5ef85..18cb36d20a75 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh @@ -93,6 +93,7 @@ for keyword in "${MY_KEYWORDS[@]}" ; do log_must $ZPOOL set autoreplace=on $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL" diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh index 5dfc8e9a9d18..57233070a1ba 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh @@ -27,6 +27,7 @@ # $FreeBSD$ . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/include/libgnop.kshlib ################################################################################ # @@ -39,8 +40,7 @@ # # # STRATEGY: -# 1. Create a storage pool. Only use the da driver (FreeBSD's SCSI disk -# driver) because it has a special interface for simulating IO errors. +# 1. Create a storage pool. Use gnop vdevs so we can inject I/O errors. # 2. Inject IO errors while doing IO to the pool. # 3. Verify that the vdev becomes FAULTED. # 4. ONLINE it and verify that it resilvers and joins the pool. @@ -57,65 +57,28 @@ verify_runnable "global" -function cleanup -{ - # Disable error injection, if still active - sysctl kern.cam.da.$TMPDISKNUM.error_inject=0 > /dev/null - - if poolexists $TESTPOOL; then - # We should not get here if the test passed. Print the output - # of zpool status to assist in debugging. - $ZPOOL status - # Clear out artificially generated errors and destroy the pool - $ZPOOL clear $TESTPOOL - destroy_pool $TESTPOOL - fi -} - log_assert "ZFS will fault a vdev that produces IO errors" -log_onexit cleanup ensure_zfsd_running -# Make sure that at least one of the disks is using the da driver, and use -# that disk for inject errors -typeset TMPDISK="" -for d in $DISKS -do - b=`basename $d` - if test ${b%%[0-9]*} == da - then - TMPDISK=$b - TMPDISKNUM=${b##da} - break - fi -done -if test -z $TMPDISK -then - log_unsupported "This test requires at least one disk to use the da driver" -fi +DISK0_NOP=${DISK0}.nop +DISK1_NOP=${DISK1}.nop +log_must create_gnops $DISK0 $DISK1 for type in "raidz" "mirror"; do log_note "Testing raid type $type" # Create a pool on the supplied disks - create_pool $TESTPOOL $type $DISKS + create_pool $TESTPOOL $type "$DISK0_NOP" "$DISK1_NOP" log_must $ZFS create $TESTPOOL/$TESTFS # Cause some IO errors writing to the pool while true; do - # Running zpool status after every dd operation is too slow. - # So we will run several dd's in a row before checking zpool - # status. sync between dd operations to ensure that the disk - # gets IO - for ((i=0; $i<64; i=$i+1)); do - sysctl kern.cam.da.$TMPDISKNUM.error_inject=1 > \ - /dev/null - $DD if=/dev/zero bs=128k count=1 >> \ - /$TESTPOOL/$TESTFS/$TESTFILE 2> /dev/null - $FSYNC /$TESTPOOL/$TESTFS/$TESTFILE - done + log_must gnop configure -e 5 -w 100 "$DISK1_NOP" + $DD if=/dev/zero bs=128k count=1 >> \ + /$TESTPOOL/$TESTFS/$TESTFILE 2> /dev/null + $FSYNC /$TESTPOOL/$TESTFS/$TESTFILE # Check to see if the pool is faulted yet $ZPOOL status $TESTPOOL | grep -q 'state: DEGRADED' if [ $? == 0 ] @@ -127,15 +90,9 @@ for type in "raidz" "mirror"; do log_must check_state $TESTPOOL $TMPDISK "FAULTED" - #find the failed disk guid - typeset FAILED_VDEV=`$ZPOOL status $TESTPOOL | - awk "/^[[:space:]]*$TMPDISK[[:space:]]*FAULTED/ {print \\$1}"` - - # Reattach the failed disk - $ZPOOL online $TESTPOOL $FAILED_VDEV > /dev/null - if [ $? != 0 ]; then - log_fail "Could not reattach $FAILED_VDEV" - fi + # Heal and reattach the failed disk + log_must gnop configure -w 0 "$DISK1_NOP" + log_must $ZPOOL online $TESTPOOL "$DISK1_NOP" # Verify that the pool resilvers and goes to the ONLINE state for (( retries=60; $retries>0; retries=$retries+1 )) diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh index 21850af96f96..006eaeaef92c 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh @@ -58,6 +58,7 @@ for type in "raidz" "mirror"; do # Disable the first disk. log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 # Write out data to make sure we can do I/O after the disk failure log_must $DD if=/dev/zero of=$TESTDIR/$TESTFILE bs=1m count=1 diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh index b15208973bfe..4c43ba4e601d 100755 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh @@ -30,12 +30,14 @@ atf_test_case zfsd_fault_001_pos cleanup zfsd_fault_001_pos_head() { atf_set "descr" "ZFS will fault a vdev that produces IO errors" - atf_set "require.progs" "ksh93 zfs zpool zfsd" + atf_set "require.progs" "ksh93 gnop zfs zpool zfsd" atf_set "timeout" 300 } zfsd_fault_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/../hotspare/hotspare.kshlib + . $(atf_get_srcdir)/../hotspare/hotspare.cfg . $(atf_get_srcdir)/zfsd.cfg verify_disk_count "$DISKS" 2 @@ -212,7 +214,7 @@ atf_test_case zfsd_hotspare_004_pos cleanup zfsd_hotspare_004_pos_head() { atf_set "descr" "Removing a disk from a pool results in the spare activating" - atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd" + atf_set "require.progs" "ksh93 gnop zpool" atf_set "timeout" 3600 } zfsd_hotspare_004_pos_body() @@ -303,7 +305,7 @@ atf_test_case zfsd_hotspare_007_pos cleanup zfsd_hotspare_007_pos_head() { atf_set "descr" "zfsd will swap failed drives at startup" - atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd" + atf_set "require.progs" "ksh93 gnop zpool" atf_set "timeout" 3600 } zfsd_hotspare_007_pos_body() @@ -364,7 +366,7 @@ atf_test_case zfsd_autoreplace_001_neg cleanup zfsd_autoreplace_001_neg_head() { atf_set "descr" "A pool without autoreplace set will not replace by physical path" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop" + atf_set "require.progs" "ksh93 zpool gnop" atf_set "timeout" 3600 } zfsd_autoreplace_001_neg_body() @@ -425,7 +427,7 @@ atf_test_case zfsd_autoreplace_003_pos cleanup zfsd_autoreplace_003_pos_head() { atf_set "descr" "A pool with autoreplace set will replace by physical path even if a spare is active" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop" + atf_set "require.progs" "ksh93 zpool gnop" atf_set "timeout" 3600 } zfsd_autoreplace_003_pos_body() @@ -456,7 +458,7 @@ atf_test_case zfsd_replace_001_pos cleanup zfsd_replace_001_pos_head() { atf_set "descr" "ZFSD will automatically replace a SAS disk that disappears and reappears in the same location, with the same devname" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop" + atf_set "require.progs" "ksh93 zpool zfs gnop" } zfsd_replace_001_pos_body() { @@ -485,7 +487,7 @@ atf_test_case zfsd_replace_002_pos cleanup zfsd_replace_002_pos_head() { atf_set "descr" "zfsd will reactivate a pool after all disks are failed and reappeared" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs" + atf_set "require.progs" "ksh93 zpool zfs" } zfsd_replace_002_pos_body() { @@ -514,7 +516,7 @@ atf_test_case zfsd_replace_003_pos cleanup zfsd_replace_003_pos_head() { atf_set "descr" "ZFSD will correctly replace disks that dissapear and reappear with different devnames" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop" + atf_set "require.progs" "ksh93 zpool zfs gnop" } zfsd_replace_003_pos_body() { From nobody Mon Jul 10 22:57:58 2023 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 4R0KCp5QxyzZTSC; Mon, 10 Jul 2023 22:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0KCp51Dxz3q8B; Mon, 10 Jul 2023 22:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689029878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYCBU68nDeXQPTkZpWwHXGmBBMBRzMVZ9CjuwIxsYG8=; b=Ark6FN8luJ8JuWMLTJ6jim93DjvOwd8bFya8AGqSNIpxbgPTETdeeo/IPfb7ba+tLJJxPJ yO3qCtBTtmOq+KX/VjBvqPRkZVzDLNVqD8WUlaDBkh6tQkp00gxnrHDu4zxuQZaRTHw4EC uDd35u/W7TdG9i5a+cn19V3f5Pty7AKtlmBW3ZKg9tTjEzQXmBEHJQf1tC4B2VkB5t5PzM mwn619U6fxPFeTIS7NusCvdxBzOcxqbPI4gYk3KFgfArI6JJd+lOTGU30X1wr/897P8SjH 5bTh0zUusSJGKRWawcI0ei+EpVzdtcS/qwqq6W8p5PIylkPg3V0ktu5aAd3ffw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689029878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYCBU68nDeXQPTkZpWwHXGmBBMBRzMVZ9CjuwIxsYG8=; b=CdI/kgSWhyGRJrv/BTRkWYzZ6dLnhosiV4lcZ8NipKFCm2f0JYCYJIt53z6Wr2vO4xkgaX ZEUXcEIZJUWaV4Wmx43hbd3mmqxKhWm81UZ6JtuaJs92oU2/N5/AXK+fpRS/tp0rp0apW+ wRPLu8pFkhGfhqW74zOD4xNxy7uaeLXsoGE6sRvTeP6Qq0kVAkc2y7IKGTCfyL3fu8tNRk LWH7tfwF5xzLPGtgsJOISY9pdyz4uhVf+A1wEg4N88GH9/BkAsg+A1JFjjYWP6Wb62BltV OPNgh2ZphetBLc/LQZR76oEgxCKs3LBQ+ZnsijNqKIiDQyVIrs8ZZ2aWYd+ZRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689029878; a=rsa-sha256; cv=none; b=muRsjVhGqnWwd2sk0hsSPHQ3A9WhcOxSiEEYRaItcl+thE9WTXThX1r5lz1aK8J7tduXK7 viRf/0zEkStP/npBCIJp+umKXW9I3C5WnaAStNoC/EDUpAW3hV6e7bf/chE64iNlWg5QOw x0pK9HATQOoMgB1EBx3EMS29gPuHMtEeRbIBZmFldJksQOUDVkgFYOveSzj5yEd7i6lZbv LmOZV2B8GK2nd8ZPDMWk+DN1bz7HQbUe7zLrHUiGg+gEzTcwmXykz0HeHFQMjwOFH3guNE HCTsHgmQdk9KGt32+Dh81qZSGpjzJqZr9wsWDaMuBNhAHA1MLiXA8NT6BHF4+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0KCp3yYvz12yX; Mon, 10 Jul 2023 22:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AMvwPl099687; Mon, 10 Jul 2023 22:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AMvwMB099686; Mon, 10 Jul 2023 22:57:58 GMT (envelope-from git) Date: Mon, 10 Jul 2023 22:57:58 GMT Message-Id: <202307102257.36AMvwMB099686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 7ba8cc9b7b6b - main - depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ba8cc9b7b6bdea142d7ecb82c7d3a9b095e967d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7ba8cc9b7b6bdea142d7ecb82c7d3a9b095e967d commit 7ba8cc9b7b6bdea142d7ecb82c7d3a9b095e967d Author: Dimitry Andric AuthorDate: 2023-07-10 22:50:09 +0000 Commit: Dimitry Andric CommitDate: 2023-07-10 22:57:33 +0000 depend-cleanup.sh: handle 32-bit dependencies having no 64-bit equivalent For example with the recent removal of ffs.S for 32-bit arm and i386, the egrep in clean_dep() did not find any files to remove, even if you added a "clean_dep lib/libc ffs S" line. This is because it will never find the ffs.S filename in the 64-bit .depend files for libc. Split the searching and removing of 32-bit dependencies and objects into a separate part to cope with this. This can be used similarly later on, for other bitnesses. MFC after: 3 days --- tools/build/depend-cleanup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 7b851873f288..e7e7f30ab16b 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -32,7 +32,11 @@ clean_dep() echo "Removing stale dependencies and objects for $2.$3" rm -f \ "$OBJTOP"/$1/.depend.$2.* \ - "$OBJTOP"/$1/$2.*o \ + "$OBJTOP"/$1/$2.*o + fi + if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then + echo "Removing 32-bit stale dependencies and objects for $2.$3" + rm -f \ "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o fi From nobody Mon Jul 10 22:57:59 2023 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 4R0KCq72f7zZTbP; Mon, 10 Jul 2023 22:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0KCq5ryrz3q2K; Mon, 10 Jul 2023 22:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689029879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbHHq+rYSOUT1UwcxGSUlsyn4nhKHjVb7jNyvnIWCIM=; b=bBNGzVDziYcfd1K4sAhWHYDYFdPlnfSsVJc/mds1Mo+9NUrtJpHVSIH2lYzTWOqQ2MZItP 2RYwkZEKKxx0I3a/l0+Z5mnlparAZ4K4vrQHMhVRv+P5IwSrJeDTRX/dvmjKS9ozAFZjrr U10PYvUir7IWI3tMyYrtnEuWRg8uYzdd6drx7pyx/CLvs1GAPtsvDw0Zav/n/rxUF/pkkN K/QNTbbT+73liyOlXx+0xc8ZYQ5IBszeYCBbtqurX8DtjGSRl8kC309HqtYMv/ISa2ZXpU TlO+iGovt4YZe1LPnIjPN1mF+VmCzud9qhM0fBIqs9Dufx71YSP3EsN1+0J1eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689029879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vbHHq+rYSOUT1UwcxGSUlsyn4nhKHjVb7jNyvnIWCIM=; b=rhWPlj2eI/G9cX7RKH0dO7lvZULRCQ/QWF8QFO6peBFEkGIEVIcctR4urQAsKdFOTtZv3I hYce+lQpj38uCOE6Z0mGl8jC8v4sDLmbiGCEWm2i7QaP/qPZfsM9+b45YSeev48pLk+nD8 lY6Im6A/CE04B6nSdrhE7K97NyJ0GxbpdL7nbvhtE8uK2+h/PeJJ7Kg3Xft5NOVdIzM9Tn 6NXeqMtFn1h5uyhavO8hpUcpnvHoVZeDBbNt0lcxo0FReu/c8ftANsHdnVSKmIjhyUtoji P3ZImnS/uEC4xIj9uBkHlfNbXZwTSGbZ2EMoqvAXGM6qIs8OypfCR/yCKJOHPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689029879; a=rsa-sha256; cv=none; b=sHiY4XlCVv7JB8LxemiIXHUfZvU4zpC9b6w1J+/T70bQi2Wyh7VCQqmf6+MzzEyAi41cmd PRxelnhGVo0CJSwkuq8THrZpSjKgFqSJvAiMny6XYwlM/p/BPWq+nv97Y1OGezQMl9jKEI rXN6osD/yRabsCxYw87q6SMeZ8cqx1d14AbcrLm5AyDxuOXOhHJJooGd7SSsC6Dgb427mp 77Kb5NpkMTT+c1v0tlzZMO/PhSpYQXsCOJJnJgmczYSSh52tauaxPReZbTkppYkdRQL9qu VY3xs8uFlrdU63PMzeKIq/5HFRo/g+fuvyxIxTbQ+KQJDpMddMSOfBZs+2UhvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0KCq4YsJz139V; Mon, 10 Jul 2023 22:57:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AMvx4Z099707; Mon, 10 Jul 2023 22:57:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AMvxnq099706; Mon, 10 Jul 2023 22:57:59 GMT (envelope-from git) Date: Mon, 10 Jul 2023 22:57:59 GMT Message-Id: <202307102257.36AMvxnq099706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: ce4846ae75d4 - main - depend-cleanup.sh: cleanup stale ffs.S dependencies for arm and i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce4846ae75d435b9b2c2c415bf906851aafc10de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4846ae75d435b9b2c2c415bf906851aafc10de commit ce4846ae75d435b9b2c2c415bf906851aafc10de Author: Dimitry Andric AuthorDate: 2023-07-10 22:50:31 +0000 Commit: Dimitry Andric CommitDate: 2023-07-10 22:57:33 +0000 depend-cleanup.sh: cleanup stale ffs.S dependencies for arm and i386 Now that depend-cleanup.sh handles 32-bit dependencies a bit better, get rid of the stale ffs.S ones, otherwise an incremental build on amd64 will fail with: cc: error: no such file or directory: '/usr/src/lib/libc/i386/string/ffs.S' Fixes: ee8b0c436d72 --- tools/build/depend-cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e7e7f30ab16b..a7c27a4ba730 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -128,3 +128,6 @@ if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then "$OBJTOP"/obj-lib32/secure/lib/libcrypto \ "$OBJTOP"/obj-lib32/secure/lib/libssl fi + +# 20230711 ee8b0c436d72 replace ffs/fls implementations with clang builtins +clean_dep lib/libc ffs S From nobody Mon Jul 10 23:18:58 2023 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 4R0Kh30Cqnz2thMS; Mon, 10 Jul 2023 23:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Kh26v4hz3v4d; Mon, 10 Jul 2023 23:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689031139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iix6IKWP1l6NYb+n6JgUh/Uia/rPuX6niR57natKTjc=; b=R2LOEUxJ5/ox957RB9oP7AN8Yha8kdumHOLG9uQGk+Eh9VP/NaDettI9aGEQWL+ooQ6Ozi WSUkQCtl9A9Ksyu1KK1T7anFsjDuI8gfvKDUb8Qtoa3Sj+TfplEFRz8aKZXnEi60M4gMJV Fv/1lnlge76oLn2jynsPwvL4J5mWAAKS9SJLb3zDzJ49nhGx0KeSTCt0M7Lf89eT96JY5L HWec8bFXRRF2cDyOzNTLIiHgB3Du7eUw98NELEmLxZtVVzCJoct7ILwGxoezBktyfY6J5t L2D1viHFZpDc02Hw9gfCKuvigpGy3hBqtgaRjLT2B7HPSalLCEUITK0nxdo+LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689031139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iix6IKWP1l6NYb+n6JgUh/Uia/rPuX6niR57natKTjc=; b=pZL+1BNHjixinC3wN+LqoI+2U19UDXr7mT6SXLDjHPWLKwOKfB+jPv0ZWuIg7ltRq5M7oq SH6nMYXcBGfNk8sMBaSH4WAaN/iET7JfNAYnGbukvSIXMBhua2T7Wx9+N5bptID9DSZWmG UEjHG4XdXhijryaf5TzIDEhlOfil3wXgmc54BGwJG9lDo0HyzuUkh1VPIEbyyBWfXbCxLI k258QpcN4H+NroOTjh7MUH09ZzHpAzV0/Nvp1/ciTaZYvqfhFnJuRl1YKYZMxhVc8KMqHX XsynVBNZaEIBB4dk1Rb0rCeuCPMEgziwEUQsR6maYHqhSfS6QSObGWti1+vzEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689031139; a=rsa-sha256; cv=none; b=ruIxXNfyUzlIrD/oheWoIYeSQJOTYXy3YM7bvuEqF9vF3t6HOJ9tpffN09w/BZvWk6L3xZ Fgjs70f8b7ms+ELWzKOwhS5S40I39K7hhir2J+czdb4XHSSHfaRDF5KJKc451fecB982Sf LEgRiKJIkIHQ2juf0mZwsb6KddktWxW5wiW9PcA7dMksLQGm9A3icc6psoi9yUYTtACFpb WJx7wpCoq2xJw2KUerduj4bIL+wokRO6Nqa513J0bN9NUuLqOcje2McrbSL1BM1xZoWZ+g GIqq/dvOZijWNYkY9+tacWLyYxH8u3CsEGnpkVKttFeKepg2mQst5LyPeZMZog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Kh25s01z13W6; Mon, 10 Jul 2023 23:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ANIwRL033580; Mon, 10 Jul 2023 23:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ANIw6l033579; Mon, 10 Jul 2023 23:18:58 GMT (envelope-from git) Date: Mon, 10 Jul 2023 23:18:58 GMT Message-Id: <202307102318.36ANIw6l033579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f3674213e38f - main - depend-cleanup.sh: Fix whitespace 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3674213e38f07752963cde58b2291700c90232a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f3674213e38f07752963cde58b2291700c90232a commit f3674213e38f07752963cde58b2291700c90232a Author: Jessica Clarke AuthorDate: 2023-07-10 23:18:15 +0000 Commit: Jessica Clarke CommitDate: 2023-07-10 23:18:15 +0000 depend-cleanup.sh: Fix whitespace Fixes: 45c4ff15e3eb ("depend-cleanup.sh: Handle libc bcmp.S moving to bcmp.c on amd64.") --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index a7c27a4ba730..743da3361cf5 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -91,7 +91,7 @@ fi # 20220326 fbc002cb72d2 move from bcmp.c to bcmp.S if [ "$MACHINE_ARCH" = "amd64" ]; then - clean_dep lib/libc bcmp c + clean_dep lib/libc bcmp c fi # 20220524 68fe988a40ca kqueue_test binary replaced shell script From nobody Tue Jul 11 00:49:49 2023 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 4R0Mhs32Pmz4dQ7x; Tue, 11 Jul 2023 00:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Mhs2Z0dz4GKV; Tue, 11 Jul 2023 00:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqj/2iLd4qW04AbeBEAXugsaJyU8QisMmScu81o+pZ4=; b=RdQzIdlYDzBEA4GP6fy265foDaEfiharFp+PegwIPjID0qMpSS9Qnebj4bw/z1bCK4YsFK Xt5N6lyGK4LcJndzYEcwKK0MvQcd7SJm1RirbkSJfRBiBBhZRzdnV9fn35IFy+9MjTw/Lm B6TIWro2R5wJQizbXkjofv72jVduL/rx6HwRxSNLxQ+PWBZ4Hy8VtpDMPF+naiOqfAkurp GhzNfHgdYbc3aG2aDr93siC/YcWINt0NJ8Yiq1ajTLushBe4ANrJ0zX++RHSl2F5Rxr8tJ fNZpkexyGX1orfHJbOLoajPgWZ+O8wiZ2mej1MxKEgwwDNBiHMNQEafKWLYpBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqj/2iLd4qW04AbeBEAXugsaJyU8QisMmScu81o+pZ4=; b=aA9kIoQnmZ+NAZZBcSDEuDDGpSWdguGFrmgec9Qb33uFKiGy7VhfUnM+VrKtjNuPY1YJ6V omTIlxa8t+jdBwwg8/NQPdTud9IfoF0LHRBLsjGcJg49BpEmcprHFNnGYX37Qb0ptqW247 Khd4m+1RzptAmNUj9Scf7dnGTGVSmgyLG5phvkUjtRJxY7BdstuojQP0voszHdoOGuI3cl 3Xwo32RU33NmRP4+5o3XdWdD5EHAtVHKydP92pJiS9+fAobGBmaguVwlIUzojLomf7UHpn zcwMxJd6ltmo1mASCSqo9gpGmeGqyO+hvVOEuDNLPQr/LJkV5a1OlwABXQNpFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036589; a=rsa-sha256; cv=none; b=wfb8RSxecBQA3IsbTpDTYv85banM+56n/5Nmbh7tbF90sAM0yyv3EMkmbJYFuIuGtx7cVU 7CmsoovtAbsj62M2EwRPl3aVVpMlSNtNYOnYFN9XLHVABVcIejFxqaJaUIxJNyhMSk27ps MfKiXLmLeCFRtWJoPDgCaC8JVup80pesLfye7QDQSaGcDeJcu03Oi32/PLQhh2q+jPoxu1 62joMfX1BmlUt+cWiPFdqLw7iqXGBX42XT1SzkUgtlO4spnk8HEaSod0jTZcbxvlcOwUdK +C6uJm41HGl5w5nLxGpTMn7xvAJCSHdCTvsg/rlroG+cMN4Mz0BVkAQmxo58oA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Mhs1dMlz15Tv; Tue, 11 Jul 2023 00:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B0nn2d082767; Tue, 11 Jul 2023 00:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0nnxN082765; Tue, 11 Jul 2023 00:49:49 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:49:49 GMT Message-Id: <202307110049.36B0nnxN082765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7e4c6b2163fb - main - msdosfs: zero partially valid extended cluster 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e4c6b2163fbed6be92b1e19f0eec4da973cfaec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7e4c6b2163fbed6be92b1e19f0eec4da973cfaec commit 7e4c6b2163fbed6be92b1e19f0eec4da973cfaec Author: Konstantin Belousov AuthorDate: 2023-07-06 01:51:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-11 00:49:09 +0000 msdosfs: zero partially valid extended cluster It contains arbitrary garbage, which is not cleared by vfs_bio_clrbuf() which only zeroes invalid portions of the pages. Reported by: Maxim Suhanov Discussed with: so Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/msdosfs/msdosfs_denode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 7acd90c8e713..ce7058b3ae60 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -498,6 +498,7 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) struct msdosfsmount *pmp = dep->de_pmp; struct vnode *vp = DETOV(dep); struct buf *bp; + off_t eof_clusteroff; u_long count; int error; @@ -536,13 +537,19 @@ deextend(struct denode *dep, u_long length, struct ucred *cred) * B_CACHE | B_DELWRI but with invalid pages, and cannot be * neither written out nor validated. * - * Fix it by proactively clearing extended pages. + * Fix it by proactively clearing extended pages. Need to do + * both vfs_bio_clrbuf() to mark pages valid, and to zero + * actual buffer content which might exist in the tail of the + * already valid cluster. */ error = bread(vp, de_cluster(pmp, dep->de_FileSize), pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) goto rewind; vfs_bio_clrbuf(bp); + eof_clusteroff = de_cn2off(pmp, de_cluster(pmp, dep->de_FileSize)); + vfs_bio_bzero_buf(bp, dep->de_FileSize - eof_clusteroff, + pmp->pm_bpcluster - dep->de_FileSize + eof_clusteroff); if (!DOINGASYNC(vp)) (void)bwrite(bp); else if (vm_page_count_severe() || buf_dirty_count_severe()) From nobody Tue Jul 11 00:52:22 2023 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 4R0Mlq1kvGz4dRL1; Tue, 11 Jul 2023 00:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Mlq1KGYz4HBR; Tue, 11 Jul 2023 00:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQlzgBHNLS3ANVSbcnEyrvtpGlLVsgDDhv/yD9fFowA=; b=SEg1Erx+CgCuv8Q/Lc9V7awH3zqzn7dqD+HT6c9CN01UMBU74ZjeKAFmPLjeWBL6rVyb4B kXR7YP8/zgQfK94eUH3wi7UKJVV29w/X9D+wHsa7FjPMt7UWXJmgk74/MKesJJqG9yleMI L5z77U1lxK+ITy8DpnJnnHqlnAthqccJx20cq5a2YdUSuvTH4dxMtna86kwZGTBEqdvaI6 nTNog3Rj9h0tzjEbqJM2YSjLF0cKlTztjdvW8Yjg93e9xV9GcVoh6ffQQamjeVBy71M6bB VXnTJuYfkSezlo9Gt5KU3rVcTeWOsP7oHyu4jPcLr3DSd2M6ruJU0tVJukstAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQlzgBHNLS3ANVSbcnEyrvtpGlLVsgDDhv/yD9fFowA=; b=GmJkzwz8Xv/jLliJ8uYryuna6ZeOsdYnGI5TucAeQW9GCTMlhhCCwuA+XnSyDdtkOjPwkw EybE8dhMrUWOdZv33YfCHPRZSIpCUab90wbkqiXt8XGuLCqu5XgpVwV65pzVbkuHxs2eW1 Ajh4PLLgKK60tlIGZvBiIoPB84muBzeE3DLsvU5C+7BW1GuSV2p38NY+MI/Jj6MepcZRn0 yy1RbzjKIGNlQ1Rz5QEoQphIYvySQj4KPd5DBLrgA9Q1UI7Edyvhu+7IA85ZGKeycxjUIQ KBPK5xtnmYHtI2fLGJjBz3KhH2yebC00GgO+8U4/Y2OmfjD0exCa/kkxUMnuVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036743; a=rsa-sha256; cv=none; b=dg5RbLk4RMpdhayxvneUjB2Kyz6OWDFUHRX2agsMs2BjWz/i6Q6lrpFsSqpXg2To2mpcaP WuUlP76qhdzomGc+XVfSUB3s78ldwdKZZLURjlvyShDoW40I8LQyV8UqMxNNlDbGVGAM1P XW6d4UW9q+pnN76Ivt5nES81D0bl2BJKLm/8LVr794K4jZpZ+iJsZU0RrLssIDKvMgfX/b W7CQyQzCxVLkq4g1NCkP049gvRG3EUw/hlLn871ugK8/YHeXgV4GTFQ1lKq812zTmY0XMe sDAICgdFv2/X0pMvH05UH4QH0BtgZNBP37NF9Vc+Q+DKo8gS0oFHacYdnfQZlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Mlq0Nswz15mB; Tue, 11 Jul 2023 00:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B0qM2Q098192; Tue, 11 Jul 2023 00:52:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0qMVN098191; Tue, 11 Jul 2023 00:52:22 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:52:22 GMT Message-Id: <202307110052.36B0qMVN098191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 565a343ae3a3 - main - sigqueue_delete_set_proc(): initialize sq_proc for worklist 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 565a343ae3a30bc2973182ff8dfd2fa37d7f615f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=565a343ae3a30bc2973182ff8dfd2fa37d7f615f commit 565a343ae3a30bc2973182ff8dfd2fa37d7f615f Author: Konstantin Belousov AuthorDate: 2023-07-10 00:29:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-11 00:52:16 +0000 sigqueue_delete_set_proc(): initialize sq_proc for worklist This should fix leaks for the p_killpg_cnt counter, because sigqueue_flush() drops ksi's. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/kern_sig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 18756d53e98c..ecfde7a549fc 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -683,7 +683,7 @@ sigqueue_delete_set_proc(struct proc *p, const sigset_t *set) PROC_LOCK_ASSERT(p, MA_OWNED); - sigqueue_init(&worklist, NULL); + sigqueue_init(&worklist, p); sigqueue_move_set(&p->p_sigqueue, &worklist, set); FOREACH_THREAD_IN_PROC(p, td0) From nobody Tue Jul 11 00:53:10 2023 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 4R0Mmk5sF8z4dRM7; Tue, 11 Jul 2023 00:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Mmk5HM0z4HXX; Tue, 11 Jul 2023 00:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAcj9sIDsNxxr2U5lJKgdpWfJ5+jWDYImsYRh2DPneo=; b=LFLAAPoZxAMnrACtscQ98zfezj59XRM6cEc2AzhvhTN/D1GDK3V9BsZ+6LzX8jFkoqRHPR GdvfoONwFXGFs4N8r0U/SbfaIVZuZGsK+OyI6+gl16XuZOSrm82FbaFs+xBUzhKOSJxFhV hlprjCYFv4ndsc61koYPLmPND6CikZsL1Ab/JdlhA/mtu3iZzmM43HZx0f5aIIqZCjqA/d qlNfBNCjFXy56GxqO1+kflFt1qKfG6f5Cw3ZR9rFb7ulOkXVnAznZzusX0dGRLpnIMMoOO g1m0htaj2mRPXf3P5DuGeP91GvNVV21zoN3k+FWTok4YBRKQxeUj7xBxngZy9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WAcj9sIDsNxxr2U5lJKgdpWfJ5+jWDYImsYRh2DPneo=; b=dNy4m7+OgQ371S4guKZ5bNEgcmlDZg1ACKTBlgvigNLbYxkNPEuGaP5C80gqj7xphrVic6 gNykQg8ccEGliayfk3cVpjhLtteKcKNr/lVguYchY5Q3UHrucRpZ4z1Q5LlLYgG7wuf91y 9EqTkl54YGFiiDT1wi0cyR8qHgqe9k4EbL8lFOJpqLQT4y6c91nh8C6ngxU5P3MHkOmsL2 UdqvInZbW0xR+kGHNJdc/Na/dMBjH9XrSTK4jRonY/Rx9KaomFTQdOngnJguBrgKUxDtb2 TQDpWFymEk2DTJcAWWyDLgPZRyD/eBwpgGBbO6YnFIALdxVDw90KIXkS4C3iNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036790; a=rsa-sha256; cv=none; b=mm5PZJVfvVzbPjNmjMz1yr866d36/gfF7DR4CBxZciEPfblZ7yPWWaXI4ipbEen8wNMrqf 9khejCo5EXhQouUuAdm9xMNoL5y/QzmQD006kFoZlXRgARunPtI8jxMN+kA78SU3YmyWfg stGOE7qckeYbQ7y+cbEfUOduZdeGoUicIUSRRgoaw3XR76GES/Fr7wVuqqhhi/smcfgyGP F5vduIqkUVvWJ2+iL8PVy6QxrShXi0EF3Zya65xHGY1csfh11SdngZjFzQZFyp3D5Q59Ri cTWBIb3UhXh3nRILzkxdMzqksVfSN4EMndam/pjXgpyLTViuJxVLl+jFT95oEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Mmk4MFtz1578; Tue, 11 Jul 2023 00:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B0rAtv098469; Tue, 11 Jul 2023 00:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0rA3L098468; Tue, 11 Jul 2023 00:53:10 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:53:10 GMT Message-Id: <202307110053.36B0rA3L098468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: c70dd03a7ff6 - main - Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c70dd03a7ff649f832f1d29179b9094720392bce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c70dd03a7ff649f832f1d29179b9094720392bce commit c70dd03a7ff649f832f1d29179b9094720392bce Author: Jessica Clarke AuthorDate: 2023-07-11 00:53:04 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 00:53:04 +0000 Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh We run depend-cleanup.sh twice during the build. The second time is the normal run, where we run it under WMAKEENV and thus have CROSSENV's MACHINE(_ARCH)=${TARGET(_ARCH)} in the environment. However, the first time is for bootstrap-tools, where it's run under BMAKEENV and we don't have any assignments to MACHINE(_ARCH) in the environment, meaning the script sees them as unset. In practice this doesn't matter since the only use doesn't apply to bootstrap-tools, but it could be a future issue. Thus, explicitly export them for depend-cleanup.sh and have the script verify they're set. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40968 --- Makefile.inc1 | 3 ++- tools/build/depend-cleanup.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6db68b627d96..1e992b05c859 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1016,7 +1016,8 @@ _sanity_check: .PHONY .MAKE # replacing generated files. Handle these cases here in an ad-hoc fashion. _cleanobj_fast_depend_hack: .PHONY @echo ">>> Deleting stale dependencies..."; - sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} + MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \ + sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} _worldtmp: .PHONY @echo diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 743da3361cf5..ce962cc1eb86 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -23,6 +23,16 @@ if [ ! -d "$OBJTOP" ]; then exit 1 fi +if [ -z "${MACHINE+set}" ]; then + echo "$(basename "$0"): MACHINE not set" >&2 + exit 1 +fi + +if [ -z "${MACHINE_ARCH+set}" ]; then + echo "$(basename "$0"): MACHINE_ARCH not set" >&2 + exit 1 +fi + # $1 directory # $2 source filename w/o extension # $3 source extension From nobody Tue Jul 11 00:53:11 2023 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 4R0Mml6q78z4dRSH; Tue, 11 Jul 2023 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Mml6Bt6z4Hl1; Tue, 11 Jul 2023 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJxPIPVpKesLjyvcIekXmTy66SfB+r11gd3KnhjMD3U=; b=Ch5LWOlLglSAxmxcGSXpWrM3pMwydWNVXoisDmJk2pnGTEGApGNLH5UwCyi1gUGCrmHcLH 7qtZ0RT5ki4hJ1T55HBWbkVZM5/8gB1RjB7Nq0ohu2Qvu9L9wsac80oa56SIG+qohaiTSd YdTTpKrDbq17jHlgIiDWUMZGYVpI1qu2aoKnp0y22EXKoS4+YZUcETfPhFddDJTwznNWM7 m+c41wZ/avPMRotX0WxQqUSF3Mk48sfOs/pc+ycFX1u3WpLj6KFzpE8AT2BWuC/YeprDAB aqYayiv8c9fZgXwWmFWhM8Gkwe2t/g4XTUQyG9MXU8DoZVT4h/NZ4EMNsc4asw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689036791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJxPIPVpKesLjyvcIekXmTy66SfB+r11gd3KnhjMD3U=; b=S0wGQocT7t05aTxJhj/y/JT7VPnUZSIwncpM5A+wgBNkaAsR2oBNZAhN22RKJBPT6kRrAu a7CMeYWP3FUkl/MaxdHcDlJJBx6Ni65kaYBHRWW49yvLrG4R00JFXqGfN43FnOm4sFZ/Lq 0KKa1WZNwrsAd0ncY/6TNgDUf5IW+4ClorlNJP0Inlh4PN6j/D58/bXxIshhY+bA0PwuAp JvGg395+LXGsiK50woEuJf9sAXPeAsb2LrEu8JquOe6hNRf3COPt3yN/NS8l/sFghEFZi8 t3Iajcw4K6qzz8b2XYZOcRNZLr0NFC4dl81YaCEBA9DUAROi9T9qmkYZsQdy5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689036791; a=rsa-sha256; cv=none; b=vOYtP4HHFJ8lLn0T5TJIBHo775KvScZs0bozi6Y/yVsAt5+Q1Yeoe0f6ZNt4bWkJp+tGWC 45dup/MDujMFyqZ7ZzEYzam3Ju8p2TZ8fSXoMOnc30XcckgG4HkTEno80jXFCLeCQuosNj pVuk/mI7TOUsjxa3JJcFzLYKtzZ0WG0cOIgefWMCb+eY1cxWp1A26iAdBDLFf814NAfBiQ PRHJ5DHxkItWCkhL/BStk3wJPUX1JfQOXrDUWARHZLEKDsOy3diJqp2Q3HYqj+gacr66u9 glz/goMNOZoVNQfh/GgMrdM0PbjRvvwqAQS5BBxZT5jHo0xPoUu3s7J7/WhCrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Mml5HDdz15w7; Tue, 11 Jul 2023 00:53:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B0rBRh098488; Tue, 11 Jul 2023 00:53:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B0rBWH098487; Tue, 11 Jul 2023 00:53:11 GMT (envelope-from git) Date: Tue, 11 Jul 2023 00:53:11 GMT Message-Id: <202307110053.36B0rBWH098487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1ec7cb1b5d18 - main - depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ec7cb1b5d1800b05c0682e0b673be0dece98779 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1ec7cb1b5d1800b05c0682e0b673be0dece98779 commit 1ec7cb1b5d1800b05c0682e0b673be0dece98779 Author: Jessica Clarke AuthorDate: 2023-07-11 00:53:04 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 00:53:04 +0000 depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags These are useful for testing new additions to the script. Whilst here, harden the script a little and improve error messages. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D31007 --- tools/build/depend-cleanup.sh | 82 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index ce962cc1eb86..b9b38b4ed3e6 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -17,22 +17,72 @@ # anyone would try a NO_CLEAN build against an object tree from before the # related change. One year should be sufficient. +set -e +set -u + +warn() +{ + echo "$(basename "$0"):" "$@" >&2 +} + +err() +{ + warn "$@" + exit 1 +} + +usage() +{ + echo "usage: $(basename $0) [-v] [-n] objtop" >&2 +} + +VERBOSE= +PRETEND= +while getopts vn o; do + case "$o" in + v) + VERBOSE=1 + ;; + n) + PRETEND=1 + ;; + *) + usage + exit 1 + ;; + esac +done +shift $((OPTIND-1)) + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + OBJTOP=$1 +shift if [ ! -d "$OBJTOP" ]; then - echo "usage: $(basename $0) objtop" >&2 - exit 1 + err "$OBJTOP: Not a directory" fi if [ -z "${MACHINE+set}" ]; then - echo "$(basename "$0"): MACHINE not set" >&2 - exit 1 + err "MACHINE not set" fi if [ -z "${MACHINE_ARCH+set}" ]; then - echo "$(basename "$0"): MACHINE_ARCH not set" >&2 - exit 1 + err "MACHINE_ARCH not set" fi +run() +{ + if [ "$VERBOSE" ]; then + echo "$@" + fi + if ! [ "$PRETEND" ]; then + "$@" + fi +} + # $1 directory # $2 source filename w/o extension # $3 source extension @@ -40,13 +90,13 @@ clean_dep() { if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale dependencies and objects for $2.$3" - rm -f \ + run rm -f \ "$OBJTOP"/$1/.depend.$2.* \ "$OBJTOP"/$1/$2.*o fi if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then echo "Removing 32-bit stale dependencies and objects for $2.$3" - rm -f \ + run rm -f \ "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o fi @@ -63,14 +113,14 @@ if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \ egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \ "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then echo "Removing old ZFS tree" - rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl + run rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl fi # 20200916 WARNS bumped, need bootstrapped crunchgen stubs if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \ ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then echo "Removing old rescue(8) tree" - rm -rf "$OBJTOP"/rescue/rescue + run rm -rf "$OBJTOP"/rescue/rescue fi # 20210105 fda7daf06301 pfctl gained its own version of pf_ruleset.c @@ -78,13 +128,13 @@ if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \ egrep -qw "sys/netpfil/pf/pf_ruleset.c" \ "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o; then echo "Removing old pf_ruleset dependecy file" - rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o + run rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o fi # 20210108 821aa63a0940 non-widechar version of ncurses removed if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then echo "Removing stale ncurses objects" - rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses + run rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses fi # 20210608 f20893853e8e move from atomic.S to atomic.c @@ -96,7 +146,7 @@ clean_dep lib/libc pdfork S if [ -e "$OBJTOP"/lib/libc++/libc++.ld ] && \ fgrep -q "/usr/lib/libc++.so" "$OBJTOP"/lib/libc++/libc++.ld; then echo "Removing old libc++ linker script" - rm -f "$OBJTOP"/lib/libc++/libc++.ld + run rm -f "$OBJTOP"/lib/libc++/libc++.ld fi # 20220326 fbc002cb72d2 move from bcmp.c to bcmp.S @@ -108,7 +158,7 @@ fi if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then echo "Removing old kqtest" - rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ + run rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/* fi @@ -118,7 +168,7 @@ clean_dep usr.bin/rs rs c # 20230110 bc42155199b5 usr.sbin/zic/zic -> usr.sbin/zic if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then echo "Removing old zic directory" - rm -rf "$OBJTOP"/usr.sbin/zic/zic + run rm -rf "$OBJTOP"/usr.sbin/zic/zic fi # 20230208 29c5f8bf9a01 move from mkmakefile.c to mkmakefile.cc @@ -133,7 +183,7 @@ clean_dep lib/libc kqueue1 S # 20230623 b077aed33b7b OpenSSL 3.0 update if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then echo "Removing old OpenSSL 1.1.1 tree" - rm -rf "$OBJTOP"/secure/lib/libcrypto \ + run rm -rf "$OBJTOP"/secure/lib/libcrypto \ "$OBJTOP"/secure/lib/libssl \ "$OBJTOP"/obj-lib32/secure/lib/libcrypto \ "$OBJTOP"/obj-lib32/secure/lib/libssl From nobody Tue Jul 11 03:11:52 2023 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 4R0Qrn05b3z2tpTZ; Tue, 11 Jul 2023 03:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Qrm6nztz3hpd; Tue, 11 Jul 2023 03:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689045113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLFGTFU6FXPWsppDnUgqp69oVWF8Rby4s4EZQhAOI+g=; b=JG77Pn6REGjeUd23ZyB8icaVKSv6097pmQQ9qAlN9Xn6nLaPWWFIoSAk3MT5juFHzJ8dka b8HBgZh56UNRRZewOiHxPdzmcOVvC7PLX/HGa0xLVy24yomopq7YsTy80ibtoChIwLid4d 9nS/Svse3YwjYjYqVe8XrCql1EOx3LY3ah/sXpwHSeK/Eg0e5b6fBflgw+w8/m2KAK+sbH Qk1XBr/awILpOqLMEuYHcHGuUxgl9DADh2DpbB1nvBdOmZl+YpKMRlTt6M08pTh36HghLE cH9J4RtmNHas3zlXIOihkuizwOdpOFC/tab1xARpJYLIAm1K9n66EsCEprd+GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689045113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kLFGTFU6FXPWsppDnUgqp69oVWF8Rby4s4EZQhAOI+g=; b=G/wNKljpudbCrhn5gOKO8hSeVAlbXNkBPd7uMExmKAXjySomcYFL5gG8xoZbe3jlZtWhmc A2OOD0ISXxIWekVGWoPNZYDvv6dVVz48k0zqMNv9N+sn7piM1DHKy/mxeIZFbfau+rhmat KR/0mPKbkLdyq6HUc8j5mDWqT4dVjrn7R5vOf5xVsJf2qKuS8g6IoFeH8Go83qJdaSc7Sk aWKe5vF+/NiGCl51aCczOKxxR6w2pr4dIT3m4RziPmcsKqSrR9yXZMeyFDXXw3U1W/lJ8q u/zb+zwbn2fbTBQeEasmnTAgAHudX43XlS2hfsTJ657Ohfh7xul3uxT0k8Lbwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689045113; a=rsa-sha256; cv=none; b=xgOaZX78ty3is+sVi/Ip7fUCO6cHC21dp1G8TrsSQVKRgOx3GS7WA6IcUCWvabP1xVUK6R S1PXFd9SDraTkYCoInig83ss5NOhIVjBereHkFU5pldxOXz/BbkFjlXWf73LlMMI5g37dM k2M+mYBxz0STXnHq+b8R34RFBnj2sCBtp14fGWYeu5R1PxZQQK1Qhu8KNHii0V1mGeCie7 eo6nQuIqP4MHjjxW+sPxWCAbJVh1OIun4+qww+0kl1P/B1exdlYhLuIXIiSkQi4qmxELf6 O72T5DhXXDMrxsvxf7LgPINp+OpJTuxqmjCZXMSwnnzHlveqhwNGTQvKEwA2cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Qrm5vLHz192S; Tue, 11 Jul 2023 03:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B3BqSH031380; Tue, 11 Jul 2023 03:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B3BqfH031379; Tue, 11 Jul 2023 03:11:52 GMT (envelope-from git) Date: Tue, 11 Jul 2023 03:11:52 GMT Message-Id: <202307110311.36B3BqfH031379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Grehan Subject: git: 43ed91e00bbb - main - igc: Increase default per-queue interrupt rate to 20000. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grehan X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ed91e00bbb1c7edadbe1c210d8e57d66a3badd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by grehan: URL: https://cgit.FreeBSD.org/src/commit/?id=43ed91e00bbb1c7edadbe1c210d8e57d66a3badd commit 43ed91e00bbb1c7edadbe1c210d8e57d66a3badd Author: Peter Grehan AuthorDate: 2023-07-07 08:23:42 +0000 Commit: Peter Grehan CommitDate: 2023-07-11 03:29:37 +0000 igc: Increase default per-queue interrupt rate to 20000. The default per-queue packet rate of 8000 will cause packet loss when forwarding at 2.5G with a single stream, as is common when using e.g. iperf3 to test a platform. Bump this to 20000 (the "low latency" value in the Linux driver) which avoids packet loss for this type of test. Future work will use adaptive interrupt rate in a similar fashion to the ixgbe driver. Sponsored by: Rubicon Communications, LLC ("Netgate") Reviewed by: erj, kp MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D40904 --- sys/dev/igc/if_igc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 60f796010232..1ede99eee4ae 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -271,7 +271,7 @@ SYSCTL_INT(_hw_igc, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &igc_eee_setting, 0, /* ** Tuneable Interrupt rate */ -static int igc_max_interrupt_rate = 8000; +static int igc_max_interrupt_rate = 20000; SYSCTL_INT(_hw_igc, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN, &igc_max_interrupt_rate, 0, "Maximum interrupts per second"); From nobody Tue Jul 11 05:44:26 2023 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 4R0VDq0pXZzZP89; Tue, 11 Jul 2023 05:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0VDp74Dcz4DD9; Tue, 11 Jul 2023 05:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689054267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/vvsJRos1IvPtMQ5Pcg8YulEFKZEb+leYNkB2HmAAA=; b=X1oCxMv6XeZoVh4eGL6XFuIYzNPanPQHAOXofoyFCuokE7FUCB6mVw6K3KzAdzpvT4tAs5 5MJkkjvlYA4DSWhwkA34BBWwuVw1WXFuSEHW7zEyAusoPb2kcoH5hzysu3Cb+2VAxd8n3x CGiUeezEQ/DZxB6tot8t3YiGujzMxIdBM9Luuzmq+3KxZMIdt9KFy7eWllvTuSfHPMFZj9 IllOu1JiA94nOY7iE2NR8ZMXKIbRTlG89Jn5N/vC/dKWi5dt/sD1QpTCvHjLOcOngpz1W6 wA/M5BtDnqJYu3hfFAIheWk7KltMM12jb2e8AgTDej1k3RAXBvbuhCSqL2w4JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689054267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/vvsJRos1IvPtMQ5Pcg8YulEFKZEb+leYNkB2HmAAA=; b=VOzcudAChAS4JaBDocIB6CmsAEDxO/UHjK98vDaH4/qkyDwHRsKTVG604VDZOdggNCa+jI LOqTMFova59ZR6BT8LHgVSMm/4smjo/lojhmTT55/fI77HbvmrhdrWyTGGdJSYaaB7uRY1 clqrzRvnnv3N5RsaAEBLZ7/IVSRe4sjq+JIpp2vDR2KOHRg/orsnyeghDmYWy+KIafijtd bYIYMPzI6MrIUObWlH99pnZzfaDrRkpRcIzIHGSAGjTjjlV/9hqSN6w53NPiY00ewbDTeD l9r69OzLyUK62jbEZt/S+zun3iilvykKCksX8HhT0UNCRf6IQSh6BJXeXGy43w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689054267; a=rsa-sha256; cv=none; b=NcBeU+AbBU5tVqscBtCOsNLjLSpf7ci3+3n9e8mWMUX2Sa0m/56eJD9m6n6/6pLqMhEDw8 FbwPz8egEItd0ImTiEhW+G/v5qJUyNxwX+TZd7VjaE3kQGZ9V3SSTXz1jmvNeLlUoNeGZH K6aDa0mr4P2GriVd3yXrxEujwJipgmJ8EEeuTZloZ9QcQ0kGFQ1+DY5FDPxvFL84UUDF6c UD8x/PHeHk7Ov4mvD7K8idSJOLHHazFNyCVo2kwkz8xITQFxO+SNJJ6jhSsgRJwRChxMrq y+m2CN84IE3hqbJ2IwikZ4ELrQwLPrDQjFIErKD43Ifhrzv4MiVm5KYGFQ3E5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0VDp67lPzFDr; Tue, 11 Jul 2023 05:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B5iQm6079122; Tue, 11 Jul 2023 05:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B5iQnP079121; Tue, 11 Jul 2023 05:44:26 GMT (envelope-from git) Date: Tue, 11 Jul 2023 05:44:26 GMT Message-Id: <202307110544.36B5iQnP079121@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 5d0826017fc9 - main - libbe: promote activated BEs all the way 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d0826017fc9b84f50ef19b0d452bc0590072f2d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5d0826017fc9b84f50ef19b0d452bc0590072f2d commit 5d0826017fc9b84f50ef19b0d452bc0590072f2d Author: Kyle Evans AuthorDate: 2023-07-11 05:43:51 +0000 Commit: Kyle Evans CommitDate: 2023-07-11 05:44:13 +0000 libbe: promote activated BEs all the way This matches the beadm behavior; generally, we need to keep promoting until the BE is no longer a clone from a snapshot. This fixes scenarios where the dataset associated with a BE's origin is itself a clone, activating the BE previously would promote it to a clone of the origin's origin. We could keep using be_get_dataset_props here, except for two annoyances: 1.) I couldn't find a clean way to just clear an nvlist rather than having to re-alloc it, and I didn't want to just remove the one prop we're inspecting out of it. 2.) That's a lot of overhead when all we want to do is fetch the origin anyways. Note that this is not a complete fix, but it does fix the majority of cases; deep BE subordinates are still notably broken, pending a patch from Christian. Reported by: R. Christian McDonald Reviewed by: rew Differential Revision: https://reviews.freebsd.org/D40903 --- lib/libbe/be.c | 30 +++++++++++----------- sbin/bectl/tests/bectl_test.sh | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 16 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 753fde746e31..31836c623c4a 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -1269,9 +1269,7 @@ be_deactivate(libbe_handle_t *lbh, const char *ds, bool temporary) int be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary) { - char be_path[BE_MAXPATHLEN]; - nvlist_t *dsprops; - const char *origin; + char be_path[BE_MAXPATHLEN], origin[BE_MAXPATHLEN]; zfs_handle_t *zhp; int err; @@ -1294,23 +1292,23 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary) if (err) return (-1); - zhp = zfs_open(lbh->lzh, be_path, ZFS_TYPE_FILESYSTEM); - if (zhp == NULL) - return (-1); + for (;;) { + zhp = zfs_open(lbh->lzh, be_path, ZFS_TYPE_FILESYSTEM); + if (zhp == NULL) + return (-1); - if (be_prop_list_alloc(&dsprops) != 0) - return (-1); - - if (be_get_dataset_props(lbh, be_path, dsprops) != 0) { - nvlist_free(dsprops); - return (-1); - } + if (zfs_prop_get(zhp, ZFS_PROP_ORIGIN, origin, sizeof(origin), + NULL, NULL, 0, 1) != 0) { + zfs_close(zhp); + break; + } - if (nvlist_lookup_string(dsprops, "origin", &origin) == 0) err = zfs_promote(zhp); - nvlist_free(dsprops); + zfs_close(zhp); + if (err) + break; + } - zfs_close(zhp); if (err) return (-1); diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh index 5f865b86954e..7ca7af8a1abf 100755 --- a/sbin/bectl/tests/bectl_test.sh +++ b/sbin/bectl/tests/bectl_test.sh @@ -525,6 +525,61 @@ bectl_jail_cleanup() bectl_cleanup ${zpool} } +atf_test_case bectl_promotion cleanup +bectl_promotion_head() +{ + + atf_set "descr" "Check bectl promotion upon activation" + atf_set "require.user" root +} +bectl_promotion_body() +{ + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "armv7" ]; then + atf_skip "https://bugs.freebsd.org/249229" + fi + + cwd=$(realpath .) + zpool=$(make_zpool_name) + disk=${cwd}/disk.img + mount=${cwd}/mnt + root=${mount}/root + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check mkdir -p ${root} + + # Sleeps interspersed to workaround some naming quirks; notably, + # bectl will append a serial if two snapshots were created within + # the same second, but it can only do that for the one root it's + # operating on. It won't check that other roots don't have a snapshot + # with the same name, and the promotion will fail. + atf_check bectl -r ${zpool}/ROOT rename default A + sleep 1 + atf_check bectl -r ${zpool}/ROOT create -e A B + sleep 1 + atf_check bectl -r ${zpool}/ROOT create -e B C + + # C should be a clone of B to start with + atf_check -o not-inline:"-" zfs list -H -o origin ${zpool}/ROOT/C + + # Activating it should then promote it all the way out of clone-hood. + # This entails two promotes internally, as the first would promote it to + # a snapshot of A before finally promoting it the second time out of + # clone status. + atf_check -o not-empty bectl -r ${zpool}/ROOT activate C + atf_check -o inline:"-\n" zfs list -H -o origin ${zpool}/ROOT/C +} +bectl_promotion_cleanup() +{ + + bectl_cleanup $(get_zpool_name) +} + atf_init_test_cases() { atf_add_test_case bectl_create @@ -534,4 +589,5 @@ atf_init_test_cases() atf_add_test_case bectl_mount atf_add_test_case bectl_rename atf_add_test_case bectl_jail + atf_add_test_case bectl_promotion } From nobody Tue Jul 11 08:24:42 2023 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 4R0Ynk2XLnz4h3x8; Tue, 11 Jul 2023 08:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0Ynk1prrz3Dhn; Tue, 11 Jul 2023 08:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AgNITjjGruRAwXQAfWnyblIKw5Nz8VlS6fOyzyxO2+Q=; b=a8IBk77bOvPE5U4pPmAt1j/XQZuyaqDs+ZaLblbhkmiCYn0NLTGHAADcqJ6gXzCcN9yw9q zy0IkisBi6CeRWXDbeerinAvJXuK68XZyf0t3tMeqf6Q5OI8RfmdQGD2THjkoylfb7pFw2 qL9fI1tMn46Lb7UJBZC+JHqiV7eWP8oQ+mzeWP73dpsGN8P0aNp7hNEzmUnbhgpvxfjqgP 80X0bfKPsWqpX1hfSr7x36AuZwIBfDYGr+c1catAr42rUgr11L8CrBhHTshSMpQxSgt8aQ 3ZdXXIw8rVs8BEN7MLe9QZ+KFcIcc2h/pzDYqL8lqBezDRVSTy2Vj1XbwHQGOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689063882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AgNITjjGruRAwXQAfWnyblIKw5Nz8VlS6fOyzyxO2+Q=; b=A9rUVz7fa5f4fAf5MJVYwmv9CPAwaWUD0kOyTCo+9a499CXoU6OIHSzA+vA044N5il2quC sbA/5N3YADul3k3x1tNzTc8TPwyhzv5s9W8o21wBDq/MAoQ+VTMNL91oVJRFXDyeOyCdtJ xrKi/jVpIdWeTajpGSB/lJmJNzLV9Vh+ogPrWql+xBwfkGhcD5a78FwwQCgHoEP2hZyEZD WXuQqhgQjfyuWBQguyWLt9yJ0g0Jt+1ceomiF6LDvy6fIg8uxwE9oQOkHk5H314xEBCMN0 PCAWB6SspFjmVUWk5uc2ChTZNProeGihKF/eO9WB8dfqSVVPAWfcyYt9MRFHVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689063882; a=rsa-sha256; cv=none; b=dSZGOCBbkiiCEiRltNHXYArxG3y1K6F89suWro9VUAR1tItorIUWjtLtkzm7xaNujkEeXI a7Jswo+exjq5eM29NfI0MQp0XJW0QXBOvC7Ts6qpxLJ+vRkbOaWjYeSKFg1qGP1auLxWq5 q1w9FTSWxNgVSzgQuD06wdIzpmzs2MLEz3ZGx8/R7rume6f6Z2Oo/wMZAlSGdrXVoXDvKU aCiW2SMUAAMM4Qe1aETQDJ5uo3ngiQzQMTPWayLlWMRbYzI013isTIlFaEXQ6i/pyghXUO AJzuDLd4asIndooWhfAjX7k8YJ9RobMFdUx1Lo3MyJSrBncYuucK68OBJaPtDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0Ynk0tvJzK4V; Tue, 11 Jul 2023 08:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36B8Og1p044137; Tue, 11 Jul 2023 08:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36B8Ogx0044136; Tue, 11 Jul 2023 08:24:42 GMT (envelope-from git) Date: Tue, 11 Jul 2023 08:24:42 GMT Message-Id: <202307110824.36B8Ogx0044136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 972e60da74aa - main - stress2: Added two syzkaller reproducers 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 972e60da74aaf1d6244d3eb225ea06133655bc98 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=972e60da74aaf1d6244d3eb225ea06133655bc98 commit 972e60da74aaf1d6244d3eb225ea06133655bc98 Author: Peter Holm AuthorDate: 2023-07-11 08:24:19 +0000 Commit: Peter Holm CommitDate: 2023-07-11 08:24:19 +0000 stress2: Added two syzkaller reproducers --- tools/test/stress2/misc/syzkaller68.sh | 235 ++++++++++++++++ tools/test/stress2/misc/syzkaller69.sh | 494 +++++++++++++++++++++++++++++++++ 2 files changed, 729 insertions(+) diff --git a/tools/test/stress2/misc/syzkaller68.sh b/tools/test/stress2/misc/syzkaller68.sh new file mode 100755 index 000000000000..3d60af5215c5 --- /dev/null +++ b/tools/test/stress2/misc/syzkaller68.sh @@ -0,0 +1,235 @@ +#!/bin/sh + +# panic: mutex Giant owned at ../../../kern/kern_thread.c:1409 +# cpuid = 0 +# time = 1688501618 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe0171ba2510 +# vpanic() at vpanic+0x150/frame 0xfffffe0171ba2560 +# panic() at panic+0x43/frame 0xfffffe0171ba25c0 +# __mtx_assert() at __mtx_assert+0xc4/frame 0xfffffe0171ba25d0 +# thread_suspend_check() at thread_suspend_check+0x38/frame 0xfffffe0171ba2610 +# sig_intr() at sig_intr+0x78/frame 0xfffffe0171ba2640 +# fork1() at fork1+0x238/frame 0xfffffe0171ba26c0 +# kproc_create() at kproc_create+0x92/frame 0xfffffe0171ba2790 +# kproc_kthread_add() at kproc_kthread_add+0xdd/frame 0xfffffe0171ba28b0 +# zthr_create_timer() at zthr_create_timer+0x109/frame 0xfffffe0171ba2930 +# arc_init() at arc_init+0x1b44/frame 0xfffffe0171ba2970 +# dmu_init() at dmu_init+0x31/frame 0xfffffe0171ba2980 +# spa_init() at spa_init+0xed/frame 0xfffffe0171ba29a0 +# zfs_kmod_init() at zfs_kmod_init+0x1f/frame 0xfffffe0171ba29c0 +# zfs_modevent() at zfs_modevent+0module_register_init() at module_register_init+0xb0/frame 0xfffffe0171ba2a10 +# linker_load_module() at linker_load_module+0xbd2/frame 0xfffffe0171ba2d10 +# kern_kldload() at kern_kldload+0x16f/frame 0xfffffe0171ba2d60 +# vfs_byname_kld() at vfs_byname_kld+0x31/frame 0xfffffe0171ba2da0 +# sys_mount() at sys_mount+0xa9/frame 0xfffffe0171ba2e00 +# amd64_syscall() at amd64_syscall+0x150/frame 0xfffffe0171ba2f30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe0171ba2f30 +# --- syscall (0, FreeBSD ELF64, syscall), rip = 0x823f70e9a, rsp = 0x82513af78, rbp = 0x82513af90 KDB: enter: panic +# [ thread pid 43886 tid 178779 ] +# Stopped at kdb_enter+0x32: movq $0,0xde5863(%rip) +# db> x/s version +# version: FreeBSD 14.0-CURRENT #0 main-n263953-d7614c010c762: Tue Jul 4 19:29:44 CEST 2023 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO +# db> + +uname -p | grep -Eq "amd64|i386" || exit 0 +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void loop(void) +{ + int i, call, thread; + for (call = 0; call < 1; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +void execute_call(int call) +{ + switch (call) { + case 0: + memcpy((void*)0x20000440, "zfs\000", 4); + syscall(SYS_mount, 0x20000440ul, 0ul, 0x8300648ul, 0ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x1012ul, -1, 0ul); + loop(); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +(cd /tmp; timeout 2m ./$prog) + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/syzkaller.* +exit 0 diff --git a/tools/test/stress2/misc/syzkaller69.sh b/tools/test/stress2/misc/syzkaller69.sh new file mode 100755 index 000000000000..fbaa3e5b9c9c --- /dev/null +++ b/tools/test/stress2/misc/syzkaller69.sh @@ -0,0 +1,494 @@ +#!/bin/sh + +# Fatal trap 12: page fault while in kernel mode +# cpuid = 6; apic id = 06 +# fault virtual address = 0xb8 +# fault code = supervisor read data, page not present +# instruction pointer = 0x20:0xffffffff80d3c17b +# stack pointer = 0x28:0xfffffe00e49fab80 +# frame pointer = 0x28:0xfffffe00e49facc0 +# code segment = base 0x0, limit 0xfffff, type 0x1b +# = DPL 0, pres 1, long 1, def32 0, gran 1 +# processor eflags = interrupt enabled, resume, IOPL = 0 +# current process = 12 (swi1: netisr 0) +# rdi: fffff802d2d8daa0 rsi: fffffe00e49fab48 rdx: ffffffff819d5a90 +# rcx: ffffffff819d5a98 r8: 00000000ffffffff r9: 0000000000000000 +# rax: 0000000000000000 rbx: 0000000000000002 rbp: fffffe00e49facc0 +# r10: fffff802d2d8daa0 r11: 0000000000010000 r12: 0000000000000000 +# r13: fffff802d2d8da80 r14: 0000000000000060 r15: fffff802d2d8dab8 +# trap number = 12 +# panic: page fault +# cpuid = 6 +# time = 1689053386 +# KDB: stack backtrace: +# db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00e49fa930 +# vpanic() at vpanic+0x149/frame 0xfffffe00e49fa980 +# panic() at panic+0x43/frame 0xfffffe00e49fa9e0 +# trap_fatal() at trap_fatal+0x40c/frame 0xfffffe00e49faa40 +# trap_pfault() at trap_pfault+0xae/frame 0xfffffe00e49faab0 +# calltrap() at calltrap+0x8/frame 0xfffffe00e49faab0 +# --- trap 0xc, rip = 0xffffffff80d3c17b, rsp = 0xfffffe00e49fab80, rbp = 0xfffffe00e49facc0 --- +# tcp_input_with_port() at tcp_input_with_port+0x70b/frame 0xfffffe00e49facc0 +# tcp6_input_with_port() at tcp6_input_with_port+0x6a/frame 0xfffffe00e49facf0 +# tcp6_input() at tcp6_input+0xb/frame 0xfffffe00e49fad00 +# ip6_input() at ip6_input+0xc97/frame 0xfffffe00e49fade0 +# swi_net() at swi_net+0x19b/frame 0xfffffe00e49fae60 +# ithread_loop() at ithread_loop+0x266/frame 0xfffffe00e49faef0 +# fork_exit() at fork_exit+0x82/frame 0xfffffe00e49faf30 +# fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe00e49faf30 +# --- trap 0, rip = 0, rsp = 0, rbp = 0 --- +# KDB: enter: panic +# [ thread pid 12 tid 100089 ] +# Stopped at kdb_enter+0x32: movq $0,0xde5053(%rip) +# db> x/s version +# version: FreeBSD 14.0-CURRENT #0 main-n264110-43ed91e00bbb1: Tue Jul 11 06:28:21 CEST 2023 +# pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO +# db> + +uname -p | grep -Eq "amd64" || exit 0 +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static unsigned long long procid; + +static __thread int clone_ongoing; +static __thread int skip_segv; +static __thread jmp_buf segv_env; + +static void segv_handler(int sig, siginfo_t* info, void* ctx __unused) +{ + if (__atomic_load_n(&clone_ongoing, __ATOMIC_RELAXED) != 0) { + exit(sig); + } + uintptr_t addr = (uintptr_t)info->si_addr; + const uintptr_t prog_start = 1 << 20; + const uintptr_t prog_end = 100 << 20; + int skip = __atomic_load_n(&skip_segv, __ATOMIC_RELAXED) != 0; + int valid = addr < prog_start || addr > prog_end; + if (sig == SIGBUS) + valid = 1; + if (skip && valid) { + _longjmp(segv_env, 1); + } + exit(sig); +} + +static void install_segv_handler(void) +{ + struct sigaction sa; + memset(&sa, 0, sizeof(sa)); + sa.sa_sigaction = segv_handler; + sa.sa_flags = SA_NODEFER | SA_SIGINFO; + sigaction(SIGSEGV, &sa, NULL); + sigaction(SIGBUS, &sa, NULL); +} + +#define NONFAILING(...) \ + ({ \ + int ok = 1; \ + __atomic_fetch_add(&skip_segv, 1, __ATOMIC_SEQ_CST); \ + if (_setjmp(segv_env) == 0) { \ + __VA_ARGS__; \ + } else \ + ok = 0; \ + __atomic_fetch_sub(&skip_segv, 1, __ATOMIC_SEQ_CST); \ + ok; \ + }) + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void use_temporary_dir(void) +{ + char tmpdir_template[] = "./syzkaller.XXXXXX"; + char* tmpdir = mkdtemp(tmpdir_template); + if (!tmpdir) + exit(1); + if (chmod(tmpdir, 0777)) + exit(1); + if (chdir(tmpdir)) + exit(1); +} + +static void reset_flags(const char* filename) +{ + struct stat st; + if (lstat(filename, &st)) + exit(1); + st.st_flags &= ~(SF_NOUNLINK | UF_NOUNLINK | SF_IMMUTABLE | UF_IMMUTABLE | + SF_APPEND | UF_APPEND); + if (lchflags(filename, st.st_flags)) + exit(1); +} +static void __attribute__((noinline)) remove_dir(const char* dir) +{ + DIR* dp = opendir(dir); + if (dp == NULL) { + if (errno == EACCES) { + if (rmdir(dir)) + exit(1); + return; + } + exit(1); + } + struct dirent* ep = 0; + while ((ep = readdir(dp))) { + if (strcmp(ep->d_name, ".") == 0 || strcmp(ep->d_name, "..") == 0) + continue; + char filename[FILENAME_MAX]; + snprintf(filename, sizeof(filename), "%s/%s", dir, ep->d_name); + struct stat st; + if (lstat(filename, &st)) + exit(1); + if (S_ISDIR(st.st_mode)) { + remove_dir(filename); + continue; + } + if (unlink(filename)) { + if (errno == EPERM) { + reset_flags(filename); + reset_flags(dir); + if (unlink(filename) == 0) + continue; + } + exit(1); + } + } + closedir(dp); + while (rmdir(dir)) { + if (errno == EPERM) { + reset_flags(dir); + if (rmdir(dir) == 0) + break; + } + exit(1); + } +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static void sandbox_common() +{ + struct rlimit rlim; + rlim.rlim_cur = rlim.rlim_max = 128 << 20; + setrlimit(RLIMIT_AS, &rlim); + rlim.rlim_cur = rlim.rlim_max = 8 << 20; + setrlimit(RLIMIT_MEMLOCK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_FSIZE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 1 << 20; + setrlimit(RLIMIT_STACK, &rlim); + rlim.rlim_cur = rlim.rlim_max = 0; + setrlimit(RLIMIT_CORE, &rlim); + rlim.rlim_cur = rlim.rlim_max = 256; + setrlimit(RLIMIT_NOFILE, &rlim); +} + +static void loop(); + +static int do_sandbox_none(void) +{ + sandbox_common(); + loop(); + return 0; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void execute_one(void) +{ + int i, call, thread; + for (call = 0; call < 7; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + if (call == 3) + break; + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ + int iter = 0; + for (;; iter++) { + char cwdbuf[32]; + sprintf(cwdbuf, "./%d", iter); + if (mkdir(cwdbuf, 0777)) + exit(1); + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + if (chdir(cwdbuf)) + exit(1); + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + sleep_ms(1); + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + remove_dir(cwdbuf); + } +} + +uint64_t r[2] = {0xffffffffffffffff, 0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + res = syscall(SYS_socket, 0x1cul, 1ul, 0); + if (res != -1) + r[0] = res; + break; + case 1: + NONFAILING(*(uint32_t*)0x20000080 = 9); + syscall(SYS_setsockopt, r[0], 0xffff, 0x10000, 0x20000080ul, 4ul); + break; + case 2: + NONFAILING(*(uint8_t*)0x200000c0 = 0x1c); + NONFAILING(*(uint8_t*)0x200000c1 = 0x1c); + NONFAILING(*(uint16_t*)0x200000c2 = htobe16(0x4e20 + procid * 4)); + NONFAILING(*(uint32_t*)0x200000c4 = 0); + NONFAILING(memset((void*)0x200000c8, 0, 16)); + NONFAILING(*(uint32_t*)0x200000d8 = 0); + syscall(SYS_bind, r[0], 0x200000c0ul, 0x1cul); + break; + case 3: + NONFAILING(*(uint32_t*)0x20000080 = 9); + syscall(SYS_setsockopt, r[0], 0xffff, 0x10000, 0x20000080ul, 4ul); + break; + case 4: + NONFAILING(*(uint32_t*)0x20000040 = 0x72); + NONFAILING(*(uint8_t*)0x20000048 = 0x10); + NONFAILING(*(uint8_t*)0x20000049 = 2); + NONFAILING(*(uint16_t*)0x2000004a = htobe16(0x4e21 + procid * 4)); + NONFAILING(*(uint32_t*)0x2000004c = htobe32(0x7f000001)); + NONFAILING(memset((void*)0x20000050, 0, 8)); + NONFAILING(memset((void*)0x20000058, 0, 112)); + syscall(SYS_setsockopt, r[0], 0, 0x51, 0x20000040ul, 0x88ul); + break; + case 5: + res = syscall(SYS_socket, 0x1cul, 1ul, 0); + if (res != -1) + r[1] = res; + break; + case 6: + NONFAILING(*(uint8_t*)0x20000140 = 0x1c); + NONFAILING(*(uint8_t*)0x20000141 = 0x1c); + NONFAILING(*(uint16_t*)0x20000142 = htobe16(0x4e20 + procid * 4)); + NONFAILING(*(uint32_t*)0x20000144 = 0); + NONFAILING(memset((void*)0x20000148, 0, 16)); + NONFAILING(*(uint32_t*)0x20000158 = 0); + syscall(SYS_connect, r[1], 0x20000140ul, 0x1cul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x1012ul, -1, 0ul); + install_segv_handler(); + for (procid = 0; procid < 4; procid++) { + if (fork() == 0) { + use_temporary_dir(); + do_sandbox_none(); + } + } + sleep(1000000); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +(cd ../testcases/swap; ./swap -t 2m -i 10 -l 100 > /dev/null 2>&1) & + +(cd /tmp; timeout 2m ./$prog) +wait + +rm -rf /tmp/$prog /tmp/$prog.c /tmp/syzkaller.* +exit 0 From nobody Tue Jul 11 12:12:17 2023 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 4R0frK4Qv9z2tn7S; Tue, 11 Jul 2023 12:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0frK411Wz3tpL; Tue, 11 Jul 2023 12:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYZ5REesjLwEGu23TfmY6iOXeQwK35mfR5+bAML8B5Q=; b=KQuKaFThIPkwtm0xdWi5Po96xFi+vx/X+qFxxe95h/PapzfbqlITvx88a/RFuD7ZtxIK1Y 2ZdOozTRvDjTelY3C3VbDTcgwefvpry1rBMCImdts7n+Ae3a84Yl9IkGbNuAomzspK0Q9Q aM+VMRAJrfxzs+57A5/GtzAy2qt2O4sUtGRRPSHdT83SR9TYgKQeVjrrOZ4dkUjPY8/5aS ZuV0ZV6PJviRMzwPWOGcpCgQ/mkcPe2tGSqCvXGd2OcT6vtgfIKfp3BVBAP4ceP7rdZq0l guoF1WKvj3YvieRpfVhATGnCTErG246LbqDOUCUgOm4UugMAhYRfG58xfKIP9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYZ5REesjLwEGu23TfmY6iOXeQwK35mfR5+bAML8B5Q=; b=EswhIXZbLlRp4iTv4kM001uZ9QltYINdQ+398OFP1zd0SYI7lD2sb4HNRlY9DSmej7AQc3 oAQ05xEQfWn8zdW/T7X87TDTD+IvOMWUU9LwlHeWldiUiihLcq6H6tuO/45EEmblg1/ktJ XJCTYsUu1IkV2AGZtMwTT+RQfauBDH2LKq+dR5MQms9Y7bu9j3kX61JqeNNoHehFm4+AUA saPwLyRzfzrJoRW7eTKUddPjXsZaReFRfx4KkWKn2XQaLjwF4+53iZkXyGAKGZf202PGsi NKzfh9KwFapFzpXg2w0c0K/ZS/bdjQGkjHsoPwYcBqfvShaMBRwD/dd23GJoPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689077537; a=rsa-sha256; cv=none; b=uRKlRBRf1jpCtD1zMFU5/Ka+CZPisV3zmAflpNjUcRFWNdVzjwvPiw/JE/zTeHaZc9dYPU mnXYJ25cWWc884JtNAtjN9HP1bzaOP79Te+6w63zmW5sTXWRI22s6Q4lzO3lqfZjYSu3qq aK9prALAJms8Sw/SHhSfxMWZExtXBFh2kFXsPvR0SqNWn4TfxzjpjoL+uT2iF/GEIWqVSv H69Ctz2NITKHgAyR5e5p4QgasT2OYhpPS/P4OEaOfZJMzRCgh1PCr08EB/cl+Zr6jrlq15 Z3r8MXUT5Cb1kBUFCvUpFovsocJR047Jjm1MKTQBf8LoZLK4QOOHhaKQQPkQ1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0frK355dzQsp; Tue, 11 Jul 2023 12:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BCCHh7024267; Tue, 11 Jul 2023 12:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BCCHgt024266; Tue, 11 Jul 2023 12:12:17 GMT (envelope-from git) Date: Tue, 11 Jul 2023 12:12:17 GMT Message-Id: <202307111212.36BCCHgt024266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 86c63225ea21 - main - rtld: Microoptimize rtld_start on i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86c63225ea21f2b4c0926bde9d9d4da1ec891b06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=86c63225ea21f2b4c0926bde9d9d4da1ec891b06 commit 86c63225ea21f2b4c0926bde9d9d4da1ec891b06 Author: Dmitry Chagin AuthorDate: 2023-07-11 12:10:08 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-11 12:10:08 +0000 rtld: Microoptimize rtld_start on i386 Initial stack pointer is preserved in calle-saved %esi, use it bellow to pass initial stack pointer to _rtld(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40950 --- libexec/rtld-elf/i386/rtld_start.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S index 87dca0e5b66b..6dbae220d89c 100644 --- a/libexec/rtld-elf/i386/rtld_start.S +++ b/libexec/rtld-elf/i386/rtld_start.S @@ -31,7 +31,6 @@ .type .rtld_start,@function .rtld_start: xorl %ebp,%ebp # Clear frame pointer for good form - movl %esp,%eax # Save initial stack pointer movl %esp,%esi # Save initial stack pointer andl $0xfffffff0,%esp # Align stack pointer subl $16,%esp # A place to store exit procedure addr @@ -41,7 +40,7 @@ subl $4,%esp # Keep stack aligned pushl %ecx # Pass address of obj_main pushl %ebx # Pass address of exit proc - pushl %eax # Pass initial stack pointer to rtld + pushl %esi # Pass initial stack pointer to rtld call _rtld # Call rtld(sp); returns entry point addl $16,%esp # Remove arguments from stack popl %edx # Get exit procedure address From nobody Tue Jul 11 12:12:18 2023 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 4R0frL5DrWz2tnPB; Tue, 11 Jul 2023 12:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0frL4cC6z3v7S; Tue, 11 Jul 2023 12:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9uPsFQ1OYyI57eyNb4LrofBwyLk6xtL+VtVZ29fHx4=; b=DezEW1ppYB+RUuIezrCxigizqZdrMDRBwOVy0qEZFwKClVe4dDbtDkAGo11ADbiJckPSqa t64sQ7nhydyEqo98tcauAwm36kzk5ZkvUcLmiBBmIjXxNmNNh8sZ7gtTrl/ItCR4RpmCjp OCy3g+LwnIo8zdyvEHTkO4tHssZHI5GgDIMVLf2BgP5nhEOdcxoKKCOOFWnOupomn2oDri sYru1gLpj81dZ1Du/tvm2KUgXIXzy57ZFjIYfXwXusjoZ8F5yImC6bDmmCHkpa8CXe/AyA p9iFy/LtTyE9HJYp2xbEMvcl95BxLC5GD70rt6ggKblbC5n2PwvbOLfEIC0KCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l9uPsFQ1OYyI57eyNb4LrofBwyLk6xtL+VtVZ29fHx4=; b=MjZtbNj/xMvy+vNW6ezeJqexAKnVHIXcQZYVHV6dDtuuCdDAwIpMJnV3W95ZYyqqQjSkIR RdGieKswBJRxJ6Zwnw6l0I5vSyMM9Q4tgIq9zkJLgMcQVGEnwnG5GlexT5MeZt6yWlaamV p6kVvR1tqjSbHIASNe1+JJOdvHulxooYBsd0IAwnjnnVoU/WE/8V++GJzXZjch1/aFskdD CPg9+WiJVK9C/V9szzzSGAMWyckKvSM0jIykKDcWL8ROyKrT5shRpfhuM3Ph/XAX/11N8a Uc+uD+lSyNzZF/+iVlE3EN2taxDvmxth7O7QKgYScUdhkDKi/Xt5DOvpL00JEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689077538; a=rsa-sha256; cv=none; b=p0xN1heEj/H+JP9Wjz0d8AiisTVON0UIz+7sJ4Inlh7iedn4pirBmL4ITfeRG+X0w0W7cn Qn5A9+EEROlXp7d8yHTy9iWKJa6JzPb+lUU74hGOHhNbmeAVX9D8wr3pP1YblbIloSuGeN +HEQeERK3NnATET8pY6ZOmi9MyXPa7hPdRTDrD16qBU5XQYwWW+Y6VTpaDuOaCsEB89qY2 i1IsG/lLUNC5DEQw+pb1xDFg8FOsdIf+JIoGU1DI1hqPH0rVUYTjYaEV2UBE8YjQ5nCqBl GPNzRifG1ztPgxT5DuiQc6B7qDCTmARM6ItaZ7venywSL6O9rY8xw/+QHyvYLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0frL3ht0zQyY; Tue, 11 Jul 2023 12:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BCCIhc025107; Tue, 11 Jul 2023 12:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BCCI9R025106; Tue, 11 Jul 2023 12:12:18 GMT (envelope-from git) Date: Tue, 11 Jul 2023 12:12:18 GMT Message-Id: <202307111212.36BCCI9R025106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: e541cf8316bb - main - rtld: Annotate .rtld_start on i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e541cf8316bb787df0f19c43132c517482cf24a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e541cf8316bb787df0f19c43132c517482cf24a6 commit e541cf8316bb787df0f19c43132c517482cf24a6 Author: Dmitry Chagin AuthorDate: 2023-07-11 12:10:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-11 12:10:32 +0000 rtld: Annotate .rtld_start on i386 Add a stop indicator to rtld_start to satisfy unwinders: The right unwinding stop indicator should be CFI-undefined PC. https://dwarfstd.org/doc/Dwarf3.pdf - page 118: If a Return Address register is defined in the virtual unwind table, and its rule is undefined (for example, by DW_CFA_undefined), then there is no return address and no call address, and the virtual unwind of stack activations is complete. That is allows gdb and libunwind successfully stop when unwinding stack from global constructors and destructors. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40949 --- libexec/rtld-elf/i386/rtld_start.S | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S index 6dbae220d89c..656ebb13864f 100644 --- a/libexec/rtld-elf/i386/rtld_start.S +++ b/libexec/rtld-elf/i386/rtld_start.S @@ -30,8 +30,15 @@ .globl .rtld_start .type .rtld_start,@function .rtld_start: + .cfi_startproc + .cfi_undefined %eip xorl %ebp,%ebp # Clear frame pointer for good form movl %esp,%esi # Save initial stack pointer + pushl %ebp + .cfi_def_cfa_offset 4 + movl %esp,%ebp + .cfi_offset %ebp,-4 + .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # Align stack pointer subl $16,%esp # A place to store exit procedure addr movl %esp,%ebx # save address of exit proc @@ -53,6 +60,7 @@ .globl .rtld_goto_main .rtld_goto_main: # This symbol exists just to make debugging easier. jmp *%eax # Enter main program + .cfi_endproc /* From nobody Tue Jul 11 12:12:19 2023 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 4R0frM6Hjpz2tnB1; Tue, 11 Jul 2023 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0frM5cYwz3v4b; Tue, 11 Jul 2023 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48PzJFhyKIey+nSJ6hLHIq22vXsq/utDH+k+AiLXY8k=; b=ceiVDPnW27ClbyG4ed9+bpa1HdwS+AIpPofL0Qx0w9kPy+1JBz4wxRtJjYc6aaDPN9pac/ cIPNZIA0JEC2M2bz0plTXOOMpEP5terjaPWOIJWa3PFdAp+PhMCtTcVFZDrFAih/hEq4Zn O8ZwG1p2SgM+DqYHIfkaQqbe5xlE2wOpK3lZJgnYYDw4wD74URT2egzPDmBkUuvw7SimNJ 10VXFVYnmw6eueqwofj6tEJEg5RpvN4cV9yj4MjesoNZf4Rol+0tJ4m0IB7SYsNO5qd+M4 x3RrlyCjHtYWCBCQVVsEd2DdeW+8U+U5jp5Wu40fCE9FyT3VS63JaFzMLpg8mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48PzJFhyKIey+nSJ6hLHIq22vXsq/utDH+k+AiLXY8k=; b=SmgZcozO4Rk/jaLypx/+5rtXqSppMEB/PJUmL0hgNN6O8OWxuc0CF6lxw+LjhOCZp0eei7 NL5APG6GrJ699dsbq2lktprDTKM/HJvIVzToy7fd80rzJN2qWdRXL/vAFopG2kdd2O8RW8 Hjrut6WWH+ZfkBezaRHCO12YqGV3eIkXyZFT+IPTagcBmi9rSYwn39gZP03O768i+lqIJK qnrmuxoAcKGCz9aUZYOwa1n097k0qt+5ukFP8N1Y3uvO0DE969h0DLRylaDenGv/Z937AA BkLZwNopeBJsF0IpCoVRf1Naz/zliKkXIHdul/UegoInDp6plT9Bo6oBacrtMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689077539; a=rsa-sha256; cv=none; b=WUPRSMBRY93Hh6yJTJbhVJg7Q0hkQyPIOZhKUYNRRUreTUaqVtpxZzQwEeiS2r0tsAtjj3 zMajTcfly1TIfkbXfl+5f9jdqk4tpBjmYem2rya/qD//hCYwjwoysshDEoQE/U+kaC3iaw /aaM7IFwK37yewWK+Ry4VvT4AiEl9VWH8rzbO+bIER1RQyZC8tJpmLg3VsjCgZecPoKVRy su2f2TuoCTUnuSYTUFt7DFj6jt8au2jUtjVzZt0EjP+yhToOViJNetEuMzcMGkycm9X9xv qRdFDbu8daWb5M9dJBoZi2Hgkj888dEZoc/3+y3Z49boHVhMQv8rz9QkexXwEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0frM4dBpzQsq; Tue, 11 Jul 2023 12:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BCCJrX025126; Tue, 11 Jul 2023 12:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BCCJWC025125; Tue, 11 Jul 2023 12:12:19 GMT (envelope-from git) Date: Tue, 11 Jul 2023 12:12:19 GMT Message-Id: <202307111212.36BCCJWC025125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d7e2580a1494 - main - csu: Add the prologue and epilogue to the _init and _fini on i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e2580a1494a8a05d4a97fa472612df84c1539b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d7e2580a1494a8a05d4a97fa472612df84c1539b commit d7e2580a1494a8a05d4a97fa472612df84c1539b Author: Dmitry Chagin AuthorDate: 2023-07-11 12:11:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-11 12:11:22 +0000 csu: Add the prologue and epilogue to the _init and _fini on i386 Normally, modern unwinders uses Dwarf information to unwind stack, however in case when the code is not annotated by Dwarf instructions, unwinders fallbacks to a frame-pointer based algorithm. That is allows libunwind to unwind stack from global constructors and destructors. Also it makes gdb happy as it printed nonexistent frame before. Reviewed by: kib, imp Differential Revision: https://reviews.freebsd.org/D40948 --- lib/csu/i386/crti.S | 8 ++++++-- lib/csu/i386/crtn.S | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/csu/i386/crti.S b/lib/csu/i386/crti.S index 77e4e77722d7..f5883db0ba0f 100644 --- a/lib/csu/i386/crti.S +++ b/lib/csu/i386/crti.S @@ -31,13 +31,17 @@ __FBSDID("$FreeBSD$"); .globl _init .type _init,@function _init: - sub $12,%esp /* re-align stack pointer */ + pushl %ebp + movl %esp,%ebp + subl $8,%esp /* re-align stack pointer */ .section .fini,"ax",@progbits .align 4 .globl _fini .type _fini,@function _fini: - sub $12,%esp /* re-align stack pointer */ + pushl %ebp + movl %esp,%ebp + subl $8,%esp /* re-align stack pointer */ .section .note.GNU-stack,"",%progbits diff --git a/lib/csu/i386/crtn.S b/lib/csu/i386/crtn.S index 0264e22540f1..f223062bb787 100644 --- a/lib/csu/i386/crtn.S +++ b/lib/csu/i386/crtn.S @@ -27,11 +27,13 @@ __FBSDID("$FreeBSD$"); .section .init,"ax",@progbits - add $12,%esp + addl $8,%esp + popl %ebp ret .section .fini,"ax",@progbits - add $12,%esp + addl $8,%esp + popl %ebp ret .section .note.GNU-stack,"",%progbits From nobody Tue Jul 11 12:12:20 2023 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 4R0frP0RSMz2tnJt; Tue, 11 Jul 2023 12:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0frN6hLpz3v7K; Tue, 11 Jul 2023 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfHWb+xPXMZ6ic2Sn09MT3DE1/G+KmUA7+AO18pWhn4=; b=s3K2cQT5gj6/chlN8YBUaLPlfOpxLzKaUX76K/khE5vviPRuw0GQW9Tn18faoFcTU1BI88 bgM1rQ3TbFaPF9SKTFqhiKMT0PwNca8IekFd0b+i/OSOyP/xhYGrVaahA50rEpfXIqCrMb W/3vbwSHJLoblfvpP5sRw798nNZFLBmRFnIYLbB1+I/zIRr/0GEj6NepCuv72tlVZY0uaV HXIjWp+gZj9DYR457eK+CTb+EUihqvwLO7Hr57aHnuctC3FBh/dBp3Wr80hVC0WH52HU6c k9+mM2FnEFfnc0a+niM9NxksOzrXksn+GkpUflXIHAF9pk2bYuQScRtOlAbQ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689077541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfHWb+xPXMZ6ic2Sn09MT3DE1/G+KmUA7+AO18pWhn4=; b=fvoRjCkuoYkuPemrrby5+jGpy1wkpKMuHZ69CYbFhu7aryyUD6djYxE2iZsRKFkNKsopLI jh4Zh6ObsfFNmOe6sPqYRLxiXGjWGpWCebnEGGKOUV+Vb+KngQ0oj6rKDw22u9BbMhNMHR 5jetp3rxpBB0zNW6sEj84BsMS+FCL5rIDdHwCrjasFHfyvUziiYVOjhkSQ2wsb/ooPPPRV mf/Y4qtCUmmkT0K2pvlDjRDbaXYyOiBQDB/8YV99TVGMNkP6v5ZHvZNBGbRN9982Xv2g0S BpxNEM2BmA7Bg78RjxDFY1LzciDW3rFRosDi9zG9yD6zrnQREi0X5rzUNWkpsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689077541; a=rsa-sha256; cv=none; b=EeJ5LZbBnDkEq0j0ckxGzjJf6wqO1KBC1aIErJyJTg7Q/4sxfyUwz7x1lmUHGs2w9wLteg AFiPDz10fIQF6KFddIh+bh3VKGKavtb832eXaXgILohGQ7h6h8mK8ttvVaMOoXf2evavIv fUN9ZkCSFtOMtzaaIQ1TmJjnv4+mPezKCuj97T8rCcmkpOpda3c+jeYBg54IN0FlPT8LSt KTL//P1QCakj/KvwGUHLwTAx6LmOfASsZfyl2+SDE4kaPTNWzyohANz30sECva3nIAjxFo dOyhw0IEU8QMGLHnRDESiWNx+4JjqjFS6g6GdKEWJqEb+mSAH0CZKG6p0l8V1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0frN5Z2czQss; Tue, 11 Jul 2023 12:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BCCKqe025149; Tue, 11 Jul 2023 12:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BCCKR7025148; Tue, 11 Jul 2023 12:12:20 GMT (envelope-from git) Date: Tue, 11 Jul 2023 12:12:20 GMT Message-Id: <202307111212.36BCCKR7025148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: d744a37a3ad4 - main - csu: Implement _start using as to satisfy unwinders on i386 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d744a37a3ad4be9d1f748258195f9d654c3cb2ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d744a37a3ad4be9d1f748258195f9d654c3cb2ae commit d744a37a3ad4be9d1f748258195f9d654c3cb2ae Author: Dmitry Chagin AuthorDate: 2023-07-11 12:12:01 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-11 12:12:01 +0000 csu: Implement _start using as to satisfy unwinders on i386 The right unwinding stop indicator should be CFI-undefined PC. https://dwarfstd.org/doc/Dwarf3.pdf - page 118: If a Return Address register is defined in the virtual unwind table, and its rule is undefined (for example, by DW_CFA_undefined), then there is no return address and no call address, and the virtual unwind of stack activations is complete. The hack localizing _start1 symbol removed. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40624 --- lib/csu/Makefile.inc | 6 ------ lib/csu/i386/Makefile | 3 ++- lib/csu/i386/crt1_c.c | 21 +------------------ lib/csu/i386/crt1_s.S | 58 ++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 54 insertions(+), 34 deletions(-) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index ee60c3968b87..9c3352296651 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -42,9 +42,6 @@ CLEANFILES+= crti_s.o ${CRT1SRC:C/.[S|c]$/.o/} crt1.o: ${CRT1SRC:C/.[S|c]$/.o/} ${CRT1OBJS} ${CRT1OBJ} ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o} -.if ${MACHINE_ARCH} == "i386" - ${OBJCOPY} --localize-symbol _start1 ${.TARGET} -.endif gcrt1_c.o: ${CRT1SRC} ${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/${CRT1SRC} @@ -57,9 +54,6 @@ Scrt1_c.o: ${CRT1SRC} Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${CRT1OBJ} ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o} -.if ${MACHINE_ARCH} == "i386" - ${OBJCOPY} --localize-symbol _start1 ${.TARGET} -.endif crtbegin.o: crtbegin.c crtbeginS.o: crtbegin.c diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index d8d0d3fd8f99..72be8b70ef19 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -4,6 +4,7 @@ CFLAGS+= -I${.CURDIR} -CRT1OBJS+= crt1_s.o +CRT1SRC= crt1_s.S +CRT1OBJ= crt1_c.o .include diff --git a/lib/csu/i386/crt1_c.c b/lib/csu/i386/crt1_c.c index d49c763749a3..7b28200cbd29 100644 --- a/lib/csu/i386/crt1_c.c +++ b/lib/csu/i386/crt1_c.c @@ -29,25 +29,6 @@ #include __FBSDID("$FreeBSD$"); -#include "libc_private.h" #include "csu_common.h" -void _start(char *, ...); -void _start1(void (*)(void), int, char *[]) __dead2; - -/* The entry function, C part. */ -void -_start1(void (*cleanup)(void), int argc, char *argv[]) -{ - char **env; - - env = argv + argc + 1; -#ifdef GCRT - __libc_start1_gcrt(argc, argv, env, cleanup, main, &eprol, &etext); -__asm__("eprol:"); -#else - __libc_start1(argc, argv, env, cleanup, main); -#endif -} - -__asm(".hidden _start1"); +void _start(char *, ...) __dead2; diff --git a/lib/csu/i386/crt1_s.S b/lib/csu/i386/crt1_s.S index 1bd9a4283987..f6e230a1a5a7 100644 --- a/lib/csu/i386/crt1_s.S +++ b/lib/csu/i386/crt1_s.S @@ -31,19 +31,63 @@ __FBSDID("$FreeBSD$"); .type _start, @function _start: .cfi_startproc + .cfi_undefined %eip + popl %esi # Pop argc + .cfi_def_cfa_offset -4 + movl %esp,%edi # argv starts at stack top xorl %ebp,%ebp pushl %ebp - .cfi_def_cfa_offset 4 + .cfi_def_cfa_offset 0 movl %esp,%ebp - .cfi_offset %ebp,-8 + .cfi_offset %ebp,-4 .cfi_def_cfa_register %ebp andl $0xfffffff0,%esp # align stack - leal 8(%ebp),%eax - subl $4,%esp - pushl %eax # argv - pushl 4(%ebp) # argc + +#ifdef GCRT + subl $4,%esp # Align stack for 7 arguments + pushl $etext + pushl $eprol +eprol: +#else + subl $12,%esp # Align stack for 5 arguments +#endif /* GCRT */ + +#ifdef PIC + calll 1f +1: popl %ebx + addl $_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx + leal main@GOTOFF(%ebx),%eax + pushl %eax +#else + pushl $main +#endif /* PIC */ + pushl %edx # rtld cleanup - call _start1 + /* env = argv + argc + 1 */ + movl %edi,%eax # env = argv + movl %esi,%ecx + shll $2,%ecx # argc * 4 + addl %ecx,%eax # env += argc + addl $4,%eax # env += 1 + pushl %eax # env + pushl %edi # argv + pushl %esi # argc + +#ifdef GCRT + /* + * __libc_start1_gcrt(argc, argv, env, cleanup, main, &eprol, &etext); + */ + calll __libc_start1_gcrt +#else + /* + * __libc_start1(argc, argv, env, cleanup, main); + */ +#ifdef PIC + calll __libc_start1@PLT +#else + calll __libc_start1 +#endif +#endif /* GCRT */ int3 .cfi_endproc .size _start, . - _start From nobody Tue Jul 11 15:00:09 2023 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 4R0kZ16X53z4h4xm; Tue, 11 Jul 2023 15:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0kZ1615hz3BpP; Tue, 11 Jul 2023 15:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689087609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Up6Ms4g8mRWx5D26Z53w/LHf/0JoybuIpGpdCqbgHw8=; b=Em9GOkZWLgBuEWIaLE1u34gfUJ434LR5zi7d0C2HUY6g2TdYZsW9N2Q6Hlxfg4L9a1+Daj 0q2FSiolyn3S3ly7s22OeDVm8T5omHFT13oZlvCZmiiE3c0vgfHTP9edpEDpV0xj9tMPAw TiROQLnsTyxf7dVW0TMDXBOI9f2NeM99GY0D6rnTzhMopPZINoJuP0qOt+hDYDBQUjJInf 7KITDbL44mAss6HA//8tv3vGBQ9EmdwwvCJYN5H0vyeJSwuUFhtPuehGKn+bupnmA3nXQS 29UKFF4EsNKgWqPlLyeyIdsxeHBoXdaYGwXYxeHN/AxWIzcS/5cPvMIRu0PT0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689087609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Up6Ms4g8mRWx5D26Z53w/LHf/0JoybuIpGpdCqbgHw8=; b=U2AhWinYCg9bCCLyv7vm853a05BIkVmsY+cmW87r2q8G5+MzYUehyQx8f+ZOSwNlv9uO7T VCLuTeroCxhxUw0TJadhlAt+qIeeZahErtp/Mj3me0ZBIrcNJwRgMMwoUjUX/fbIN8AMyt nSBShLSagIuO9fAumUDH9zmpbStvhea3/asHRma0A8CsZ/hvQieO53A7mEDf6uds9Lvgkt GrLSWlM9Iv1C3JLaG2B3y8RFXlY/xYWLQM5wOZbJTd1bXT8QN2kX94/PBTv0a0wvJFKUeD 3+AYFvHe15JiZd2Re8uTNi5O4rOHwMJwFF/sVQjHvEwH3w6MnJPbJFoYL9V4OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689087609; a=rsa-sha256; cv=none; b=XVzWjcIb5vRofhr4L+AjRSKpe5BXXqr8dXDf9b6GtYFbDb/u4ig5NSOYLC0NNjXiEIP/Ig x8HzJHgR/v2PVRzcn2xgbb2ssT05ty03yHv5GBoYWSDoZpGpKqtDTHEiCWLU+tHe5GJHXm unajCMwtOd9Kx7tf1MaHvq4jXfpHLRbtZdZTmXQapChjp8cGE8znSgqQHa9UwyfRgx7FcK hvF4AIKa4JFa2pS4EDgYkccSqPdQGmvD/v0BBZpTwIx2bSWCvQthQPjZLIANyUSihfy2Vf P/vikpIhg5gCYGDmaXEMXfS/s2dA1djuu7fJxbhqyZOBPtvmuxNj6qeBfdkfNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0kZ156VgzVwC; Tue, 11 Jul 2023 15:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BF09JV095625; Tue, 11 Jul 2023 15:00:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BF09Uk095618; Tue, 11 Jul 2023 15:00:09 GMT (envelope-from git) Date: Tue, 11 Jul 2023 15:00:09 GMT Message-Id: <202307111500.36BF09Uk095618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 66f2f9ee0877 - main - ipfw: teach ipfw that pfsync is an upper layer protocol 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f commit 66f2f9ee08770f2d2ad7de4dbb07ed77fb870a0f Author: Kristof Provost AuthorDate: 2023-07-11 10:37:17 +0000 Commit: Kristof Provost CommitDate: 2023-07-11 12:59:08 +0000 ipfw: teach ipfw that pfsync is an upper layer protocol Explicitly add pfsync as a know upper layer protocol so we don't automatically discard pfsync packets (carried over IPv6). net.inet6.ip6.fw.deny_unknown_exthdrs defaults to 1, so even if net.inet.ip.fw.default_to_accept is set to 1 we'd discard pfsync (over IPv6). Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D40973 --- sys/netpfil/ipfw/ip_fw2.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index 766b978fbaf5..41420563ab5b 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -1718,6 +1719,10 @@ do { \ PULLUP_TO(hlen, ulp, struct ip); break; + case IPPROTO_PFSYNC: + PULLUP_TO(hlen, ulp, struct pfsync_header); + break; + default: if (V_fw_verbose) printf("IPFW2: IPV6 - Unknown " From nobody Tue Jul 11 16:19:34 2023 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 4R0mKg0599z4gvbW; Tue, 11 Jul 2023 16:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0mKf6nCVz3hsK; Tue, 11 Jul 2023 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689092375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTdRhud7sIlz76OgXcXimZQSYWly8v29ECuog0+hJ20=; b=trm7wx9alon0pLHiOF6hBJMozzVScMA3ZcrgH2nyfGsTt9L8fGw68mBKnSBGadKs/1/RGH 6d3IvYceKVvKQb9ftmUo+GBxeKps2i9RJPcRDemaoZNZ1twJfg7urWV+RJUbhcj2r6mGx7 Cd43GmxA+B+0Qc74zqK3VLB1LHGjyc66vy0FrjkR+N7eCC7CsjcuDJl1ez4noRygrsLNAm QNG8ElJ1aP+ekh6hv0TLyKy2AJorbI7j1UwEDiL6hUhqquJh1WhYlyLp2zS5QYMtnJNJfp v7H4kguZJw1TufE0jpf1n7DVypUD+wd68APZ/I3MlsgJM1dO2apaDGVougYdpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689092374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BTdRhud7sIlz76OgXcXimZQSYWly8v29ECuog0+hJ20=; b=aA45LhoA+rcgAYDMu3va11wppTCgGh0OvFDmcP9U8HocB65f63T1YKfaJyITGLpFkNFHM/ RC60HJM9eJ8RjIfXC89ZafsnXGenP3j9s+GaObVs1ObobdhA6S1pjZIdiNThHRsotsQyKJ kDhmcVi2swDTyrCpi1n8BTTZ5WqSp8yw5mKT13Z0Ixmcpgui8gPpAclq/CPM8Xipz/bYuD l2sTd+2lHn/qfyL1bq/88on+ZUezblrDOtwIYfhjFsIQ9KD92Q1LJnMiR9ga30f9ricDag HSfjYTOkOWBfRBs2L8Os3QRdJR9hitbSgJvX/UW/zBkzNvlLFl5qC4BhDGrBzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689092374; a=rsa-sha256; cv=none; b=JMKwXEx4bfxz+L/QPJbmgVqN8SJ6EqC/NhnKpA8LqrhFhw1W9UquSu7fg4dFfGmhRHaShz CqhaobxVWHSJt/qFOYne21cbKbjPuVNIHPi8HDuU09UEg3E2Cjt4isU66RuZcASIAOErVh S2Oe6v1dZUcCbjh0wvdkS6HenJmoe3warI9Sm4ixi7aiPqNNJkIbuZAN54zrNpyDGtvJIW nOuXYD1sowhNCWgECKCqcX25I6FyOiJi7Kr2bI2LntClXvnjx+zlu77m0+9+HJ7ezqEfj1 5Poek7e3hgIGrdkAe0Z2o+88rj6d35NXY3Z1JJxfTjRxQXaS0cx3FlsepsPKcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0mKf5lZwzY24; Tue, 11 Jul 2023 16:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BGJYYo023722; Tue, 11 Jul 2023 16:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BGJYdv023721; Tue, 11 Jul 2023 16:19:34 GMT (envelope-from git) Date: Tue, 11 Jul 2023 16:19:34 GMT Message-Id: <202307111619.36BGJYdv023721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: a0302c923150 - main - ix, ixv: Update link status with autonegotiated baudrate value 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0302c9231502bae8f43edbd5fb8d73132eb8da7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=a0302c9231502bae8f43edbd5fb8d73132eb8da7 commit a0302c9231502bae8f43edbd5fb8d73132eb8da7 Author: Piotr Pietruszewski AuthorDate: 2023-07-11 16:14:26 +0000 Commit: Piotr Kubaj CommitDate: 2023-07-11 16:14:26 +0000 ix, ixv: Update link status with autonegotiated baudrate value Use autonegotiated link speed value while updating link status to iflib. This patch is part of change made in NetBSD kernel by Masanobu Saitoh, NetBSD maintainer. Differential Revision: https://reviews.freebsd.org/D19176 Approved by: erj --- sys/dev/ixgbe/if_ix.c | 3 ++- sys/dev/ixgbe/if_ixv.c | 2 +- sys/dev/ixgbe/ixgbe.h | 2 ++ sys/dev/ixgbe/ixgbe_osdep.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 0179c6456de8..09c0a82279ed 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3679,7 +3679,8 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) /* Update DMA coalescing config */ ixgbe_config_dmac(sc); /* should actually be negotiated value */ - iflib_link_state_change(ctx, LINK_STATE_UP, IF_Gbps(10)); + iflib_link_state_change(ctx, LINK_STATE_UP, + ixgbe_link_speed_to_baudrate(adapter->link_speed)); if (sc->feat_en & IXGBE_FEATURE_SRIOV) ixgbe_ping_all_vfs(sc); diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 848c15fe3b99..13f48a6fd3ec 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -937,7 +937,7 @@ ixv_if_update_admin_status(if_ctx_t ctx) "Full Duplex"); sc->link_active = true; iflib_link_state_change(ctx, LINK_STATE_UP, - IF_Gbps(10)); + ixgbe_link_speed_to_baudrate(adapter->link_speed)); } } else { /* Link down */ if (sc->link_active == true) { diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h index 83a51b4d15e7..a704a6ebbc8c 100644 --- a/sys/dev/ixgbe/ixgbe.h +++ b/sys/dev/ixgbe/ixgbe.h @@ -530,6 +530,8 @@ ixv_check_ether_addr(u8 *addr) return (status); } +uint64_t ixgbe_link_speed_to_baudrate(ixgbe_link_speed speed); + /* Shared Prototypes */ int ixgbe_allocate_queues(struct ixgbe_softc *); diff --git a/sys/dev/ixgbe/ixgbe_osdep.c b/sys/dev/ixgbe/ixgbe_osdep.c index 49ae5e27f46e..a35ff0ef7889 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.c +++ b/sys/dev/ixgbe/ixgbe_osdep.c @@ -76,3 +76,36 @@ ixgbe_write_reg_array(struct ixgbe_hw *hw, u32 reg, u32 offset, u32 val) ((struct ixgbe_softc *)hw->back)->osdep.mem_bus_space_handle, reg + (offset << 2), val); } + +uint64_t +ixgbe_link_speed_to_baudrate(ixgbe_link_speed speed) +{ + uint64_t baudrate; + + switch (speed) { + case IXGBE_LINK_SPEED_10GB_FULL: + baudrate = IF_Gbps(10); + break; + case IXGBE_LINK_SPEED_5GB_FULL: + baudrate = IF_Gbps(5); + break; + case IXGBE_LINK_SPEED_2_5GB_FULL: + baudrate = IF_Mbps(2500); + break; + case IXGBE_LINK_SPEED_1GB_FULL: + baudrate = IF_Gbps(1); + break; + case IXGBE_LINK_SPEED_100_FULL: + baudrate = IF_Mbps(100); + break; + case IXGBE_LINK_SPEED_10_FULL: + baudrate = IF_Mbps(10); + break; + case IXGBE_LINK_SPEED_UNKNOWN: + default: + baudrate = 0; + break; + } + + return baudrate; +} From nobody Tue Jul 11 16:34:08 2023 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 4R0mfZ1kn2z4h1VP; Tue, 11 Jul 2023 16:34:14 +0000 (UTC) (envelope-from nparhar@gmail.com) Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0mfY73rcz3mXn; Tue, 11 Jul 2023 16:34:13 +0000 (UTC) (envelope-from nparhar@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6b8decf09e1so5210722a34.0; Tue, 11 Jul 2023 09:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689093251; x=1691685251; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=qEiPNwZF0tyYBwbWo+PpgcbNvkd9GQw4wjPsFN1HjqM=; b=lB/x/1r4IBRICvHSmVoRZnVDDbb41A0pDRPn+jF0dRuVIY4GsYQlCcJp/AwacjWBjN JRyvHjF2BwmlbBTrwMUdXGmIiihG+5vFb7hFlydSYYHlIt146aCGsNuI5yBUzzao8f3I JB0kEQlv04aBx9cCSq6qQeNBBIEl2w2UCFXN+0oraU7OiTtfNS4kFxjCPy+l01AVzP3d xMYoAqaXtITeu0rTcih4qvcZx5GqoNw8Il+izquiVUgB2tSv47k6BT+zPIClZkjqtFGy pZK/NVkJwML4wB/etcvSfzlfkNJRuGoPO4Up7R7kL8+U2rAl1cO4A87VxvCmVDU3FL6R R2Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689093251; x=1691685251; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qEiPNwZF0tyYBwbWo+PpgcbNvkd9GQw4wjPsFN1HjqM=; b=jcwUy8Dggr5ikBgBfliF3QVI1ye5IMLFuaa93lAKxYfS8zx3ya6+lpPyUJewSn6IxJ jZxLFWSGejgLyMJwhNlfKJZpoQI5kefPC08hRZvGi3SweagQ1vIQlwJ00H/zfTBdc3px NFOF14dp98whA13uFgZ7QXRqB/bYJzxDeWZT7w58a4V12/CkRDIffKbrPfM//dRUBQBF okTaiesYmCm8pE5pAQibJOPjpXWPMHyYFbJZbN06FyDxnChaZi/gbgbFUkKYt89ihTss +wIl0ei0fo67N+EKT5UlUprhK2E77f+LMhI6izFfaFow9kwu48peEWclzgvYrcdmSFRZ nFUA== X-Gm-Message-State: ABy/qLbI0+551pqzPUohOGJuZjeoPTqJPivxkqXUazzp3LSQHg6oZynh mjhc+0Jny5pOITSSVMqsE6UtWdKWGS4= X-Google-Smtp-Source: APBJJlGI9FJVovgzx0VbdF+8W8psjjN9+SCLmOk641kg901z+z5KSJ3PDMv9hxkIgiOvnVFsBaWPew== X-Received: by 2002:a05:6358:278f:b0:12f:158e:ed88 with SMTP id l15-20020a056358278f00b0012f158eed88mr18035948rwb.22.1689093250742; Tue, 11 Jul 2023 09:34:10 -0700 (PDT) Received: from [10.192.161.10] (stargate.chelsio.com. [12.32.117.8]) by smtp.googlemail.com with ESMTPSA id x28-20020a656abc000000b00528da88275bsm1671356pgu.47.2023.07.11.09.34.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Jul 2023 09:34:10 -0700 (PDT) Message-ID: <1e24a398-2a92-b84e-a5c6-710dc277fe51@FreeBSD.org> Date: Tue, 11 Jul 2023 09:34:08 -0700 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.13.0 Subject: Re: git: a0302c923150 - main - ix, ixv: Update link status with autonegotiated baudrate value To: Piotr Kubaj , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307111619.36BGJYdv023721@gitrepo.freebsd.org> Content-Language: en-US From: Navdeep Parhar In-Reply-To: <202307111619.36BGJYdv023721@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 X-Rspamd-Queue-Id: 4R0mfY73rcz3mXn X-Spamd-Bar: ---- 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-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N T24gNy8xMS8yMyA5OjE54oCvQU0sIFBpb3RyIEt1YmFqIHdyb3RlOg0KPiBUaGUgYnJhbmNo IG1haW4gaGFzIGJlZW4gdXBkYXRlZCBieSBwa3ViYWo6DQo+IA0KPiBVUkw6IGh0dHBzOi8v Y2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD1hMDMwMmM5MjMxNTAyYmFlOGY0M2Vk YmQ1ZmI4ZDczMTMyZWI4ZGE3DQo+IA0KPiBjb21taXQgYTAzMDJjOTIzMTUwMmJhZThmNDNl ZGJkNWZiOGQ3MzEzMmViOGRhNw0KPiBBdXRob3I6ICAgICBQaW90ciBQaWV0cnVzemV3c2tp IDxwaW90ci5waWV0cnVzemV3c2tpQGludGVsLmNvbT4NCj4gQXV0aG9yRGF0ZTogMjAyMy0w Ny0xMSAxNjoxNDoyNiArMDAwMA0KPiBDb21taXQ6ICAgICBQaW90ciBLdWJhaiA8cGt1YmFq QEZyZWVCU0Qub3JnPg0KPiBDb21taXREYXRlOiAyMDIzLTA3LTExIDE2OjE0OjI2ICswMDAw DQo+IA0KPiAgICAgIGl4LCBpeHY6IFVwZGF0ZSBsaW5rIHN0YXR1cyB3aXRoIGF1dG9uZWdv dGlhdGVkIGJhdWRyYXRlIHZhbHVlDQo+ICAgICAgDQo+ICAgICAgVXNlIGF1dG9uZWdvdGlh dGVkIGxpbmsgc3BlZWQgdmFsdWUgd2hpbGUgdXBkYXRpbmcgbGluayBzdGF0dXMNCj4gICAg ICB0byBpZmxpYi4NCj4gICAgICANCj4gICAgICBUaGlzIHBhdGNoIGlzIHBhcnQgb2YgY2hh bmdlIG1hZGUgaW4gTmV0QlNEIGtlcm5lbA0KPiAgICAgIGJ5IE1hc2Fub2J1IFNhaXRvaCwg TmV0QlNEIG1haW50YWluZXIuDQo+ICAgICAgDQo+ICAgICAgRGlmZmVyZW50aWFsIFJldmlz aW9uOiAgaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3JnL0QxOTE3Ng0KPiAgICAgIEFwcHJv dmVkIGJ5OiAgICBlcmoNCj4gLS0tDQo+ICAgc3lzL2Rldi9peGdiZS9pZl9peC5jICAgICAg IHwgIDMgKystDQo+ICAgc3lzL2Rldi9peGdiZS9pZl9peHYuYyAgICAgIHwgIDIgKy0NCj4g ICBzeXMvZGV2L2l4Z2JlL2l4Z2JlLmggICAgICAgfCAgMiArKw0KPiAgIHN5cy9kZXYvaXhn YmUvaXhnYmVfb3NkZXAuYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Kw0KPiAgIDQgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkNCj4gDQo+IGRpZmYgLS1naXQgYS9zeXMvZGV2L2l4Z2JlL2lmX2l4LmMgYi9zeXMvZGV2 L2l4Z2JlL2lmX2l4LmMNCj4gaW5kZXggMDE3OWM2NDU2ZGU4Li4wOWMwYTgyMjc5ZWQgMTAw NjQ0DQo+IC0tLSBhL3N5cy9kZXYvaXhnYmUvaWZfaXguYw0KPiArKysgYi9zeXMvZGV2L2l4 Z2JlL2lmX2l4LmMNCj4gQEAgLTM2NzksNyArMzY3OSw4IEBAIGl4Z2JlX2lmX3VwZGF0ZV9h ZG1pbl9zdGF0dXMoaWZfY3R4X3QgY3R4KQ0KPiAgIAkJCS8qIFVwZGF0ZSBETUEgY29hbGVz Y2luZyBjb25maWcgKi8NCj4gICAJCQlpeGdiZV9jb25maWdfZG1hYyhzYyk7DQo+ICAgCQkJ Lyogc2hvdWxkIGFjdHVhbGx5IGJlIG5lZ290aWF0ZWQgdmFsdWUgKi8NCg0KVGhpcyBjb21t ZW50IHNob3VsZCBoYXZlIGJlZW4gZGVsZXRlZCB0b28/DQoNClJlZ2FyZHMsDQpOYXZkZWVw DQoNCj4gLQkJCWlmbGliX2xpbmtfc3RhdGVfY2hhbmdlKGN0eCwgTElOS19TVEFURV9VUCwg SUZfR2JwcygxMCkpOw0KPiArCQkJaWZsaWJfbGlua19zdGF0ZV9jaGFuZ2UoY3R4LCBMSU5L X1NUQVRFX1VQLA0KPiArCQkJICAgIGl4Z2JlX2xpbmtfc3BlZWRfdG9fYmF1ZHJhdGUoYWRh cHRlci0+bGlua19zcGVlZCkpOw0KPiAgICA+ICAgCQkJaWYgKHNjLT5mZWF0X2VuICYgSVhH QkVfRkVBVFVSRV9TUklPVikNCj4gICAJCQkJaXhnYmVfcGluZ19hbGxfdmZzKHNjKQ0K From nobody Tue Jul 11 16:45:05 2023 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 4R0mv553N3z4h5S6; Tue, 11 Jul 2023 16:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0mv54ftVz3pnV; Tue, 11 Jul 2023 16:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689093905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtF6OTelPx+Ln0Ai2rl/luEi+w4uggbFLQyCDPyrmic=; b=amZTu7e3kJ8/SG2Adquzn2nf+GqP9ayuzKIxF59YCvz6VEOjiLqF2cH7iJW9k+oJE1woQH yG0aRotyB0zXS8LMTpJzKI/DzlmLcgr5ekeblNqkbifF51FkKGwm7H9rsoi37zlcs3z8xZ YfZFNCZmKmmFP3NXsPaaCQ7SaH5gMqWt8xRGLMiM6G42OpVu4Q8Ls7D+tOACnARKAvMaIt BU0UJnwoV+oOYV6IKyN5QeSUge06IJuBWmRy60r5aUVcqacHppP34Lh+UmorU1iRuPGhOS /ml8d3wyp8ojVsx4uYbqk1yDQDI8DNPYSpFiD/++fjv3nAhAjYlMBU0k/LbYJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689093905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UtF6OTelPx+Ln0Ai2rl/luEi+w4uggbFLQyCDPyrmic=; b=g++oUUdajWVipj2lss6dnFvOMMebllYY6IdOM/Vi6ksi8JzVyrG24SKncOA9s2Y/VINxrL Rf7wVnwa4/706yLbbmi8IP0VgUU4l8zj1MUyQzbAwLyxUIxLldBWuSie3YoSBdYX+L1SKH Ra2cNVPq7rn+96JRvkg+IYmOYCidhjBgNdtulWzls6V+M3nv9ZMjjTZuFmxbn+6pim8HdJ THi2nYEYKf/JDRfmle6BlpyRBC3JXG3a3SperykSqaC95adwTgtD9PZCNEaLVl2SChHCoA 6hvdKGTeFAp9JxMW3sklAelvdiOlxebrSE2lrLPA24O/q6O/be3EY5xRAyGRRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689093905; a=rsa-sha256; cv=none; b=xgRF+5WjPdj8vKaM9/K9XxDi7bbb/KjcnS50lQaxnG7/UFW7zIy06eWuTKRCnMeQS7seVU Px/vLAcic2jbGqUInETpGs6M35WI75PWPlnc8k+UF7wEs/p+Ud9oXtIuKb0jvt/xsHTMtj FmLXm/MybWxlCd/Q0WEGbooDsKR59PjM9tEDEIhT/ESBS6cNFJ4ElRwCCbajSyT9BXncP7 TTvfztusJFiPhQ0DarVd6/huMRvHinsY2yXEeos7ZpWSjiah8of34DJ+D/ooc1rs+zHYW4 rsnxUcs2NJh50xSAjhy9ULcTTgr21jGbALYJRjGx3H2+8XEqfR0dymGc9et6aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0mv53mRBzYlK; Tue, 11 Jul 2023 16:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BGj5Xo072744; Tue, 11 Jul 2023 16:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BGj5K9072743; Tue, 11 Jul 2023 16:45:05 GMT (envelope-from git) Date: Tue, 11 Jul 2023 16:45:05 GMT Message-Id: <202307111645.36BGj5K9072743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 6ad2a9a64f34 - main - ix: remove stale comment 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd commit 6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd Author: Piotr Kubaj AuthorDate: 2023-07-11 16:45:04 +0000 Commit: Piotr Kubaj CommitDate: 2023-07-11 16:45:04 +0000 ix: remove stale comment Reported by: Navdeep Parhar --- sys/dev/ixgbe/if_ix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 09c0a82279ed..45ab7c27233a 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3678,7 +3678,6 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) ixgbe_fc_enable(&sc->hw); /* Update DMA coalescing config */ ixgbe_config_dmac(sc); - /* should actually be negotiated value */ iflib_link_state_change(ctx, LINK_STATE_UP, ixgbe_link_speed_to_baudrate(adapter->link_speed)); From nobody Tue Jul 11 16:45:33 2023 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 4R0mvr3gQFz4lJbX; Tue, 11 Jul 2023 16:45:44 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from mail.anongoth.pl (mail.anongoth.pl [46.248.190.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X448 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "anongoth.pl", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0mvr0DTTz3pyj; Tue, 11 Jul 2023 16:45:44 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Authentication-Results: mx1.freebsd.org; none Received: from anongoth.pl (unknown [192.168.1.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: pkubaj@anongoth.pl) by mail.anongoth.pl (Postfix) with ESMTPSA id D45C71558C6; Tue, 11 Jul 2023 18:45:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=anongoth.pl; s=ANONGOTH; t=1689093934; bh=WwvuGkpfhVl9hScivPyVLKpcwg5KnxRjH9u9sapBo3M=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=k9QI6aUlW7bDtNch0jJKRfBwpMek4+EDOubFB57cRcte+hamPnXa9YjAbbmL48z8G Hjbym1iOlFuTD4zIA5BZbWarpamgNHXDJj/+iGACGzQ/vUbljKLXv+45Nctfcl94U0 ri1+DvL58dRNVIPcqERjLt5nrJR6kGRiip3+8Xr+3XVGQ72cTBaOGTjgpRvWWwzbur mmISfcu9xZLW1dOxfOq3DeF2q1gYJh3ntaugN056Gpj9ZGH1tDrIvW0vKoV6vRbmp6 UmAlIGrlFKoeMdivLhbJGiRG6156mjEuC5XhewnlrYUFCzHsU9aQhdRoye/nWp+I2B QlLQgdBKShGKg== Date: Tue, 11 Jul 2023 18:45:33 +0200 From: Piotr Kubaj To: Navdeep Parhar Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a0302c923150 - main - ix, ixv: Update link status with autonegotiated baudrate value Message-ID: References: <202307111619.36BGJYdv023721@gitrepo.freebsd.org> <1e24a398-2a92-b84e-a5c6-710dc277fe51@FreeBSD.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hkD8xVjIhsAJGigs" Content-Disposition: inline In-Reply-To: <1e24a398-2a92-b84e-a5c6-710dc277fe51@FreeBSD.org> X-Rspamd-Queue-Id: 4R0mvr0DTTz3pyj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:47544, ipnet:46.248.160.0/19, country:PL] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --hkD8xVjIhsAJGigs Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 23-07-11 09:34:08, Navdeep Parhar wrote: > On 7/11/23 9:19=E2=80=AFAM, Piotr Kubaj wrote: > > The branch main has been updated by pkubaj: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Da0302c9231502bae8f43edbd= 5fb8d73132eb8da7 > >=20 > > commit a0302c9231502bae8f43edbd5fb8d73132eb8da7 > > Author: Piotr Pietruszewski > > AuthorDate: 2023-07-11 16:14:26 +0000 > > Commit: Piotr Kubaj > > CommitDate: 2023-07-11 16:14:26 +0000 > >=20 > > ix, ixv: Update link status with autonegotiated baudrate value > > =20 > > Use autonegotiated link speed value while updating link status > > to iflib. > > =20 > > This patch is part of change made in NetBSD kernel > > by Masanobu Saitoh, NetBSD maintainer. > > =20 > > Differential Revision: https://reviews.freebsd.org/D19176 > > Approved by: erj > > --- > > sys/dev/ixgbe/if_ix.c | 3 ++- > > sys/dev/ixgbe/if_ixv.c | 2 +- > > sys/dev/ixgbe/ixgbe.h | 2 ++ > > sys/dev/ixgbe/ixgbe_osdep.c | 33 +++++++++++++++++++++++++++++++++ > > 4 files changed, 38 insertions(+), 2 deletions(-) > >=20 > > diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c > > index 0179c6456de8..09c0a82279ed 100644 > > --- a/sys/dev/ixgbe/if_ix.c > > +++ b/sys/dev/ixgbe/if_ix.c > > @@ -3679,7 +3679,8 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) > > /* Update DMA coalescing config */ > > ixgbe_config_dmac(sc); > > /* should actually be negotiated value */ >=20 > This comment should have been deleted too? Thanks, fixed now. >=20 > Regards, > Navdeep >=20 > > - iflib_link_state_change(ctx, LINK_STATE_UP, IF_Gbps(10)); > > + iflib_link_state_change(ctx, LINK_STATE_UP, > > + ixgbe_link_speed_to_baudrate(adapter->link_speed)); > > > if (sc->feat_en & IXGBE_FEATURE_SRIOV) > > ixgbe_ping_all_vfs(sc) --hkD8xVjIhsAJGigs Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmSthy0ACgkQelmbhSCD nJ1urhAAhwugy4vzFkyM/nQXK+gvRx+Ai07nWg2yX7cl82jCJsaHAAAN69KXK8m5 dGRCJmUliWwNz7SnEswvABYkfQEtHvkgo2gDEznVmLfo1DrfeWTO8D2gwBeL++Ao HPrYAgVrU2U7jGZVK4Tq7AWDiVdKqF7a73E6dYbN6mgdUthQmlJV3mnk9uyC8a09 xNxD/lrp1d8gIAjxPfsD0t0xPB5ZTwYWC05uMLBRuLoEzm0Kx6GFHVwzYtaLK2m1 CVDTv+Bt9NNOkjFtbAFSyoPGCEplIEQJ9VdVtge9D2Ly/Gapg2/sJIh6081km8rJ XFAlcVBl3ro6AyryCT2bpzkfCgzne3wJ/f+3uCFePBfLBINg8DydyNYBuNN3CoSb Ru8CTy8048kBB2tKNhv+TgWAP7r4VNxAzp+L9cPcCNXLcbxrlZ9v58O4esfTGn8x BJ9BfO9Avz2mU3aR3gdRVhv/I/Wui9VIn7tHlOH7R/0P1hjpgCKpD8sZpBBEieGW 4X54K1E/hMPFyq+X5srsByy1siSJ2KDjIvHZEIPK8jAz0D/zEdeDPpY+asGQIkEC iBIZDwh5p0ROax6mQyf2AGsJF822Nlg8ueqOxgsAhZxJ91GiXrGMGhURTMHKAWbW j0QHvtcQGiooMO/hXUV9i3cxAzutL2kS04ARwUijvZKxvEuVcUA= =SJJE -----END PGP SIGNATURE----- --hkD8xVjIhsAJGigs-- From nobody Tue Jul 11 17:03:22 2023 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 4R0nJs3ty6z4lRXR; Tue, 11 Jul 2023 17:03:57 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0nJs1tqbz3t0X; Tue, 11 Jul 2023 17:03:57 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [85.220.129.53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp5.goneo.de (Postfix) with ESMTPS id 83BA110A1E8F; Tue, 11 Jul 2023 19:03:52 +0200 (CEST) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id A7153105C659; Tue, 11 Jul 2023 19:03:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1689095030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=taqvkZn73JoMv/vl5533jedPV4OK86gDjZxNdkEnub4=; b=QjHCo8HbY2fCt/nrEF61pOS5SyRqS8/BmTyMw7HQeq5vHrmoMOIizH+mB9kfZpkx5odmo7 miN25AfHmxvbEvu/K73YQ3n4dYzPuI9cw2oX0M5StjEcHceFD6upD8yp9vLpXrfi2GNh51 VyGE8mNgTVyLB6cpmE+tN4eYDDXPG4MAqrBj7K8ulgGs62tpPNQq+dZOeFHe4DRO2YA8tm A0sM6BiXds3kAJowQqEHGHEwekvxrz7qJBlWuN5UcAy0/AZgZuxniaV/WrZ3HheTHyRwOR 6xRCztGpgkM7lbIrV+QWqbgDBme/sIa+F3/Nat9dGvHtlkaORtlEV0Uajv16hg== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-191-145-176.77.191.pool.telefonica.de [77.191.145.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 5F1DD105C5C4; Tue, 11 Jul 2023 19:03:50 +0200 (CEST) Date: Tue, 11 Jul 2023 19:03:22 +0200 From: FreeBSD User To: Piotr Kubaj Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 6ad2a9a64f34 - main - ix: remove stale comment Message-ID: <20230711190349.632481df@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202307111645.36BGj5K9072743@gitrepo.freebsd.org> References: <202307111645.36BGj5K9072743@gitrepo.freebsd.org> Organization: walstatt-de.de 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: be60e6 X-Rspamd-UID: 8e4965 X-Rspamd-Queue-Id: 4R0nJs1tqbz3t0X X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Am Tue, 11 Jul 2023 16:45:05 GMT Piotr Kubaj schrieb: > The branch main has been updated by pkubaj: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd > > commit 6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd > Author: Piotr Kubaj > AuthorDate: 2023-07-11 16:45:04 +0000 > Commit: Piotr Kubaj > CommitDate: 2023-07-11 16:45:04 +0000 > > ix: remove stale comment > > Reported by: Navdeep Parhar > --- > sys/dev/ixgbe/if_ix.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c > index 09c0a82279ed..45ab7c27233a 100644 > --- a/sys/dev/ixgbe/if_ix.c > +++ b/sys/dev/ixgbe/if_ix.c > @@ -3678,7 +3678,6 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) > ixgbe_fc_enable(&sc->hw); > /* Update DMA coalescing config */ > ixgbe_config_dmac(sc); > - /* should actually be negotiated value */ > iflib_link_state_change(ctx, LINK_STATE_UP, > ixgbe_link_speed_to_baudrate(adapter->link_speed)); > > Buildkernel seems to fail due to: [...] /usr/src/sys/dev/ixgbe/if_ixv.c:940:37: error: use of undeclared identifier 'adapter' ixgbe_link_speed_to_baudrate(adapter->link_speed)); -- O. Hartmann From nobody Tue Jul 11 17:41:51 2023 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 4R0p8c1rrGz4mh4m; Tue, 11 Jul 2023 17:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0p8c1Qlyz44K9; Tue, 11 Jul 2023 17:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689097312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8sGb0A4jVtuua9uptfPBs0MybMikjuXz3VtJWBakFs=; b=bo9uXgMcPmsWxIWMwWyEE987ulP4HF9sCv9grXhknGjbrjWQb3U0oEHNFz/ObL1/4ZPZdL E4y/Y3+mqYs3gifcm+D3VFuJvfADd1/aPJS4Lagtfjg3mRo2/jnLA/lSIN4+HqWClf9ToH r52PaVGe68bvs5qVKdFDE00YoF12fh2Mc5yJKijToZDsChsl/IIGd0JuUXhOuos8BMv8tD C+QZOgZlzAHYhPhjsgrWFMtDnN6OqnBRLM/wxKCeejcI0Y18xBDRULb7wI9SNwB8cMLdcA 3JuDOpHCC524B8NiDRYIAaAlLZBfNc3lA91N3guK8mkn1lQEzHPQ6PScbshz8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689097312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w8sGb0A4jVtuua9uptfPBs0MybMikjuXz3VtJWBakFs=; b=v33mxZHpCqxzl4aAEJskmAi7IApnuUlAkMwbWeO3IeG/VDLIqnD+YfU+EKyBYZ5D7bz30E Eg7wRJL2IBgB3nu7ym9SH4H7g+WDIkiMJS3sVrBbq1aXEvSK810XsXPhZ+3hCXpxOe7N8W jvKrlSQgup0eGy4t1N1S+ogzjWn12gBPLKkPFYy1QV/33y/Kyj/0Kj2t2RbGWB1/Rxvc+T 1N50jJ4MUZgA/+8N4b3qQ56MfEVJ61z2337u01F/7T5546bhSTjYilfZmK0SGzxbODUslt UUilHWSj3gJ/mgJNfwqkvlHqU8cMbHwCe3NLPwKIyAsyMADaXsWqMA7k602YLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689097312; a=rsa-sha256; cv=none; b=r2EApcfhtUKm94bex1Z3x6v4fHIajVi6HVjPVIMd5FVNCkMTAhuKq2o5/pMTppNaAiv10Z zOQlGz1CAh+Iz5IZ1Z9Yb5d/Hh2Qp7nxkLYFdXQC6GSqWd5HrziFnNCM/zoV3Vn3CzFzR0 KNghB+WwUWNajPMdTHZAM2r8jB9e7id55Zuy+hBb/lFnVSwY5uqiC57ImQ2d29GxDXtbsV uiw5cz78zONi+6vG+40D5iwl3i5s6lPmEguHag8usry7N9YXdKU+Laka0drKcKxxtDruVH CtZu2rluhxLCKbIU+9eSARjQo4BA++gCsgKx5pASR7y/hmvsJOKVxULMuSOHmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0p8c0VYxzZZ1; Tue, 11 Jul 2023 17:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BHfp9M067768; Tue, 11 Jul 2023 17:41:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BHfpsW067767; Tue, 11 Jul 2023 17:41:51 GMT (envelope-from git) Date: Tue, 11 Jul 2023 17:41:51 GMT Message-Id: <202307111741.36BHfpsW067767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5ddb1aa30563 - main - ix, ixv: fix kernel build 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ddb1aa3056305c202e604dd456fe0dcf365edd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ddb1aa3056305c202e604dd456fe0dcf365edd7 commit 5ddb1aa3056305c202e604dd456fe0dcf365edd7 Author: Piotr Kubaj AuthorDate: 2023-07-11 17:41:26 +0000 Commit: Piotr Kubaj CommitDate: 2023-07-11 17:41:26 +0000 ix, ixv: fix kernel build struct adapter was renamed to struct sc. Reported by: FreeBSD User --- sys/dev/ixgbe/if_ix.c | 2 +- sys/dev/ixgbe/if_ixv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 45ab7c27233a..487a5625dd3a 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -3679,7 +3679,7 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) /* Update DMA coalescing config */ ixgbe_config_dmac(sc); iflib_link_state_change(ctx, LINK_STATE_UP, - ixgbe_link_speed_to_baudrate(adapter->link_speed)); + ixgbe_link_speed_to_baudrate(sc->link_speed)); if (sc->feat_en & IXGBE_FEATURE_SRIOV) ixgbe_ping_all_vfs(sc); diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 13f48a6fd3ec..cf5c8f92c450 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -937,7 +937,7 @@ ixv_if_update_admin_status(if_ctx_t ctx) "Full Duplex"); sc->link_active = true; iflib_link_state_change(ctx, LINK_STATE_UP, - ixgbe_link_speed_to_baudrate(adapter->link_speed)); + ixgbe_link_speed_to_baudrate(sc->link_speed)); } } else { /* Link down */ if (sc->link_active == true) { From nobody Tue Jul 11 17:42:35 2023 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 4R0p9Y2Xcnz4mhPR; Tue, 11 Jul 2023 17:42:41 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Received: from mail.anongoth.pl (mail.anongoth.pl [46.248.190.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X448 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "anongoth.pl", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0p9Y1f72z456t; Tue, 11 Jul 2023 17:42:41 +0000 (UTC) (envelope-from pkubaj@anongoth.pl) Authentication-Results: mx1.freebsd.org; none Received: from anongoth.pl (unknown [192.168.1.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: pkubaj@anongoth.pl) by mail.anongoth.pl (Postfix) with ESMTPSA id 76F5D155938; Tue, 11 Jul 2023 19:42:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=anongoth.pl; s=ANONGOTH; t=1689097356; bh=kH5mz/oiveVOmFY28wGa4gl5V99HGZvJd8yKd0+aBVQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=HUUg7VX7RHWo9PmIonw2R4vJwM9hxHQ6jt8TtWZ0SWN0NpKdK+sRtmYbkcVnyIt8j cmR8+nUpbY1az7RoD78SjjltUgaNAsi+OFJ3k3iiTBqe1jiePUQWcVBxGvykbcB73z QI3BqhAZp1RKyAtVNLGTAHMvgSRSVrYDc8nXSM4coUMBReyn2yGVnYpHP7HMOF8rB0 J1CaQNbM3Oaq4PalIhJ6rGquUk4Pn1+rTfGl1jZmz6ItlUBSuWlfo6VxpNbinbcJ8G zhLCdHcY9i02ll4aa7VwdIGhEw8pCEBZ5g7NlbuBkjgw2P2VCze1HyU8jqDRWarQu0 Ggr93T2UsA8Cg== Date: Tue, 11 Jul 2023 19:42:35 +0200 From: Piotr Kubaj To: FreeBSD User Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 6ad2a9a64f34 - main - ix: remove stale comment Message-ID: References: <202307111645.36BGj5K9072743@gitrepo.freebsd.org> <20230711190349.632481df@thor.intern.walstatt.dynvpn.de> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="8U6Qche72nN3OQ5P" Content-Disposition: inline In-Reply-To: <20230711190349.632481df@thor.intern.walstatt.dynvpn.de> X-Rspamd-Queue-Id: 4R0p9Y1f72z456t X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:47544, ipnet:46.248.160.0/19, country:PL] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --8U6Qche72nN3OQ5P Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 23-07-11 19:03:22, FreeBSD User wrote: > Am Tue, 11 Jul 2023 16:45:05 GMT > Piotr Kubaj schrieb: >=20 > > The branch main has been updated by pkubaj: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D6ad2a9a64f34ea3b376c3064= fcba30b3c8e654dd > >=20 > > commit 6ad2a9a64f34ea3b376c3064fcba30b3c8e654dd > > Author: Piotr Kubaj > > AuthorDate: 2023-07-11 16:45:04 +0000 > > Commit: Piotr Kubaj > > CommitDate: 2023-07-11 16:45:04 +0000 > >=20 > > ix: remove stale comment > > =20 > > Reported by: Navdeep Parhar > > --- > > sys/dev/ixgbe/if_ix.c | 1 - > > 1 file changed, 1 deletion(-) > >=20 > > diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c > > index 09c0a82279ed..45ab7c27233a 100644 > > --- a/sys/dev/ixgbe/if_ix.c > > +++ b/sys/dev/ixgbe/if_ix.c > > @@ -3678,7 +3678,6 @@ ixgbe_if_update_admin_status(if_ctx_t ctx) > > ixgbe_fc_enable(&sc->hw); > > /* Update DMA coalescing config */ > > ixgbe_config_dmac(sc); > > - /* should actually be negotiated value */ > > iflib_link_state_change(ctx, LINK_STATE_UP, > > ixgbe_link_speed_to_baudrate(adapter->link_speed)); > > =20 > >=20 >=20 > Buildkernel seems to fail due to: >=20 > [...] > /usr/src/sys/dev/ixgbe/if_ixv.c:940:37: error: use of undeclared identifi= er 'adapter' > ixgbe_link_speed_to_baudrate(adapter->link_sp= eed)); Thanks, fixed now. >=20 >=20 >=20 > --=20 > O. Hartmann --8U6Qche72nN3OQ5P Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmStlIsACgkQelmbhSCD nJ1h0RAAndMinkH7xsu6X6320BY1h8aF0kyo8eCnlh3j+3UGF63ZYVv4fkRx3PVE llUDc9rfo2qQzEylAP1HtH//InsW7a6jm7BpzH8JScDMve+65QFHKER0aimSbFWp vEi1qJuoqCB5s77ceJa6a7vgVEU29M2sIOcI5/7Mb2ddz8hGr0neJ4UHI+BOYzYl ZrqDRu6AyRorG4fFVGHU3nfEgQwSPlyOhL/ovPkpjFPXGx+cMbd+bwedIL5K77+q lgVJOvYnKASr05KkcKTdLGXOBiZ+Uo74IYr+MrhSnC1D+PBiTmHcdqSRgpVfqRHK +0QMnATIqNBnT0qT6X9WyZ5gLknxOwj5FIe6bY94yE20xa4p2zSYu7qh6YK7jF8w 0J+wmE/fxBAhjkqey/JgHB20tIKtXv49HenEAs8iiuKtXeiJ+P7zhhZYcO9M/e7y dggrmndRF2/BgXrUjXgdOIwrUBTPY9YjMtZcNzjpNMmc4S8xhV+JpWnnsafeVW0X x/+HhWxAXN7dkVzWquqljxJ3HMPTGHTpmxYr/xImJ4sZO/Zw8bWXWyj1IcAQG7wt OFy0MkO0fDz0h8oNeR5YMwWDSAq8bLrpbmJlbgCOM1No26R70Fd5BVVuBdUvkdr0 2gOz+P1SAF0xC/kCx9uvEpwt0YaCc1+mTtfnHVPc0kO5Bi/CG8o= =Z6F6 -----END PGP SIGNATURE----- --8U6Qche72nN3OQ5P-- From nobody Tue Jul 11 17:53:23 2023 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 4R0pPv3mZ9z4mmKB; Tue, 11 Jul 2023 17:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0pPv39zwz47vQ; Tue, 11 Jul 2023 17:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689098003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPK3e6qNsU18+qYvgkmvIkDEr1vFM8GZ9Gsy0/GPpdk=; b=GjrppSDHQ1P/0x3Yk5yM7TO8xSe5nwKkKDWr3kvZ3vI9dM/bIJesnurBTZPPb3ZJgDhcVt 7CflwmQd4Lapap5UnXigeoQPPcqhclGcxzU+SofYToMoHZBCyMdl3TCmi9sc97kpvzxnQa THPpkYq4k+JeLz2wRxN5m54He/2QYVoYolHnk/wBWHMhPvSboogcdGvXlPuwLJmpTav7ZM ZTrL+0CBqLAIcAW+/DuWO96MQw5m/KGVv5TjU1U/GUqjpuin2iBkuWXTht4TtELhuJnqaE QrEX5uxxYUPqqfwUY0Kaza28H4Ad+8BnHPzOMIoWXvmYK4Tth37FMK/fbCq5eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689098003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dPK3e6qNsU18+qYvgkmvIkDEr1vFM8GZ9Gsy0/GPpdk=; b=x7fpPYY0fwZNOIfchFCzSzJzDZSamaXMqVURHQTcgm2pPdDWzUoXiVX5SkW1RPT/+fYkj1 jJYSlescrmB7vbyufgjwmDu7/au3Tk345a0ZN0OX1m7D5v9+XozIEVmSVOIzzrw3+j2ojL bFswszED37ZUIjni73v0dKW9fRYnD+Fu4SYctcmI/ANzWp0ayj/Fc6RugWUuIHz4MiEPBB pL8Ee6cgYS4JKKgc1lmVtKpCAEvnqJrrNANktJUgJ+q2OsklM0x4mlOLgy5L4XVgQDuSk0 lSlmxJTZ0iYBEm/7BExe3Pp1M7HLMr+LL4JEAjREL1BFeRqiaV7WV5TjO294rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689098003; a=rsa-sha256; cv=none; b=eOES71ODwAnT46sDuG49I+CGPh3PkBoti42QQ3UfW3iH20iM+bdEainUHg3ao7iKoKSNqI dY5pirKqUGJ7++4F6wuIHPqAIoFIilAUo3ktGs8CYVuleWJy6AmfMYR6e6QrUF5Rv8YHk7 6kC3wBDGmr1hsd2feMQuUrg8MLoXFc0SKtm0GUv0nWD0n3Qim1I3pYvNWa9+Ny5JIoru9H dMoCXStQfS7MXR6fhYG+6pg3afz5HNMsemCmjKueOEU58b33C1fHjsjMESxm4YiUlYBzbz CLIQ+DtE8VQb5IJli6oEAXLS6w/fg8s2sLq7XYNkpewRSDrLlTTivtLRf0rreA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0pPv2DrxzZZx; Tue, 11 Jul 2023 17:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BHrN9F087474; Tue, 11 Jul 2023 17:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BHrNNU087473; Tue, 11 Jul 2023 17:53:23 GMT (envelope-from git) Date: Tue, 11 Jul 2023 17:53:23 GMT Message-Id: <202307111753.36BHrNNU087473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f8cabe555032 - main - libutil: Delete trailing whitespace 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8cabe555032569d8ef71d731cd17f40abbd70cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f8cabe555032569d8ef71d731cd17f40abbd70cc commit f8cabe555032569d8ef71d731cd17f40abbd70cc Author: Jessica Clarke AuthorDate: 2023-07-11 17:45:23 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 17:45:23 +0000 libutil: Delete trailing whitespace --- lib/libutil/getlocalbase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/getlocalbase.c b/lib/libutil/getlocalbase.c index 8ecd8447155c..a737d8c5c253 100644 --- a/lib/libutil/getlocalbase.c +++ b/lib/libutil/getlocalbase.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); const char * getlocalbase(void) { -#if LOCALBASE_CTL_LEN > 0 +#if LOCALBASE_CTL_LEN > 0 int localbase_oid[2] = {CTL_USER, USER_LOCALBASE}; static char localpath[LOCALBASE_CTL_LEN]; size_t localpathlen = LOCALBASE_CTL_LEN; From nobody Tue Jul 11 17:53:24 2023 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 4R0pPx0JYcz4mm9h; Tue, 11 Jul 2023 17:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0pPw431fz483r; Tue, 11 Jul 2023 17:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689098004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDWrnadJ9q4dNHbEOt6ZpV6fmIveRVnpV6CDrcifm6I=; b=BEMk/9QS0YAl+l0TRiNQHwxO1cUFu2mUJHbewmn6wjuX//Ii2wOcMIff5mjaLYhpPmisgQ +IzcTUgOwF+MSRw5SaYITyFxneu+tOAzKGAShhOWzEEgfEgi8CcSkhFBbKxKxldfpR8J+R y1Idx/AGQHacNGamQCPqxuRjQuDJXfJzutrd17VhI8l/TfoOXkcIsRp6+b79OWNqWdwj/t IWiwiFMrrMpo0Wm8IxL1hGEZn3jkrS1qwpXGFAI1U76rrbRVfzvt8b4f9GX1FDqzerQPt0 4Ly+55ld4zneaGyOrQvfjQFsi1/4YzH8p8c00S7IFioipd78TLLzIL1MbnCtcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689098004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sDWrnadJ9q4dNHbEOt6ZpV6fmIveRVnpV6CDrcifm6I=; b=btlGzt8bf6kcaif9Sd6IF5jYPo3/6oUy3N2YJA0/PxlRXTBEWThPbCiwZBq5DxxEXRY3pz xqfNgVM0Ysw3FzuPwlTO8KGwJcSniKnggWlUMEyH6X+h7g07nCjemxKilpbwQ9b3qC9RDI 3WTlAsiLw4UrFrdIz5MZ+uNvRwvx/tzIgm3Zw/62zSIbDC/4DHpfdDn3QoGM1A/D9MpuUr 4wLzq+BhMsGSLVoiXRpljV/oeZrmdFt3UOCZXQryvPuaXsdZc4RkBqODlvWO+4jiuo9Eg8 X7byYbRUakVP9VQ63VFMAd2XxvKRSRLVtZItqTo+45xfo7D12VckxImZEivISw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689098004; a=rsa-sha256; cv=none; b=Cd7jw6Z+oO+9zMvEJyhEzV2fqfK91z0Y5nRPDP4iUxg6ZhYkbRsmykUroJvhDbFCnEMsul nkW2WzzVpZ9OflqTDWNQ6covZyfWQvMC7tEWtiZ8/qRLoI8Bm8eZdIO+gumnuHDneZ/eNW d3bMQGEKj5AzTPAy+GXlWs7BaUGIfNzHiMBC3RCa2xFJEZdHD70UOzMoIjZyvvQKh1E3lZ CAuE/AIJSReX3/+xE/aaot7ZajBi5CoCnvsOLyDfK9hwk23HwJZkRjCnj2yd8HrQZZ07J6 AOSRRQhBvuylfkZZmAth1+5cxAqHeHDk9Cie26pQytepA+6AH7YVpZZaV/yTmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0pPw386YzZZy; Tue, 11 Jul 2023 17:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BHrOdt087500; Tue, 11 Jul 2023 17:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BHrO8U087499; Tue, 11 Jul 2023 17:53:24 GMT (envelope-from git) Date: Tue, 11 Jul 2023 17:53:24 GMT Message-Id: <202307111753.36BHrO8U087499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: bfc47586acee - main - getlocalbase.3: Fix AUTHORS formatting 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfc47586acee94ade461f2210c700abca93647af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=bfc47586acee94ade461f2210c700abca93647af commit bfc47586acee94ade461f2210c700abca93647af Author: Jessica Clarke AuthorDate: 2023-07-11 17:50:32 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 17:50:32 +0000 getlocalbase.3: Fix AUTHORS formatting MFC after: 1 week --- lib/libutil/getlocalbase.3 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libutil/getlocalbase.3 b/lib/libutil/getlocalbase.3 index 504b39b0235b..e7be3f1809ef 100644 --- a/lib/libutil/getlocalbase.3 +++ b/lib/libutil/getlocalbase.3 @@ -115,6 +115,9 @@ The library function first appeared in .Fx 13.0 . .Sh AUTHORS +.An -nosplit This manual page was written by -.An Scott Long Aq Mt scottl@FreeBSD.org and Stefan Eßer Aq Mt se@FreeBSD.org . +.An Scott Long Aq Mt scottl@FreeBSD.org +and +.An Stefan Eßer Aq Mt se@FreeBSD.org . From nobody Tue Jul 11 19:35:01 2023 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 4R0rgB1bfFz4dbXV; Tue, 11 Jul 2023 19:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0rgB1Bztz3LFK; Tue, 11 Jul 2023 19:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689104102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yeZiEVH5JdqKJQc2f6gaERjPWmKlWf8DAsS3pZxc6Nk=; b=WoqBm4N88VAkcJRo3GBLAImvHcox8MIo9apgjcqVBFpV+TsKmpYUwvoijHVlQdQTJfG3D0 NAbAC1GgTx/6kSbUKVKIIp3iIY5+MkLBZDbC6CnlMkoN7zf5uuOmrSaLxoesikO3Z3cZpI 2hxd9kQvKfCxvc/Rt9P1Zk5lwBzvugClAJFkBOMlPLSKQyKOzS4Fgs4D8VX/6VBtRhAwiS UBgUmUiuNRFrrgw9QqyEgLflUevXhkVGhJZHcU2OACSFcnJsIRrBff5QErmVgasPa1k+Eu 1gdw+tHOsRzciRTvkvOyrRMMLZeINEPJMB3cXASYcmvWt9w8qrhlioy3tv44zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689104102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yeZiEVH5JdqKJQc2f6gaERjPWmKlWf8DAsS3pZxc6Nk=; b=AsFWb34DKLKvznMhofx/XMnlkm34uhFqRztNaVmkddDTe2aWCcwiIWYNGWP4tkjSUxnWJK bgZPoLp1AhyeWq381WcPBMaf7CyQB+7YePobQR2WFkHNh5GJUSAQh4x6ACXe6tofEn2fGs NgvMXiLpAGi1KdrncApFfxdFpUCe0ds7T7T0bNPjLPUmhLV2xIBlswn/fdrmCtHTCu39WZ 5QE66yCA0VfCfwlyGAfuKgUr4ToYfDTZc1oUwCr5gWz+VEz6hQWlvo/q0cpNzO89TATfez iakYy+dRyt+RI/m0HYzCT6MclHm+cAYwCUoKa8nLEYdjjG4wuXhN0Mf02885+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689104102; a=rsa-sha256; cv=none; b=AXBgWw7+UA1lyrEf+8pm+G9zgvqKhh/6zsOj0XFR+RMNMvgH3+CER5vrlf+kXzZEII8A3T cWWxXrMTkXnnX5IRZJdPtt/oSJX8NjYdIGyLxRotFVItq8DzXYw6nl6hWFhHA8t1sauyCg 7fCzQT5tQ3M0tLeAewbHuySS39cSm98KUnExwmt/CzAH9l/cQFoC1LricTJTNs00R+GtTV xqBhCHRR5FwTehQr/thpqq8hWpK7fDqnEaJmvdnoxp3RwXPNOGDaR29crbpTJY3X3K61rW gYWHPctN+1FgftRN6pH0jyNNPdBMQ8vqxK92oYCaI3mpeq6eghCYB46xMMwZAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0rgB0DNBzdyw; Tue, 11 Jul 2023 19:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BJZ1MP054479; Tue, 11 Jul 2023 19:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BJZ11X054478; Tue, 11 Jul 2023 19:35:01 GMT (envelope-from git) Date: Tue, 11 Jul 2023 19:35:01 GMT Message-Id: <202307111935.36BJZ11X054478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0dea4f064dfc - main - bhyve: Deduplicate some code in modify_bar_registration() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dea4f064dfcd0725d02b9b2d02b2494ca866857 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0dea4f064dfcd0725d02b9b2d02b2494ca866857 commit 0dea4f064dfcd0725d02b9b2d02b2494ca866857 Author: Mark Johnston AuthorDate: 2023-07-11 19:22:37 +0000 Commit: Mark Johnston CommitDate: 2023-07-11 19:22:37 +0000 bhyve: Deduplicate some code in modify_bar_registration() No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40877 --- usr.sbin/bhyve/pci_emul.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index f921abc356ec..cf6e1810aaad 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -615,9 +615,6 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration) error = register_inout(&iop); } else error = unregister_inout(&iop); - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; case PCIBAR_MEM32: case PCIBAR_MEM64: @@ -633,21 +630,18 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration) error = register_mem(&mr); } else error = unregister_mem(&mr); - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; case PCIBAR_ROM: error = 0; - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; default: error = EINVAL; break; } assert(error == 0); + + if (pe->pe_baraddr != NULL) + (*pe->pe_baraddr)(pi, idx, registration, pi->pi_bar[idx].addr); } static void From nobody Tue Jul 11 20:49:48 2023 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 4R0tKT1f4Sz4dPyf; Tue, 11 Jul 2023 20:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0tKS6Rdgz3tMF; Tue, 11 Jul 2023 20:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689108588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WqS7Hg3UcJ7N+u9EgVJk9ppIN3Nj2Wb6MrYbAH2OKZM=; b=RYGzF7QUhCebTIEBd5ZVuThyKOcXjkFpGhNDhfSBCgYbbtfnah6EAdoa9/uoH32mG1RWek HQ4YOgA2/KoC646RiMR7jJgsY5L5Rb32S5R4D7VTGHftRswtw5A63PmdO1vyNd+rXBlQXr qa/ULfpFYmjHGYeylJCK0D7RAd4fb0/bg9/Z8DLbPn1o6eWEV76xoYae+5uvzGNeJ+glFU ePH+nqRWcVDK8whToBmBdePJg2+/XfaMKCSVqvyu7eFwrlEtr0YkVW81j//3dySlDeWjzp +dWyjHbLtZbZmMpaRHbltuml3gKAKOTsR/+jrCq6Zyb+1fAu7P1f6UcWy/9jhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689108588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WqS7Hg3UcJ7N+u9EgVJk9ppIN3Nj2Wb6MrYbAH2OKZM=; b=pz4xVrTSWXFVTBQnuj4jeHujYIIrpiwRH9SgPNBNmPm3gvV4KKYboAW78+CDYhs6LmdBbz l0L5+YPyFXnQzLCndoYG1EBWQPi4xkLj15+WwDjH3s464V4uSyzulAONwA7B3JslukK5Nv EABUIAJ2L85ngsdDKl8WQtwFE2OQNGcRBvNPNrd+8SYCZApt+ZRtKARIqFYMtzZeXmaAU3 7iHchJtclQFkDrl0nS04cWp0+8CFyehVHe6ka54aJAPZncZg3ryWL6kDgyZdCVWjoR69+S Mq448yAWKQjNM7LZSEcu09CuN6siU/vevozmWhFv+ec3q/HfAgYnGOIhhvltkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689108588; a=rsa-sha256; cv=none; b=scMPCYT5Lilc3lkpHZ8DUDZHx1Rk6LvbTUh1ttR1Wd6FBC3G6fFtCCTbXVnlCbI2rkLgtF od0Ey3vePn5e6jGZqw8df6JBbR3VpJXGQXg1MidfcqvmdgL+k/8T1FhgR+P4e/SjRPJ+DB 7vSLE6DSbBqvQA/qqvkQa7MZLBpskDlRXVzXDdgavF/IBOSqB1pQSVF2FgRjOBUQCdTDKm 4FXAbDpxrateZ02ebUZtnai0XLosNVBmvRbwJaqvhQQqTxOpbeS5qChCWlNGhaJtJMrLtw nJBnUr1efWe/ovsoXRpUFLmwgGH4AWz/19sdusgDaBKg3/Id+/YJ2BIAey448g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0tKS5WYRzglH; Tue, 11 Jul 2023 20:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BKnm0W071296; Tue, 11 Jul 2023 20:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BKnmQD071295; Tue, 11 Jul 2023 20:49:48 GMT (envelope-from git) Date: Tue, 11 Jul 2023 20:49:48 GMT Message-Id: <202307112049.36BKnmQD071295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d1e44bc94494 - main - kmod.mk: Use portable printf '%s' over non-portable echo -n 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1e44bc94494448de196948d698b637b6e1df4bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d1e44bc94494448de196948d698b637b6e1df4bf commit d1e44bc94494448de196948d698b637b6e1df4bf Author: Jessica Clarke AuthorDate: 2023-07-11 20:30:06 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 20:30:06 +0000 kmod.mk: Use portable printf '%s' over non-portable echo -n Whilst /bin/echo on macOS and Linux implement -n, as do the builtin echos in bash and zsh, the builtin echo in dash does not, causing the first line of the output to be -n foo rather than just foo, and there to be an extra newline in the output and thus blank line, both of which result in "Symbol ... is not present in *.kld" warnings appearing in the build output (once for -n foo and once for the empty string for each module where EXPORT_SYMS is a list of symbols). MFC after: 1 week --- sys/conf/kmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index a3ff24f0571a..246af5ba1e81 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -266,7 +266,7 @@ ${FULLPROG}: ${OBJS} ${BLOB_OBJS} .if ${EXPORT_SYMS} == NO :> export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) - echo -n "${EXPORT_SYMS:@s@$s${.newline}@}" > export_syms + printf '%s' "${EXPORT_SYMS:@s@$s${.newline}@}" > export_syms .else grep -v '^#' < ${EXPORT_SYMS} > export_syms .endif From nobody Tue Jul 11 20:49:49 2023 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 4R0tKV0zw2z4dQ7k; Tue, 11 Jul 2023 20:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R0tKV0XMrz3tPw; Tue, 11 Jul 2023 20:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689108590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2dQBfFAwOahxekbTgxy+ovbz8U4/Hl5MSoinv51Zqk=; b=xyXuZ/8W1a8LQPfvNAEj9HgxUuPIyHsWs9hPePv6rBWuu7WfRWF/YVr9wmit4u9Spzs/9a u7qA06yRyTVNIYtZ/g8ePBjrjFS8OAl9cQbXBevIojQZpn3I5E4IbLMzpaWKz8EJ43iKzH 8roqXYMGiADjtTQDkdj2HJKjDlKMxMiOWgjNrlf2lgNtp6+ECBBni5Qjcb2ZeJZPLEAqpD UI+uBrZNU9FcBJml+YYPQmqvGiI12ABcnsHoH0E7pXfWYmkD4FZbH5jUuha9cL+vdVxemy xdIsvw9OaMIWxKA+PwJUhaIYBxhWai/HEWD6T+j7aJ3KIsET7vOt9jdhku+Vog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689108590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2dQBfFAwOahxekbTgxy+ovbz8U4/Hl5MSoinv51Zqk=; b=rb1+5/atHPKX9h78Gz8YFRwJOlhF17aWxdaWEBkrNIDhsrEWrsdbd2ocPePwLNrnIWp+U2 EgFyx0oNcWmuiEAaYV20Yh6GMWyjMOn+eqiP2+fJIgqLzXEh74v3Ao+PtcrVIiHNQmGqYQ 7df2CItuv4DTwJvg3gJNzZ4U7AFyYXWVE3HD8HIe6ftG3TDKARotkACswoxIkgBl8V2/sm R9lWzzXl4ru7NxOARFhmYHLq9PVo7BBkNNPh/DHwNCa/CdBAR3/F4epUkJGANoP/HpPAsA FvXzu+3LNLRIC/FEaxST8NKb+ZmOs2tHSCVcotzPUhemdGfKMBwqbbX7YcO3lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689108590; a=rsa-sha256; cv=none; b=M1QeOTrl82oBg5opPUIDMN3NQJQpUFiujFD1HinqRtkHGRfHqFbv/uv7FXTbXSf3VdjBXC BsnL7WShkThknGNH+CPxpaG4zUJUylnAhunmAFae9uSf085tKmDCh9JTLGA+d4vnB8ENS6 yKLjd3Nba/HcCORKfcBGzkdzbzMfapQGJnwxHa81fw/T/eCxCxsADt8sHMYo0VmCNXimbj /oCA7bQWF8Nu2x0xJOFG0Ns4Xm7GOxUj/6KF1XD76lrdpiLmMhZLkRJPCnSBhrFWcJOgOv uuRmi7ks99ModMRXzRmVo3A4thCeB4rFHcnIClBclADY1WYJrGLlCmgxfCdb+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R0tKT6PG8zh4N; Tue, 11 Jul 2023 20:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BKnnZI071315; Tue, 11 Jul 2023 20:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BKnn3s071314; Tue, 11 Jul 2023 20:49:49 GMT (envelope-from git) Date: Tue, 11 Jul 2023 20:49:49 GMT Message-Id: <202307112049.36BKnn3s071314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3a46fe226193 - main - getlocalbase: Make default path actually configurable 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a46fe226193dde1270ebb08d2066a77ae12d7e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3a46fe226193dde1270ebb08d2066a77ae12d7e9 commit 3a46fe226193dde1270ebb08d2066a77ae12d7e9 Author: Jessica Clarke AuthorDate: 2023-07-11 20:49:22 +0000 Commit: Jessica Clarke CommitDate: 2023-07-11 20:49:22 +0000 getlocalbase: Make default path actually configurable We include paths.h in getlocalbase.c, which defines _PATH_LOCALBASE. This will override a definition on the command line, meaning it is impossible to override like how the manpage says you can, and it means the code to provide a fallback default is dead as the macro is always defined. Instead, introduce a new LOCALBASE_PATH macro like LOCALBASE_CTL_LEN that can be set on the command line and will default to the system's existing _PATH_LOCALBASE to avoid duplicating the default here. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D40975 --- lib/libutil/getlocalbase.3 | 8 ++++---- lib/libutil/getlocalbase.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libutil/getlocalbase.3 b/lib/libutil/getlocalbase.3 index e7be3f1809ef..06216b8b48a2 100644 --- a/lib/libutil/getlocalbase.3 +++ b/lib/libutil/getlocalbase.3 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 25, 2020 +.Dd July 11, 2023 .Dt GETLOCALBASE 3 .Os .Sh NAME @@ -53,10 +53,10 @@ If that does not exist then the .Va user.localbase sysctl is checked. If that also does not exist then the value of the -.Dv _PATH_LOCALBASE +.Dv LOCALBASE_PATH compile-time variable is used. -If that is undefined then the default of -.Pa /usr/local +If that is undefined then the system default, +.Pa _PATH_LOCALBASE is used. .Pp The contents of the string returned by the diff --git a/lib/libutil/getlocalbase.c b/lib/libutil/getlocalbase.c index a737d8c5c253..c19cb95212dd 100644 --- a/lib/libutil/getlocalbase.c +++ b/lib/libutil/getlocalbase.c @@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$"); #include #include -#ifndef _PATH_LOCALBASE -#define _PATH_LOCALBASE "/usr/local" +#ifndef LOCALBASE_PATH +#define LOCALBASE_PATH _PATH_LOCALBASE #endif #ifndef LOCALBASE_CTL_LEN @@ -73,17 +73,17 @@ getlocalbase(void) #if LOCALBASE_CTL_LEN > 0 if (sysctl(localbase_oid, 2, localpath, &localpathlen, NULL, 0) != 0) { if (errno != ENOMEM) - localbase = _PATH_LOCALBASE; + localbase = LOCALBASE_PATH; else localbase = ILLEGAL_PREFIX; } else { if (localpath[0] != '\0') localbase = localpath; else - localbase = _PATH_LOCALBASE; + localbase = LOCALBASE_PATH; } #else - localbase = _PATH_LOCALBASE; + localbase = LOCALBASE_PATH; #endif return (localbase); From nobody Wed Jul 12 13:26:29 2023 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 4R1JRV1zCdz2tnBs; Wed, 12 Jul 2023 13:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1JRV1Yjzz3CwY; Wed, 12 Jul 2023 13:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1saFzAc1TrD+bchIkrUdo7jqc1nmNL4JFi5YT5tkKa8=; b=eyVX2/eYZjuD+M+9E5pxly9tEUvV6eMYy9w+DJrsPsChJcJyW9+xE3t0JcYaG3gGK0ROFu HztuW9KD4tXZ8Mff2L0gfri0JNQhGTdsHz1xO5NlOBKiWtcMWJCalwE8v+x62vpBU0UX6m Zfs0QE9G8PDtERowEH72T4MHPL9pQbyyAAhq5XD1CPKdZHK1ia8d7W1pCd95LB9jcjW3Ce RQXKK1HHfguT7VYUGV4faVrlIGrsgx5TgTZ2y2/8e783q3nYXUcb8mb75ot9mzeylM5X1s TQY+nmAN+PPCMiSTveDs3/YOP+zEzEq0HkKCv/F2ldI01jV4Oxn8jpNjxqHWyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1saFzAc1TrD+bchIkrUdo7jqc1nmNL4JFi5YT5tkKa8=; b=ClcB8QZRxluqS6qPzlGjBTRaoqLl5Z75KKtNEPxECzCCXsvSx/BgX3FtnVgMCttzUk+E8u wdFIYbd2DA0BoYhMQO4pTJ0MRmNlLJ5ruM0e5LODpT5EzO4cEGoOZbFktsD6sgtlWRsSKW /srRLLLT9oaz6GFC84+xNx2zJUOpdoWDo0ZgXX4wydEn9j8ae0HVxIhhE8S4vJj9Timw/E Ci10aLTqNyOVUt0GCoJZAEYOnwVKj7NDnx3gxqQXSSutBMgrxH2SjY2wU9RA3rCzkCjmvQ UrVs/hxFuy/d8zH7zjRXRvkeyueUWWHIMi+jPFcVdqodXrg9Ui5vFQzQTGrv/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689168390; a=rsa-sha256; cv=none; b=RXBrqrDZi9XcwKnvelh2euYB+xvMR7YZvbwaXPe+rxRQbqLfFNgIJyZ9r/hp2h+RpYX98j QTKFRJFSs1tLf5flHIu9xGzfaTuzI048sEgsQubSXCpmHURxXC69kP+Exv22zPbLpPwGcB AlZ0FSCknDpHFEtf3C4AU1Mn3cdy78brdHuDjFohL1kXZj7D+V/QNWtUkGb6oOX5XIUIeS ysWS7J83V7nbLKYt7JuAUzJCnHH+8Q7ZKIPMS/QiRWCOcKeYzhcmgESW6M68wZoCC0VB1u bw4vH8/ulVXc+qbzyo3dFTFbp/dtXT5OUOaomXKaX4iwPxXJb/jvetYnzurvJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1JRV0YmQz19QR; Wed, 12 Jul 2023 13:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CDQTLZ027843; Wed, 12 Jul 2023 13:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CDQTfT027842; Wed, 12 Jul 2023 13:26:29 GMT (envelope-from git) Date: Wed, 12 Jul 2023 13:26:29 GMT Message-Id: <202307121326.36CDQTfT027842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 64b30b7aeb6d - main - pf: fix pfi_kif definition in the man page 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b30b7aeb6d0dc48d038b3df033328c8d8c3141 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=64b30b7aeb6d0dc48d038b3df033328c8d8c3141 commit 64b30b7aeb6d0dc48d038b3df033328c8d8c3141 Author: Kristof Provost AuthorDate: 2023-07-12 09:43:43 +0000 Commit: Kristof Provost CommitDate: 2023-07-12 09:43:43 +0000 pf: fix pfi_kif definition in the man page PR: 272455 Submitted by: alex@inferiorhumanorgans.com MFC after: 1 week --- share/man/man4/pf.4 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 133e4d300043..8f25b7c7aebd 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 7, 2021 +.Dd July 12, 2023 .Dt PF 4 .Os .Sh NAME @@ -1094,20 +1094,18 @@ The data is returned in the structure described below: .Bd -literal struct pfi_kif { - RB_ENTRY(pfi_kif) pfik_tree; char pfik_name[IFNAMSIZ]; + union { + RB_ENTRY(pfi_kif) pfik_tree; + LIST_ENTRY(pfi_kif) pfik_list; + }; u_int64_t pfik_packets[2][2][2]; u_int64_t pfik_bytes[2][2][2]; u_int32_t pfik_tzero; - int pfik_flags; - struct pf_state_tree_lan_ext pfik_lan_ext; - struct pf_state_tree_ext_gwy pfik_ext_gwy; - TAILQ_ENTRY(pfi_kif) pfik_w_states; - void *pfik_ah_cookie; + u_int pfik_flags; struct ifnet *pfik_ifp; struct ifg_group *pfik_group; - int pfik_states; - int pfik_rules; + u_int pfik_rulerefs; TAILQ_HEAD(, pfi_dynaddr) pfik_dynaddrs; }; .Ed From nobody Wed Jul 12 13:26:31 2023 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 4R1JRW4c91z2tn40; Wed, 12 Jul 2023 13:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1JRW2Zx7z3CmP; Wed, 12 Jul 2023 13:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wunE5/S4LYH6DUXvwSfEAaXd/Yluu8NmBfG28G8NBzE=; b=bimo90ZyTTbxt9dcHuuHyPUGAxjbZo+YhnBl7zq/mOAIuFO200cJR3uun3CzVLAto5Obh8 Y6pEzGHT8q70E0dQl7Myp/bXegLWbmtSLtOMxmTDsd1KFc3QDq+ISLNjWDD7Pc2OKnD4+I mnRpW0jOLNdYyT9mlI+DQRZOLMTIefBg+kwaghECl2SSsTaHY45yyokPnSWE9OXUO5wEem jNDsg0KAdkfMgt4DJ9P8H0h4wZJpI5leWsXRXZXwa8ztXExLq4RRROCfkU9R3r6KPS/QKV VVSCvE3sLz9HfxVOiwB+JlFYWVOiM+Xz6a2ekQkA9ISIHCZJFf5958jpDuy9zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689168391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wunE5/S4LYH6DUXvwSfEAaXd/Yluu8NmBfG28G8NBzE=; b=ZYKD4Bxgnt4A8vRmyQkRSa7OykXi6cd9KdXYnDKoM0dsZZVc42I53FhwHkOr4uHwa7mv7o cMkbWNzvpODin6s9klzIE0VU4gFEe2EXF3QK1MwfovTYMG7suZuU9YxQ5ZE7ZCx6NQEs0s HwMbG7I6DCQUZ8WvdaTR/nLJTM71Lpvmu8DVIg8PUSsNvcbofserZhEp+fzIep6oBnU7Ck 5WOF7fsTUI9dr3MDwbhuB+ZQYMmFom0cy7D0TVMmwYZpaPky5ZUR9qBRDrhonNjmxdDxWd rrgxjc2y8pFWNwyfwRy2neJzUjQXKsV40cPgCtHRrCIm7mKXNuZMLeyywcU1DA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689168391; a=rsa-sha256; cv=none; b=VIoXDopZIXXNHRQb1b0LMEt0dEuWRfXtVcOuIKc0vZ6UHzHsUsfqGjcmgcYgaTckG4MszA 5wuiO1MOkM8AV/WJ2PesFZrSwZ34HX2PZtniQqoEzXHfmNW8i0L0B94Bz48/8zERjpBA3m bDAOr2GDiG5HsBCQnuer6bM8ipXaA+1jzV2SxMQK4OHMgd7MJ8u9hDBJtW+R80rmMoFFTK frT67Bf3HtLYeZsFHHW0StzDOmEf3XE4IBWrMJ2FP6PYANySoGBOlS/FfFPert2Hit/Mak Jy+lULyUbkaUANNooKj8tdU65j5MppHJRRIR6kYjD9Pe25EeI0R1EXPl5F2ReQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1JRW1SzWz191P; Wed, 12 Jul 2023 13:26:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CDQVef027868; Wed, 12 Jul 2023 13:26:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CDQVuf027866; Wed, 12 Jul 2023 13:26:31 GMT (envelope-from git) Date: Wed, 12 Jul 2023 13:26:31 GMT Message-Id: <202307121326.36CDQVuf027866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: df56c8069a4c - main - pf: fix error descriptions in the man page 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df56c8069a4c920392ac9fec0adfcc03d9607abc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=df56c8069a4c920392ac9fec0adfcc03d9607abc commit df56c8069a4c920392ac9fec0adfcc03d9607abc Author: Kristof Provost AuthorDate: 2023-07-12 11:17:14 +0000 Commit: Kristof Provost CommitDate: 2023-07-12 11:17:14 +0000 pf: fix error descriptions in the man page PR: 272459 Submitted by: alex@inferiorhumanorgans.com MFC after: 1 week --- share/man/man4/pf.4 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4 index 8f25b7c7aebd..3b3237cb9295 100644 --- a/share/man/man4/pf.4 +++ b/share/man/man4/pf.4 @@ -302,8 +302,10 @@ calls. Nested anchors, since they are not directly attached to the given anchor, will not be included. This ioctl returns -.Er EINVAL -if the given anchor does not exist. +.Er ENOENT +if the parent anchor given at +.Va path +does not exist. .It Dv DIOCGETRULESET Fa "struct pfioc_ruleset *pr" Get a ruleset (i.e., an anchor) .Va name @@ -315,10 +317,14 @@ the maximum number of which can be obtained from a preceding .Dv DIOCGETRULESETS call. This ioctl returns -.Er EINVAL -if the given anchor does not exist or +.Er ENOENT +if the parent anchor given by +.Va path +does not exist or .Er EBUSY -if another process is concurrently updating a ruleset. +if the index passed in by +.Va nr +is greater than the number of anchors. .It Dv DIOCADDSTATE Fa "struct pfioc_state *ps" Add a state entry. .Bd -literal From nobody Wed Jul 12 15:36:17 2023 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 4R1MKF2TDYz4n1Kt; Wed, 12 Jul 2023 15:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1MKF1xtqz3vXQ; Wed, 12 Jul 2023 15:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689176177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFo7C46D/VWE7m2fDrgMZ1a2Z9VI4FhpMy6BPHnfIWo=; b=QSwIgRBAGj4yk8WMCKuCbCr/BFcatgKYi5fluL6C3zhGY0RLrJkx6Dys5EAw9pEN3ZAZu5 YrvDIXA1B04mfVHBxBs8t8FPvF0ykkTwfZNCMrEIveKYxU1z1EP+m8ksgEKVTLe6orBH2J HhL0/aVEFm8Dk+GyqiZt8C7ZOSn9A6QOjUQxKENY4R1K8R48PSoPDCqR67gB2Qc0wKVc4t 7GA107g4mjcDU1kE1Xe6sYaJFsyBVjCbcF2mlQIE6dga3RT99aMLV7yqGJmu64MmwiWcdW KmChNQdpIMYqZPQ/Z4IQioefUB4AJjfJ3FYYtiBnDSvAYhm7JGkL2p1CbZDWJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689176177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XFo7C46D/VWE7m2fDrgMZ1a2Z9VI4FhpMy6BPHnfIWo=; b=LdQP+ljZzhdLJkdhoS0eRHDHr591cMOg+BUhOFM4HBT+Z/25yS/jqZavdMeRqe+WIx2Zi4 47GJD/Csd03jkJ8ousOfcp8eABC9zL/hTEOQCGLJ+j2y/pPmsQOVHHA5JzmNqwTwBUPmZg STMiq9MHa9kYkl4TWyjxP2RX/0QAmPgzSldiOKaocpf4zGLCKOEoWBfnWfnfTdfE73Ni/y pbz4bN8TLhKvSP2kxZFJ1epSlOsdAH9JrYgmQ3h/BsIxI9RECDfkOY5Wt8SBHahS7tJKx+ 7Xh/z5d2OQwLc5FCWdhIEwbwEwKJL94AWYBUjLwYT8uBTF/XFp5/OGX9apuGtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689176177; a=rsa-sha256; cv=none; b=CXhoY967TrMeo5A7ihy8zpmdbo1Qqp4+IWegqRzfOgfv1doKZNLK1YpAhDbARl1Hh38pL3 kl93NtATQ2ea/KYm95ioxKPoB8XwB11w1bXX1obHBghVW9OsWeB794Z76sAXmcZgSlztan +X0A3K05XLXMlqro0p/y+RQbMaKi72KcPIcKM0+KO1fH8q1CuThYlzBlZIAY01Hn6vjEox fEOZg0SpAMwlIEoFy9xLTcOUY2YumZftkZSEePRCxZKt0tpxzN69GHhw/v+HGqbZhuRCXe vi8+5iEFYVB1joJJ06O9qDzYUQ0nFO/0dpFCC3PQyUWqBI+P0XmLyQWreYiDPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1MKF11BmzFQT; Wed, 12 Jul 2023 15:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CFaHpI042786; Wed, 12 Jul 2023 15:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CFaHGH042785; Wed, 12 Jul 2023 15:36:17 GMT (envelope-from git) Date: Wed, 12 Jul 2023 15:36:17 GMT Message-Id: <202307121536.36CFaHGH042785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: dad11f990e2b - main - dtrace: prevent forked child from running after an error condition 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dad11f990e2b84b55c440a42c42040f6f0821027 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=dad11f990e2b84b55c440a42c42040f6f0821027 commit dad11f990e2b84b55c440a42c42040f6f0821027 Author: Eric van Gyzen AuthorDate: 2023-07-11 17:58:29 +0000 Commit: Eric van Gyzen CommitDate: 2023-07-12 15:33:28 +0000 dtrace: prevent forked child from running after an error condition The pid/killonerror test uses an invalid probe specifier to verify that the child process is killed. It occasionally fails because the "date" command is allowed to run long enough to print the date. This is harmless in this case, but is clearly not ideal. When the dt_proc_control thread is about to exit, and the dtrace command forked the child, do not make the child runnable. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D40976 --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c index 34bcc15b9ac7..02b63c0a788a 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c @@ -685,9 +685,19 @@ pwait_locked: break; } - if (Pstate(P) != PS_UNDEAD && Psetrun(P, 0, 0) == -1) { - dt_dprintf("pid %d: failed to set running: %s\n", - (int)dpr->dpr_pid, strerror(errno)); + if (Pstate(P) != PS_UNDEAD) { + if (dpr->dpr_quit && (proc_getflags(P) & PR_KLC)) { + /* + * We're about to kill the child, so don't + * bother resuming it. In some cases, such as + * an initialization error, we shouldn't have + * started it in the first place, so letting it + * run could be harmful. + */ + } else if (Psetrun(P, 0, 0) == -1) { + dt_dprintf("pid %d: failed to set running: " + "%s\n", (int)dpr->dpr_pid, strerror(errno)); + } } (void) pthread_mutex_unlock(&dpr->dpr_lock); From nobody Wed Jul 12 16:17:16 2023 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 4R1NDX6nbyz4nFYn; Wed, 12 Jul 2023 16:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1NDX6J54z44MF; Wed, 12 Jul 2023 16:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JmCxOKGBq5DRxaghkg/TFs5rlt4yxlhuWqCZ3wOYUhA=; b=vyirCf3BBiySPPWEUOynSHTxmWAVghXrfteoacBqah5Dgak575fg27ZQjhni6fppYhGkNj XWOVJmvXUABZVNhGfaC4h6/BnuVW4/0GDcH2dD1zWCZ6SCmb2h5VHPGKt7lKvgFfjWTKM/ wTkF4D5qWwe1ddYo2D9GtClXcRuKAEOe5hbUpaMSgh49lMjS/0toNcCmIKtZ4MaLI45+ty DGZoaV/zXwgc5xiPu02TIPm1NjLAnvN9qhWW3ZGpZ9i7ywHnhV30X390y7xGbXj1IK5zKW /LF3UUqHnMK++lbHVI+8BcJvKpkMGX/ScfpIPVmh25Xqt+C58LZT2rd6MNRdOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JmCxOKGBq5DRxaghkg/TFs5rlt4yxlhuWqCZ3wOYUhA=; b=EjdwvsOGTeoCVUSWBcBXzhIbVY2S2nXHtOyP9PvrkwiQrwdB7f0TMt5RCs7XjBFWbTRI3N 39nu1cuD8+H0DlvzxCkePk54R9O+RrWaSSWRXKeLvqnt3gOHRzOKdJ68jiXVppRtR89Mk/ VCYC6IEXjeV5VKVDFCp6L2ITZIlQO/p7nR4w1Cy9vTG4lLyeMH42Pq5xBVemUVwSRIYw4b 2DfePpQvXEBXTgV1c/n7SvHymX5MOZ5FVJbkR0moePRFey5+GsOaIjeQe4JVjEKnPV1fLE cZr7QqeTHhgab5fs7TpVMZdTdGamYImraVJSppeazpK55xJd8DfBCLR99z7g6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689178636; a=rsa-sha256; cv=none; b=CIW6gP+UVl/qFqGEeRc3kcLkbRS5MYl1P6XyKFwtvYKaiREKybvyA6xqy1CpKgTKDK5zMB qkvjP0JexFHdeGpE0MC7dDYFElk8iWdfpQWenJmTy4TSm37/2wpnPW1nONXeCcRwCbUhwp ZjRuW5a/InMkT/ZLXJvTvzZdn2WG9KqfSfc9GKOLS39Ta67dplob/qq8PjrL5aSRmz7dvh eBmmzcDHaVLNlK6uqYE1+fZDZR8WRFng0TW0QwsaLWW7tYrJjUuNvGRu9EvuR28zs4+hZl HlgZPR2aG6kXuiCqnAL0E6ts+6MdQE7G6lxbOxWRLiV904pt8i9zgPDbldd5Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1NDX5GyKzFxj; Wed, 12 Jul 2023 16:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CGHGUH010913; Wed, 12 Jul 2023 16:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CGHGaf010912; Wed, 12 Jul 2023 16:17:16 GMT (envelope-from git) Date: Wed, 12 Jul 2023 16:17:16 GMT Message-Id: <202307121617.36CGHGaf010912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 30f0328a322e - main - vmm: don't return random error from vcpu_lock_all() if vcpu is empty 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30f0328a322eb17e7b6bf31a8d587a071e9421ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=30f0328a322eb17e7b6bf31a8d587a071e9421ed commit 30f0328a322eb17e7b6bf31a8d587a071e9421ed Author: Gleb Smirnoff AuthorDate: 2023-07-12 16:16:40 +0000 Commit: Gleb Smirnoff CommitDate: 2023-07-12 16:16:40 +0000 vmm: don't return random error from vcpu_lock_all() if vcpu is empty When vcpu array is empty, function would return random value from stack. What I observed was -1. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D40980 --- sys/amd64/vmm/vmm_dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index f9fcb32d8e28..74c751d7f116 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -187,6 +187,7 @@ vcpu_lock_all(struct vmmdev_softc *sc) int error; uint16_t i, j, maxcpus; + error = 0; vm_slock_vcpus(sc->vm); maxcpus = vm_get_maxcpus(sc->vm); for (i = 0; i < maxcpus; i++) { From nobody Wed Jul 12 16:17:17 2023 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 4R1NDZ0gsXz4nFfV; Wed, 12 Jul 2023 16:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1NDY75Kcz44SG; Wed, 12 Jul 2023 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QuD6k87Nit8ymSDFBQmfgw7Um597h3yhKPsHfg2vATI=; b=mepvhxLOA3vzOhTSbYCvMPcHTMJzvnBLUuJyCcc7b674wMhIqLBFOrxQt8qasqdkLt3pHc j3XqHw1G2PuuAM9UeIcgUpBb52p6vUjvs+EIUL62vAO+7NoqC44FI9Y6NLuJnUDZZaCBs7 JloxEpGGmSGTKDv7oornfh8kzvh0a+JRSH46LbJV+Iqy5Z6YY+DFOjDn0c8wwWoRri/fO/ /8Mo8TXBwhaIO2UdTRwgfMQNRQs/YYS3YNSMhpCeQ/ti97Igtfst+JDvhbIIxo9akpHpLi gt+qwny919nTi+pmL1sWh/3WX/gtpd7ecSrMhcxqrNTRihimbh5dbOkipNY0KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689178638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QuD6k87Nit8ymSDFBQmfgw7Um597h3yhKPsHfg2vATI=; b=Fu+VNnmlJwfXXLsN7vrrcCxuQORvtn8i5n6WIcExyMwLfUQajZsxYoxQHVYuz3yI132BTV 0yv7QIKYaFsDIpOSXve0SbxzKBMS7wyWpV9IF+S6s4dtLcR/BuUPTyQFZHLzRV4bzE/KuC DZDewpcmyah9Ar2+xvvVhN9T+EYoI3H+WEbmVYYGCDimO1A9yejCKY2KPb1tvQW31C5IuP q783e/dI6IpPa0cnShODPGDSJiQi/Usm1Fv0Z9dqn1IH2zY7nAoIoxOaGxkY7i5BxRp/6s 3kA6gSwU/F/by2h/OSGU/SARuY2ouZ4OL3l2qfXuEgLM/KdlrikM6FjnBSe05g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689178638; a=rsa-sha256; cv=none; b=EvEBUt6pDFFWYqtBxSCTeutKkC1GgvpwPrjKTAmBazgAXeP/GWUgN/2ONCmhHNUArQHAy2 iPnf33L4+ETZbGFpXr7g7ErCkQIc7eT0Nq1AyFmHmradc8OflMj6O51GS9escz94m68GYK esgqegXSfMo1akjeUOGt1jHlhWF3FX8OT55xFbcLIfIK3gh+RhtGsN0ILj9uhEvRlafQRr gIOSdK+geLO5db5g+SaibkAKn9VwSm8FncZYZhEEdMlZT+3DPnOyM1r5fr5EY2WCpMC1hV oc2WMCf4mYT4J1O+xfdAciR5woEdBzUOZha4xfhVCyZqc9AcfBx7fAL7i7FcIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1NDY5zQhzFlK; Wed, 12 Jul 2023 16:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CGHHOn010932; Wed, 12 Jul 2023 16:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CGHHlP010931; Wed, 12 Jul 2023 16:17:17 GMT (envelope-from git) Date: Wed, 12 Jul 2023 16:17:17 GMT Message-Id: <202307121617.36CGHHlP010931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0d1ff2b04d27 - main - vmm: don't leak locks exiting vmmdev_ioctl() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 commit 0d1ff2b04d27c21bf7f66a0b1aaade817ed271e5 Author: Gleb Smirnoff AuthorDate: 2023-07-12 16:16:40 +0000 Commit: Gleb Smirnoff CommitDate: 2023-07-12 16:16:40 +0000 vmm: don't leak locks exiting vmmdev_ioctl() At least an error from vcpu_lock_all() at line 553 would leak memseg lock. There might be other cases as well. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D40981 --- sys/amd64/vmm/vmm_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index 74c751d7f116..dabcd4393a3f 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -1083,6 +1083,7 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, break; } +done: if (vcpus_locked == SINGLE) vcpu_unlock_one(sc, vcpuid, vcpu); else if (vcpus_locked == ALL) @@ -1090,7 +1091,6 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, if (memsegs_locked) vm_unlock_memsegs(sc->vm); -done: /* * Make sure that no handler returns a kernel-internal * error value to userspace. From nobody Wed Jul 12 17:09:32 2023 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 4R1PNr5Bg7z4gwK0; Wed, 12 Jul 2023 17:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1PNr4mTHz4GGP; Wed, 12 Jul 2023 17:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689181772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tok00+zbnHtNgP3CawO4aT0tO+NdG9bGrTAeDEhssB8=; b=fPMWBUx0Fdt4d0DvLOjlLw6PZlwKDoeRrrYhQq6gj3tk/hE2unT7o7FfnwPcIb0vzSmrY0 hqa5kTLgLuK3HsF5eb/Q4XTlft4u2YkygLwda3RTK+KUtLG7ULMLJrcz29TOlH8vh5Z/5M w8x2kCLQopfWg3AKusEE/j9VoDmZxtLbxakQYfSTX3jHucdfjV7O7e/O5gEaebniAEHgAb BRxTZOzmMO9a8vFokYdi5tHHi78URIBmE9oOmVoTu3EaJ5siYX6gTv/gOJ1lADBUan4ySA mbfvZFm5uu1MxaSXsSK23BvB22KxIOGS+hGdoCoIndNzGdt3myKBQ7WLpIL9bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689181772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tok00+zbnHtNgP3CawO4aT0tO+NdG9bGrTAeDEhssB8=; b=P1v+Fmuism6MGHHsr3nR1zznySJjSWX0FTom9Hq8bk4NQvkBeQEbelTlCK14JgdJA1JU4m A62MbjZuP97qTFaX3uze0MoyouDeg3SFffH4o7XLkAblnN26dIoh1a17Ok+xnthvFKa3PU XTwSttJegIMWx+foc24X07LI4HnZKLW4NR9UuHb7QZNc7KpkgZ1HCxTbQAKSk2PMXS5o1m LBYVSQQFLKt+9eSKKZCnuWmQBxn36DTtfdQkFisi0xIhHCAovynbjbiampaR5LxbzWy1Tq nnEM2jb3uN/rkSlCgzBw4Cpc3EE71xAkUPjYtwfbDk3l3M7jLXtUIrzSG/F5DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689181772; a=rsa-sha256; cv=none; b=k0VDGORXWp1ZLTlZA5gzdYxhEtT1Sr+b7Lltk515z6SJbcia/sVGC8iI9Y2fym50Qi2+nX xsE8kruw5Bh9dmAfNHEQ0Lo7CuEIWQRuASEz+TmI8FknHhJ2utF4b0k7HbclFDsoqCxZ+J yMhqLkPwCHOys6+EJoADNOCXvGuXOtmmkenzKNQnwSAKu22t2PeqJjmjEEN3HFx9QNi6Aq g6SMYxXobf2jwS9Ipo19cOIL9g5iRxdEv3vjWuv8C4ZZhp8Bi9axwuLklnz+aVulDHdMMC FU+1UG5+6NKHvsGTuVJ8rNS96zz93New09oteNGzp/reQjMmCkX6NM1dx8l9JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1PNr3k6mzGwX; Wed, 12 Jul 2023 17:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CH9WHq093375; Wed, 12 Jul 2023 17:09:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CH9WB0093374; Wed, 12 Jul 2023 17:09:32 GMT (envelope-from git) Date: Wed, 12 Jul 2023 17:09:32 GMT Message-Id: <202307121709.36CH9WB0093374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 294c52d969df - main - amd64 pmap: Fix compilation when superpage reservations are disabled 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294c52d969dfdaf1d9b3f4a1de76b702ee724afc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=294c52d969dfdaf1d9b3f4a1de76b702ee724afc commit 294c52d969dfdaf1d9b3f4a1de76b702ee724afc Author: Yufeng Zhou AuthorDate: 2023-07-12 07:52:02 +0000 Commit: Alan Cox CommitDate: 2023-07-12 17:07:42 +0000 amd64 pmap: Fix compilation when superpage reservations are disabled The function pmap_pde_ept_executable() should not be conditionally compiled based on VM_NRESERVLEVEL. It is required indirectly by pmap_enter(..., psind=1) even when reservation-based allocation is disabled at compile time. Reviewed by: alc MFC after: 1 week --- sys/amd64/amd64/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 3215a7f8d559..896078f3c456 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -6839,7 +6839,6 @@ retry: PMAP_UNLOCK(pmap); } -#if VM_NRESERVLEVEL > 0 static bool pmap_pde_ept_executable(pmap_t pmap, pd_entry_t pde) { @@ -6849,6 +6848,7 @@ pmap_pde_ept_executable(pmap_t pmap, pd_entry_t pde) return ((pde & EPT_PG_EXECUTE) != 0); } +#if VM_NRESERVLEVEL > 0 /* * Tries to promote the 512, contiguous 4KB page mappings that are within a * single page table page (PTP) to a single 2MB page mapping. For promotion From nobody Wed Jul 12 18:06:25 2023 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 4R1QfT6zWMz4ml7P; Wed, 12 Jul 2023 18:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1QfT61bqz4VZY; Wed, 12 Jul 2023 18:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689185185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I34z50+H8/q9LUEjxX4zKu7QkPqCfiugD3AWMa3Jcyk=; b=WmGEUNN9tcU9Nls0H43NOW0KYmm5G1JMI50UCkwg4pSe2SuCqQZh4XB+RBHNUo5nGuC260 4e3oR3SnFKtc0ptmGVnmNQGShIfuaoIRW2BvrxCS/J9E+fap2SxReUrRy6Mq7easqwDU/L APcx0Ql2rLye0Hu81ezW24dz31N2F4s+MIwKOAtvQGyXsBYk11tEP81lXENI8tT8MaC7UR QntMdhMGnDzz4PZHejKGdUy05fYB+xrxcTOQbraPhLQQiS14wu5S13jyn1pG30vCC328iu UBsoo7s8B4xcXN0xS2ZFpG/QbDigkDW9F6bjrBJVDarmNMj26t4Y4mCN3bO7zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689185185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I34z50+H8/q9LUEjxX4zKu7QkPqCfiugD3AWMa3Jcyk=; b=tNMuhZNWi7BxTjQiIxJrc4Qi5C5+NB8QiSu6dwJOFgPF/z9ig2c58xbKAJYEcQw91oUaaI l5UqOzKZWg4jnFP+PcN/6zEmQ8Fa+TECxL/6gdi7m/bmVRlpzkBDTmRFh/RndpkkFkQ3Hy 1sFFm9LVITThxzNZL+AnOe9EvyhdMBVA+sInlnlRZx7JLD6QaoWoW9T8DLCusatAUr0iAn eQV254sFADDgSwGhxd5LYwkZ06HThja5KAbr+QZmElH/w454UpadBAXnjNK4suI9iOE+hh KFgYmnxUEYI8Q8aDrQBQ38USYmCKftBoYIILIZg8L0a3Vc4djpDdjYrOezUeRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689185185; a=rsa-sha256; cv=none; b=jQ/1Frz8JsbvaUAXkZLAx9yla+ezysyO+3TvjS1zcRnlN59mv+08HpoZUCAdVt+s8AeJw+ FC+eDcoC2dZU5gMrXqxWmOuriE3wOS946wMucikUFuSkHE75HdKlNZetxGDNHLw54XpFO5 Gr51HkkksLi7o4VP6NTA5HNDeZsqxJVFzzCxmf80hXBJLD3HcK3pbGa7I98R0AFNrOV7ad HF2QyMim7axiTBAGbRaMPmjHLgozi2umGClwYuUEkWPrAi0/zFLo4TGmtnGMBlApgbHg/+ ua6/yVrRGCu/abMs2QwSuGXTveQ/xyM0UbS4U1S9tW2znFIrnE7VX5UyMRcVSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1QfT53tqzJSL; Wed, 12 Jul 2023 18:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CI6PTq092222; Wed, 12 Jul 2023 18:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CI6PKt092221; Wed, 12 Jul 2023 18:06:25 GMT (envelope-from git) Date: Wed, 12 Jul 2023 18:06:25 GMT Message-Id: <202307121806.36CI6PKt092221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f2064dd1f170 - main - pf: Fix duplicate storage of direction 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2064dd1f170fc538ea078caba57cd6cd563eea3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f2064dd1f170fc538ea078caba57cd6cd563eea3 commit f2064dd1f170fc538ea078caba57cd6cd563eea3 Author: Kajetan Staszkiewicz AuthorDate: 2023-07-12 16:04:56 +0000 Commit: Kristof Provost CommitDate: 2023-07-12 16:05:47 +0000 pf: Fix duplicate storage of direction The variable storing the direction of a processed packet is passed around to many functions. Most of those functions already have a pointer to struct pf_pdesc which also contains the direction. By using the one in struct pf_pdesc we can reduce the amount of arguments passed around. Reviewed by: kp Sponsored by: InnGames GmbH Differential Revision: https://reviews.freebsd.org/D41008 --- sys/net/if_pflog.h | 4 +- sys/net/pfvar.h | 14 +-- sys/netpfil/pf/if_pflog.c | 8 +- sys/netpfil/pf/pf.c | 287 ++++++++++++++++++++++------------------------ sys/netpfil/pf/pf_lb.c | 22 ++-- sys/netpfil/pf/pf_norm.c | 38 +++--- 6 files changed, 181 insertions(+), 192 deletions(-) diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 443c1cc36cf6..508e9c77286d 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -71,9 +71,9 @@ struct pf_ruleset; struct pfi_kif; struct pf_pdesc; -#define PFLOG_PACKET(i,a,b,c,d,e,f,g,h,di) do { \ +#define PFLOG_PACKET(i,a,b,c,d,e,f,g,di) do { \ if (pflog_packet_ptr != NULL) \ - pflog_packet_ptr(i,a,b,c,d,e,f,g,h,di); \ + pflog_packet_ptr(i,a,b,c,d,e,f,g,di); \ } while (0) #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 57b2383b1549..ed371f61a999 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1214,8 +1214,8 @@ void pf_state_export(struct pf_state_export *, struct pf_kruleset; struct pf_pdesc; typedef int pflog_packet_t(struct pfi_kkif *, struct mbuf *, sa_family_t, - u_int8_t, u_int8_t, struct pf_krule *, struct pf_krule *, - struct pf_kruleset *, struct pf_pdesc *, int); + u_int8_t, struct pf_krule *, struct pf_krule *, struct pf_kruleset *, + struct pf_pdesc *, int); extern pflog_packet_t *pflog_packet_ptr; #endif /* _KERNEL */ @@ -2236,14 +2236,14 @@ int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); #ifdef INET int pf_test(int, int, struct ifnet *, struct mbuf **, struct inpcb *, struct pf_rule_actions *); -int pf_normalize_ip(struct mbuf **, int, struct pfi_kkif *, u_short *, +int pf_normalize_ip(struct mbuf **, struct pfi_kkif *, u_short *, struct pf_pdesc *); #endif /* INET */ #ifdef INET6 int pf_test6(int, int, struct ifnet *, struct mbuf **, struct inpcb *, struct pf_rule_actions *); -int pf_normalize_ip6(struct mbuf **, int, struct pfi_kkif *, u_short *, +int pf_normalize_ip6(struct mbuf **, struct pfi_kkif *, u_short *, struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, struct pf_addr *, struct pf_addr *, sa_family_t); @@ -2271,7 +2271,7 @@ int pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t); void pf_normalize_init(void); void pf_normalize_cleanup(void); -int pf_normalize_tcp(int, struct pfi_kkif *, struct mbuf *, int, int, void *, +int pf_normalize_tcp(struct pfi_kkif *, struct mbuf *, int, int, void *, struct pf_pdesc *); void pf_normalize_tcp_cleanup(struct pf_kstate *); int pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *, @@ -2285,7 +2285,7 @@ void pf_purge_expired_fragments(void); void pf_purge_fragments(uint32_t); int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kkif *, int); -int pf_socket_lookup(int, struct pf_pdesc *, struct mbuf *); +int pf_socket_lookup(struct pf_pdesc *, struct mbuf *); struct pf_state_key *pf_alloc_state_key(int); void pfr_initialize(void); void pfr_cleanup(void); @@ -2472,7 +2472,7 @@ u_short pf_map_addr(u_int8_t, struct pf_krule *, struct pf_addr *, struct pf_addr *, struct pf_addr *, struct pf_ksrc_node **); struct pf_krule *pf_get_translation(struct pf_pdesc *, struct mbuf *, - int, int, struct pfi_kkif *, struct pf_ksrc_node **, + int, struct pfi_kkif *, struct pf_ksrc_node **, struct pf_state_key **, struct pf_state_key **, struct pf_addr *, struct pf_addr *, uint16_t, uint16_t, struct pf_kanchor_stackframe *); diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c index 2f687e901a71..68f18b13bafe 100644 --- a/sys/netpfil/pf/if_pflog.c +++ b/sys/netpfil/pf/if_pflog.c @@ -217,7 +217,7 @@ pflogioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } static int -pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, +pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t reason, struct pf_krule *rm, struct pf_krule *am, struct pf_kruleset *ruleset, struct pf_pdesc *pd, int lookupsafe) { @@ -254,7 +254,7 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, * These conditions are very very rare, however. */ if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done && lookupsafe) - pd->lookup.done = pf_socket_lookup(dir, pd, m); + pd->lookup.done = pf_socket_lookup(pd, m); if (pd->lookup.done > 0) hdr.uid = pd->lookup.uid; else @@ -262,10 +262,10 @@ pflog_packet(struct pfi_kkif *kif, struct mbuf *m, sa_family_t af, u_int8_t dir, hdr.pid = NO_PID; hdr.rule_uid = rm->cuid; hdr.rule_pid = rm->cpid; - hdr.dir = dir; + hdr.dir = pd->dir; #ifdef INET - if (af == AF_INET && dir == PF_OUT) { + if (af == AF_INET && pd->dir == PF_OUT) { struct ip *ip; ip = mtod(m, struct ip *); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index df015fd3347b..7c41be4b25fe 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -277,15 +277,15 @@ static int pf_state_key_ctor(void *, int, void *, int); static u_int32_t pf_tcp_iss(struct pf_pdesc *); void pf_rule_to_actions(struct pf_krule *, struct pf_rule_actions *); -static int pf_dummynet(struct pf_pdesc *, int, struct pf_kstate *, +static int pf_dummynet(struct pf_pdesc *, struct pf_kstate *, struct pf_krule *, struct mbuf **); -static int pf_dummynet_route(struct pf_pdesc *, int, +static int pf_dummynet_route(struct pf_pdesc *, struct pf_kstate *, struct pf_krule *, struct ifnet *, struct sockaddr *, struct mbuf **); static int pf_test_eth_rule(int, struct pfi_kkif *, struct mbuf **); static int pf_test_rule(struct pf_krule **, struct pf_kstate **, - int, struct pfi_kkif *, struct mbuf *, int, + struct pfi_kkif *, struct mbuf *, int, struct pf_pdesc *, struct pf_krule **, struct pf_kruleset **, struct inpcb *); static int pf_create_state(struct pf_krule *, struct pf_krule *, @@ -295,25 +295,24 @@ static int pf_create_state(struct pf_krule *, struct pf_krule *, u_int16_t, u_int16_t, int *, struct pfi_kkif *, struct pf_kstate **, int, u_int16_t, u_int16_t, int, struct pf_krule_slist *); -static int pf_test_fragment(struct pf_krule **, int, - struct pfi_kkif *, struct mbuf *, void *, - struct pf_pdesc *, struct pf_krule **, - struct pf_kruleset **); +static int pf_test_fragment(struct pf_krule **, struct pfi_kkif *, + struct mbuf *, void *, struct pf_pdesc *, + struct pf_krule **, struct pf_kruleset **); static int pf_tcp_track_full(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, struct pf_pdesc *, u_short *, int *); static int pf_tcp_track_sloppy(struct pf_kstate **, struct pf_pdesc *, u_short *); -static int pf_test_state_tcp(struct pf_kstate **, int, +static int pf_test_state_tcp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); -static int pf_test_state_udp(struct pf_kstate **, int, +static int pf_test_state_udp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *); -static int pf_test_state_icmp(struct pf_kstate **, int, +static int pf_test_state_icmp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); -static int pf_test_state_other(struct pf_kstate **, int, +static int pf_test_state_other(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, int, u_int16_t); @@ -336,14 +335,14 @@ static void pf_mtag_free(struct m_tag *); static void pf_packet_rework_nat(struct mbuf *, struct pf_pdesc *, int, struct pf_state_key *); #ifdef INET -static void pf_route(struct mbuf **, struct pf_krule *, int, +static void pf_route(struct mbuf **, struct pf_krule *, struct ifnet *, struct pf_kstate *, struct pf_pdesc *, struct inpcb *); #endif /* INET */ #ifdef INET6 static void pf_change_a6(struct pf_addr *, u_int16_t *, struct pf_addr *, u_int8_t); -static void pf_route6(struct mbuf **, struct pf_krule *, int, +static void pf_route6(struct mbuf **, struct pf_krule *, struct ifnet *, struct pf_kstate *, struct pf_pdesc *, struct inpcb *); #endif /* INET6 */ @@ -356,10 +355,10 @@ extern struct proc *pf_purge_proc; VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); -#define PACKET_UNDO_NAT(_m, _pd, _off, _s, _dir) \ +#define PACKET_UNDO_NAT(_m, _pd, _off, _s) \ do { \ struct pf_state_key *nk; \ - if ((_dir) == PF_OUT) \ + if ((pd->dir) == PF_OUT) \ nk = (_s)->key[PF_SK_STACK]; \ else \ nk = (_s)->key[PF_SK_WIRE]; \ @@ -369,10 +368,10 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); #define PACKET_LOOPED(pd) ((pd)->pf_mtag && \ (pd)->pf_mtag->flags & PF_MTAG_FLAG_PACKET_LOOPED) -#define STATE_LOOKUP(i, k, d, s, pd) \ +#define STATE_LOOKUP(i, k, s, pd) \ do { \ - (s) = pf_find_state((i), (k), (d)); \ - SDT_PROBE5(pf, ip, state, lookup, i, k, d, pd, (s)); \ + (s) = pf_find_state((i), (k), (pd->dir)); \ + SDT_PROBE5(pf, ip, state, lookup, i, k, (pd->dir), pd, (s)); \ if ((s) == NULL) \ return (PF_DROP); \ if (PACKET_LOOPED(pd)) \ @@ -3623,7 +3622,7 @@ pf_rule_to_actions(struct pf_krule *r, struct pf_rule_actions *a) } int -pf_socket_lookup(int direction, struct pf_pdesc *pd, struct mbuf *m) +pf_socket_lookup(struct pf_pdesc *pd, struct mbuf *m) { struct pf_addr *saddr, *daddr; u_int16_t sport, dport; @@ -3647,7 +3646,7 @@ pf_socket_lookup(int direction, struct pf_pdesc *pd, struct mbuf *m) default: return (-1); } - if (direction == PF_IN) { + if (pd->dir == PF_IN) { saddr = pd->src; daddr = pd->dst; } else { @@ -4175,9 +4174,9 @@ pf_test_eth_rule(int dir, struct pfi_kkif *kif, struct mbuf **m0) } static int -pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, - struct pfi_kkif *kif, struct mbuf *m, int off, struct pf_pdesc *pd, - struct pf_krule **am, struct pf_kruleset **rsm, struct inpcb *inp) +pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, + struct mbuf *m, int off, struct pf_pdesc *pd, struct pf_krule **am, + struct pf_kruleset **rsm, struct inpcb *inp) { struct pf_krule *nr = NULL; struct pf_addr * const saddr = pd->src; @@ -4262,13 +4261,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_FILTER].active.ptr); /* check packet for BINAT/NAT/RDR */ - if ((nr = pf_get_translation(pd, m, off, direction, kif, &nsn, &sk, + if ((nr = pf_get_translation(pd, m, off, kif, &nsn, &sk, &nk, saddr, daddr, sport, dport, anchor_stack)) != NULL) { KASSERT(sk != NULL, ("%s: null sk", __func__)); KASSERT(nk != NULL, ("%s: null nk", __func__)); if (nr->log) { - PFLOG_PACKET(kif, m, af, direction, PFRES_MATCH, nr, a, + PFLOG_PACKET(kif, m, af, PFRES_MATCH, nr, a, ruleset, pd, 1); } @@ -4399,7 +4398,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) r = r->skip[PF_SKIP_IFP].ptr; - else if (r->direction && r->direction != direction) + else if (r->direction && r->direction != pd->dir) r = r->skip[PF_SKIP_DIR].ptr; else if (r->af && r->af != af) r = r->skip[PF_SKIP_AF].ptr; @@ -4434,13 +4433,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, r = TAILQ_NEXT(r, entries); /* tcp/udp only. uid.op always 0 in other cases */ else if (r->uid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(direction, pd, m), 1)) && + pf_socket_lookup(pd, m), 1)) && !pf_match_uid(r->uid.op, r->uid.uid[0], r->uid.uid[1], pd->lookup.uid)) r = TAILQ_NEXT(r, entries); /* tcp/udp only. gid.op always 0 in other cases */ else if (r->gid.op && (pd->lookup.done || (pd->lookup.done = - pf_socket_lookup(direction, pd, m), 1)) && + pf_socket_lookup(pd, m), 1)) && !pf_match_gid(r->gid.op, r->gid.gid[0], r->gid.gid[1], pd->lookup.gid)) r = TAILQ_NEXT(r, entries); @@ -4471,13 +4470,13 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, ri->r = r; SLIST_INSERT_HEAD(&match_rules, ri, entry); pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&r->packets[direction == PF_OUT], 1); - pf_counter_u64_add_protected(&r->bytes[direction == PF_OUT], pd->tot_len); + pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); + pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); if (r->log) PFLOG_PACKET(kif, m, af, - direction, PFRES_MATCH, r, + PFRES_MATCH, r, a, ruleset, pd, 1); } else { match = 1; @@ -4509,8 +4508,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, if (r->log) { if (rewrite) m_copyback(m, off, hdrlen, pd->hdr.any); - PFLOG_PACKET(kif, m, af, direction, reason, r, a, - ruleset, pd, 1); + PFLOG_PACKET(kif, m, af, reason, r, a, ruleset, pd, 1); } if ((r->action == PF_DROP) && @@ -4555,7 +4553,7 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, m_copyback(m, off, hdrlen, pd->hdr.any); if (*sm != NULL && !((*sm)->state_flags & PFSTATE_NOSYNC) && - direction == PF_OUT && + pd->dir == PF_OUT && V_pfsync_defer_ptr != NULL && V_pfsync_defer_ptr(*sm, m)) /* * We want the state created, but we dont @@ -4846,7 +4844,7 @@ csfailed: } static int -pf_test_fragment(struct pf_krule **rm, int direction, struct pfi_kkif *kif, +pf_test_fragment(struct pf_krule **rm, struct pfi_kkif *kif, struct mbuf *m, void *h, struct pf_pdesc *pd, struct pf_krule **am, struct pf_kruleset **rsm) { @@ -4869,7 +4867,7 @@ pf_test_fragment(struct pf_krule **rm, int direction, struct pfi_kkif *kif, pf_counter_u64_add(&r->evaluations, 1); if (pfi_kkif_match(r->kif, kif) == r->ifnot) r = r->skip[PF_SKIP_IFP].ptr; - else if (r->direction && r->direction != direction) + else if (r->direction && r->direction != pd->dir) r = r->skip[PF_SKIP_DIR].ptr; else if (r->af && r->af != af) r = r->skip[PF_SKIP_AF].ptr; @@ -4915,13 +4913,13 @@ pf_test_fragment(struct pf_krule **rm, int direction, struct pfi_kkif *kif, ri->r = r; SLIST_INSERT_HEAD(&match_rules, ri, entry); pf_counter_u64_critical_enter(); - pf_counter_u64_add_protected(&r->packets[direction == PF_OUT], 1); - pf_counter_u64_add_protected(&r->bytes[direction == PF_OUT], pd->tot_len); + pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); + pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); pf_rule_to_actions(r, &pd->act); if (r->log) PFLOG_PACKET(kif, m, af, - direction, PFRES_MATCH, r, + PFRES_MATCH, r, a, ruleset, pd, 1); } else { match = 1; @@ -4951,8 +4949,7 @@ pf_test_fragment(struct pf_krule **rm, int direction, struct pfi_kkif *kif, pf_rule_to_actions(r, &pd->act); if (r->log) - PFLOG_PACKET(kif, m, af, direction, reason, r, a, - ruleset, pd, 1); + PFLOG_PACKET(kif, m, af, reason, r, a, ruleset, pd, 1); if (r->action != PF_PASS) return (PF_DROP); @@ -5494,7 +5491,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) } static int -pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, +pf_test_state_tcp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) { @@ -5507,7 +5504,7 @@ pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, bzero(&key, sizeof(key)); key.af = pd->af; key.proto = IPPROTO_TCP; - if (direction == PF_IN) { /* wire side, straight */ + if (pd->dir == PF_IN) { /* wire side, straight */ PF_ACPY(&key.addr[0], pd->src, key.af); PF_ACPY(&key.addr[1], pd->dst, key.af); key.port[0] = th->th_sport; @@ -5519,9 +5516,9 @@ pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, key.port[0] = th->th_dport; } - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); - if (direction == (*state)->direction) { + if (pd->dir == (*state)->direction) { src = &(*state)->src; dst = &(*state)->dst; } else { @@ -5585,7 +5582,7 @@ pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, } static int -pf_test_state_udp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, +pf_test_state_udp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; @@ -5596,7 +5593,7 @@ pf_test_state_udp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, bzero(&key, sizeof(key)); key.af = pd->af; key.proto = IPPROTO_UDP; - if (direction == PF_IN) { /* wire side, straight */ + if (pd->dir == PF_IN) { /* wire side, straight */ PF_ACPY(&key.addr[0], pd->src, key.af); PF_ACPY(&key.addr[1], pd->dst, key.af); key.port[0] = uh->uh_sport; @@ -5608,9 +5605,9 @@ pf_test_state_udp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, key.port[0] = uh->uh_dport; } - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); - if (direction == (*state)->direction) { + if (pd->dir == (*state)->direction) { src = &(*state)->src; dst = &(*state)->dst; psrc = PF_PEER_SRC; @@ -5657,7 +5654,7 @@ pf_test_state_udp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, } static int -pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, +pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) { struct pf_addr *saddr = pd->src, *daddr = pd->dst; @@ -5707,7 +5704,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif key.af = pd->af; key.proto = pd->proto; key.port[0] = key.port[1] = icmpid; - if (direction == PF_IN) { /* wire side, straight */ + if (pd->dir == PF_IN) { /* wire side, straight */ PF_ACPY(&key.addr[0], pd->src, key.af); PF_ACPY(&key.addr[1], pd->dst, key.af); } else { /* stack side, reverse */ @@ -5715,7 +5712,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif PF_ACPY(&key.addr[0], pd->dst, key.af); } - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); (*state)->expire = time_uptime; (*state)->timeout = PFTM_ICMP_ERROR_REPLY; @@ -5795,8 +5792,8 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif pd2.af = pd->af; /* Payload packet is from the opposite direction. */ - pd2.sidx = (direction == PF_IN) ? 1 : 0; - pd2.didx = (direction == PF_IN) ? 0 : 1; + pd2.sidx = (pd->dir == PF_IN) ? 1 : 0; + pd2.didx = (pd->dir == PF_IN) ? 0 : 1; switch (pd->af) { #ifdef INET case AF_INET: @@ -5929,9 +5926,9 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif key.port[pd2.sidx] = th.th_sport; key.port[pd2.didx] = th.th_dport; - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); - if (direction == (*state)->direction) { + if (pd->dir == (*state)->direction) { src = &(*state)->dst; dst = &(*state)->src; } else { @@ -6050,7 +6047,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif key.port[pd2.sidx] = uh.uh_sport; key.port[pd2.didx] = uh.uh_dport; - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -6117,7 +6114,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af); key.port[0] = key.port[1] = iih.icmp_id; - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -6169,7 +6166,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af); key.port[0] = key.port[1] = iih.icmp6_id; - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -6212,7 +6209,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af); key.port[0] = key.port[1] = 0; - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); /* translate source/destination address, if necessary */ if ((*state)->key[PF_SK_WIRE] != @@ -6261,7 +6258,7 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif } static int -pf_test_state_other(struct pf_kstate **state, int direction, struct pfi_kkif *kif, +pf_test_state_other(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, struct pf_pdesc *pd) { struct pf_state_peer *src, *dst; @@ -6271,7 +6268,7 @@ pf_test_state_other(struct pf_kstate **state, int direction, struct pfi_kkif *ki bzero(&key, sizeof(key)); key.af = pd->af; key.proto = pd->proto; - if (direction == PF_IN) { + if (pd->dir == PF_IN) { PF_ACPY(&key.addr[0], pd->src, key.af); PF_ACPY(&key.addr[1], pd->dst, key.af); key.port[0] = key.port[1] = 0; @@ -6281,9 +6278,9 @@ pf_test_state_other(struct pf_kstate **state, int direction, struct pfi_kkif *ki key.port[1] = key.port[0] = 0; } - STATE_LOOKUP(kif, &key, direction, *state, pd); + STATE_LOOKUP(kif, &key, *state, pd); - if (direction == (*state)->direction) { + if (pd->dir == (*state)->direction) { src = &(*state)->src; dst = &(*state)->dst; psrc = PF_PEER_SRC; @@ -6437,7 +6434,7 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kkif *kif, #ifdef INET static void -pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, +pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct pf_kstate *s, struct pf_pdesc *pd, struct inpcb *inp) { struct mbuf *m0, *m1, *md; @@ -6460,7 +6457,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, r_dir = r->direction; } - KASSERT(dir == PF_IN || dir == PF_OUT || + KASSERT(pd->dir == PF_IN || pd->dir == PF_OUT || r_dir == PF_IN || r_dir == PF_OUT, ("%s: invalid direction", __func__)); @@ -6502,8 +6499,8 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, } } } else { - if ((r_rt == PF_REPLYTO) == (r_dir == dir)) { - pf_dummynet(pd, dir, s, r, m); + if ((r_rt == PF_REPLYTO) == (r_dir == pd->dir)) { + pf_dummynet(pd, s, r, m); if (s) PF_STATE_UNLOCK(s); return; @@ -6545,7 +6542,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, if (ifp == NULL) goto bad; - if (dir == PF_IN) { + if (pd->dir == PF_IN) { if (pf_test(PF_OUT, 0, ifp, &m0, inp, &pd->act) != PF_PASS) goto bad; else if (m0 == NULL) @@ -6591,7 +6588,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, m_clrprotoflags(m0); /* Avoid confusing lower layers. */ md = m0; - error = pf_dummynet_route(pd, dir, s, r, ifp, sintosa(&dst), &md); + error = pf_dummynet_route(pd, s, r, ifp, sintosa(&dst), &md); if (md != NULL) error = (*ifp->if_output)(ifp, md, sintosa(&dst), NULL); goto done; @@ -6605,7 +6602,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, if (s && pd->nat_rule != NULL) PACKET_UNDO_NAT(m0, pd, (ip->ip_hl << 2) + (ip_off & IP_OFFMASK), - s, dir); + s); icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0, ifp->if_mtu); @@ -6624,7 +6621,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, if (error == 0) { m_clrprotoflags(m0); md = m0; - error = pf_dummynet_route(pd, dir, s, r, ifp, + error = pf_dummynet_route(pd, s, r, ifp, sintosa(&dst), &md); if (md != NULL) error = (*ifp->if_output)(ifp, md, @@ -6652,7 +6649,7 @@ bad: #ifdef INET6 static void -pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, +pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct pf_kstate *s, struct pf_pdesc *pd, struct inpcb *inp) { struct mbuf *m0, *md; @@ -6673,7 +6670,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, r_dir = r->direction; } - KASSERT(dir == PF_IN || dir == PF_OUT || + KASSERT(pd->dir == PF_IN || pd->dir == PF_OUT || r_dir == PF_IN || r_dir == PF_OUT, ("%s: invalid direction", __func__)); @@ -6715,8 +6712,8 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, } } } else { - if ((r_rt == PF_REPLYTO) == (r_dir == dir)) { - pf_dummynet(pd, dir, s, r, m); + if ((r_rt == PF_REPLYTO) == (r_dir == pd->dir)) { + pf_dummynet(pd, s, r, m); if (s) PF_STATE_UNLOCK(s); return; @@ -6761,7 +6758,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, if (ifp == NULL) goto bad; - if (dir == PF_IN) { + if (pd->dir == PF_IN) { if (pf_test6(PF_OUT, 0, ifp, &m0, inp, &pd->act) != PF_PASS) goto bad; else if (m0 == NULL) @@ -6793,7 +6790,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, dst.sin6_addr.s6_addr16[1] = htons(ifp->if_index); if ((u_long)m0->m_pkthdr.len <= ifp->if_mtu) { md = m0; - pf_dummynet_route(pd, dir, s, r, ifp, sintosa(&dst), &md); + pf_dummynet_route(pd, s, r, ifp, sintosa(&dst), &md); if (md != NULL) nd6_output_ifp(ifp, ifp, md, &dst, NULL); } @@ -6803,7 +6800,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, if (s && pd->nat_rule != NULL) PACKET_UNDO_NAT(m0, pd, ((caddr_t)ip6 - m0->m_data) + - sizeof(struct ip6_hdr), s, dir); + sizeof(struct ip6_hdr), s); icmp6_error(m0, ICMP6_PACKET_TOO_BIG, 0, ifp->if_mtu); } else @@ -6958,9 +6955,8 @@ pf_check_proto_cksum(struct mbuf *m, int off, int len, u_int8_t p, sa_family_t a } static bool -pf_pdesc_to_dnflow(int dir, const struct pf_pdesc *pd, - const struct pf_krule *r, const struct pf_kstate *s, - struct ip_fw_args *dnflow) +pf_pdesc_to_dnflow(const struct pf_pdesc *pd, const struct pf_krule *r, + const struct pf_kstate *s, struct ip_fw_args *dnflow) { int dndir = r->direction; @@ -6969,7 +6965,7 @@ pf_pdesc_to_dnflow(int dir, const struct pf_pdesc *pd, } else if (dndir == PF_INOUT) { /* Assume primary direction. Happens when we've set dnpipe in * the ethernet level code. */ - dndir = dir; + dndir = pd->dir; } memset(dnflow, 0, sizeof(*dnflow)); @@ -6979,15 +6975,15 @@ pf_pdesc_to_dnflow(int dir, const struct pf_pdesc *pd, if (pd->sport != NULL) dnflow->f_id.src_port = ntohs(*pd->sport); - if (dir == PF_IN) + if (pd->dir == PF_IN) dnflow->flags |= IPFW_ARGS_IN; else dnflow->flags |= IPFW_ARGS_OUT; - if (dir != dndir && pd->act.dnrpipe) { + if (pd->dir != dndir && pd->act.dnrpipe) { dnflow->rule.info = pd->act.dnrpipe; } - else if (dir == dndir && pd->act.dnpipe) { + else if (pd->dir == dndir && pd->act.dnpipe) { dnflow->rule.info = pd->act.dnpipe; } else { @@ -7052,14 +7048,14 @@ pf_test_eth(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, } static int -pf_dummynet(struct pf_pdesc *pd, int dir, struct pf_kstate *s, +pf_dummynet(struct pf_pdesc *pd, struct pf_kstate *s, struct pf_krule *r, struct mbuf **m0) { - return (pf_dummynet_route(pd, dir, s, r, NULL, NULL, m0)); + return (pf_dummynet_route(pd, s, r, NULL, NULL, m0)); } static int -pf_dummynet_route(struct pf_pdesc *pd, int dir, struct pf_kstate *s, +pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, struct pf_krule *r, struct ifnet *ifp, struct sockaddr *sa, struct mbuf **m0) { @@ -7105,7 +7101,7 @@ pf_dummynet_route(struct pf_pdesc *pd, int dir, struct pf_kstate *s, sizeof(struct sockaddr_in6)); } - if (pf_pdesc_to_dnflow(dir, pd, r, s, &dnflow)) { + if (pf_pdesc_to_dnflow(pd, r, s, &dnflow)) { pd->pf_mtag->flags |= PF_MTAG_FLAG_DUMMYNET; ip_dn_io_ptr(m0, &dnflow); if (*m0 != NULL) { @@ -7213,6 +7209,14 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, return (PF_PASS); } + pd.sport = pd.dport = NULL; + pd.proto_sum = NULL; + pd.dir = dir; + pd.sidx = (dir == PF_IN) ? 0 : 1; + pd.didx = (dir == PF_IN) ? 1 : 0; + pd.af = AF_INET; + pd.act.rtableid = -1; + if (__predict_false(ip_divert_ptr != NULL) && ((ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(ipfwtag+1); @@ -7229,7 +7233,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, m->m_flags |= M_FASTFWD_OURS; pd.pf_mtag->flags &= ~PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; } - } else if (pf_normalize_ip(m0, dir, kif, &reason, &pd) != PF_PASS) { + } else if (pf_normalize_ip(m0, kif, &reason, &pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ action = PF_DROP; goto done; @@ -7247,22 +7251,14 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, pd.src = (struct pf_addr *)&h->ip_src; pd.dst = (struct pf_addr *)&h->ip_dst; - pd.sport = pd.dport = NULL; pd.ip_sum = &h->ip_sum; - pd.proto_sum = NULL; pd.proto = h->ip_p; - pd.dir = dir; - pd.sidx = (dir == PF_IN) ? 0 : 1; - pd.didx = (dir == PF_IN) ? 1 : 0; - pd.af = AF_INET; pd.tos = h->ip_tos & ~IPTOS_ECN_MASK; pd.tot_len = ntohs(h->ip_len); - pd.act.rtableid = -1; /* handle fragments that didn't get reassembled by normalization */ if (h->ip_off & htons(IP_MF | IP_OFFMASK)) { - action = pf_test_fragment(&r, dir, kif, m, h, - &pd, &a, &ruleset); + action = pf_test_fragment(&r, kif, m, h, &pd, &a, &ruleset); goto done; } @@ -7289,11 +7285,10 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if ((pd.hdr.tcp.th_flags & TH_ACK) && pd.p_len == 0) pqid = 1; - action = pf_normalize_tcp(dir, kif, m, 0, off, h, &pd); + action = pf_normalize_tcp(kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; - action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd, - &reason); + action = pf_test_state_tcp(&s, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -7319,8 +7314,8 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, m_freem(msyn); if (action == PF_PASS) { - action = pf_test_state_tcp(&s, dir, - kif, m, off, h, &pd, &reason); + action = pf_test_state_tcp(&s, kif, m, + off, h, &pd, &reason); if (action != PF_PASS || s == NULL) { action = PF_DROP; break; @@ -7340,7 +7335,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, break; } else { - action = pf_test_rule(&r, &s, dir, kif, m, off, + action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); } } @@ -7368,7 +7363,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, REASON_SET(&reason, PFRES_SHORT); goto done; } - action = pf_test_state_udp(&s, dir, kif, m, off, h, &pd); + action = pf_test_state_udp(&s, kif, m, off, h, &pd); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -7376,7 +7371,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, a = s->anchor.ptr; log = s->log; } else if (s == NULL) - action = pf_test_rule(&r, &s, dir, kif, m, off, &pd, + action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); break; } @@ -7388,8 +7383,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, log = PF_LOG_FORCE; goto done; } - action = pf_test_state_icmp(&s, dir, kif, m, off, h, &pd, - &reason); + action = pf_test_state_icmp(&s, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -7397,7 +7391,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, a = s->anchor.ptr; log = s->log; } else if (s == NULL) - action = pf_test_rule(&r, &s, dir, kif, m, off, &pd, + action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); break; } @@ -7412,7 +7406,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, #endif default: - action = pf_test_state_other(&s, dir, kif, m, &pd); + action = pf_test_state_other(&s, kif, m, &pd); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -7420,7 +7414,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, a = s->anchor.ptr; log = s->log; } else if (s == NULL) - action = pf_test_rule(&r, &s, dir, kif, m, off, &pd, + action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); break; } @@ -7574,13 +7568,13 @@ done: lr = r; if (log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) - PFLOG_PACKET(kif, m, AF_INET, dir, reason, lr, a, - ruleset, &pd, (s == NULL)); + PFLOG_PACKET(kif, m, AF_INET, reason, lr, a, ruleset, + &pd, (s == NULL)); if (s) { SLIST_FOREACH(ri, &s->match_rules, entry) if (ri->r->log & PF_LOG_ALL) - PFLOG_PACKET(kif, m, AF_INET, dir, - reason, ri->r, a, ruleset, &pd, 0); + PFLOG_PACKET(kif, m, AF_INET, reason, + ri->r, a, ruleset, &pd, 0); } } @@ -7664,10 +7658,10 @@ done: default: /* pf_route() returns unlocked. */ if (rt) { - pf_route(m0, r, dir, kif->pfik_ifp, s, &pd, inp); + pf_route(m0, r, kif->pfik_ifp, s, &pd, inp); return (action); } - if (pf_dummynet(&pd, dir, s, r, m0) != 0) { + if (pf_dummynet(&pd, s, r, m0) != 0) { action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); } @@ -7774,8 +7768,17 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb return (PF_PASS); } + pd.sport = pd.dport = NULL; + pd.ip_sum = NULL; + pd.proto_sum = NULL; + pd.dir = dir; + pd.sidx = (dir == PF_IN) ? 0 : 1; + pd.didx = (dir == PF_IN) ? 1 : 0; + pd.af = AF_INET6; + pd.act.rtableid = -1; + /* We do IP header normalization and packet reassembly here */ - if (pf_normalize_ip6(m0, dir, kif, &reason, &pd) != PF_PASS) { + if (pf_normalize_ip6(m0, kif, &reason, &pd) != PF_PASS) { action = PF_DROP; goto done; } @@ -7794,24 +7797,16 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb pd.src = (struct pf_addr *)&h->ip6_src; pd.dst = (struct pf_addr *)&h->ip6_dst; - pd.sport = pd.dport = NULL; - pd.ip_sum = NULL; - pd.proto_sum = NULL; - pd.dir = dir; - pd.sidx = (dir == PF_IN) ? 0 : 1; - pd.didx = (dir == PF_IN) ? 1 : 0; - pd.af = AF_INET6; pd.tos = IPV6_DSCP(h); pd.tot_len = ntohs(h->ip6_plen) + sizeof(struct ip6_hdr); - pd.act.rtableid = -1; off = ((caddr_t)h - m->m_data) + sizeof(struct ip6_hdr); pd.proto = h->ip6_nxt; do { switch (pd.proto) { case IPPROTO_FRAGMENT: - action = pf_test_fragment(&r, dir, kif, m, h, - &pd, &a, &ruleset); + action = pf_test_fragment(&r, kif, m, h, &pd, &a, + &ruleset); if (action == PF_DROP) REASON_SET(&reason, PFRES_FRAG); goto done; @@ -7888,11 +7883,10 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb pd.p_len = pd.tot_len - off - (pd.hdr.tcp.th_off << 2); pd.sport = &pd.hdr.tcp.th_sport; pd.dport = &pd.hdr.tcp.th_dport; - action = pf_normalize_tcp(dir, kif, m, 0, off, h, &pd); + action = pf_normalize_tcp(kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; - action = pf_test_state_tcp(&s, dir, kif, m, off, h, &pd, - &reason); + action = pf_test_state_tcp(&s, kif, m, off, h, &pd, &reason); if (action == PF_PASS) { if (V_pfsync_update_state_ptr != NULL) V_pfsync_update_state_ptr(s); @@ -7900,7 +7894,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb a = s->anchor.ptr; log = s->log; *** 308 LINES SKIPPED *** From nobody Wed Jul 12 20:09:28 2023 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 4R1TNS256Nz4mlb7; Wed, 12 Jul 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1TNS1gM1z3q87; Wed, 12 Jul 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689192568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95B/IzEsFk5RXM+NLQ+5g6BiVuB8MX2n9+gxoPpLZOQ=; b=LQsw0btez7s32BZ1TdYAbJbAJunWtaSl0FjT04132WlrE+x/QBaiQwM3fVdZGBdsM5lLgF w64GZGzaQcj/Yu18ihMtm3YBbBHbvOpq1u5v7yHTukfumGMH7KtW8c1LjPQpQBaj4/Ju6W 2chLUT04tZ5JSAROW8MSsv0oksvWrOxFrCw1xiv6RHYRKa+wYWUJ1riHFVyHqST0d1hKat f5k+ho6JQ0exM1DxXkF2C+6cIx+h4PdaSL31OsF+WVEzyEao5nJ4bbC3NXBqFpSy/ks5eo IdGNqb0wQLHD4li+2Ocw12TGNdcHcrpf8fEwRP/FoZ8yc3VO2algUIDtrkHacQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689192568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=95B/IzEsFk5RXM+NLQ+5g6BiVuB8MX2n9+gxoPpLZOQ=; b=CN7WUWA+s/Sty6V0IDS8a2rQXmPv85m3lIKOQBnGwvIQYqTRuuF1i8BahqJVTM32q9woVS byxJhHAEY90Pii5+2EuNqRfGUM9N/DpLiYcGg4PxS86ARyrfsH7MbbbcUpo3N6ttNKs74r 2imansmbZsrKqI7YoumZDZ3VnUmU6/sDnOg6YDycQdneTe46jRtMpf2pomVpzMvTudRmFs 390eI3dUfLnEEBFMmau79pCkcCfjeyX7Ept3WRhqRgZT3oT0iw0c5Kb6XaNRaZ3LO5BQNS tyXhC4KcZ4B5Mjj0uKR3yG9+I1yrCW7QP9S8q+eF3Z9Kb0RnpAb54/vZ8EP3oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689192568; a=rsa-sha256; cv=none; b=Tx1VGcXVfN1p96pevHvY9Xb/1xAWByYnH8BZy7eijeHPU0TTyzF64OHd64GywWzScLNvMd MqIpHdOFrlSMdPLGw9rGhOB9PETBkgXfNpn64ex9XndRnRODOq7EGzy6Pjk1ta8Ll+20/w iBSNzNoS3AClN2Wg/lHncmpl49kIDpoRGzvrasJUkGmNwmlnPD2mknoUw9vCnUfg/zE+yC 67wpgBS5nk10vQSd2gtOsMj+inIpQTJmJ+sY7MDRKyBQcKvHf07nUFlxXVv7/y6s9ybGoL c2WWfXMeCornwOA1gPd92br9ns3uE650nxqjyzOsyKtkbKaQKntL5f6eqpAXjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1TNS0lFDzN4w; Wed, 12 Jul 2023 20:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CK9SjT091328; Wed, 12 Jul 2023 20:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CK9SJ4091327; Wed, 12 Jul 2023 20:09:28 GMT (envelope-from git) Date: Wed, 12 Jul 2023 20:09:28 GMT Message-Id: <202307122009.36CK9SJ4091327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 0ed426276fd5 - main - release: ensure gce-check-depends installs lang/python{,3} 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ed426276fd52e917506ab87c05a61c6641ae298 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed426276fd52e917506ab87c05a61c6641ae298 commit 0ed426276fd52e917506ab87c05a61c6641ae298 Author: Glen Barber AuthorDate: 2023-07-12 20:08:40 +0000 Commit: Glen Barber CommitDate: 2023-07-12 20:08:40 +0000 release: ensure gce-check-depends installs lang/python{,3} PR: 272354 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd --- release/Makefile.gce | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index fac6918eab34..ff260726a844 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -49,6 +49,8 @@ gce-check-depends: env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean . endif .endif From nobody Wed Jul 12 20:50:38 2023 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 4R1VHz01vGz4my7k; Wed, 12 Jul 2023 20:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1VHy6PrPz3yjQ; Wed, 12 Jul 2023 20:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689195038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUzfJ7v8d0VD0dNHpaZH/Xn8xMcLEgdaL/eL0OEyiEg=; b=aWRvqo65OiYRQpHRWmapBBKlrW4F37IcB+90qrbKPWsNLTQoMi4MDX/xOO3P3tDuJx3DFv +zdw/Jg5gajtoP7aR0HSzAD0yznnSghG265uQ+p1J40XP7rSPgcDKHcnB4zyW4MbCGcNQc v4juJjbjVFit+IBdVPOAdTcPEwJZhpbgzMmb7uVld52XHSauPr8QymZ8TguFm/MI1B4vNg iiAroPYEEEduuPE0l+AKtzRFrZP3T1mM6R2f8NhOU/Bqu/KIg20YhmVnHz9OH6yuWLUqc0 hNcyNLZ7BqpZUeq8wE1X2PVNBFR2fO1x8cqD9/llcUpA0AvKzJzydvH43TyWNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689195038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XUzfJ7v8d0VD0dNHpaZH/Xn8xMcLEgdaL/eL0OEyiEg=; b=F1Ms6/hojcy4BoaL395HYwhDGIJTjTj+mFlKhYmiqn/1cb0b7lHZrpgnSqSNavltGJ8mt7 yRBh+Nr/34v/ddJaXiHf150/+r3QC/km43ucH5tu3vhx2tf83/9KIfFJ7Chhsk6UkcM01I /ufdEULlDRhuwW0OlxbQqgitRKr09Ad/uW1+1zg0GBVNteyNIVlgZLotBWpCpdUVwG/Ft6 XZCvp1y3HZmSnnBne9T5nHNDFPu/H1eW2A7ANsMAhXhNwWKcQ/Xxtn3ArURgLkdpN0cBim atQMzOPVLGPfQRKiwmyBMvFl3Zvu3XJ9kAY7bfP8N//8gLRffJWWZQhjZwdjbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689195038; a=rsa-sha256; cv=none; b=bjwSG6RAT3YQ4+vexgqxzjPJGZKjsk9+ObERiyXoQpEUp9UMzjHaQBjn74LI7eGim1Ic6t uMi1W/iVRnqjPjKJXF3BC7YC7ZSDcjda4AlniL/QjIPFREAmsEyiu2XzyMkfD7vvTDUu6N ToqL8gGYjSLEMavxVnF5V/ZOOrFvgjPKtP5kvvUZgqFQhqzFf+2olLoBbo5w6pgJwSkK57 32EdXm/xUOjXobyEwzfbC5/afu2k0WQdWUd8AdMlTFFW+Sa2N4rlfHDf0G3XOJCx0ArLbE 00f6nuZNc/LDNxx9gwDGTnWf/zUmXep2BFzUJnCmvLYNgTuDSEt2M2shHXROiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1VHy5RKzzPLp; Wed, 12 Jul 2023 20:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CKoc6k067656; Wed, 12 Jul 2023 20:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CKocRi067655; Wed, 12 Jul 2023 20:50:38 GMT (envelope-from git) Date: Wed, 12 Jul 2023 20:50:38 GMT Message-Id: <202307122050.36CKocRi067655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: cd8cad0ef5cd - main - release: follow-up to previous commit to install lang/python{,3} 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 commit cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 Author: Glen Barber AuthorDate: 2023-07-12 20:49:53 +0000 Commit: Glen Barber CommitDate: 2023-07-12 20:49:53 +0000 release: follow-up to previous commit to install lang/python{,3} PR: 272354 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd --- release/Makefile.gce | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release/Makefile.gce b/release/Makefile.gce index ff260726a844..ff364c9287c5 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -47,6 +47,8 @@ gce-check-depends: env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk + env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \ + net/google-cloud-sdk . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean From nobody Wed Jul 12 20:59:12 2023 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 4R1VTr6sWyz4n0gv; Wed, 12 Jul 2023 20:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1VTr6NVnz41VY; Wed, 12 Jul 2023 20:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689195552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcdO8dgXU6E8LATUknYseXrUEbBwhQxqQd+DJf4Bty8=; b=ereX0/0e0qna/k9AcdFzO+eAIRtxKU5NM584/OLEfd9BsZKhj0OW+qn2YJcT+60g4POnaz nmDMoT4ZgiMSSlZlKtT9ZFyEtd3iden7MT5l2irtFWR6rj2EZT8HRGyi4bs2cVsFpuexue uA0WdfXNyTMupykVKqlP+yvwlrJAI+nbkMUaZfbeIaCYryoOKqgTjfl/05gYUHpGOTk3U9 nCux7YIiIzl9fyCuWkS/V9yPa1QcxRQqdmYehMxik+aGBwjueTSNO6qWBx8tkZZNojd7xk Y0ZP96LN5Ra4hFQrbjhE7jUuEhrqLru09lR/5shOtKiEv9hdLn/2QlEKwV8wbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689195552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcdO8dgXU6E8LATUknYseXrUEbBwhQxqQd+DJf4Bty8=; b=LtlONNpFHGYVSshlOD21IKdKhvOVf/ORKnErjikEPxf60qKU0hrDVf776cXPLGCw3PV0PM SK9wnVA6qOj3epBr36hNnSut8G/T5z2Ws8lPoBNVm7rqpLuEErRhd6puIuBggVxuojK+Av qmUUXWHLt57BtABOtNctLsHA9ncDKSFK/GVjkUzFW0IWmIKnlqz6e5P5GeTq14tsMb2NZQ uvhnbuoURXZaRmCU/FPTOsbdUy9WouHmYLIbTSlasTU2YJq2KIfXbavmvQRrNq702p2Nqs vPMv6V+PjJeTVLrT4+EAjyJBlUD4wn0dtYOsVGNjRUn8J0EV0iCmxQ5wVCN8PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689195552; a=rsa-sha256; cv=none; b=U+9ZT9mxFxqz16ruiI2jflppPB0scvgs5SjsyDPlY5QjijqUJKbUq4pZvAnTdMcMhce12C 4+bF1YsAxdzZ/h3CjL7SFTO/zba8HEIHuVj44ZwFYMY7YfkmXKHiRogKD2aW4kac11OMvL GqSdv+DxAdUj5ZH0DRP9cgGOyEXnUiOBaycxppiWOuoFACcOFJUzNleou92sWlK+vwHYBi fcwVZBtOu8OZ9RCUtseQwOwHmEcZKaAvvdcGwVaVySQ8dkEDe+ylRlL57IL3HnE3DPl2fz i3ZGFmZKCs7gL/Jq2OE9ON/uQeEmpBeBTluIka/5WWkvxn3MjX8GuxMkZMla0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1VTr5LYFzPXm; Wed, 12 Jul 2023 20:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36CKxC4v072992; Wed, 12 Jul 2023 20:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CKxCqa072991; Wed, 12 Jul 2023 20:59:12 GMT (envelope-from git) Date: Wed, 12 Jul 2023 20:59:12 GMT Message-Id: <202307122059.36CKxCqa072991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 510fd8313800 - main - release: remove a stray backslash 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 510fd83138001b0a6e45b3fa6a7249377f806171 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=510fd83138001b0a6e45b3fa6a7249377f806171 commit 510fd83138001b0a6e45b3fa6a7249377f806171 Author: Glen Barber AuthorDate: 2023-07-12 20:57:57 +0000 Commit: Glen Barber CommitDate: 2023-07-12 20:57:57 +0000 release: remove a stray backslash PR: 272354 (related) MFC after: 3 days MFC with: 0ed426276fd52e917506ab87c05a61c6641ae298 MFC with: cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd --- release/tools/gce.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 725709e3f335..48f95a82b3c8 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -8,7 +8,7 @@ export VMSIZE=20g # Set to a list of packages to install. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ - firstboot-pkgs \ google-cloud-sdk panicmail sudo \ + firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" From nobody Thu Jul 13 01:18:20 2023 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 4R1cDr4KkRz2tnsC; Thu, 13 Jul 2023 01:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1cDr3lVSz3wZX; Thu, 13 Jul 2023 01:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1f95syRYXRrmQL8APLlCrKCXbNAOOTZYByQqheNehE=; b=E4eta8FFqtgnfyMTR3euFNvheAxCgdXZrxw3zCNIGl7akoPy0qwUl6z4AsKxh096/LNLNz 4EgZe36UwwrTq/yt9Tid2NAGYnjXRhgMgsCkXvCBi1m/oZABVDeZW5n+KOCeIulajdgkqG 9JjOuEmNirUSST6fPfro2ABrwK8JG1V25jxpgDgnpEDC9FQB3oaK7s3L3CRWrPNIQ1ZPrP ImMKisDyl6Xs5FMcfm3Btj5DrHNjIEZ937CeqrxZatwnPQc4oxH9RAbumXd+tvPDet5JQE 3PCgyYkdVVtcIqmAZdDaqrzS141ul99l+NBBTwUGxPTpNl1th9G0oNxpsGd5yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E1f95syRYXRrmQL8APLlCrKCXbNAOOTZYByQqheNehE=; b=EZ6Pltjn0RHK26AETmvgAUKjj5Z3azLmuflPIWkKWjrIvRJUfsZiRmyj5kDTAvENZIV2wt 9flTax9hEZx/jy56u+67RpYMhBFfnTxyCI958nwn3thfKqSxIYEbvppL2BRxx48xNRwyXA Seffi3R7+j+orm+0fT8l9JAstgX07d29rWnfSSbnYd52mkIU3q1MBOTJkLpfBBY2PEfYbG B3AitwTssJZ9dMXgTPdYh6ba96WLSOm5+pR1B6J1lgISHPKsxBUNWqXrbkja/6ZHDltJUY AufC+Y2r8QopWX+PHEDsQHJrZOQjrDB7/BeRz5rhytvsJ7CN242J7vWqYTE0uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689211100; a=rsa-sha256; cv=none; b=h3RqtWB8FDYEr0fwXH3Xf/9LK7CWd7aBFfPzEJYe8ZdUfSBbwQZUC/amBDY1LMw4yn77/e BNLfNF3+z02Ah0h8w4oZgjr8lwD2bRxUNKQQZ3Y0SgUQ0b/PfMWj01HjoSUUChMJyu8SQO BqSZtwhxPjHpwL0mqXM+qcxw8VqlcN8ghg4FrwLLh/Ga5ngvqumyVo/8CWkxzQRcC6kwzJ G2S5VXV8Y5QtBcrmSlnyfIsbhy3AvYoBy3LZXPhO+mgN1e1JGW3ZvEf9Hax2LdNQtuQfs9 QWPoN9IReyg6xx3uoRAWHw0+BLGXG30Y8A1BhqQDbXg1ubIWFDR0EU+pizfTQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1cDr2jHpzX5Y; Thu, 13 Jul 2023 01:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D1IKEw005014; Thu, 13 Jul 2023 01:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D1IKoh005013; Thu, 13 Jul 2023 01:18:20 GMT (envelope-from git) Date: Thu, 13 Jul 2023 01:18:20 GMT Message-Id: <202307130118.36D1IKoh005013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9c3bfe2ad071 - main - Revert "VFS: Remove VV_READLINK flag" and "fdescfs: improve linrdlnk mount option" 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c3bfe2ad07170cd7d3645a7c24f4d80a509c2b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c3bfe2ad07170cd7d3645a7c24f4d80a509c2b7 commit 9c3bfe2ad07170cd7d3645a7c24f4d80a509c2b7 Author: Konstantin Belousov AuthorDate: 2023-07-11 04:58:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:14:12 +0000 Revert "VFS: Remove VV_READLINK flag" and "fdescfs: improve linrdlnk mount option" This reverts commits 4a402dfe0bc44770c9eac6e58a501e4805e29413 and 3bffa2262328e4ff1737516f176107f607e7bc76. The fix will be implemented in somewhat different manner. The semantic adjustment is incompatible with linuxolator expectations. Reported and reviewed by: dchagin Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40969 --- sys/fs/fdescfs/fdesc_vnops.c | 8 +++----- sys/kern/vfs_subr.c | 4 +++- sys/kern/vfs_syscalls.c | 2 +- sys/sys/vnode.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 3f6fca16c715..1c4b6d0c6cdb 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -190,9 +190,8 @@ loop: fd->fd_type = ftype; fd->fd_fd = fd_fd; fd->fd_ix = ix; - /* Cannot set v_type to VCHR */ - if (ftype == Fdesc && (fmp->flags & FMNT_LINRDLNKF) != 0) - vp->v_type = VLNK; + if (ftype == Fdesc && fmp->flags & FMNT_LINRDLNKF) + vp->v_vflag |= VV_READLINK; error = insmntque1(vp, mp); if (error != 0) { vgone(vp); @@ -458,8 +457,7 @@ fdesc_getattr(struct vop_getattr_args *ap) break; case Fdesc: - vap->va_type = (VFSTOFDESC(vp->v_mount)->flags & - FMNT_LINRDLNKF) == 0 ? VCHR : VLNK; + vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK; vap->va_nlink = 1; vap->va_size = 0; vap->va_rdev = makedev(0, vap->va_fileid); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index b7d43863a228..25efabf3acc7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -4284,9 +4284,11 @@ vn_printf(struct vnode *vp, const char *fmt, ...) strlcat(buf, "|VV_MD", sizeof(buf)); if (vp->v_vflag & VV_FORCEINSMQ) strlcat(buf, "|VV_FORCEINSMQ", sizeof(buf)); + if (vp->v_vflag & VV_READLINK) + strlcat(buf, "|VV_READLINK", sizeof(buf)); flags = vp->v_vflag & ~(VV_ROOT | VV_ISTTY | VV_NOSYNC | VV_ETERNALDEV | VV_CACHEDLABEL | VV_VMSIZEVNLOCK | VV_COPYONWRITE | VV_SYSTEM | - VV_PROCDEP | VV_DELETED | VV_MD | VV_FORCEINSMQ); + VV_PROCDEP | VV_DELETED | VV_MD | VV_FORCEINSMQ | VV_READLINK); if (flags != 0) { snprintf(buf2, sizeof(buf2), "|VV(0x%lx)", flags); strlcat(buf, buf2, sizeof(buf)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 52145ece7120..d68af4ea4d51 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -2677,7 +2677,7 @@ kern_readlink_vp(struct vnode *vp, char *buf, enum uio_seg bufseg, size_t count, if (error != 0) return (error); #endif - if (vp->v_type != VLNK) + if (vp->v_type != VLNK && (vp->v_vflag & VV_READLINK) == 0) return (EINVAL); aiov.iov_base = buf; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index e7ebc39ada1d..d8fd580facb5 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -270,7 +270,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VV_DELETED 0x0400 /* should be removed */ #define VV_MD 0x0800 /* vnode backs the md device */ #define VV_FORCEINSMQ 0x1000 /* force the insmntque to succeed */ -#define VV_UNUSED01 0x2000 /* was: fdescfs linux vnode */ +#define VV_READLINK 0x2000 /* fdescfs linux vnode */ #define VV_UNREF 0x4000 /* vunref, do not drop lock in inactive() */ #define VV_CROSSLOCK 0x8000 /* vnode lock is shared w/ root mounted here */ From nobody Thu Jul 13 01:18:21 2023 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 4R1cDt0dWwz2tnsJ; Thu, 13 Jul 2023 01:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1cDs4X7Bz3wgZ; Thu, 13 Jul 2023 01:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+cMBBcrum4tKFu91NXHqGxflZ/wb7Sw6tPaEjrma5eY=; b=ZW+MnJU6GGYORL/bG1MpeFGju5DLKba+FCJw2GmDfN4vgIHP4JZ4qU59KgKC25rF1vnPvu Xewxr/gn/r6yFQfQEF5GFFR9S4Oe/V+XOzbrF8rGkklTtiGaps62YSPwaV9zjA2LUWAbG1 zIaQyWKQZ+5Po+qCKquK5BWD3gHy/SjBS3+S+R5Z/W+EtrtaxIjiTNU07lmiD4AM3KBEZX 5jaeKdsYRZ/UW7oO+mRCb6oHOdYLWeEeuAP5sOn+viyz2877v/0MUmMQaBUQnVcd+GWhtc AAzpsBZaSvexdnMYFKNyfgjGgOgBU0aCUG/eXFIZOfTNUDsD2AUTkMGWKG17ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+cMBBcrum4tKFu91NXHqGxflZ/wb7Sw6tPaEjrma5eY=; b=xssuTCuWHUzp0mzlSdwk6xE8nBJPFAXSgq6fLmZcWrdsYL5tpIBPnhzKq+nnu78q0GHI3D Xi3Nw+XycVm/50CCEPFtjz0+y/AY8Gfwg6ZSYn2fThJ35Q8LzIYW0RnCuFTwe3XtzVyHlb Y8hDofTcNhMWqoFQ8AivQgYC5OJvC4jGzcU1TWkWQtlMkptbsmOeUIcSYX+4+4JG4/71EQ XFFCfGE9X7KMfkOlghvopg4QzXVTI4Ua1gKcQC5P3niJkuxurNs1z9CNIerBm7wzoCMoFo 8vERQZ0bmS387tmTsP7w35qY/zh1kP3GPmpUZIl2kmryZEL6ay5hOeA78sUSrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689211101; a=rsa-sha256; cv=none; b=tRtwUvFPUVX028mcTLIy/zUGddyI8htxadVTsO7yECCcDhIZuGd47vZRNsjzdJVKxx8NmN rca2MsEkC7fljSt2g2Mj6aFvQPiZ5TeqkkbYJx75+USXhuAMdjEAo9k0Jm7sc9hmsFaLN+ Jcq7MO6SDEFSbU3lYslWVvT0pvsrWYgepYEHZfcwyu1gf/wQHT20YTeimm7PQhBp7x7jDD WrsD2ouzYoNTVc4yQyalUYpAk+Yaqt5TYGHyCb76AlH0O/i5aob4bnMqMbPRvoZgw0sIBX biJRXaZFIvTo7SdqCDaPjlwoYWJ1XsQlfp64tAPkKqCZGUf5lpQ/EtCsvdJBEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1cDs3NMWzWjL; Thu, 13 Jul 2023 01:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D1ILJr005033; Thu, 13 Jul 2023 01:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D1IL2k005032; Thu, 13 Jul 2023 01:18:21 GMT (envelope-from git) Date: Thu, 13 Jul 2023 01:18:21 GMT Message-Id: <202307130118.36D1IL2k005032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3905309dfeeb - main - fdescfs: add a mount option rdlnk 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3905309dfeeb89f03b09c347f7ac0a863faa3975 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3905309dfeeb89f03b09c347f7ac0a863faa3975 commit 3905309dfeeb89f03b09c347f7ac0a863faa3975 Author: Konstantin Belousov AuthorDate: 2023-07-11 05:03:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:14:20 +0000 fdescfs: add a mount option rdlnk which changes /dev/fd/N files types to symbolic link with the behavior of symbolic links. PR: 272127 Reported by: Peter Eriksson Reviewed by: dchagin Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40969 --- sys/fs/fdescfs/fdesc.h | 1 + sys/fs/fdescfs/fdesc_vfsops.c | 2 ++ sys/fs/fdescfs/fdesc_vnops.c | 15 ++++++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h index 94682f42cdb3..b51ac9f32ac1 100644 --- a/sys/fs/fdescfs/fdesc.h +++ b/sys/fs/fdescfs/fdesc.h @@ -43,6 +43,7 @@ #define FMNT_UNMOUNTF 0x01 #define FMNT_LINRDLNKF 0x02 #define FMNT_NODUP 0x04 +#define FMNT_RDLNKF 0x08 struct fdescmount { struct vnode *f_root; /* Root node */ diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index 2961c3bf6224..d0d518245e92 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -100,6 +100,8 @@ fdesc_mount(struct mount *mp) fmp->flags = 0; if (vfs_getopt(mp->mnt_optnew, "linrdlnk", NULL, NULL) == 0) fmp->flags |= FMNT_LINRDLNKF; + if (vfs_getopt(mp->mnt_optnew, "rdlnk", NULL, NULL) == 0) + fmp->flags |= FMNT_RDLNKF; if (vfs_getopt(mp->mnt_optnew, "nodup", NULL, NULL) == 0) fmp->flags |= FMNT_NODUP; error = fdesc_allocvp(Froot, -1, FD_ROOT, mp, &rvp); diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 1c4b6d0c6cdb..9aa844360256 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -190,8 +190,12 @@ loop: fd->fd_type = ftype; fd->fd_fd = fd_fd; fd->fd_ix = ix; - if (ftype == Fdesc && fmp->flags & FMNT_LINRDLNKF) - vp->v_vflag |= VV_READLINK; + if (ftype == Fdesc) { + if ((fmp->flags & FMNT_RDLNKF) != 0) + vp->v_type = VLNK; + else if ((fmp->flags & FMNT_LINRDLNKF) != 0) + vp->v_vflag |= VV_READLINK; + } error = insmntque1(vp, mp); if (error != 0) { vgone(vp); @@ -457,7 +461,8 @@ fdesc_getattr(struct vop_getattr_args *ap) break; case Fdesc: - vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK; + vap->va_type = (VFSTOFDESC(vp->v_mount)->flags & + (FMNT_RDLNKF | FMNT_LINRDLNKF)) == 0 ? VCHR : VLNK; vap->va_nlink = 1; vap->va_size = 0; vap->va_rdev = makedev(0, vap->va_fileid); @@ -575,8 +580,8 @@ fdesc_readdir(struct vop_readdir_args *ap) break; dp->d_namlen = sprintf(dp->d_name, "%d", fcnt); dp->d_reclen = UIO_MX; - dp->d_type = (fmp->flags & FMNT_LINRDLNKF) == 0 ? - DT_CHR : DT_LNK; + dp->d_type = (fmp->flags & (FMNT_RDLNKF | + FMNT_LINRDLNKF)) == 0 ? DT_CHR : DT_LNK; dp->d_fileno = i + FD_DESC; dirent_terminate(dp); break; From nobody Thu Jul 13 01:18:22 2023 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 4R1cDt5SrRz2tny2; Thu, 13 Jul 2023 01:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1cDt4tLSz3wjS; Thu, 13 Jul 2023 01:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iY4koP5ZNpJcM1dyjydzJrmxsViXK5Z6LTp3adFWgUI=; b=Rb2KOVXQUX8tG6ZxFNYll2NfiiEjg1m13y+YxNPFRU713HDdi0bc9/d/4isBneGvv6uxB8 pJRPYdUtJ8d25O0d5LWEuLKQ5IRlg/9PpSfUbVxxRR++IgrhWERiqCy45IM9hIed/eqMrP y/ms0kyA0ydCu9wnrT/XDmBMB0bM4asF8Z8oS+fv3GnH4lWFvjWOJmBYsjIbVOIhHzqx5S 9I9Ca3gpk57cMorwIHnDf8Kk2+05FObN+uRvLHeeuk85OtUnbjaZ28F6tQx7HYAxXPgAY+ YCE7Wr8a1vTt1XeOXH9Tx+AJOMqF7RyJwyrQkpdmvc9z8lz5TQKXMU8T8fDNPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689211102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iY4koP5ZNpJcM1dyjydzJrmxsViXK5Z6LTp3adFWgUI=; b=t4vB1SOkIHyKw4hPdHngXjVEkn7QLDPI+vuc/A3UrXE+JK5OftLhnhaGj1eGln7sULdJu/ 50lYQ3SfHF3tILoOH1yifBUqggZbLVx7hcTdobA1A4Z/4SKk4UXqE0YRrPsWfYc+0aWTSL Z7uc8SkgNiK0Bne0B5iMR/qFWA0TNsQTlP6D7s68swpZ2J3MhZsh8BPixdSVwCG5/XhLog ISab2g0g9+YZpHYV/Rt3OFv2KgKaN8yBJrqdK21FAGWz1aQa5Xwh1FYTQX4XbMPX6sNP3O jjdaB/mOs4weuHfPR6Cg0neBPOnXPBdb0wKJakSeT1bt2IF+bVDoPYgLjFLf9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689211102; a=rsa-sha256; cv=none; b=BsY36kbrgDzqLYqfDpyTFOWAPfRsK9VOSxFvGeqIKOdW67Xxnp/MVjc+7xmi8yAOShk8Uj +8nn1HOuug3hntkJ3IHQLcgmQ8zQlsSJLdzjQ5Z2bpO6fIl0gyIQeLMvxUCfQepUh7/y0i svegIDo0HLaim6WJ55dCQi9XcOdSjU1kCr4/0+2WeYxHwKnNZdF24ngQm26/RlALHaM1Ij 0xgkhv2oryeAItC99+gxLjWiE/DVelJMxLdreQf0VdPKzc9CrE7nV51HUBSErTY9EteK7U UDGkW0D2NEXghG1Bx9XfrtvoopmePVkCITKEzBIVpG5RP5JbhGPj7EZdrCxSzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1cDt3zYvzWxL; Thu, 13 Jul 2023 01:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D1IMwR005052; Thu, 13 Jul 2023 01:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D1IMel005051; Thu, 13 Jul 2023 01:18:22 GMT (envelope-from git) Date: Thu, 13 Jul 2023 01:18:22 GMT Message-Id: <202307130118.36D1IMel005051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7cd7a3204153 - main - Document fdescfs mount option "rdlnk" 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cd7a3204153fc8ddf7d06cd0d924d5c3ef5ff35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7cd7a3204153fc8ddf7d06cd0d924d5c3ef5ff35 commit 7cd7a3204153fc8ddf7d06cd0d924d5c3ef5ff35 Author: Konstantin Belousov AuthorDate: 2023-07-11 05:09:11 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-13 01:14:29 +0000 Document fdescfs mount option "rdlnk" Reviewed by: dchagin Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40969 --- share/man/man5/fdescfs.5 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5 index f2abda2bb4c2..6355951eb714 100644 --- a/share/man/man5/fdescfs.5 +++ b/share/man/man5/fdescfs.5 @@ -40,7 +40,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 17, 2021 +.Dd Jul 11, 2023 .Dt FDESCFS 5 .Os .Sh NAME @@ -94,6 +94,18 @@ ABI compatibility mount volume with the .Cm linrdlnk option. +.It Cm rdlnk +Treat +.Nm +vnodes as symbolic links consistently, in particular, follow +the resolved name for the name lookups. +This option is strictly stronger than the +.Cm linrdlnk +option, it changes not only the type returned by +.Xr stat 2 , +but also causes the +.Nm +files to behave as symlinks. .El .Pp For From nobody Thu Jul 13 05:24:11 2023 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 4R1jhW3gt3z4mj83; Thu, 13 Jul 2023 05:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1jhW3Clrz3mCK; Thu, 13 Jul 2023 05:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689225851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXtYk7ACadyI9P30liHLcmcUMuLR8iMfE9EWcQFOJ+g=; b=uPPs1oZINoPLr5bN3rML9pLpEWyVXU04GvRUwo+DXOQbJWQTRtSv10ORxQ38cugRb/0Z6S nJ3FWDayE7T06IBt2NwbJdKhrQ5ZMnqHSuctpE+TAJ4AUxVjAnFSXee1fjs2cRCmSNBjea RcTfDAvF8csb0dxNyOz9XqUBsyX1P8GJ9S/tmIjIsxJWSdE3+mWZ7IxbBtaXV8XnMdQ+Dv dKNDz/2wkw/PiUU3T8WNkssHE3z1zTR9CdkKfW9NJNxMgrlizNW8R/lAhTnuVDrAX5Swt8 m1fxg543w0KjC6rLgjs/ful3GWd03/WgwgytV4wDtUipn6dswRNGyOj7+3QyFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689225851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xXtYk7ACadyI9P30liHLcmcUMuLR8iMfE9EWcQFOJ+g=; b=b9fwZzeV17IJDHcxQs4eMAqs6xJm9DN1oGrTaI7uHGXHoJx76x0l8GLQxmh0MW5jCm4Dbn l6csVa7nSpNUyyi21ATC5wd57foG8nQG1zZdvUoPBzV78o6RTteaBwNiESmCheStnH6/tN 3s+xT+XZGguN0xlayESS94rYKLE+DUFKbtqMmMzeNuBaoY5CgrSGOQizqC8J4XCcAknXpd vSjMlV/UBVbXLQKbupzntptr4BCf/BND4e6lSAFQB50nQw3GguE+Qcsjx4H4JKSnbtKF3P 5oZ3HIfWPgMzq+Ost4PrMXVhOz2epefMiJM5rn9h8pTEsgxLAIUnMdlreVYEng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689225851; a=rsa-sha256; cv=none; b=MDet2/iU31X1eIXDPLPWacjy7Td2nfKOOoUwvzV9xUCEzA/AA0lw49qzhL1iYei51YXdOc xAWrkoru2I3DcKrL3DkhFcPWyTNg1REkYkQAl/Sl897A5825vIunrcZL8y5STSh+gs5xW8 3b2BZFR1ioncszNhJZBChg4UzEPZf0aCMeiQcMx/smebqhXTCuFGGVnEJ/vUKy0cTIrR1/ e470ApXZCg74mHQKYlOpkHr1R1Z5OVEmieXZ+4+h7Pb6FioGVUnQcBrW56ykn6N7eoW6lG OMH4pWPFDtYvwRV0OGGr6zGBkgc/37lQxIOWHFQg/cORiZfC7MClCnX1dcxTEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1jhW2J1Pzdn8; Thu, 13 Jul 2023 05:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D5OBl3018991; Thu, 13 Jul 2023 05:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D5OBNN018990; Thu, 13 Jul 2023 05:24:11 GMT (envelope-from git) Date: Thu, 13 Jul 2023 05:24:11 GMT Message-Id: <202307130524.36D5OBNN018990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9d843ba32496 - main - rpcgen: Clarify behaviour for idx 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d843ba32496b5713eea53e9e06f09b9377e700e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9d843ba32496b5713eea53e9e06f09b9377e700e commit 9d843ba32496b5713eea53e9e06f09b9377e700e Author: Jessica Clarke AuthorDate: 2023-07-13 05:22:52 +0000 Commit: Jessica Clarke CommitDate: 2023-07-13 05:22:59 +0000 rpcgen: Clarify behaviour for idx The re-initialisation of idx in the later else branch is a bit hidden, and results in deviation from the earlier two paths. Use more consistent code instead to make it abundantly clear what's going on. --- usr.bin/rpcgen/rpc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index 644c090f82ab..ba9eda676b39 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -270,18 +270,18 @@ add_warning(void) static void prepend_cpp(void) { - int idx = 1; + int idx = 0; const char *var; char *dupvar, *s, *t; if (CPP != NULL) - insarg(0, CPP); + insarg(idx++, CPP); else if ((var = getenv("RPCGEN_CPP")) == NULL) - insarg(0, "/usr/bin/cpp"); + insarg(idx++, "/usr/bin/cpp"); else { /* Parse command line in a rudimentary way */ dupvar = xstrdup(var); - for (s = dupvar, idx = 0; (t = strsep(&s, " \t")) != NULL; ) { + for (s = dupvar; (t = strsep(&s, " \t")) != NULL; ) { if (t[0]) insarg(idx++, t); } From nobody Thu Jul 13 07:36:56 2023 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 4R1mdh656zz4mZHY; Thu, 13 Jul 2023 07:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1mdh5s73z4Dv1; Thu, 13 Jul 2023 07:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689233816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VWAgPefBldGVU8haf9Vkc0HOrtBnlOwD8zrtEeizRAE=; b=fB5T4lp44sgOej9s2RFDnP9ZJjvQ61BKh4VduIS89+/URrLIO4Hw0cuX+SlCaceCD8LGQL FhE7kLyz39H67+kIZlkMBaM0xkyg+Id7EmfeLhqHWLqIjrclHRqnhgr4xjT7FR1BKQvR5P 53H/VCAy1IxYlgiydY/5OTQgrJIyPccYdO5x2Dhip0mTlqpsMt2AwUs6hoVpuXxHfCEVzS luN32skisJfDwumHa3Q8C4KM1PSITuSYmXjkhdvJNeJ1YU3It+8w3pzPemyfqRAOygAH1E MP0oTEE4udvNJmNGEMB8Z72tuB+8Bg+d2d7vin9Xknm4ed9gj02fGLkLLXMIsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689233816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VWAgPefBldGVU8haf9Vkc0HOrtBnlOwD8zrtEeizRAE=; b=GsT02+GbrZuCCxk/KSTIvjgJ2ij0FF/RxaHGftgMub64W7M4LrQMNg2F6DdC7jsg8VRQs4 GTJVzD+hSkKg4OaYzKbfIErPVayis/tTcay4LugtBMQOAAqwL6o1qkd7VQ0Rit9+YZ5ZTG HsoNjavE6ZJ2G4qb9EM8v63wO8k7jzktAm9H43idrdLXqL81ybSYkK/MKeb4xe6PkGnrkN SIwnh6HRqPFgkcykf0GRRep4OnwHLYBeiRBtwauakxmcsR8wvFXvgDJJirUpxOjWJQ0Xyz kHWBMhYGLZnZ1EWPdXhqIr+BodJ/BQa06CHUwe+TXDjn5VM8i0PuZSUuy/Yztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689233816; a=rsa-sha256; cv=none; b=Zejlfeh/ma9fhTRIOvAPwwZBHkxVs/HPzf/eUsl+rjz4K5ftTitDk5p7uBE9YbebAvLBMB RO09V/NdaabiOAOzcaegG89FEY67FwZbl1Dqt6xr45qctdyQ9FPbRaZ+aeBOWeNBCI4Slb gd11S2LRMNABu2BKBH6kNaOCrVQd7AwXjCFrUs11NhfbmmjeDbcarE2yt/vdAnF1Lx1uCZ esdKXc3d0PJts/2InTo9R24CyD9Gv8RWNRPuGjPPUn8JLhaCYnXN2nuohZW7g/lOmtEzqR W6Pt9Z+omSFHsNwO4HjRV87NIk02WzFvZLKV7AufTlFzRoJF09YgmFxyr0+kRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1mdh4vpTzjdG; Thu, 13 Jul 2023 07:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D7au69035062; Thu, 13 Jul 2023 07:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D7auWa035061; Thu, 13 Jul 2023 07:36:56 GMT (envelope-from git) Date: Thu, 13 Jul 2023 07:36:56 GMT Message-Id: <202307130736.36D7auWa035061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6b4ed16d74e1 - main - pf: Simplify rule actions logic 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b4ed16d74e110997d5b8f8b24e9ef9bdd579db9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6b4ed16d74e110997d5b8f8b24e9ef9bdd579db9 commit 6b4ed16d74e110997d5b8f8b24e9ef9bdd579db9 Author: Kajetan Staszkiewicz AuthorDate: 2023-07-13 05:08:24 +0000 Commit: Kristof Provost CommitDate: 2023-07-13 05:36:39 +0000 pf: Simplify rule actions logic Actions applied to a processed packet come in case of stateless firewalling from a rule or in case of statefull firewalling from a state. The state obtains the actions from a rule when it is created by a rule or by pfsync. The logic for deciding if actions come from a rule or a state is spread across many places in pf. There already is struct pf_rule_actions in struct pf_pdesc and thus it can be used as a central place for storing actions and their parameters. OpenBSD does something similar: they also store the actions in struct pf_pdesc and have no variables in pf_test() but they use separate variables instead of a structure. By using struct pf_rule_actions we can simplify the code even further. Applying of actions is done *only* in pf_rule_to_actions() no matter if for the legacy scrub rules or for the normal match / pass rules. The logic of choosing if rule or state actions are used is applied only once in pf_test() by copying the whole struct. Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D41009 --- sys/net/pfvar.h | 21 ++-- sys/netpfil/pf/if_pfsync.c | 38 ++++---- sys/netpfil/pf/pf.c | 235 ++++++++++++++------------------------------- sys/netpfil/pf/pf_ioctl.c | 44 ++++----- sys/netpfil/pf/pf_norm.c | 66 ++++--------- 5 files changed, 139 insertions(+), 265 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index ed371f61a999..e0c5fb5214a8 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1061,18 +1061,9 @@ struct pf_kstate { u_int32_t creation; u_int32_t expire; u_int32_t pfsync_time; - u_int16_t qid; - u_int16_t pqid; - u_int16_t dnpipe; - u_int16_t dnrpipe; + struct pf_rule_actions act; u_int16_t tag; - u_int8_t log; - int32_t rtableid; - u_int8_t min_ttl; - u_int8_t set_tos; - u_int16_t max_mss; u_int8_t rt; - u_int8_t set_prio[2]; }; /* @@ -2480,15 +2471,15 @@ struct pf_krule *pf_get_translation(struct pf_pdesc *, struct mbuf *, struct pf_state_key *pf_state_key_setup(struct pf_pdesc *, struct pf_addr *, struct pf_addr *, u_int16_t, u_int16_t); struct pf_state_key *pf_state_key_clone(struct pf_state_key *); - +void pf_rule_to_actions(struct pf_krule *, + struct pf_rule_actions *); int pf_normalize_mss(struct mbuf *m, int off, - struct pf_pdesc *pd, u_int16_t maxmss); -u_int16_t pf_rule_to_scrub_flags(u_int32_t); + struct pf_pdesc *pd); #ifdef INET -void pf_scrub_ip(struct mbuf **, uint32_t, uint8_t, uint8_t); +void pf_scrub_ip(struct mbuf **, struct pf_pdesc *); #endif /* INET */ #ifdef INET6 -void pf_scrub_ip6(struct mbuf **, uint32_t, uint8_t, uint8_t); +void pf_scrub_ip6(struct mbuf **, struct pf_pdesc *); #endif /* INET6 */ struct pfi_kkif *pf_kkif_create(int); diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 2af0b57eba45..4fe916c77ab8 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -618,7 +618,7 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) } st->direction = sp->pfs_1301.direction; - st->log = sp->pfs_1301.log; + st->act.log = sp->pfs_1301.log; st->timeout = sp->pfs_1301.timeout; switch (msg_version) { @@ -639,13 +639,13 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) * from multiple "match" rules as only rule * creating the state is send over pfsync. */ - st->qid = r->qid; - st->pqid = r->pqid; - st->rtableid = r->rtableid; + st->act.qid = r->qid; + st->act.pqid = r->pqid; + st->act.rtableid = r->rtableid; if (r->scrub_flags & PFSTATE_SETTOS) - st->set_tos = r->set_tos; - st->min_ttl = r->min_ttl; - st->max_mss = r->max_mss; + st->act.set_tos = r->set_tos; + st->act.min_ttl = r->min_ttl; + st->act.max_mss = r->max_mss; st->state_flags |= (r->scrub_flags & (PFSTATE_NODF|PFSTATE_RANDOMID| PFSTATE_SETTOS|PFSTATE_SCRUB_TCP| @@ -656,22 +656,22 @@ pfsync_state_import(union pfsync_state_union *sp, int flags, int msg_version) else st->state_flags &= ~PFSTATE_DN_IS_PIPE; } - st->dnpipe = r->dnpipe; - st->dnrpipe = r->dnrpipe; + st->act.dnpipe = r->dnpipe; + st->act.dnrpipe = r->dnrpipe; } break; case PFSYNC_MSG_VERSION_1400: st->state_flags = ntohs(sp->pfs_1400.state_flags); - st->qid = ntohs(sp->pfs_1400.qid); - st->pqid = ntohs(sp->pfs_1400.pqid); - st->dnpipe = ntohs(sp->pfs_1400.dnpipe); - st->dnrpipe = ntohs(sp->pfs_1400.dnrpipe); - st->rtableid = ntohl(sp->pfs_1400.rtableid); - st->min_ttl = sp->pfs_1400.min_ttl; - st->set_tos = sp->pfs_1400.set_tos; - st->max_mss = ntohs(sp->pfs_1400.max_mss); - st->set_prio[0] = sp->pfs_1400.set_prio[0]; - st->set_prio[1] = sp->pfs_1400.set_prio[1]; + st->act.qid = ntohs(sp->pfs_1400.qid); + st->act.pqid = ntohs(sp->pfs_1400.pqid); + st->act.dnpipe = ntohs(sp->pfs_1400.dnpipe); + st->act.dnrpipe = ntohs(sp->pfs_1400.dnrpipe); + st->act.rtableid = ntohl(sp->pfs_1400.rtableid); + st->act.min_ttl = sp->pfs_1400.min_ttl; + st->act.set_tos = sp->pfs_1400.set_tos; + st->act.max_mss = ntohs(sp->pfs_1400.max_mss); + st->act.set_prio[0] = sp->pfs_1400.set_prio[0]; + st->act.set_prio[1] = sp->pfs_1400.set_prio[1]; st->rt = sp->pfs_1400.rt; if (st->rt && (st->rt_kif = pfi_kkif_find(sp->pfs_1400.rt_ifname)) == NULL) { if (V_pf_status.debug >= PF_DEBUG_MISC) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7c41be4b25fe..2a1813d6aadd 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -275,8 +275,6 @@ static int pf_state_key_attach(struct pf_state_key *, static void pf_state_key_detach(struct pf_kstate *, int); static int pf_state_key_ctor(void *, int, void *, int); static u_int32_t pf_tcp_iss(struct pf_pdesc *); -void pf_rule_to_actions(struct pf_krule *, - struct pf_rule_actions *); static int pf_dummynet(struct pf_pdesc *, struct pf_kstate *, struct pf_krule *, struct mbuf **); static int pf_dummynet_route(struct pf_pdesc *, @@ -2048,7 +2046,7 @@ pf_unlink_state(struct pf_kstate *s) s->key[PF_SK_WIRE]->port[1], s->key[PF_SK_WIRE]->port[0], s->src.seqhi, s->src.seqlo + 1, - TH_RST|TH_ACK, 0, 0, 0, true, s->tag, 0, s->rtableid); + TH_RST|TH_ACK, 0, 0, 0, true, s->tag, 0, s->act.rtableid); } LIST_REMOVE(s, entry); @@ -3590,8 +3588,22 @@ pf_addr_inc(struct pf_addr *addr, sa_family_t af) void pf_rule_to_actions(struct pf_krule *r, struct pf_rule_actions *a) { + /* + * Modern rules use the same flags in rules as they do in states. + */ a->flags |= (r->scrub_flags & (PFSTATE_NODF|PFSTATE_RANDOMID| - PFSTATE_SETTOS|PFSTATE_SCRUB_TCP|PFSTATE_SETPRIO)); + PFSTATE_SCRUB_TCP|PFSTATE_SETPRIO)); + + /* + * Old-style scrub rules have different flags which need to be translated. + */ + if (r->rule_flag & PFRULE_RANDOMID) + a->flags |= PFSTATE_RANDOMID; + if (r->scrub_flags & PFSTATE_SETTOS || r->rule_flag & PFRULE_SET_TOS ) { + a->flags |= PFSTATE_SETTOS; + a->set_tos = r->set_tos; + } + if (r->qid) a->qid = r->qid; if (r->pqid) @@ -3599,8 +3611,6 @@ pf_rule_to_actions(struct pf_krule *r, struct pf_rule_actions *a) if (r->rtableid >= 0) a->rtableid = r->rtableid; a->log |= r->log; - if (a->flags & PFSTATE_SETTOS) - a->set_tos = r->set_tos; if (r->min_ttl) a->min_ttl = r->min_ttl; if (r->max_mss) @@ -3615,7 +3625,7 @@ pf_rule_to_actions(struct pf_krule *r, struct pf_rule_actions *a) else a->flags &= ~PFSTATE_DN_IS_PIPE; } - if (a->flags & PFSTATE_SETPRIO) { + if (r->scrub_flags & PFSTATE_SETPRIO) { a->set_prio[0] = r->set_prio[0]; a->set_prio[1] = r->set_prio[1]; } @@ -4620,6 +4630,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, s->nat_rule.ptr = nr; s->anchor.ptr = a; bcopy(match_rules, &s->match_rules, sizeof(s->match_rules)); + memcpy(&s->act, &pd->act, sizeof(struct pf_rule_actions)); + STATE_INC_COUNTERS(s); if (r->allow_opts) s->state_flags |= PFSTATE_ALLOWOPTS; @@ -4627,23 +4639,13 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, s->state_flags |= PFSTATE_SLOPPY; if (pd->flags & PFDESC_TCP_NORM) /* Set by old-style scrub rules */ s->state_flags |= PFSTATE_SCRUB_TCP; - s->log = pd->act.log & PF_LOG_ALL; - s->qid = pd->act.qid; - s->pqid = pd->act.pqid; - s->rtableid = pd->act.rtableid; - s->min_ttl = pd->act.min_ttl; - s->set_tos = pd->act.set_tos; - s->max_mss = pd->act.max_mss; + + s->act.log = pd->act.log & PF_LOG_ALL; s->sync_state = PFSYNC_S_NONE; - s->qid = pd->act.qid; - s->pqid = pd->act.pqid; - s->dnpipe = pd->act.dnpipe; - s->dnrpipe = pd->act.dnrpipe; - s->set_prio[0] = pd->act.set_prio[0]; - s->set_prio[1] = pd->act.set_prio[1]; - s->state_flags |= pd->act.flags; + s->state_flags |= pd->act.flags; /* Only needed for pfsync and state export */ + if (nr != NULL) - s->log |= nr->log & PF_LOG_ALL; + s->act.log |= nr->log & PF_LOG_ALL; switch (pd->proto) { case IPPROTO_TCP: s->src.seqlo = ntohl(th->th_seq); @@ -5280,7 +5282,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, th->th_sport, ntohl(th->th_ack), 0, TH_RST, 0, 0, (*state)->rule.ptr->return_ttl, true, 0, 0, - (*state)->rtableid); + (*state)->act.rtableid); src->seqlo = 0; src->seqhi = 1; src->max_win = 1; @@ -5417,7 +5419,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) pd->src, th->th_dport, th->th_sport, (*state)->src.seqhi, ntohl(th->th_seq) + 1, TH_SYN|TH_ACK, 0, (*state)->src.mss, 0, true, 0, 0, - (*state)->rtableid); + (*state)->act.rtableid); REASON_SET(reason, PFRES_SYNPROXY); return (PF_SYNPROXY_DROP); } else if ((th->th_flags & (TH_ACK|TH_RST|TH_FIN)) != TH_ACK || @@ -5449,7 +5451,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) sk->port[pd->sidx], sk->port[pd->didx], (*state)->dst.seqhi, 0, TH_SYN, 0, (*state)->src.mss, 0, false, (*state)->tag, 0, - (*state)->rtableid); + (*state)->act.rtableid); REASON_SET(reason, PFRES_SYNPROXY); return (PF_SYNPROXY_DROP); } else if (((th->th_flags & (TH_SYN|TH_ACK)) != @@ -5464,13 +5466,13 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_kstate **state, u_short *reason) pd->src, th->th_dport, th->th_sport, ntohl(th->th_ack), ntohl(th->th_seq) + 1, TH_ACK, (*state)->src.max_win, 0, 0, false, - (*state)->tag, 0, (*state)->rtableid); + (*state)->tag, 0, (*state)->act.rtableid); pf_send_tcp((*state)->rule.ptr, pd->af, &sk->addr[pd->sidx], &sk->addr[pd->didx], sk->port[pd->sidx], sk->port[pd->didx], (*state)->src.seqhi + 1, (*state)->src.seqlo + 1, TH_ACK, (*state)->dst.max_win, 0, 0, true, 0, 0, - (*state)->rtableid); + (*state)->act.rtableid); (*state)->src.seqdiff = (*state)->dst.seqhi - (*state)->src.seqlo; (*state)->dst.seqdiff = (*state)->src.seqhi - @@ -7061,15 +7063,6 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, { NET_EPOCH_ASSERT(); - if (s && (s->dnpipe || s->dnrpipe)) { - pd->act.dnpipe = s->dnpipe; - pd->act.dnrpipe = s->dnrpipe; - pd->act.flags = s->state_flags; - } else if (r->dnpipe || r->dnrpipe) { - pd->act.dnpipe = r->dnpipe; - pd->act.dnrpipe = r->dnrpipe; - pd->act.flags = r->free_flags; - } if (pd->act.dnpipe || pd->act.dnrpipe) { struct ip_fw_args dnflow; if (ip_dn_io_ptr == NULL) { @@ -7120,7 +7113,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb *inp, struct pf_rule_actions *default_actions) { struct pfi_kkif *kif; - u_short action, reason = 0, log = 0; + u_short action, reason = 0; struct mbuf *m = *m0; struct ip *h = NULL; struct m_tag *ipfwtag; @@ -7128,18 +7121,9 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct pf_kstate *s = NULL; struct pf_kruleset *ruleset = NULL; struct pf_pdesc pd; - int off, dirndx; - uint16_t scrub_flags; -#ifdef ALTQ - uint16_t qid; -#endif - uint16_t pqid; + int off, dirndx, use_2nd_queue = 0; uint16_t tag; - int32_t rtableid; - uint8_t min_ttl; - uint8_t set_tos; uint8_t rt; - uint8_t set_prio[2]; PF_RULES_RLOCK_TRACKER; KASSERT(dir == PF_IN || dir == PF_OUT, ("%s: bad direction %d\n", __func__, dir)); @@ -7245,7 +7229,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if (off < (int)sizeof(struct ip)) { action = PF_DROP; REASON_SET(&reason, PFRES_SHORT); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } @@ -7267,7 +7251,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if (!pf_pull_hdr(m, off, &pd.hdr.tcp, sizeof(pd.hdr.tcp), &action, &reason, AF_INET)) { if (action != PF_PASS) - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } pd.p_len = pd.tot_len - off - (pd.hdr.tcp.th_off << 2); @@ -7284,7 +7268,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, } if ((pd.hdr.tcp.th_flags & TH_ACK) && pd.p_len == 0) - pqid = 1; + use_2nd_queue = 1; action = pf_normalize_tcp(kif, m, 0, off, h, &pd); if (action == PF_DROP) goto done; @@ -7294,7 +7278,6 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) { /* Validate remote SYN|ACK, re-create original SYN if * valid. */ @@ -7339,11 +7322,6 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, &pd, &a, &ruleset, inp); } } - if (s) { - if (s->max_mss) - pf_normalize_mss(m, off, &pd, s->max_mss); - } else if (r->max_mss) - pf_normalize_mss(m, off, &pd, r->max_mss); break; } @@ -7351,7 +7329,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if (!pf_pull_hdr(m, off, &pd.hdr.udp, sizeof(pd.hdr.udp), &action, &reason, AF_INET)) { if (action != PF_PASS) - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } pd.sport = &pd.hdr.udp.uh_sport; @@ -7369,7 +7347,6 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7380,7 +7357,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, if (!pf_pull_hdr(m, off, &pd.hdr.icmp, ICMP_MINLEN, &action, &reason, AF_INET)) { if (action != PF_PASS) - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } action = pf_test_state_icmp(&s, kif, m, off, h, &pd, &reason); @@ -7389,7 +7366,6 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7412,7 +7388,6 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7425,37 +7400,18 @@ done: !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { action = PF_DROP; REASON_SET(&reason, PFRES_IPOPTIONS); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, ("pf: dropping packet with ip options\n")); } if (s) { - scrub_flags = s->state_flags; - min_ttl = s->min_ttl; - set_tos = s->set_tos; - rtableid = s->rtableid; - pqid = s->pqid; -#ifdef ALTQ - qid = s->qid; -#endif + memcpy(&pd.act, &s->act, sizeof(struct pf_rule_actions)); tag = s->tag; rt = s->rt; - set_prio[0] = s->set_prio[0]; - set_prio[1] = s->set_prio[1]; } else { - scrub_flags = r->scrub_flags; - min_ttl = r->min_ttl; - set_tos = r->set_tos; - rtableid = r->rtableid; - pqid = r->pqid; -#ifdef ALTQ - qid = r->qid; -#endif tag = r->tag; rt = r->rt; - set_prio[0] = r->set_prio[0]; - set_prio[1] = r->set_prio[1]; } if (tag > 0 && pf_tag_packet(m, &pd, tag)) { @@ -7463,29 +7419,26 @@ done: REASON_SET(&reason, PFRES_MEMORY); } - pf_scrub_ip(&m, scrub_flags, min_ttl, set_tos); + pf_scrub_ip(&m, &pd); + if (pd.proto == IPPROTO_TCP && pd.act.max_mss) + pf_normalize_mss(m, off, &pd); - if (rtableid >= 0) - M_SETFIB(m, rtableid); + if (pd.act.rtableid >= 0) + M_SETFIB(m, pd.act.rtableid); - if (scrub_flags & PFSTATE_SETPRIO) { + if (pd.act.flags & PFSTATE_SETPRIO) { if (pd.tos & IPTOS_LOWDELAY) - pqid = 1; - if (vlan_set_pcp(m, set_prio[pqid])) { + use_2nd_queue = 1; + if (vlan_set_pcp(m, pd.act.set_prio[use_2nd_queue])) { action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, ("pf: failed to allocate 802.1q mtag\n")); } } #ifdef ALTQ - if (qid) { - pd.act.pqid = pqid; - pd.act.qid = qid; - } - if (action == PF_PASS && pd.act.qid) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { @@ -7494,7 +7447,7 @@ done: } else { if (s != NULL) pd.pf_mtag->qid_hash = pf_state_hash(s); - if (pqid || (pd.tos & IPTOS_LOWDELAY)) + if (use_2nd_queue || (pd.tos & IPTOS_LOWDELAY)) pd.pf_mtag->qid = pd.act.pqid; else pd.pf_mtag->qid = pd.act.qid; @@ -7534,7 +7487,7 @@ done: ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, ("pf: failed to allocate tag\n")); } else { @@ -7551,13 +7504,13 @@ done: /* XXX: ipfw has the same behaviour! */ action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, ("pf: failed to allocate divert tag\n")); } } - if (log) { + if (pd.act.log) { struct pf_krule *lr; struct pf_krule_item *ri; @@ -7567,7 +7520,7 @@ done: else lr = r; - if (log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) + if (pd.act.log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) PFLOG_PACKET(kif, m, AF_INET, reason, lr, a, ruleset, &pd, (s == NULL)); if (s) { @@ -7683,7 +7636,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb struct pf_rule_actions *default_actions) { struct pfi_kkif *kif; - u_short action, reason = 0, log = 0; + u_short action, reason = 0; struct mbuf *m = *m0, *n = NULL; struct m_tag *mtag; struct ip6_hdr *h = NULL; @@ -7691,18 +7644,9 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb struct pf_kstate *s = NULL; struct pf_kruleset *ruleset = NULL; struct pf_pdesc pd; - int off, terminal = 0, dirndx, rh_cnt = 0; - uint16_t scrub_flags; -#ifdef ALTQ - uint16_t qid; -#endif - uint16_t pqid; + int off, terminal = 0, dirndx, rh_cnt = 0, use_2nd_queue = 0; uint16_t tag; - int32_t rtableid; - uint8_t min_ttl; - uint8_t set_tos; uint8_t rt; - uint8_t set_prio[2]; PF_RULES_RLOCK_TRACKER; KASSERT(dir == PF_IN || dir == PF_OUT, ("%s: bad direction %d\n", __func__, dir)); @@ -7818,7 +7762,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb ("pf: IPv6 more than one rthdr\n")); action = PF_DROP; REASON_SET(&reason, PFRES_IPOPTIONS); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } if (!pf_pull_hdr(m, off, &rthdr, sizeof(rthdr), NULL, @@ -7827,7 +7771,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb ("pf: IPv6 short rthdr\n")); action = PF_DROP; REASON_SET(&reason, PFRES_SHORT); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } if (rthdr.ip6r_type == IPV6_RTHDR_TYPE_0) { @@ -7835,7 +7779,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb ("pf: IPv6 rthdr0\n")); action = PF_DROP; REASON_SET(&reason, PFRES_IPOPTIONS); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } /* FALLTHROUGH */ @@ -7851,7 +7795,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb DPFPRINTF(PF_DEBUG_MISC, ("pf: IPv6 short opt\n")); action = PF_DROP; - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; goto done; } if (pd.proto == IPPROTO_AH) @@ -7877,7 +7821,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb if (!pf_pull_hdr(m, off, &pd.hdr.tcp, sizeof(pd.hdr.tcp), &action, &reason, AF_INET6)) { if (action != PF_PASS) - log |= PF_LOG_FORCE; + pd.act.log |= PF_LOG_FORCE; goto done; } pd.p_len = pd.tot_len - off - (pd.hdr.tcp.th_off << 2); @@ -7892,15 +7836,9 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); - if (s) { - if (s->max_mss) - pf_normalize_mss(m, off, &pd, s->max_mss); - } else if (r->max_mss) - pf_normalize_mss(m, off, &pd, r->max_mss); break; } @@ -7908,7 +7846,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb if (!pf_pull_hdr(m, off, &pd.hdr.udp, sizeof(pd.hdr.udp), &action, &reason, AF_INET6)) { if (action != PF_PASS) - log |= PF_LOG_FORCE; + pd.act.log |= PF_LOG_FORCE; goto done; } pd.sport = &pd.hdr.udp.uh_sport; @@ -7926,7 +7864,6 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7944,7 +7881,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb if (!pf_pull_hdr(m, off, &pd.hdr.icmp6, sizeof(pd.hdr.icmp6), &action, &reason, AF_INET6)) { if (action != PF_PASS) - log |= PF_LOG_FORCE; + pd.act.log |= PF_LOG_FORCE; goto done; } action = pf_test_state_icmp(&s, kif, m, off, h, &pd, &reason); @@ -7953,7 +7890,6 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7967,7 +7903,6 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb V_pfsync_update_state_ptr(s); r = s->rule.ptr; a = s->anchor.ptr; - log = s->log; } else if (s == NULL) action = pf_test_rule(&r, &s, kif, m, off, &pd, &a, &ruleset, inp); @@ -7986,37 +7921,18 @@ done: !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { action = PF_DROP; REASON_SET(&reason, PFRES_IPOPTIONS); - log = r->log; + pd.act.log = r->log; DPFPRINTF(PF_DEBUG_MISC, ("pf: dropping packet with dangerous v6 headers\n")); } if (s) { - scrub_flags = s->state_flags; - min_ttl = s->min_ttl; - set_tos = s->set_tos; - rtableid = s->rtableid; - pqid = s->pqid; -#ifdef ALTQ - qid = s->qid; -#endif + memcpy(&pd.act, &s->act, sizeof(struct pf_rule_actions)); tag = s->tag; rt = s->rt; - set_prio[0] = s->set_prio[0]; - set_prio[1] = s->set_prio[1]; } else { - scrub_flags = r->scrub_flags; - min_ttl = r->min_ttl; - set_tos = r->set_tos; - rtableid = r->rtableid; - pqid = r->pqid; -#ifdef ALTQ - qid = r->qid; -#endif tag = r->tag; rt = r->rt; - set_prio[0] = r->set_prio[0]; - set_prio[1] = r->set_prio[1]; } if (tag > 0 && pf_tag_packet(m, &pd, tag)) { @@ -8024,29 +7940,26 @@ done: REASON_SET(&reason, PFRES_MEMORY); } - pf_scrub_ip6(&m, scrub_flags, min_ttl, set_tos); + pf_scrub_ip6(&m, &pd); + if (pd.proto == IPPROTO_TCP && pd.act.max_mss) + pf_normalize_mss(m, off, &pd); - if (rtableid >= 0) - M_SETFIB(m, rtableid); + if (pd.act.rtableid >= 0) + M_SETFIB(m, pd.act.rtableid); - if (scrub_flags & PFSTATE_SETPRIO) { + if (pd.act.flags & PFSTATE_SETPRIO) { if (pd.tos & IPTOS_LOWDELAY) - pqid = 1; - if (vlan_set_pcp(m, set_prio[pqid])) { + use_2nd_queue = 1; + if (vlan_set_pcp(m, pd.act.set_prio[use_2nd_queue])) { action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - log = PF_LOG_FORCE; + pd.act.log = PF_LOG_FORCE; DPFPRINTF(PF_DEBUG_MISC, ("pf: failed to allocate 802.1q mtag\n")); } } #ifdef ALTQ - if (qid) { - pd.act.pqid = pqid; - pd.act.qid = qid; - } - if (action == PF_PASS && pd.act.qid) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { @@ -8076,7 +7989,7 @@ done: if (r->divert.port) printf("pf: divert(9) is not supported for IPv6\n"); - if (log) { + if (pd.act.log) { struct pf_krule *lr; struct pf_krule_item *ri; @@ -8086,7 +7999,7 @@ done: else lr = r; - if (log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) + if (pd.act.log & PF_LOG_FORCE || lr->log & PF_LOG_ALL) PFLOG_PACKET(kif, m, AF_INET6, reason, lr, a, ruleset, &pd, (s == NULL)); if (s) { diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index b78c30aa4b8c..78727566cde6 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5706,7 +5706,7 @@ pfsync_state_export(union pfsync_state_union *sp, struct pf_kstate *st, int msg_ sp->pfs_1301.expire = htonl(sp->pfs_1301.expire - time_uptime); sp->pfs_1301.direction = st->direction; - sp->pfs_1301.log = st->log; + sp->pfs_1301.log = st->act.log; sp->pfs_1301.timeout = st->timeout; switch (msg_version) { @@ -5715,16 +5715,16 @@ pfsync_state_export(union pfsync_state_union *sp, struct pf_kstate *st, int msg_ break; case PFSYNC_MSG_VERSION_1400: sp->pfs_1400.state_flags = htons(st->state_flags); - sp->pfs_1400.qid = htons(st->qid); - sp->pfs_1400.pqid = htons(st->pqid); - sp->pfs_1400.dnpipe = htons(st->dnpipe); - sp->pfs_1400.dnrpipe = htons(st->dnrpipe); - sp->pfs_1400.rtableid = htonl(st->rtableid); - sp->pfs_1400.min_ttl = st->min_ttl; - sp->pfs_1400.set_tos = st->set_tos; - sp->pfs_1400.max_mss = htons(st->max_mss); - sp->pfs_1400.set_prio[0] = st->set_prio[0]; - sp->pfs_1400.set_prio[1] = st->set_prio[1]; + sp->pfs_1400.qid = htons(st->act.qid); + sp->pfs_1400.pqid = htons(st->act.pqid); + sp->pfs_1400.dnpipe = htons(st->act.dnpipe); + sp->pfs_1400.dnrpipe = htons(st->act.dnrpipe); + sp->pfs_1400.rtableid = htonl(st->act.rtableid); + sp->pfs_1400.min_ttl = st->act.min_ttl; + sp->pfs_1400.set_tos = st->act.set_tos; + sp->pfs_1400.max_mss = htons(st->act.max_mss); + sp->pfs_1400.set_prio[0] = st->act.set_prio[0]; + sp->pfs_1400.set_prio[1] = st->act.set_prio[1]; sp->pfs_1400.rt = st->rt; if (st->rt_kif) strlcpy(sp->pfs_1400.rt_ifname, @@ -5797,7 +5797,7 @@ pf_state_export(struct pf_state_export *sp, struct pf_kstate *st) sp->expire = htonl(sp->expire - time_uptime); sp->direction = st->direction; - sp->log = st->log; + sp->log = st->act.log; sp->timeout = st->timeout; /* 8 bits for the old libpfctl, 16 bits for the new libpfctl */ sp->state_flags_compat = st->state_flags; @@ -5830,20 +5830,20 @@ pf_state_export(struct pf_state_export *sp, struct pf_kstate *st) sp->bytes[0] = st->bytes[0]; sp->bytes[1] = st->bytes[1]; - sp->qid = htons(st->qid); - sp->pqid = htons(st->pqid); - sp->dnpipe = htons(st->dnpipe); - sp->dnrpipe = htons(st->dnrpipe); - sp->rtableid = htonl(st->rtableid); - sp->min_ttl = st->min_ttl; - sp->set_tos = st->set_tos; - sp->max_mss = htons(st->max_mss); + sp->qid = htons(st->act.qid); + sp->pqid = htons(st->act.pqid); + sp->dnpipe = htons(st->act.dnpipe); + sp->dnrpipe = htons(st->act.dnrpipe); + sp->rtableid = htonl(st->act.rtableid); + sp->min_ttl = st->act.min_ttl; + sp->set_tos = st->act.set_tos; + sp->max_mss = htons(st->act.max_mss); sp->rt = st->rt; if (st->rt_kif) strlcpy(sp->rt_ifname, st->rt_kif->pfik_name, sizeof(sp->rt_ifname)); - sp->set_prio[0] = st->set_prio[0]; - sp->set_prio[1] = st->set_prio[1]; + sp->set_prio[0] = st->act.set_prio[0]; + sp->set_prio[1] = st->act.set_prio[1]; } diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index f62d0e7e51a4..5f6d9c1635cd 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1086,6 +1086,7 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); + pf_rule_to_actions(r, &pd->act); } else if ((!V_pf_status.reass && (h->ip_off & htons(IP_MF | IP_OFFMASK)))) { /* With no scrub rules IPv4 fragment reassembly depends on the * global switch. Fragments can be dropped early if reassembly @@ -1170,10 +1171,6 @@ pf_normalize_ip(struct mbuf **m0, struct pfi_kkif *kif, u_short *reason, h->ip_sum = pf_cksum_fixup(h->ip_sum, ip_off, h->ip_off, 0); } } - if (r != NULL) { - int scrub_flags = pf_rule_to_scrub_flags(r->rule_flag); - pf_scrub_ip(&m, scrub_flags, r->min_ttl, r->set_tos); - } return (PF_PASS); @@ -1248,6 +1245,7 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); + pf_rule_to_actions(r, &pd->act); } /* Check for illegal packets */ @@ -1319,11 +1317,6 @@ pf_normalize_ip6(struct mbuf **m0, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) goto shortpkt; - if (r != NULL) { - int scrub_flags = pf_rule_to_scrub_flags(r->rule_flag); - pf_scrub_ip6(&m, scrub_flags, r->min_ttl, r->set_tos); - } - return (PF_PASS); fragment: @@ -1420,6 +1413,7 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, pf_counter_u64_add_protected(&r->packets[pd->dir == PF_OUT], 1); pf_counter_u64_add_protected(&r->bytes[pd->dir == PF_OUT], pd->tot_len); pf_counter_u64_critical_exit(); + pf_rule_to_actions(rm, &pd->act); } if (rm && rm->rule_flag & PFRULE_REASSEMBLE_TCP) @@ -1470,11 +1464,6 @@ pf_normalize_tcp(struct pfi_kkif *kif, struct mbuf *m, int ipoff, rewrite = 1; } - /* Set MSS for old-style scrub rules. - * The function performs its own copyback. */ - if (rm != NULL && rm->max_mss) - pf_normalize_mss(m, off, pd, rm->max_mss); - /* copy back packet headers if we sanitized */ if (rewrite) m_copyback(m, off, sizeof(*th), (caddr_t)th); @@ -1974,7 +1963,7 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd, } int -pf_normalize_mss(struct mbuf *m, int off, struct pf_pdesc *pd, u_int16_t maxmss) +pf_normalize_mss(struct mbuf *m, int off, struct pf_pdesc *pd) { struct tcphdr *th = &pd->hdr.tcp; u_int16_t *mss; @@ -2008,10 +1997,10 @@ pf_normalize_mss(struct mbuf *m, int off, struct pf_pdesc *pd, u_int16_t maxmss) switch (opt) { case TCPOPT_MAXSEG: mss = (u_int16_t *)(optp + 2); - if ((ntohs(*mss)) > maxmss) { + if ((ntohs(*mss)) > pd->act.max_mss) { pf_patch_16_unaligned(m, &th->th_sum, - mss, htons(maxmss), + mss, htons(pd->act.max_mss), PF_ALGNMNT(startoff), 0); m_copyback(m, off + sizeof(*th), @@ -2027,34 +2016,15 @@ pf_normalize_mss(struct mbuf *m, int off, struct pf_pdesc *pd, u_int16_t maxmss) return (0); } -u_int16_t -pf_rule_to_scrub_flags(u_int32_t rule_flags) -{ - /* - * Translate pf_krule->rule_flag to pf_krule->scrub_flags. - * The pf_scrub_ip functions have been adapted to the new style of pass - * rules but they might get called if old scrub rules are used. - */ - int scrub_flags = 0; - - if (rule_flags & PFRULE_SET_TOS) { - scrub_flags |= PFSTATE_SETTOS; - } - if (rule_flags & PFRULE_RANDOMID) - scrub_flags |= PFSTATE_RANDOMID; - - return scrub_flags; -} - #ifdef INET void -pf_scrub_ip(struct mbuf **m0, u_int32_t flags, u_int8_t min_ttl, u_int8_t tos) +pf_scrub_ip(struct mbuf **m0, struct pf_pdesc *pd) { struct mbuf *m = *m0; struct ip *h = mtod(m, struct ip *); /* Clear IP_DF if no-df was requested */ - if (flags & PFSTATE_NODF && h->ip_off & htons(IP_DF)) { + if (pd->act.flags & PFSTATE_NODF && h->ip_off & htons(IP_DF)) { u_int16_t ip_off = h->ip_off; h->ip_off &= htons(~IP_DF); @@ -2062,26 +2032,26 @@ pf_scrub_ip(struct mbuf **m0, u_int32_t flags, u_int8_t min_ttl, u_int8_t tos) } *** 55 LINES SKIPPED *** From nobody Thu Jul 13 07:42:05 2023 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 4R1mld6GQcz4mbsN; Thu, 13 Jul 2023 07:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1mld5nVdz4G2k; Thu, 13 Jul 2023 07:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689234125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhfWMWZfeGaVUo+bqcMAFUaMdGmGLOqDNCDATvUggxo=; b=simEvlma7j07J4Dbzp6kd+mpOhwMNTOduJjUa9TIC9/QxoetfE1piuXJQPgEEqkdETdsgQ Mvjr1zDRVm99EHgfsB0onbT82Qv7LkjQwG2I//3xrYbb+Lp9EXIXnkvkUYty3S+cCSZz7c KOUMiA73VO55/NI7D04+J3EAcuTsZqefYcEkCiZcz17ZiDWJwnmVmdvoARxM/iPpeEbBob hBA3mh8wLgm4p8lZQ559tQGHnFnoLvmFZGea5J1O8tutHSj/ixA0WlDqUN4ABsrohHFhI3 nxegTLHzYLo7rkyRiSr7eLprQ+DXQX/KRA9TdpezFqmYps7EUscbOipS7hCWGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689234125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhfWMWZfeGaVUo+bqcMAFUaMdGmGLOqDNCDATvUggxo=; b=azX+UBmoTJUgsHwjCgAZ+UmyS4mR9mKMuZ1koO2PJUvhiiwdcNLcW9/FYnRTDs3aQ3M5pE tSuwlq1R4xJg2rhf5Wuioga3PwTlMy+SHVyuEQzGZAHKiA5zzYxphUv/E2bNMypyK/rNwK amOBylPnBPY03+Qlh4ehrp/2jL9hrDMRP5StFOmF6V9LIMXXPww8zNdT/CbQ4ieBPUAflE ZEh3Wf9d8rndZgzj3D+adM9DtO63wVAV43mKnPj9LPqSRY7V5DPh8yz1hK9+9VkJjljuUI tRPrDB/8YwJ9A+0Z+35OP5qSLaSTdqPBe5YFBamoNElS4v8OPmxAor6hZ32Bnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689234125; a=rsa-sha256; cv=none; b=fTEYrbZUCOqEV7iFVWKK2VMYiklp6LI9hAgn9bTskvUD+bNCBhP/6g5UPueUHm3KnnWBJv 4Xc6Edpj+ATA+v9ZC+OpvV3KtNriwc2tBO87zclfPVJVlfkHpUQr+ixFwddfC3peLSB8/p Hh5MFYDNl6bg3MBUcROuTpMAnpQbG/z9BiSzERjj+mfRowysT0ZePnRFMYX3a+ZGIN9xAC 07NuUsOGeF7PDM5yex+s89X4r6X05q8PSmsKZatotRlW00ud/TOiLRi6FOO8tKmbqAarVq Oqqh7DShLCKaipSXPKVPcyzN5uucuiFoYhykiTJ32kP22cwOO6rzVA5AO279Fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1mld4sFczjvl; Thu, 13 Jul 2023 07:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D7g5vd047781; Thu, 13 Jul 2023 07:42:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D7g50m047780; Thu, 13 Jul 2023 07:42:05 GMT (envelope-from git) Date: Thu, 13 Jul 2023 07:42:05 GMT Message-Id: <202307130742.36D7g50m047780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 17cb2ac3dfca - main - signal: Get rid of gsignal() as it not used anywhere 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17cb2ac3dfcab3f47727c3c1725c61f6b98f690b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=17cb2ac3dfcab3f47727c3c1725c61f6b98f690b commit 17cb2ac3dfcab3f47727c3c1725c61f6b98f690b Author: Dmitry Chagin AuthorDate: 2023-07-13 07:41:51 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-13 07:41:51 +0000 signal: Get rid of gsignal() as it not used anywhere Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D41007 MFC after: 1 week --- sys/kern/kern_sig.c | 19 ------------------- sys/sys/signalvar.h | 1 - 2 files changed, 20 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index ecfde7a549fc..d38cad182c30 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2059,25 +2059,6 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) return (error); } -/* - * Send a signal to a process group. - */ -void -gsignal(int pgid, int sig, ksiginfo_t *ksi) -{ - struct pgrp *pgrp; - - if (pgid != 0) { - sx_slock(&proctree_lock); - pgrp = pgfind(pgid); - sx_sunlock(&proctree_lock); - if (pgrp != NULL) { - pgsignal(pgrp, sig, 0, ksi); - PGRP_UNLOCK(pgrp); - } - } -} - /* * Send a signal to a process group. If checktty is 1, * limit to members which have a controlling terminal. diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 611eb11a8629..1db8813b6bf0 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -383,7 +383,6 @@ sigallowstop(int prev) int cursig(struct thread *td); void execsigs(struct proc *p); -void gsignal(int pgid, int sig, ksiginfo_t *ksi); void killproc(struct proc *p, const char *why); ksiginfo_t *ksiginfo_alloc(int mwait); void ksiginfo_free(ksiginfo_t *ksi); From nobody Thu Jul 13 09:02:04 2023 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 4R1pWx0yD8z4n7gK; Thu, 13 Jul 2023 09:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1pWx0f2bz4Xyl; Thu, 13 Jul 2023 09:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689238925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GcZwtJRuGQsSF3NUvod7e8LDYY2dkRHRn8a8BOc0uOg=; b=Lu/wab97In/X4a0RFc+2glFM1CrVTy7KGC+UzE7lQJREl3zikGECNXhxd5CSeqL+2ZL/a2 a+HRAFg5dLuu8FBQOpUJLY4ElJw6J76+8Y7USNTRFF7TSad7wi2bHq71oQV4rIIERtz3RR w3ApMBB4JXifi6QSnOf9PjtVZWqmfm2ojbecPF+IE99q8anx7KXkbyueQzwVfMzfqPVPat +LuX13mMeo/aqI5QvUTiD5i/WxHMYdDiHkVS//hU9IAjcF10idQK5r+5upGbEotPzGzU8o ubkjPZfSBmKdQ4b1PS5xXlmfdMxNNgW7D81C88Sf6RZQfmpjJpk1Nf0KxNxKbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689238925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GcZwtJRuGQsSF3NUvod7e8LDYY2dkRHRn8a8BOc0uOg=; b=cKOJZLoONLQBXJzRASfBSrzi1sbkx9bRPbjZ1vT3mbiD8spWjXP4MG+GWU5UPJP5cUMqyJ FUHUVwwbX/HUd54515SF2k+McPUCMvn0+feNDkf+r7XYM5kvjipQLcUEoUWKFIJ2fQvrRz zjJZ3zMFCNR0tKiR7sv5bt253sXgyeEpbpA83p3iA/WjUonbvoui72nIQ9hBaB1u+PFeub eMEiRwIa0o/kEa7mqcL7UnvvYw4RrpT63Jpkg5yDJWmzEFRQuKtK1e45UzFiGuTzT2I6dr oo6ixsgE4nj2JnGmVSw3tTeEP2vLHBa8CpFCPoJruHzzWBdB5+DQ+U3GK1MkSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689238925; a=rsa-sha256; cv=none; b=T+LQfTf29U41zxXanbqiys/HfZXdgs/sWBUQA57ScyN0gXdRjnc70zeJ/doObJXpVr/3iG vT236UzclYyxK0HO5iskNrmQwUAVSRtjBriPDcdp78t1QLkQsFtbG+d5FZcpFTaCei0xI6 zLtfESYXZ9AhIuvi70ZgB4zCwnFcw+6znagXgk3mb8Tdx7nvoCsvkVOQUrjQ1rNXz2v8Y1 /Glv6cIOyzusrsQWdBgQshD1LAsNkgLGcPmAs0lG2VNMcjPrK8IWmwk6CI8kzYIv/YZgsd u6XbznOngi6SXxQN428D6a8bimq79u8Ek1NYQvUmotnJlqKF+QAlXS+3EsAeMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R1pWw6pTDzlJJ; Thu, 13 Jul 2023 09:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36D924CD079825; Thu, 13 Jul 2023 09:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D924RY079824; Thu, 13 Jul 2023 09:02:04 GMT (envelope-from git) Date: Thu, 13 Jul 2023 09:02:04 GMT Message-Id: <202307130902.36D924RY079824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 6fc7fc2dbb2b - main - pfsync: transport over IPv6 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fc7fc2dbb2b246f529013807fdfa1ffb8364dc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6fc7fc2dbb2b246f529013807fdfa1ffb8364dc1 commit 6fc7fc2dbb2b246f529013807fdfa1ffb8364dc1 Author: Luiz Amaral AuthorDate: 2023-07-13 06:06:24 +0000 Commit: Kristof Provost CommitDate: 2023-07-13 06:09:42 +0000 pfsync: transport over IPv6 Implement pfsync over IPv6. Submitted by: Luiz Amaral Submitted by: Naman Sood Reviewed by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D40102 --- sbin/ifconfig/ifpfsync.c | 15 +- sys/netpfil/pf/if_pfsync.c | 331 ++++++++++++++++++++++++++++++++++++----- sys/netpfil/pf/pfsync_nv.c | 12 ++ tests/sys/netpfil/pf/pfsync.sh | 126 ++++++++++++++++ 4 files changed, 440 insertions(+), 44 deletions(-) diff --git a/sbin/ifconfig/ifpfsync.c b/sbin/ifconfig/ifpfsync.c index 3e880c96a97c..1bd17c5376eb 100644 --- a/sbin/ifconfig/ifpfsync.c +++ b/sbin/ifconfig/ifpfsync.c @@ -227,12 +227,17 @@ setpfsync_syncpeer(if_ctx *ctx, const char *val, int dummy __unused) case AF_INET: { struct sockaddr_in *sin = satosin(peerres->ai_addr); - if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr))) - errx(1, "syncpeer address cannot be multicast"); - memcpy(&addr, sin, sizeof(*sin)); break; } +#endif +#ifdef INET6 + case AF_INET6: { + struct sockaddr_in6 *sin6 = satosin6(peerres->ai_addr); + + memcpy(&addr, sin6, sizeof(*sin6)); + break; + } #endif default: errx(1, "syncpeer address %s not supported", val); @@ -377,9 +382,9 @@ pfsync_status(if_ctx *ctx) if (syncdev[0] != '\0') printf("syncdev: %s ", syncdev); - if (syncpeer.ss_family == AF_INET && + if ((syncpeer.ss_family == AF_INET && ((struct sockaddr_in *)&syncpeer)->sin_addr.s_addr != - htonl(INADDR_PFSYNC_GROUP)) { + htonl(INADDR_PFSYNC_GROUP)) || syncpeer.ss_family == AF_INET6) { struct sockaddr *syncpeer_sa = (struct sockaddr *)&syncpeer; diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 4fe916c77ab8..5df51d20e05f 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -91,12 +91,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include #include +#include #include +#include #include #include #include @@ -105,6 +108,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include @@ -112,7 +116,8 @@ struct pfsync_bucket; struct pfsync_softc; union inet_template { - struct ip ipv4; + struct ip ipv4; + struct ip6_hdr ipv6; }; #define PFSYNC_MINPKT ( \ @@ -247,6 +252,7 @@ struct pfsync_softc { struct ifnet *sc_ifp; struct ifnet *sc_sync_if; struct ip_moptions sc_imo; + struct ip6_moptions sc_im6o; struct sockaddr_storage sc_sync_peer; uint32_t sc_flags; uint8_t sc_maxupdates; @@ -303,7 +309,7 @@ static void pfsync_push(struct pfsync_bucket *); static void pfsync_push_all(struct pfsync_softc *); static void pfsyncintr(void *); static int pfsync_multicast_setup(struct pfsync_softc *, struct ifnet *, - struct in_mfilter *imf); + struct in_mfilter *, struct in6_mfilter *); static void pfsync_multicast_cleanup(struct pfsync_softc *); static void pfsync_pointers_init(void); static void pfsync_pointers_uninit(void); @@ -368,6 +374,9 @@ static struct pfsync_bucket *pfsync_get_bucket(struct pfsync_softc *, VNET_DEFINE(struct if_clone *, pfsync_cloner); #define V_pfsync_cloner VNET(pfsync_cloner) +const struct in6_addr in6addr_linklocal_pfsync_group = + {{{ 0xff, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0 }}}; static int pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) { @@ -842,6 +851,109 @@ done: } #endif +#ifdef INET6 +static int +pfsync6_input(struct mbuf **mp, int *offp __unused, int proto __unused) +{ + struct pfsync_softc *sc = V_pfsyncif; + struct mbuf *m = *mp; + struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); + struct pfsync_header *ph; + struct pfsync_subheader subh; + + int offset, len, flags = 0; + int rv; + uint16_t count; + + PF_RULES_RLOCK_TRACKER; + + *mp = NULL; + V_pfsyncstats.pfsyncs_ipackets++; + + /* Verify that we have a sync interface configured. */ + if (!sc || !sc->sc_sync_if || !V_pf_status.running || + (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + goto done; + + /* verify that the packet came in on the right interface */ + if (sc->sc_sync_if != m->m_pkthdr.rcvif) { + V_pfsyncstats.pfsyncs_badif++; + goto done; + } + + if_inc_counter(sc->sc_ifp, IFCOUNTER_IPACKETS, 1); + if_inc_counter(sc->sc_ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); + /* verify that the IP TTL is 255. */ + if (ip6->ip6_hlim != PFSYNC_DFLTTL) { + V_pfsyncstats.pfsyncs_badttl++; + goto done; + } + + + offset = sizeof(*ip6); + if (m->m_pkthdr.len < offset + sizeof(*ph)) { + V_pfsyncstats.pfsyncs_hdrops++; + goto done; + } + + if (offset + sizeof(*ph) > m->m_len) { + if (m_pullup(m, offset + sizeof(*ph)) == NULL) { + V_pfsyncstats.pfsyncs_hdrops++; + return (IPPROTO_DONE); + } + ip6 = mtod(m, struct ip6_hdr *); + } + ph = (struct pfsync_header *)((char *)ip6 + offset); + + /* verify the version */ + if (ph->version != PFSYNC_VERSION) { + V_pfsyncstats.pfsyncs_badver++; + goto done; + } + + len = ntohs(ph->len) + offset; + if (m->m_pkthdr.len < len) { + V_pfsyncstats.pfsyncs_badlen++; + goto done; + } + + /* + * Trusting pf_chksum during packet processing, as well as seeking + * in interface name tree, require holding PF_RULES_RLOCK(). + */ + PF_RULES_RLOCK(); + if (!bcmp(&ph->pfcksum, &V_pf_status.pf_chksum, PF_MD5_DIGEST_LENGTH)) + flags = PFSYNC_SI_CKSUM; + + offset += sizeof(*ph); + while (offset <= len - sizeof(subh)) { + m_copydata(m, offset, sizeof(subh), (caddr_t)&subh); + offset += sizeof(subh); + + if (subh.action >= PFSYNC_ACT_MAX) { + V_pfsyncstats.pfsyncs_badact++; + PF_RULES_RUNLOCK(); + goto done; + } + + count = ntohs(subh.count); + V_pfsyncstats.pfsyncs_iacts[subh.action] += count; + rv = (*pfsync_acts[subh.action])(m, offset, count, flags, subh.action); + if (rv == -1) { + PF_RULES_RUNLOCK(); + return (IPPROTO_DONE); + } + + offset += rv; + } + PF_RULES_RUNLOCK(); + +done: + m_freem(m); + return (IPPROTO_DONE); +} +#endif + static int pfsync_in_clr(struct mbuf *m, int offset, int count, int flags, int action) { @@ -1701,6 +1813,19 @@ pfsync_sendout(int schedswi, int c) ip_fillid(ip); break; } +#endif +#ifdef INET6 + case AF_INET6: + { + struct ip6_hdr *ip6; + + ip6 = mtod(m, struct ip6_hdr *); + bcopy(&sc->sc_template.ipv6, ip6, sizeof(*ip6)); + aflen = offset = sizeof(*ip6); + + ip6->ip6_plen = htons(m->m_pkthdr.len); + break; + } #endif default: m_freem(m); @@ -2512,10 +2637,8 @@ pfsync_tx(struct pfsync_softc *sc, struct mbuf *m) error = ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL); } else { - MPASS(false); - /* We don't support pfsync over IPv6. */ - /*error = ip6_output(m, NULL, NULL, - IP_RAWOUTPUT, &sc->sc_imo6, NULL);*/ + error = ip6_output(m, NULL, NULL, 0, + &sc->sc_im6o, NULL, NULL); } break; #endif @@ -2564,10 +2687,12 @@ pfsyncintr(void *arg) static int pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, - struct in_mfilter *imf) + struct in_mfilter* imf, struct in6_mfilter* im6f) { struct ip_moptions *imo = &sc->sc_imo; + struct ip6_moptions *im6o = &sc->sc_im6o; int error; + struct sockaddr_in6 *syncpeer_sa6 = NULL; if (!(ifp->if_flags & IFF_MULTICAST)) return (EADDRNOTAVAIL); @@ -2578,9 +2703,12 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, { ip_mfilter_init(&imo->imo_head); imo->imo_multicast_vif = -1; - if ((error = in_joingroup(ifp, &((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr, NULL, - &imf->imf_inm)) != 0) + if ((error = in_joingroup(ifp, + &(((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr), + NULL, &imf->imf_inm)) != 0) + { return (error); + } ip_mfilter_insert(&imo->imo_head, imf); imo->imo_multicast_ifp = ifp; @@ -2589,7 +2717,29 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, break; } #endif +#ifdef INET6 + case AF_INET6: + { + syncpeer_sa6 = (struct sockaddr_in6 *)&sc->sc_sync_peer; + if ((error = in6_setscope(&syncpeer_sa6->sin6_addr, ifp, NULL))) + { + return (error); + } + ip6_mfilter_init(&im6o->im6o_head); + if ((error = in6_joingroup(ifp, &syncpeer_sa6->sin6_addr, NULL, + &(im6f->im6f_in6m), 0)) != 0) + { + return (error); + } + + ip6_mfilter_insert(&im6o->im6o_head, im6f); + im6o->im6o_multicast_ifp = ifp; + im6o->im6o_multicast_hlim = PFSYNC_DFLTTL; + im6o->im6o_multicast_loop = 0; + break; + } } +#endif return (0); } @@ -2598,7 +2748,9 @@ static void pfsync_multicast_cleanup(struct pfsync_softc *sc) { struct ip_moptions *imo = &sc->sc_imo; + struct ip6_moptions *im6o = &sc->sc_im6o; struct in_mfilter *imf; + struct in6_mfilter *im6f; while ((imf = ip_mfilter_first(&imo->imo_head)) != NULL) { ip_mfilter_remove(&imo->imo_head, imf); @@ -2606,6 +2758,13 @@ pfsync_multicast_cleanup(struct pfsync_softc *sc) ip_mfilter_free(imf); } imo->imo_multicast_ifp = NULL; + + while ((im6f = ip6_mfilter_first(&im6o->im6o_head)) != NULL) { + ip6_mfilter_remove(&im6o->im6o_head, im6f); + in6_leavegroup(im6f->im6f_in6m, NULL); + ip6_mfilter_free(im6f); + } + im6o->im6o_multicast_ifp = NULL; } void @@ -2625,6 +2784,7 @@ pfsync_detach_ifnet(struct ifnet *ifp) */ ip_mfilter_init(&sc->sc_imo.imo_head); sc->sc_imo.imo_multicast_ifp = NULL; + sc->sc_im6o.im6o_multicast_ifp = NULL; sc->sc_sync_if = NULL; } @@ -2655,9 +2815,11 @@ pfsync_pfsyncreq_to_kstatus(struct pfsyncreq *pfsyncr, struct pfsync_kstatus *st static int pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) { - struct in_mfilter *imf = NULL; struct ifnet *sifp; - struct ip *ip; + struct in_mfilter *imf = NULL; + struct in6_mfilter *im6f = NULL; + struct sockaddr_in *status_sin; + struct sockaddr_in6 *status_sin6; int error; int c; @@ -2669,12 +2831,45 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) else if ((sifp = ifunit_ref(status->syncdev)) == NULL) return (EINVAL); - struct sockaddr_in *status_sin = - (struct sockaddr_in *)&(status->syncpeer); - if (sifp != NULL && (status_sin->sin_addr.s_addr == 0 || - status_sin->sin_addr.s_addr == - htonl(INADDR_PFSYNC_GROUP))) - imf = ip_mfilter_alloc(M_WAITOK, 0, 0); + switch (status->syncpeer.ss_family) { + case AF_UNSPEC: + case AF_INET: { + status_sin = (struct sockaddr_in *)&(status->syncpeer); + if (sifp != NULL) { + if (status_sin->sin_addr.s_addr == 0 || + status_sin->sin_addr.s_addr == + htonl(INADDR_PFSYNC_GROUP)) { + status_sin->sin_family = AF_INET; + status_sin->sin_len = sizeof(*status_sin); + status_sin->sin_addr.s_addr = + htonl(INADDR_PFSYNC_GROUP); + } + + if (IN_MULTICAST(ntohl(status_sin->sin_addr.s_addr))) { + imf = ip_mfilter_alloc(M_WAITOK, 0, 0); + } + } + break; + } + case AF_INET6: { + status_sin6 = (struct sockaddr_in6*)&(status->syncpeer); + if (sifp != NULL) { + if (IN6_IS_ADDR_UNSPECIFIED(&status_sin6->sin6_addr) || + IN6_ARE_ADDR_EQUAL(&status_sin6->sin6_addr, + &in6addr_linklocal_pfsync_group)) { + status_sin6->sin6_family = AF_INET6; + status_sin6->sin6_len = sizeof(*status_sin6); + status_sin6->sin6_addr = + in6addr_linklocal_pfsync_group; + } + + if (IN6_IS_ADDR_MULTICAST(&status_sin6->sin6_addr)) { + im6f = ip6_mfilter_alloc(M_WAITOK, 0, 0); + } + } + break; + } + } PFSYNC_LOCK(sc); @@ -2691,13 +2886,31 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) return (EINVAL); } - struct sockaddr_in *sc_sin = (struct sockaddr_in *)&sc->sc_sync_peer; - sc_sin->sin_family = AF_INET; - sc_sin->sin_len = sizeof(*sc_sin); - if (status_sin->sin_addr.s_addr == 0) { - sc_sin->sin_addr.s_addr = htonl(INADDR_PFSYNC_GROUP); - } else { - sc_sin->sin_addr.s_addr = status_sin->sin_addr.s_addr; + switch (status->syncpeer.ss_family) { + case AF_INET: { + struct sockaddr_in *status_sin = (struct sockaddr_in *)&(status->syncpeer); + struct sockaddr_in *sc_sin = (struct sockaddr_in *)&sc->sc_sync_peer; + sc_sin->sin_family = AF_INET; + sc_sin->sin_len = sizeof(*sc_sin); + if (status_sin->sin_addr.s_addr == 0) { + sc_sin->sin_addr.s_addr = htonl(INADDR_PFSYNC_GROUP); + } else { + sc_sin->sin_addr.s_addr = status_sin->sin_addr.s_addr; + } + break; + } + case AF_INET6: { + struct sockaddr_in6 *status_sin = (struct sockaddr_in6 *)&(status->syncpeer); + struct sockaddr_in6 *sc_sin = (struct sockaddr_in6 *)&sc->sc_sync_peer; + sc_sin->sin6_family = AF_INET6; + sc_sin->sin6_len = sizeof(*sc_sin); + if(IN6_IS_ADDR_UNSPECIFIED(&status_sin->sin6_addr)) { + sc_sin->sin6_addr = in6addr_linklocal_pfsync_group; + } else { + sc_sin->sin6_addr = status_sin->sin6_addr; + } + break; + } } sc->sc_maxupdates = status->maxupdates; @@ -2731,12 +2944,20 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) pfsync_multicast_cleanup(sc); - if (sc_sin->sin_addr.s_addr == htonl(INADDR_PFSYNC_GROUP)) { - error = pfsync_multicast_setup(sc, sifp, imf); + if (((sc->sc_sync_peer.ss_family == AF_INET) && + IN_MULTICAST(ntohl(((struct sockaddr_in *) + &sc->sc_sync_peer)->sin_addr.s_addr))) || + ((sc->sc_sync_peer.ss_family == AF_INET6) && + IN6_IS_ADDR_MULTICAST(&((struct sockaddr_in6*) + &sc->sc_sync_peer)->sin6_addr))) { + error = pfsync_multicast_setup(sc, sifp, imf, im6f); if (error) { if_rele(sifp); - ip_mfilter_free(imf); PFSYNC_UNLOCK(sc); + if (imf != NULL) + ip_mfilter_free(imf); + if (im6f != NULL) + ip6_mfilter_free(im6f); return (error); } } @@ -2744,17 +2965,39 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) if_rele(sc->sc_sync_if); sc->sc_sync_if = sifp; - ip = &sc->sc_template.ipv4; - bzero(ip, sizeof(*ip)); - ip->ip_v = IPVERSION; - ip->ip_hl = sizeof(sc->sc_template.ipv4) >> 2; - ip->ip_tos = IPTOS_LOWDELAY; - /* len and id are set later. */ - ip->ip_off = htons(IP_DF); - ip->ip_ttl = PFSYNC_DFLTTL; - ip->ip_p = IPPROTO_PFSYNC; - ip->ip_src.s_addr = INADDR_ANY; - ip->ip_dst.s_addr = sc_sin->sin_addr.s_addr; + switch (sc->sc_sync_peer.ss_family) { + case AF_INET: { + struct ip *ip; + ip = &sc->sc_template.ipv4; + bzero(ip, sizeof(*ip)); + ip->ip_v = IPVERSION; + ip->ip_hl = sizeof(sc->sc_template.ipv4) >> 2; + ip->ip_tos = IPTOS_LOWDELAY; + /* len and id are set later. */ + ip->ip_off = htons(IP_DF); + ip->ip_ttl = PFSYNC_DFLTTL; + ip->ip_p = IPPROTO_PFSYNC; + ip->ip_src.s_addr = INADDR_ANY; + ip->ip_dst = ((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr; + break; + } + case AF_INET6: { + struct ip6_hdr *ip6; + ip6 = &sc->sc_template.ipv6; + bzero(ip6, sizeof(*ip6)); + ip6->ip6_vfc = IPV6_VERSION; + ip6->ip6_hlim = PFSYNC_DFLTTL; + ip6->ip6_nxt = IPPROTO_PFSYNC; + ip6->ip6_dst = ((struct sockaddr_in6 *)&sc->sc_sync_peer)->sin6_addr; + + struct epoch_tracker et; + NET_EPOCH_ENTER(et); + in6_selectsrc_addr(if_getfib(sc->sc_sync_if), &ip6->ip6_dst, 0, + sc->sc_sync_if, &ip6->ip6_src, NULL); + NET_EPOCH_EXIT(et); + break; + } + } /* Request a full state table update. */ if ((sc->sc_flags & PFSYNCF_OK) && carp_demote_adj_p) @@ -2841,15 +3084,22 @@ VNET_SYSUNINIT(vnet_pfsync_uninit, SI_SUB_PROTO_FIREWALL, SI_ORDER_FOURTH, static int pfsync_init(void) { -#ifdef INET int error; pfsync_detach_ifnet_ptr = pfsync_detach_ifnet; +#ifdef INET error = ipproto_register(IPPROTO_PFSYNC, pfsync_input, NULL); if (error) return (error); #endif +#ifdef INET6 + error = ip6proto_register(IPPROTO_PFSYNC, pfsync6_input, NULL); + if (error) { + ipproto_unregister(IPPROTO_PFSYNC); + return (error); + } +#endif return (0); } @@ -2862,6 +3112,9 @@ pfsync_uninit(void) #ifdef INET ipproto_unregister(IPPROTO_PFSYNC); #endif +#ifdef INET6 + ip6proto_unregister(IPPROTO_PFSYNC); +#endif } static int diff --git a/sys/netpfil/pf/pfsync_nv.c b/sys/netpfil/pf/pfsync_nv.c index d4a839581332..1a461d138fc7 100644 --- a/sys/netpfil/pf/pfsync_nv.c +++ b/sys/netpfil/pf/pfsync_nv.c @@ -35,6 +35,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include + +#include +#include + #include int @@ -42,6 +47,7 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *sa) { int af; + int error; if (!nvlist_exists_number(nvl, "af")) return (EINVAL); @@ -74,6 +80,11 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, return (EINVAL); memcpy(in6, addr, sizeof(*in6)); + + error = sa6_embedscope(in6, V_ip6_use_defzone); + if (error) + return (error); + break; } #endif @@ -106,6 +117,7 @@ pfsync_sockaddr_to_syncpeer_nvlist(struct sockaddr_storage *sa) #ifdef INET6 case AF_INET6: { struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa; + sa6_recoverscope(in6); nvlist_add_number(nvl, "af", in6->sin6_family); nvlist_add_binary(nvl, "address", in6, sizeof(*in6)); break; diff --git a/tests/sys/netpfil/pf/pfsync.sh b/tests/sys/netpfil/pf/pfsync.sh index 1b61ec4f03a0..6ee2038c6eee 100644 --- a/tests/sys/netpfil/pf/pfsync.sh +++ b/tests/sys/netpfil/pf/pfsync.sh @@ -702,6 +702,130 @@ timeout_cleanup() pft_cleanup } +atf_test_case "basic_ipv6_unicast" "cleanup" +basic_ipv6_unicast_head() +{ + atf_set descr 'Basic pfsync test (IPv6)' + atf_set require.user root +} + +basic_ipv6_unicast_body() +{ + pfsynct_init + + epair_sync=$(vnet_mkepair) + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + + vnet_mkjail one ${epair_one}a ${epair_sync}a + vnet_mkjail two ${epair_two}a ${epair_sync}b + + # pfsync interface + jexec one ifconfig ${epair_sync}a inet6 fd2c::1/64 no_dad up + jexec one ifconfig ${epair_one}a inet6 fd2b::1/64 no_dad up + jexec one ifconfig pfsync0 \ + syncdev ${epair_sync}a \ + syncpeer fd2c::2 \ + maxupd 1 \ + up + jexec two ifconfig ${epair_two}a inet6 fd2b::2/64 no_dad up + jexec two ifconfig ${epair_sync}b inet6 fd2c::2/64 no_dad up + jexec two ifconfig pfsync0 \ + syncdev ${epair_sync}b \ + syncpeer fd2c::1 \ + maxupd 1 \ + up + + # Enable pf! + jexec one pfctl -e + pft_set_rules one \ + "block on ${epair_sync}a inet" \ + "pass out keep state" + jexec two pfctl -e + pft_set_rules two \ + "block on ${epair_sync}b inet" \ + "pass out keep state" + + ifconfig ${epair_one}b inet6 fd2b::f0/64 no_dad up + + ping6 -c 1 -S fd2b::f0 fd2b::1 + + # Give pfsync time to do its thing + sleep 2 + + if ! jexec two pfctl -s states | grep icmp | grep fd2b::1 | \ + grep fd2b::f0 ; then + atf_fail "state not found on synced host" + fi +} + +basic_ipv6_unicast_cleanup() +{ + pfsynct_cleanup +} + +atf_test_case "basic_ipv6" "cleanup" +basic_ipv6_head() +{ + atf_set descr 'Basic pfsync test (IPv6)' + atf_set require.user root +} + +basic_ipv6_body() +{ + pfsynct_init + + epair_sync=$(vnet_mkepair) + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + + vnet_mkjail one ${epair_one}a ${epair_sync}a + vnet_mkjail two ${epair_two}a ${epair_sync}b + + # pfsync interface + jexec one ifconfig ${epair_sync}a inet6 fd2c::1/64 no_dad up + jexec one ifconfig ${epair_one}a inet6 fd2b::1/64 no_dad up + jexec one ifconfig pfsync0 \ + syncdev ${epair_sync}a \ + syncpeer ff12::f0 \ + maxupd 1 \ + up + jexec two ifconfig ${epair_two}a inet6 fd2b::2/64 no_dad up + jexec two ifconfig ${epair_sync}b inet6 fd2c::2/64 no_dad up + jexec two ifconfig pfsync0 \ + syncdev ${epair_sync}b \ + syncpeer ff12::f0 \ + maxupd 1 \ + up + + # Enable pf! + jexec one pfctl -e + pft_set_rules one \ + "block on ${epair_sync}a inet" \ + "pass out keep state" + jexec two pfctl -e + pft_set_rules two \ + "block on ${epair_sync}b inet" \ + "pass out keep state" + + ifconfig ${epair_one}b inet6 fd2b::f0/64 no_dad up + + ping6 -c 1 -S fd2b::f0 fd2b::1 + + # Give pfsync time to do its thing + sleep 2 + + if ! jexec two pfctl -s states | grep icmp | grep fd2b::1 | \ + grep fd2b::f0 ; then + atf_fail "state not found on synced host" + fi +} + +basic_ipv6_cleanup() +{ + pfsynct_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" @@ -712,4 +836,6 @@ atf_init_test_cases() atf_add_test_case "pfsync_pbr" atf_add_test_case "ipsec" atf_add_test_case "timeout" + atf_add_test_case "basic_ipv6_unicast" + atf_add_test_case "basic_ipv6" } From nobody Thu Jul 13 18:30:07 2023 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 4R237M6tHMz2tlLL; Thu, 13 Jul 2023 18:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R237M6TShz4FPW; Thu, 13 Jul 2023 18:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689273007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQlBehoEPcdnlgWbVfYsKp0/7LMFeok2/+MjKrb6q5s=; b=oK/JJDJ6bJoTAoG1C+wlXZzplYeIZxR1Xm9i7SycuhtBknTzO3a/8awmbLNyTdjigUAc9N J/oSHe762ms7hlAr6aW0cGHpgQX0O3KmA9WItsY270LUD/Jt+dzmIwTscCp866BKL/fIDJ n0yEZebTLnyBWWu+JGlA5j6Baq2alr/ftHhGc/+05x6yYIU89jnH65Sr1LDgdSDljpNeX8 ygGgakcV3MB2IxDNUJoNZVIwvWZobc3EjVD04Hd3ABKinXsN4raydyHmQjyIy7zKy058US qAXiCwvHP4aQZSyCG3e1DEWM2npFn/Dv9CUD2edHU8/uvOGJw2mZDqFaErFf9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689273007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQlBehoEPcdnlgWbVfYsKp0/7LMFeok2/+MjKrb6q5s=; b=xWbpdqOaY/lSXxBZanFqXQve6da0cgAkRgArDThznm/KHeLrIuZ1h9KnZqKMyiJm0ClltJ wxb9Klo/4iD06e6fKyxC8Wb0YIYiwWeP4fI/Cfgw3hGPcjk0cO9icIlbHKBnXh1kfWATzw DR1xTmflrqD2gECfU8MF26MBwRGt7q8e6ruMHqP82m152IboKKL6x58wE4AuHLyMCm4fLx Z0tIWhDnL7fW7w1tgs3/7iadCjlgyH3hoZL/cgchyrYur0HZUdpheXwZjzU1eDp3nP083E twFGqAvbODZk1smG1dyQ4G1QiPfEAsiqJNeWKCtoKHIP6xxDIw7GL0Ft91ITNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689273007; a=rsa-sha256; cv=none; b=jqu/PcQQW3Y2fLJ8uh3ScRUaHYVgXOtvNETu5EyHtGsAs4SzK1wn2bvkx2hCND3NaHyryP yaRZDHh+wUjIU1DpnSu1QX1+GRIFbQClXjDhLSpAXz+ZWb/6QlqC2HgM47piiblKQx/EGF 3FnRqkiSIk73bAkMMwnAupPW5M5/usCqiz0Do54P/6oSU3w6jPU37x5vb0lzt1kmxlBg+M 7EWjMavIXL1HMKmIijBtJ1S+IsxZD3G9VhysH771vMsDP0Ruee0fOzFm3T1iRr/GZwX2XO uykq1DobUfmSEPsJLT5jQuRCsB8e7gwPC2okB0JsJJfIusBRHOi93IbdCJvoYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R237M5TLvz11yB; Thu, 13 Jul 2023 18:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DIU7oM012920; Thu, 13 Jul 2023 18:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DIU77d012917; Thu, 13 Jul 2023 18:30:07 GMT (envelope-from git) Date: Thu, 13 Jul 2023 18:30:07 GMT Message-Id: <202307131830.36DIU77d012917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 8f056492c5e8 - main - vfs_bio: initialize pctries 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f056492c5e846912589dd0e9ceb4f8e682f2782 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=8f056492c5e846912589dd0e9ceb4f8e682f2782 commit 8f056492c5e846912589dd0e9ceb4f8e682f2782 Author: Doug Moore AuthorDate: 2023-07-13 18:28:21 +0000 Commit: Doug Moore CommitDate: 2023-07-13 18:28:21 +0000 vfs_bio: initialize pctries bufobj_init depends on fields bo_dirty.bv_root and bo_clean.bv_root being zeroed on entry and pctrie_init zeroing whatever is passed to them, and so does not call pctrie_init for either of them. That fails if pctrie_init ever changes to do something other that zeroing data, so add explicit calls to them. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D40978 --- sys/kern/vfs_bio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index cf01d2a239ea..98b267f89737 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -5152,7 +5153,9 @@ bufobj_init(struct bufobj *bo, void *private) rw_init(BO_LOCKPTR(bo), "bufobj interlock"); bo->bo_private = private; TAILQ_INIT(&bo->bo_clean.bv_hd); + pctrie_init(&bo->bo_clean.bv_root); TAILQ_INIT(&bo->bo_dirty.bv_hd); + pctrie_init(&bo->bo_dirty.bv_root); } void From nobody Thu Jul 13 18:59:23 2023 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 4R23n72p2Xz4mZ4l; Thu, 13 Jul 2023 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R23n72LV4z4LQc; Thu, 13 Jul 2023 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689274763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvV06Nq6il69aI7K9DTnR2Yp191oo08ROnOSFFUF3Y0=; b=v3iUxM4Nf5D4Mmy08xEi9EMIVR+6dDPFG9QzC77V4f/1A19tCr7oyWrYCY13Sn+azaoPpj ofAK1s1IWQHcTQEMDDaaixI5xkWcM8iwULGjB+D48KViG4MmA/BAl4186Z0BXuhv4MkUis ZDqEGlmwI9eEolkHCNcCufdg2w6AobHIYtxMfesWo9phMWEzoNzvM23VMF3bOCD4YAR0ls 2d4OQCD/hE5sGYuM+jv2qy1lrvf0tPW0/qfMm8Hw48A4O+XheDo8hZDrAL7R3xEoeJCAfP DPAP4YsbFEbrSbfdEVbsbfzAm5fC2wVWVFO1Dj7Q29hz3UZg8TIz7dlscpY/Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689274763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zvV06Nq6il69aI7K9DTnR2Yp191oo08ROnOSFFUF3Y0=; b=DkI1n2JEhYu41fpNHlw9Rruyzvhj/8GLUewOaV4lUOXAEQ5nrXpXXH/fgtb2PRqg7AYXxQ dETB53z76dXn38iu0k8aZEcc9fGiqVL4+z5fCgpuDAJ0oRbFwyOkt83qGeu8ZCO/YJf7kU mVRV54L+kIcQyl9LFmbXSB8+RaasiaKLuY+dWybLPaq2C2rVN6cxgCpK9fvmDTZQQ1H1UD 23/pIXZrUuM2E/OuenVxkAOdKQJoYGcPLe0xEOph5BfCjcy5B511rNaxzEsYjzOZxuM4pw frml0K//IoKDAdyOo7wZ6yQf/QKwDgqiKWMNpFwM91bK+iRW9QVMuLoPhRr30Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689274763; a=rsa-sha256; cv=none; b=ILAjQSICc8GjsuAeY8ja4SNASYq14gxtiFN/LasKwCliW3lRN+D+nc2ZYgkRjF+kYX587j 888Z0ZV3eWVmwattknrKn3xBvHtn7iFP52pTBk/s55bD2HpJ6tdJFoi+FskrD9dGWT7Wd3 G0OJiTQDVvDzg5u8MZC1y+5KHjJ+BrnSxSrfo2VpL9FfuvuDRx9xWdPtjNPMrIh0HNFDgx Eq+8B9QEfcPdoI/5bc4GATLO0YVq8iQI7x3axl3HS1qx4orzoC0tqbjs5wgroriUODVAkR fJj8obhHJqH5z/W01HDAEjY/1jCBF8KkXO9pmSaoaUTkZkocZHvcmQlVTFHpjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R23n71JgRz12M2; Thu, 13 Jul 2023 18:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DIxNCx058532; Thu, 13 Jul 2023 18:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DIxNPi058531; Thu, 13 Jul 2023 18:59:23 GMT (envelope-from git) Date: Thu, 13 Jul 2023 18:59:23 GMT Message-Id: <202307131859.36DIxNPi058531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1cd9788408aa - main - Merge commit fde5924dcc69 from llvm-project (by Serge Pavlov): 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cd9788408aa9ea4fd0fbc3e06bd9a4eaf8d8d22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1cd9788408aa9ea4fd0fbc3e06bd9a4eaf8d8d22 commit 1cd9788408aa9ea4fd0fbc3e06bd9a4eaf8d8d22 Author: Dimitry Andric AuthorDate: 2023-07-13 18:57:22 +0000 Commit: Dimitry Andric CommitDate: 2023-07-13 18:57:22 +0000 Merge commit fde5924dcc69 from llvm-project (by Serge Pavlov): [clang] Reset FP options before template instantiation AST nodes that may depend on FP options keep them as a difference relative to the options outside the AST node. At the moment of instantiation the FP options may be different from the default values, defined by command-line option. In such case FP attributes would have unexpected values. For example, the code: template void func_01(int last, C) { func_01(last, int()); } void func_02() { func_01(0, 1); } #pragma STDC FENV_ACCESS ON caused compiler crash, because template instantiation takes place at the end of translation unit, where pragma STDC FENV_ACCESS is in effect. As a result, code in the template instantiation would use constrained intrinsics while the function does not have StrictFP attribute. To solve this problem, FP attributes in Sema must be set to default values, defined by command line options. This change resolves https://github.com/llvm/llvm-project/issues/63542. Differential Revision: https://reviews.llvm.org/D154359 Requested by: pkubaj PR: 265755, 265758 MFC after: 1 month --- contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index 7a0da8d08333..bed5237749c5 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -5057,6 +5057,10 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, // PushDeclContext because we don't have a scope. Sema::ContextRAII savedContext(*this, Function); + FPFeaturesStateRAII SavedFPFeatures(*this); + CurFPFeatures = FPOptions(getLangOpts()); + FpPragmaStack.CurrentValue = FPOptionsOverride(); + if (addInstantiatedParametersToScope(Function, PatternDecl, Scope, TemplateArgs)) return; From nobody Thu Jul 13 20:31:34 2023 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 4R25qW1bnNz4n7jQ; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R25qW18vkz3QBF; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689280295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyL2W7Zes+AFH3EkfStfHPr+1AGC8Bb0/m2QHjgYF9k=; b=BTQmxJQjyaBL7Zv9jJXTlLTNJ2LWyXtkAaszCtwNNZv8yFIzmmKsK3HplOFobHkr3NwrRf O82AGeP97BxzjwG5fHmaLdCCWgFon/lptvXSdxQwUSs8elxGkAaC+pX9pVWnEKha3GlG3G 9X6O0HG0vM1KfnKxVnN449cn4lZe7AatCqvWUIQAz/drQYIUfO+bkNtMT+IAitvGgDRWV1 lvcpXYMm0gmxSdL3UTcupMPO6m9cRJswgPmyKc06CbWS50ZqHLjcg+cxGRj70nw2btaWfD nD/X31NB49UV5IvvccADdpZFjplZvMS6cUI+ccxNJWIatYuULNaFNKHIkhBWIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689280295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cyL2W7Zes+AFH3EkfStfHPr+1AGC8Bb0/m2QHjgYF9k=; b=Ztx7QsJYBFJuM/kkaW6rTeMYCLUaJLtI6ZueZcmw6K+vllQzyc0qryvaoSjxvYBh/xZ65m XttTjIIMKVoDNk5xJP41JkBy43WzPU3HpoIy/jf11hjtDHVRQYUj9hX9x8KDHZLvbabODJ bDcbjeTfQplj/EedW1okrn5LhaqeFWtudrkJGWXC6dsfQVzSlaOME8qXMdx4OLKsSbp+RI 2LSe19LGB/6YS9eQ/0/oFZ/nB7ufA3l4MgOb3DlN+fI4e4SyHn6Vn6H4R2NRm8m55x5+F9 +V9LHZW2xaBE4g9CFI/BK5dBczOy5RRW6v6rIyUecrG61gOnYTZFrENB+jz5Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689280295; a=rsa-sha256; cv=none; b=lLKXKZuhLDoRniyCODbM8eLZWpXj72nwVdyi5k4Rmw5ITTCsDeiWdPFKppjDkQ90v/76Gk AyN9lvdFxCm7wBrANxXCWwe3pV9PlxynldlGSTzX4LcIk9nu3TXqAdgP+wkuuFk95bO6+9 gGc2pN2xITd4NbnIToAA+xkEhxKfzSVbVyCrB9YKxFg/4Gl+G4Z3k96sPY5aAq/FyOM4Pd ZEJfgt0OEZlVFs8KOSxwd6RxQjYgw6YVtLdUlPuqsZEuhqJOusvEqJm9tZwygNVDtX7xUE U9571U5eXzVt5FwYcftVQt+X2lkq4ufrUM9qkfvQswVIBSFnD+nJ0SUhX8Yo+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R25qW0Ds5z155s; Thu, 13 Jul 2023 20:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DKVYpV019477; Thu, 13 Jul 2023 20:31:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DKVYIK019476; Thu, 13 Jul 2023 20:31:34 GMT (envelope-from git) Date: Thu, 13 Jul 2023 20:31:34 GMT Message-Id: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: be78a31188c5 - main - tcp: fix build issue for some cc modules 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be78a31188c530c93700396ecfdb5604a8f22fff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff commit be78a31188c530c93700396ecfdb5604a8f22fff Author: Michael Tuexen AuthorDate: 2023-07-13 16:56:25 +0000 Commit: Michael Tuexen CommitDate: 2023-07-13 16:56:25 +0000 tcp: fix build issue for some cc modules The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523 The corresponding changes in two Makefiles were missed, which resulted in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. Reported by: void@f-m.fm Reviewed by: rrs, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D41010 --- sys/modules/cc/Makefile | 6 +++--- sys/modules/khelp/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile index 3f7110024722..b595cc204481 100644 --- a/sys/modules/cc/Makefile +++ b/sys/modules/cc/Makefile @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \ # Do we have the TCP_HHOOK symbol defined? If not, there is no point in # building these modules by default. -# We will default to building these modules unless $OPT_INET is defined -# and does not contain the TCP_HHOOK option. -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" +# We will default to building these modules if $OPT_GLOBAL does contain +# the TCP_HHOOK option. +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" SUBDIR+= \ cc_cdg \ cc_chd \ diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile index 256d8838c573..c01d61541062 100644 --- a/sys/modules/khelp/Makefile +++ b/sys/modules/khelp/Makefile @@ -4,9 +4,9 @@ SUBDIR= # Do we have the TCP_HHOOK symbol defined? If not, there is no point in # building this modules by default. -# We will default to building this module unless $OPT_INET is defined -# and does not contain the TCP_HHOOK option. -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" +# We will default to building this module if $OPT_GLOBAL does contain +# the TCP_HHOOK option. +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" SUBDIR+= h_ertt .endif From nobody Thu Jul 13 21:16:37 2023 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 4R26qV060Nz2tnrB; Thu, 13 Jul 2023 21:16:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R26qT6n3hz3p5B; Thu, 13 Jul 2023 21:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689282998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFm8GTO264larkoNQjDssEGFq8df97/z/azCdWTIJ5E=; b=LXUdWbWNdbMkGnbdIkSBTQk51/pHiWL4Mq3jvzr7eqM2r9HLeTZBobtE74dHUU/0MWAizK FONXAfRH/v+TSJTb1hATIVr/ftCxoa41DtD/SmOgaGBWiWbIEIPuNfs852M/Wo214fitcR B4/fEwfRVCRdam191wQ3XBqXF7mxOIYD6GZEcqPywkK1EsSsum3IG5GjvN591QwxggdI0k TrBT5jrhnKyk+J/EkGRMfao7OCyB5lnWDwiUPYzVxnUYeeSpFiKxdUMaxRybHQzgaYsjXT vbtYhjVdSP2oqUdjB2f1+kynGPFQ1PkEls0Yg2ntoSaII0SnPNy4ypmZEQ7nTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689282997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aFm8GTO264larkoNQjDssEGFq8df97/z/azCdWTIJ5E=; b=Rcb55CZmT9Mvu/tpy46Es7H2mVzJcX145mJNhYLnEorVdrQxZWCfD9W05CRjbQeuaiVsfZ Rn7QBwWyzBFuko0i6PBLdCLrThgACSOrqM66r5vrupN7WCSjRz2Ae2pJW0T6kbWlLsYY2r nGnlv0yo4jgv1lQqnzW5Vv5aew4i9H5GSbKTZ6E1HMqkQ3+PT4wzdx9p382PBvmoZw12vS eVoKiR5KMZsy0zahoTXPq5EVM82BGMQ1rHsvD64FS+DgJwl3+fynUdbljOfUHk+9xZcw6c m7EqaPbclNS0kdu6P2f2khu6bhUOR0mKIMrFdDq21zpfW4mXe3WlFqWY9COX2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689282998; a=rsa-sha256; cv=none; b=vMZCcuFEhwP9aG3enx5sKYR48lOjDmiRI41ffZe5GmrsiZrq1j+4rILRwudtk71dSBh4Kc S0STLrkgn9TAzFwsVvvLzSxT/7ktm80sbJ3dEJL30W834ibEmU+11xAacKqy7jJqYE4cwH f74cvtX07kZ/gpEWnOf7fIixp+cnoCcq6r47FXEYXKiQpQjOWeAm653+PwykhbAiZKk3U+ gWSRqJbRu4M25xiISVHpA0xL9T+Hg+2l6JDJyWRzgmqAX2gNQV0g3N9yqZmj37xJPDW8+W 3CTewdguLyU/eCoHggAkrWOhR2MQtNjYainwhKEcApqVJhcH5VeY1yj8ZRphNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R26qT5rqWz15xR; Thu, 13 Jul 2023 21:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DLGbHC090078; Thu, 13 Jul 2023 21:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DLGbDx090077; Thu, 13 Jul 2023 21:16:37 GMT (envelope-from git) Date: Thu, 13 Jul 2023 21:16:37 GMT Message-Id: <202307132116.36DLGbDx090077@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: c3f58005d92e - main - signal: Remove gsignal references from manuals 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3f58005d92e5ac189e7dcb2d6d868ed5a0f27fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f58005d92e5ac189e7dcb2d6d868ed5a0f27fa commit c3f58005d92e5ac189e7dcb2d6d868ed5a0f27fa Author: Dmitry Chagin AuthorDate: 2023-07-13 21:15:47 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-13 21:15:47 +0000 signal: Remove gsignal references from manuals Reported by: Mina Galić, mhorne Reviewed by: Mina Galić, mhorne Differential Revision: https://reviews.freebsd.org/D41020 MFC after: 1 week --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 3 +-- share/man/man9/psignal.9 | 23 +---------------------- share/man/man9/signal.9 | 3 +-- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index bde97dfecb53..c2f629133fd5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230714: gsignal +OLD_FILES+=/usr/share/man/man9/gsignal.9.gz + # 20230626: Only install sys/dev/nvme/nvme.h to /usr/include OLD_FILES+=usr/include/dev/nvme/nvme_private.h diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 45f9ec9b0515..ab373e22b185 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1829,8 +1829,7 @@ MLINKS+=prng.9 prng32.9 \ prng.9 prng64_bounded.9 MLINKS+=proc_rwmem.9 proc_readmem.9 \ proc_rwmem.9 proc_writemem.9 -MLINKS+=psignal.9 gsignal.9 \ - psignal.9 pgsignal.9 \ +MLINKS+=psignal.9 pgsignal.9 \ psignal.9 tdsignal.9 MLINKS+=pwmbus.9 pwm.9 MLINKS+=random.9 arc4rand.9 \ diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9 index aa170322e7cf..936f47f930e7 100644 --- a/share/man/man9/psignal.9 +++ b/share/man/man9/psignal.9 @@ -28,14 +28,13 @@ .\" $NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $ .\" $FreeBSD$ .\" -.Dd October 8, 2011 +.Dd July 14, 2023 .Dt PSIGNAL 9 .Os .Sh NAME .Nm psignal , .Nm kern_psignal , .Nm pgsignal , -.Nm gsignal , .Nm tdsignal .Nd post signal to a thread, process, or process group .Sh SYNOPSIS @@ -46,8 +45,6 @@ .Ft void .Fn pgsignal "struct pgrp *pgrp" "int signum" "int checkctty" .Ft void -.Fn gsignal "int pgid" "int signum" -.Ft void .Fn tdsignal "struct thread *td" "int signum" .Sh DESCRIPTION These functions post a signal to a thread or one or more processes. @@ -129,24 +126,6 @@ is no action is taken. .Pp The -.Fn gsignal -function posts signal number -.Fa signum -to each member of the process group identified by the group id -.Fa pgid . -.Fn gsignal -first finds the group structure associated with -.Fa pgid , -then invokes -.Fn pgsignal -with the argument -.Fa checkctty -set to zero. -If -.Fa pgid -is zero no action is taken. -.Pp -The .Fn tdsignal function posts signal number .Fa signum diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9 index a2e54fef012d..d6906f359c18 100644 --- a/share/man/man9/signal.9 +++ b/share/man/man9/signal.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 8, 2013 +.Dd July 14, 2023 .Dt SIGNAL 9 .Os .Sh NAME @@ -430,7 +430,6 @@ function returns either a valid signal number or zero. .Fn issignal returns either a valid signal number or zero. .Sh SEE ALSO -.Xr gsignal 9 , .Xr pgsignal 9 , .Xr psignal 9 .Sh AUTHORS From nobody Thu Jul 13 21:37:24 2023 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 4R27HS2wNLz4mYgL; Thu, 13 Jul 2023 21:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R27HS2GKrz3sq4; Thu, 13 Jul 2023 21:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG3Own+ZHqDuiUlE4+pfE2veVR8MgNu4RMk6vziD87o=; b=qY7nP7mkGQG8S0vygcq8JI4hkwPVwuGqcEcH7oiANloJE1dNaFH14OJimm7nX3SmXsGUmb Vwg2Uoww9eP78DbvLY5QXA9P7W3jlHpRMUUoRlV0tX2krYcz3QcnqcFhIcjCkGm7usMWdp 18JBtmAYWVZA/vtqgk8A7RfW/LWVw6TKtYaH8xIsJSfqrWlZzXGFcXfKVhv+2mHNmBxQR7 PsaALJjueIGEL6aijZsYo2gt7BCW08blnyg0eYReMcOZYqIFfUFXSgQnaZq8ZNQy2yD3EK wPCzP2HsO8ZmskPiQjX/QmIB/XzaJ9OAe/Mtl6cIwwRZScqCRUUKeyHM2a7w6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RG3Own+ZHqDuiUlE4+pfE2veVR8MgNu4RMk6vziD87o=; b=J2S2v8BW1vbQdclVO9DCPLdt/5df9QMN3npKqMTN2GowCtWZEFuUmzysfC2uCFZ7BvEKsq Otq/1VyieckN4s6yVgLjFMMFJi4BSa08pG0o+SHRrosXDC0zo99TlTL+SBPx7zgWnW4Sm/ DRYkP/EZwDpS1P0JDm2zFvEZVNc0oQD9fFpSuSZTVPIqwQKck5YNfwuJ7n4vTETY2zJpuo tgL80+quZGvzUxCdK+T46iR+aaqfzXq10B7nAkMRLibZDi1p6d3KqJhvWplPW/n1wgCnVq /KYN1AovTI47mqnl3mgxFDtq5EDRp47CZQE+uakYzFFJCV0ooP+QUcxjQdOx1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689284244; a=rsa-sha256; cv=none; b=i45qDE/xRveqMi/0Sl6F32Q2gfNu9c02DHC7x5XmBxQRvR/Ne0nl0NkMHZD3ws3WLyu+oo 94YL0d7xQIDsBomad94zeGGpYsIhMCHPKebuQQdlGNvIl4xOQ1FeT2PP8zsHvOTGQqt1rK 20cGfJxD0krnAxXjtULGistR0OjHuuNsrTcwkFXCNazYlwUAMqG+d3SBgWrSqbWBm9+16L pRDRXLV9P+MI9HQKRZOb+flgyPYrjPtpzOHqHn+uRLnIRk/EhMmJYfntjv+Vnc6s7eD96b mJOm1uY6W1y7jOmiMHnz17nHdZf9MgJjQoO8QKRpcM1tcHXaPiydTRHzgq/3fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R27HS1BZ5z16X9; Thu, 13 Jul 2023 21:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DLbO90022767; Thu, 13 Jul 2023 21:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DLbOGk022766; Thu, 13 Jul 2023 21:37:24 GMT (envelope-from git) Date: Thu, 13 Jul 2023 21:37:24 GMT Message-Id: <202307132137.36DLbOGk022766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 202adb223610 - main - xargs: fix -R so that it accepts negative numbers again 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 202adb2236104141dc02d512084a3cc4bbe734c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=202adb2236104141dc02d512084a3cc4bbe734c7 commit 202adb2236104141dc02d512084a3cc4bbe734c7 Author: Daniel Tameling AuthorDate: 2023-07-13 20:06:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-13 21:35:23 +0000 xargs: fix -R so that it accepts negative numbers again fbc445addf9 converted the parsing of arguments to strtonum but made the accepted range for -R too restrictive. As documented in the man page, it should accept negative numbers. Added a test for this, which was provided by Jose Luis Duran. Fixes: fbc445addf9 MFC after: 1 week Reviewed by: des, kevans Differential Revision: https://reviews.freebsd.org/D41021 --- usr.bin/xargs/tests/Makefile | 1 + usr.bin/xargs/tests/regress.R-1.out | 4 ++++ usr.bin/xargs/tests/regress.sh | 3 ++- usr.bin/xargs/xargs.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile index 228c1d545781..6bb861a6d27a 100644 --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -15,6 +15,7 @@ ${PACKAGE}FILES+= regress.J.out ${PACKAGE}FILES+= regress.L.out ${PACKAGE}FILES+= regress.P1.out ${PACKAGE}FILES+= regress.R.out +${PACKAGE}FILES+= regress.R-1.out ${PACKAGE}FILES+= regress.in ${PACKAGE}FILES+= regress.n1.out ${PACKAGE}FILES+= regress.n2.out diff --git a/usr.bin/xargs/tests/regress.R-1.out b/usr.bin/xargs/tests/regress.R-1.out new file mode 100644 index 000000000000..7bdf58090c60 --- /dev/null +++ b/usr.bin/xargs/tests/regress.R-1.out @@ -0,0 +1,4 @@ +The quick brown quick brown quick brown quick brownquick brown quick brown quick brown +The fox jumped fox jumped fox jumped fox jumpedfox jumped fox jumped fox jumped +The over the lazy over the lazy over the lazy over the lazyover the lazy over the lazy over the lazy +The dog dog dog dogdog dog dog diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index e79bfd4352fa..ed81d66bf2a6 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,6 +1,6 @@ # $FreeBSD$ -echo 1..20 +echo 1..21 REGRESSION_START($1) @@ -10,6 +10,7 @@ REGRESSION_TEST(`J', `xargs -J% echo The % again. <${SRCDIR}/regress.in') REGRESSION_TEST(`L', `xargs -L3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`P1', `xargs -P1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in') +REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort') diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index e832cbb35a31..94a32d04fd67 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -200,7 +200,7 @@ main(int argc, char *argv[]) pflag = 1; break; case 'R': - Rflag = (int)strtonum(optarg, 0, INT_MAX, &errstr); + Rflag = (int)strtonum(optarg, INT_MIN, INT_MAX, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); break; From nobody Thu Jul 13 21:37:25 2023 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 4R27HT4N8Gz4mYMG; Thu, 13 Jul 2023 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R27HT2SJvz3t62; Thu, 13 Jul 2023 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mj/WMHI9noQq/VbKlGGdzylt5UxZ4Fhw1feewu1IPPA=; b=uqOCGDUL1LT3KgoO2zNk+qBpcOzaUk9FMlXZP77husUXmK+Eurw5KkiAGEmAuBQmQkCOjz 5cvlpGR0mCNYHQ5Jif03/8bg2DcUIC5UnlQwN2TLSKERU0KLeKgPDKT8m531Vh+AnEhD1C BmcUVfYA2elgAZSg7h0ffTzWrGuiG/BoJlv2t3fBxQgQiOpx6D+J8VQtw6qxTZhdvNOqMU 4GMdmHuiTkCw3K0YCrsGi2WtI5aAas9V1kUK+Iiu3CQdxqFWPOO01Ycjmh6xCyRihNMEDV 677+2c7/QmaQWkYZx83qE0mzSG/+aGoLk5bbg0muy18DWCDtBBxljjS2NZSdRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mj/WMHI9noQq/VbKlGGdzylt5UxZ4Fhw1feewu1IPPA=; b=YjLurHSH7VnEPkEcFbzcS0dS8xJwjPfchjYBHPg5oMiEhGkINamwI4v3QhjdwQ3s4Qn1Hx 5fIdzjk/LeYaRBb+tFK+7guHMU6+HX7vvQjiIH9h6U7cJVl3psPZP/aSevvkUiCUJqNnLG QdlQdMyvw1tuZj9htmtWJY2cwwjDwOFiR2WtplaO0d55SxArqFTFbAo/JcXoCwlQhhNyj8 feGyuPaEe2Vz5g+/HZvnqukXalLA2Y39IkIZyPzHfmlPI2duJIcwLuHfHXAei8k0gWfcyT xaytcivt3lIa3xS5Bv4RoQ0pm58DaqhdPlqvnRMgmMpIWOGbAjegOj3Tunsd4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689284245; a=rsa-sha256; cv=none; b=QFKtwHBhoUTIRZ60cacAsxAKBAnlyTFq/8v+wxi77SOVncwFuGAkVOt4nncTpqoPjsyI01 Zbedh3SxqlmF8ngkyY8p+jo/taAPl6bpmkV9WljZxrb/Q5ZcWz1soxsZZ4nwPUSELiQTxK Bo9VHQxfnhGEFnMmohMFGC8WgAkXoFelq1hlIWcuxsE/bcjR8XU70/SiCwbiKpxvLkUQqN 5eoBnuP+uzGj5N2QLYUbctp/HM/G590sSOLkt04WFmbmwnje3jEbikUOAzcD64MDJVceUX PFB2uO/8fNmJAkd2y5lObIN6ugb3ELzU6/yEH4Jrnsac7mcjmXqQPbVasuylKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R27HT1XhPz16P1; Thu, 13 Jul 2023 21:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DLbPV4022799; Thu, 13 Jul 2023 21:37:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DLbPHh022798; Thu, 13 Jul 2023 21:37:25 GMT (envelope-from git) Date: Thu, 13 Jul 2023 21:37:25 GMT Message-Id: <202307132137.36DLbPHh022798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 1048a870e3b6 - main - xargs: disallow -R0 and -L0 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1048a870e3b6973a5be1193f3b45e6e867e8e1c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1048a870e3b6973a5be1193f3b45e6e867e8e1c0 commit 1048a870e3b6973a5be1193f3b45e6e867e8e1c0 Author: Daniel Tameling AuthorDate: 2023-07-13 20:06:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-13 21:35:23 +0000 xargs: disallow -R0 and -L0 Both cases were interpreted as these flags are unset. This meant that -R0 got converted to -R5 and that -L0 didn't have any effect at all. Since make at most 0 replacements isn't useful and since call utility for every 0 lines read doesn't make sense, throw an error for these two cases. MFC after: 1 week Reviewed by: des, kevans Differential Revision: https://reviews.freebsd.org/D41022 --- usr.bin/xargs/xargs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 94a32d04fd67..e6f8619bb8d1 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -174,7 +174,7 @@ main(int argc, char *argv[]) replstr = optarg; break; case 'L': - Lflag = (int)strtonum(optarg, 0, INT_MAX, &errstr); + Lflag = (int)strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); break; @@ -203,6 +203,8 @@ main(int argc, char *argv[]) Rflag = (int)strtonum(optarg, INT_MIN, INT_MAX, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); + if (!Rflag) + errx(1, "-%c %s: %s", ch, optarg, "must be non-zero"); break; case 'r': /* GNU compatibility */ From nobody Thu Jul 13 21:37:26 2023 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 4R27HV4FM2z4mYPK; Thu, 13 Jul 2023 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R27HV3BG1z3t8r; Thu, 13 Jul 2023 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6HZkKejzn6iAZljI1CA7unzBJFmd6W5MXTOajMNqy4=; b=Ena5uj0vaIPCmWAqjdYu0JH5qe5exhQSKTYjn6en1RjDELbgM0uTGgT1eRBOf35sT3lcg7 /nDcXRMsKx6fHkM/eyMloMzfRMHd3sNsrl0ulAtr2SI3uXSv5o3ZbcJlzCi+dbnXAhdm/6 C9JP7SvjCO4aCxtHyV6xsnQB5imQQ1jKeJOljm0vndDYJeGV7vJD90URxT4pLLZ9Gtepf+ 4D2AQxwRRLgeUBkF9IF/1YnDbSvtEB5JcDK21xOSdeLHrOEYjEy6wuBldzGYTIeDDRbVKn NyjBj3aAMrAE9k6sPlbBnulNpAK908KG5xU0cr+TMbawwu0HbsfFHjtY6qtlVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6HZkKejzn6iAZljI1CA7unzBJFmd6W5MXTOajMNqy4=; b=CXxPtz59wUuTWJrV90DT6xQvi6hB+EkDH5jurVB5eQZEViUOyINilVB/55S7ztdp2xgKDG U9MZmaVcml8UJX3uptrEB5Q4gD5q9LoTHfJssXBUPEC6Si4mObYPEAnMHZYMGSio7cGu27 rvoq19Vbyumj/JWd54oPjpwOxG0goTZ5Jfj0vQigrwa/04QxgC1ecqxd2vngO/AeO4GSKy I5AcBkLoc50zQGW8fvnkJQ8ViOmsmoTnlZdGC50Ao10lz94X5LBZr8xr9JioayDXqG83zN zhTv6repqB0TFT2b+7ZVs/XJJfil8HeOAO0n96tQcxZhaDEdHR0GJ/jLyIDnvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689284246; a=rsa-sha256; cv=none; b=gn9CJTwvVRQId33eatoU4eek/ia0iqLzR7ZYTx/wlAx4PBPYKEuOewEO/VYVp1wCvYmTXC QRqQQowJwiqXN0eIQyAcs/N8YZiD/DmYryT+1263+LjEdOY0Q2jIOgz+9MLu9MBjuUcEHb 71cjlphH98XRkHGGGTe1/EokNlJZicz237+iCcneghidbFMC0zUhVH05C4Sw2u3GraBDL4 JAs0WW6wnXdAqpbZ0f0x5Tszn7kLOQGMXcID9iey4hOEFi+JIBFUVb0YUemZNSAnimVDon D7Ad5WlgBcKfP7eyP21rbgG2aQKkkhnvnEWFGqu2wdEOcyAmYc13Cavfi6qaww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R27HV2F48z16P2; Thu, 13 Jul 2023 21:37:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DLbQVA022824; Thu, 13 Jul 2023 21:37:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DLbQ0R022823; Thu, 13 Jul 2023 21:37:26 GMT (envelope-from git) Date: Thu, 13 Jul 2023 21:37:26 GMT Message-Id: <202307132137.36DLbQ0R022823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: eab91d008165 - main - xargs: Prevent overflow in linelen calculation if nargs is large. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eab91d008165e7bbf8ca7b87eabe4dc8bf3da191 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eab91d008165e7bbf8ca7b87eabe4dc8bf3da191 commit eab91d008165e7bbf8ca7b87eabe4dc8bf3da191 Author: Dag-Erling Smørgrav AuthorDate: 2023-07-13 20:06:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-13 21:35:23 +0000 xargs: Prevent overflow in linelen calculation if nargs is large. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41023 --- usr.bin/xargs/tests/regress.n2147483647.out | 1 + usr.bin/xargs/tests/regress.sh | 1 + usr.bin/xargs/xargs.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/xargs/tests/regress.n2147483647.out b/usr.bin/xargs/tests/regress.n2147483647.out new file mode 100644 index 000000000000..cc32a92a2199 --- /dev/null +++ b/usr.bin/xargs/tests/regress.n2147483647.out @@ -0,0 +1 @@ +quick brown fox jumped over the lazy dog diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index ed81d66bf2a6..fed3ab9c8461 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -5,6 +5,7 @@ echo 1..21 REGRESSION_START($1) REGRESSION_TEST(`normal', `xargs echo The <${SRCDIR}/regress.in') +REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') REGRESSION_TEST(`I', `xargs -I% echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`J', `xargs -J% echo The % again. <${SRCDIR}/regress.in') REGRESSION_TEST(`L', `xargs -L3 echo <${SRCDIR}/regress.in') diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index e6f8619bb8d1..cd6b7da1a186 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -257,7 +257,7 @@ main(int argc, char *argv[]) * the maximum arguments to be read from stdin and the trailing * NULL. */ - linelen = 1 + argc + nargs + 1; + linelen = 1 + argc + (size_t)nargs + 1; if ((av = bxp = malloc(linelen * sizeof(char *))) == NULL) errx(1, "malloc failed"); From nobody Thu Jul 13 21:41:01 2023 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 4R27Md5M02z4mZwy; Thu, 13 Jul 2023 21:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R27Md4x9Tz3vdB; Thu, 13 Jul 2023 21:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y8nEJhEx74AC1s1TqNXYWaujp3i4IbxQH/fuQfoje98=; b=PzFDnw/ze9S6C3f3wydfgt9Xsy82R64X9eWVzmbSFwHjrTqz0KskIKg9FZvwNcMAuhxUNt PKRz7O29WSnKU43Ur9HrU6ct3fa1Tki8a02I5exLYjUpJG35Ii7TljxLorggnqVt6y8Lns 0fhGWbbE1DLN1afLB+wXlM1tsG/tmOGJeSzB6sJegrDlpaw8YjsJFSN3aEmqIqIANvOFvC VOv/kXM4jpEJLFMESrEJa09rDxldi9OqBxh6cjoufVoFEHExde11pGFDba+DVlmD5i5bfU AFoVqZ9EWD/4acn8atEYVwubeIkNKm5cyyTs/YRdP5aQnN/2ZIA6lz/vOXsWmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689284461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y8nEJhEx74AC1s1TqNXYWaujp3i4IbxQH/fuQfoje98=; b=HDfHVS3oYNViYVx8+EpsiWTVITNbDiJzAhc8r0I87/JhJ2Y2xx+wS+ja8xCIbiCHfiIuTP z+0IIp2lENACmrSiJSlpjGUeXHiIsiR+xI690FRiw8zqIvPeaCIMbOQSkFn/1Ojp4Fp23w 8reigYNX5IMhNqQ5cjktkzNxO7UibEZAItrVspZMH9oDp+kg84vlaarrXOL9Rzlge9nNYY dAT9IoSFK/qb2vM8WqOrnUVK3eg6Vkj6EE+iehnquHoIXv3cezQ83xv8RLdBi7hUw3VbgL FGUaZEdfR9pxUDXpdDvLXIqCRnBRHkcLlAGF1e18EuNCsZtMfIV682ImpyqoZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689284461; a=rsa-sha256; cv=none; b=adkOuhxtNXCfpNTRNlulj38WK7vxWPV6eKN4qJtBf6c7adD2iUChD0CFB7ULvBa+FMS0K7 CtUbrNFOeAiQinjWSl33NE9ss+p8SutD//mUQ1FIuNbqlFa610GalhJRcvR7wl07Fa2alu 3OGpkbdwUMxudRhwmTjPR+1YUqljsDRLV2EXhEebZriLqqddsIJWpLcHFrUn8IXPRB0Dzs oTgx58iRnOCtlPqIpqvdp/FYUTtsmCC/6itnDgLBxuVUTV5yfYkKWyF/5ntlqk37mXLx2x JaXslurpNKd53cc6pMVJs/YChSh76KCjKK9GrpWtN7FAU4l+/wc5VcjVlBufkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R27Md41R4z16PG; Thu, 13 Jul 2023 21:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DLf11w033168; Thu, 13 Jul 2023 21:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DLf1KI033167; Thu, 13 Jul 2023 21:41:01 GMT (envelope-from git) Date: Thu, 13 Jul 2023 21:41:01 GMT Message-Id: <202307132141.36DLf1KI033167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: c65845d0bb2d - main - xargs: Fix test case count. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c65845d0bb2d17dc283ae5928f25e68212a30842 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c65845d0bb2d17dc283ae5928f25e68212a30842 commit c65845d0bb2d17dc283ae5928f25e68212a30842 Author: Dag-Erling Smørgrav AuthorDate: 2023-07-13 21:40:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-13 21:40:36 +0000 xargs: Fix test case count. MFC after: 1 week Sponsored by: Klara, Inc. --- usr.bin/xargs/tests/regress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index fed3ab9c8461..eb6b99ec29fc 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,6 +1,6 @@ # $FreeBSD$ -echo 1..21 +echo 1..22 REGRESSION_START($1) From nobody Thu Jul 13 23:41:27 2023 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 4R2B2b6Y7yz4nLRm; Thu, 13 Jul 2023 23:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2B2b49dcz4KZJ; Thu, 13 Jul 2023 23:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689291687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSM+rl7FHNmsRQFV4rR/HJTDGZtVFLk9J39kvl6G+dM=; b=FUAGy1luYSVureWi82m705YGZUuN493JmseODwopjib8OIazCedHidzMf/2aytSfknGBWd tz/0YtOTfdc1DRyqU4wJtK1p5La2eSu0TgGcd0gdLTufGykdUWN3z+xjFRTHhZ6s/4Z5Ax q13s1l0q4B9135RQdiLA/zaIF2m3B4xPeL7/a4UhSOfNJgtJ5loFSZNVEC5lcIaFrDq80s IUjAxwSpmzzyVXH5+JzaPYKFLYJMZ6lPkYklAYQYr1GyXV2mefj2osOwtkrOHTkWlk0hj7 AHsYhg3mUrEpYre75rfa4PxmSZYCu5tBchDpRliv2GKfUVnkcQhApy6g4I5rEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689291687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSM+rl7FHNmsRQFV4rR/HJTDGZtVFLk9J39kvl6G+dM=; b=D6inIaIIep4dYRHKuNeA8immctsFv4IkRSJslwCRHXQz5xNoLaAwyMsXnC69wnBt9p0mFi TXvQLpFzJ/2Lt+/IBqafdmSngUu99c29ZJs87ezBWMjWO/5QegwKWCkk2a+OH+ogSoPHsO doWZTOcinZTU01fWxaxq7NFmSm4KpxFCPoUMr0E2DV3RUkc8Df8bdpCjfWW3r3wTXcX9P0 HPmNQjCUwcBWaCwf9oOwsrKdn+sznvWJYqfksjx1ZPaV+QIyMeuTfWxgpaenRMctEQy2KB 08e9mSUDOfgwFrPx5fRj24qZeZD8FDKPhxNfhd/z46mCzwTyECCj7kn6ZihNLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689291687; a=rsa-sha256; cv=none; b=NpHlvZMa2MijhMfWVYFDOh0OY7JTjurLoL9uysrNtDbKJSkxb0/ZWLoHS7HznaKBVC73uW cY1JNWp2OM5xhzwHyLwE0Lp0SbgMnYZGqenpLEwHgx4tF0PTMYsyTJmf130A7RnNaLXJcF 0sljxd7Whdu1YmJKBWNYlsip6uBZm+2KXwQ6meZ9SFN8fxpImaELkLTP8uUyEL3FMKcW99 7mVigJbpqqYoXhqMtkjJCRA4/mfR6I+Ghv3dbGlxslGjdzZmJiBj5frqqZ9os80ZazRV0T BhAUx5WFeQcKRl83IhKiMWgu4T+FNDB7ucvGYHKRFFS08SAFXar/O9qJqswfwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2B2b3FKMz19Zp; Thu, 13 Jul 2023 23:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36DNfRQA035281; Thu, 13 Jul 2023 23:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DNfRFn035280; Thu, 13 Jul 2023 23:41:27 GMT (envelope-from git) Date: Thu, 13 Jul 2023 23:41:27 GMT Message-Id: <202307132341.36DNfRFn035280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: d234c8228ced - main - xargs: Install missing test output. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d234c8228ced5ea3aa86bd2e9eca79b87d8e6441 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d234c8228ced5ea3aa86bd2e9eca79b87d8e6441 commit d234c8228ced5ea3aa86bd2e9eca79b87d8e6441 Author: Jose Luis Duran AuthorDate: 2023-07-13 23:39:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-07-13 23:39:51 +0000 xargs: Install missing test output. Fixes: eab91d008165e7bbf8ca7b87eabe4dc8bf3da191 MFC after: 1 week Reviewed by: des Differential Revision: https://reviews.freebsd.org/D41033 --- usr.bin/xargs/tests/Makefile | 1 + usr.bin/xargs/tests/regress.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile index 6bb861a6d27a..fb1e80c2e222 100644 --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -19,6 +19,7 @@ ${PACKAGE}FILES+= regress.R-1.out ${PACKAGE}FILES+= regress.in ${PACKAGE}FILES+= regress.n1.out ${PACKAGE}FILES+= regress.n2.out +${PACKAGE}FILES+= regress.n2147483647.out ${PACKAGE}FILES+= regress.n2P0.out ${PACKAGE}FILES+= regress.n3.out ${PACKAGE}FILES+= regress.normal.out diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index eb6b99ec29fc..f0f0bd4a3edd 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -5,7 +5,6 @@ echo 1..22 REGRESSION_START($1) REGRESSION_TEST(`normal', `xargs echo The <${SRCDIR}/regress.in') -REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') REGRESSION_TEST(`I', `xargs -I% echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`J', `xargs -J% echo The % again. <${SRCDIR}/regress.in') REGRESSION_TEST(`L', `xargs -L3 echo <${SRCDIR}/regress.in') @@ -14,6 +13,7 @@ REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in' REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in') +REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort') REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in') From nobody Fri Jul 14 00:10:54 2023 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 4R2Bhb3TsTz4nSN9; Fri, 14 Jul 2023 00:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Bhb1JwHz4Nvg; Fri, 14 Jul 2023 00:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689293455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S421GIzb1Xan4qQ+tQsMyKw7/hLrwsGao84e5h+2JcU=; b=GD3XnneRXPEa8kWOW429ENZzE6xqudkOXk7ssdJ+4+TJ4dTqpKsaeRAdZLotsibvOx0KAh 5mfnS9p/O9ThQtZBi0obApQW6kXfUAuaWC1iK97q0V8CZlTwyaIhhnXb7pBRsdaBQY3B3+ jpqk2zHd2xdn9Rd25lLsxAwHaJk9CTO/QH189H34kN8HlaO21kSUKlzjb7Gj93NDSoMhhl FrU2liLH9K1keLv9KKLMBj2dfNRe/qIRZZ2RaSoJpKyTjyXWV2ZELGhRNvUpAqk9tbJiYh J/zX2RgGJXzK6ejWihnfJQAIgd2N5bbRo92U/4VjypAxIU/vs+Cv0grIGDN3pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689293455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S421GIzb1Xan4qQ+tQsMyKw7/hLrwsGao84e5h+2JcU=; b=EaMICCmuFOCLh2V+j3wVYWuBy0rCltFcPRjQ0GEypvkV9PbfxhMz+PJ9hCoW/JcloiJuk4 3LsF9LEyb+Qm785/sSFkYBtFRDzTC/tzbMhltG5ifMh3L5ldxXW+VNkMc+uZZND3OtxiR6 cpyLOlj/oGaXhjt6Hl0q3ErWWDjEDKmLiQUA+TS23Jm6Exc7KwD1G1r0NfXcZGr65QWdMq ZlFNBqPq39x7sGIs9Z8swhkWoYlpvBaimm7xsYtSb7Ow4kXXBPFK7BLsynxYN/GVuWojAu x6b7rGqK45xf0isixcOnq1gJ0fmXBPeCxiaCYqqsuo2DHVkr+yBQyc5fbZ06Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689293455; a=rsa-sha256; cv=none; b=mvqK1QrLscy+bwbcxu2ODLFFWuqrRN7HDgWdKb5Ibzn47+LNCRYv5sSYsIqHnpfCQT72NX WIad4P57ut9a3rui8KJXUU1Wlg4imMMU7SxURMOwZE0W/RdrITAmV+XGNjg1u3OgQJSgdG +maVntfLO+t9NP3V+CsQaKp01ZkbUmM8U9QcZTqYjPbes9x5AIxDHBKkPZurn2Eoslwpe4 9SO6udGGMugqO3h7Oy8VUD3SyGzN7ir5KHJZ4F7PHr94sCAmIwKyAx8vlWmp6CVu/7C/tJ GnxnpYQFRG98v0sfV1ALwNsAwnrpWzWJM9mk3qiB7SoGSzzGYxUcvZ0sX6CyHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Bhb0NJBz1BBV; Fri, 14 Jul 2023 00:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E0Aslk079676; Fri, 14 Jul 2023 00:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E0AsQQ079675; Fri, 14 Jul 2023 00:10:54 GMT (envelope-from git) Date: Fri, 14 Jul 2023 00:10:54 GMT Message-Id: <202307140010.36E0AsQQ079675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 39248950a014 - main - nvmecontrol.8: Fix a few formatting nits. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39248950a014b9abb9be87c8a3564109af89c3e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=39248950a014b9abb9be87c8a3564109af89c3e0 commit 39248950a014b9abb9be87c8a3564109af89c3e0 Author: John Baldwin AuthorDate: 2023-07-14 00:08:36 +0000 Commit: John Baldwin CommitDate: 2023-07-14 00:10:36 +0000 nvmecontrol.8: Fix a few formatting nits. --- sbin/nvmecontrol/nvmecontrol.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8 index 4a1b9e73c199..462bdedb3222 100644 --- a/sbin/nvmecontrol/nvmecontrol.8 +++ b/sbin/nvmecontrol/nvmecontrol.8 @@ -589,6 +589,7 @@ Show all the command values on stdout. .It Fl w -write Command writes data to the device. .El +.Pp Send arbitrary commands to the device. Can be used to extract vendor specific logs. Transfers to/from the device possible, but limited to @@ -615,7 +616,7 @@ Where is required, you can use either the .Pa nvmeX device, or the disk device such as -.Pa nda Z +.Pa ndaZ or .Pa nvdZ . For commands that take an optional From nobody Fri Jul 14 01:37:23 2023 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 4R2DcN0lyZz4mmpD; Fri, 14 Jul 2023 01:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2DcN0HX3z4l06; Fri, 14 Jul 2023 01:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5MEyeQyyojPL8YcFWSGmbg6wCyyS+B32T5Mx0gOcON8=; b=NzCEiyM60r5L84rL9xNJDtJAgOA1kZG/VqzbHiZJKut/slnD3tfog7kHKQvcBwCsL0g3Pr SbUwCz+IORKKOb9HNbPJJ6hOd1nW6dqZbBRefqtrFvq91fhtb8Z3y48tZ9b81z8Hxr2QNB F5RtXD0Uwq639TMvXO7MOkxm+WZlD1mx0ViPHj0kFuYvoeN9cfJ2oGllI5RY6cWJ//59Md de4n0mksHjl2IyTUXmFy3snW5gqNhu436QDbMrzORHMNzVAnQD2LHxojqOLBwn/grC8USF 01/l4wqUjLOHvmveHFXjq/t3eUPzXZseGsY+DxF7aim7rf7/ZC3oLOfhWAMacA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5MEyeQyyojPL8YcFWSGmbg6wCyyS+B32T5Mx0gOcON8=; b=L2TiDo3ynMPfnjt70laUtI98SmM4IsjoPqY+CNksEmVw+oIZMafvBkxHwoHhnNp75zVbZc l6RidqJE08Og3qkK+fcbXoF6dlrdQW41xioy7vYKUn5786cK3h5QA8X9a+pHuLXr1Sx5M3 Pc4k3kIdTjqPvHgl2GLHiWjZjeDrIU/4Kym5JxjfTEosffzW7fhnTl/PPUTQlVFA+/S8X1 1Td+EamO2laXiyb5DGzu8XzzgVdOptKkJI4+pidHJpdyQp8JOJUFwHfL35ysTf8DFHU3Vv k/MxBn4vN7rvn6Vpdo5Ey3HJnWZaAuN93FKwHPEuy6632x27XDaPUimDeYQ49Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689298644; a=rsa-sha256; cv=none; b=S07x/tPLZ+0mjRkNTSVas1kD/rMiq0CU9yW/BnqEvszn44T/inr870f0cjoaEUKESNtYXK goFp9eMmFtgk2HiUuNRXqU2yeqeSg3PM+FLv/3ehq8yj2WTzdSG/81+GJgCvuHAB9y5c9I 7OAHRtBMAiVaUiWSEwEk570pqEeSr8g8z/lPWB42uGIFAPule2mU6vf7hZ6JqnjQbooq8p xwl+Qej66Rb65jBP+fjzq7AfiUPaEXGoUwRFR2aKl3JpoUo8fgFpZDmZnkLtvFyKNwjaph y/kJ6ZNOQBatBHTfSFbuOcfpnnxJOJlOZCBk33V2dCa0D8tqCu/Jnw0gQhOirw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2DcM6Nyrz1DYv; Fri, 14 Jul 2023 01:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E1bNa3019326; Fri, 14 Jul 2023 01:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E1bNJX019325; Fri, 14 Jul 2023 01:37:23 GMT (envelope-from git) Date: Fri, 14 Jul 2023 01:37:23 GMT Message-Id: <202307140137.36E1bNJX019325@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 587458b7d67a - main - rpcgen: Perform shell-style word expansion on RPCGEN_CPP 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 587458b7d67a697c53fc2e31fb3407d1084fe773 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=587458b7d67a697c53fc2e31fb3407d1084fe773 commit 587458b7d67a697c53fc2e31fb3407d1084fe773 Author: Jessica Clarke AuthorDate: 2023-07-14 01:35:25 +0000 Commit: Jessica Clarke CommitDate: 2023-07-14 01:35:25 +0000 rpcgen: Perform shell-style word expansion on RPCGEN_CPP Up until recently, CPP has been a list of space-separated words, with no quotes, backslashes or other characters with special meaning to a shell. However, as of 8fad2cda93c7, (escaped) quotes appear in CPP, and the rudimentary parser in rpcgen is insufficient, since it will leave the escaped quotes as escaped rather than performing one level of expansion as would be done by a shell (whether in a script or a Makefile). Rather than hack around this in all the places RPCGEN_CPP gets set, implement proper expansion inside rpcgen. Note that this only deals with a subset of shell syntax, since we don't handle any of: | & ; < > ( ) $ ` * ? [ # ˜ = % having special meaning (with the exception of how a backslash behaves inside double quotes, where \$ means a literal $ inside double quotes but \a means a literal \a), instead using their literal value, but those are all reasonable restrictions, and can be worked around by avoiding their use; what's important is that we get the quoting and splitting right. This fixes -Winvalid-pp-token spew during build${libcompat}. Reviewed by: brooks Fixes: 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") Differential Revision: https://reviews.freebsd.org/D41013 --- usr.bin/rpcgen/rpc_main.c | 111 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 8 deletions(-) diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index ba9eda676b39..6576d6cfb919 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -270,20 +271,114 @@ add_warning(void) static void prepend_cpp(void) { - int idx = 0; - const char *var; - char *dupvar, *s, *t; + int idx = 0, quoted; + const char *var, *s; + char *dupvar, *t, *word; if (CPP != NULL) insarg(idx++, CPP); else if ((var = getenv("RPCGEN_CPP")) == NULL) insarg(idx++, "/usr/bin/cpp"); else { - /* Parse command line in a rudimentary way */ - dupvar = xstrdup(var); - for (s = dupvar; (t = strsep(&s, " \t")) != NULL; ) { - if (t[0]) - insarg(idx++, t); + /* + * Parse command line like a shell (but only handle whitespace, + * quotes and backslash). + */ + dupvar = malloc(strlen(var) + 1); + quoted = 0; + word = NULL; + for (s = var, t = dupvar; *s; ++s) { + switch (quoted) { + /* Unquoted */ + case 0: + switch (*s) { + case ' ': + case '\t': + case '\n': + if (word != NULL) { + *t++ = '\0'; + insarg(idx++, word); + word = NULL; + } + break; + case '\'': + if (word == NULL) + word = t; + quoted = 1; + break; + case '"': + if (word == NULL) + word = t; + quoted = 2; + break; + case '\\': + switch (*(s + 1)) { + case '\0': + break; + case '\n': + ++s; + continue; + default: + ++s; + break; + } + /* FALLTHROUGH */ + default: + if (word == NULL) + word = t; + *t++ = *s; + break; + } + break; + + /* Single-quoted */ + case 1: + switch (*s) { + case '\'': + quoted = 0; + break; + default: + *t++ = *s; + break; + } + break; + + /* Double-quoted */ + case 2: + switch (*s) { + case '"': + quoted = 0; + break; + case '\\': + switch (*(s + 1)) { + case '\0': + break; + case '$': + case '`': + case '"': + case '\\': + ++s; + break; + case '\n': + ++s; + continue; + default: + break; + } + /* FALLTHROUGH */ + default: + *t++ = *s; + break; + } + break; + } + } + if (quoted) + errx(1, "RPCGEN_CPP: unterminated %c", + quoted == 1 ? '\'' : '"'); + if (word != NULL) { + *t++ = '\0'; + insarg(idx++, word); } free(dupvar); } From nobody Fri Jul 14 01:37:24 2023 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 4R2DcP2GH5z4mmpH; Fri, 14 Jul 2023 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2DcP0mhWz4kqN; Fri, 14 Jul 2023 01:37:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtercP4qxYoEPIC4ZmXvr9Prxw8s0jph2VjeHaH42fs=; b=FpbiDzF4tJPnACNmdgC9jGc9/M78PuGRdP2VHgNANrqfxy1GV/OIkdFH07gKB2ugWOholU Z08uqdiBHHzaztwFFITQioQxPROHRmP/ZXXQOvXQEdD8FPYTS2U+NI7tBqOtArq9jUFdeJ MGWqHSArmIrPFOMgyYeLxU1GevIeRQduB3rO5QaAw/sxj5RCDnv9Ia6IphmVFtediJbmcl m0NtR39EQwsVglYsO1h3n/yEJrACsEjCBeASA4rN0KK4UgjiWlouSN/JSrdT+gmRcBBLeT 4biK5TN4yfTQuQ0ToUlvF1lm6I4JpFpW9pEDL4ZTtd3cO4GcnY5wtnDRwU2Prw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689298645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HtercP4qxYoEPIC4ZmXvr9Prxw8s0jph2VjeHaH42fs=; b=yiji66AQPgCLvtWNsr9hDZyztD4DG8DCAuJuZFqBkhqVdftS3aGcffPZ75uAlO9wPRKD9G 76hylt2ydWJ/PZ1zUL1ouELuUtVvt25aFe7OfAXV1h8RoVGPijpf+InVaSQFb/hc2BF0wI FY8ynJZVrWOqslb//c2MKPaNY07BM/URjRZKFQKr1iHzlwniMgbeWmc/hICITKjoPai53X Ae/XnGaHbRCMRF1t6CeoPKlC9Jqw3w/lVFKRN4zOsO8N7PqoaJ1C08amwZ2FHXzmVux+AS moMbxjrqbg3ru3XZCw8/E7sgM1dDy8ozte1GmN1SJsuSQ+8KNQSmfAoNmgbR3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689298645; a=rsa-sha256; cv=none; b=SgcjCgLndktw0cAmoHKWgoK8dv9Z172Lp0jsSspXUIYa+oJ2bQR0TLE66fqhn4EwHT1bcJ S339t4boIlhybiLRuVKAVJEOe5S3RaU76QzfVydltGQvBtobzk/5jnkMsAj2O+G/Zb/03Q LI4s5H5UkHtOz1HJtTAsPfyv8kahlSTXORiyDTs2Q/Yho9Ngc2d1Sl8fERLp1GEaals6Dz /lDJsffjxruf9B1N8JLmIrabsvjGs2aUFdti9m3sniAx2sMtjzKCA8KWhzUB9yktfsDjmV mHQKLlGHGQm82s8ICiQ/KgTXr4Wo8a+kTPj3Exl/cAOAlduYSkhmKRpNPO8DIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2DcN6lV2z1D6f; Fri, 14 Jul 2023 01:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E1bOa9019345; Fri, 14 Jul 2023 01:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E1bO5r019344; Fri, 14 Jul 2023 01:37:24 GMT (envelope-from git) Date: Fri, 14 Jul 2023 01:37:24 GMT Message-Id: <202307140137.36E1bO5r019344@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 0a5e35a7b181 - main - Makefile.libcompat: Be consistent about not installing includes 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 commit 0a5e35a7b1811308bcb2aa2e6c7e7bd49dfc9770 Author: Jessica Clarke AuthorDate: 2023-07-14 01:36:04 +0000 Commit: Jessica Clarke CommitDate: 2023-07-14 01:36:04 +0000 Makefile.libcompat: Be consistent about not installing includes Currently we only pass MK_INCLUDES=no for distribute and install, since it's only in LIB${_LIBCOMPAT}IMAKE, which means that we enable includes during libraries and thus install includes into worldtmp, despite it being shared these days across native and libcompats. This also means we're at risk of having headers needed for building against a libcompat that don't get installed to the system, but do end up being installed to worldtmp. In particular, lib/msun has different fenv.h for aarch64 and arm, so aarch64 will need arm's copy when it grows lib32 support, and this would be installed to worldtmp, but not to the system, meaning any programs that use fenv.h wouldn't be able to be built. Instead, be consistent, and don't install includes at all during any of the libcompat phases, so that we can detect these issues and ensure any needed headers are installed for both worldtmp and the system. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D41030 --- Makefile.libcompat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index 72ea4d865647..e8d33b905559 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -38,10 +38,10 @@ LIB${_LIBCOMPAT}WMAKE+= ${TIME_ENV} ${LIB${_LIBCOMPAT}WMAKEENV} ${MAKE} \ OBJTOP=${LIB${_LIBCOMPAT}_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ + MK_INCLUDES=no \ MK_MAN=no MK_HTML=no LIB${_LIBCOMPAT}IMAKE+= ${LIB${_LIBCOMPAT}WMAKE:NINSTALL=*:NDESTDIR=*} \ ${IMAKE_INSTALL} \ - MK_INCLUDES=no \ -DLIBRARIES_ONLY # Shared logic From nobody Fri Jul 14 05:29:00 2023 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 4R2Klc5mNDz4nFbn; Fri, 14 Jul 2023 05:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Klc55Y3z4GPK; Fri, 14 Jul 2023 05:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689312540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2y97psixSMPU3dCfqRU8j7B+1eXOkzYi2cjrsk22xi4=; b=IqQDvZ8tlx+6jkLkpHLb490SVL8fQelVYK19EosLDrBYK9F4xs+/543c2HYo61lJqpAVC3 sG9+/jkCe0ylywsV1kBFevdCaNAtDO0dYoeurMZCky6AFJmJJpZ1NdDKK7CLu2W3xQzEhU gi6VkKiSxzK6QQmBAv2tVrWZC430YGpsIz+zoEK1EsZJNGhNIojB/voApjbZRSQgLmd6Rq uOCBh+3RFLwCCzKgVTW5n9QVMllrWzjUyp7oEM35WOn7RttzdTPD+9rcI2IluElTjHVlPQ vNblrf/xYzXM7ZLjHGq32FN6Z+WCXt9kbpBTY9uhd197CRrlSjt0Z5uDXgavpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689312540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2y97psixSMPU3dCfqRU8j7B+1eXOkzYi2cjrsk22xi4=; b=NduaBo4Ex51/Fzw76EWmYPC3c9NovMjOngofhp8jTvxEHwgQCIBVolLwWmhKsORWQ/pgfF SU1pYshjN0Ex1zEjg5gHy7cQnPbyQ7mVjXsUn2VtnLT540UaBn+/sp01yt0umrx6fcSQto DPqb6XTdUZsh6KP/+L4WULDdP/8a3bmDpsIjZyAehP1Xm83Gk+7VelUUubdbjxdfn8Qy+f e4d/AMZbQQ74YX88Q3131xylFryhV50bIM5kMSiZme/ZepMU/i7qz+KBVghd4hp1ZfoWz0 YVlvTNR4hVpEKeUQGM30xXTKjJq9drZD38Lu1QVgaF9uqIKoD+kCqjS5cF8QIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689312540; a=rsa-sha256; cv=none; b=aEJXxlJqXqjFx4up3wi9NvfQN7S6bz5hvV1fJC88aTtzqogga22W3HdwiYbsgmtmF7fv7L jqympj5quwTCBAilrcJ66YWWIhc1dP3McanePe7KxEAOVNEkJkTQdzXmrYEOMWps3+qC3i tTWA+i7qCY8NJ9gpS37KAEItNx8T/+bub4BP56KIz2jR8TOne8MFRQIifIV7Z8zKDaU9ni 2o3fQ58Yqg1JgeojjI9/KO0YmReJAfCZmv1D+JVAjEBe2MD7XuMjmy4qm+7rymwaLj9xJo Xw0HrTTsEsANyigRGadJFAaGqfI7fieJwSqFKfRVMSnAfEdtZ9CV167r/3l/Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Klc45s3z1Krc; Fri, 14 Jul 2023 05:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E5T00n002037; Fri, 14 Jul 2023 05:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E5T0EM002036; Fri, 14 Jul 2023 05:29:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 05:29:00 GMT Message-Id: <202307140529.36E5T0EM002036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 5d4f8df451aa - main - Makefile.libcompat: Make quoting for CC/CXX/CPP more future-proof 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d4f8df451aa942701ecfced80516f3584b589d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=5d4f8df451aa942701ecfced80516f3584b589d9 commit 5d4f8df451aa942701ecfced80516f3584b589d9 Author: Jessica Clarke AuthorDate: 2023-07-14 04:34:03 +0000 Commit: Jessica Clarke CommitDate: 2023-07-14 04:34:03 +0000 Makefile.libcompat: Make quoting for CC/CXX/CPP more future-proof bmake's :Q is for quoting outside of double quotes, but here is inside double quotes, and as a result it ends up quoting characters that don't have a special meaning inside double quotes. On the surface this would seem harmless, but POSIX sh has a strange behaviour (differing from outside double quotes) that, inside double quotes, a backslash before a character that never has a special meaning inside double quotes is passed through. As a result, should LIB${_LIBCOMPAT}CFLAGS contain something like -DFOO\(x\)=x, we would form "... -DFOO\\\(x\\\)=x ...", which would be parsed as -DFOO\\(x\\)=x, since the parentheses are never special inside double quotes (but the backslash itself is), not the original -DFOO\(x\)=x as intended. Instead, construct the whole string as a bmake expression and use :Q on that, without the manual double quotes around everything. Note that the :L modifier lets you treat an expression like a variable expansion and apply modifiers to it, i.e. ${expr:L:...} is the same as tmp=expr ${tmp:...} (in essence, ignoring possible differences due to deferred substitution). Improves: 537f945fc89f ("Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make") --- Makefile.libcompat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index e8d33b905559..b21e27105e99 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -25,9 +25,9 @@ LIB${_LIBCOMPAT}WMAKEENV+= \ # Don't rebuild build-tools targets during normal build. LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA .endif -LIB${_LIBCOMPAT}WMAKEFLAGS+= CC="${XCC} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ - CXX="${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS:@v@${v:Q}@} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ - CPP="${XCPP} ${LIB${_LIBCOMPAT}CFLAGS:@v@${v:Q}@}" \ +LIB${_LIBCOMPAT}WMAKEFLAGS+= CC=${${XCC} ${LIB${_LIBCOMPAT}CFLAGS}:L:Q} \ + CXX=${${XCXX} ${LIB${_LIBCOMPAT}CXXFLAGS} ${LIB${_LIBCOMPAT}CFLAGS}:L:Q} \ + CPP=${${XCPP} ${LIB${_LIBCOMPAT}CFLAGS}:L:Q} \ DESTDIR=${WORLDTMP} \ -DNO_CPU_CFLAGS \ MK_BOOT=no \ From nobody Fri Jul 14 06:51:28 2023 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 4R2MZm3r8Kz4lNMP; Fri, 14 Jul 2023 06:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2MZm29F0z3JKT; Fri, 14 Jul 2023 06:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689317488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIj4/ASd4TON5KdzyV4fvzSZ6VMONZBBT9oxWLzU62w=; b=tUP2riUzACEyx71URAsBmYlmcJMOl/Xl9E7xgP3MsDURcHqK/MftmD07I0BCifWZykI83o OwT9N+6XEUfCXfUS+PRbiy3u7VUBThV+lrpntxNt/Z9P7qF4l9E5AgfOu5oycpirc4vCEl ORb786NUCjKTMnqZt/8LhKRhSVvORowoqVs/ssNpW4VVGSVxGIJYTSEVvBetQIcd1hLl5B ngKx2QFdmeb3l9vF//fMyouy0EX4rUM3XAeq3KTIV6BAtULPzZmw1sFg0FirS4lOarrpvB NdbPhPKViuLZi3+kEm9w7cwhOwRiWwGDqcz8pkIm3EvEUy/qr2/Jvi8WaXplHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689317488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EIj4/ASd4TON5KdzyV4fvzSZ6VMONZBBT9oxWLzU62w=; b=lblBc/TVyGb3BFz7XZFIgbRnMFciBI/tdVY4FswY0UlLI7CSr8f7FgUbjAXk1fK+bSArtr kgIWF99ul0oSAbiQ7xi81QRA+gIxwaU3ALWzXrAap6SzoWfS/QONWjZtRFtD7cvJLQzpoe 1+OsYklwVYuER9eIZsU1coIlizyr/si0xxLatwz/fyv7HVt+AOO9iYgeuxSzSE9yLNARIA Rp5MjL4N2yWh1QYUfb1DDfOEriqJvlqhaKrlV8IhosqrlB2QcMB/glRWsUdjWh47zOObWV c4K9uEn5xY3sEXo5Uj4C1T9/SM90Vm9X6d+Xe2cKxNcxLYf919Vogd6h+g4Gsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689317488; a=rsa-sha256; cv=none; b=jpiUBvDyWGUzgmPnS9Iv7EnD+TbgC/ORhpxeozDhMNRMU8xHXwdfsR1gETOwM39IZLt2SS E8xKSmpBe9IQ5P+yem8S92S6QH6OgpKsk7+ZKkdQMw5o/0lDeuPJlIHHl7SvNoMAUSIMDQ DVRvVTCSHop45287XyRFEOXEM2BY35Yx0C9twou+lIij8FGJ/tADFKIK6VgSBTVC8hMQLx fddJbIBJsHuuorbfQZwcQtgksNAQ90Mwlxl19mIcFz6wR0HBf70V1B/FeJfneWqm8OL4hD Wc1mB1FV4fQ1Zimwni5304uqRuxbhMrgXTtl6N9tokPUMJl+gnzh3qGRBnA4fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2MZm1FXLz1Ms6; Fri, 14 Jul 2023 06:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E6pSFp044085; Fri, 14 Jul 2023 06:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E6pSU8044084; Fri, 14 Jul 2023 06:51:28 GMT (envelope-from git) Date: Fri, 14 Jul 2023 06:51:28 GMT Message-Id: <202307140651.36E6pSU8044084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 3e04ae433fdc - main - vm_radix_init: use initializer 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e04ae433fdc4b47ff951667be15a360ca00ba8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=3e04ae433fdc4b47ff951667be15a360ca00ba8f commit 3e04ae433fdc4b47ff951667be15a360ca00ba8f Author: Doug Moore AuthorDate: 2023-07-14 06:49:55 +0000 Commit: Doug Moore CommitDate: 2023-07-14 06:49:55 +0000 vm_radix_init: use initializer Several vm_radix tries are not initialized with vm_radix_init. That works, for now, since static initialization zeroes the root field anyway, but if initialization changes, these tries will fail. Add missing initializer calls. Reviewed by: alc, kib, markj Differential Revision: https://reviews.freebsd.org/D40971 --- sys/amd64/amd64/pmap.c | 1 + sys/arm64/arm64/pmap.c | 1 + sys/i386/i386/pmap.c | 1 + sys/riscv/riscv/pmap.c | 1 + sys/vm/vm_object.c | 1 + 5 files changed, 5 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 896078f3c456..a4b8c6dc4c06 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1993,6 +1993,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr) kernel_pmap->pm_ucr3 = PMAP_NO_CR3; TAILQ_INIT(&kernel_pmap->pm_pvchunk); kernel_pmap->pm_stats.resident_count = res; + vm_radix_init(&kernel_pmap->pm_root); kernel_pmap->pm_flags = pmap_flags; /* diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 46520889728f..c2681104c961 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1291,6 +1291,7 @@ pmap_bootstrap(vm_paddr_t kernstart, vm_size_t kernlen) PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_l0_paddr = pmap_early_vtophys((vm_offset_t)kernel_pmap_store.pm_l0); + vm_radix_init(&kernel_pmap->pm_root); kernel_pmap->pm_cookie = COOKIE_FROM(-1, INT_MIN); kernel_pmap->pm_stage = PM_STAGE1; kernel_pmap->pm_levels = 4; diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 077c4329ecaa..fc1afdb708be 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -659,6 +659,7 @@ __CONCAT(PMTYPE, bootstrap)(vm_paddr_t firstaddr) CPU_FILL(&kernel_pmap->pm_active); /* don't allow deactivation */ kernel_pmap->pm_stats.resident_count = res; TAILQ_INIT(&kernel_pmap->pm_pvchunk); + vm_radix_init(&kernel_pmap->pm_root); /* * Initialize the global pv list lock. diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index ac3565ce69b1..6cada93cdc91 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -646,6 +646,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) /* Set this early so we can use the pagetable walking functions */ kernel_pmap_store.pm_top = (pd_entry_t *)l1pt; PMAP_LOCK_INIT(kernel_pmap); + vm_radix_init(&kernel_pmap->pm_root); rw_init(&pvh_global_lock, "pmap pv global"); diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index be81ad4942a4..3e9324da63ea 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -286,6 +286,7 @@ vm_object_init(void) mtx_init(&vm_object_list_mtx, "vm object_list", NULL, MTX_DEF); rw_init(&kernel_object->lock, "kernel vm object"); + vm_radix_init(&kernel_object->rtree); _vm_object_allocate(OBJT_PHYS, atop(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), OBJ_UNMANAGED, kernel_object, NULL); #if VM_NRESERVLEVEL > 0 From nobody Fri Jul 14 07:46:58 2023 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 4R2Npp3kRBz4mmkW; Fri, 14 Jul 2023 07:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Npp36Nsz3lbc; Fri, 14 Jul 2023 07:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNKmuw1rQOyiZbJBqhf4+2xxuEBo26J0wvc6pXeDf9c=; b=fH8rPSEQrjgkcpaK8+STRUl4DkCHlcK+YrIkqZZiuefw7JhNByRTartusZJYGXuonnY6Nn 1bZf8PREUgvGlpy2SXRaolYa7U4Lhk8mUMdfYDZQJ2KQYEqU9Ya/5HYhCNwUgyNUAzjF6T d5abA5eYZFejkUrcMMMvXV2c5lDzcKWXQ2Z/Ok3En3uaKhyisCafAiDGs65fLOgXxGA6ml 8uLSae9PJ079/TH0o0F/BMe3/l3GurgPsx2y3rfeJg83Omxo5n8YvdoDWVnMrFZKco/wnU IasO/Rj3Omu8Huyj9BZ5o/beNv+bOcIV2OtOzw//8k5tyd/us5etT5NtFTgzxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNKmuw1rQOyiZbJBqhf4+2xxuEBo26J0wvc6pXeDf9c=; b=CMLc1+KeK9z+Ht22qJna+ZCA7ODOgcDMVdc+yhF9UCu/wsI3BEB83nHY00F5CKtOjo8cs6 sIUDjc5UxscPtJ8JBJB7gKbUtmjW6X3NbA8eGNEBhXDnduI95nIN6xHm3nNv/aIrpEoA9Y AQUTcB5E3aofHyhBI1Dg6762OvkkxnEN6QMonX1mUQcSc5nqHKFdSMFyHc8ZIBhAQBtpR/ QD2XpsQzCYeHh5N9TSGdNNvHTB1xNV43I9vf2HZwyX1mvIOmdSpmbh9OrxgSPkUkrA2hCD 26ycRvPJP8/LZrQrDqkBr9gmJBqY1CG7JbA1jZ65uVZAVrOi2KhF+4YUWxlifA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689320818; a=rsa-sha256; cv=none; b=nFOkrx1fc1+YcJ0MzwzfOY8P+xXVUDwRr7iOlWuGkBG6oASr1c1/VImtNDuAsDnLcbJ2av qZU7EVK9/n3pbRK+NbtKaUfu6Hi9ik3sHelbWhVus1UfDkcc7EeWAVSEqZVxiJEDSz87LQ RngtwiNckfkDCHkdCIoYqGNJ/ienJN0+oMV0RmEUMCDZ8rhKpa/TVATGDoTTlf9+pneLQb n6jx2xLvV9SNNgUlcE0dhL1yBy5v/mvuMo1/Jq7LUSENpzPOntPtJehiyy4oCkKSfghGNK RS0O+aOKO6bcYDUOWwduJfkfXewHc+yjayB2Ma1eCSNLrKp6F+lN5D13seUShw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Npp26lnz1PBL; Fri, 14 Jul 2023 07:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E7kwtm032794; Fri, 14 Jul 2023 07:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7kwUc032793; Fri, 14 Jul 2023 07:46:58 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:46:58 GMT Message-Id: <202307140746.36E7kwUc032793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 77c9e608854f - main - pfsync: fix NOINET6 build 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e commit 77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e Author: Kristof Provost AuthorDate: 2023-07-13 12:39:25 +0000 Commit: Kristof Provost CommitDate: 2023-07-14 07:18:43 +0000 pfsync: fix NOINET6 build While here also fix a few minor style(9) issues. --- sys/netpfil/pf/if_pfsync.c | 53 +++++++++++++++++++++++++++++++--------------- sys/netpfil/pf/pfsync_nv.c | 2 +- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 5df51d20e05f..fa5ffd4649f6 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2689,10 +2689,13 @@ static int pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, struct in_mfilter* imf, struct in6_mfilter* im6f) { +#ifdef INET struct ip_moptions *imo = &sc->sc_imo; +#endif +#ifdef INET6 struct ip6_moptions *im6o = &sc->sc_im6o; - int error; struct sockaddr_in6 *syncpeer_sa6 = NULL; +#endif if (!(ifp->if_flags & IFF_MULTICAST)) return (EADDRNOTAVAIL); @@ -2700,46 +2703,45 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, switch (sc->sc_sync_peer.ss_family) { #ifdef INET case AF_INET: - { + { + int error; + ip_mfilter_init(&imo->imo_head); imo->imo_multicast_vif = -1; if ((error = in_joingroup(ifp, - &(((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr), - NULL, &imf->imf_inm)) != 0) - { + &((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr, NULL, + &imf->imf_inm)) != 0) return (error); - } ip_mfilter_insert(&imo->imo_head, imf); imo->imo_multicast_ifp = ifp; imo->imo_multicast_ttl = PFSYNC_DFLTTL; imo->imo_multicast_loop = 0; break; - } + } #endif #ifdef INET6 case AF_INET6: - { + { + int error; + syncpeer_sa6 = (struct sockaddr_in6 *)&sc->sc_sync_peer; if ((error = in6_setscope(&syncpeer_sa6->sin6_addr, ifp, NULL))) - { return (error); - } + ip6_mfilter_init(&im6o->im6o_head); if ((error = in6_joingroup(ifp, &syncpeer_sa6->sin6_addr, NULL, &(im6f->im6f_in6m), 0)) != 0) - { return (error); - } ip6_mfilter_insert(&im6o->im6o_head, im6f); im6o->im6o_multicast_ifp = ifp; im6o->im6o_multicast_hlim = PFSYNC_DFLTTL; im6o->im6o_multicast_loop = 0; break; - } } #endif + } return (0); } @@ -2747,10 +2749,9 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, static void pfsync_multicast_cleanup(struct pfsync_softc *sc) { +#ifdef INET struct ip_moptions *imo = &sc->sc_imo; - struct ip6_moptions *im6o = &sc->sc_im6o; struct in_mfilter *imf; - struct in6_mfilter *im6f; while ((imf = ip_mfilter_first(&imo->imo_head)) != NULL) { ip_mfilter_remove(&imo->imo_head, imf); @@ -2758,6 +2759,11 @@ pfsync_multicast_cleanup(struct pfsync_softc *sc) ip_mfilter_free(imf); } imo->imo_multicast_ifp = NULL; +#endif + +#ifdef INET6 + struct ip6_moptions *im6o = &sc->sc_im6o; + struct in6_mfilter *im6f; while ((im6f = ip6_mfilter_first(&im6o->im6o_head)) != NULL) { ip6_mfilter_remove(&im6o->im6o_head, im6f); @@ -2765,6 +2771,7 @@ pfsync_multicast_cleanup(struct pfsync_softc *sc) ip6_mfilter_free(im6f); } im6o->im6o_multicast_ifp = NULL; +#endif } void @@ -2818,8 +2825,6 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) struct ifnet *sifp; struct in_mfilter *imf = NULL; struct in6_mfilter *im6f = NULL; - struct sockaddr_in *status_sin; - struct sockaddr_in6 *status_sin6; int error; int c; @@ -2832,8 +2837,10 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) return (EINVAL); switch (status->syncpeer.ss_family) { +#ifdef INET case AF_UNSPEC: case AF_INET: { + struct sockaddr_in *status_sin; status_sin = (struct sockaddr_in *)&(status->syncpeer); if (sifp != NULL) { if (status_sin->sin_addr.s_addr == 0 || @@ -2851,7 +2858,10 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) } break; } +#endif +#ifdef INET6 case AF_INET6: { + struct sockaddr_in6 *status_sin6; status_sin6 = (struct sockaddr_in6*)&(status->syncpeer); if (sifp != NULL) { if (IN6_IS_ADDR_UNSPECIFIED(&status_sin6->sin6_addr) || @@ -2869,6 +2879,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) } break; } +#endif } PFSYNC_LOCK(sc); @@ -2954,10 +2965,14 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) if (error) { if_rele(sifp); PFSYNC_UNLOCK(sc); +#ifdef INET if (imf != NULL) ip_mfilter_free(imf); +#endif +#ifdef INET6 if (im6f != NULL) ip6_mfilter_free(im6f); +#endif return (error); } } @@ -2966,6 +2981,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) sc->sc_sync_if = sifp; switch (sc->sc_sync_peer.ss_family) { +#ifdef INET case AF_INET: { struct ip *ip; ip = &sc->sc_template.ipv4; @@ -2981,6 +2997,8 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) ip->ip_dst = ((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr; break; } +#endif +#ifdef INET6 case AF_INET6: { struct ip6_hdr *ip6; ip6 = &sc->sc_template.ipv6; @@ -2997,6 +3015,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) NET_EPOCH_EXIT(et); break; } +#endif } /* Request a full state table update. */ diff --git a/sys/netpfil/pf/pfsync_nv.c b/sys/netpfil/pf/pfsync_nv.c index 1a461d138fc7..66b81e8c0b7d 100644 --- a/sys/netpfil/pf/pfsync_nv.c +++ b/sys/netpfil/pf/pfsync_nv.c @@ -47,7 +47,6 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *sa) { int af; - int error; if (!nvlist_exists_number(nvl, "af")) return (EINVAL); @@ -74,6 +73,7 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, case AF_INET6: { struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa; size_t len; + int error; const void *addr = nvlist_get_binary(nvl, "address", &len); in6->sin6_family = af; if (len != sizeof(*in6)) From nobody Fri Jul 14 07:46:59 2023 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 4R2Npq5Bspz4mmfY; Fri, 14 Jul 2023 07:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Npq3rV8z3lbs; Fri, 14 Jul 2023 07:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQig03WyXTdKaIr0oex8J7d7iJDvBHWQIF7GhD+EJtE=; b=TwiBXbQtuS5lJUB2/l/PeXwQtaARcUnCXwYvsQcXoBUspJzJmlGf6MwqCfU5EvEe4uVKql A8zXC1sW5+u/a1Az63VCHW8tO13gLbSFHldVwmCZH3VR8IzgTXISYEcQFUzIEJhv3UPbt5 sVA9MD+TqOWI3do+1nrbxuPdjkg/eP2z4lA1Y5AwQrvq7WZgh+fgJTXPbqwZuj13C/02OS iUsyBPRdPBHYGOdpuQIOEXk8HtCAqJR4ecR+gSowGWa8fjEptCc8LHc4TAfRe28QR9oC0d CgBuB4ZL1w99EU6khG2v0lTaqcL5hH/COdzPHNgPbP5qrpnisrnWq3TEEoqjvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQig03WyXTdKaIr0oex8J7d7iJDvBHWQIF7GhD+EJtE=; b=eUmKvLX/nww/TUtVSicB5dFAhjo+1iv1a/Igte++NWiVYruJtCvOAhUXhM3ssq1cf2EMCu /UDouovyA7rpCPd+MGRbPFH8Fkf4xjOVR6t4ZqKZs9k9eM3dHGf1FLGebNpp968DFQjL+7 fjqtPMELKhgiOGctoe5nE6k86LD5c5DDZ7q8DhbL9bCPBvIy3NutQdVbbGYB44ePJ0tUvC YJIw0dLkiaFY29qkv8y2CWIbMeZR+G1sVEmlHqpJAgmqks/IIHyLTvlLIqQzzQtH5wzYuO DSPJggfU36obX4MX+ci1xU5v4FJWxUV7QI5z6N/7iEZjSd8/t09jf2njf+shEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689320819; a=rsa-sha256; cv=none; b=C2rsu8wtlLm/U6vEhqTJiCtXdEkqJC1ztYr/CZNlYSn9NZVO02h0yfN4usJpJTxF2y2unz KMVHZHtXG1x4PfVF44e2Sd9KF5APtdOtg3WN2o1ZHsw2rrO74BM0VrHOmOEnVwgiwSNqlt Zef2t/zbl2zGZzQdytYZXF3wIvZjlKZ/lUEJd0v2ZvLkSa7zRoIQNE0lfsBgCP+ZjJmDxN YX6SBU4dhPEbwh4g6yOgM8ugUUpgeUtpZZ5en5LpfpHbkRFTsgTVCd05FOQOrQhNlyeSjg DQKM7Sw8LQcdCga3MZ+5omW5kUu8k1U6JjSfuIWuChpqjBRwUeShsaR/CIrTcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Npq2yTLz1NpC; Fri, 14 Jul 2023 07:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E7kxjv032813; Fri, 14 Jul 2023 07:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7kxpF032812; Fri, 14 Jul 2023 07:46:59 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:46:59 GMT Message-Id: <202307140746.36E7kxpF032812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 208fcb55e33b - main - Fix MINIMAL build on amd64 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 208fcb55e33ba423a90b0a6f72e730b0ab97d853 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=208fcb55e33ba423a90b0a6f72e730b0ab97d853 commit 208fcb55e33ba423a90b0a6f72e730b0ab97d853 Author: Kristof Provost AuthorDate: 2023-07-13 12:44:26 +0000 Commit: Kristof Provost CommitDate: 2023-07-14 07:18:43 +0000 Fix MINIMAL build on amd64 amd64/include/counter.h uses KASSERT, but failed to include the kassert.h header. --- sys/amd64/include/counter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/amd64/include/counter.h b/sys/amd64/include/counter.h index bde78ccacd7a..38c5a3d12056 100644 --- a/sys/amd64/include/counter.h +++ b/sys/amd64/include/counter.h @@ -36,6 +36,7 @@ #define __MACHINE_COUNTER_H__ #include +#include #define EARLY_COUNTER (void *)__offsetof(struct pcpu, pc_early_dummy_counter) From nobody Fri Jul 14 07:47:00 2023 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 4R2Nps1jknz4mmkk; Fri, 14 Jul 2023 07:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Npr4vTTz3lYs; Fri, 14 Jul 2023 07:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c9M2PcfCVXqZDsrTQoDXdZRO6MNFDF4kxub933AL2U=; b=oWqP+4v/lfSOc3J9SUBCoiagk8/NzMuONB6hiHx/vzWA42187nw/RuYrd+GLL6WrzQ6hOq KZGu11ZvaFgAsucZWlZYLo0EZHNMCuJpZ8GkxkKuYJpWmWqXisQqhngo1z1vOfZ1oGc58u BkLCfWRkU+TsflvtoW0+UGe+ZFFg5zXBqIIbJupCKKfmgH0kMp81ECSnWJ/kQIA3AcSQL6 w+9gl/dWmrmVVl/a/ZBaiyPNjpXxpMQqoWLrkUozSV8yeCB5dxg9MgQKILQ+0JwB2T5MEe AnXW7WOXWq1beyLYevzdtPg493caOiJeSJwntU9HS+NCdeBhbh3YZcdB/yEXmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1c9M2PcfCVXqZDsrTQoDXdZRO6MNFDF4kxub933AL2U=; b=ELGQycaP4JcxS/CceZjLl31ObrQcN4GKL1+O8KluYMwgPvErINxbjesJuy+YoD8ck+yX0E YwEBclG7R18ODcZe9jYuheR9doo+Apr2tPxC7DIw+l3he0xR95/kjz3blmnMf+Rv7N3b0g lGIn+eRaLsDgUF16RT2D/ixzrf97KpuQzpoqx9YAOTr/H2s2pRr+TBD9urfCGm9fQpFLMJ YB50tsd1BBkW5ofgL29YYCXonOdgurAdpx8GhKtcRrfEFLCZf1nQOPTAC39Iq8NrmsxLOZ 9aeXjnthCTqyiv9HwaoAoD2AeMrCk8Q44XPeunqHfvB4GXGfwaDfkcxSJLT1ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689320820; a=rsa-sha256; cv=none; b=i8maZHMan6oER/lR/0U4f6E/REjvGgXunkUjcLHW2oygI5TIDsWg/u5QeoY4pTlv2D2Rk8 j+A6AQnX97gsPkWoyvfNMC8xwBs9yP7dHmAJwcujnZ1dAkREIA7vb+Cb155ZJyDEdVgmn3 rggBGkpybsa0qS0wsgl+aGnas+rxhXbauFw2kPzNYn2/tDHx2c7gDS0pkDg93JMAuWpxeI 8PQ/OLttwThmhQAZ69l3gSQjzP7gh0isPat833YHF9f1Ug+wzykYH16AIIQ8RiVR68s/a+ 5Seu1txBXhqjKQB5UXp7WfCIuXUdzD86cFg/lfXVMyKeLDv6cxKCwF1eqrOy/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Npr3cgcz1NpD; Fri, 14 Jul 2023 07:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E7l0cl032845; Fri, 14 Jul 2023 07:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7l0O0032844; Fri, 14 Jul 2023 07:47:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:47:00 GMT Message-Id: <202307140747.36E7l0O0032844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b8039bf5b329 - main - Fix MINIMAL build 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8039bf5b329849ae1ad2ad32f5e847437d41edd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8039bf5b329849ae1ad2ad32f5e847437d41edd commit b8039bf5b329849ae1ad2ad32f5e847437d41edd Author: Kristof Provost AuthorDate: 2023-07-13 18:30:01 +0000 Commit: Kristof Provost CommitDate: 2023-07-14 07:18:43 +0000 Fix MINIMAL build Pre-declare struct ucred, to fix build issues on the MINIMAL config: In file included from /usr/src/sys/netpfil/pf/pfsync_nv.c:40: /usr/src/sys/netinet6/ip6_var.h:384:31: error: declaration of 'struct ucred' will not be visible outside of this function [-Werror,-Wvisibility] struct ip6_pktopts *, struct ucred *, int); ^ /usr/src/sys/netinet6/ip6_var.h:408:28: error: declaration of 'struct ucred' will not be visible outside of this function [-Werror,-Wvisibility] struct inpcb *, struct ucred *, int, struct in6_addr *, int *); ^ 2 errors generated. --- sys/netinet6/ip6_var.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index bc409780feec..e538afd93994 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -346,6 +346,7 @@ extern struct pr_usrreqs rip6_usrreqs; struct sockopt; struct inpcb; +struct ucred; int icmp6_ctloutput(struct socket *, struct sockopt *sopt); From nobody Fri Jul 14 07:47:01 2023 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 4R2Npt0rqrz4mmqV; Fri, 14 Jul 2023 07:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Nps60wLz3lfs; Fri, 14 Jul 2023 07:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSeYkykPMPsP/TZFAKy0GmHBPYkyWxO32lFQawGIgI8=; b=KkvaVU7L2T0AVfsgLLaxx/tBNwFuNJgrdDJ2NhVLnsjRdRjGk0mQbVnqdAEh+nAT/LqiJJ DKDSqTGuRFVIIPQH9ajpcYlc2md9yDexKEgMMb9lfjec/GYWPAJv+OFYJoMzffJy2OfkSf JuyMVuVUyaSa287jluhhHRo6pIwBERi76tGoYvyrX78lZYdR+3wQKS9imyr5W6DAIEjC0i kajv6tgKvORN0J4aIvTOV6FrumvI4B8rynZnkVrJ1ftpTiy0cbGE5dOzWF6IjH324VkgJm H/12eNyyFbetsiUfxXaMcvHQ1b9GroWXmQeBf/cep6WkRD9aN/wb2DV0ZRAWjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSeYkykPMPsP/TZFAKy0GmHBPYkyWxO32lFQawGIgI8=; b=yapU7rVOFaFvs/DV1TqUILxsx4qWE4e4rdBDXho69AP3CXxdYBTpdq1ldJp//1KwBAB29X tkhLduaDPhM8hUubhkv/wq+i/I60HH2DILYNZiK4DLRMym1rGOp8UBkBHKANKENsrIgQIK VRGuE3ty7xp11nOCKeW6XE2yi82EItUZhf4J5iUh4cDLLbNrluYV/c2s3cI8hEUlSMg0B+ Ci9fMRiNV/rBaUBUfkhrNYY5/Fqv7iKZKEupPbjapLJI5/AgyAHLT0t2l25pE1dYwzfBYW Q3rMg6v5m62teHCs0KKWEQA0L+LzKM2zQ+8Pa/1+bXa5gp0pxiuWrwKj38/Mog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689320821; a=rsa-sha256; cv=none; b=oJ5eoma/4jNbf5wOORcJXC3yq048ewrBCHmmhxfoOCrEqji0boP+q35LlGuKD8GDl+dLm0 P1gFPJ0e/qiyy73bQUDXqL2hfsZu85PjgL+pK8BD2AyVMJ/MgrEhG6INjDR74shm1/zLJZ o5FDuBbBqvgdRSJP/28i3Z89Q8Mu/wQDKa2PfS+VpFfr086REBQKlUMCQuxe3Ro73n1Gw2 QirpteyVZ2efktcjD78nzBg3GMF0t8CasdB+dQtJFOS1P0kyx/1a2ehDVoQATBUtr38+q2 XA85BfbAp2ij+JwWiee6NmkKMS9/NH3Q0FPwe10jfUfrUyIaZmGL2fCs9DN6Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Nps4nVxz1PQR; Fri, 14 Jul 2023 07:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E7l1GC032864; Fri, 14 Jul 2023 07:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7l1T9032863; Fri, 14 Jul 2023 07:47:01 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:47:01 GMT Message-Id: <202307140747.36E7l1T9032863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f53b28c6dffe - main - Fix i386 MINIMAL build 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f53b28c6dffebbd554d5c07b3abc03b83a8c89ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f53b28c6dffebbd554d5c07b3abc03b83a8c89ad commit f53b28c6dffebbd554d5c07b3abc03b83a8c89ad Author: Kristof Provost AuthorDate: 2023-07-13 18:31:06 +0000 Commit: Kristof Provost CommitDate: 2023-07-14 07:18:44 +0000 Fix i386 MINIMAL build Include systm.h in i386's counter.h, so it can use critical_*(). In file included from /usr/src/sys/netinet6/ip6_var.h:250: In file included from /usr/src/sys/sys/counter.h:37: ./machine/counter.h:191:3: error: call to undeclared function 'critical_enter'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] critical_enter(); ^ ./machine/counter.h:193:3: error: call to undeclared function 'critical_exit'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] critical_exit(); ^ --- sys/i386/include/counter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/i386/include/counter.h b/sys/i386/include/counter.h index 1b3fc4c638e7..2a54e2b725e0 100644 --- a/sys/i386/include/counter.h +++ b/sys/i386/include/counter.h @@ -35,6 +35,7 @@ #ifdef INVARIANTS #include #endif +#include #include #include From nobody Fri Jul 14 09:57:33 2023 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 4R2RjT6jcFz4myyR; Fri, 14 Jul 2023 09:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2RjT6Gshz4J82; Fri, 14 Jul 2023 09:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689328653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhNpKiDgGM0zhm0xSSw9xIqHHyICX/vvm9HggNhedI=; b=dDfx/s3ux7O7Z1Ozr1tqRzXUioD5xwJli/NNU6HLXgb9FCMdSDifVPnqWqg1H1/4Qmepvo kSTls+xL0L86kp+jwNHTh3Xycm9by2U2ds6yFNDg9YOWMT0931Vs9JFnQRy4pm63nDRgPw y1xsLC6xKYIv8BS5fPUavmJJyoTXYrcCRBUTTThbqWpP8mh/xO+ZCIdmu3tUimdaEZKMUH Ooc3nJsiolXS0xuKb83tT8GVvUx9kKjK6EM1WtbR6N63JYRK0vbDH0uzfNz/aj5tOP3vRu 8Mt74Rs2GL2laKHi6aSgcQ/DDKHMkfCVrk0UokVWFAd8ZxIQgGr/cq1DGCmNmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689328653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WIhNpKiDgGM0zhm0xSSw9xIqHHyICX/vvm9HggNhedI=; b=m1gH24MTmm+NT5/W1ExuWPka69c/IkZl3PrD+A7h2oSrH7FZDwGfuhyZnJDc1mTcGNqVvr NwBcRhu1cgAO96HPGBs0CMQNyMo304V0+5qR2P3hOxsXgA093Fk4m8PWfn5P5jRLfNZ2yT 58vGjoTyX38K4C8L9LYg/4z28c8jJV/0qUvAIPkm76ZfSmeZift0UjJa0Bdha+A3pVUfXR eB0SmiNwZUchUrADm5aUGcCe7zPos9+FWeBBPokxmfxxxDrn3y1PSBKeTUxornLUEfXC0u Gl0d3mg0ADOEGHc4NidX8oGCBqaD4OKjTbMdlur3La/5WBn27zUsUssq5VkFIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689328653; a=rsa-sha256; cv=none; b=iCE84pjop5kq7OcTgF4iJgJiBosM1B9E7SnhB+IMQK2a+Z/4m11SveDfAGmtAD/mqopuOF w1jtJKW9wXYYcYFn3DtfU5l7mqkP0jzHwpU4IO4sNoBPR6tFDkmejmTvTvMXtD7layYbTS +jcPGtUyMWWcMhmTZDwIviJQ/2GbWGKwSS/WT1GkMkXZ3NgtBAI7j+sqUQrvTP5tBbZQHd TAV3XZtsL0HHZ6PNbayYnMHwSdl99TBQoSVxr22Pxc1dqE2T4kJHRxJCX8DzJxSGq28Oy8 G8IYYzCfg1/U35OI1O2WdimwIeHwXnBDotP/ERd9xr+PXdb5iRw2fJh/05n90g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2RjT5KV6z1SWl; Fri, 14 Jul 2023 09:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36E9vXu0047195; Fri, 14 Jul 2023 09:57:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E9vXtE047194; Fri, 14 Jul 2023 09:57:33 GMT (envelope-from git) Date: Fri, 14 Jul 2023 09:57:33 GMT Message-Id: <202307140957.36E9vXtE047194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 09267cc15284 - main - /etc/rc.subr: add support for kld sysctl variables 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09267cc15284795fef958fb9ed786bb2382d6763 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=09267cc15284795fef958fb9ed786bb2382d6763 commit 09267cc15284795fef958fb9ed786bb2382d6763 Author: Doug Rabson AuthorDate: 2023-06-21 12:26:17 +0000 Commit: Doug Rabson CommitDate: 2023-07-14 09:49:47 +0000 /etc/rc.subr: add support for kld sysctl variables For kernel modules loaded by scripts in /etc/rc.d and /usr/local/etc/rc.d, if there is a file in /etc/sysctl.conf.d named .conf, then this will be loaded using the sysctl(8) utility. For instance, sysctl variable changes for the pf kernel module would be placed in the file /etc/sysctl.conf.d/pf.conf. PR: 272129 Reviewed by: imp freebsd_igalic.co MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40886 --- etc/mtree/BSD.root.dist | 2 ++ libexec/rc/rc.subr | 3 +++ share/man/man5/sysctl.conf.5 | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 3a3a3a78d995..2ec079b0abd1 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -96,6 +96,8 @@ .. ssl .. + sysctl.conf.d + .. syslog.d .. zfs diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 6a7f070f7f5b..ef3da46b3206 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1970,6 +1970,9 @@ load_kld() return 1 else info "$1 kernel module loaded." + if [ -f "/etc/sysctl.conf.d/$1.conf" ]; then + sysctl -f "/etc/sysctl.conf.d/$1.conf" + fi fi else debug "load_kld: $1 kernel module already loaded." diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5 index 5df168661d85..26ecf763ca12 100644 --- a/share/man/man5/sysctl.conf.5 +++ b/share/man/man5/sysctl.conf.5 @@ -51,6 +51,13 @@ Comments can also exist at the end of a line, as seen in the .Sx EXAMPLES section, below. +.Pp +For kernel modules loaded via +.Xr rc.subr 8 +system , +additional module-specific settings can be applied +by adding a file in the same format named +.Pf /etc/sysctl.d/.conf . .Sh FILES .Bl -tag -width /etc/rc.d/sysctl_lastload -compact .It Pa /etc/rc.d/sysctl @@ -69,6 +76,9 @@ Initial settings for .It Pa /etc/sysctl.conf.local Machine-specific settings for sites with a common .Pa /etc/sysctl.conf . +.It Pa /etc/sysctl.conf.d +Module specific settings for kernel modules loaded via +.Xr rc.subr 8 . .El .Sh EXAMPLES To turn off logging of programs that exit due to fatal signals you may use From nobody Fri Jul 14 11:23:25 2023 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 4R2Tcj5DbZz2tkBt; Fri, 14 Jul 2023 11:23:33 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Tch6f4Cz3MPg; Fri, 14 Jul 2023 11:23:32 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 36EBNPVq078121 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 14 Jul 2023 14:23:28 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 36EBNPVq078121 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 36EBNPYT078120; Fri, 14 Jul 2023 14:23:25 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 14 Jul 2023 14:23:25 +0300 From: Konstantin Belousov To: Michael Tuexen Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Message-ID: References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> X-Spam-Status: No, score=0.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,FREEMAIL_REPLY, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4R2Tch6f4Cz3MPg X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff > > commit be78a31188c530c93700396ecfdb5604a8f22fff > Author: Michael Tuexen > AuthorDate: 2023-07-13 16:56:25 +0000 > Commit: Michael Tuexen > CommitDate: 2023-07-13 16:56:25 +0000 > > tcp: fix build issue for some cc modules > > The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in > https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523 > The corresponding changes in two Makefiles were missed, which resulted > in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. > > Reported by: void@f-m.fm > Reviewed by: rrs, rscheff > Sponsored by: Netflix, Inc. > Differential Revision: https://reviews.freebsd.org/D41010 > --- > sys/modules/cc/Makefile | 6 +++--- > sys/modules/khelp/Makefile | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile > index 3f7110024722..b595cc204481 100644 > --- a/sys/modules/cc/Makefile > +++ b/sys/modules/cc/Makefile > @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \ > > # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > # building these modules by default. > -# We will default to building these modules unless $OPT_INET is defined > -# and does not contain the TCP_HHOOK option. > -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > +# We will default to building these modules if $OPT_GLOBAL does contain > +# the TCP_HHOOK option. > +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > SUBDIR+= \ > cc_cdg \ > cc_chd \ > diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile > index 256d8838c573..c01d61541062 100644 > --- a/sys/modules/khelp/Makefile > +++ b/sys/modules/khelp/Makefile > @@ -4,9 +4,9 @@ SUBDIR= > > # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > # building this modules by default. > -# We will default to building this module unless $OPT_INET is defined > -# and does not contain the TCP_HHOOK option. > -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > +# We will default to building this module if $OPT_GLOBAL does contain > +# the TCP_HHOOK option. > +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > SUBDIR+= h_ertt > .endif > It seems modules are actually broken for some configurations. I get ===> cc/cc_cdg (all) /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_cdg.c:585:47: error: no member named 't_osd' in 'struct tcpcb' e_t = (struct ertt *)khelp_get_osd(&CCV(ccv, t_osd), ertt_id); ~~~~~~~~~^~~~~~ /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_module.h:59:41: note: expanded from macro 'CCV' #define CCV(ccv, what) (ccv)->ccvc.tcp->what ~~~~~~~~~~~~~~~ ^ 1 error generated. --- cc_cdg.o --- *** [cc_cdg.o] Error code 1 From nobody Fri Jul 14 11:28:54 2023 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 4R2Tky6Gskz2tlhG; Fri, 14 Jul 2023 11:28:58 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Tky3SsXz3P67; Fri, 14 Jul 2023 11:28:58 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:85a6:7e27:ddf8:905b]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id 9AF4380573EAA; Fri, 14 Jul 2023 13:28:55 +0200 (CEST) Content-Type: text/plain; charset=us-ascii 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules From: tuexen@freebsd.org In-Reply-To: Date: Fri, 14 Jul 2023 13:28:54 +0200 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3731.600.7) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4R2Tky3SsXz3P67 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On 14. Jul 2023, at 13:23, Konstantin Belousov = wrote: >=20 > On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dbe78a31188c530c93700396ecfdb5604= a8f22fff >>=20 >> commit be78a31188c530c93700396ecfdb5604a8f22fff >> Author: Michael Tuexen >> AuthorDate: 2023-07-13 16:56:25 +0000 >> Commit: Michael Tuexen >> CommitDate: 2023-07-13 16:56:25 +0000 >>=20 >> tcp: fix build issue for some cc modules >>=20 >> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in >> = https://cgit.FreeBSD.org/src/commit/?id=3De68b3792440cac248347afe08ba5881a= 00ba6523 >> The corresponding changes in two Makefiles were missed, which = resulted >> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. >>=20 >> Reported by: void@f-m.fm >> Reviewed by: rrs, rscheff >> Sponsored by: Netflix, Inc. >> Differential Revision: https://reviews.freebsd.org/D41010 >> --- >> sys/modules/cc/Makefile | 6 +++--- >> sys/modules/khelp/Makefile | 6 +++--- >> 2 files changed, 6 insertions(+), 6 deletions(-) >>=20 >> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile >> index 3f7110024722..b595cc204481 100644 >> --- a/sys/modules/cc/Makefile >> +++ b/sys/modules/cc/Makefile >> @@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \ >>=20 >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = in >> # building these modules by default. >> -# We will default to building these modules unless $OPT_INET is = defined >> -# and does not contain the TCP_HHOOK option. >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" >> +# We will default to building these modules if $OPT_GLOBAL does = contain >> +# the TCP_HHOOK option. >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" >> SUBDIR+=3D \ >> cc_cdg \ >> cc_chd \ >> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile >> index 256d8838c573..c01d61541062 100644 >> --- a/sys/modules/khelp/Makefile >> +++ b/sys/modules/khelp/Makefile >> @@ -4,9 +4,9 @@ SUBDIR=3D >>=20 >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = in >> # building this modules by default. >> -# We will default to building this module unless $OPT_INET is = defined >> -# and does not contain the TCP_HHOOK option. >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" >> +# We will default to building this module if $OPT_GLOBAL does = contain >> +# the TCP_HHOOK option. >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" >> SUBDIR+=3D h_ertt >> .endif >>=20 > It seems modules are actually broken for some configurations. Some problems are known and being worked on. Could you share your kernel conf file and tell us, in which directory you are running the make command? Best regards Michael > I get >=20 > =3D=3D=3D> cc/cc_cdg (all) > /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_cdg.c:585:47: error: = no member named 't_osd' in 'struct tcpcb' > e_t =3D (struct ertt *)khelp_get_osd(&CCV(ccv, t_osd), ertt_id); > ~~~~~~~~~^~~~~~ > /usr/home/kostik/work/DEV/src/sys/netinet/cc/cc_module.h:59:41: note: = expanded from macro 'CCV' > #define CCV(ccv, what) (ccv)->ccvc.tcp->what > ~~~~~~~~~~~~~~~ ^ > 1 error generated. > --- cc_cdg.o --- > *** [cc_cdg.o] Error code 1 >=20 From nobody Fri Jul 14 11:36:34 2023 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 4R2Tvk69ZSz2tpZj; Fri, 14 Jul 2023 11:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2Tvk5c26z3hDp; Fri, 14 Jul 2023 11:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exGAxTulREwecRQKeF3TP7ZqpI6zxp4ZFDpRCJgr5s0=; b=wIYHL3sj/UHQF9B+QH++xnt3jkjGdCve8agUDSO/tdhprse67nqDPo9Z2kvINTm6/ZR+Oi JGIpY9nf1gIsYSoF+6I5q52H5xTEIOiwukpBn8quI0M5+hF57greUaU8V8feht+tfsw/Eu 8bHK3M8Hhl9bCcgVx7Qh0p5Ng/P6+WAOBf45fg1AIIE1Dvl2uTCCna9xyfXSbddwnzwbGD UuCg8dh+7VsMgD11/m3yfmdtHaV3zCILz8LopmeUjtDtvD0NBEmZh7VAjSx055dYHVOhOI /vfBnwtJL/zxWl1QVAgv0LbD/p6jaDKJdmoHonR8Pk9HCfYQoKhiJgc9XlZYaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exGAxTulREwecRQKeF3TP7ZqpI6zxp4ZFDpRCJgr5s0=; b=iD7boBDowrmRUFvzTkLyaHiomZFOVok+thLXCyyr1oIEemvuaNB+auY4njA13wffXESEdj ndsRUg9YB78z/hZaDBk3QwkDko9LLIjyuQqprwB1P7Gl3jzyZjOU6nWgnJFcFsC1BLtWzC CLdl27T0x/yh7Rd2wMKWdfckYIvbOJ2Q4NSM3Vai/RklW5znlECY1yoXvflKfNC0e4s3r2 WjG/WIJkHUfoLFLPsAm1a4IK67MmwgIiNIrdX+PI8J1anSDiy6iinALDcT/uz+Tteguc7Z Wh7lo3kZNsNX8uirC4qX+1q2cbkOqlhaB1VLJPA+rV0A0aiePqTczq6ALs1J3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689334594; a=rsa-sha256; cv=none; b=X3cN+UZwu8btrmkyKz6KHP4al7WfTb8WoBgdFPhG/M9OT7zZTffR7i4DUw5reCNiGEnubc dr90nW9SKXcusPt6o4/BjK7O1yAb5uuyGbgDJLcHfFEAXItY9JGoC2ffqfFT3QGJZ3J3U8 Llh4flw6K6l6cDtOekaYfs4bYBkFqCciBorEnEyW07vw9Ac4IK2+jO3Bo+Y7VNj2oPGNB4 BCwdhE42hQAGWXplX2H8IY9zULIxQLPTAbFIYU9w6C7sQa2nYC4Lz3r0UXrLQx6AcZmT8R Ec64akauw2FTIPaH+s/yzJBq8KM6oYHdT/Vm9oDxCH+yzP0JkDsVGRVC/ogBUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2Tvk4gZlzGrR; Fri, 14 Jul 2023 11:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EBaYUK012902; Fri, 14 Jul 2023 11:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EBaYRX012901; Fri, 14 Jul 2023 11:36:34 GMT (envelope-from git) Date: Fri, 14 Jul 2023 11:36:34 GMT Message-Id: <202307141136.36EBaYRX012901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f58378393fb0 - main - vn_lock_pair(): Support passing LK_NODDLKTREAT 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f58378393fb00f1683bc15f1ae7cbb83e047b9fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f58378393fb00f1683bc15f1ae7cbb83e047b9fb commit f58378393fb00f1683bc15f1ae7cbb83e047b9fb Author: Olivier Certner AuthorDate: 2023-07-09 17:12:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-14 11:36:12 +0000 vn_lock_pair(): Support passing LK_NODDLKTREAT Since this function ultimately calls vn_lock() or VOP_LOCK1(), allows it to receive and pass this flag which is used in the lookup code and doesn't interfere with the function's operation. Reviewed by: kib, markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40954 --- sys/kern/vfs_vnops.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 33cb3ebed60f..41a80da75a4f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -4018,6 +4018,9 @@ vn_lock_pair_pause(const char *wmesg) * Both vnodes could be unlocked temporary (and reclaimed). * * If requesting shared locking, locked vnode lock must not be recursed. + * + * Only one of LK_SHARED and LK_EXCLUSIVE must be specified. + * LK_NODDLKTREAT can be optionally passed. */ void vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, @@ -4025,19 +4028,21 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error; - MPASS(lkflags1 == LK_SHARED || lkflags1 == LK_EXCLUSIVE); - MPASS(lkflags2 == LK_SHARED || lkflags2 == LK_EXCLUSIVE); + MPASS((lkflags1 & LK_SHARED) != 0 ^ (lkflags1 & LK_EXCLUSIVE) != 0); + MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); + MPASS((lkflags2 & LK_SHARED) != 0 ^ (lkflags2 & LK_EXCLUSIVE) != 0); + MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) return; if (vp1 != NULL) { - if (lkflags1 == LK_SHARED && + if ((lkflags1 & LK_SHARED) != 0 && (vp1->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) - lkflags1 = LK_EXCLUSIVE; + lkflags1 = (lkflags1 & ~LK_SHARED) | LK_EXCLUSIVE; if (vp1_locked && VOP_ISLOCKED(vp1) != LK_EXCLUSIVE) { ASSERT_VOP_LOCKED(vp1, "vp1"); - if (lkflags1 == LK_EXCLUSIVE) { + if ((lkflags1 & LK_EXCLUSIVE) != 0) { VOP_UNLOCK(vp1); ASSERT_VOP_UNLOCKED(vp1, "vp1 shared recursed"); @@ -4050,12 +4055,12 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, } if (vp2 != NULL) { - if (lkflags2 == LK_SHARED && + if ((lkflags2 & LK_SHARED) != 0 && (vp2->v_vnlock->lock_object.lo_flags & LK_NOSHARE) != 0) - lkflags2 = LK_EXCLUSIVE; + lkflags2 = (lkflags2 & ~LK_SHARED) | LK_EXCLUSIVE; if (vp2_locked && VOP_ISLOCKED(vp2) != LK_EXCLUSIVE) { ASSERT_VOP_LOCKED(vp2, "vp2"); - if (lkflags2 == LK_EXCLUSIVE) { + if ((lkflags2 & LK_EXCLUSIVE) != 0) { VOP_UNLOCK(vp2); ASSERT_VOP_UNLOCKED(vp2, "vp2 shared recursed"); From nobody Fri Jul 14 11:39:32 2023 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 4R2TzC5y4tz2tql2; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2TzC5RPCz3jpF; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QWV9xDK772EN9RPDNtQgVB6DYPhoz6aE1YdSFH0hMIU=; b=QOaUgEGhfrUDgMkZ1soC17J0XOf7uT7EtWjpcyu6/BvthR0eVX3ffoAYkfTpVI9CuONOxr r+Brdgk98Fib3wt8KSqqfVxBOChk5zXGVRs7bVOzfBu7aTqCdBvGHgm+Po6moDre06EBGx vU4Oaha8boltOG4XaKH1GPV99V9DAaI/aoA5iC8N+B20z1zDNoeUuSWZ+u2dJPb05Z6zvL lMl34sHZN962rxAoJ/FKDYZ9sY16SuWVNUdGSkWgD6EaPymHX8s6cxOYNN5R67J/ul752n Oo7+v1RXwdydbcZPR5bIlwYZtNe7lg8SD+aptOGampmeBIJDM+ZFGI2CWdRSgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689334775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QWV9xDK772EN9RPDNtQgVB6DYPhoz6aE1YdSFH0hMIU=; b=HDNz8B2oGveKhT+n+PeIqLCWmwj+6VvqG8AszP8tOESuNe+Nxph7oWpPLLLNZ4nPl8haRw KqrbWJSw3FklxRdlS47jWOWYNCMGY34GAfyqaBbTy2Nm2SZ5YsFGLbj9jE6COwv3h+82jc JlYl9SC4/DgLc7cHUHEMuF2eRHSE5Jha+UaPc6iZ4bevKNYGKLJspOn3o4oFOSFrjvFJgv B1setnFVMTJguKELEgzhQ8BYE1lM9v2r0XeWUuB+qNinpyUgXKfEhIHMGRGhrucHt8cw4h k966ije+PJmvYnQaQnH7GrBuiAyNTz0tw3+gTwdPJEKBImLZpe1DZa5OjNecxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689334775; a=rsa-sha256; cv=none; b=j5ifddO5qNaHdLuHLZbdhXmPlkon3r1OSnikuHT9Aw9PSewKhyti7HnxKtBYNEUnjZsuuV Q8gCj+SZPyPIlj7su7pXfG3e5/gjk8jQFspAS2RJHlRyRbonP65KVkI/a+t7jGjMzNO7vj Pc5A6vlXUbN+D7tT2qv7MW6lMFpgvZrVyZsiA5aoHQgyEu2SftHn9KlkXj668Xq9QUpsC/ t/N4jc/21UTngV2y3OlPAXI41LeOGNA0EnCm9wtEgF0DTtsAd0Gyu2J8/pbWr1AI49hKyN c1PjDlLkq8s5yT8TWM8bDRj3rHCa/Zyb66dVZGX10RfmgIEV4i6bWJ+P2XPhkA== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R2TzC3Blkzn6N; Fri, 14 Jul 2023 11:39:35 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 0E3E28E33; Fri, 14 Jul 2023 13:39:32 +0200 (CEST) From: Kristof Provost To: tuexen@freebsd.org Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Date: Fri, 14 Jul 2023 13:39:32 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <00949E97-1098-4FC4-B5FB-9F639E93C81D@FreeBSD.org> In-Reply-To: <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_=" X-ThisMailContainsUnwantedMimeParts: N --=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_= Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable On 14 Jul 2023, at 13:28, tuexen@freebsd.org wrote: >> On 14. Jul 2023, at 13:23, Konstantin Belousov = >> wrote: >> >> On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: >>> The branch main has been updated by tuexen: >>> >>> URL: = >>> https://cgit.FreeBSD.org/src/commit/?id=3Dbe78a31188c530c93700396ecfd= b5604a8f22fff >>> >>> commit be78a31188c530c93700396ecfdb5604a8f22fff >>> Author: Michael Tuexen >>> AuthorDate: 2023-07-13 16:56:25 +0000 >>> Commit: Michael Tuexen >>> CommitDate: 2023-07-13 16:56:25 +0000 >>> >>> tcp: fix build issue for some cc modules >>> >>> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in >>> https://cgit.FreeBSD.org/src/commit/?id=3De68b3792440cac248347afe08b= a5881a00ba6523 >>> The corresponding changes in two Makefiles were missed, which = >>> resulted >>> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. >>> >>> Reported by: void@f-m.fm >>> Reviewed by: rrs, rscheff >>> Sponsored by: Netflix, Inc. >>> Differential Revision: https://reviews.freebsd.org/D41010 >>> --- >>> sys/modules/cc/Makefile | 6 +++--- >>> sys/modules/khelp/Makefile | 6 +++--- >>> 2 files changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile >>> index 3f7110024722..b595cc204481 100644 >>> --- a/sys/modules/cc/Makefile >>> +++ b/sys/modules/cc/Makefile >>> @@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \ >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = >>> in >>> # building these modules by default. >>> -# We will default to building these modules unless $OPT_INET is = >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D "= " >>> +# We will default to building these modules if $OPT_GLOBAL does = >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D= = >>> "" >>> SUBDIR+=3D \ >>> cc_cdg \ >>> cc_chd \ >>> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile >>> index 256d8838c573..c01d61541062 100644 >>> --- a/sys/modules/khelp/Makefile >>> +++ b/sys/modules/khelp/Makefile >>> @@ -4,9 +4,9 @@ SUBDIR=3D >>> >>> # Do we have the TCP_HHOOK symbol defined? If not, there is no point = >>> in >>> # building this modules by default. >>> -# We will default to building this module unless $OPT_INET is = >>> defined >>> -# and does not contain the TCP_HHOOK option. >>> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D "= " >>> +# We will default to building this module if $OPT_GLOBAL does = >>> contain >>> +# the TCP_HHOOK option. >>> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D= = >>> "" >>> SUBDIR+=3D h_ertt >>> .endif >>> >> It seems modules are actually broken for some configurations. > Some problems are known and being worked on. > > Could you share your kernel conf file and tell us, in which directory > you are running the make command? > `make buildkernel KERNCONF=3DMINIMAL` will fail (on amd64). Best regards, Kristof --=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 14 Jul 2023, at 13:28, tuexen@freebsd.org wrote:

On 14. Jul 2023, at 13:23, Konstantin Belousov = <kostikbel@gmail.com> wrote:

On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen = wrote:

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/co= mmit/?id=3Dbe78a31188c530c93700396ecfdb5604a8f22fff

commit be78a31188c530c93700396ecfdb5604a8f22fff
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-07-13 16:56:25 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-07-13 16:56:25 +0000

tcp: fix build issue for some cc modules

The TCP_HHOOK option was moved from opt_inet.h to opt_g= lobal.h in
https://cgit.FreeBSD.org/src/commit/?id=3De68b3792= 440cac248347afe08ba5881a00ba6523
The corresponding changes in two Makefiles were missed, which resulted
in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore.

Reported by: void@f-m.fm
Reviewed by: rrs, rscheff
Sponsored by: Netflix, Inc.
Differential Revision: = https://reviews.freebsd.org/D41010
---
sys/modules/cc/Makefile | 6 +++---
sys/modules/khelp/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Mak= efile
index 3f7110024722..b595cc204481 100644
--- a/sys/modules/cc/Makefile
+++ b/sys/modules/cc/Makefile
@@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \

# Do we have the TCP_HHOOK symbol defined? If not, there = is no point in
# building these modules by default.
-# We will default to building these modules unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
+# We will default to building these modules if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
SUBDIR+=3D \
cc_cdg \
cc_chd \
diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile
index 256d8838c573..c01d61541062 100644
--- a/sys/modules/khelp/Makefile
+++ b/sys/modules/khelp/Makefile
@@ -4,9 +4,9 @@ SUBDIR=3D

# Do we have the TCP_HHOOK symbol defined? If not, there = is no point in
# building this modules by default.
-# We will default to building this module unless $OPT_INET is defined
-# and does not contain the TCP_HHOOK option.
-.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
+# We will default to building this module if $OPT_GLOBAL does contain
+# the TCP_HHOOK option.
+.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} !=3D ""
SUBDIR+=3D h_ertt
=2Eendif

It seems modules are actually broken for som= e configurations.

Some problems are known and being worked on.=

Could you share your kernel conf file and tell us, in whi= ch directory
you are running the make command?


make buildkernel KERNCONF=3DMINIMAL will fail (on amd64).

=

Best regards,
Kristof

--=_MailMate_10D9FA97-377D-4FCC-A767-2224FD2A307B_=-- From nobody Fri Jul 14 11:50:57 2023 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 4R2VDW30Lrz2tvvh; Fri, 14 Jul 2023 11:51:07 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2VDV40vxz3mTl; Fri, 14 Jul 2023 11:51:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 36EBovht085429 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 14 Jul 2023 14:51:01 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 36EBovht085429 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 36EBovo2085428; Fri, 14 Jul 2023 14:50:57 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 14 Jul 2023 14:50:57 +0300 From: Konstantin Belousov To: tuexen@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules Message-ID: References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="kja3y4QpTjAFSdTC" Content-Disposition: inline In-Reply-To: <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> X-Spam-Status: No, score=0.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM,FREEMAIL_REPLY, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4R2VDV40vxz3mTl X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --kja3y4QpTjAFSdTC Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jul 14, 2023 at 01:28:54PM +0200, tuexen@freebsd.org wrote: > > On 14. Jul 2023, at 13:23, Konstantin Belousov wrote: > > > > On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: > >> The branch main has been updated by tuexen: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=be78a31188c530c93700396ecfdb5604a8f22fff > >> > >> commit be78a31188c530c93700396ecfdb5604a8f22fff > >> Author: Michael Tuexen > >> AuthorDate: 2023-07-13 16:56:25 +0000 > >> Commit: Michael Tuexen > >> CommitDate: 2023-07-13 16:56:25 +0000 > >> > >> tcp: fix build issue for some cc modules > >> > >> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in > >> https://cgit.FreeBSD.org/src/commit/?id=e68b3792440cac248347afe08ba5881a00ba6523 > >> The corresponding changes in two Makefiles were missed, which resulted > >> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. > >> > >> Reported by: void@f-m.fm > >> Reviewed by: rrs, rscheff > >> Sponsored by: Netflix, Inc. > >> Differential Revision: https://reviews.freebsd.org/D41010 > >> --- > >> sys/modules/cc/Makefile | 6 +++--- > >> sys/modules/khelp/Makefile | 6 +++--- > >> 2 files changed, 6 insertions(+), 6 deletions(-) > >> > >> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile > >> index 3f7110024722..b595cc204481 100644 > >> --- a/sys/modules/cc/Makefile > >> +++ b/sys/modules/cc/Makefile > >> @@ -8,9 +8,9 @@ SUBDIR= cc_newreno \ > >> > >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > >> # building these modules by default. > >> -# We will default to building these modules unless $OPT_INET is defined > >> -# and does not contain the TCP_HHOOK option. > >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > >> +# We will default to building these modules if $OPT_GLOBAL does contain > >> +# the TCP_HHOOK option. > >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > >> SUBDIR+= \ > >> cc_cdg \ > >> cc_chd \ > >> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile > >> index 256d8838c573..c01d61541062 100644 > >> --- a/sys/modules/khelp/Makefile > >> +++ b/sys/modules/khelp/Makefile > >> @@ -4,9 +4,9 @@ SUBDIR= > >> > >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point in > >> # building this modules by default. > >> -# We will default to building this module unless $OPT_INET is defined > >> -# and does not contain the TCP_HHOOK option. > >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} != "" > >> +# We will default to building this module if $OPT_GLOBAL does contain > >> +# the TCP_HHOOK option. > >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != "" > >> SUBDIR+= h_ertt > >> .endif > >> > > It seems modules are actually broken for some configurations. > Some problems are known and being worked on. > > Could you share your kernel conf file and tell us, in which directory > you are running the make command? My config is attached. I do 'make -C sys/amd64/compile/X' for this specific run. --kja3y4QpTjAFSdTC Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=X cpu HAMMER options PREEMPTION options SMP options HWPMC_HOOKS device acpi #options IOMMU options PCI_IOV options EARLY_AP_STARTUP options INVARIANTS options INVARIANT_SUPPORT options WITNESS options WITNESS_SKIPSPIN options DEBUG_LOCKS options DEBUG_VFS_LOCKS options DIAGNOSTIC #options DEBUG_MEMGUARD options BUS_DEBUG ident X nooptions INCLUDE_CONFIG_FILE makeoptions DEBUG=-gdwarf-2 options STACK options KDB options KDB_TRACE options DDB options DDB_NUMSYM options GDB options KTR options KTR_ENTRIES=131072 options BREAK_TO_DEBUGGER options ALT_BREAK_TO_DEBUGGER options VIMAGE options INET options INET6 options SCTP_SUPPORT options IPSEC_SUPPORT options SCHED_ULE options SOFTUPDATES options QUOTA options UFS_DIRHASH options UFS_ACL options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART options SUIDDIR options NFS_ROOT options COMPAT_FREEBSD32 options SCSI_DELAY=15000 options KTRACE options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV options CAPABILITY_MODE options CAPABILITIES options MAC options PRINTF_BUFR_SIZE=128 options COMPAT_43TTY options COMPAT_43 options COMPAT_FREEBSD4 options COMPAT_FREEBSD5 options COMPAT_FREEBSD6 options COMPAT_FREEBSD7 options COMPAT_FREEBSD9 options COMPAT_FREEBSD10 options COMPAT_FREEBSD11 options COMPAT_FREEBSD12 options COMPAT_FREEBSD13 device isa device pci device loop # Network loopback device ether # Ethernet support device mem device io device bpf device uart device crypto --kja3y4QpTjAFSdTC-- From nobody Fri Jul 14 13:20:57 2023 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 4R2XDD1qLcz4n7lW for ; Fri, 14 Jul 2023 13:21:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2XDC6Ghrz48kt for ; Fri, 14 Jul 2023 13:20:59 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-51e2a6a3768so2333321a12.0 for ; Fri, 14 Jul 2023 06:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1689340858; x=1691932858; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zAtqmz43Z1rIelD4tKpmKNUZaHQUnPtlLpaiGPJQk60=; b=HpPqV7ZHoPK/cp39JbcXljhxHiZrXN5GbKl/wpddWU8fQKsyhpTK2UaT7WAOBvUFMO LJ2HJHpUB2DEe97ArNyrgwVtM3ERouVkVncTBK7BYGcaChpeYCKzEwFKI4K52hTu5O62 sMVpUIKlaYAZ+YnDJGs8+43Heyx/O/zGA40gmNhqN/U0L96bVpbqhgEJc/7Majg+qWQ1 jX4kxIMHeJPJCxz1OXjYmw66/o8xZDn8X7LxC0juokNIrhd+SJfmFeE4K37yPftxfzIH zRO/duDDSrZWaIdhu9MyyNnywMgNz5U9ULuidphJpI6YRoHok8jh2XkpXpCMJUi0jjOd L5vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689340858; x=1691932858; 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=zAtqmz43Z1rIelD4tKpmKNUZaHQUnPtlLpaiGPJQk60=; b=laTnd38Y79uWNhnaTKrh5mG7LFaf7Xk7iOt4SHCzToSAk+rRUe2QedRGTM13ik70j7 uiNExFl/GhwRbLziBuUUdzw4zGHuSaG19eFGvSH/9LHEsqO8M6rSTtQX69c9WOeJrnpK D238K19k4UpVUerv47GCaMiEblo5w21GTaYHYQT/2QtDKLuJNeVyFwHyqJa097CbcpMW mYbS0UWEGRHBDg4RVTM76+TU942r+xN2oeETBlMkJWQdUAzMozuDMv5CbGUS1r+xd0/0 MPZ9dL30WuNlC48sM2xXm9WhE3f+i7aaE/a7xwBAzC8FeweHic8bkJusxKP2HX4pg4gq Kqtg== X-Gm-Message-State: ABy/qLaI9b3lLEypWDZvJrCiIyaXFVF4hkgKdd27pMGmNlNrMcuKV5aG PfVtOm/jotcpL8sXMlXEC3JbgDEq9ZmkkneK2/zQ3A== X-Google-Smtp-Source: APBJJlGOLNHh0v1qkckd8Gey0p4sY6dGxTNAz+mpn11GaucCSRtDB6KOhxP26KqOyn6mYqBDAMi44JvSh5sTY4DJrIA= X-Received: by 2002:aa7:c50a:0:b0:51d:d227:15d0 with SMTP id o10-20020aa7c50a000000b0051dd22715d0mr4303030edq.0.1689340858383; Fri, 14 Jul 2023 06:20:58 -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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202307132031.36DKVYIK019476@gitrepo.freebsd.org> <0C3C0CAD-523A-4A77-8942-4316DB49EF57@freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 14 Jul 2023 07:20:57 -0600 Message-ID: Subject: Re: git: be78a31188c5 - main - tcp: fix build issue for some cc modules To: Konstantin Belousov Cc: tuexen@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c4d4d00600725192" X-Rspamd-Queue-Id: 4R2XDC6Ghrz48kt X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000c4d4d00600725192 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Jul 14, 2023 at 5:51=E2=80=AFAM Konstantin Belousov wrote: > On Fri, Jul 14, 2023 at 01:28:54PM +0200, tuexen@freebsd.org wrote: > > > On 14. Jul 2023, at 13:23, Konstantin Belousov > wrote: > > > > > > On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: > > >> The branch main has been updated by tuexen: > > >> > > >> URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dbe78a31188c530c93700396ecfdb560= 4a8f22fff > > >> > > >> commit be78a31188c530c93700396ecfdb5604a8f22fff > > >> Author: Michael Tuexen > > >> AuthorDate: 2023-07-13 16:56:25 +0000 > > >> Commit: Michael Tuexen > > >> CommitDate: 2023-07-13 16:56:25 +0000 > > >> > > >> tcp: fix build issue for some cc modules > > >> > > >> The TCP_HHOOK option was moved from opt_inet.h to opt_global.h in > > >> > https://cgit.FreeBSD.org/src/commit/?id=3De68b3792440cac248347afe08ba5881= a00ba6523 > > >> The corresponding changes in two Makefiles were missed, which > resulted > > >> in not building cc_cdg, cc_chd, cc_hd, and cc_vegas anymore. > > >> > > >> Reported by: void@f-m.fm > > >> Reviewed by: rrs, rscheff > > >> Sponsored by: Netflix, Inc. > > >> Differential Revision: https://reviews.freebsd.org/D41010 > > >> --- > > >> sys/modules/cc/Makefile | 6 +++--- > > >> sys/modules/khelp/Makefile | 6 +++--- > > >> 2 files changed, 6 insertions(+), 6 deletions(-) > > >> > > >> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile > > >> index 3f7110024722..b595cc204481 100644 > > >> --- a/sys/modules/cc/Makefile > > >> +++ b/sys/modules/cc/Makefile > > >> @@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \ > > >> > > >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point > in > > >> # building these modules by default. > > >> -# We will default to building these modules unless $OPT_INET is > defined > > >> -# and does not contain the TCP_HHOOK option. > > >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" > > >> +# We will default to building these modules if $OPT_GLOBAL does > contain > > >> +# the TCP_HHOOK option. > > >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != =3D "" > > >> SUBDIR+=3D \ > > >> cc_cdg \ > > >> cc_chd \ > > >> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile > > >> index 256d8838c573..c01d61541062 100644 > > >> --- a/sys/modules/khelp/Makefile > > >> +++ b/sys/modules/khelp/Makefile > > >> @@ -4,9 +4,9 @@ SUBDIR=3D > > >> > > >> # Do we have the TCP_HHOOK symbol defined? If not, there is no point > in > > >> # building this modules by default. > > >> -# We will default to building this module unless $OPT_INET is defin= ed > > >> -# and does not contain the TCP_HHOOK option. > > >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK} !=3D = "" > > >> +# We will default to building this module if $OPT_GLOBAL does conta= in > > >> +# the TCP_HHOOK option. > > >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHOOK} != =3D "" > I don't see how this could possibly work reliably. OPT_GLOBAL isn't set for all builds, and I'm not sure it's set for this submake given how we set them up= . > > >> SUBDIR+=3D h_ertt > > >> .endif > > >> > > > It seems modules are actually broken for some configurations. > > Some problems are known and being worked on. > > > > Could you share your kernel conf file and tell us, in which directory > > you are running the make command? > > My config is attached. I do 'make -C sys/amd64/compile/X' for this > specific > run. > I believe this is due to the interface between the kernel and the modules changing based on kernel config, which is something we've traditionally avoided. Removing the #ifdef for the 'osd' member in tcp_var.h git diff diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 587998331fbf..f6d3e2b9fa85 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -482,9 +482,7 @@ struct tcpcb { struct mbufq t_inpkts; /* List of saved input packets. */ struct mbufq t_outpkts; /* List of saved output packets. */ #endif -#ifdef TCP_HHOOK struct osd t_osd; /* storage for Khelp module data */ -#endif uint8_t _t_logpoint; /* Used when a BB log points is enabled */ #ifdef TCP_REQUEST_TRK /* Response tracking addons. */ fixes the problem, at least as far as building goes. The t_osd member is trivial in size, and not worth the savings that having different KBIs based on options causes (though there's other ifdefs that likely should be rethought, and t_osd likely should be moved before all the optional bits). Warner --000000000000c4d4d00600725192 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Jul 14, 2023 at 5:51=E2=80=AF= AM Konstantin Belousov <kostikbel= @gmail.com> wrote:
On Fri, Jul 14, 2023 at 01:28:54PM +0200, tuexen@freebsd.org wrote:
> > On 14. Jul 2023, at 13:23, Konstantin Belousov <kostikbel@gmail.com> wrot= e:
> >
> > On Thu, Jul 13, 2023 at 08:31:34PM +0000, Michael Tuexen wrote: > >> The branch main has been updated by tuexen:
> >>
> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dbe78a31188c530c93700396ecfdb5604= a8f22fff
> >>
> >> commit be78a31188c530c93700396ecfdb5604a8f22fff
> >> Author:=C2=A0 =C2=A0 =C2=A0Michael Tuexen <tuexen@FreeBSD.= org>
> >> AuthorDate: 2023-07-13 16:56:25 +0000
> >> Commit:=C2=A0 =C2=A0 =C2=A0Michael Tuexen <tuexen@FreeBSD.= org>
> >> CommitDate: 2023-07-13 16:56:25 +0000
> >>
> >>=C2=A0 =C2=A0tcp: fix build issue for some cc modules
> >>
> >>=C2=A0 =C2=A0The TCP_HHOOK option was moved from opt_inet.h to= opt_global.h in
> >>=C2=A0 =C2=A0https://cgit.FreeBSD.org/src/commit/?id=3De68b3792440cac248347afe08= ba5881a00ba6523
> >>=C2=A0 =C2=A0The corresponding changes in two Makefiles were m= issed, which resulted
> >>=C2=A0 =C2=A0in not building cc_cdg, cc_chd, cc_hd, and cc_veg= as anymore.
> >>
> >>=C2=A0 =C2=A0Reported by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 void@f-m.fm
> >>=C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 rrs, rscheff
> >>=C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0Netflix, Inc.
> >>=C2=A0 =C2=A0Differential Revision:=C2=A0 https://rev= iews.freebsd.org/D41010
> >> ---
> >> sys/modules/cc/Makefile=C2=A0 =C2=A0 | 6 +++---
> >> sys/modules/khelp/Makefile | 6 +++---
> >> 2 files changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefil= e
> >> index 3f7110024722..b595cc204481 100644
> >> --- a/sys/modules/cc/Makefile
> >> +++ b/sys/modules/cc/Makefile
> >> @@ -8,9 +8,9 @@ SUBDIR=3D cc_newreno \
> >>
> >> # Do we have the TCP_HHOOK symbol defined? If not, there is n= o point in
> >> # building these modules by default.
> >> -# We will default to building these modules unless $OPT_INET= is defined
> >> -# and does not contain the TCP_HHOOK option.
> >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK= } !=3D ""
> >> +# We will default to building these modules if $OPT_GLOBAL d= oes contain
> >> +# the TCP_HHOOK option.
> >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHO= OK} !=3D ""
> >> SUBDIR+=3D \
> >> cc_cdg \
> >> cc_chd \
> >> diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/M= akefile
> >> index 256d8838c573..c01d61541062 100644
> >> --- a/sys/modules/khelp/Makefile
> >> +++ b/sys/modules/khelp/Makefile
> >> @@ -4,9 +4,9 @@ SUBDIR=3D
> >>
> >> # Do we have the TCP_HHOOK symbol defined? If not, there is n= o point in
> >> # building this modules by default.
> >> -# We will default to building this module unless $OPT_INET i= s defined
> >> -# and does not contain the TCP_HHOOK option.
> >> -.if defined(ALL_MODULES) || ${OPT_INET:UTCP_HHOOK:MTCP_HHOOK= } !=3D ""
> >> +# We will default to building this module if $OPT_GLOBAL doe= s contain
> >> +# the TCP_HHOOK option.
> >> +.if defined(ALL_MODULES) || ${OPT_GLOBAL:UTCP_HHOOK:MTCP_HHO= OK} !=3D ""

I don't see h= ow this could possibly work reliably. OPT_GLOBAL isn't set for all
builds, and I'm not sure it's set for this submake given how = we set them up.
=C2=A0
> >> SUBDIR+=3D h_ertt
> >> .endif
> >>
> > It seems modules are actually broken for some configurations.
> Some problems are known and being worked on.
>
> Could you share your kernel conf file and tell us, in which directory<= br> > you are running the make command?

My config is attached.=C2=A0 I do 'make -C sys/amd64/compile/X' for= this specific
run.

I believe this is due to the inter= face between the kernel and the modules changing
based on kernel = config, which is something we've traditionally avoided. Removing the
#ifdef for the 'osd' member in tcp_var.h

git diff
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var= .h
index 587998331fbf..f6d3e2b9fa85 100644
--- a/sys/netinet/tcp_var.= h
+++ b/sys/netinet/tcp_var.h
@@ -482,9 +482,7 @@ struct tcpcb {
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct mbufq t_inpkts; =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0/* List of saved input packets. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0= struct mbufq t_outpkts; =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* List of saved outpu= t packets. */
=C2=A0#endif
-#ifdef TCP_HHOOK
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 struct osd =C2=A0 =C2=A0 =C2=A0t_osd; =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0/* storage for Khelp module data */
-#endif
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 uint8_t _t_logpoint; =C2=A0 =C2=A0/* Used when a BB log points i= s enabled */
=C2=A0#ifdef TCP_REQUEST_TRK
=C2=A0 =C2=A0 =C2=A0 =C2=A0= /* Response tracking addons. */

fixes the pro= blem, at least as far as building goes. The t_osd member
is trivi= al in size, and not worth the savings that having different KBIs
= based on options causes (though there's other ifdefs that likely should=
be rethought, and t_osd likely should be moved before all the op= tional
bits).

Warner
--000000000000c4d4d00600725192-- From nobody Fri Jul 14 17:27:00 2023 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 4R2dh43NcJz2tnx4; Fri, 14 Jul 2023 17:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2dh41kjXz430L; Fri, 14 Jul 2023 17:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MW5yr9gRYNLKofgJUw2E/+Mn0nvRpCGg0e3FQk7QQE4=; b=eeSpsYP7AXLYtujafFwmRsuuMzNEyHdtWMIqCO9bNvfBbAyosmoJnn6ju/eUTKpIXTi6JP l2Kv+ECx7dyvgvyHVKPmGn69htdIox3iRW1uKidkfWb5D4xuOKAyHp4Lm0alwDrpBKhdLl WRi8pmIhEtlSoHciXem2bxK7aNPrmwNzDsxuOIS/t5+FVNYn3SsFzrNpUte9AwVE1HRnj9 OJKoWC9sBvwanqZH6CS3544A3EBoZMiNF4oD6qYUY/un5b/wc/7Bt6EnD7uojmShbJ3LoU j1XmRtXXedWzhoXvz1i6C3UT904xYZ9a0apcQrOOErwZHzo0cMiPUZWO4SBw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MW5yr9gRYNLKofgJUw2E/+Mn0nvRpCGg0e3FQk7QQE4=; b=aJ3wBGotFXzX0P073ONScfr8ejeMSv2dz8yH8DN1SxdkkNRXXkm95BKSgjvC+weQ2e2j3Q j93L+f7PwLOghi24dMfc1bDCwkGoRWcwW/kGVJ49h+EYVAuyTjupfzcLJ1tgxuPNgH16HI 6ltBqHOsRb/Nqd/Z1FSsVgrz4hSCy6e/wUqUoBPFBoemyU4PsdQUUa3fw0BvvFGxmnHLaP 3n18b6qvu1pW2IadQbEKkPGqHoNuBpCCD9DSvaH998/MnLyp+dhGkowS8+qcEKz/mHtpaw J9ncXyj7o11klSlFX7NeayNZbNMT/V9gJCn7EzEPHQ8q2GvQxi4VKFyCQESlow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689355620; a=rsa-sha256; cv=none; b=G5fDfktUdKT93Vhw+whYUS3abqNPQcAMZFY6ouq1aFU2syia0OI9nkVEJnEwaJHcJT2xMQ 9gSHQTNbTP44OzareoF2euKXormqyj1z1sRNWDJdyToXmCvHrfVPuV1fMpUYhhBhRmKiOx Bun6eJ1pwj8lSoAtH+suOTkg+aEASKG12trjBlYOf+5AHUcUtIcP75pjL+McjuqXDaLHPe CDXotIkCX9FEp4aYtCsc5exdXNYnP1LQ5gYK2YHDqm+8XrkmBAFhugA/qxPHH96zA1rtp7 mwzIEXvDIzi/U7Lm5GerC5NhU3qTYe4D5L6FMTqriixfXnCWa3II3MyiqBdyiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2dh40qQZzQxZ; Fri, 14 Jul 2023 17:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EHR0lr094001; Fri, 14 Jul 2023 17:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EHR05f093999; Fri, 14 Jul 2023 17:27:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 17:27:00 GMT Message-Id: <202307141727.36EHR05f093999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: a248abb55a51 - main - Obsoletefiles.inc: A few OpenSSL 3 cleanups. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a248abb55a51830d811b45d78eaacf5df108148b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a248abb55a51830d811b45d78eaacf5df108148b commit a248abb55a51830d811b45d78eaacf5df108148b Author: John Baldwin AuthorDate: 2023-07-14 17:25:54 +0000 Commit: John Baldwin CommitDate: 2023-07-14 17:25:54 +0000 Obsoletefiles.inc: A few OpenSSL 3 cleanups. - Treat old engine DSOs from OpenSSL 1.1.1 as OLD_LIBS, not OLD_FILES. These should only be deleted by make delete-old-libs similar to how PAM modules are treated. - Add /usr/lib32/engines to OLD_DIRS. lib32 automation does not apply to OLD_DIRS. Reviewed by: Pierre Pronchery Differential Revision: https://reviews.freebsd.org/D41034 --- ObsoleteFiles.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c2f629133fd5..ccc57c3406c3 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -61,10 +61,11 @@ OLD_FILES+=usr/include/dev/nvme/nvme_private.h # 20230623: OpenSSL 3.0.9 OLD_LIBS+=lib/libcrypto.so.111 OLD_FILES+=usr/include/openssl/rand_drbg.h -OLD_FILES+=usr/lib/engines/capi.so -OLD_FILES+=usr/lib/engines/padlock.so +OLD_LIBS+=usr/lib/engines/capi.so +OLD_LIBS+=usr/lib/engines/padlock.so OLD_LIBS+=usr/lib/libssl.so.111 OLD_DIRS+=usr/lib/engines +OLD_DIRS+=usr/lib32/engines OLD_FILES+=usr/share/man/man1/list.1 OLD_FILES+=usr/share/man/man1/openssl-tsget.1 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_data.3 From nobody Fri Jul 14 17:32:20 2023 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 4R2dpD5357z2tpdY; Fri, 14 Jul 2023 17:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2dpD4GKyz43kb; Fri, 14 Jul 2023 17:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSZFj+r7GdahLvMIXUY+I0aEC+ooTgD1+0Ix1IKyZjE=; b=BnL5m3/kBTACacatbCXuXH7iJuZRTQQpdgYuxdnUb9Oh3Vh3YE+7XhbgSfPiN3H9UEgTCJ l6RGKLLgKfxjGA5YWm2R4mjst9ACB4Lk0pm8gcZC1tf8lrsecAkXM7cXq7CL/wahVNGkAD i2EoFnVcl/1Y92mZ37G6LvjApOj4eWUeJ+jiZIBag/vMGodzZPBbXTB/DjwmUC0rSBK72p 912y+cR47ha6W99ogv6OLnwkSfpxdDUpagLp5eT6fZuyqsgbJCWwiOGcqL2WRpUC4NhE1j VjI2vdKAQtYWwr8LPIpgGSSb98alyU37YAg4QuLyOdnmZB1yCafM7NZbOihlrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689355940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSZFj+r7GdahLvMIXUY+I0aEC+ooTgD1+0Ix1IKyZjE=; b=fi3BIKUEBXy0nc2xMKqD7iphbegxqCkt0RUyrnwojL0Vw6Tpb+qi5Jq00lwXGQB9X+26kD UIIyCheKIzXzlOnuxFneMpzQvHU2QcEcqNDfg5z3WlbAWE9UGcVrKuW390k9PrbnzEfkjI GbDgyfUJXusCGKgcNzt+dI5THcf8IqKDmfahqYPmhV6+qyO6S5eRklwKQLzvuoV+dUe0K8 CHizgKRgEOzlv0nLAADslaOxs4Jdarz+pkDtKYPsMkoYfS7fxkf1Y9gxkRKQLJZupQPD/t yFmTqFVvupyjfiNlslfDHM6qXgXkHjcv0oXYV3M5jz5HVFTPHgSSNI6vflNwiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689355940; a=rsa-sha256; cv=none; b=hyP1Lj8N5vNaYg/W1Aj864FqvB8wvyzvgM9gTI/hBhB1jUrVnE7PYQTavh8HlyVV2HBbY0 7r3EC58nxkHT1I4wuLs3cvuXcgoEAW26ceY0rXKKRtOqqZvZ/UeXN2Wl02+XPBc/pZDxvn due2c+agnw4YCVrM2TaetwmLRKa8IHGShfaU1wYbMXDJQ+EO+ZxX3PmONb2rXy5Ae2I+ny jVFhhjSIub+M7ABVi1ZbpMLSrabVuYu2k7oJwpw2gJ1+/eQROgfRBDMx7Tcc9e9Z+gzha4 qKgnNonmjh9Gu2pDOLdFX6qcBuaHvB/HK7+qMYacyHkdaBtbjWknSheDhWgTjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2dpD3KwFzRZ8; Fri, 14 Jul 2023 17:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EHWKQM008917; Fri, 14 Jul 2023 17:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EHWK0Y008916; Fri, 14 Jul 2023 17:32:20 GMT (envelope-from git) Date: Fri, 14 Jul 2023 17:32:20 GMT Message-Id: <202307141732.36EHWK0Y008916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6582301f83c6 - main - PCI DEN0115: Reliably check for a memory resource during probe. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6582301f83c6ccaede7352fc6e6d3e7b46161713 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6582301f83c6ccaede7352fc6e6d3e7b46161713 commit 6582301f83c6ccaede7352fc6e6d3e7b46161713 Author: John Baldwin AuthorDate: 2023-07-14 17:27:40 +0000 Commit: John Baldwin CommitDate: 2023-07-14 17:27:40 +0000 PCI DEN0115: Reliably check for a memory resource during probe. rid was stack garbage, so the bus_alloc_resource_any() call could fail and fall through to the SMCCC version check even if a bridge had a memory resource. Debugging help: jrtc27 Reviewed by: jrtc27 Fixes: c9a05c072270 Add a PCI driver that follows the Arm DEN0115 spec Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41025 --- sys/dev/pci/pci_host_generic_den0115.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_host_generic_den0115.c b/sys/dev/pci/pci_host_generic_den0115.c index d620a755a1ca..cfef34824965 100644 --- a/sys/dev/pci/pci_host_generic_den0115.c +++ b/sys/dev/pci/pci_host_generic_den0115.c @@ -71,10 +71,11 @@ pci_host_acpi_smccc_probe(device_t dev) return (ENXIO); /* - * Check we have memory resources. We may have a non-memory + * Check if we have memory resources. We may have a non-memory * mapped device, e.g. using the Arm PCI Configuration Space * Access Firmware Interface (DEN0115). */ + rid = 0; res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 0); if (res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, rid, res); From nobody Fri Jul 14 18:41:03 2023 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 4R2gKW5VCNz4mpmr; Fri, 14 Jul 2023 18:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2gKW53Mmz4KFG; Fri, 14 Jul 2023 18:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edeBtsotKMMjOI3V9jR3z9VQIjqvRrv1uOeE0CluReI=; b=AQaouKYuDSg6IpMrEF6UoduGJLeu88T68C90+SmxYxSJeR2/Lm1x7lh5M8GNJYVKS7glff stVvjsb5qgN6aShmE9oDdJE/1Xuzp5UXJCI674i/jktOy/ES7gTlAwgn5EWmNa/9iD7kzm CqAO5Flxc13rkWmvtd3AY5c2ZnaudvbPbZyQjIvfKQJe7d6CZX0FUqvzvChSQLZjsXgFva oQ8yXasoQgHX94ezApsd/qEBG9ztsfdXMQb2wFZjjvW0fMjup6jVna86ct9S1gllowPRgo Kp3FjAbX4A73i498Xhmu01ldjGUV5aJrs9QbboP+d4VHzkVrJaKtnQXdR21CIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=edeBtsotKMMjOI3V9jR3z9VQIjqvRrv1uOeE0CluReI=; b=sieF2B38nbcqXdnka6v2dffw+wW7lO1bUMPXamp/ZrgYqTo5UT1vkswN3OGoykn5rsl6Ux kR6RAEX9WJg2Seyrulj4a3rLfEgHvQS0n3cEGA2XMKu8MGuQaH6YaPHdqncGquK0M26yD5 LnnF7jzIp1xfYntId2KE2dMFgIozgSh9EO8jjtT3choXTOyZuaJpxDZ9XJ0v5PQnhX5Ruh pD9x/5Uod7y1svKoNZC5hTYQHUwEKOLniKPSXs6Uoz51dqs7bPchBVihTzZMTDNoSdwTg8 cbtpEd7p6dTNuOJWSo1JeyLtRTXFqI1eAIDhKExdVrVZ3Z5+urGbzxivSQsCmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689360063; a=rsa-sha256; cv=none; b=AAMIPBZzFSIW/7SXjh97e3RURWycA+BKiV0YawIOBqC7G1Zr6ZFyaDrVwL0IivResTyM06 nNLvdu9HpcXz7FVUBYDwJRoa/kdIM37li4SHb4FGH+z03j5DWdDfAg+b8jhbghQISNM1qo gp//VL1qG90b/tuLpUJBcpx7dVTknBkKdVxUYzEmWm5gIpB7wsKHmmnCi4vZF+8quPETWE sXWmfvcyB3+9pSh7n/DVa+dGSTGKx77Swg5GR0NGc5RWZ2RxiQmYyvP9O3OXSkdu6T18pW 25GS6JEhQQDkQJsEl/GlovRA1/Smjv3F3oIDhoXPZ9nc23ohvh7dzX3flhuToA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2gKW47BnzTNW; Fri, 14 Jul 2023 18:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EIf3UY019404; Fri, 14 Jul 2023 18:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EIf3f0019403; Fri, 14 Jul 2023 18:41:03 GMT (envelope-from git) Date: Fri, 14 Jul 2023 18:41:03 GMT Message-Id: <202307141841.36EIf3f0019403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 60381fd1ee86 - main - memdesc: Retire MEMDESC_CCB. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60381fd1ee8668ea1e4676a6128883d987cab858 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=60381fd1ee8668ea1e4676a6128883d987cab858 commit 60381fd1ee8668ea1e4676a6128883d987cab858 Author: John Baldwin AuthorDate: 2023-07-14 18:30:31 +0000 Commit: John Baldwin CommitDate: 2023-07-14 18:32:16 +0000 memdesc: Retire MEMDESC_CCB. Instead, change memdesc_ccb to examine the CCB and return a memdesc of a more generic type describing the data buffer. Reviewed by: imp, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40880 --- sys/cam/cam.c | 72 +++++++++++++++++++++++++++ sys/kern/subr_bus_dma.c | 129 ++---------------------------------------------- sys/kern/subr_msan.c | 78 ----------------------------- sys/sys/memdesc.h | 12 +---- 4 files changed, 76 insertions(+), 215 deletions(-) diff --git a/sys/cam/cam.c b/sys/cam/cam.c index ae1286c8bc6a..ce7dc81b3495 100644 --- a/sys/cam/cam.c +++ b/sys/cam/cam.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include #include +#include #include #else /* _KERNEL */ #include @@ -571,3 +572,74 @@ cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended) ccg->cylinders = ccg->volume_size / secs_per_cylinder; ccg->ccb_h.status = CAM_REQ_CMP; } + +#ifdef _KERNEL +struct memdesc +memdesc_ccb(union ccb *ccb) +{ + struct ccb_hdr *ccb_h; + void *data_ptr; + uint32_t dxfer_len; + uint16_t sglist_cnt; + + ccb_h = &ccb->ccb_h; + switch (ccb_h->func_code) { + case XPT_SCSI_IO: { + struct ccb_scsiio *csio; + + csio = &ccb->csio; + data_ptr = csio->data_ptr; + dxfer_len = csio->dxfer_len; + sglist_cnt = csio->sglist_cnt; + break; + } + case XPT_CONT_TARGET_IO: { + struct ccb_scsiio *ctio; + + ctio = &ccb->ctio; + data_ptr = ctio->data_ptr; + dxfer_len = ctio->dxfer_len; + sglist_cnt = ctio->sglist_cnt; + break; + } + case XPT_ATA_IO: { + struct ccb_ataio *ataio; + + ataio = &ccb->ataio; + data_ptr = ataio->data_ptr; + dxfer_len = ataio->dxfer_len; + sglist_cnt = 0; + break; + } + case XPT_NVME_IO: + case XPT_NVME_ADMIN: { + struct ccb_nvmeio *nvmeio; + + nvmeio = &ccb->nvmeio; + data_ptr = nvmeio->data_ptr; + dxfer_len = nvmeio->dxfer_len; + sglist_cnt = nvmeio->sglist_cnt; + break; + } + default: + panic("%s: Unsupported func code %d", __func__, + ccb_h->func_code); + } + + switch ((ccb_h->flags & CAM_DATA_MASK)) { + case CAM_DATA_VADDR: + return (memdesc_vaddr(data_ptr, dxfer_len)); + case CAM_DATA_PADDR: + return (memdesc_paddr((vm_paddr_t)(uintptr_t)data_ptr, + dxfer_len)); + case CAM_DATA_SG: + return (memdesc_vlist(data_ptr, sglist_cnt)); + case CAM_DATA_SG_PADDR: + return (memdesc_plist(data_ptr, sglist_cnt)); + case CAM_DATA_BIO: + return (memdesc_bio(data_ptr)); + default: + panic("%s: flags 0x%X unimplemented", __func__, ccb_h->flags); + } +} +#endif diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c index 65a08aeba17c..bfaad30b37d3 100644 --- a/sys/kern/subr_bus_dma.c +++ b/sys/kern/subr_bus_dma.c @@ -304,94 +304,6 @@ bus_dmamap_load_ma_triv(bus_dma_tag_t dmat, bus_dmamap_t map, return (error); } -/* - * Load a cam control block. - */ -static int -_bus_dmamap_load_ccb(bus_dma_tag_t dmat, bus_dmamap_t map, union ccb *ccb, - int *nsegs, int flags) -{ - struct ccb_hdr *ccb_h; - void *data_ptr; - int error; - uint32_t dxfer_len; - uint16_t sglist_cnt; - - error = 0; - ccb_h = &ccb->ccb_h; - switch (ccb_h->func_code) { - case XPT_SCSI_IO: { - struct ccb_scsiio *csio; - - csio = &ccb->csio; - data_ptr = csio->data_ptr; - dxfer_len = csio->dxfer_len; - sglist_cnt = csio->sglist_cnt; - break; - } - case XPT_CONT_TARGET_IO: { - struct ccb_scsiio *ctio; - - ctio = &ccb->ctio; - data_ptr = ctio->data_ptr; - dxfer_len = ctio->dxfer_len; - sglist_cnt = ctio->sglist_cnt; - break; - } - case XPT_ATA_IO: { - struct ccb_ataio *ataio; - - ataio = &ccb->ataio; - data_ptr = ataio->data_ptr; - dxfer_len = ataio->dxfer_len; - sglist_cnt = 0; - break; - } - case XPT_NVME_IO: - case XPT_NVME_ADMIN: { - struct ccb_nvmeio *nvmeio; - - nvmeio = &ccb->nvmeio; - data_ptr = nvmeio->data_ptr; - dxfer_len = nvmeio->dxfer_len; - sglist_cnt = nvmeio->sglist_cnt; - break; - } - default: - panic("_bus_dmamap_load_ccb: Unsupported func code %d", - ccb_h->func_code); - } - - switch ((ccb_h->flags & CAM_DATA_MASK)) { - case CAM_DATA_VADDR: - error = _bus_dmamap_load_buffer(dmat, map, data_ptr, dxfer_len, - kernel_pmap, flags, NULL, nsegs); - break; - case CAM_DATA_PADDR: - error = _bus_dmamap_load_phys(dmat, map, - (vm_paddr_t)(uintptr_t)data_ptr, dxfer_len, flags, NULL, - nsegs); - break; - case CAM_DATA_SG: - error = _bus_dmamap_load_vlist(dmat, map, - (bus_dma_segment_t *)data_ptr, sglist_cnt, kernel_pmap, - nsegs, flags, 0, dxfer_len); - break; - case CAM_DATA_SG_PADDR: - error = _bus_dmamap_load_plist(dmat, map, - (bus_dma_segment_t *)data_ptr, sglist_cnt, nsegs, flags); - break; - case CAM_DATA_BIO: - error = _bus_dmamap_load_bio(dmat, map, (struct bio *)data_ptr, - nsegs, flags); - break; - default: - panic("_bus_dmamap_load_ccb: flags 0x%X unimplemented", - ccb_h->flags); - } - return (error); -} - /* * Load a uio. */ @@ -566,49 +478,18 @@ bus_dmamap_load_ccb(bus_dma_tag_t dmat, bus_dmamap_t map, union ccb *ccb, bus_dmamap_callback_t *callback, void *callback_arg, int flags) { - bus_dma_segment_t *segs; struct ccb_hdr *ccb_h; struct memdesc mem; - int error; - int nsegs; - -#ifdef KMSAN - mem = memdesc_ccb(ccb); - _bus_dmamap_load_kmsan(dmat, map, &mem); -#endif ccb_h = &ccb->ccb_h; if ((ccb_h->flags & CAM_DIR_MASK) == CAM_DIR_NONE) { callback(callback_arg, NULL, 0, 0); return (0); } - if ((flags & BUS_DMA_NOWAIT) == 0) { - mem = memdesc_ccb(ccb); - _bus_dmamap_waitok(dmat, map, &mem, callback, callback_arg); - } - nsegs = -1; - error = _bus_dmamap_load_ccb(dmat, map, ccb, &nsegs, flags); - nsegs++; - - CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", - __func__, dmat, flags, error, nsegs); - - if (error == EINPROGRESS) - return (error); - segs = _bus_dmamap_complete(dmat, map, NULL, nsegs, error); - if (error) - (*callback)(callback_arg, segs, 0, error); - else - (*callback)(callback_arg, segs, nsegs, error); - /* - * Return ENOMEM to the caller so that it can pass it up the stack. - * This error only happens when NOWAIT is set, so deferral is disabled. - */ - if (error == ENOMEM) - return (error); - - return (0); + mem = memdesc_ccb(ccb); + return (bus_dmamap_load_mem(dmat, map, &mem, callback, callback_arg, + flags)); } int @@ -702,10 +583,6 @@ bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map, error = _bus_dmamap_load_mbuf_sg(dmat, map, mem->u.md_mbuf, NULL, &nsegs, flags); break; - case MEMDESC_CCB: - error = _bus_dmamap_load_ccb(dmat, map, mem->u.md_ccb, &nsegs, - flags); - break; } nsegs++; diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 236693cfd841..756d1fca4910 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -57,9 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.14 2020/09/09 16:29:59 maxv Exp $"); #include #include -#include -#include - #include #include @@ -555,42 +552,6 @@ kmsan_mark_bio(const struct bio *bp, uint8_t c) kmsan_mark(bp->bio_data, bp->bio_length, c); } -static void -kmsan_mark_ccb(const union ccb *ccb, uint8_t c) -{ - if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_IN) - return; - if ((ccb->ccb_h.flags & CAM_DATA_MASK) != CAM_DATA_VADDR) - return; - - switch (ccb->ccb_h.func_code) { - case XPT_SCSI_IO: { - const struct ccb_scsiio *scsiio; - - scsiio = &ccb->ctio; - kmsan_mark(scsiio->data_ptr, scsiio->dxfer_len, c); - break; - } - case XPT_ATA_IO: { - const struct ccb_ataio *ataio; - - ataio = &ccb->ataio; - kmsan_mark(ataio->data_ptr, ataio->dxfer_len, c); - break; - } - case XPT_NVME_IO: { - const struct ccb_nvmeio *nvmeio; - - nvmeio = &ccb->nvmeio; - kmsan_mark(nvmeio->data_ptr, nvmeio->dxfer_len, c); - break; - } - default: - kmsan_panic("%s: unhandled CCB type %d", __func__, - ccb->ccb_h.func_code); - } -} - void kmsan_mark_mbuf(const struct mbuf *m, uint8_t c) { @@ -613,39 +574,6 @@ kmsan_check_bio(const struct bio *bp, const char *descr) kmsan_shadow_check((uintptr_t)bp->bio_data, bp->bio_length, descr); } -void -kmsan_check_ccb(const union ccb *ccb, const char *descr) -{ - if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_OUT) - return; - switch (ccb->ccb_h.func_code) { - case XPT_SCSI_IO: { - const struct ccb_scsiio *scsiio; - - scsiio = &ccb->ctio; - kmsan_check(scsiio->data_ptr, scsiio->dxfer_len, descr); - break; - } - case XPT_ATA_IO: { - const struct ccb_ataio *ataio; - - ataio = &ccb->ataio; - kmsan_check(ataio->data_ptr, ataio->dxfer_len, descr); - break; - } - case XPT_NVME_IO: { - const struct ccb_nvmeio *nvmeio; - - nvmeio = &ccb->nvmeio; - kmsan_check(nvmeio->data_ptr, nvmeio->dxfer_len, descr); - break; - } - default: - kmsan_panic("%s: unhandled CCB type %d", __func__, - ccb->ccb_h.func_code); - } -} - void kmsan_check_mbuf(const struct mbuf *m, const char *descr) { @@ -1586,9 +1514,6 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) case MEMDESC_MBUF: kmsan_check_mbuf(desc->u.md_mbuf, "dmasync"); break; - case MEMDESC_CCB: - kmsan_check_ccb(desc->u.md_ccb, "dmasync"); - break; case 0: break; default: @@ -1608,9 +1533,6 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) case MEMDESC_MBUF: kmsan_mark_mbuf(desc->u.md_mbuf, KMSAN_STATE_INITED); break; - case MEMDESC_CCB: - kmsan_mark_ccb(desc->u.md_ccb, KMSAN_STATE_INITED); - break; case 0: break; default: diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index 68dc83d03ef0..1c92ae5b1eb5 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -49,7 +49,6 @@ struct memdesc { struct bio *md_bio; struct uio *md_uio; struct mbuf *md_mbuf; - union ccb *md_ccb; } u; size_t md_opaque; /* type specific data. */ uint32_t md_type; /* Type of memory. */ @@ -62,7 +61,6 @@ struct memdesc { #define MEMDESC_BIO 5 /* Pointer to a bio (block io). */ #define MEMDESC_UIO 6 /* Pointer to a uio (any io). */ #define MEMDESC_MBUF 7 /* Pointer to a mbuf (network io). */ -#define MEMDESC_CCB 8 /* Cam control block. (scsi/ata io). */ static inline struct memdesc memdesc_vaddr(void *vaddr, size_t len) @@ -145,14 +143,6 @@ memdesc_mbuf(struct mbuf *mbuf) return (mem); } -static inline struct memdesc -memdesc_ccb(union ccb *ccb) -{ - struct memdesc mem; +struct memdesc memdesc_ccb(union ccb *ccb); - mem.u.md_ccb = ccb; - mem.md_type = MEMDESC_CCB; - - return (mem); -} #endif /* _SYS_MEMDESC_H_ */ From nobody Fri Jul 14 18:41:04 2023 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 4R2gKY1FXBz4mpps; Fri, 14 Jul 2023 18:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2gKX6NkKz4K48; Fri, 14 Jul 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4rqVRR/4NaResodZnvPZZ1voCskfKMiSFaANncZ678=; b=M+YvuylZM06L4yUBvkE8HNR7VSk/49qDhsoYcMQmUC68nJ8WKRDUEqyWhVUVEqLV6wySiW MKQtny6Np4nS6Nx3ip0W/ThqHZy9qHhEom2lW3T9zclTH9LQmGM8wzAOcyxNEQRnU3IUaG 7RWEh2PU6sflJanVwdyLMzsLbfnMeBXtmbF4btvIKSzK/DfMd9WZRN0Id9rKE1iKLWHFab DlvxBEBVR0tCKAjoGSvuKdlyvhIj43PG3hd38dFy6oasFbWKRfNwHQhfjvku2tPesUjGDx tVNg0eyW/TZeggtZ9eVxwTvfCi8C3IMsuVnLNfQnUa83JKH5kZX9kyCGae2evw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4rqVRR/4NaResodZnvPZZ1voCskfKMiSFaANncZ678=; b=kYnHlkc33qdKgfVH8zMjg22IQQgJcfRu7ZILG3YTf7UqJ+Nan7oDeNoFDhUOUclKp1nprf RUr2qWxkBo+dxE6ccfDPQasty+E9DuCU3Wk0287KDP2WRMsN7bk8diuyxBJLyPdpRiBiQW JCOYryeArCOswhZcQ1aH3Uy1kLTs8nC6GAqugYTxEspztS9wsJDp5QP/U3TVH2qekT9YMK uV4FI/sHZ6J3LjOZGAvxjZ0MQAOs2HWLMnQ+hDANGsEDvE5oe8rWU9WWxxzWc8t+6ErP7V NZTn2Ygkc20vE+cAM7NoZVmIIixB4JN4dhpjK/xjj0qBTFPvPSvHDQhXBRNrBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689360064; a=rsa-sha256; cv=none; b=TfwC4cisUPtYu8xiKxda4dsfCPDzjPHdtJdNEka5jxziFKYiRwRX8O76I7rsaqL4UKsQVM QjP7hG6lVEWCuQoQInQlXF2v1bUy7WRoQrtctch5eYSsqNO4jBBsffnGDEQQYIXuq6/Kh2 z8okOdHm7licX4+PGe9kHsM2TGDC349jiRjNglPAx0LvxHDlRnDg7RVlERPSkOamrJ1WkS vyo4tNhbqXYwrD4yTsUGZL2+ouR/sNTsQ78q4jUwte1qaT5toRl0uCUHegfx42/K9LVOPR a3ptGra0w3as4kJEylzk6liDxYuyl2y0+4qXj4qHpD0YssEk/deXYs20m4IgOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2gKX5JdHzTQb; Fri, 14 Jul 2023 18:41:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EIf4xh019424; Fri, 14 Jul 2023 18:41:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EIf4Pn019423; Fri, 14 Jul 2023 18:41:04 GMT (envelope-from git) Date: Fri, 14 Jul 2023 18:41:04 GMT Message-Id: <202307141841.36EIf4Pn019423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3dba010e4902 - main - memdesc: Replace md_opaque with a union of type-specific fields. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dba010e4902b2e9106f1cc52967c5c71fcc25ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3dba010e4902b2e9106f1cc52967c5c71fcc25ab commit 3dba010e4902b2e9106f1cc52967c5c71fcc25ab Author: John Baldwin AuthorDate: 2023-07-14 18:30:57 +0000 Commit: John Baldwin CommitDate: 2023-07-14 18:32:21 +0000 memdesc: Replace md_opaque with a union of type-specific fields. Reviewed by: imp, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41027 --- sys/kern/subr_bus_dma.c | 8 ++++---- sys/kern/subr_msan.c | 4 ++-- sys/sys/memdesc.h | 13 ++++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c index bfaad30b37d3..329887affc99 100644 --- a/sys/kern/subr_bus_dma.c +++ b/sys/kern/subr_bus_dma.c @@ -557,19 +557,19 @@ bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map, switch (mem->md_type) { case MEMDESC_VADDR: error = _bus_dmamap_load_buffer(dmat, map, mem->u.md_vaddr, - mem->md_opaque, kernel_pmap, flags, NULL, &nsegs); + mem->md_len, kernel_pmap, flags, NULL, &nsegs); break; case MEMDESC_PADDR: error = _bus_dmamap_load_phys(dmat, map, mem->u.md_paddr, - mem->md_opaque, flags, NULL, &nsegs); + mem->md_len, flags, NULL, &nsegs); break; case MEMDESC_VLIST: error = _bus_dmamap_load_vlist(dmat, map, mem->u.md_list, - mem->md_opaque, kernel_pmap, &nsegs, flags, 0, SIZE_T_MAX); + mem->md_nseg, kernel_pmap, &nsegs, flags, 0, SIZE_T_MAX); break; case MEMDESC_PLIST: error = _bus_dmamap_load_plist(dmat, map, mem->u.md_list, - mem->md_opaque, &nsegs, flags); + mem->md_nseg, &nsegs, flags); break; case MEMDESC_BIO: error = _bus_dmamap_load_bio(dmat, map, mem->u.md_bio, diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 756d1fca4910..ec2492773243 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -1505,7 +1505,7 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) BUS_DMASYNC_PREWRITE) { switch (desc->md_type) { case MEMDESC_VADDR: - kmsan_check(desc->u.md_vaddr, desc->md_opaque, + kmsan_check(desc->u.md_vaddr, desc->md_len, "dmasync"); break; case MEMDESC_BIO: @@ -1524,7 +1524,7 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) if ((op & BUS_DMASYNC_POSTREAD) != 0) { switch (desc->md_type) { case MEMDESC_VADDR: - kmsan_mark(desc->u.md_vaddr, desc->md_opaque, + kmsan_mark(desc->u.md_vaddr, desc->md_len, KMSAN_STATE_INITED); break; case MEMDESC_BIO: diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index 1c92ae5b1eb5..58aafb2a1f1b 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -50,7 +50,10 @@ struct memdesc { struct uio *md_uio; struct mbuf *md_mbuf; } u; - size_t md_opaque; /* type specific data. */ + union { /* type specific data. */ + size_t md_len; /* VADDR, PADDR */ + int md_nseg; /* VLIST, PLIST */ + }; uint32_t md_type; /* Type of memory. */ }; @@ -68,7 +71,7 @@ memdesc_vaddr(void *vaddr, size_t len) struct memdesc mem; mem.u.md_vaddr = vaddr; - mem.md_opaque = len; + mem.md_len = len; mem.md_type = MEMDESC_VADDR; return (mem); @@ -80,7 +83,7 @@ memdesc_paddr(vm_paddr_t paddr, size_t len) struct memdesc mem; mem.u.md_paddr = paddr; - mem.md_opaque = len; + mem.md_len = len; mem.md_type = MEMDESC_PADDR; return (mem); @@ -92,7 +95,7 @@ memdesc_vlist(struct bus_dma_segment *vlist, int sglist_cnt) struct memdesc mem; mem.u.md_list = vlist; - mem.md_opaque = sglist_cnt; + mem.md_nseg = sglist_cnt; mem.md_type = MEMDESC_VLIST; return (mem); @@ -104,7 +107,7 @@ memdesc_plist(struct bus_dma_segment *plist, int sglist_cnt) struct memdesc mem; mem.u.md_list = plist; - mem.md_opaque = sglist_cnt; + mem.md_nseg = sglist_cnt; mem.md_type = MEMDESC_PLIST; return (mem); From nobody Fri Jul 14 18:41:05 2023 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 4R2gKZ0crVz4mphC; Fri, 14 Jul 2023 18:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2gKY6v0bz4K4Q; Fri, 14 Jul 2023 18:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3yNRxaafOP+uvTuWSj1uKDajWw1mnh1TmRy2pkcfMM=; b=nuzM8H/cgW3yJKveSVdV4HxIMSin4SIv7EZ7+ycK7c8gkNnMCkbi3An36q0nayyT6eC0Pu KWheMSWey5u4IT01A3p1lRcviww6a5Rh5YSlj8c2kNYxib3LxFLVBoK0jsjGpDeEfQcvnY vpaw2t2FHmUidyDysXTicgs5OknFzhBbSy0b68rqPyBIcJ8jLQYrRzeoFW52cyy3wylT4u RbJbQiOC6SFUcBpwTzW3bbSqHAoGVt2y1cXZjnWxNwsFHoWzsRn/wPqeOZSr9VqJSmIWD4 Bug1Ncv/7dRknSchQ3xJ3RexSGL0+M/NsmUlMqEUbOh7QxZdN4GRGiJRQjtD9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W3yNRxaafOP+uvTuWSj1uKDajWw1mnh1TmRy2pkcfMM=; b=ZgdS82y8k+m9mSb6usAKcpWePL9H6jlVx9U/7DA/q0k26evizSl/+wQoAth0uRzzP2y9GL tUT9qt5WCtVP0dIIViWK+FiQP2qN9dr+JmkyTlDq6RFq7I5y5BztG0lwBLkcEElGC+3WEP ttReY+dTg6TLVq/3BFJw0ekh7+660/2gbgnjF1M9j2L2lvlg5nKAK/eseqfG2ECTlYnwAI m9mVEp20dwuEolTDx6wGcvhCg862c9qmQ+yqxBbf/z4xBzYlHCGXeSCVqFciqDy6FtYcVc +QPuO8EpXQxHo1M7i56SORy0xZ3E9Az72BQfrpM3diiMJRyLpd1mEgdMxSQ2gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689360066; a=rsa-sha256; cv=none; b=w19Z6FUME42hmEXEsvRhs4fkRdIDTYPqr978siW3YLSirQCkoQOaHGmDJMfTgVlHErnE81 swY50TJL93Qtha64D5I8NE0Tkrlo6IDewlXFBIyq1GnsLklMDqHbhexR9IMpuowdEwlCr0 bA1kpuv9KKQj/fxTd165yQb0/m78V7qp1z8Z7LbnSHQMGjuAhp3WlMCzz9Pyf4Q6zkvbzy PbAduXkZzZQhYJijf8xKo2WFBbf1POaFzgM8o2mFrUOi1nkhHB7TIh69I09Rc5WJDHjtzb DRyduEsGBqdEuf4wl1XcexqxhJLxYx9f62QeBBDRYMhiIXmCCp1vz++bmbxtxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2gKY5zwGzTNX; Fri, 14 Jul 2023 18:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EIf5r0019443; Fri, 14 Jul 2023 18:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EIf5dS019442; Fri, 14 Jul 2023 18:41:05 GMT (envelope-from git) Date: Fri, 14 Jul 2023 18:41:05 GMT Message-Id: <202307141841.36EIf5dS019442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bab38b44dd11 - main - memdesc: Add a MEMDESC_VMPAGES descriptor type. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bab38b44dd119fc9e8773b68e888cdcbc9564c55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bab38b44dd119fc9e8773b68e888cdcbc9564c55 commit bab38b44dd119fc9e8773b68e888cdcbc9564c55 Author: John Baldwin AuthorDate: 2023-07-14 18:31:42 +0000 Commit: John Baldwin CommitDate: 2023-07-14 18:32:24 +0000 memdesc: Add a MEMDESC_VMPAGES descriptor type. This memory descriptor is backed by an array of VM pages. This type requires adding a new field to 'struct memdesc' to hold the offset within the first page. For LP64 systems, this new field is added in an existing padding hole so does not increase the size. For ILP32 systems, this grows 'struct memdesc' from 12 to 16 bytes. Reviewed by: imp, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41028 --- sys/kern/subr_bus_dma.c | 4 ++++ sys/sys/memdesc.h | 21 ++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c index 329887affc99..0ff57c389fb1 100644 --- a/sys/kern/subr_bus_dma.c +++ b/sys/kern/subr_bus_dma.c @@ -583,6 +583,10 @@ bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map, error = _bus_dmamap_load_mbuf_sg(dmat, map, mem->u.md_mbuf, NULL, &nsegs, flags); break; + case MEMDESC_VMPAGES: + error = _bus_dmamap_load_ma(dmat, map, mem->u.md_ma, + mem->md_len, mem->md_offset, flags, NULL, &nsegs); + break; } nsegs++; diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index 58aafb2a1f1b..d31b04f32393 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -35,6 +35,7 @@ struct bio; struct bus_dma_segment; struct uio; struct mbuf; +struct vm_page; union ccb; /* @@ -49,11 +50,15 @@ struct memdesc { struct bio *md_bio; struct uio *md_uio; struct mbuf *md_mbuf; + struct vm_page **md_ma; } u; union { /* type specific data. */ - size_t md_len; /* VADDR, PADDR */ + size_t md_len; /* VADDR, PADDR, VMPAGES */ int md_nseg; /* VLIST, PLIST */ }; + union { + uint32_t md_offset; /* VMPAGES */ + }; uint32_t md_type; /* Type of memory. */ }; @@ -64,6 +69,7 @@ struct memdesc { #define MEMDESC_BIO 5 /* Pointer to a bio (block io). */ #define MEMDESC_UIO 6 /* Pointer to a uio (any io). */ #define MEMDESC_MBUF 7 /* Pointer to a mbuf (network io). */ +#define MEMDESC_VMPAGES 8 /* Pointer to array of VM pages. */ static inline struct memdesc memdesc_vaddr(void *vaddr, size_t len) @@ -146,6 +152,19 @@ memdesc_mbuf(struct mbuf *mbuf) return (mem); } +static inline struct memdesc +memdesc_vmpages(struct vm_page **ma, size_t len, u_int ma_offset) +{ + struct memdesc mem; + + mem.u.md_ma = ma; + mem.md_len = len; + mem.md_type = MEMDESC_VMPAGES; + mem.md_offset = ma_offset; + + return (mem); +} + struct memdesc memdesc_ccb(union ccb *ccb); #endif /* _SYS_MEMDESC_H_ */ From nobody Fri Jul 14 18:41:06 2023 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 4R2gKb3HPmz4mpw3; Fri, 14 Jul 2023 18:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2gKb1jJlz4KPs; Fri, 14 Jul 2023 18:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u27uJkYjG1RpSKNYHFDutU+/x3hOmA3eDG+L2okWJAE=; b=ukvTdjrtoQZ0ZxEPW5twXm4WGYxrhnAkbKAnrhC7FarKiWM0G0ku7ZWvOuJbumYljyHh2M V9cvmMqOHFtzsV42vC+Blgv3DUHSO1WssuOwyZ/DRdW88j1nhxYPgo5Y67aR9V/XObm4ys aH/JdKJSy1JwwYHT0lPjghE26BLrojTSJ6xjyWBsvVI5l77JOVllBz1BYe/PAyNP9krMQ3 JkvvhhKH6Q3TJpG7srb5ruhDcjMWsCoTKDfsN4iBaG7Q6C6ev1gFzV/yv5dvdilNcwyZqR l/9tOQ1ZH6/sUtWBYs1/HP6yggJf8RJiT/jyiyvuQGH5QiqDxqW+9/fzYJS7IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689360067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u27uJkYjG1RpSKNYHFDutU+/x3hOmA3eDG+L2okWJAE=; b=JL9khXWTx2H1rP99qdvVz3/nSd/g7OOkM9f5dlYPTqXc4hZ7ycG6QBqgTlfRNFxdI17c1Q NOGcqqGjEkpDabvQpzfavwb+vW/Denhw11O8r1nrEB8U20oMR0n1CCliH9DzZkG6QY1YmT Sb4fsUgTFODdzn0VFt65uCv1qO0dLqhBciGegd4fKBZPANgKKqrX2P8yLNVDfFk9JQxFu8 kp9KGb/zrD05oboogngS7YlBHheCIOWqDTg5DaRGZPVuN64SqQj2cU1CDxj7ZUahl7PFzB BNt8z6cdd4hkOsOlWmRaPnItr8wUbazFjIaPmqK5Tx66Lb24A13Io9Id4MO5jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689360067; a=rsa-sha256; cv=none; b=QTyelnycKA3QwsLmTlpYP/WTtRvWXO0+mirToQV2pAKVYyVKUoBse1Lqq1Y93QppgNEVbj +6BYXQrgUg63qxCqVCUF3BKErY9hX7kfVGVFCyXAwLt/piQVFv68jKXz11CZjnSF55fIsG T3JohmrSnn/8PnEn2fyuWIJUA+o1vhbDr/h/90stI2Af+N/plX909L4RuOkk0gHFZ5KQKF K5jtVw7p1/PlaajQnMi6vHwdquQviRkTddAxK9+1fL9bNhC8Y/lcYcygtBxh98Z6YFM7lq U6vuU2acgas1jgvfEZXHR6yUJ1Snc74bbu11lAi9jx4IG3eNI5RbxHl3kHUSqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2gKb056WzTQc; Fri, 14 Jul 2023 18:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EIf6wU019462; Fri, 14 Jul 2023 18:41:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EIf6IL019461; Fri, 14 Jul 2023 18:41:06 GMT (envelope-from git) Date: Fri, 14 Jul 2023 18:41:06 GMT Message-Id: <202307141841.36EIf6IL019461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c9b19803946e - main - memdesc: Retire MEMDESC_BIO. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9b19803946e0dc74a54a1dcbf71a2837c979388 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b19803946e0dc74a54a1dcbf71a2837c979388 commit c9b19803946e0dc74a54a1dcbf71a2837c979388 Author: John Baldwin AuthorDate: 2023-07-14 18:32:40 +0000 Commit: John Baldwin CommitDate: 2023-07-14 18:32:40 +0000 memdesc: Retire MEMDESC_BIO. Instead, change memdesc_bio to examine the bio and return a memdesc of a more generic type describing the data buffer. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41029 --- sys/kern/subr_bus_dma.c | 64 ++----------------------------------------------- sys/kern/subr_msan.c | 6 ----- sys/kern/vfs_bio.c | 15 ++++++++++++ sys/sys/memdesc.h | 14 +---------- 4 files changed, 18 insertions(+), 81 deletions(-) diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c index 0ff57c389fb1..da7a2ee4cdc9 100644 --- a/sys/kern/subr_bus_dma.c +++ b/sys/kern/subr_bus_dma.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -259,29 +258,6 @@ _bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map, return (error); } -/* - * Load from block io. - */ -static int -_bus_dmamap_load_bio(bus_dma_tag_t dmat, bus_dmamap_t map, struct bio *bio, - int *nsegs, int flags) -{ - - if ((bio->bio_flags & BIO_VLIST) != 0) { - bus_dma_segment_t *segs = (bus_dma_segment_t *)bio->bio_data; - return (_bus_dmamap_load_vlist(dmat, map, segs, bio->bio_ma_n, - kernel_pmap, nsegs, flags, bio->bio_ma_offset, - bio->bio_bcount)); - } - - if ((bio->bio_flags & BIO_UNMAPPED) != 0) - return (_bus_dmamap_load_ma(dmat, map, bio->bio_ma, - bio->bio_bcount, bio->bio_ma_offset, flags, NULL, nsegs)); - - return (_bus_dmamap_load_buffer(dmat, map, bio->bio_data, - bio->bio_bcount, kernel_pmap, flags, NULL, nsegs)); -} - int bus_dmamap_load_ma_triv(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags, @@ -497,43 +473,11 @@ bus_dmamap_load_bio(bus_dma_tag_t dmat, bus_dmamap_t map, struct bio *bio, bus_dmamap_callback_t *callback, void *callback_arg, int flags) { - bus_dma_segment_t *segs; struct memdesc mem; - int error; - int nsegs; -#ifdef KMSAN mem = memdesc_bio(bio); - _bus_dmamap_load_kmsan(dmat, map, &mem); -#endif - - if ((flags & BUS_DMA_NOWAIT) == 0) { - mem = memdesc_bio(bio); - _bus_dmamap_waitok(dmat, map, &mem, callback, callback_arg); - } - nsegs = -1; - error = _bus_dmamap_load_bio(dmat, map, bio, &nsegs, flags); - nsegs++; - - CTR5(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d nsegs %d", - __func__, dmat, flags, error, nsegs); - - if (error == EINPROGRESS) - return (error); - - segs = _bus_dmamap_complete(dmat, map, NULL, nsegs, error); - if (error) - (*callback)(callback_arg, segs, 0, error); - else - (*callback)(callback_arg, segs, nsegs, error); - /* - * Return ENOMEM to the caller so that it can pass it up the stack. - * This error only happens when NOWAIT is set, so deferral is disabled. - */ - if (error == ENOMEM) - return (error); - - return (0); + return (bus_dmamap_load_mem(dmat, map, &mem, callback, callback_arg, + flags)); } int @@ -571,10 +515,6 @@ bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map, error = _bus_dmamap_load_plist(dmat, map, mem->u.md_list, mem->md_nseg, &nsegs, flags); break; - case MEMDESC_BIO: - error = _bus_dmamap_load_bio(dmat, map, mem->u.md_bio, - &nsegs, flags); - break; case MEMDESC_UIO: error = _bus_dmamap_load_uio(dmat, map, mem->u.md_uio, &nsegs, flags); diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index ec2492773243..ba625a5405c5 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -1508,9 +1508,6 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) kmsan_check(desc->u.md_vaddr, desc->md_len, "dmasync"); break; - case MEMDESC_BIO: - kmsan_check_bio(desc->u.md_bio, "dmasync"); - break; case MEMDESC_MBUF: kmsan_check_mbuf(desc->u.md_mbuf, "dmasync"); break; @@ -1527,9 +1524,6 @@ kmsan_bus_dmamap_sync(struct memdesc *desc, bus_dmasync_op_t op) kmsan_mark(desc->u.md_vaddr, desc->md_len, KMSAN_STATE_INITED); break; - case MEMDESC_BIO: - kmsan_mark_bio(desc->u.md_bio, KMSAN_STATE_INITED); - break; case MEMDESC_MBUF: kmsan_mark_mbuf(desc->u.md_mbuf, KMSAN_STATE_INITED); break; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 98b267f89737..690dd97e708c 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -5233,6 +5234,20 @@ bdata2bio(struct buf *bp, struct bio *bip) } } +struct memdesc +memdesc_bio(struct bio *bio) +{ + if ((bio->bio_flags & BIO_VLIST) != 0) + return (memdesc_vlist((struct bus_dma_segment *)bio->bio_data, + bio->bio_ma_n)); + + if ((bio->bio_flags & BIO_UNMAPPED) != 0) + return (memdesc_vmpages(bio->bio_ma, bio->bio_bcount, + bio->bio_ma_offset)); + + return (memdesc_vaddr(bio->bio_data, bio->bio_bcount)); +} + static int buf_pager_relbuf; SYSCTL_INT(_vfs, OID_AUTO, buf_pager_relbuf, CTLFLAG_RWTUN, &buf_pager_relbuf, 0, diff --git a/sys/sys/memdesc.h b/sys/sys/memdesc.h index d31b04f32393..9054e2674409 100644 --- a/sys/sys/memdesc.h +++ b/sys/sys/memdesc.h @@ -47,7 +47,6 @@ struct memdesc { void *md_vaddr; vm_paddr_t md_paddr; struct bus_dma_segment *md_list; - struct bio *md_bio; struct uio *md_uio; struct mbuf *md_mbuf; struct vm_page **md_ma; @@ -66,7 +65,6 @@ struct memdesc { #define MEMDESC_PADDR 2 /* Contiguous physical address. */ #define MEMDESC_VLIST 3 /* scatter/gather list of kva addresses. */ #define MEMDESC_PLIST 4 /* scatter/gather list of physical addresses. */ -#define MEMDESC_BIO 5 /* Pointer to a bio (block io). */ #define MEMDESC_UIO 6 /* Pointer to a uio (any io). */ #define MEMDESC_MBUF 7 /* Pointer to a mbuf (network io). */ #define MEMDESC_VMPAGES 8 /* Pointer to array of VM pages. */ @@ -119,17 +117,6 @@ memdesc_plist(struct bus_dma_segment *plist, int sglist_cnt) return (mem); } -static inline struct memdesc -memdesc_bio(struct bio *bio) -{ - struct memdesc mem; - - mem.u.md_bio = bio; - mem.md_type = MEMDESC_BIO; - - return (mem); -} - static inline struct memdesc memdesc_uio(struct uio *uio) { @@ -165,6 +152,7 @@ memdesc_vmpages(struct vm_page **ma, size_t len, u_int ma_offset) return (mem); } +struct memdesc memdesc_bio(struct bio *bio); struct memdesc memdesc_ccb(union ccb *ccb); #endif /* _SYS_MEMDESC_H_ */ From nobody Fri Jul 14 20:27:34 2023 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 4R2jhQ3wPHz4mb0V; Fri, 14 Jul 2023 20:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2jhQ3VKLz3DtB; Fri, 14 Jul 2023 20:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689366454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhKER+ulRzilk+9aqN6ZwdMqG+C2BwAtz5y85iSUslY=; b=QrxbfObzxOyh6BhVcLvGkrlV9fsjEAQ5dUoLCjZJLtkz+IVAOlgok34mGzE8pHhIzLHD00 7eOjMXVPtbfSI2Ed+SicEGfCi5CDIQH4wPjY5MsNgyGX8iIG6YKbh9Bs+1S8BjiaN7YYYe wmSoZeNHw6v/fxhR0RAVN33obfmBgvXNFh6uuI8ylBgTQ2v+jrv9Ngo7IdzoSDhG17GN9W rmyA9uIOWQewKBESStddSQfBtGCqnsTw6teCxaQhLE0ZOuHm4ajWbxn+LYsnbshVlStuhb JqzOWAUiDBwhw9ZuHaF+c9vyWtLlls9Ulh4qeWuGsEUj2P8w6yvvbex22G6Xhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689366454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XhKER+ulRzilk+9aqN6ZwdMqG+C2BwAtz5y85iSUslY=; b=n53zpkcAuFr1iWSzNl+/BJ4jnDH06D1F0kegaGMKS0Rm2KQfvuRwFoyoKL1Hzv2la+lpzO NG4vnl128LGNvXs+ORhM6IvvSfSMEODx0Ve1Z2l3mydOmF0gkzKlZp+WAdj23/WhspBjUM PTF53h91EJtubS2W6922i8vIv3RCPuYHvJmD32G3bWGQ3qXIn4o6+v8jSwPmc7eWNemi0y HV73DMkw19pf1h4SykRE/8q+K++LUnF0t+yZ+zu1E9QcglaHlkmctL2emq4gBUSrFYe8Df IZ7ke0tloVBlmBJUeL0BrQyPaCwBhCBPa9puIOEQOSLGoqcMZkVNkRKlW9RS9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689366454; a=rsa-sha256; cv=none; b=g61u9zBl8raRh4+HZIgob8y/rhtEX7HyCNHghOtFeJkf57Wk1/FTvlN8/gtFCBrlnRcSei HTlZ3dzbwAxa0Kh+9i0Dn/EQd9LH/k+gc3IspQ05Lj5sC5uNlccQjWhQU0bmew+jpwuICk nlWdniC/ZdgOe01fIuRGyQoOkhT61kuhL8zFvabGD/mOZQFxxiT4NfJnNHHU7e3csg/yT0 8XhHkDoNWohwNBkXVs1Z6Y+AYEvS8c8C7SLJSQ4D0nv3jqCtTuTdGOb2RPCl6St7xfNLUq MlOnxSfzagsUPSZ/1+hXz7uJQbFLpkk3FDmV8vmQm1MQZXmVnhuefuSWugvEzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2jhQ2YCpzXR7; Fri, 14 Jul 2023 20:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EKRYVT093511; Fri, 14 Jul 2023 20:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EKRYmh093510; Fri, 14 Jul 2023 20:27:34 GMT (envelope-from git) Date: Fri, 14 Jul 2023 20:27:34 GMT Message-Id: <202307142027.36EKRYmh093510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: e74bc7757a2e - main - lib/libc/string/ffs*.c: fix problems introduced with D40730 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e74bc7757a2ec538c5070973dbd83394933d4bfe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=e74bc7757a2ec538c5070973dbd83394933d4bfe commit e74bc7757a2ec538c5070973dbd83394933d4bfe Author: Kyle Evans AuthorDate: 2023-07-07 18:59:26 +0000 Commit: Robert Clausecker CommitDate: 2023-07-14 20:23:31 +0000 lib/libc/string/ffs*.c: fix problems introduced with D40730 Remove stale dependencies on the remaining old assembly ffs*/fls* implementations. Sponsored by: FreeBSD Foundation Reported by: jlduran@gmail.com, jhb Fixes: ee8b0c43 (D40730) Approved by: jhb Differential Revision: https://reviews.freebsd.org/D40966 --- tools/build/depend-cleanup.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b9b38b4ed3e6..39ab518d5dc9 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -189,5 +189,10 @@ if [ -f "$OBJTOP"/secure/lib/libcrypto/aria.o ]; then "$OBJTOP"/obj-lib32/secure/lib/libssl fi -# 20230711 ee8b0c436d72 replace ffs/fls implementations with clang builtins -clean_dep lib/libc ffs S +# 20230714 ee8b0c436d72 replace ffs/fls implementations with clang builtins +clean_dep lib/libc ffs S +clean_dep lib/libc ffsl S +clean_dep lib/libc ffsll S +clean_dep lib/libc fls S +clean_dep lib/libc flsl S +clean_dep lib/libc flsll S From nobody Fri Jul 14 20:27:35 2023 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 4R2jhR5Ghkz4mb5N; Fri, 14 Jul 2023 20:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2jhR4RfFz3DpH; Fri, 14 Jul 2023 20:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689366455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSJpmTYkJIpoQ5L3dMsjpSe2vZPPnBr2SphG/AFg364=; b=Ua6cuHdqWT7UUpwHQPA4/YWzUTi5DdLGLSes80BRzjr0Ht2NzJRbFLGXPaZruwzs7FJcB6 ZuYfiaYm95jiElohERaa4NeRyeRvSQPQH0ZUyCtG0HY1ZljW/gsUW04GET/BsvtVHdTd2v UobXt2YcejKkuUGes7ndMm9mCxyCkZd0LsiyS5ZEll9Z7odxrSG0/qb4rQ6fapHGko3psd T19zX/KCqDUaTEWR8Y9lRyFj3OY/KMtiaaMNAb7TZByJ6iMsuT15bzdcU+3aaS5KTIl3qB +31lvZW4FtSRyhNGbgsrZjq+vlxY7yuxHFcylwAff1TrbDoODoR2a44FIufiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689366455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSJpmTYkJIpoQ5L3dMsjpSe2vZPPnBr2SphG/AFg364=; b=L9DfRIwyzs/WsjHAATBaVYLuOcQEox/JOnF0xudBIcxMl536aicgpFbhjIDM71BZEqDx79 3uRR8kHtF8Skb//940dieyLig6qBDWtOWw0R8oZiiOBFqBCghkT05Ya79Ms23K3Ckwl/yp ICQDWN4kJqVD1zqQki8vf7fPXWqweSPpZ9h5wxZaX3ihEASPqNpEbcOi6S3dSiS8HlLFI+ z/t2XjpAr4enFxrWh3kY/PbRCYoMvQHkyz+3cD21V855YWQhpjnnh4HAJZWpxnW7ZnUrnw 73WsOCJvr4J5wNJnZQwQ8Emf7IOtAvEp8kHeMYAdOKN7BjHnjkO3FROho3AOCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689366455; a=rsa-sha256; cv=none; b=nC5AauqQAGmlAw6sr+nif0VJp4DRlP/0ned3IGbCVLU11vFzaksDIKlS3Ti7/Lq+qQhpsi 9sPHccgFCynfPML3VpL/qOrOGvjLW3Kb9YcG0hVStMH6FOslZDuTL6Mq0QY2DF3FaKXOL4 4s0B+MgtwOcrBB+DyOj39jWdOYTUmJv+GKwccnof/s+bUwCGsr3un9BCmpy8zI2SHqFpCg 1vplS0TNRcodJZTw96UPeFtGLPK4cTEqqPgD45tQLnIdMJZzh+ZNpXk9EHcijsje9TyQcw ti+ApLz6bAyhELd83yJnUbB9kz4CJGiCrbV5IOijUBU+7Ds0fPFUH+vYxdDiJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2jhR3RB9zXR8; Fri, 14 Jul 2023 20:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36EKRZ64093532; Fri, 14 Jul 2023 20:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EKRZa8093531; Fri, 14 Jul 2023 20:27:35 GMT (envelope-from git) Date: Fri, 14 Jul 2023 20:27:35 GMT Message-Id: <202307142027.36EKRZa8093531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 3f5788e0ed8e - main - lib/libc/string/ffs*.c: work around gcc warning 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f5788e0ed8e85567f651ad360596b8c330af5a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5788e0ed8e85567f651ad360596b8c330af5a9 commit 3f5788e0ed8e85567f651ad360596b8c330af5a9 Author: Robert Clausecker AuthorDate: 2023-07-10 22:10:52 +0000 Commit: Robert Clausecker CommitDate: 2023-07-14 20:26:43 +0000 lib/libc/string/ffs*.c: work around gcc warning Gcc warns of infinite recursion if we use __builtin_ffs*() to implement ffs*(). This is because gcc uses ffs() to implement these on some platforms. Sidestep the warning by using __builtin_ctz*() for these. Sponsored by: FreeBSD Foundation Reported by: jlduran@gmail.com, jhb Fixes: ee8b0c43 (D40730) Reviewed by: jhb, mhorne Approved by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40966 --- lib/libc/string/ffs.c | 2 +- lib/libc/string/ffsl.c | 2 +- lib/libc/string/ffsll.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c index c011b3390612..34140e3e4d85 100644 --- a/lib/libc/string/ffs.c +++ b/lib/libc/string/ffs.c @@ -47,5 +47,5 @@ __FBSDID("$FreeBSD$"); int ffs(int mask) { - return (__builtin_ffs(mask)); + return (mask == 0 ? 0 : __builtin_ctz(mask) + 1); } diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c index 6e1ac8ec45c1..701e23cdf8f4 100644 --- a/lib/libc/string/ffsl.c +++ b/lib/libc/string/ffsl.c @@ -44,5 +44,5 @@ __FBSDID("$FreeBSD$"); int ffsl(long mask) { - return (__builtin_ffsl(mask)); + return (mask == 0 ? 0 : __builtin_ctzl(mask) + 1); } diff --git a/lib/libc/string/ffsll.c b/lib/libc/string/ffsll.c index b945658b9008..e94fb518eb03 100644 --- a/lib/libc/string/ffsll.c +++ b/lib/libc/string/ffsll.c @@ -44,5 +44,5 @@ __FBSDID("$FreeBSD$"); int ffsll(long long mask) { - return (__builtin_ffsll(mask)); + return (mask == 0 ? 0 : __builtin_ctzll(mask) + 1); } From nobody Fri Jul 14 20:50:49 2023 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 4R2kCN4QZfz4mlq8; Fri, 14 Jul 2023 20:50:56 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2kCN2qHhz3KXm; Fri, 14 Jul 2023 20:50:56 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; none Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id A26303C0199; Fri, 14 Jul 2023 20:50:49 +0000 (UTC) Date: Fri, 14 Jul 2023 20:50:49 +0000 From: Brooks Davis To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3f5788e0ed8e - main - lib/libc/string/ffs*.c: work around gcc warning Message-ID: References: <202307142027.36EKRZa8093531@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202307142027.36EKRZa8093531@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4R2kCN2qHhz3KXm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Jul 14, 2023 at 08:27:35PM +0000, Robert Clausecker wrote: > The branch main has been updated by fuz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3f5788e0ed8e85567f651ad360596b8c330af5a9 > > commit 3f5788e0ed8e85567f651ad360596b8c330af5a9 > Author: Robert Clausecker > AuthorDate: 2023-07-10 22:10:52 +0000 > Commit: Robert Clausecker > CommitDate: 2023-07-14 20:26:43 +0000 > > lib/libc/string/ffs*.c: work around gcc warning > > Gcc warns of infinite recursion if we use __builtin_ffs*() to > implement ffs*(). This is because gcc uses ffs() to implement > these on some platforms. Sidestep the warning by using > __builtin_ctz*() for these. Thank you for fixing this. The warning seems to be rather bogus and we might be better off suppressing it as (based on poking at compiler explorer) the warning doesn't appear to apply to any architecture we care about and quite a few compilers generate worse code for the __builtin_ctz*() implementations (including gcc for x86-64 at -O2): https://godbolt.org/z/E174v96GT -- Brooks From nobody Fri Jul 14 20:57:18 2023 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 4R2kLl0Z5Jz4mp2t; Fri, 14 Jul 2023 20:57:19 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2kLl08Jzz3M4N; Fri, 14 Jul 2023 20:57:19 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; none Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 8FBA93C0199; Fri, 14 Jul 2023 20:57:18 +0000 (UTC) Date: Fri, 14 Jul 2023 20:57:18 +0000 From: Brooks Davis To: Brooks Davis Cc: Robert Clausecker , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3f5788e0ed8e - main - lib/libc/string/ffs*.c: work around gcc warning Message-ID: References: <202307142027.36EKRZa8093531@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Rspamd-Queue-Id: 4R2kLl08Jzz3M4N X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Fri, Jul 14, 2023 at 08:50:49PM +0000, Brooks Davis wrote: > On Fri, Jul 14, 2023 at 08:27:35PM +0000, Robert Clausecker wrote: > > The branch main has been updated by fuz: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3f5788e0ed8e85567f651ad3= 60596b8c330af5a9 > >=20 > > commit 3f5788e0ed8e85567f651ad360596b8c330af5a9 > > Author: Robert Clausecker > > AuthorDate: 2023-07-10 22:10:52 +0000 > > Commit: Robert Clausecker > > CommitDate: 2023-07-14 20:26:43 +0000 > >=20 > > lib/libc/string/ffs*.c: work around gcc warning > > =20 > > Gcc warns of infinite recursion if we use __builtin_ffs*() to > > implement ffs*(). This is because gcc uses ffs() to implement > > these on some platforms. Sidestep the warning by using > > __builtin_ctz*() for these. >=20 > Thank you for fixing this. >=20 > The warning seems to be rather bogus and we might be better off > suppressing it as (based on poking at compiler explorer) the warning > doesn't appear to apply to any architecture we care about and quite a few > compilers generate worse code for the __builtin_ctz*() implementations > (including gcc for x86-64 at -O2): >=20 > https://godbolt.org/z/E174v96GT Oops, I missed a case. riscv64 gcc does call ffs so never mind. -- Brooks From nobody Fri Jul 14 21:59:00 2023 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 4R2ljw6G1Qz4nDXl; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2ljw5qHvz3q5r; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689371940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziL7LinHRR5D9HCvn8mXg1PmraA1Y31IsGkS/4Ebxbs=; b=vKgylvkfROCBmw1kK3jL2/vgYt4zvX0GRoZrBfnKSbxFDOhz0026VlBB+viHJHbBJkLdCY nTm8oZtt0oIEiZAtRqK39J+Q7SG+5ZbSLtd83QJE9lz0TjmoMCatTBbk+qtizU3DYo4ZtH uf+Dx7zEgTM3VmhVaFUgogIFZjfrLw/kTgc3jXBqdP6AyLUD9n1nJA8T3A1/gd2mXgxaqA FDpPX38jOqetJ1RvTak6i10G52vJd9W5hf4YgPwz0H20/HHUzP5teDvFwOpkeXzSco5ifG R1zgM18XKPQkz+djJGj2XWXcfmN8bsFToG0k+C+VrNpr0X/OReXsyTHLrcud/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689371940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ziL7LinHRR5D9HCvn8mXg1PmraA1Y31IsGkS/4Ebxbs=; b=w1ZrwZ7pWI7EsC9u5ZN3cMHtqQ0RwJjawRGhsNGdVwMPTNX5K2eRNWle5B417dqRIYScsB L5T2VlBjrJ8umSsYnFPATYttvwwpovV/AQ3i26hlQmzG0SIycKPu8iIMYlBOME+6mmpgWA a6HFtB7TrcpyblYElY1Mi+IZiBUyP/x+C6E8EF710CrHwH+NmKucYgIFywbRpla7zklJel muuscV8pSgIj50lZmQICPil5N5CARO/WTuR3CvugOImu2FiEJjzhga7NBMW1hqc7ckS9fo Fgv+Ce7l4p8UufhD3LbGVVgAJPIiuiqFVGseLP15pmdfBrZEVpSKW2Rpvg4nZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689371940; a=rsa-sha256; cv=none; b=jftH/D839YVrraY3OQ1urKrhHQdDfXRQon4ebb9snNV4ykikbR/1G/wtGhdBJtBHJ+DDfa EFTHyV6K1kjlg/q9MIgt4moVKbTRJ+gEgEgReU7GdTQfF2j7R/YtBHXyq+M67Wx6uffldK MiXkwpeMaSocHo9LyjtWAp5oCVCQeLGjLdwblgyHqnrZryqnOWaxqm1WR6yYvdUiUAqEdk iCx7Wls8e8aXuczDMfrO/0yn+OITXl5DkXtMQ3ymHUPewyDZkXADgd49tazcMXZro/xoDu c+Db0yR/T+QVuk4m6+bOsj9JaqV5UiN98agBrmNKkCkBxXDcC4rygvKxJTBoJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R2ljw4vmvzZMN; Fri, 14 Jul 2023 21:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36ELx04v041600; Fri, 14 Jul 2023 21:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36ELx0h8041599; Fri, 14 Jul 2023 21:59:00 GMT (envelope-from git) Date: Fri, 14 Jul 2023 21:59:00 GMT Message-Id: <202307142159.36ELx0h8041599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 2a0c0aea4209 - main - Fix zfsd unittests after 92642bba4db 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2a0c0aea42092f89c2a5345991e6e3ce4cbef99a commit 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a Author: Alan Somers AuthorDate: 2023-07-14 21:57:40 +0000 Commit: Alan Somers CommitDate: 2023-07-14 21:57:40 +0000 Fix zfsd unittests after 92642bba4db At the time we ensured that the more important functional tests were working, but neglected to update the unit tests. MFC after: 2 weeks MFC with: 92642bba4db4bf1719758ac7233468bc09a0bd59 Sponsored by: Axcient --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index e2833170f9ac..882524c83efd 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -400,7 +400,7 @@ TEST_F(ZfsEventTest, ProcessPoolEventGetsCalled) { string evString("!system=ZFS " "subsystem=ZFS " - "type=misc.fs.zfs.vdev_remove " + "type=sysevent.fs.zfs.vdev_remove " "pool_name=foo " "pool_guid=9756779504028057996 " "vdev_guid=1631193447431603339 " @@ -515,7 +515,7 @@ TEST_F(CaseFileTest, PoolDestroy) "pool_guid=456 " "subsystem=ZFS " "timestamp=1348867914 " - "type=misc.fs.zfs.pool_destroy "); + "type=sysevent.fs.zfs.pool_destroy "); m_event = Event::CreateEvent(*m_eventFactory, evString); ZfsEvent *zfs_event = static_cast(m_event); EXPECT_CALL(*m_caseFile, Close()); @@ -685,7 +685,7 @@ string ReEvaluateByGuidTest::s_evString( "pool_name=foo " "subsystem=ZFS " "timestamp=1360620391 " - "type=misc.fs.zfs.config_sync"); + "type=sysevent.fs.zfs.config_sync"); /* From nobody Sat Jul 15 03:59:18 2023 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 4R2vjg4zsHz4mfn1; Sat, 15 Jul 2023 03:59:19 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2vjg4Z5lz45Yd; Sat, 15 Jul 2023 03:59:19 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689393559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3IkuSoOwGWk/Q48s4yLLmCfpqphPpP0XMVtZB1E1TUY=; b=YtZfK9QkxUlNLvHfzN99q8XLkvE7k+nUKHElytUzNIfxSci7Vs/XGy5HZj/UCBDt0K+eaj CrUqI5z/zpnHr2HM4i+QA0//SeEvcmDv+SsGmX6fjCJd9Xg2RirqHebGyomJjJ2ZEfVPhv uYFJ2Bby8HwBpFiTnHLUzoHadJzSE1TaYNb9Q16nsmiiWY4Yl/AP+BXAhC9J3EG9PlV1PI JV8D53LjNS7f3jic19ZleYTodfojuhEnqxfTmMBHlY0Zyxjq+YthRSmWcH1tWzvpPaUom9 eH8WJ/2dB2x6EwtH3xYFJMF4HJ27jOOGiavClgFG/KobMxVsdaM/FvXMXNmE0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689393559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3IkuSoOwGWk/Q48s4yLLmCfpqphPpP0XMVtZB1E1TUY=; b=Vety6em6Hoh7qDIC7elmbJwXIO8A2nAPwuRkZ1pH7dQm8InFQZt7ojhhm2kjhvR6tqRLro kytPt+/24VmPjbXPwrRs7cGhqkjK6GPclTdGihWRM2r/ljHo2BI6mf7LJQ1sddTkd/A7u6 aERRz/An/ngMgPx2jwgbc4JHH2RjqvX8HL5Faa9XmmpaIgZQKyMjxPPkvQil3HmcMYN5ur LlbSBAdjwPpzKEFkplPiPyYoxE8n1Bpl0Zk7jESkCa7xo8mENIpBiAcSoY3bsrxjQi4WKR YRIYADhYWtyM3iRNubbyaIKWB5U+rJs4EvB+fRm7lB14H5tJ+K2psslbtkI+3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689393559; a=rsa-sha256; cv=none; b=KQaISn7mZ3yw2367D3BfivVwT2I/CmxgYPXZcEZmvUWWFW/RRjRQdBzQy3PorBBAP9IXSc ogAQI4jTPd1nvjkkudcrP1NsWkgTMGkg02wEolpwoWPyF07NnDfXAhW8GqlVG2JLQQOBvL zpfGgkzafI8IVpByGCLjFoimC1iyQ2KTu7U8Vra/GSgzFBoQxbrre6IMicwrHy3HJp7Ppv UmfvwwXDEtXJXRb+wRFp4f7Az2+TysUtg4eVhS7MZWhdDyWhBbKdZV8q3C38BGyiNjs8tF sce6k3jad7+qEAiGxEs+BM2Jvb/lElyLfm2KtRk8c3EqSCb2lo9AUDtgrF3Erg== Received: from [10.9.4.95] (unknown [209.182.120.176]) (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 did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R2vjg1shqz180h; Sat, 15 Jul 2023 03:59:19 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <54f0a239-ebc3-9496-f1b2-ea8eb15f80ba@FreeBSD.org> Date: Fri, 14 Jul 2023 22:59:18 -0500 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: git: 09267cc15284 - main - /etc/rc.subr: add support for kld sysctl variables Content-Language: en-US To: Doug Rabson , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307140957.36E9vXtE047194@gitrepo.freebsd.org> From: Kyle Evans In-Reply-To: <202307140957.36E9vXtE047194@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 7/14/23 04:57, Doug Rabson wrote: > The branch main has been updated by dfr: > > URL: https://cgit.FreeBSD.org/src/commit/?id=09267cc15284795fef958fb9ed786bb2382d6763 > > commit 09267cc15284795fef958fb9ed786bb2382d6763 > Author: Doug Rabson > AuthorDate: 2023-06-21 12:26:17 +0000 > Commit: Doug Rabson > CommitDate: 2023-07-14 09:49:47 +0000 > > /etc/rc.subr: add support for kld sysctl variables > > For kernel modules loaded by scripts in /etc/rc.d and > /usr/local/etc/rc.d, if there is a file in /etc/sysctl.conf.d named name>.conf, then this will be loaded using the sysctl(8) utility. For > instance, sysctl variable changes for the pf kernel module would be > placed in the file /etc/sysctl.conf.d/pf.conf. > > PR: 272129 > Reviewed by: imp freebsd_igalic.co > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D40886 Hello! We discussed this out-of-band a little bit, but to circle back to the list: I'd like to propose changing the name of this directory before we cement it into a release; we've seen some non-zero amount of confusion with rc.conf.d (at least on IRC) because files within are actually conditionally sourced based on daemons being loaded. Many folks are conditioned to seeing $file.d as "just a way to split up $file," and when the contents are conditionally loaded it's not necessarily intuitive. We could document the behavior in hier(7) in additional to sysctl.conf(5), but IMO it'd be really nice for conditionally-sourced directories to be a little more descriptively named so that one could make an educated guess as to when the contents are used. For this one, perhaps "sysctl.kld.d"? I don't really know what to propose for rc.conf.d, perhaps rc.svcconf.d, but we'd need to actually implement rc.conf.d as you might guess it's implemented if we change it since it's seen a number of releases. Thanks, Kyle Evans From nobody Sat Jul 15 04:11:29 2023 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 4R2vzz3QhCz4mlxc for ; Sat, 15 Jul 2023 04:11:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R2vzy72SGz48tR for ; Sat, 15 Jul 2023 04:11:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbea147034so23976215e9.0 for ; Fri, 14 Jul 2023 21:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1689394301; x=1691986301; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=eF0LCqXowlJ6n3kecubwE7YQWMoxHDYkpf9ccHwsWfc=; b=Sai1Yb3jrwymeU1NrdCuqP0j5+rNmz9gr6g3x0hzmqgenOVDvlDajSfWo65d4km1sp lMUQ0ozO7fmMiH0LwBUO1HXg1+b3QHDB3oAEzQWFsZR+23KhSwHTxMPfiRbuITwGOoaN yZs8HwoF95BK8YW2ZeeiCjVXHJCxJbCLjRAEhNJ9hlEqmJkjaGQq9wLsWOWbkAiFtx+Q hsPGhUqMvU+sFLzDdfKtwYklcXNNyq0X9m1OHjAii6WZ+BVghkSn3BW2MgeQh8Opo+0q ibq1mzRt3c8GskZgFcxPtv6+pXGepuMFwo/WbL6H27J9JcfKa/dy0tw6o11GFEVbL6GU hwWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689394301; x=1691986301; 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=eF0LCqXowlJ6n3kecubwE7YQWMoxHDYkpf9ccHwsWfc=; b=iCTp6nM334WfSN5DHIgDC55ytYqr9WIi1Iwa2/9gv/9PVZezwtHM8r7qcO7FnRhuG+ ktlJ9YU+lJd9rsj0GQq9Zqhjm/rcWQHuIrqvEDxPvBn6sYit89jQWnqmVVf3W7LTnYa8 fRwnfCyzdzmBBl8VCQK1dv3oHz9nDijBE7L43Vu+e+e82ZQZxCUy0xd1PHyQzRRmLXz4 dmvvYnZmPzwX0ZHOl7kAwPLmjltUnvVHBvZqS+FA9n0o5a2geVC+aVSQdZfNSuVrZbCS ckSEuIYGAIyqJiGa6NpabD///bJcSPdsu2BRyrX4eeDYI7MBWQIcXqodc1rwHOF8ja6D WlYA== X-Gm-Message-State: ABy/qLZGrUqK+DWD4REjhTWRHHhLIdtNTHc5oXAbkeSdRRLMCHA02ifJ MEyhfMM2SkxJ5yBs6trjMB1AM/iBH9t1J0QGUnRcpg== X-Google-Smtp-Source: APBJJlGjiEQi7P1bTxKmKsGxz/XDcFoDriPkDBw1k4oHviRo/Ed7k8cN6rZlxeP+WWcZMbiYWUd+sTh7xsrLY9JUlaY= X-Received: by 2002:a5d:6783:0:b0:313:f33c:24c4 with SMTP id v3-20020a5d6783000000b00313f33c24c4mr4580472wru.39.1689394300554; Fri, 14 Jul 2023 21:11:40 -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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202307140957.36E9vXtE047194@gitrepo.freebsd.org> <54f0a239-ebc3-9496-f1b2-ea8eb15f80ba@FreeBSD.org> In-Reply-To: <54f0a239-ebc3-9496-f1b2-ea8eb15f80ba@FreeBSD.org> From: Warner Losh Date: Fri, 14 Jul 2023 22:11:29 -0600 Message-ID: Subject: Re: git: 09267cc15284 - main - /etc/rc.subr: add support for kld sysctl variables To: Kyle Evans Cc: Doug Rabson , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000002baa5706007ec39d" X-Rspamd-Queue-Id: 4R2vzy72SGz48tR X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000002baa5706007ec39d Content-Type: text/plain; charset="UTF-8" On Fri, Jul 14, 2023, 9:59 PM Kyle Evans wrote: > On 7/14/23 04:57, Doug Rabson wrote: > > The branch main has been updated by dfr: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=09267cc15284795fef958fb9ed786bb2382d6763 > > > > commit 09267cc15284795fef958fb9ed786bb2382d6763 > > Author: Doug Rabson > > AuthorDate: 2023-06-21 12:26:17 +0000 > > Commit: Doug Rabson > > CommitDate: 2023-07-14 09:49:47 +0000 > > > > /etc/rc.subr: add support for kld sysctl variables > > > > For kernel modules loaded by scripts in /etc/rc.d and > > /usr/local/etc/rc.d, if there is a file in /etc/sysctl.conf.d named > > name>.conf, then this will be loaded using the sysctl(8) utility. > For > > instance, sysctl variable changes for the pf kernel module would be > > placed in the file /etc/sysctl.conf.d/pf.conf. > > > > PR: 272129 > > Reviewed by: imp freebsd_igalic.co > > MFC after: 2 weeks > > Differential Revision: https://reviews.freebsd.org/D40886 > > Hello! > > We discussed this out-of-band a little bit, but to circle back to the > list: I'd like to propose changing the name of this directory before we > cement it into a release; we've seen some non-zero amount of confusion > with rc.conf.d (at least on IRC) because files within are actually > conditionally sourced based on daemons being loaded. Many folks are > conditioned to seeing $file.d as "just a way to split up $file," and > when the contents are conditionally loaded it's not necessarily intuitive. > > We could document the behavior in hier(7) in additional to > sysctl.conf(5), but IMO it'd be really nice for conditionally-sourced > directories to be a little more descriptively named so that one could > make an educated guess as to when the contents are used. For this one, > perhaps "sysctl.kld.d"? > > I don't really know what to propose for rc.conf.d, perhaps rc.svcconf.d, > but we'd need to actually implement rc.conf.d as you might guess it's > implemented if we change it since it's seen a number of releases. > I'm planning on adding this behavior to devmatch (and maybe moving it more into devd), if that affects the naming. Warner Thanks, > > Kyle Evans > --0000000000002baa5706007ec39d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Jul 14, 2023, 9:59 PM Kyle Evans <kevans@freebsd.org> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">On 7/14/23 04:57, Doug Rabson wrote:
> The branch main has been updated by dfr:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D09267cc15284795fef958fb9ed786b= b2382d6763
>
> commit 09267cc15284795fef958fb9ed786bb2382d6763
> Author:=C2=A0 =C2=A0 =C2=A0Doug Rabson <dfr@FreeBSD.org>
> AuthorDate: 2023-06-21 12:26:17 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Doug Rabson <dfr@FreeBSD.org>
> CommitDate: 2023-07-14 09:49:47 +0000
>
>=C2=A0 =C2=A0 =C2=A0 /etc/rc.subr: add support for kld sysctl variables=
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 For kernel modules loaded by scripts in /etc/rc.d = and
>=C2=A0 =C2=A0 =C2=A0 /usr/local/etc/rc.d, if there is a file in /etc/sy= sctl.conf.d named <kld
>=C2=A0 =C2=A0 =C2=A0 name>.conf, then this will be loaded using the = sysctl(8) utility. For
>=C2=A0 =C2=A0 =C2=A0 instance, sysctl variable changes for the pf kerne= l module would be
>=C2=A0 =C2=A0 =C2=A0 placed in the file /etc/sysctl.conf.d/pf.conf.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 PR:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0272129
>=C2=A0 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 imp freebsd_ig= alic.co
>=C2=A0 =C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
>=C2=A0 =C2=A0 =C2=A0 Differential Revision: https:/= /reviews.freebsd.org/D40886

Hello!

We discussed this out-of-band a little bit, but to circle back to the
list: I'd like to propose changing the name of this directory before we=
cement it into a release; we've seen some non-zero amount of confusion =
with rc.conf.d (at least on IRC) because files within are actually
conditionally sourced based on daemons being loaded. Many folks are
conditioned to seeing $file.d as "just a way to split up $file," = and
when the contents are conditionally loaded it's not necessarily intuiti= ve.

We could document the behavior in hier(7) in additional to
sysctl.conf(5), but IMO it'd be really nice for conditionally-sourced directories to be a little more descriptively named so that one could
make an educated guess as to when the contents are used.=C2=A0 For this one= ,
perhaps "sysctl.kld.d"?

I don't really know what to propose for rc.conf.d, perhaps rc.svcconf.d= ,
but we'd need to actually implement rc.conf.d as you might guess it'= ;s
implemented if we change it since it's seen a number of releases.

I'= m planning on adding this behavior to devmatch (and maybe moving it more in= to devd), if that affects the naming.

Warner=C2=A0

Thanks,

Kyle Evans
--0000000000002baa5706007ec39d-- From nobody Sat Jul 15 13:18:26 2023 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 4R386p5Fvwz4nJmJ; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R386p4rgcz4298; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hPJ0NmB2PoP7Tiav64SKnvG0rgLpxg/g2UaWZcehUg=; b=OpFlU1BtXrAfoQ75F0kZPPokeggJirNrOWBaez82blTUdNDVU77TFkgEqxPAHZU9kC2Uqx KTW3yxkq+6ythEm0K8r896k4fFQy16mzyN66fPz2XVEBxzPovubD5MxdRFBORsWNUEfc5o JHCbqUPMhzROGCeTshdBD5pr1IT9d8H5gY2jzIjxO2Z84HxAJJVbbbaFLQemaZ1q0GeQ8i aG44iCzk71vY5paQM/ba21PGQPXEzhqBxPTxiMLKhwe38qyUKU1k8Dftdvoc1jr4MOUUms mbWjUQG4dIjTjBxDlDbMBoOLE7EykqnFYoD9Aag/dddPDQ5iXi40Wn32vhoebA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689427106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hPJ0NmB2PoP7Tiav64SKnvG0rgLpxg/g2UaWZcehUg=; b=u0bQU9wHDTqaIMfQr6sAowFdnOy9NVEJWGogaCJdK9mGJ3flV7xPxCh/+DEsFYUmQg19/t bRMsQ6h7/SbpZ0f9a1IWBRD8Ib3UskJMsDGv9rBYXY/dYOvMNXiC7kH6DqpN0TyezuZvgk MKxPxvg1qkukio8n/IZWchJu2jU3wnFd+7iMo/Wud09aaKYAbQr2g0zNQ+C2nx6d2nrSGz 7xbuXyyTxnoLyMLZtZusIIBTBNsUPcg7AdLto1WNuzbvV6FQ54shhwr5y91xg/BBp6IREP wXRYn05vkFsb8+gFMX4COWqwEMuHI1VYIRcGJrH1Vq828T2JSwPQBbELzlJnyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689427106; a=rsa-sha256; cv=none; b=mE3x6KiVSsHANVt0xN3hIfk/c4SN20mrSlLvTYXHqN5q0IKL8XgEq6sOeqcS+Vyk0BhcY5 R4ZynrhorZyKh0s3P48VMSLuPgM1I8qUvjIGxpuPeGHHubFsnFU7ojH97tA2p6zBLvX3tF /BgUtTiylumm0Zs7q4eoKxfz3Niki4cDBGmzQsXPa06Q+yPhuSD8CPilMLRHl1Bp6saAXC ynlWy0EiBnM5Hg1zkz+bIRZh1o2iw3xGzf99RUtETp0BVKxdQciShbna0lmrO4c+1TWwLk 3QJfcNe+nwfkKSEUZnxaEx+wxFrgayz9JWVbs5fWN2L0D+oami4vrYmgFaEL9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R386p3q3gz11hj; Sat, 15 Jul 2023 13:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36FDIQoB064428; Sat, 15 Jul 2023 13:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36FDIQ7M064427; Sat, 15 Jul 2023 13:18:26 GMT (envelope-from git) Date: Sat, 15 Jul 2023 13:18:26 GMT Message-Id: <202307151318.36FDIQ7M064427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 5ac2a874d070 - main - /etc/rc.subr: rename sysctl.conf.d to sysctl.kld.d 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ac2a874d070a0880dc0a264cb2230d7f1c19bea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=5ac2a874d070a0880dc0a264cb2230d7f1c19bea commit 5ac2a874d070a0880dc0a264cb2230d7f1c19bea Author: Doug Rabson AuthorDate: 2023-07-15 07:40:50 +0000 Commit: Doug Rabson CommitDate: 2023-07-15 13:16:08 +0000 /etc/rc.subr: rename sysctl.conf.d to sysctl.kld.d This better reflects the intent that this directory is indexed by kld name and removes a conflict with D32128 which aims to split sysctl.conf. Reviewed by: kevans imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41043 --- etc/mtree/BSD.root.dist | 2 +- libexec/rc/rc.subr | 4 ++-- share/man/man5/sysctl.conf.5 | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 2ec079b0abd1..a81cd03050aa 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -96,7 +96,7 @@ .. ssl .. - sysctl.conf.d + sysctl.kld.d .. syslog.d .. diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index ef3da46b3206..0114dd5ca5a8 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1970,8 +1970,8 @@ load_kld() return 1 else info "$1 kernel module loaded." - if [ -f "/etc/sysctl.conf.d/$1.conf" ]; then - sysctl -f "/etc/sysctl.conf.d/$1.conf" + if [ -f "/etc/sysctl.kld.d/$1.conf" ]; then + sysctl -f "/etc/sysctl.kld.d/$1.conf" fi fi else diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5 index 26ecf763ca12..1f769772dc9d 100644 --- a/share/man/man5/sysctl.conf.5 +++ b/share/man/man5/sysctl.conf.5 @@ -54,10 +54,10 @@ section, below. .Pp For kernel modules loaded via .Xr rc.subr 8 -system , +system, additional module-specific settings can be applied by adding a file in the same format named -.Pf /etc/sysctl.d/.conf . +.Pf /etc/sysctl.kld.d/.conf . .Sh FILES .Bl -tag -width /etc/rc.d/sysctl_lastload -compact .It Pa /etc/rc.d/sysctl @@ -76,7 +76,7 @@ Initial settings for .It Pa /etc/sysctl.conf.local Machine-specific settings for sites with a common .Pa /etc/sysctl.conf . -.It Pa /etc/sysctl.conf.d +.It Pa /etc/sysctl.kld.d Module specific settings for kernel modules loaded via .Xr rc.subr 8 . .El