From nobody Mon Mar 18 03:40:50 2024 X-Original-To: dev-commits-src-all@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 4TygcL4bk2z5FTsl; Mon, 18 Mar 2024 03:40: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 4TygcL46nHz45Ks; Mon, 18 Mar 2024 03:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733250; 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=5mqIoIRTZecFlYqJXj1+urFQDpv8Nc7Z19jGe6SGENI=; b=ur+94ZHYVwMXolspEy8nhNAEKZFDq1dRojCGQPLB+GeneMRkLBypWRJ1EOTLdFGxE16pHf ayPWXrsrw9GtfUaC0mynjvVKaGMR6gZmOfzdYPyvZSELMwVJKds8SaFkNxsSXO2uEuMy9L MkgXYfShy8hyaEZDkyn+J4sQBDH7Sj1mOwxwjCv9XTPxwLzdvWDkL3L+HyfNT7vbpzpZmD jK3h76iDIO6lZUJiMSOu09nhJTeNpU/SVQVbvEOuBZOcMas1TEBx9rv7p41Ke9wFe+HJBF 644akPnFth5U0cfU0sssP6DSyIoaSx/PPvWr39VupvR9muSmUO/tCs9R6SyyqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710733250; a=rsa-sha256; cv=none; b=hPf76Yslpah9UAQwZKxYSDemILfLJfSaCQ0JUbWUHgtkkKLy8G8A1fS9/XT/ai8MLuOWXV lrZSOR1JBPtnsVxsxztVfANhjwUv+A6DgrMk4AqqQEHEK3dXVW+MVjwFgMbquba5gMdakw Pkv9n0beEiIayVjoT707o/Nx6pffcuZW2kDG2HBV2MWDju5WNqeDcymxGV2p7F9Y2nmy7K ftX68XmHaR1ULPdHUuykxyYdhp4+mC1Z5kTR5UmKBypxDZSPD4CszsyBvGrIQbvkMy2Yq7 rUsSDHIX35JPv6KT7UOuFnu1W15N/xDyP7/O2RpApkbuuECahaDl8i5Ch7kL0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733250; 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=5mqIoIRTZecFlYqJXj1+urFQDpv8Nc7Z19jGe6SGENI=; b=Xfv+hZJwaExS92rZ6TeAFXmJ2O395BRrC2k+0xkHHF4/0S8RpbI4eJCkBgBYZdzf3qIEEG touIA4x4SwFT/5xfBPt9uMGmeqICJDk1zGWEbrHORXuLwtjjx2cOWdBvg27EldlXzQ0XIW vfj/K5ZDjWNmAnhXt1IyYa5WQQYyoL2Ub/1MM066OCtibtVKhpnSY0LKgaaTHMxVcscy6d jj2Q04TO5jSRnx5sPe118tkP4gqNlYNZhO/GIfqxuHCzHe8APotoAYDYEf2bEISrIwyt4q LezcpHABcaXomHRM+KiOiD348gZOCri/HT9KaaIEQrKMyyCz087gSnbP/R2ZXQ== 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 4TygcL3k8Nz163L; Mon, 18 Mar 2024 03:40: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 42I3eoCg057368; Mon, 18 Mar 2024 03:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I3eoU7057365; Mon, 18 Mar 2024 03:40:50 GMT (envelope-from git) Date: Mon, 18 Mar 2024 03:40:50 GMT Message-Id: <202403180340.42I3eoU7057365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7e9323311117 - stable/13 - rtld: add some dlopen tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7e9323311117758e7b17386445afd9a7e98bf290 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7e9323311117758e7b17386445afd9a7e98bf290 commit 7e9323311117758e7b17386445afd9a7e98bf290 Author: Kyle Evans AuthorDate: 2024-02-13 15:38:02 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 03:34:05 +0000 rtld: add some dlopen tests dlopen_basic just tests that libthr.so can be dlopen()ed, which will just serve as a sanity check that "libthr.so" is a thing that can be dlopened in case we get a weird failure in dlopen_recursing. dlopen_recursing tests a regression reported after the libsys split, where some dlopen() may cause infinite recursion and a resulting crash. This case is inspired by bdrewery's description of what seemed to be causing his issue. The corresponding fix landed in commit 968a18975ad ("rtld: ignore load_filtees() calls if we already [...]") Reviewed by: kib (cherry picked from commit c5796f1572c82b88e8b6a2810c92f30e5ac3e118) --- libexec/rtld-elf/tests/Makefile | 2 ++ libexec/rtld-elf/tests/dlopen_test.c | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 06e143a441a1..e380e9850fc1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -13,6 +13,8 @@ ATF_TESTS_C+= ld_preload_fds SRCS.$t= $t.c common.c .endfor +ATF_TESTS_C+= dlopen_test + WARNS?= 3 .include diff --git a/libexec/rtld-elf/tests/dlopen_test.c b/libexec/rtld-elf/tests/dlopen_test.c new file mode 100644 index 000000000000..ab1e8da1cb41 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_test.c @@ -0,0 +1,52 @@ +/*- + * + * Copyright (C) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dlopen_basic); +ATF_TC_BODY(dlopen_basic, tc) +{ + void *hdl, *sym; + + hdl = dlopen("libthr.so", RTLD_NOW); + ATF_REQUIRE(hdl != NULL); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym != NULL); + + dlclose(hdl); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym == NULL); +} + +ATF_TC_WITHOUT_HEAD(dlopen_recursing); +ATF_TC_BODY(dlopen_recursing, tc) +{ + void *hdl; + + /* + * If this doesn't crash, we're OK; a regression at one point caused + * some infinite recursion here. + */ + hdl = dlopen("libthr.so", RTLD_NOW | RTLD_GLOBAL); + ATF_REQUIRE(hdl != NULL); + + dlclose(hdl); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_basic); + ATF_TP_ADD_TC(tp, dlopen_recursing); + + return atf_no_error(); +} From nobody Mon Mar 18 03:40:51 2024 X-Original-To: dev-commits-src-all@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 4TygcM5d3Vz5FV3C; Mon, 18 Mar 2024 03:40:51 +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 4TygcM4yVyz456t; Mon, 18 Mar 2024 03:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733251; 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=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=oUtmM2IWs1bQcEZLZTE6LASqRngPv7mxZslUcaG2alEYT4SPdpGLbgSNCfMhsdkK7MN1+l 3iiMHndzp9TEnC6Sd5oIXskczxn/J6sXItib7HATEKovCWK0p07D0PkF7s4vELqtlgSwnO bfDqF0RRtO+JL0oSfEbM1r5t/m2qe9sFChRbDvHjQTzAAb6wHoB7QTkSkBK2T7tBKwZYb2 URuAgCfK5h570htdtmb0cQ4jMKhaECO/aIk0ujMsIVtQ8DeZAEHs6+8jV0tDIjv6Xaq+pO z2CDQp96xzkQUnX33nhfWwGYaB5Tq6eIBAoqLepBOqKcYzrH6zFhLS4A6xzJcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710733251; a=rsa-sha256; cv=none; b=dReQ7SlVwwx7qB9TESM3YHDMxzDdyFZ4P2VKQg5oPh4utXUcV+Fb7I/2oq9Zx2fFgiGIFM WATxyF4q+o6kpIo3v4eu6BRSVR7f3E+qNuYjcwP6AinxkEhneY9hNhW6C1AJIUZHy/go4X Boal+LASJsgbPIvLXOI2Uj/xbUDtfQcH7eWt8RNT+t7X6aNwiiRipVsDqgZfJhpAFBRjGR 6IcRZrCf/sQTpX+NyB1lBQnFS+g1KlLdJ9DBvQXIbHPCxsJJE1+lEy3Z+suNr3DwRWlggu VeylK8xRUuizqqoKnGS3UfgDR9eollrLN91iq6IjN+TjB7J4RqxPchrlH+wGYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733251; 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=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=l+iPnqfPTPVuFJuwvEu/TZTlBJkr38NkGB7K4nUmmbwY1ipWKW3sB6fifu/q+gWVlEg4zo tUy40/Rghv2SCPKnet9YN7M9+CLLu4B+RFZ8ohqbNx1cfcrqJCJqFafQKuAHdEt9CGVIzH 690+OsW4+jpYIB0ZXF0MTE1Tn6QmbIHxLefvxTrt3uQkWLDLMUkvIMBOOrfHcxlaLFLOsM Gj+bF6w4+yBanKrsvObRaApyf+dugnlHLQfgkWsUIsI+ncCI6sYG37X9aSalPNrGdEcKd1 Na0h2JvXMaHjl1NsaF2yl8ydin6Hl4YikQEXwQW7L28yvfTrMdbL047qIimvUA== 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 4TygcM4Z75z15cg; Mon, 18 Mar 2024 03:40:51 +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 42I3epVZ057632; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I3epXH057618; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git) Date: Mon, 18 Mar 2024 03:40:51 GMT Message-Id: <202403180340.42I3epXH057618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 79a095fa8a66 - stable/13 - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 79a095fa8a66a55e21d75c540a56249718d4eb73 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=79a095fa8a66a55e21d75c540a56249718d4eb73 commit 79a095fa8a66a55e21d75c540a56249718d4eb73 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 03:34:09 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp (cherry picked from commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f) --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 2315b139b8b6..31d64e8ab676 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1129,8 +1129,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From nobody Mon Mar 18 09:36:05 2024 X-Original-To: dev-commits-src-all@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 4TyqVF6lm4z5D5kK; Mon, 18 Mar 2024 09:36: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 4TyqVF5w2Bz4kVv; Mon, 18 Mar 2024 09:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710754565; 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=dM0ijgOo0nBd3DQYIdpXqldnd5+zQiTGMLrFOiUSvKE=; b=a8ftlxP3NyVTfk/1WmqkIBsRgaAOCbYujY5NzuObM9bWAvQ84hK6aVZMF02Aipvvgn2jrG mcSd/ikKyUDPfnYIEYoB7XR2kq3q3YBbtiQESQN+YPzb/yhiX+F7M6xO3tWL+K/B5pGTkT fro8iqVAkEDZxg3k0JIDG9QSpRgoNJlI4SURJK+47lcxu91yfPbJPt5mtMXEYUrNeXvY9y 7CBCY7/1os1+qAq/5goD4mXtZs7siWCFtSkmcJvhi0fGTePcgsWWgO4lZ3yF9Sa+qA2jNe 9sFL50KP++ZWQ/gKQksMuzl88B+L1HBxU0JHkk3xCvufenIG60BJR31pTv74aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710754565; a=rsa-sha256; cv=none; b=kb+PHHFx1ZOduSS+txTXnKwsJuimcWdVegxOM2bXmyfY9WmLNwE4foniaqQSllWWET/svY AgDHmA/3Tuq4FHvBm1m4mphAPkhBVyoPItmTv7ck1oQTRPsvoKKZR5gYu+VIrsgsn0QsWM Cw45D1pOiHxkpWD17e2zyJsuHgripv2Tc0wcC01iDMKxMYaZRL9CcJlzyLg7ogmIviIgen qSSL4CmQ6P+iStob4YfgfyAuhpy08/5wvzbPqgBVhF6jY8O9NfX5WLXtrfbXRcC6VlaShl +V1gOCt9mN1pB4WjgtWACpIqbLYtTwEfIGT2KUlXcxN7+dW2lIWRq0rGSa+/PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710754565; 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=dM0ijgOo0nBd3DQYIdpXqldnd5+zQiTGMLrFOiUSvKE=; b=DbyOUlqxT8Gx1ba7wwZTYW4ouWceV93FBCb6O9hG26bc1wDq/29BNx5FxNAvgyQIrXGQWS JT0MrbGjRVG5x2Lui94AD+yexnVtsU7/4ZL/QYNZTkODKlT2bk3Vd6+gRJ6CJ5mHMbWDFK 3Aoh2AfjbFkIz31nJZbRzuQslq6aabcevTfSGga7PSv5LXwqGvT23ljSxiNEeR7B5AIryY fjoWj7SKFcxPBYvDQcmAluU30hrTRfUKQjlzWbIc35q/T+Z8R7rmTcRTr7Qk6TF1fbEpbb r9dztX1HozSpsTylfW8FPjpE/34+I7G1/Fou4b0SIYGEdARdQbdotEPQiQTorA== 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 4TyqVF5VXYzHkw; Mon, 18 Mar 2024 09:36: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 42I9a5U6056738; Mon, 18 Mar 2024 09:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I9a5df056735; Mon, 18 Mar 2024 09:36:05 GMT (envelope-from git) Date: Mon, 18 Mar 2024 09:36:05 GMT Message-Id: <202403180936.42I9a5df056735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 59b02bb420e3 - main - freebsd-update: Don't provide copiable commands in output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59b02bb420e3b0a49af39f7817764ca444f7c793 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=59b02bb420e3b0a49af39f7817764ca444f7c793 commit 59b02bb420e3b0a49af39f7817764ca444f7c793 Author: Michael Osipov AuthorDate: 2024-01-30 16:24:45 +0000 Commit: Michael Osipov CommitDate: 2024-03-18 09:33:42 +0000 freebsd-update: Don't provide copiable commands in output Previously, freebsd-update provided ready-to-go commands for copying and pasting into the terminal. This causes problems as soon as options are used and not supplied again by the user, e.g., '-b' or '-d'. Stop making them copiable and force the user to construct a valid command line by himself to avoid failures. PR: 276102 Approved by: jrm (mentor), emaste MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43700 --- usr.sbin/freebsd-update/freebsd-update.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 551d40418240..a3e56127f9eb 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -776,7 +776,7 @@ fetch_check_params () { if ! [ -z "${TARGETRELEASE}" ]; then echo -n "`basename $0`: " - echo -n "-r option is meaningless with 'fetch' command. " + echo -n "'-r' option is meaningless with 'fetch' command. " echo "(Did you mean 'upgrade' instead?)" exit 1 fi @@ -784,8 +784,8 @@ fetch_check_params () { # Check that we have updates ready to install if [ -f ${BDHASH}-install/kerneldone -a $FORCEFETCH -eq 0 ]; then echo "You have a partially completed upgrade pending" - echo "Run '$0 install' first." - echo "Run '$0 fetch -F' to proceed anyway." + echo "Run '`basename $0` [options] install' first." + echo "Run '`basename $0` [options] fetch -F' to proceed anyway." exit 1 fi } @@ -798,7 +798,7 @@ upgrade_check_params () { NKERNCONF=${KERNCONF} # We need TARGETRELEASE set - _TARGETRELEASE_z="Release target must be specified via -r option." + _TARGETRELEASE_z="Release target must be specified via '-r' option." if [ -z "${TARGETRELEASE}" ]; then echo -n "`basename $0`: " echo "${_TARGETRELEASE_z}" @@ -863,7 +863,7 @@ install_check_params () { if ! [ -L ${BDHASH}-install ]; then echo "No updates are available to install." if [ $ISFETCHED -eq 0 ]; then - echo "Run '$0 fetch' first." + echo "Run '`basename $0` [options] fetch' first." exit 2 fi exit 0 @@ -871,7 +871,7 @@ install_check_params () { if ! [ -f ${BDHASH}-install/INDEX-OLD ] || ! [ -f ${BDHASH}-install/INDEX-NEW ]; then echo "Update manifest is corrupt -- this should never happen." - echo "Re-run '$0 fetch'." + echo "Re-run '`basename $0` [options] fetch'." exit 1 fi @@ -973,7 +973,7 @@ IDS_check_params () { _SERVERNAME_z=\ "SERVERNAME must be given via command line or configuration file." - _KEYPRINT_z="Key must be given via -k option or configuration file." + _KEYPRINT_z="Key must be given via '-k' option or configuration file." _KEYPRINT_bad="Invalid key fingerprint: " _WORKDIR_bad="Directory does not exist or is not writable: " @@ -2326,7 +2326,7 @@ upgrade_guess_components () { WARNING: This system is running a "${KCOMP}" kernel, which is not a kernel configuration distributed as part of FreeBSD ${RELNUM}. This kernel will not be updated: you MUST update the kernel manually -before running "$0 install". +before running '`basename $0` [options] install'. EOF fi @@ -2770,7 +2770,7 @@ upgrade_run () { # Remind the user that they need to run "freebsd-update install" # to install the downloaded bits, in case they didn't RTFM. - echo "To install the downloaded upgrades, run \"$0 install\"." + echo "To install the downloaded upgrades, run '`basename $0` [options] install'." } # Make sure that all the file hashes mentioned in $@ have corresponding @@ -2788,7 +2788,7 @@ install_verify () { if ! [ -f files/${HASH}.gz ]; then echo -n "Update files missing -- " echo "this should never happen." - echo "Re-run '$0 fetch'." + echo "Re-run '`basename $0` [options] fetch'." return 1 fi done < filelist @@ -3024,7 +3024,7 @@ install_files () { cat <<-EOF Kernel updates have been installed. Please reboot and run -"$0 install" again to finish installing updates. +'`basename $0` [options] install' again to finish installing updates. EOF exit 0 fi @@ -3111,8 +3111,8 @@ Kernel updates have been installed. Please reboot and run Completing this upgrade requires removing old shared object files. Please rebuild all installed 3rd party software (e.g., programs -installed from the ports tree) and then run "$0 install" -again to finish installing updates. +installed from the ports tree) and then run +'`basename $0` [options] install' again to finish installing updates. EOF rm newfiles exit 0 @@ -3491,7 +3491,7 @@ cmd_updatesready () { fi echo "There are updates available to install." - echo "Run '$0 install' to proceed." + echo "Run '`basename $0` [options] install' to proceed." } # Install downloaded updates. From nobody Mon Mar 18 09:46:54 2024 X-Original-To: dev-commits-src-all@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 4Tyqkk5hC3z5D6ZT; Mon, 18 Mar 2024 09:46: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 4Tyqkk54ZMz4m8t; Mon, 18 Mar 2024 09:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755214; 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=tGst/sNRb6l2oSDseVdQ0j+QldxMb2S2ELy5dsMm/Yo=; b=EQXctFlux6yOis9Cm+db7lQlPPj6VK89rkEdVT9lN92dDN9mGuN1LGjb/wsPFj6/e2dGgt bxy/b/39og96ik7+AiM+is5noDjbFnEsJXQ/ff0jiZT59+Kpa1X8q8oDNw1bq15jKCkrJW glVtM4Fhc3jQqEMU4JzAEKoib94qeoaKN99Py7kGJEURexEjvGR+cg8vLgLkGNTe8ndRXE ByjYZ3n6sX1A/YkwEaIScEkOlrIIeH4jXe4Awek27MrgCyGlGzH6xCu+K0EH/DD7VcsgAE +wSb/iMcNjw70W3XOnQCNCse2kd6wSVpYyiM57u3Yuiuyb5ifVMR2qrrR00WkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710755214; a=rsa-sha256; cv=none; b=QLYyxr9o2Ru1EhqDkyFrXEihzldd+B/LSJtpyrKH9rR6mfOuevt7faYEiC3BBnws+KE2Ip WYCspTwJTNBn3MNINRQ2ypnL6Wvto/K8TMNxblMJ+BAc8xMvaKLGjRMIjaspkb687KLCDX aIkJxmacnEpBIuB9StDaHS+iajKI04QucArdvino2UwkNDSwyPEuiyPM/VMf+NeLj2LfYu tdQLJ9FlaePzu+glYd8PuB+eMqFrTYG6EQQfBIr7jZ1tQdIc/S1hGlADS+FTyYd4cpBjUB JJVoRfkn7VLqwWcs/ApAGcRN1TujMRuEQEkG5h38HgraiEa/sHMN2SLqsZhoVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755214; 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=tGst/sNRb6l2oSDseVdQ0j+QldxMb2S2ELy5dsMm/Yo=; b=ETWdfoiOLMO8NOJNfMmeDVj12Sh0uWo9J4jTD28osS/yPEsV+iyAs69aUWwSUMkjmb6lSO DH6dMVyrKkvuv+5nk+sR62Ldtrxu2snXXxDmktaetk8ZIuolnlKsSAW4d76PSOKYWXdzcg rORuTQglV1GkMn9kNB+P6HvSHeLEEIEnqXveud5Eu+rePKWbxwtRqFSRTjZACgUW7ELjLt aHxq7au3taYPr/T4CS/FUhcc3fAIFBJXFPWxB35NOczFcSjTcl+qz4icEJSOv5LWuR4IvR X6qKbPsqAdJrtgNk4a1x6KRwruDbsgHwzHAx7CC4rjYvPQkbiOcZ2v6m61eRJw== 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 4Tyqkk4YtSzJ7W; Mon, 18 Mar 2024 09:46: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 42I9ks9J074160; Mon, 18 Mar 2024 09:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I9ksYP074157; Mon, 18 Mar 2024 09:46:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 09:46:54 GMT Message-Id: <202403180946.42I9ksYP074157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: c547f17816be - main - Add myself (michaelo) to the calendar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c547f17816beb163b44a5dfe9b0dde6a49a7787d Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=c547f17816beb163b44a5dfe9b0dde6a49a7787d commit c547f17816beb163b44a5dfe9b0dde6a49a7787d Author: Michael Osipov AuthorDate: 2024-03-18 09:46:02 +0000 Commit: Michael Osipov CommitDate: 2024-03-18 09:46:02 +0000 Add myself (michaelo) to the calendar Reminded by: mckusick --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 59945b13daa2..6e6aac9995c6 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -16,6 +16,7 @@ 01/05 D Scott Phillips born in Anderson, Indiana, 1983 01/06 Adriaan de Groot born in Calgary, Canada, 1973 01/06 Philippe Audeoud born in Bretigny-Sur-Orge, France, 1980 +01/06 Michael Osipov born in Baku, USSR, 1983 01/08 Michael L. Hostbaek born in Copenhagen, Denmark, 1977 01/10 Jean-Yves Lefort born in Charleroi, Belgium, 1980 01/10 Guangyuan Yang born in Yangzhou, Jiangsu, People's Republic of China, 1997 From nobody Mon Mar 18 09:53:48 2024 X-Original-To: dev-commits-src-all@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 4Tyqtj13CBz5D7d4; Mon, 18 Mar 2024 09:53: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 4Tyqtj06Bcz4nPg; Mon, 18 Mar 2024 09:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755629; 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=uBZl3hKCK6WpKS4IgxZibgTS2tHF2h2Vc//lvQfYX+M=; b=pSl8PdND0Y+mhXaBEqyslbJFcBGo5eFCLeutTgrpoi0YcTBCmJ4s2Cm2jlQebarhVvrFNy 2HTWRPGWyNiJzaHcBGaquCin4l+xZ1aqfcJOFJaaoetlRiFCNVzqQ4gI0gF9d6sY1fxlJQ sq9TgtWNKsHDXL/Drp/jv3CzIi10EjLwuvyb+31c/WhnYPtwPuRtsK+QkCGXHA7CYYyFRE BvuyeODTm/+SuwKC5YqhUUB9L9zSH+0xfrkii8lUZmQ6Gq00bp/md4FJCpsKEVMdz/f0KT tHdWolMA2UBO9yJCEse2zd8wV/zcnVr1j0e8VyG8935wpVWeXHYPFQY6HybeWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710755629; a=rsa-sha256; cv=none; b=JV+YXhKaWMeia5SpHhjaqnW/HFyq9u3rbFkJr5ANoAARcnhdVmWJxEEfvlDA3JpFSdgvJO z6afknQSqJsnJRcxIfJ+a5A9mc9pPMmaM0jIvGqVW0Om4omOMjg4v320tlXypINRW/NZro E+NjyMtxqdFIvS7tp5hPZv7tzG9gF25llgU0VzLNZUbn5CKu4/n1Hp99IiGhVQDjP7UeI8 XJg0Guh602uNVKyXAepfAgQIO135+6asw6ckNxsj3VeVsykutP8ZEilVPxj0ReZ31l8gPv M5GP/0NlHq8lTw8TkFskd/7PoexKih+/ziQ8k3dE1aN/NqFoh81qIXiIryPuOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755629; 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=uBZl3hKCK6WpKS4IgxZibgTS2tHF2h2Vc//lvQfYX+M=; b=D5fzlY6Xgzo07jgt6BjMKpe5mK/22U8ErbLn70APB6Co5ByKygN0gA6xEoN0nLPWmZWLmo HblwTJBPfecSaaQELc66Ynb6q8k+28s5EsSP6nU9DAHW1rMcOjXeHFNJJII6Nrr/vju/G6 75MkRW8uGahhItlvPbW6zE0G5OCTNxtaGy8xNiV5BltGygmriEZ0ixMMPy80c/SF5q+Wdu l8VzYU3RcpwWRijMcqQic7KzCXCmcwaD7eHCsJmC80sPe2ulv3cDUcPBuAGMPzYiQ+wpAW +l4hrtf4zru9r25DBjhmZ1vM696VPfcj0qwEpadI/iDpWCH0N1fe+jLlWvOxeQ== 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 4Tyqth6q19zJ8H; Mon, 18 Mar 2024 09:53: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 42I9rmFj090543; Mon, 18 Mar 2024 09:53:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I9rmbZ090540; Mon, 18 Mar 2024 09:53:48 GMT (envelope-from git) Date: Mon, 18 Mar 2024 09:53:48 GMT Message-Id: <202403180953.42I9rmbZ090540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Murray Subject: git: e38f2308273c - main - lib/msun: Fix tgammal(3) on IEEE 128-bit platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e38f2308273c8a51ec45f013d22c963590917cca Auto-Submitted: auto-generated The branch main has been updated by markm: URL: https://cgit.FreeBSD.org/src/commit/?id=e38f2308273c8a51ec45f013d22c963590917cca commit e38f2308273c8a51ec45f013d22c963590917cca Author: Mark Murray AuthorDate: 2024-03-01 15:53:58 +0000 Commit: Mark Murray CommitDate: 2024-03-18 09:48:43 +0000 lib/msun: Fix tgammal(3) on IEEE 128-bit platforms Undo the 80-bit "stub" implementation of the 128-bit long double tgammal(3) function. The latest (as of Feb 2024) version of the src/contrib/arm-optimised-routines library includes a standalone, full 128-bit replacement. This needs a small bit of wrapping to fit it in, but is otherwise a drop-in replacement. Testing this is hard, as most maths packages blow up as soon as their 80-bit floating-point capability is exceeded. With 128-bit tgammal(), this is easy to do, and this is the range that needs to be checked the most carefully. Using my copy of Maple, I was able to check that the output was within a few ULP of the correct answer, right up to the point of 128-bit over- and underflow. Additionally, the results are no worse, and indeed better than the 80-bit version. Steve Kargl sent me his libm testing code, which I used to verify that the excpetions for certain key values were correct. Tested in this case were +-Inf, +-NaN, +-1 and +-0. Differential Revision: https://reviews.freebsd.org/D44168 Reviewed by: theraven, andrew, imp --- lib/msun/Makefile | 2 +- lib/msun/ld128/b_tgammal.c | 53 +++++----------------------------------------- lib/msun/man/lgamma.3 | 19 ++++++++--------- 3 files changed, 15 insertions(+), 59 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 6c8c6c3e8009..24989749a502 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -26,7 +26,7 @@ CFLAGS+= -I${.CURDIR}/x86 CFLAGS+= -I${.CURDIR}/ld80 .elif ${LDBL_PREC} == 113 .PATH: ${.CURDIR}/ld128 -CFLAGS+= -I${.CURDIR}/ld128 +CFLAGS+= -I${.CURDIR}/ld128 -I${SRCTOP}/contrib/arm-optimized-routines/math .endif CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} diff --git a/lib/msun/ld128/b_tgammal.c b/lib/msun/ld128/b_tgammal.c index 4bae4f3aded6..6df7264a4c9e 100644 --- a/lib/msun/ld128/b_tgammal.c +++ b/lib/msun/ld128/b_tgammal.c @@ -1,55 +1,12 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2013 David Chisnall - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * Copyright (c) 2024 The FreeBSD Foundation */ -#include -#include - /* - * If long double is not the same size as double, then these will lose - * precision and we should emit a warning whenever something links against - * them. + * This is a pure C function generously donated by ARM. + * See src/contrib/arm-optimized-routines/math/tgamma128.[ch]. */ -#if (LDBL_MANT_DIG > 53) -#define WARN_IMPRECISE(x) \ - __warn_references(x, # x " has lower than advertised precision"); -#else -#define WARN_IMPRECISE(x) -#endif -/* - * Declare the functions as weak variants so that other libraries providing - * real versions can override them. - */ -#define DECLARE_WEAK(x)\ - __weak_reference(imprecise_## x, x);\ - WARN_IMPRECISE(x) - -#define DECLARE_IMPRECISE(f) \ - long double imprecise_ ## f ## l(long double v) { return f(v); }\ - DECLARE_WEAK(f ## l) - -DECLARE_IMPRECISE(tgamma); +#define tgamma128 tgammal +#include "tgamma128.c" diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3 index 8c0298ec8299..a77d524373fb 100644 --- a/lib/msun/man/lgamma.3 +++ b/lib/msun/man/lgamma.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 8, 2017 +.Dd March 1, 2024 .Dt LGAMMA 3 .Os .Sh NAME @@ -167,15 +167,6 @@ non-positive integers. For large non-integer negative values, .Fn tgamma will underflow. -.Sh BUGS -To conform with newer C/C++ standards, a stub implementation for -.Nm tgammal -was committed to the math library, where -.Nm tgammal -is mapped to -.Nm tgamma . -Thus, the numerical accuracy is at most that of the 53-bit double -precision implementation. .Sh SEE ALSO .Xr math 3 .Sh STANDARDS @@ -212,3 +203,11 @@ The .Fn tgamma function appeared in .Fx 5.0 . +The 128-bit +.Ft long double +version of +.Fn tgammal +replaced the 80-bit stub version in +version in +.Fx 16 , +thanks to an appropriate implementation from Arm. From nobody Mon Mar 18 09:58:55 2024 X-Original-To: dev-commits-src-all@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 4Tyr0b2sNcz5D7t6; Mon, 18 Mar 2024 09:58: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 4Tyr0b2JmWz4nlW; Mon, 18 Mar 2024 09:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755935; 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=jwemQ0TRP+1SvPVQ/rT5zwrbfllGGHaNpiPs5NjQ8Bw=; b=KanKkTsaFd+4WFK5w49TBGotOSfVEpx7APY1D70Yq3gGugZKylMKLJw6Wg0/2Mk6gfoWrG sQU7wu23ug/D0vVk3C1Ta7EeWS1LB+zP00XJkRF00s9b4mVTfgnm1X8uvqAOQo5Kzggdok EL9sTWl99+Npyhtbf4isVNebLfOLAMzknSgaYsjDnYXqjehMMT2JZJeTuSRu4lW3VxGnZc uhKOJhBt+IlqJwWPUjhAEXecRwwKvYjF5c+GTUiogguKi8/PJ4vIHkBzm1ndtU3XOMiEzx +LmdqaTlDtZh55OsCx/TGrlMv6PlwNdIi7pC2aL9Q8z9I4NUx8lRWjlQbzWSLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710755935; a=rsa-sha256; cv=none; b=cTxAULSjGciXeWo26r1tkz2M+NdzMga6PG/diUqouYl/bjpT2gpJlHMMOmODNsqwYzXgu5 t3/CgHPpW7ToeO5Qzj5mFTsVY82NNekTPLBzBF4MhGHFOUsfim4As0fKl3uNGLIvKJAr4Z 750nKmI0jychfD1Su677KcFzYTYkT0aVMQBPnbFGYtQ4IcMa+jCJdfSVJsFC/z/U5eJ73y KHpyIMnNp4bQMaM/w7ZNMXfE0ZPNEHPuFiqNInRq2hls95+7lQdUBTPUlvDe935M/gpMmT XQrgDs6O80Tj2rMcG5UIeF8FCAHIF6TI/vbDCsfi9jJau2lTCmeO3jHvO+wfog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710755935; 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=jwemQ0TRP+1SvPVQ/rT5zwrbfllGGHaNpiPs5NjQ8Bw=; b=Nl+tDbDRmDnE54Yv8q+hzdcspn/mC6iLz+p9HQlHeuTuEos/kojLzBTWa+TKnMTvunceyQ 585NXr0rfb2QD3s0lN4AOl3mYPRWpLNp5OzMSeRSt2j9o7rvTs6iLUh/6h6XAOvIRzwPyS 1e2XHpGY3pH3xNf1hrRBuZ62+qv5OBndHVafYyPL5WGWfW+reWh51/nux+yvYh3jv5cVGa Oi0ndu9OiRbydzyBRaT4pRi37wcgj1EVkajTb64hpONyDaC89H1tq57oppwlILnZ3cVP/h 214Ehzkytx5b9BtVgHdsHbG8JbrmqAuuUDECG9tUfoCI3phYXX9VEcbV1wBaNw== 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 4Tyr0b1pTvzJH1; Mon, 18 Mar 2024 09:58: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 42I9wthN091396; Mon, 18 Mar 2024 09:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I9wtPN091393; Mon, 18 Mar 2024 09:58:55 GMT (envelope-from git) Date: Mon, 18 Mar 2024 09:58:55 GMT Message-Id: <202403180958.42I9wtPN091393@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 78b6117dac99 - main - release: add basic cloudinit images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78b6117dac99c80fe618979fef4ef322b97415fa Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=78b6117dac99c80fe618979fef4ef322b97415fa commit 78b6117dac99c80fe618979fef4ef322b97415fa Author: Baptiste Daroussin AuthorDate: 2024-03-15 08:43:20 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 09:58:50 +0000 release: add basic cloudinit images Provide both zfs and ufs images which a 1MB partition reserved for the config drive wearing a GPT Label "config-drive" to allow consumer to know where they should push the config drive on the provided image. 2 formats available: qcow2 and raw This has been tested on OVHCloud baremetal via "bring your own image" Also tested on openstack Reviewed by: emaste Sponsored by: OVHCloud Differential Revision: https://reviews.freebsd.org/D44369 --- release/Makefile.vm | 4 ++++ release/tools/basic-cloudinit.conf | 36 ++++++++++++++++++++++++++++++++++++ release/tools/vmimage.subr | 5 +++++ 3 files changed, 45 insertions(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index b9c43e8b491f..2b252aa18c3a 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -19,6 +19,7 @@ RAW_DESC= Unformatted raw disk image CLOUDWARE_TYPES?= AZURE \ BASIC-CI \ + BASIC-CLOUDINIT \ EC2 \ GCE \ OCI \ @@ -29,6 +30,9 @@ AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST?= ufs BASIC-CI_DESC= Image for CI +BASIC-CLOUDINIT_FORMAT= raw qcow2 +BASIC-CLOUDINIT_FSLIST?= ufs zfs +BASIC_CLOUDINIT_DESC?= Images for VM with cloudinit disk config support EC2_FORMAT= raw EC2_FSLIST?= ufs zfs EC2_FLAVOURS?= BASE CLOUD-INIT diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf new file mode 100644 index 000000000000..da4bed5ea5b5 --- /dev/null +++ b/release/tools/basic-cloudinit.conf @@ -0,0 +1,36 @@ +#!/bin/sh +# +# + +# Should be enough for base image, image can be resized in needed +export VMSIZE=5g + +# 1M config drive should be enough in most cases +export CONFIG_DRIVE=YES +export CONFIG_DRIVE_SIZE=1M + +# Set to a list of third-party software to enable in rc.conf(5). +export VM_RC_LIST="sshd growfs nuageinit" + +vm_extra_pre_umount() { + cat << EOF >> ${DESTDIR}/etc/rc.conf +dumpdev="AUTO" +ifconfig_DEFAULT="DHCP" +sshd_enable="YES" +EOF + + cat << EOF >> ${DESTDIR}/boot/loader.conf +autoboot_delay="-1" +beastie_disable="YES" +loader_logo="none" +console="comconsole,vidconsole" +EOF + cat <> ${DESTDIR}/etc/ssh/sshd_config +PasswordAuthentication yes +UsePAM no +EOF + + touch ${DESTDIR}/firstboot + + return 0 +} diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 41437a9e1edb..0346e33b81b4 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -239,6 +239,10 @@ vm_create_disk() { BOOTPARTSOFFSET=":${VM_BOOTPARTSOFFSET}" fi + if [ -n "${CONFIG_DRIVE}" ]; then + CONFIG_DRIVE="-p freebsd/config-drive::${CONFIG_DRIVE_SIZE}" + fi + case "${VMFS}" in ufs) FSPARTTYPE=freebsd-ufs @@ -312,6 +316,7 @@ vm_create_disk() { mkimg -s ${PARTSCHEME} -f ${VMFORMAT} \ ${BOOTPARTS} \ ${SWAPOPT} \ + ${CONFIG_DRIVE} \ ${ROOTFSPART} \ -o ${VMIMAGE} From nobody Mon Mar 18 10:02:18 2024 X-Original-To: dev-commits-src-all@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 4Tyr4V457tz5D7ws; Mon, 18 Mar 2024 10:02: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 4Tyr4V3XgCz4p2B; Mon, 18 Mar 2024 10:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710756138; 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=yAWaLhcx2kQZX00gjiieFfIeNIXdymJz89AhHQX4de4=; b=EUdyFjKrU0n0KHsNlyIev6V9+x1T3+BiXIIL5UXdPShHN7iHLThIKtWZ7grYPKCnWEtEVk G/pfCPHuoB5/TYUWUIXPw+H9VOCqGF70NevA1oVTv7h2Z//vJtEt8MNDLDwXG4LtEZr6SW 1U0t1wmAzDKg1IJfv6MoLKZ06u5JqTV0fKhJDFd21TpnwsFwh56BFCxyV/Tgn5mWMVGwM6 GIUJEmdxaObZVqwM/+qBBOIE3I8KSdxyVF7AdSVIIMKXP7Y1H5lD0tAB2923C3NsvB54UD 985J+Ubdjzri2Q7hn8waO4tbucs7Cu9SRAwsEvytHyCvfIUxLWYOXgTGUQFa6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710756138; a=rsa-sha256; cv=none; b=vcqUpWr2LIWUDfC/cHoCy7fquQrZMuW2f3/0/Na0oWUq6rFJq6Oq4Yn1S7BqXo9uQcETxb qF174loqPYhHJg7vqPlBiTNCXRnJWMdnonPuLiqRjYZVO40Q6EW2fOweoX/5dMNFhJT4HR tBG87glnFiIRr3AsRGAHiAGTvAYjMmkLdn210xebXzlkHldtxrc3VvCIX/sHpArjytJQd5 N6nqeZrAwu/M67R7WPe/3LAj+uuJ+eY6zlJacbNMVKPrGJKKQSSwMgP9Qq95k7R7pKAgoq yJKx8H2EhRUbuz49koFMdOYmJ6ywe8TBgO9/FNXeWcFhcrH2G4s9rwAGfr1G+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710756138; 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=yAWaLhcx2kQZX00gjiieFfIeNIXdymJz89AhHQX4de4=; b=jK3ECz2Gz8ENLnf4bKK5K/6X4bck3p/W9j/U/hK+Miv2SNDdmGXGe7QtGrnNvar1HPyqcH +TGENcYoeyhUhMWE1DXakb+w4qZmLUQBqHTBY1C/PHSuvhEGidl2VGG5jtrGCqWt4NScxe wMpPypif7YU3+cXNXqjXGmrRjWW8qi7QgC4EH180PQC5GWp3DPbzzOW7SHF8GFBiPzSfd1 ilcG/eiYL5Ou/rJH7ZoYX2iNv+hOsRUhPhPT/431kUVJTKCXrvMP7FOsqnvbpcZZRtuZS+ kcIRn4pjCG2d4CnUHprX+pZBCZOQWaiA/w/cuVYKrxRqdAaU+69aSgxoIXo4Ig== 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 4Tyr4V37g7zJfr; Mon, 18 Mar 2024 10:02: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 42IA2IkU007120; Mon, 18 Mar 2024 10:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IA2ILr007117; Mon, 18 Mar 2024 10:02:18 GMT (envelope-from git) Date: Mon, 18 Mar 2024 10:02:18 GMT Message-Id: <202403181002.42IA2ILr007117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 85c3ef77cc9f - main - freebsd-update: mark "cron" as fetched as "fetch" itself List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85c3ef77cc9f7dbf8500c3d16c82d24eb06bfa81 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=85c3ef77cc9f7dbf8500c3d16c82d24eb06bfa81 commit 85c3ef77cc9f7dbf8500c3d16c82d24eb06bfa81 Author: Michael Osipov AuthorDate: 2024-03-14 16:39:47 +0000 Commit: Michael Osipov CommitDate: 2024-03-18 10:01:59 +0000 freebsd-update: mark "cron" as fetched as "fetch" itself The change in 33bd05c3187d7b49c80cf1b0132b405c105d0833 was incomplete because it did not mark "cron" as ISFETCHED=1 although it performs the same operations as "install", but less output and does not perform a hard exit. Mark result as such and make "install" know that updates have been fetched. PR: 277699 Approved by: jrm (mentor), emaste, cperciva MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44356 --- usr.sbin/freebsd-update/freebsd-update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index a3e56127f9eb..88a0a4439e50 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3457,6 +3457,7 @@ cmd_cron () { [ ${VERBOSELEVEL} = "debug" ]; then mail -s "`hostname` security updates" ${MAILTO} < ${TMPFILE} fi + ISFETCHED=1 rm ${TMPFILE} } From nobody Mon Mar 18 10:49:15 2024 X-Original-To: dev-commits-src-all@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 4Tys6g4L7fz5DDKZ; Mon, 18 Mar 2024 10:49:15 +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 4Tys6g3qQSz4tF3; Mon, 18 Mar 2024 10:49:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710758955; 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=AKWm54m9RYDMM2a/SgmKYh0jfoOkEkdrrQvXyy2VT/0=; b=bqJJ+AePRon1Tx/eaIceg2jIzc0+9XNY4TSiU//QrLfTvnijq+ozzuXKQ+K3fkndZ7DAE7 UdMajQ8OmDjZeU3FGioRrn3+Ac9waUeV7NcZF/dVYBIVMEOPUgVHvqJ8ieTvX3eIr9Y6ML GvL609IAaniUMoTlsxSZ7PhTLD0xYqO/h4OVNL8GDHcHrt55QpwbTKd5g+2cU3GkqwjGf0 HIpF2JqFIzH5R/z+2whXZjP0rbGTpdhakoY/0sPo2XZ8EbGftY/T/OjxWLDYwf/mtXuPyj GYGssaoytcb0Tq0WMJsBQZ1gPbmnd2sMUbfFypyRrhegiPS5S0X71gkfnt8k1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710758955; a=rsa-sha256; cv=none; b=SoNGroTPigM/3CivVMPMApUMwVuna9GX1id6kvSGxJPg9O1pQc0JF+NpguxNrcX5e1E0l7 +yEL3XjXNXw0VxpMVrMEWelVSZ3vc6KX4ruh9zpmgbpJUfslKYEl2KzpkuPUggAtiIooTy n24brjRfB7gJJWQskfAxQ/S8/ZKYwyYwAPm9HNJlXfTlrKFZgE6SmqpH7I9XRyIkM0FODe BKXjXuox0sZHIILs3ykV+7YYprlvsaD9QC3yOFv1PQwImR+wutp3xGQxomWV4UXMqQN5id oQS4y1FKnyaX5RllwX8IWhRr7ZAVHHv4oLRwL5Oub+v5x8npie2VKvk2zlVyPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710758955; 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=AKWm54m9RYDMM2a/SgmKYh0jfoOkEkdrrQvXyy2VT/0=; b=x18ZlKYqbVtGVN/KLg5tCbqD5rm+pkwzHYb3SSmKa6D497cc8hduPKWD0bTDewbgtOn6ZI 4IIyVnnlLFxjmeeoI/ix8Ew/IhzL9UgWZRail4eyJ823NPrUMwfUkYlDi2F/+IgPTibsBH lWQX4eWOI2TY3RrmZpYNTE8Mbbkq39eHsfBJ8JEvyXs350gbRO42myaEjrr98tDaGZcqjb LKC2RzvsR44cEGJcyr4tJKg1H9yt85o/Rt5Qm0V2w2hso+LPhCw1Yf+bRkUTEJR0jIvNk/ AItazvMCGbA5p7dC/v08wKpdb2uo2UlgIBGC9sYylTFQe3/NKbvwng7xlMlPzQ== 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 4Tys6g3QMCzKRS; Mon, 18 Mar 2024 10:49:15 +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 42IAnFka076102; Mon, 18 Mar 2024 10:49:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IAnFA3076099; Mon, 18 Mar 2024 10:49:15 GMT (envelope-from git) Date: Mon, 18 Mar 2024 10:49:15 GMT Message-Id: <202403181049.42IAnFA3076099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: b0aaf8beb126 - main - Rename VM_LAST to more appropriate VM_GUEST_LAST List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0aaf8beb12609f8a94575ee21f849474bf7e03a Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b0aaf8beb12609f8a94575ee21f849474bf7e03a commit b0aaf8beb12609f8a94575ee21f849474bf7e03a Author: Mateusz Guzik AuthorDate: 2024-03-18 10:48:10 +0000 Commit: Mateusz Guzik CommitDate: 2024-03-18 10:49:09 +0000 Rename VM_LAST to more appropriate VM_GUEST_LAST NFC Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/subr_param.c | 2 +- sys/sys/systm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index caa30b56b582..2a721c3c113f 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -157,7 +157,7 @@ static const char *const vm_guest_sysctl_names[] = { [VM_GUEST_VBOX] = "vbox", [VM_GUEST_PARALLELS] = "parallels", }; -_Static_assert(nitems(vm_guest_sysctl_names) == VM_LAST, +_Static_assert(nitems(vm_guest_sysctl_names) == VM_GUEST_LAST, "new vm guest type not added to vm_guest_sysctl_names"); /* diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 17a1c814cf75..435e6b61c904 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -79,7 +79,7 @@ extern u_long maxphys; /* max raw I/O transfer size */ */ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV, VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_GUEST_VBOX, - VM_GUEST_PARALLELS, VM_LAST }; + VM_GUEST_PARALLELS, VM_GUEST_LAST }; #endif /* KERNEL */ From nobody Mon Mar 18 11:02:10 2024 X-Original-To: dev-commits-src-all@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 4TysPc2srlz5DF9P; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4TysPc2Pmyz4vsS; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710759732; 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=eaiOHkH9vs/Oilgh6yr7/f86/WcUzI4HIRSe47G9ap0=; b=amAVuKGLcfmW4usx8Yx8fOY3Y8FTm/K7vdRlJZqxWS9RnxfQUOG+fNPt4cU2Z5ZRkYu2F5 MjSl9DQKp/6o2Q0NWeaVWNIFMCIMsK6KdDWb7SC/NvwLXdTW4iHsN0J5YYc1gEt6No/Te0 PrIVjgzLUhSgrq938LjV6uOrusGof1yuHK8mAS8SURSUzEeVzt7muX9cME6zEFCciToXPg WWMhl55uSD/Ipn2w1BaWThmEeZr/8xAYyGQggF0XeIrFKpkbZp3ZzAPuogapHV6XzpP5Vl 6JNHh0FhAvWgn5+52/2dNfgKRYNyhn09mf9fqXJFzz0kL9363znAv2KSS1R55A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710759732; a=rsa-sha256; cv=none; b=Yr4SDj+saHuAhXs46SqoO/CE6WCqSdzf984g0X3DZ43dQJzg6Y0D6clRHbgP25MVVYAmqr UKOw4LUs0cL+nf8qUwP3E3ExpQe5812El1INFZTR1twvMeEc3QIyul+OforTBjjNhQH5sL jQ2wMcS7kAk95zFLvbKCDZaQav2CtQG5fI8047p1xBn094owN6HHuc3upHdHj0qtZEPFCi i9DoD2Jf98/qNL3S4hgjCAT3XP+YoN1iRC6oo12za2R0hV+Z0XnHYLUYk+KKcWkkST7W/e 7wBaD9dqsGg8bJyUJWh1YkeYY/of/PAvsv80EjI2xX2lAPute58B6rAmaq600A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710759732; 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=eaiOHkH9vs/Oilgh6yr7/f86/WcUzI4HIRSe47G9ap0=; b=tZavpLRngPiGVFQIeTQv02A7YrWyGydGBD9Niv1bN1vCUQegY57IvN3mzjwWVSQLZhyJSZ xb0PIbPD4syDh53cMbyQ+BQGoCVzHofHYuQqDrtkYxfZ7uG5yBIv20jtICHFIFL+Im4lMG Fgm2FyHKjs0cA09VNv0yUk1FRlRrA9i8qdo2uspxWd8j6QEQAy3hXN5DtGvTjPQsK4JvTU vzmQUAhh3jzl+xQEHZlv+oRvt8+pOO/UC35+FZmoQH9i2PUH3DCWxCQQZusWMI4aGm/dAG Jgi2/hUDfklZWDtg4AGPkBPuenXK3TW7ODSBZVCXeE9GoFgk/PX4UBRnThtjJw== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TysPc1Q0Zz1SV8; Mon, 18 Mar 2024 11:02:12 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 54511782A1; Mon, 18 Mar 2024 12:02:10 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Martin Matuska Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 81be5a55d9bb - stable/14 - zfs: merge openzfs/zfs@c883088df (zfs-2.2-release) into stable/14 In-Reply-To: <202402231838.41NIcEgt087454@gitrepo.freebsd.org> (Martin Matuska's message of "Fri, 23 Feb 2024 18:38:14 GMT") References: <202402231838.41NIcEgt087454@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 18 Mar 2024 12:02:10 +0100 Message-ID: <86r0g7hkgd.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Martin Matuska writes: > The branch stable/14 has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D81be5a55d9bb8717e280433cd8= 927dfe9bf9b814 > > commit 81be5a55d9bb8717e280433cd8927dfe9bf9b814 > Merge: fba1a994acfe c883088df83c > Author: Martin Matuska > AuthorDate: 2024-02-23 18:37:08 +0000 > Commit: Martin Matuska > CommitDate: 2024-02-23 18:37:36 +0000 > > zfs: merge openzfs/zfs@c883088df (zfs-2.2-release) into stable/14 This broke the gcc12 build due to improper use of the ASSERT0() macro to check a pointer in sys/contrib/openzfs/module/zfs/dbuf.c. Are you going to fix it or am I going to have to revert it? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Mar 18 13:44:41 2024 X-Original-To: dev-commits-src-all@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 4Tyx153TF8z5Dlp7; Mon, 18 Mar 2024 13:44:41 +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 4Tyx1530SZz4L8p; Mon, 18 Mar 2024 13:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; 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=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=S0X2EouJpmJWueCeNurMA0uMMnnsOjf6+PaHyWMW4EoiVu1ZuWUuoRDZ4U86LuW5PPf/8D Z5nKCMgslilALaLMqkeuotFtdm/tVF4qkX20ZqgvZH1eKklfyIpzsxoNf3WwbRYp/z9kGe pOMPYxl/G3OmC7NZAHlJ83ctkIoxJ+aezNOJoA5mdCM3KF0a2oxI1xIYa8O8d/3czDCKb0 ytzATYIC7qpr5/zJVKH+afRBIwXrLbIeHVQhFK6wvIDksyPDcF5z/I0mFpyB3+tkBeveu1 9STAsbOrls7RsMB/hd8LyRftVbJkNMT4g1MtGmy30Pk8MbtiEIsGnWY0TeVhqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710769481; a=rsa-sha256; cv=none; b=euG5h520CXH4pFosku6hNAh1J4D0G7R0hemP1f9+64bTn3Sc8Xy3EAFvuVbZ/aZnDldz+n od2JfCt185LJm3fgTT5YPykAkRdjpsCZqabddTxd9Yrh9qfM/xz63oe+d6HUclI+cBTGZO lVLN234IW5+sq55JbKiOBvUTdudd6mbSYNfzhraSn34wIveHl9qRNEEZAAR9F+sx1brZV4 enhqimWwFIUFUBoZG9/KpzAIFmjkadHIsVvGT4zg2iC1SZEgzdCaXkmedG74Ot6pGPhyx/ XVjT8Y2RQzbCW48J+ICuwgTBJoCRWNghB0ZMCf005mSf6ze11YRFM/T1GuvzYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710769481; 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=JaVh9wf0zrANZ33tdjFCmXOUmvrDxxnyl6/EHnz+1rE=; b=Si2/LYp4H06hVlpz2XM28T96goEZ+XYd+QNmeW+3IvvlSjeQ1IjfkRat0l12nkG/iXarOa vwmywFj6kzZqE0kKo3SbgZPxikGsbug84oYK9pmQaAG82tynSDtfHF7PsPbSvK2uy07eH3 wPwKhOAFjhHEZ7m9q2bKnJfV8YXK94sljv94JlzdOqwUeuhhXomNpejvpJf6vILWHbIl8L 5K9BUGpvCwp44x9oBDYtyJNuc4t9Imt94iY0FvD2BaTNnWtMbvE28U1OLa4ZWaZ/XihI5f pl4tc77ind6fdR/Io6mog9YeJmYke3hTd+EU2uFv1w9devzw2neHWngvCaCNmQ== 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 4Tyx152c1VzQ3F; Mon, 18 Mar 2024 13:44:41 +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 42IDif7W080042; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDifKr080039; Mon, 18 Mar 2024 13:44:41 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:44:41 GMT Message-Id: <202403181344.42IDifKr080039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2165931f74f5 - stable/14 - zfs: fix NULL assertion in dbuf.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2165931f74f5b1cbb8f0dee4b5764b694170a5ec commit 2165931f74f5b1cbb8f0dee4b5764b694170a5ec Author: Martin Matuska AuthorDate: 2024-03-18 11:44:52 +0000 Commit: Martin Matuska CommitDate: 2024-03-18 13:43:58 +0000 zfs: fix NULL assertion in dbuf.c When porting from OpenZFS master 86e115e to OpenZFS 2.2.x 9c40ae0 an assertion in dbuf.c was converted improperly. This is a direct commit to stable/14. OpenZFS PR: 16005 Differential Revision: https://reviews.freebsd.org/D44404 --- sys/contrib/openzfs/module/zfs/dbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/zfs/dbuf.c b/sys/contrib/openzfs/module/zfs/dbuf.c index 280001bc34b6..6e983093fb97 100644 --- a/sys/contrib/openzfs/module/zfs/dbuf.c +++ b/sys/contrib/openzfs/module/zfs/dbuf.c @@ -1923,7 +1923,7 @@ dbuf_unoverride(dbuf_dirty_record_t *dr) zio_free(db->db_objset->os_spa, txg, bp); if (dr->dt.dl.dr_brtwrite) { - ASSERT0(dr->dt.dl.dr_data); + ASSERT(dr->dt.dl.dr_data == NULL); dr->dt.dl.dr_data = db->db_buf; } dr->dt.dl.dr_override_state = DR_NOT_OVERRIDDEN; From nobody Mon Mar 18 13:59:06 2024 X-Original-To: dev-commits-src-all@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 4TyxKk6jtLz5DnLM; Mon, 18 Mar 2024 13:59: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 4TyxKk65pNz4Mnx; Mon, 18 Mar 2024 13:59:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770346; 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=g5YlV8gXoOw9gO2tEWiaPUPJZcTiOcV+OiHmQVCY8wk=; b=w93dcixHORjZx7peVCJ2HkZjSqSgC/sUtFSc1zio615+FP8UaG7jmOYE/7th4OqhVUgAz7 yb25iH6I5y/P4edMrsbiKvk5PP0n8vUnzoFDZ3rcu9DV2F9BykwvajIvT6ekS6w9xLICCi 6/OkNtEGz60oKoHKuhbQL1exEPmHbtGiNYuaBMU9eQVUXTd70Yal1NSWZ/oo/oxxMVG6V8 BxDh3ixtt5QIKwep13IQorMIPMC1oZ0Z/C2aVC1N5vteuKsoQsmGe89/2dNE9kXlhCJ4yA JsXgQVmnIvtSTmmByJFT6NCUnFzBNUDz6oTd7Ab26TVhf+KA77OTpq8D8PrWHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710770346; a=rsa-sha256; cv=none; b=Sf9n5paRbALjtZkLu2i/rNietYNRkmiwn+oy4pFhghNiX6M3lH0xEZkPukc6yVD+KFfXJX m/t4UF8PhRDsKRE9WGEdEsX+xdzp/OhFkqq3K3wN3N4H2qoNxZLs3/SjTP+T1cM04GuelN utQ55uj2MUATRVWPeUuXxToefB1uYn1NLqvTRTk0nr8085Wcbd+ODT72GJhSPxiBqvMcEx TPfDk5v0LwWXkvlOwzW5tyqXD+EnI4lB/qHxbD7m4hh6VrysT1dH9xMpAVoG/EIe+wkXrc c7tlJYXwunic5WXxOWYe2QbBqFYge03XhopB/Vt9nzNlXz1Umi3QyYOyj0haPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770346; 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=g5YlV8gXoOw9gO2tEWiaPUPJZcTiOcV+OiHmQVCY8wk=; b=KYrP5hmKW0zEJlhD75wI/oU28+QnIA6vCWOBHrWoyvZZkTX7Xz83D9XJnYvX109teRDOG2 FbVsHN4eXbzio/MvvNWshkatObqauKVHaOQog9oYSw8mWlwBnsG9Mw1EUu05ERW59FASyK LQ8Wvry15UWmPhaMXA/djWgUBT1uj4c2bCBP6hPsqvB6hQ/JNeYYPPMU5XsfxW9fx0PM23 t9NMWTB37BM5lCQZdI8VEHv87SIgOeH5gc8p61ctu3lZMvwhZ4+9g0jNclSsUSjiMDtAKw t+i8Yj3COfql54q8aXHFUC8+R2kRomuqVqhk7O88UzEQm7YHFfTVLRPAixBqeg== 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 4TyxKk5NqgzQ4B; Mon, 18 Mar 2024 13:59: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 42IDx6WH098231; Mon, 18 Mar 2024 13:59:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDx6xM098228; Mon, 18 Mar 2024 13:59:06 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:59:06 GMT Message-Id: <202403181359.42IDx6xM098228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e819534f1530 - main - bectl: Use geopt() and drop mention of -?. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e819534f15308c92afd19166254604995766ce32 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e819534f15308c92afd19166254604995766ce32 commit e819534f15308c92afd19166254604995766ce32 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-18 13:49:18 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 --- sbin/bectl/bectl.8 | 9 ++++----- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 93244c52ce4d..be927d123e9f 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -13,7 +13,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -21,7 +21,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -115,10 +115,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index e398e055a3b2..68f3de5b7e78 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -64,7 +64,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -545,27 +545,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -573,9 +577,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Mon Mar 18 13:59:07 2024 X-Original-To: dev-commits-src-all@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 4TyxKm1LRfz5Dn7n; Mon, 18 Mar 2024 13:59: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 4TyxKl6Jnlz4MgF; Mon, 18 Mar 2024 13:59:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770347; 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=K2x07U038KgoHPH/A39l+gdV0Y/yfCeysAk80E7fnVA=; b=WNSoo4s2tbr6EArrF3afVFLVPC3yqOS0aeLvXm+gXmCvHLUuefCO3/quITuWb8Whqc2IAj S8IRLFdjDbFnwHZNq61RYRxnqS396Q9l/X6lEUhTRozUfmk+JOTrMWKJJrp/e23I4VGypy Y/k6VdnmZ/gEg03vv/GKCjd+T1gHMpIeeDzB5zARInVvFBPcXJWhhpP11Q45/TbA7h0Yir k9N8MGaS4nmWk4lDoVyKB7VCzl3MEb7MNzEXAVZ7E6gW9+Al80EEirPGyalQINcyvSYNNd ITcBiuoYtrAakeRB8RyY5g3sav/S/a6qee89hOAXhm+HKO9s+S1zzGDKHKg/4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710770347; a=rsa-sha256; cv=none; b=ymYMp19fUEj1THPR4oolqfm/3Ia8odOKtKdFJRTTtk2r0m+OjCsG9JuiI8F070+6sYVVPJ BYwi0KimHsqjRk1GZ0pZhcr83G9ufNVEfn8l/CcKi+v2Mn8arLV1mbzLx1bIs/tfSb1wIo LSUUSwCjjRMuctWW6vsHkJHvld6SMLH0HK4mkIG9G40xUt6Nw2Zj1zaVqQgNdPO1Wtyk7B DkszFUcfllE9irZwTe5v45XX+0M6229nQQh2KNse0J1JscRQGg6ieXsjH+lP1cVK3ROl7Y iPe1lteUyXU1UaKcLO8ocWjMGUy8iZ0ApRYWYFoNDfHGWt40v9WaqTqbjViq6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770347; 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=K2x07U038KgoHPH/A39l+gdV0Y/yfCeysAk80E7fnVA=; b=uraKbmhyzbPAwJuJ5LR2gP3FoxTsZeXvzqn+MGBQyPrhyTV8TEH2noaBrCymIZsG5QmCSs TILrJq1K+Sog7F523AIUy6gpfHsu+hi4uRf2Af9C5itqlEk1BXHgz9YV0MZSc4YTOSdI7I TlODVnruJh+KiThDoa545WwmV8ogWUgHvcyqMsXU8VpCuc4ZPW/kJzbnceQSwoYYtK8Sll mbZBsgzJLDllsIt5wErFbAfsuSEM0E1hCjktlNY/tFRQ3ZCLc2Kaw57Be35sWDclMRlmpz 0GjBRsa7ctfYOTVYefliCYBn+2AP+Vd69Ee9xJl3zSks+bXY1YEp5atI7CTHFA== 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 4TyxKl5wHczQZ8; Mon, 18 Mar 2024 13:59: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 42IDx7Ue098284; Mon, 18 Mar 2024 13:59:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDx7N2098281; Mon, 18 Mar 2024 13:59:07 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:59:07 GMT Message-Id: <202403181359.42IDx7N2098281@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a46217ce7d16 - main - bectl: Simplify command aliases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a46217ce7d161ce563374899df4d94b6d000138f Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a46217ce7d161ce563374899df4d94b6d000138f commit a46217ce7d161ce563374899df4d94b6d000138f Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-18 13:49:23 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 68f3de5b7e78..f4359750a8d7 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -114,7 +114,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -570,13 +572,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Mon Mar 18 13:59:08 2024 X-Original-To: dev-commits-src-all@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 4TyxKn0qgrz5DnJF; Mon, 18 Mar 2024 13:59: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 4TyxKn0CrMz4McX; Mon, 18 Mar 2024 13:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770349; 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=WuyHO9ByutIxnXfXCOPxNRzL/TV4VnvtP3t3HP/be74=; b=D6GbGmajl/MgIHlDTSI8Jz3v3Dawsm7e5MDQ+HmJaSZHh/6IYYlHGZWDfxsWduBVq/hu7k NODYUIv0lOd5OmAvQpf7ue7XgHPyhpjaUggMDcxkzvRZeaelpEVCzKK5Zopw060ToFjWl7 nvYAyTfSyL9dww7E28FlsuyhO8hAJ1QtTqoVXdAjuOwI5MwErDpVsh4lnzrJjEJ7VnX4GZ d2h12iXLllpHvJxU721QuOzuiK27DGekl29ijoX744Qp2Q7jOc2K+Bs8WazncJDVVaLTlP tAoVaVvQbUVWU/CQUIuf/9ulLfc6G9+eF3wcOBOLdMEhqtN0Bo6vZpk/Ehv/vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710770349; a=rsa-sha256; cv=none; b=Dw/h+5t+iBY9l+35JbG+fGid9gM9/WgPAQi/x9IHASmOQA33e0rrFzL2dUagfJnV2mIUXo D+4noFLQ84v/DnreiqzDkXH0GCtzHadOkaHMco3+o4gra9Y1Cd+DDabtjHnAj29dEsW7qP dzXF2YgnJ43ilJH4xfBc1WLW2JhL+yqpQm2XM6uAL1AVYNIbH3ZXx7ke63m6IlNyyDCU/l LkGjnI6h5Z/gjYao2cPZqJWXksJJ17ckbZJtJ1dV7u8nJ7qAnkFt6+Dza9dSE9LAfQHzwz wDlVUG54Wf/bGJlEY/7x9bjO560TQFDQy5vcs+/ExPZ32tqW+SpEVu9SP+FfDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770349; 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=WuyHO9ByutIxnXfXCOPxNRzL/TV4VnvtP3t3HP/be74=; b=vQSj2SzSBJxU3Ccd3zPAHSEIXXliwhACdtDMFc2QofUOuuSj5bLd5PYsy8S3VZKn8vO1Z6 j5CeAjOrZb3zcD5HYgavY2F/kqMNCCeZ6RnFruvdRUApnec0wUs1bOAY8POF/u4q89eaGC 3lAHBhwwr40HlyDA/E9Fa1JCtBt2csI+ZThEN3dRo7zZw7DWicZp4v/0Z/qEn8+WrYCnU1 y5shHEJ+mTuaePjxs2ZCXq0jcuGUJBn3+xOi5X4hOfocbHo8FbxiYUrx73Cmmp93g/OwSh UIGTR4ctk5eCHH/7a1CI/r2aZwhX1Zn60D8ycXhfuN437vwco3RK6DaG/TePcQ== 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 4TyxKm6xfvzQJK; Mon, 18 Mar 2024 13:59: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 42IDx8x4098332; Mon, 18 Mar 2024 13:59:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IDx8dw098329; Mon, 18 Mar 2024 13:59:08 GMT (envelope-from git) Date: Mon, 18 Mar 2024 13:59:08 GMT Message-Id: <202403181359.42IDx8dw098329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: ad99fea9045d - main - libbe: Fix some markup issues. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ad99fea9045dd3daaeca3d2dd60fffecd2311826 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ad99fea9045dd3daaeca3d2dd60fffecd2311826 commit ad99fea9045dd3daaeca3d2dd60fffecd2311826 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-18 13:49:27 +0000 libbe: Fix some markup issues. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44407 --- lib/libbe/libbe.3 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 0ba5d484bdfc..8a176e37c7bf 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd March 18, 2024 .Dt LIBBE 3 .Os .Sh NAME @@ -178,14 +178,22 @@ If a BE root is supplied, .Nm will only operate out of that pool and BE root. An error may occur if: -.Bl -column -.It /boot and / are not on the same filesystem and device, -.It libzfs fails to initialize, -.It The system has not been properly booted with a ZFS boot +.Bl -bullet +.It +.Pa /boot +and +.Pa / +are not on the same filesystem and device, +.It +libzfs fails to initialize, +.It +The system has not been properly booted with a ZFS boot environment, -.It Nm +.It +.Nm fails to open the zpool the active boot environment resides on, or -.It Nm +.It +.Nm fails to locate the boot environment that is currently mounted. .El .Pp @@ -226,9 +234,8 @@ function creates a snapshot of .Fa be_name named .Fa snap_name . -A +A value of .Dv NULL -.Fa snap_name may be used, indicating that .Fn be_snaphot should derive the snapshot name from the current date and time. @@ -520,7 +527,7 @@ The function will free the property list. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: -.Bl -dash -offset indent -compact +.Bl -bullet -offset indent -compact .It BE_ERR_SUCCESS .It From nobody Mon Mar 18 14:01:24 2024 X-Original-To: dev-commits-src-all@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 4TyxNN4lFZz5DnSZ; Mon, 18 Mar 2024 14:01: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 4TyxNN4XT1z4P9x; Mon, 18 Mar 2024 14:01:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770484; 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=swGL4bSP/APDB9K+01B+veM3cOpaxM7TOrJIuoq74qM=; b=piR6dLaKDABucRQcSmdLwcLDaZ73iioyfFqKr6HGlW4jN05O908ZI3zMCT4E3inThOmSSN AZRrPx4GvGYs2nT68FrFWtw8yMOh2PYwZBUpM3m4rzUS1gr6zlTT7PUt51mIy2e0yZ9Uue lapY+Bhvkq33JJNZGs/QW+OFyQgWhE1tJS+XI0x0ZCbNu0VKuBr7Akd8viX6FD/H91JGv5 wJTT0Lw97cZW+Sb/L4AXlsiTvL8HYYIDxtyZMqkLukoKPhADxCoq/Nk6ARx6TtkUZcM5tj dKzm32glfvPuKLTUfhXOmymJnmHfuLMrjiJuuxiA8DqmLHK/TaAKoIT/gIMTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710770484; a=rsa-sha256; cv=none; b=tpDJlYmsMb9VwcXAbQ6CnJmOOtNf5UAcDpGR8WURCQdG5RtqmblqYdT2Y7F/vaaP/QayOg pqUDVW65EFRtHuPGDkG6IlYIqHakvQVw6oBAa1D+M0jcB5p0D914IPlOI2Rag4IUNWZ8W+ mpw1tMFXTl6Y/yvsNurZ6a7SYdB53Zn9L8bSeP7mE+/PithMQxjUVK6oS5Wew0+1tFZRZA gI+erHIcA2Dy0bp+VjFR2gPF+do1WgZp1lm0xEqXDe5y8ri/vWArEf896LkZ+zBez0KIBz dRi9zdPgTkxKfqmXXRZA8naE9jXxA9UYMaCJaXWwydWId5jGCXe6DVqlgp2C9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710770484; 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=swGL4bSP/APDB9K+01B+veM3cOpaxM7TOrJIuoq74qM=; b=rDEWO04rp90i35K+mdi+BnajZxQlpCyRpc0b7NFlb30Y7sLuiqHbhw6ujN//bQNlUAVcvc PUbOy4DQpmakeH2J8z/sm2gGhkJ1CK1nVIZIaA7oMG3NRAjKg9vIhPf9Xx2dYBEGTL3DIb IUUkMeq/bro63U0qN3Ax6U/qnE1+LnEqFKQ1McfLmDA2U0G16O3iDNLQ4+oXbSG4C1I22Z ZGETU9y+8vR5xM5rTdgfK8XOuxren0b2fpKgff8GgbohGQsDnWwdwnViWHeZo6uAbNtZH6 5ylzby0dvYjQGOjJvvF0GFgzr6XNionPvR/sljIX4xwc92SzJ+E70HroFbnYpg== 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 4TyxNN488MzQnZ; Mon, 18 Mar 2024 14:01: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 42IE1OGI010448; Mon, 18 Mar 2024 14:01:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IE1OHM010441; Mon, 18 Mar 2024 14:01:24 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:01:24 GMT Message-Id: <202403181401.42IE1OHM010441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a91a246563df - main - ssh: Update to OpenSSH 9.7p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a91a246563dffa876a52f53a98de4af9fa364c52 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a91a246563dffa876a52f53a98de4af9fa364c52 commit a91a246563dffa876a52f53a98de4af9fa364c52 Merge: ad99fea9045d 9200ce3210fd Author: Ed Maste AuthorDate: 2024-03-18 14:00:57 +0000 Commit: Ed Maste CommitDate: 2024-03-18 14:00:57 +0000 ssh: Update to OpenSSH 9.7p1 This release contains mostly bugfixes. It also makes support for the DSA signature algorithm a compile-time option, with plans to disable it upstream later this year and remove support entirely in 2025. Full release notes at https://www.openssh.com/txt/release-9.7 Relnotes: Yes Sponsored by: The FreeBSD Foundation crypto/openssh/.github/configs | 21 +- crypto/openssh/.github/setup_ci.sh | 26 + crypto/openssh/.github/workflows/c-cpp.yml | 20 +- crypto/openssh/.github/workflows/selfhosted.yml | 1 + crypto/openssh/.gitignore | 2 + crypto/openssh/.skipped-commit-ids | 2 + crypto/openssh/ChangeLog | 11979 +++++++++---------- crypto/openssh/PROTOCOL | 22 +- crypto/openssh/PROTOCOL.agent | 4 +- crypto/openssh/PROTOCOL.mux | 4 +- crypto/openssh/README | 2 +- crypto/openssh/README.platform | 9 +- crypto/openssh/channels.c | 79 +- crypto/openssh/clientloop.c | 4 +- crypto/openssh/config.h | 3 + crypto/openssh/configure.ac | 50 +- crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/gss-genr.c | 8 +- crypto/openssh/kex.c | 31 +- crypto/openssh/kex.h | 10 +- crypto/openssh/m4/openssh.m4 | 12 +- crypto/openssh/misc.c | 15 +- crypto/openssh/misc.h | 3 +- crypto/openssh/nchan.c | 4 +- crypto/openssh/openbsd-compat/getopt.h | 12 +- crypto/openssh/openbsd-compat/openbsd-compat.h | 10 +- crypto/openssh/readconf.c | 165 +- crypto/openssh/readconf.h | 8 +- crypto/openssh/regress/Makefile | 77 +- crypto/openssh/regress/channel-timeout.sh | 74 +- crypto/openssh/regress/dynamic-forward.sh | 9 +- crypto/openssh/regress/misc/fuzz-harness/Makefile | 8 +- .../regress/misc/fuzz-harness/agent_fuzz_helper.c | 7 + crypto/openssh/regress/multiplex.sh | 3 +- crypto/openssh/regress/putty-ciphers.sh | 51 +- crypto/openssh/regress/putty-kex.sh | 40 +- crypto/openssh/regress/putty-transfer.sh | 13 +- crypto/openssh/regress/test-exec.sh | 28 +- crypto/openssh/regress/unittests/Makefile.inc | 7 +- .../regress/unittests/hostkeys/test_iterate.c | 11 +- crypto/openssh/regress/unittests/kex/test_kex.c | 4 +- .../openssh/regress/unittests/sshkey/test_file.c | 4 +- .../openssh/regress/unittests/sshkey/test_fuzz.c | 8 +- .../openssh/regress/unittests/sshkey/test_sshkey.c | 23 +- crypto/openssh/regress/unittests/sshsig/tests.c | 4 +- crypto/openssh/servconf.c | 168 +- crypto/openssh/session.c | 4 +- crypto/openssh/sftp.c | 44 +- crypto/openssh/ssh-add.1 | 14 +- crypto/openssh/ssh-add.c | 10 +- crypto/openssh/ssh-agent.c | 48 +- crypto/openssh/ssh-dss.c | 7 +- crypto/openssh/ssh-keygen.c | 26 +- crypto/openssh/ssh-keyscan.c | 8 +- crypto/openssh/ssh-keysign.c | 7 +- crypto/openssh/ssh-pkcs11-client.c | 2 + crypto/openssh/ssh.c | 6 +- crypto/openssh/ssh_api.c | 14 +- crypto/openssh/ssh_config.5 | 24 +- crypto/openssh/ssh_namespace.h | 1 + crypto/openssh/sshbuf-getput-crypto.c | 4 +- crypto/openssh/sshconnect.c | 4 +- crypto/openssh/sshconnect2.c | 21 +- crypto/openssh/sshd.c | 4 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 59 +- crypto/openssh/sshkey.c | 12 +- crypto/openssh/sshsig.c | 4 +- crypto/openssh/version.h | 6 +- crypto/openssh/xmss_hash.c | 4 +- 71 files changed, 6362 insertions(+), 7022 deletions(-) diff --cc crypto/openssh/.gitignore index 5e4ae5a60d06,000000000000..7fccc6fe3dc3 mode 100644,000000..100644 --- a/crypto/openssh/.gitignore +++ b/crypto/openssh/.gitignore @@@ -1,36 -1,0 +1,38 @@@ +Makefile +buildpkg.sh +config.h +config.h.in +config.h.in~ +config.log +config.status +configure +aclocal.m4 +openbsd-compat/Makefile +openbsd-compat/regress/Makefile +openssh.xml +opensshd.init +survey.sh +**/*.0 +**/*.o +**/*.lo +**/*.so +**/*.out +**/*.a ++**/*.un~ ++**/.*.swp +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +ssh-sk-helper +sshd +!regress/misc/fuzz-harness/Makefile +!regress/unittests/sshsig/Makefile +tags diff --cc crypto/openssh/config.h index 23645cfe78c7,000000000000..5e7e93992829 mode 100644,000000..100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@@ -1,2051 -1,0 +1,2054 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address + */ +/* #undef AIX_GETNAMEINFO_HACK */ + +/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ +/* #undef AIX_LOGINFAILED_4ARG */ + +/* System only supports IPv4 audit records */ +/* #undef AU_IPv4 */ + +/* Define if your resolver libs need this for getrrsetbyname */ +/* #undef BIND_8_COMPAT */ + +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + +/* broken in chroots on older kernels */ +/* #undef BROKEN_CLOSEFROM */ + +/* Define if cmsg_type is not passed correctly */ +/* #undef BROKEN_CMSG_TYPE */ + +/* getaddrinfo is broken (if present) */ +/* #undef BROKEN_GETADDRINFO */ + +/* getgroups(0,NULL) will return -1 */ +/* #undef BROKEN_GETGROUPS */ + +/* getline is not what we expect */ +/* #undef BROKEN_GETLINE */ + +/* FreeBSD glob does not do what we need */ +#define BROKEN_GLOB 1 + +/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ +/* #undef BROKEN_INET_NTOA */ + +/* Define if your struct dirent expects you to allocate extra space for d_name + */ +/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */ + +/* System poll(2) implementation is broken */ +/* #undef BROKEN_POLL */ + +/* Can't do comparisons on readv */ +/* #undef BROKEN_READV_COMPARISON */ + +/* NetBSD read function is sometimes redirected, breaking atomicio comparisons + against it */ +/* #undef BROKEN_READ_COMPARISON */ + +/* Needed for NeXT */ +/* #undef BROKEN_SAVED_UIDS */ + +/* Define if your setregid() is broken */ +/* #undef BROKEN_SETREGID */ + +/* Define if your setresgid() is broken */ +/* #undef BROKEN_SETRESGID */ + +/* Define if your setresuid() is broken */ +/* #undef BROKEN_SETRESUID */ + +/* Define if your setreuid() is broken */ +/* #undef BROKEN_SETREUID */ + +/* LynxOS has broken setvbuf() implementation */ +/* #undef BROKEN_SETVBUF */ + +/* QNX shadow support is broken */ +/* #undef BROKEN_SHADOW_EXPIRE */ + +/* Define if your snprintf is busted */ +/* #undef BROKEN_SNPRINTF */ + +/* strndup broken, see APAR IY61211 */ +/* #undef BROKEN_STRNDUP */ + +/* strnlen broken, see APAR IY62551 */ +/* #undef BROKEN_STRNLEN */ + +/* strnvis detected broken */ +#define BROKEN_STRNVIS 1 + +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + +/* updwtmpx is broken (if present) */ +/* #undef BROKEN_UPDWTMPX */ + +/* Define if you have BSD auth support */ +/* #undef BSD_AUTH */ + +/* Define if you want to specify the path to your lastlog file */ +/* #undef CONF_LASTLOG_FILE */ + +/* Define if you want to specify the path to your utmp file */ +/* #undef CONF_UTMP_FILE */ + +/* Define if you want to specify the path to your wtmpx file */ +/* #undef CONF_WTMPX_FILE */ + +/* Define if you want to specify the path to your wtmp file */ +/* #undef CONF_WTMP_FILE */ + +/* Need to call setpgrp as root */ +/* #undef DISABLE_FD_PASSING */ + +/* Define if you don't want to use lastlog */ +/* #undef DISABLE_LASTLOG */ + +/* Define if you don't want to use your system's login() call */ +/* #undef DISABLE_LOGIN */ + +/* Define if you don't want to use pututline() etc. to write [uw]tmp */ +/* #undef DISABLE_PUTUTLINE */ + +/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ +/* #undef DISABLE_PUTUTXLINE */ + +/* Define if you want to disable shadow passwords */ +/* #undef DISABLE_SHADOW */ + +/* Define if you don't want to use utmp */ +#define DISABLE_UTMP 1 + +/* Define if you don't want to use utmpx */ +/* #undef DISABLE_UTMPX */ + +/* Define if you don't want to use wtmp */ +#define DISABLE_WTMP 1 + +/* Define if you don't want to use wtmpx */ +#define DISABLE_WTMPX 1 + +/* Enable for PKCS#11 support */ +#define ENABLE_PKCS11 /**/ + +/* Enable for U2F/FIDO support */ +#define ENABLE_SK /**/ + +/* Enable for built-in U2F/FIDO support */ +/* #undef ENABLE_SK_INTERNAL */ + +/* define if fflush(NULL) does not work */ +/* #undef FFLUSH_NULL_BUG */ + +/* File names may not contain backslash characters */ +/* #undef FILESYSTEM_NO_BACKSLASH */ + +/* fsid_t has member val */ +/* #undef FSID_HAS_VAL */ + +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + +/* getpgrp takes one arg */ +#define GETPGRP_VOID 1 + +/* Conflicting defs for getspnam */ +/* #undef GETSPNAM_CONFLICTING_DEFS */ + +/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ +#define GLOB_HAS_ALTDIRFUNC 1 + +/* Define if your system glob() function has gl_matchc options in glob_t */ +#define GLOB_HAS_GL_MATCHC 1 + +/* Define if your system glob() function has gl_statv options in glob_t */ +/* #undef GLOB_HAS_GL_STATV */ + +/* Define this if you want GSSAPI support in the version 2 protocol */ +/* #undef GSSAPI */ + +/* Define if you want to use shadow password expire field */ +/* #undef HAS_SHADOW_EXPIRE */ + +/* Define if your system uses access rights style file descriptor passing */ +/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */ + +/* Define if you have ut_addr in utmp.h */ +/* #undef HAVE_ADDR_IN_UTMP */ + +/* Define if you have ut_addr in utmpx.h */ +/* #undef HAVE_ADDR_IN_UTMPX */ + +/* Define if you have ut_addr_v6 in utmp.h */ +/* #undef HAVE_ADDR_V6_IN_UTMP */ + +/* Define if you have ut_addr_v6 in utmpx.h */ +/* #undef HAVE_ADDR_V6_IN_UTMPX */ + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* Define to 1 if you have the `arc4random_stir' function. */ +/* #undef HAVE_ARC4RANDOM_STIR */ + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* OpenBSD's gcc has bounded */ +/* #undef HAVE_ATTRIBUTE__BOUNDED__ */ + +/* Have attribute nonnull */ +#define HAVE_ATTRIBUTE__NONNULL__ 1 + +/* OpenBSD's gcc has sentinel */ +/* #undef HAVE_ATTRIBUTE__SENTINEL__ */ + +/* Define to 1 if you have the `aug_get_machine' function. */ +/* #undef HAVE_AUG_GET_MACHINE */ + +/* Define to 1 if you have the `auth_hostok' function. */ +#define HAVE_AUTH_HOSTOK 1 + +/* Define to 1 if you have the `auth_timeok' function. */ +#define HAVE_AUTH_TIMEOK 1 + +/* Define to 1 if you have the `b64_ntop' function. */ +/* #undef HAVE_B64_NTOP */ + +/* Define to 1 if you have the `b64_pton' function. */ +/* #undef HAVE_B64_PTON */ + +/* Define if you have the basename function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the `bcrypt_pbkdf' function. */ +/* #undef HAVE_BCRYPT_PBKDF */ + +/* Define to 1 if you have the `bindresvport_sa' function. */ +#define HAVE_BINDRESVPORT_SA 1 + +/* Define to 1 if you have the `blf_enc' function. */ +/* #undef HAVE_BLF_ENC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BLF_H */ + +/* Define to 1 if you have the `Blowfish_expand0state' function. */ +/* #undef HAVE_BLOWFISH_EXPAND0STATE */ + +/* Define to 1 if you have the `Blowfish_expandstate' function. */ +/* #undef HAVE_BLOWFISH_EXPANDSTATE */ + +/* Define to 1 if you have the `Blowfish_initstate' function. */ +/* #undef HAVE_BLOWFISH_INITSTATE */ + +/* Define to 1 if you have the `Blowfish_stream2word' function. */ +/* #undef HAVE_BLOWFISH_STREAM2WORD */ + +/* Define to 1 if you have the `BN_is_prime_ex' function. */ +#define HAVE_BN_IS_PRIME_EX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_LIBUTIL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSM_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSTRING_H */ + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* calloc(0, x) returns NULL */ +#define HAVE_CALLOC 1 + +/* Define if you have caph_cache_tzdata */ +#define HAVE_CAPH_CACHE_TZDATA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CAPSICUM_HELPERS_H 1 + +/* Define to 1 if you have the `cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 + +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 + +/* Have clock_gettime */ +#define HAVE_CLOCK_GETTIME 1 + +/* define if you have clock_t data type */ +#define HAVE_CLOCK_T 1 + +/* Define to 1 if you have the `closefrom' function. */ +#define HAVE_CLOSEFROM 1 + +/* Define to 1 if you have the `close_range' function. */ +#define HAVE_CLOSE_RANGE 1 + +/* Define if gai_strerror() returns const char * */ +#define HAVE_CONST_GAI_STRERROR_PROTO 1 + +/* Define if your system uses ancillary data style file descriptor passing */ +#define HAVE_CONTROL_IN_MSGHDR 1 + +/* Define to 1 if you have the `crypt' function. */ +#define HAVE_CRYPT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPTO_SHA2_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPT_H */ + +/* Define if you are on Cygwin */ +/* #undef HAVE_CYGWIN */ + +/* Define if your libraries define daemon() */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if + you don't. */ +#define HAVE_DECL_AI_NUMERICSERV 1 + +/* Define to 1 if you have the declaration of `authenticate', and to 0 if you + don't. */ +/* #undef HAVE_DECL_AUTHENTICATE */ + +/* Define to 1 if you have the declaration of `bzero', and to 0 if you don't. + */ +#define HAVE_DECL_BZERO 1 + +/* Define to 1 if you have the declaration of `ftruncate', and to 0 if you + don't. */ +#define HAVE_DECL_FTRUNCATE 1 + +/* Define to 1 if you have the declaration of `getentropy', and to 0 if you + don't. */ +#define HAVE_DECL_GETENTROPY 1 + +/* Define to 1 if you have the declaration of `getpeereid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPEEREID 1 + +/* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you + don't. */ +#define HAVE_DECL_GLOB_NOMATCH 1 + +/* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE', + and to 0 if you don't. */ +/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */ + +/* Define to 1 if you have the declaration of `howmany', and to 0 if you + don't. */ +#define HAVE_DECL_HOWMANY 1 + +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ +#define HAVE_DECL_H_ERRNO 1 + +/* Define to 1 if you have the declaration of `loginfailed', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINFAILED */ + +/* Define to 1 if you have the declaration of `loginrestrictions', and to 0 if + you don't. */ +/* #undef HAVE_DECL_LOGINRESTRICTIONS */ + +/* Define to 1 if you have the declaration of `loginsuccess', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINSUCCESS */ + +/* Define to 1 if you have the declaration of `MAXSYMLINKS', and to 0 if you + don't. */ +#define HAVE_DECL_MAXSYMLINKS 1 + +/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. + */ +#define HAVE_DECL_MEMMEM 1 + +/* Define to 1 if you have the declaration of `NFDBITS', and to 0 if you + don't. */ +#define HAVE_DECL_NFDBITS 1 + +/* Define to 1 if you have the declaration of `offsetof', and to 0 if you + don't. */ +#define HAVE_DECL_OFFSETOF 1 + +/* Define to 1 if you have the declaration of `O_NONBLOCK', and to 0 if you + don't. */ +#define HAVE_DECL_O_NONBLOCK 1 + +/* Define to 1 if you have the declaration of `passwdexpired', and to 0 if you + don't. */ +/* #undef HAVE_DECL_PASSWDEXPIRED */ + +/* Define to 1 if you have the declaration of `readv', and to 0 if you don't. + */ +#define HAVE_DECL_READV 1 + +/* Define to 1 if you have the declaration of `setauthdb', and to 0 if you + don't. */ +/* #undef HAVE_DECL_SETAUTHDB */ + +/* Define to 1 if you have the declaration of `SHUT_RD', and to 0 if you + don't. */ +#define HAVE_DECL_SHUT_RD 1 + +/* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you + don't. */ +#define HAVE_DECL_UINT32_MAX 1 + +/* Define to 1 if you have the declaration of `writev', and to 0 if you don't. + */ +#define HAVE_DECL_WRITEV 1 + +/* Define to 1 if you have the declaration of `_getlong', and to 0 if you + don't. */ +#define HAVE_DECL__GETLONG 0 + +/* Define to 1 if you have the declaration of `_getshort', and to 0 if you + don't. */ +#define HAVE_DECL__GETSHORT 0 + +/* Define to 1 if you have the `DES_crypt' function. */ +#define HAVE_DES_CRYPT 1 + +/* Define if you have /dev/ptmx */ +/* #undef HAVE_DEV_PTMX */ + +/* Define if you have /dev/ptc */ +/* #undef HAVE_DEV_PTS_AND_PTC */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirfd' function. */ +#define HAVE_DIRFD 1 + +/* Define to 1 if you have the `dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you have the `dlopen' function. */ +#define HAVE_DLOPEN 1 + +/* Define to 1 if you have the `DSA_generate_parameters_ex' function. */ +#define HAVE_DSA_GENERATE_PARAMETERS_EX 1 + +/* Define to 1 if you have the `EC_KEY_METHOD_new' function. */ +#define HAVE_EC_KEY_METHOD_NEW 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ELF_H 1 + +/* Define to 1 if you have the `endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the `endutent' function. */ +/* #undef HAVE_ENDUTENT */ + +/* Define to 1 if you have the `endutxent' function. */ +#define HAVE_ENDUTXENT 1 + +/* Define to 1 if you have the `err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the `errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define if your system has /etc/default/login */ +/* #undef HAVE_ETC_DEFAULT_LOGIN */ + +/* Define to 1 if you have the `EVP_chacha20' function. */ +#define HAVE_EVP_CHACHA20 1 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_get_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_GET_IV */ + +/* Define to 1 if you have the `EVP_CIPHER_CTX_get_updated_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_GET_UPDATED_IV 1 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_iv' function. */ +#define HAVE_EVP_CIPHER_CTX_IV 1 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_iv_noconst' function. */ +#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_set_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_SET_IV */ + +/* Define to 1 if you have the `EVP_DigestFinal_ex' function. */ +#define HAVE_EVP_DIGESTFINAL_EX 1 + +/* Define to 1 if you have the `EVP_DigestInit_ex' function. */ +#define HAVE_EVP_DIGESTINIT_EX 1 + +/* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */ +/* #undef HAVE_EVP_MD_CTX_CLEANUP */ + +/* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */ +#define HAVE_EVP_MD_CTX_COPY_EX 1 + +/* Define to 1 if you have the `EVP_MD_CTX_init' function. */ +/* #undef HAVE_EVP_MD_CTX_INIT */ + +/* Define to 1 if you have the `EVP_PKEY_get_raw_private_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PRIVATE_KEY 1 + +/* Define to 1 if you have the `EVP_PKEY_get_raw_public_key' function. */ +#define HAVE_EVP_PKEY_GET_RAW_PUBLIC_KEY 1 + +/* Define to 1 if you have the `EVP_sha256' function. */ +#define HAVE_EVP_SHA256 1 + +/* Define to 1 if you have the `EVP_sha384' function. */ +#define HAVE_EVP_SHA384 1 + +/* Define to 1 if you have the `EVP_sha512' function. */ +#define HAVE_EVP_SHA512 1 + +/* Define if you have ut_exit in utmp.h */ +/* #undef HAVE_EXIT_IN_UTMP */ + +/* Define to 1 if you have the `explicit_bzero' function. */ +#define HAVE_EXPLICIT_BZERO 1 + +/* Define to 1 if you have the `explicit_memset' function. */ +/* #undef HAVE_EXPLICIT_MEMSET */ + +/* Define to 1 if you have the `fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the `fchmodat' function. */ +#define HAVE_FCHMODAT 1 + +/* Define to 1 if you have the `fchown' function. */ +#define HAVE_FCHOWN 1 + +/* Define to 1 if you have the `fchownat' function. */ +#define HAVE_FCHOWNAT 1 + +/* Use F_CLOSEM fcntl for closefrom */ +/* #undef HAVE_FCNTL_CLOSEM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if the system has the type `fd_mask'. */ +#define HAVE_FD_MASK 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FEATURES_H */ + +/* Define to 1 if you have the `fido_assert_set_clientdata' function. */ +/* #undef HAVE_FIDO_ASSERT_SET_CLIENTDATA */ + +/* Define to 1 if you have the `fido_cred_prot' function. */ +/* #undef HAVE_FIDO_CRED_PROT */ + +/* Define to 1 if you have the `fido_cred_set_clientdata' function. */ +/* #undef HAVE_FIDO_CRED_SET_CLIENTDATA */ + +/* Define to 1 if you have the `fido_cred_set_prot' function. */ +/* #undef HAVE_FIDO_CRED_SET_PROT */ + +/* Define to 1 if you have the `fido_dev_get_touch_begin' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_BEGIN */ + +/* Define to 1 if you have the `fido_dev_get_touch_status' function. */ +/* #undef HAVE_FIDO_DEV_GET_TOUCH_STATUS */ + +/* Define to 1 if you have the `fido_dev_is_winhello' function. */ +/* #undef HAVE_FIDO_DEV_IS_WINHELLO */ + +/* Define to 1 if you have the `fido_dev_supports_cred_prot' function. */ +/* #undef HAVE_FIDO_DEV_SUPPORTS_CRED_PROT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOATINGPOINT_H 1 + +/* Define to 1 if you have the `flock' function. */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the `fmt_scaled' function. */ +/* #undef HAVE_FMT_SCALED */ + +/* Define to 1 if you have the `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FNMATCH_H 1 + +/* Define to 1 if you have the `freeaddrinfo' function. */ +#define HAVE_FREEADDRINFO 1 + +/* Define to 1 if you have the `freezero' function. */ +/* #undef HAVE_FREEZERO */ + +/* Define to 1 if the system has the type `fsblkcnt_t'. */ +#define HAVE_FSBLKCNT_T 1 + +/* Define to 1 if the system has the type `fsfilcnt_t'. */ +#define HAVE_FSFILCNT_T 1 + +/* Define to 1 if you have the `fstatfs' function. */ +#define HAVE_FSTATFS 1 + +/* Define to 1 if you have the `fstatvfs' function. */ +#define HAVE_FSTATVFS 1 + +/* Define to 1 if you have the `futimes' function. */ +#define HAVE_FUTIMES 1 + +/* Define to 1 if you have the `gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getaudit' function. */ +/* #undef HAVE_GETAUDIT */ + +/* Define to 1 if you have the `getaudit_addr' function. */ +/* #undef HAVE_GETAUDIT_ADDR */ + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define to 1 if you have the `getentropy' function. */ +#define HAVE_GETENTROPY 1 + +/* Define to 1 if you have the `getgrouplist' function. */ +#define HAVE_GETGROUPLIST 1 + +/* Define to 1 if you have the `getgrset' function. */ +/* #undef HAVE_GETGRSET */ + +/* Define to 1 if you have the `getlastlogxbyname' function. */ +/* #undef HAVE_GETLASTLOGXBYNAME */ + +/* Define to 1 if you have the `getline' function. */ +#define HAVE_GETLINE 1 + +/* Define to 1 if you have the `getluid' function. */ +/* #undef HAVE_GETLUID */ + +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `getopt' function. */ +#define HAVE_GETOPT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define if your getopt(3) defines and uses optreset */ +#define HAVE_GETOPT_OPTRESET 1 + +/* Define if your libraries define getpagesize() */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getpeereid' function. */ +#define HAVE_GETPEEREID 1 + +/* Define to 1 if you have the `getpeerucred' function. */ +/* #undef HAVE_GETPEERUCRED */ + +/* Define to 1 if you have the `getpgid' function. */ +#define HAVE_GETPGID 1 + +/* Define to 1 if you have the `getpgrp' function. */ +#define HAVE_GETPGRP 1 + +/* Define to 1 if you have the `getpwanam' function. */ +/* #undef HAVE_GETPWANAM */ + +/* Define to 1 if you have the `getrandom' function. */ +#define HAVE_GETRANDOM 1 + +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + +/* Define if getrrsetbyname() exists */ +/* #undef HAVE_GETRRSETBYNAME */ + +/* Define to 1 if you have the `getseuserbyname' function. */ +/* #undef HAVE_GETSEUSERBYNAME */ + +/* Define to 1 if you have the `getsid' function. */ +#define HAVE_GETSID 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `getttyent' function. */ +#define HAVE_GETTTYENT 1 + +/* Define to 1 if you have the `getutent' function. */ +/* #undef HAVE_GETUTENT */ + +/* Define to 1 if you have the `getutid' function. */ +/* #undef HAVE_GETUTID */ + +/* Define to 1 if you have the `getutline' function. */ +/* #undef HAVE_GETUTLINE */ + +/* Define to 1 if you have the `getutxent' function. */ +#define HAVE_GETUTXENT 1 + +/* Define to 1 if you have the `getutxid' function. */ +#define HAVE_GETUTXID 1 + +/* Define to 1 if you have the `getutxline' function. */ +#define HAVE_GETUTXLINE 1 + +/* Define to 1 if you have the `getutxuser' function. */ +#define HAVE_GETUTXUSER 1 + +/* Define to 1 if you have the `get_default_context_with_level' function. */ +/* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ + +/* Define to 1 if you have the `glob' function. */ +#define HAVE_GLOB 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GLOB_H 1 + +/* Define to 1 if you have the `group_from_gid' function. */ +#define HAVE_GROUP_FROM_GID 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GSSAPI_KRB5_H */ + +/* Define if HEADER.ad exists in arpa/nameser.h */ +#define HAVE_HEADER_AD 1 + +/* Define to 1 if you have the `HMAC_CTX_init' function. */ +/* #undef HAVE_HMAC_CTX_INIT */ + +/* Define if you have ut_host in utmp.h */ +/* #undef HAVE_HOST_IN_UTMP */ + +/* Define if you have ut_host in utmpx.h */ +#define HAVE_HOST_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IAF_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IA_H */ + +/* Define if you have ut_id in utmp.h */ +/* #undef HAVE_ID_IN_UTMP */ + +/* Define if you have ut_id in utmpx.h */ +#define HAVE_ID_IN_UTMPX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_IFADDRS_H 1 + +/* Define to 1 if you have the `inet_aton' function. */ +#define HAVE_INET_ATON 1 + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the `innetgr' function. */ +#define HAVE_INNETGR 1 + +/* define if you have int64_t data type */ +#define HAVE_INT64_T 1 + +/* Define to 1 if the system has the type `intmax_t'. */ +#define HAVE_INTMAX_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* define if you have intxx_t data type */ +#define HAVE_INTXX_T 1 + +/* Define to 1 if the system has the type `in_addr_t'. */ +#define HAVE_IN_ADDR_T 1 + +/* Define to 1 if the system has the type `in_port_t'. */ +#define HAVE_IN_PORT_T 1 + +/* Define if you have isblank(3C). */ +#define HAVE_ISBLANK 1 + +/* Define to 1 if you have the `killpg' function. */ +#define HAVE_KILLPG 1 + +/* Define to 1 if you have the `krb5_cc_new_unique' function. */ +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ + +/* Define to 1 if you have the `krb5_free_error_message' function. */ +/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */ + +/* Define to 1 if you have the `krb5_get_error_message' function. */ +/* #undef HAVE_KRB5_GET_ERROR_MESSAGE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LANGINFO_H 1 + +/* Define to 1 if you have the header file. */ *** 10866 LINES SKIPPED *** From nobody Mon Mar 18 14:15:09 2024 X-Original-To: dev-commits-src-all@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 4TyxhF449cz5Dpcs; Mon, 18 Mar 2024 14:15: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 4TyxhF3YfHz4QVw; Mon, 18 Mar 2024 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771309; 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=QafcaXQBq864vLiyFrmejg7fM6UxQ8OlEO3kg0J+uCY=; b=K+lykn3aJx9AMXoi+IPDw2DH56OUBpdNE8X4gob3EKzUzLSrjWP7TMH8V4sPcmmRv8BFlV 5bRs6A9+rPYcgbwtvA2y9+673+h/hE6pVXj2VnoJeBiUsZ+y+vvMu465HdFww7n6cS3qLr 9/iZtosU62dMWYGttWJ3SQdFDSZ/H3K5wQXo/R0x2ApHDOlrHmnCYZFrbHF8SjQA7y0zzG AlxW079dvgA4dRNYU0vULUxlLCpOqkoHRZCj7IQEQ39382SPcDH76qQqPZsBfhtzJ2V/hS cH1Kz3UvmQuh362j+G9sajcRF9ugJrsQ+tO7Oux1Y9E7OFBtH0Erpa3Y5Ozhbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710771309; a=rsa-sha256; cv=none; b=A6qx/vLp/zV2j/EpxQ3O86Ie3nHQ9rPmFOgtyz8/qkVStx9LJnB/0xV2IcNbEOkgfQ+BMR +M4W7hS4aK0JNrIE8zocOcUByDGVpdADcqw9TNehNS6bIZLSWeC6Y/3o9nrgWvhqRH419b GdIqp2rD8inmUyXcJg4EHcAX39MDIO2wT28huVmazgZ5gUZV1+K5o6g2Y/c2PqmhQs6vDO NpfaviCpP1L0TtWtMtvLvcI18BNUMfkutoMmwjsbmQ/BHel1M1HdvTJ7+jG1cFAXbhfGmw O6oUjbBiCHxx8AGy1qlAF7WBsS8bfP+4WDnGerLsZPweOJv8EMpQ2U+cG+U0Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771309; 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=QafcaXQBq864vLiyFrmejg7fM6UxQ8OlEO3kg0J+uCY=; b=PldLyuwNwsmaoouLFMKHrvwRAsL1dqH05PFE+oYlgirHIz7DAchNmxl/ZOGr1oYPhoIx3h HVmocOsbmYzlhK/TsVg6ODfMxKmCkbb4pItu21DABtX5VQmZJx6S3uZvm6LGC8wE2s8xEH cZsSIFcIqnRG/dp599QDswHaCU8xPAQhBuTLZx2mLBOATYKjSbwfKTF0iGyaJANAdKTEAa PGLit+hI8CXzDjUKx3CdZGlzPifsnpV1Pig+0yGnFoU0QXReu8Or1rUepEBllUb7xEfCH+ 0NvPe6E+k+6N0adg17oTfNu3uBH2V07gGZUPR2B7IcbJDJVzCtw+qsYo6Rr5CA== 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 4TyxhF38PPzR0c; Mon, 18 Mar 2024 14:15: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 42IEF9Hm032244; Mon, 18 Mar 2024 14:15:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEF9F5032241; Mon, 18 Mar 2024 14:15:09 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:15:09 GMT Message-Id: <202403181415.42IEF9F5032241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Gabriel M. Dutra" Subject: git: f56e9a65cf81 - main - calendars: Add myself to the FreeBSD calendar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dutra X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f56e9a65cf81f67f90079c8ded4c088e8dd17f2e Auto-Submitted: auto-generated The branch main has been updated by dutra: URL: https://cgit.FreeBSD.org/src/commit/?id=f56e9a65cf81f67f90079c8ded4c088e8dd17f2e commit f56e9a65cf81f67f90079c8ded4c088e8dd17f2e Author: Gabriel M. Dutra AuthorDate: 2024-03-17 06:36:07 +0000 Commit: Gabriel M. Dutra CommitDate: 2024-03-18 14:14:00 +0000 calendars: Add myself to the FreeBSD calendar Reported by: mckusick Approved by: dbaio (mentor) Differential Revision: https://reviews.freebsd.org/D44396 --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 6e6aac9995c6..88f7f10282c7 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -197,6 +197,7 @@ 05/11 Marcin Wojtas born in Krakow, Poland, 1986 05/11 Roman Kurakin born in Moscow, USSR, 1979 05/11 Ulrich Spoerlein born in Schesslitz, Bayern, Germany, 1981 +05/12 Gabriel M. Dutra born in Marialva, Parana, Brazil, 1998 05/13 Pete Fritchman born in Lansdale, Pennsylvania, United States, 1983 05/13 Ben Widawsky born in New York City, New York, United States, 1982 05/14 Tatsumi Hosokawa born in Tokyo, Japan, 1968 From nobody Mon Mar 18 14:20:26 2024 X-Original-To: dev-commits-src-all@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 4TyxpL6ByQz5Dpn3; Mon, 18 Mar 2024 14:20: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 4TyxpL5jyxz4Qhd; Mon, 18 Mar 2024 14:20:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771626; 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=88J5cQjLoyzaBOn6SnuFiaYYpgtulzdah+xq5/C5RhM=; b=XCVBatHtZOjfdAHKL4jdybv9fLDbZy/BIPFxmSzGzKgrQwncplCqf0MkzaRVBhvZw7tzt5 RKRZVy3zLO1ZfClbrhaapkNqmJXNBr0jpCpMzQnaVncfa4+9FeHf1fPCJvYq4gAGkKEUeg Ffctu1WCOjcOyFONbBkXABTvlWrrbX8yKimohS4Sy3/H2BgHBuahHIU/Xq2DcUVhQ8hW+P jLdDldbXlzC8dHbV01LN0VjVbcUATPwFtPbakenBTgImyWHU6k2HrtAIIYxkl5MEumwIeL 36Kq25KZOsm/b6xLGMgJJucLChmgJUTubro4XYaA6OFYESrKXLGWMgUo7KnCRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710771626; a=rsa-sha256; cv=none; b=ym/W3u/zYglYneuOYDBfUkNtgXQ4dB4bRmvX6f8EAUiL7Vx33l4yF9N7rHnxcuZljlJ1bn 6NN/2Y4vQ9848wCzfO9boBS6QCiwkkk1a+26ZRqwGxWi7+5qQQIjLxayX8ZhcTplNY/jKn gtbYM1ihlH2LL2DC5YFItR9pm1Nnve9QCcN2HccPHxUg7fH7JVN9n4KuMsYx/VFPGI5DOn IjonVromm5IiOdqxqnDJ/dZ9m652JF3BSLv8XdEsAJYtzs1nfdiqlLzoVlNYreIhR5TLII 0zybMC4U8WR+UBD8Z7aLhNHnZfKGXLrpTnHrQK2nm2HYcZIgUkVJmg6pBDIHgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710771626; 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=88J5cQjLoyzaBOn6SnuFiaYYpgtulzdah+xq5/C5RhM=; b=OwQqQvTaGyx3xdXHt/iNUegVeg1vcKJMFYPk4USfOR9CAtd7V3j4Dcv5CSotXcleMEcCfa mmHfNt/oGkj07Ai7ugCf6I+Cxw+tkZBnh7+10jHjVYoN6vgXkA+TEnt84GT09i8dxnzUE6 PDY4e3yQfpz8Odifjsc9Hd9xciIFWGTFIaY6EWcKcB/aVfkYoYfmRFuqKN4ZezZ4Wi96kL UpJRCTX1M/hQ8pOKjKszMxro6FZQFBZH2TjL+6vGOgt90bog78aR+Lw/KTlHmXxC7r8inq FH1g6C69DpXW3ZpxUcyXnjoacv+dV06lGlp+w+MrPl0RsxmA5TcvI/nhmjMZ5Q== 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 4TyxpL5KtjzR4Y; Mon, 18 Mar 2024 14:20: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 42IEKQIg041577; Mon, 18 Mar 2024 14:20:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEKQ6K041574; Mon, 18 Mar 2024 14:20:26 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:20:26 GMT Message-Id: <202403181420.42IEKQ6K041574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e600fc7295a7 - main - ssh: remove deprecated client VersionAddendum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e600fc7295a7082041388113a5d677f6c4cf7ce7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e600fc7295a7082041388113a5d677f6c4cf7ce7 commit e600fc7295a7082041388113a5d677f6c4cf7ce7 Author: Ed Maste AuthorDate: 2024-03-18 14:15:27 +0000 Commit: Ed Maste CommitDate: 2024-03-18 14:20:18 +0000 ssh: remove deprecated client VersionAddendum Support for a client VersionAddendum was removed in bffe60ead024, but the option was retained (as oDeprecated) as a transition aid. Sufficient time has passed that it can be removed. Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 3 +-- crypto/openssh/readconf.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 2950731c7401..ef05c55a37e3 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -173,8 +173,7 @@ 10) Retired patches - We no longer have client-side VersionAddendum, but we recognize and ignore - the configuration options to avoid breaking existing configurations. + We no longer have client-side VersionAddendum. 11) PrintLastLog bugfix diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 20a769061a0d..3a64a0441641 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -330,9 +330,6 @@ static struct { { "obscurekeystroketiming", oObscureKeystrokeTiming }, { "channeltimeout", oChannelTimeout }, - /* Client VersionAddendum - retired in bffe60ead024 */ - { "versionaddendum", oDeprecated }, - { NULL, oBadOption } }; From nobody Mon Mar 18 14:35:55 2024 X-Original-To: dev-commits-src-all@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 4Tyy8C6gsPz5DrPX; Mon, 18 Mar 2024 14:35: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 4Tyy8C5txwz4SZ1; Mon, 18 Mar 2024 14:35:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772555; 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=rVSe2EjnfMLXCRBfrRLFymx/lIzV7K8kQV99QGM3x6U=; b=D6euql0ICr8sidOlXzPxU4FJ4Ur2+WC7GLfLcyvCR75cVrAx8yxrT7zqxmdfsXxrv2o7h1 TVTwO+JaxFPKt1Ias4oz9X1BZo6YftCWIGy6yoDVUi+WvbRvVMF9oGfz6/F6xQCE3p7si1 OKyqaC6PnOPvecB8Bsto5bHX0eaSbsmP3oPmLc3Ae7JDK0GbybWl2tqq2H8tf6DjPgTSZA fqI3GgXOcbwDodYcKYybkEsnB7KYEZtenGtOlTufMB0Sn1gJqjknffcAUUc8R1Z1rRVm8K Ihjr5Tywneus6Es8aQ8yjsJ9lSy5w7LhbDBkSP2nzn9KP64DAcADPwCrl1knag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772555; a=rsa-sha256; cv=none; b=g9rnJFSHXjPdXygCMl3EDGgpLtbmNMAiIMs3qahvepCgghLu6/7zxyFf3P2FkGtxvPCmYl Bq/DajP4PTzDrzknmKg0eCK5BsD6F8j0CA9yuN5GhOua4Ye6gO8m+OEmEwCpzudMrr+UvS HHql+TjaPOQyJadKa5LcreBd68GHgt4RJgWUEGNhRsA3kGlk1u3zDVw1/gFZ4Xnbe87Til NgcNxjLnKqbEBgRa1JUW8Kb445IzWxNtPzbOnIBAO+uqjYW+xJxIU4w+e9UDgSzkidhb/s zrgTUhdx3L//Q/9iB+6+2CXE6NstV8SJIfth7iN4HY6VntrfBs++CUbiuf1Gcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772555; 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=rVSe2EjnfMLXCRBfrRLFymx/lIzV7K8kQV99QGM3x6U=; b=aGrgGmmbYQ3gyZ28fbLk1ajBLdTtBDtfOnSYBzqimRGIz+OaSvragkgWBvYvXtvbWEsYO2 aJjg+SNWtNLNC7EmLgzd8ISkI+tt/Eotze9ww3Pyvqp/26jPB1++Rh1+DFPk+QWHze5DRL FskifDFDY9hKSnqShELM+aryxsOfgFNvXgKG2N42BF83OKEqBCUxZRfnDN+f01oZw4xMxW s+HPd9KMu0o71fIJQa5IDeWWECebAp2d7jve+sn5uTjzOvMOJ4HpPnsfWpP/pK2X+K1pcW tTUtUPp/vL/Buw7QkxklgfSWCWvIeRQ/qpWpPNBPmF7HhzF+l565d8ofuzHVJg== 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 4Tyy8C5V1szRbj; Mon, 18 Mar 2024 14:35: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 42IEZtYM066224; Mon, 18 Mar 2024 14:35:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZtB3066221; Mon, 18 Mar 2024 14:35:55 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:55 GMT Message-Id: <202403181435.42IEZtB3066221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 741ca9249173 - stable/14 - kbdmap: remove debug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 741ca9249173cb680288e057ad363837056181f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=741ca9249173cb680288e057ad363837056181f2 commit 741ca9249173cb680288e057ad363837056181f2 Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:40:00 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:34:47 +0000 kbdmap: remove debug (cherry picked from commit f14ea00c8f4677d29ca966db6f0906e07f42fdbf) --- usr.sbin/kbdmap/kbdmap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 78bb9e2741c5..cad42ec29985 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -399,7 +399,6 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) case BSDDIALOG_OK: for (i = 0; i < num_keymaps; i++) { if (listitems[i].on) { - printf("ici\n"); if (!strcmp(program, "kdbmap")) do_kbdcontrol(km_sorted[i]); else @@ -409,7 +408,6 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) } break; default: - printf("la\n"); if (font != NULL && strcmp(font, font_current)) /* Cancelled, restore old font */ vidcontrol(font_current); From nobody Mon Mar 18 14:35:56 2024 X-Original-To: dev-commits-src-all@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 4Tyy8F1C85z5DrXV; Mon, 18 Mar 2024 14:35: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 4Tyy8D6vR0z4ScC; Mon, 18 Mar 2024 14:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772557; 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=XvAaQ2UoMPoaW8zZLfN+Eo3JrlxIdwB+A1IIlEALEYY=; b=vGbniRWwEXhja4qzbCr+QIRw2bXKzSgsMepXrTmvOesJbzMhQ2ajvOplHBjexM3KIoor8c tkeKcM1xhBI3ZbV3PGMYAF99VZlk6CXkgPsynaIwsO5V02CCmE7L/mPGoZ9NAxP8D1KYHC kw0z3owFLqtPyH3eCoCOGYkfhxPnduAvLfRFz8WolP5rStrlcoVYOS6wwEG0GUDi17VKq+ dPfq5hqC9kbdh3XcN0rLsxiC2qSiSXVFA9rrBgk1VwqTAbbjqb1swusSG852uxKRwuPs3Z oWPbtI6GfB0qPxk9+wfSKHuIhP8dbZSiEDr4jbGezoG9dJNL7Nv7GYYqH4EtLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772557; a=rsa-sha256; cv=none; b=g5oIDo1TrkI7j7If58DPWccfpWfOrRMuYZDMSLuW6D0YHtLWUCoeIzd7Y31KuL9weLN//6 WZ4Zjhc7xRRb/YDsow8pcSLQ+eZa+wHWUMyklPVD4lV+bulYwqbJDGY+eJpSsrQObqRHoL WnjDoSl1iPRMsrwnZtT7G9DV2wY71TlpHOeYzUrC3K+tR8IAvRwKlWyVmGtMCZq0FWaDDy Y4bRdZkVWuNdxe/F6a2ZbQTCZRK3/2yxG+MCs0UH5/7ioJ/IuJ5U4kTaat1+lYqskrcHKx ePGuW6Tj2rUOjRy4y81GFEiorujyaQ8ChDuXQSMx0i2O9zU/W6uHtvSAiZGJpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772557; 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=XvAaQ2UoMPoaW8zZLfN+Eo3JrlxIdwB+A1IIlEALEYY=; b=YSprV1btG1QCaVm937SBz1Nyts90NQM2sWakUyvuIBuxFo2giNy6dvzzTe0iB8V6YikKOv B7NfZIXqgT94aoqOPduhEredJ1dZ+iENuYmzgV+Ktkc/FwZXnDxfud4Csn/WQE61qWTf8U RCPrfkKjOftiKhonrm6t0NmIQEQCzy5CMyP1bC3qokMYbM3Os3btI/tn+xEoagtv1QbnLw j5aDgQt3C/N3nQh8MVUcgyTlkOLJp3NRpJyV1FACsEVxeco+gYXdzjC8efHZg07PMyrz2/ 4IgqS5B3rwyfkaVmxHBdKx6DQM3nhbRt04AUDBfC9GWti0+XFdRTFBroj1+sWg== 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 4Tyy8D6W0fzRbk; Mon, 18 Mar 2024 14:35: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 42IEZuj8066278; Mon, 18 Mar 2024 14:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZuv9066275; Mon, 18 Mar 2024 14:35:56 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:56 GMT Message-Id: <202403181435.42IEZuv9066275@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 20062c378b34 - stable/14 - kbdmap: fix typo preventing kbdmap to work under vt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20062c378b34f28f1f9a8025f0c5899a5349c903 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=20062c378b34f28f1f9a8025f0c5899a5349c903 commit 20062c378b34f28f1f9a8025f0c5899a5349c903 Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:44:04 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:34:49 +0000 kbdmap: fix typo preventing kbdmap to work under vt (cherry picked from commit 0f4e8037332fa5e64b3bb291c9b1ba7f8d8b4d4e) --- usr.sbin/kbdmap/kbdmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index cad42ec29985..7735a0e55191 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -399,7 +399,7 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) case BSDDIALOG_OK: for (i = 0; i < num_keymaps; i++) { if (listitems[i].on) { - if (!strcmp(program, "kdbmap")) + if (!strcmp(program, "kbdmap")) do_kbdcontrol(km_sorted[i]); else do_vidfont(km_sorted[i]); From nobody Mon Mar 18 14:35:57 2024 X-Original-To: dev-commits-src-all@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 4Tyy8G3g3Rz5DrK0; Mon, 18 Mar 2024 14:35: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 4Tyy8G0yPmz4T1t; Mon, 18 Mar 2024 14:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772558; 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=9gmIpk1CWH5PkmQ+0HOROs2Y8yWcyDiiEMSnUxYpMeQ=; b=bLPB6bR9o3xDEVHcmsQIGx/But6EN1enLb5f8wWkam0iqRtMx3WMul+aAd3DyMdkDIjye2 Ki33l8wrai8+uNsfRYlgiVysMYwOopuk0UMyL6N0BIwHwqfN9dz1474hme5+8dPHUQJr2C p8+ZgJrfQHtE9LAJeHLuDBTKqB2S202c5inQmlhGk/bO6imTvkCdEceJ/J+1kok2FzcJLd EBQBmo2So9ZCbt3geY1udO+G40rHp/WxuMv+wpKG6VXTMtuxfS1HTPQ5ihdwj2fa/K119j 4Iogv1aPRmfkG8lEebrtMxTMxaTP8sGzK2rjL7Q5UF1drwQsYHim408CeMDtcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772558; a=rsa-sha256; cv=none; b=i/rx5TdlyfLmRFdAr0C2lNe5aSuJ2DO+SlL3EZLa/B0ywoXBECgcgOkcWp+C0VnTodQbYC MUnwV43/YWLmFv5c5b7M9j0vX9qQxFNUUIKx2hmEWJzgmVXJZmJL3mZGzoexBM2afjQmEb l/iz7q39chmx2om1jQKU0zJMtC9uteAEPZA97p1gZvx2zsyAd9WlDuVOhKWc4bbY+ZugvD GluSyJlN4spTNPTSmNOEbzBHYvUORb6EjAPfotYnaRtErOMt/8IoJfP7t3PEFdKJLRHjOg 2ZWuZm7Okai3LyE2FInG0j1RY+Glgq+ZrGW3cyQnuyOMciAEsPLoraL2I+nv1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772558; 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=9gmIpk1CWH5PkmQ+0HOROs2Y8yWcyDiiEMSnUxYpMeQ=; b=FYw/1zQyU9gF2dM0cKDtRQZCBGGnYj9199LzqXpiWTiuDAK4wVTwFWI1RQDxA5Tl0MSwul CD0Kpea/JAARpKc3qFHgLdjUVGcHrxXfRFActMhgxFvgrHDNecAKudTCeTLMN8QfiS8pL8 iTo02NCgLQTQWvPjOE/OFWJ3ayVnIY1npTKxv6BMFIYkqWVPuqtnYtXuOSoKo6OECc1fvI OxKKuTNl7ajshkSCagMg1YHAYFwfsJ7kW6loFv2prcZ0pDGEjRGgwmcv6Y+cwH9HV9oWDK /feLQp4C1vcH5sCDhfiaT4rlZzI5LPf1gFvUbRno7/BIvL2S/URoXxAgVQS/Dw== 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 4Tyy8G0Z3YzRDN; Mon, 18 Mar 2024 14:35: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 42IEZwtZ066317; Mon, 18 Mar 2024 14:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEZvmX066314; Mon, 18 Mar 2024 14:35:57 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:35:57 GMT Message-Id: <202403181435.42IEZvmX066314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 122f46bd922b - stable/14 - pci_vendors: update to 2024.02.02 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 commit 122f46bd922b060e831cfc8dd6c8d1e1d33fa6d4 Author: Baptiste Daroussin AuthorDate: 2024-02-27 13:01:11 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:35:31 +0000 pci_vendors: update to 2024.02.02 (cherry picked from commit cce3a70a77a94751ce2d65890e539e24ff6081a3) --- share/misc/pci_vendors | 723 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 615 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bad1d0bd066b..ca3e5af4c97c 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.11.11 -# Date: 2023-11-11 03:15:02 +# Version: 2024.02.02 +# Date: 2024-02-02 14:41:33 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -48,7 +48,11 @@ 7a15 Vivante GPU (Graphics Processing Unit) 7a19 PCI-to-PCI Bridge 7a24 OHCI USB Controller +# Found on 7A2000 PCH + 7a25 LG100 GPU 7a29 PCI-to-PCI Bridge +# Found on 7A2000 PCH + 7a36 Display Controller 0018 Fn-Link Technology Limited 6252 6252CPUB 802.11ax PCIe Wireless Network Adapter 001c PEAK-System Technik GmbH @@ -82,14 +86,24 @@ 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] 025e Solidigm 0b60 NVMe DC SSD [Sentinel Rock Plus controller] + 025e 8008 NVMe DC SSD U.2 15mm [D7-P5510] 025e 8208 NVMe DC SSD U.2 15mm [D7-P5810] + 025e 8d1d NVMe DC SSD E1.L 9.5mm [D5-P5316] + 025e 9008 NVMe DC SSD U.2 15mm [D7-P5520] + 025e 900c NVMe DC SSD E1.S 9.5mm [D7-P5520] + 025e 900d NVMe DC SSD E1.S 15mm [D7-P5520] + 025e 901c NVMe DC SSD E1.L 9.5mm [D7-P5520] + 025e 9108 NVMe DC SSD U.2 15mm [D7-P5620] + 025e c008 NVMe DC SSD U.2 15mm [D5-P5530] 025e d408 NVMe DC SSD U.2 15mm [D5-P5430] 025e d40c NVMe DC SSD E1.S 9.5mm [D5-P5430] 025e d419 NVMe DC SSD E3.S 7.5mm [D5-P5430] 025e d808 NVMe DC SSD U.2 15mm [D5-P5336] 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] + 025e d81c NVMe DC SSD E1.L 18mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + 2b59 NVMe DC SSD [Atomos Prime] f1ab P41 Plus NVMe SSD (DRAM-less) [Echo Harbor] f1ac P44 Pro NVMe SSD [Hollywood Beach] 0270 Hauppauge computer works Inc. (Wrong ID) @@ -177,6 +191,12 @@ 0a06 RCB672FXX 672-channel modular analog telephony card 0bae Bachmann electronic GmbH 0ccd Preferred Networks, Inc. + 0110 MN-Core + 0120 MN-Core 2 + 0ccd 0000 MN-Core 2 16GB + 0ccd 0010 MN-Core 2 32GB + 0200 MN-Core Direct Connect + 0201 MN-Core 2 Middle-plane 0e11 Compaq Computer Corporation 0001 PCI to EISA Bridge 0002 PCI to ISA Bridge @@ -821,6 +841,22 @@ 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter 1028 22d2 PERC H975i Front 1028 22d3 PERC H975i Adapter + 1d49 020b ThinkSystem 460-16e SAS/SATA PCIe Gen5 24Gb HBA + 00b5 Fusion-MPT 24G SAS/PCIe SAS50xx/SAS51xx +# 9760W 32 internal port RAID controller + 1000 5000 MegaRAID 9760W-32i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal port RAID controller + 1000 5001 MegaRAID 9760W-16i 24G SAS/PCIe Storage Adapter +# 9760W 16 internal and 16 external port RAID controller + 1000 5010 MegaRAID 9760W-16i16e 24G SAS/PCIe Storage Adapter +# 9700W 32 internal port Storage controller + 1000 5020 eHBA 9700W-32i 24G SAS/PCIe Storage Adapter +# 9700W 16 internal port Storage controller + 1000 5021 eHBA 9700W-16i 24G SAS/PCIe Storage Adapter +# 9700 16 external port Storage controller + 1000 5030 eHBA 9700-16e 24G SAS/PCIe Storage Adapter +# Broadcom next-gen MPT PCIe switch + 00b8 Fusion-MPT Switch SAS50xx/SAS51xx 00be SAS3504 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00bf SAS3404 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 00c0 SAS3324 PCI-Express Fusion-MPT SAS-3 @@ -1057,10 +1093,12 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter + 1d49 0507 ThinkSystem RAID 545-8i PCIe Gen4 12Gb Adapter 1d49 0700 ThinkSystem M.2 RAID B540i-2i SATA/NVMe Enablement Kit 1d49 0701 ThinkSystem 7mm RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0702 ThinkSystem M.2 RAID B540p-2HS SATA/NVMe Enablement Kit 1d49 0703 ThinkSystem M.2 RAID B540d-2HS SATA/NVMe Enablement Kit + 1d49 0704 ThinkSystem M.2 RAID B545i-2i SATA/NVMe Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1076,6 +1114,7 @@ 8086 0520 MegaRAID RAID Controller SRCU41L 8086 0523 MegaRAID RAID Controller SRCS16 3050 SAS2008 PCI-Express Fusion-MPT SAS-2 + 3150 1068e 6001 DX1 Multiformat Broadcast HD/SD Encoder/Decoder c010 PEX880xx PCIe Gen 4 Switch 1000 100b PEX88000 PCIe Gen 4 Virtual Upstream/Downstream Port @@ -1172,6 +1211,8 @@ 13e9 Ariel/Navi10Lite 13f9 Oberon/Navi12Lite 13fe Cyan Skillfish [BC-250] +# Used in the Steam Deck OLED + 1435 Sephiroth [AMD Custom GPU 0405] 145a Dummy Function (absent graphics controller) 1478 Navi 10 XL Upstream Port of PCI Express Switch 1479 Navi 10 XL Downstream Port of PCI Express Switch @@ -1211,7 +1252,7 @@ 1637 Renoir Radeon High Definition Audio Controller 1638 Cezanne [Radeon Vega Series / Radeon Vega Mobile Series] 1043 16c2 Radeon Vega 8 -# Used in the Steam Deck +# Used in the Steam Deck LCD 163f VanGogh [AMD Custom GPU 0405] 1640 Rembrandt Radeon High Definition Audio Controller 164c Lucienne @@ -2732,6 +2773,7 @@ 1028 2120 Radeon HD 6450 103c 2128 Radeon HD 6450 103c 2aee Radeon HD 7450A + 1043 047b EAH6450 SILENT/DI/1GD3(LP) 1092 6450 Radeon HD 6450 1462 2125 Radeon HD 6450 1462 2346 Radeon HD 7450 @@ -3729,6 +3771,7 @@ 6980 Polaris12 6981 Lexa XT [Radeon PRO WX 3200] 6985 Lexa XT [Radeon PRO WX 3100] + 103c 83b5 Radeon PRO WX 3100 6986 Polaris12 6987 Lexa [Radeon 540X/550X/630 / RX 640 / E9171 MCM] 698f Lexa XT [Radeon PRO WX 3100 / Barco MXRT 4700] @@ -3919,6 +3962,7 @@ 73a5 Navi 21 [Radeon RX 6950 XT] 1849 5230 Navi 21 [ASRock OC Forumla Radeon RX 6950XT] 1da2 441d Navi 21 [Sapphire Nitro+ Radeon RX 6950 XT] + 1eae 6950 Navi 21 [XFX Speedster MERC319 Radeon RX 6950 XT] 73ab Navi 21 Pro-XLA [Radeon Pro W6800X/Radeon Pro W6800X Duo] 73ae Navi 21 [Radeon Pro V620 MxGPU] 73af Navi 21 [Radeon RX 6900 XT] @@ -3938,8 +3982,11 @@ 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] + 148c 2409 Red Devil RX 6700 XT 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC +# Gaming 1440/QHD Overclock edition with 12 Gb GDDR6 and PCIe 4.0 of Radeon RX 6700 XT by Sapphire PULSE manufactured on autumn 2022 / C1 reviseion + 1da2 445e Radeon RX 6700 XT GAMING OC 12G [Sapphire PULSE] 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT @@ -3968,17 +4015,20 @@ 1da2 e457 PULSE AMD Radeon RX 6500 XT 7446 Navi 31 USB 7448 Navi 31 [Radeon Pro W7900] - 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] + 744c Navi 31 [Radeon RX 7900 XT/7900 XTX/7900M] 1002 0e3b RX 7900 GRE [XFX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] 745e Navi 31 [Radeon Pro W7800] + 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] 7489 Navi 33 [Radeon Pro W7500] + 74a0 Aqua Vanjaram [Instinct MI300A] + 74a1 Aqua Vanjaram [Instinct MI300X] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4362,6 +4412,7 @@ aa90 Turks HDMI Audio [Radeon HD 6500/6600 / 6700M Series] 1028 04a3 Precision M4600 aa98 Caicos HDMI Audio [Radeon HD 6450 / 7450/8450/8490 OEM / R5 230/235/235X OEM] + 1043 aa98 EAH6450 SILENT/DI/1GD3(LP) 174b aa98 Radeon HD 6450 1GB DDR3 aaa0 Tahiti HDMI Audio [Radeon HD 7870 XT / 7950/7970] aab0 Oland/Hainan/Cape Verde/Pitcairn HDMI Audio [Radeon HD 7000 Series] @@ -4835,6 +4886,7 @@ 5343 SPEA 3D Accelerator 1018 Unisys Systems 1019 Elitegroup Computer Systems + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 101a AT&T GIS (NCR) 0005 100VG ethernet 0007 BYNET BIC4G/2C/2G @@ -5345,7 +5397,7 @@ 1716 Family 12h/14h Processor Function 5 1718 Family 12h/14h Processor Function 6 1719 Family 12h/14h Processor Function 7 - 2000 79c970 [PCnet32 LANCE] + 2000 79C97x [PCnet32 LANCE] 1014 2000 NetFinity 10/100 Fast Ethernet 1022 2000 PCnet - Fast 79C971 103c 104c Ethernet with LAN remote power Adapter @@ -5359,7 +5411,7 @@ 1259 2454 AT-2450v4 10Mb Ethernet Adapter 1259 2700 AT-2700TX 10/100 Fast Ethernet 1259 2701 AT-2700FX 100Mb Ethernet - 1259 2702 AT-2700FTX 10/100 Mb Fiber/Copper Fast Ethernet + 1259 2702 AT-2700FTX (AM79C976KD [PCnet-PRO] chipset) 10/100 Mb Fiber/Copper Fast Ethernet 1259 2703 AT-2701FX 1259 2704 AT-2701FTX 10/100 Mb Fiber/Copper Fast Ethernet 4c53 1000 CC7/CR7/CP7/VC7/VP7/VR7 mainboard @@ -5373,7 +5425,7 @@ 1092 0a78 Multimedia Home Network Adapter 1668 0299 ActionLink Home Network Adapter 2003 Am 1771 MBW [Alchemy] - 2020 53c974 [PCscsi] + 2020 AM53/79C974 [PC-SCSI] 1af4 1100 QEMU Virtual Machine 2040 79c974 2080 CS5536 [Geode companion] Host Bridge @@ -5418,6 +5470,10 @@ 43ee 500 Series Chipset USB 3.1 XHCI Controller # maybe 1b21 1142 ASM1042A USB 3.0 Host Controller + 43f4 600 Series Chipset PCIe Switch Upstream Port + 43f5 600 Series Chipset PCIe Switch Downstream Port + 43f6 600 Series Chipset SATA Controller + 43f7 600 Series Chipset USB 3.2 Controller 57a3 Matisse PCIe GPP Bridge 57a4 Matisse PCIe GPP Bridge 57ad Matisse Switch Upstream @@ -6404,6 +6460,7 @@ 103c Hewlett-Packard Company 1005 A4977A Visualize EG 1008 Visualize FX + 1020 548XX Scope Interface 1028 Tach TL Fibre Channel Host Adapter 1029 Tach XL2 Fibre Channel Host Adapter 107e 000f Interphase 5560 Fibre Channel Adapter @@ -6560,8 +6617,6 @@ 3010 Samurai_1 3020 Samurai_IDE 1043 ASUSTeK Computer Inc. - 0464 Radeon R9 270x GPU - 0521 RX580 [RX 580 Dual O8G] 0675 ISDNLink P-IN100-ST-D 0675 1704 ISDN Adapter (PCI Bus, D, C) 0675 1707 ISDN Adapter (PCI Bus, DV, W) @@ -7020,6 +7075,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 90eb CXD90062GG 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 @@ -7251,6 +7307,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + 9602 RS780/RS880 PCI to PCI bridge (int gfx) e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company @@ -7492,7 +7549,7 @@ 1076 Chaintech Computer Co. Ltd 1077 QLogic Corp. 1016 ISP10160 Single Channel Ultra3 SCSI Processor - 1020 ISP1020 Fast-wide SCSI + 1020 ISP1020/1040 Fast-wide SCSI 1022 ISP1022 Fast-wide SCSI 1080 ISP1080 SCSI Host Adapter 1216 ISP12160 Dual Channel Ultra3 SCSI Processor @@ -10320,6 +10377,7 @@ 1043 402f AGP-V8200 DDR 1048 0c70 GLADIAC 920 0201 NV20 [GeForce3 Ti 200] + 1462 8503 G3Ti200 Pro VT128 0202 NV20 [GeForce3 Ti 500] 1043 405b V8200 T5 1545 002f Xtasy 6964 @@ -11619,6 +11677,7 @@ 1025 0753 GeForce GT 620M 1025 0754 GeForce GT 620M 17aa 3977 GeForce GT 640M LE + 1b0a 20c6 GeForce GT 630M 1b0a 2210 GeForce GT 635M 0dea GF108M [GeForce 610M] 17aa 365a GeForce 615 @@ -12477,6 +12536,9 @@ 15f7 GP100GL [Tesla P100 PCIe 12GB] 15f8 GP100GL [Tesla P100 PCIe 16GB] 15f9 GP100GL [Tesla P100 SXM2 16GB] + 15fa GP100GL [DGX Station / PH402 SKU 200] + 15fb GP100GL [GP100 SKU 200] + 15ff GP100GL [GP100 SKU 15ff] 1617 GM204M [GeForce GTX 980M] 1618 GM204M [GeForce GTX 970M] 1619 GM204M [GeForce GTX 965M] @@ -12646,6 +12708,7 @@ 10de 131d Tesla V100-SXM3-32GB-H 1dba GV100GL [Quadro GV100] 10de 12eb TITAN V CEO Edition + 1dbd GV100GL [Tesla GV100 DGX1-V] 1dbe GV100 Engineering Sample 1dc1 GV100 [CMP 100-200] 1df0 GV100GL [Tesla PG500-216] @@ -12801,6 +12864,7 @@ 21ae TU116GL 21bf TU116GL 21c2 TU116 + 21c3 TU116 21c4 TU116 [GeForce GTX 1660 SUPER] 21d1 TU116BM [GeForce GTX 1660 Ti Mobile] 2200 GA102 @@ -12846,9 +12910,10 @@ 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] 233d GH100 [H100 96GB] - 2342 GH100 [GH200 120GB] + 2342 GH100 [GH200 120GB / 480GB] 2343 GH100 - 2345 GH100 [GH200 480GB] + 2345 GH100 [GH100-88K-A1] + 237f GH100 [Skinny Joe] 23b0 GH100 23f0 GH100 2414 GA103 [GeForce RTX 3060 Ti] @@ -12945,25 +13010,33 @@ 25fb GA107 [RTX A500 Embedded GPU] 2681 AD102 [RTX TITAN Ada] 2684 AD102 [GeForce RTX 4090] + 2685 AD102 [GeForce RTX 4090 D] 26b1 AD102GL [RTX 6000 Ada Generation] 26b2 AD102GL [RTX 5000 Ada Generation] + 26b3 AD102GL [RTX 5880 Ada Generation] 26b5 AD102GL [L40] + 26b7 AD102GL [L20] 26b8 AD102GL [L40G] 26b9 AD102GL [L40S] + 26ba AD102GL [L20] 26f5 AD102GL [L40 CNX] + 2702 AD103 [GeForce RTX 4080 SUPER] 2703 AD103 [GeForce RTX 4080 SUPER] 2704 AD103 [GeForce RTX 4080] + 2705 AD103 [GeForce RTX 4070 Ti SUPER] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] 2730 AD103GLM [RTX 5000 Ada Generation Laptop GPU] 2757 GN21-X11 2770 AD103GLM [RTX 5000 Ada Generation Embedded GPU] 2782 AD104 [GeForce RTX 4070 Ti] + 2783 AD104 [GeForce RTX 4070 SUPER] 2785 AD104 [AC AD104 20GB] 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] 27b1 AD104GL [RTX 4500 Ada Generation] 27b2 AD104GL [RTX 4000 Ada Generation] + 27b6 AD104GL [L2] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] @@ -13193,6 +13266,7 @@ 8111 Twist3 Frame Grabber 10ec Realtek Semiconductor Co., Ltd. 0139 RTL-8139/8139C/8139C+ Ethernet Controller + 2600 Killer E2600 GbE Controller 3000 Killer E3000 2.5GbE Controller 4321 RTL8852BE 802.11ax PCIe Wireless Network Adapter 5208 RTS5208 PCI Express Card Reader @@ -13314,7 +13388,7 @@ 1458 e000 GA-MA69G-S3H Motherboard 1462 235c P965 Neo MS-7235 mainboard 1462 236c 945P Neo3-F motherboard - 8168 RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller + 8168 RTL8111/8168/8211/8411 PCI Express Gigabit Ethernet Controller 1019 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller 1025 1094 Acer Aspire E5-575G 1028 0283 Vostro 220 @@ -13353,6 +13427,7 @@ 1462 4180 Wind PC MS-7418 1462 7522 X58 Pro-E 1462 7c37 X570-A PRO motherboard + 1734 11c0 RTL8211DN on Esprimo P510 D3171 motherboard 1775 11cc CC11/CL11 17aa 3098 ThinkCentre E73 17aa 3814 Z50-75 @@ -13431,6 +13506,7 @@ c821 RTL8821CE 802.11ac PCIe Wireless Network Adapter c822 RTL8822CE 802.11ac PCIe Wireless Network Adapter c82f RTL8822CE 802.11ac PCIe Wireless Network Adapter + c852 RTL8852CE PCIe 802.11ax Wireless Network Controller d723 RTL8723DE 802.11b/g/n PCIe Adapter 10ed Ascii Corporation 7310 V7310 @@ -13690,6 +13766,8 @@ 0644 RocketRAID 644 4 Port SATA-III Controller (eSATA) 0645 RocketRAID 644L 4 Port SATA-III Controller (eSATA) 0646 RocketRAID 644LS SATA-III Controller (4 eSATA devices connected by 1 SAS cable) + 0750 Rocket 750 PCIe Gen2 SATA III Controller + 0840 RocketRAID 840 PCIe Gen3 SATA III Controller 1720 RocketRAID 1720 (2x SATA II RAID Controller) 1740 RocketRAID 1740 1742 RocketRAID 1742 @@ -13701,6 +13779,7 @@ 2322 RocketRAID 2322 SATA-II Controller 2340 RocketRAID 2340 16 Port SATA-II Controller 2640 RocketRAID 2640 SAS/SATA Controller + 2720 RocketRAID 2720 PCIe Gen2 6Gb/s SAS/SATA Controller 2722 RocketRAID 2722 # SFF-8087 Mini-SAS 16 port internal 2740 RocketRAID 2740 @@ -13708,12 +13787,21 @@ 2744 RocketRaid 2744 # SFF-8088 8 port external / SFF-8087 24 port internal 2782 RocketRAID 2782 + 2840 RocketRAID 2840 PCIe Gen3 6Gb/s SAS/SATA Controller 3120 RocketRAID 3120 3220 RocketRAID 3220 3320 RocketRAID 3320 + 3520 RocketRAID 3520 PCIe Gen1 8-Port SATA II Controller + 3530 RocketRAID 3530 PCIe Gen1 12-Port SATA II Controller + 3740 RocketRAID 3740 PCIe Gen3 12Gb/s SAS/SATA Controller 4310 RocketRaid 4310 + 4320 RocketRAID 4320 SAS Controller + 7103 SSD7103 PCIe Gen3 x16 4-Port M.2 NVMe RAID Controller + 7105 SSD7105 PCIe Gen3 x16 4-Port M.2 NVMe RAID Controller + 7110 SSD7110 PCIe Gen3 x16 NVMe RAID Controller 7505 SSD7505 PCIe Gen4 x16 4-Port M.2 NVMe RAID Controller 7540 SSD7540 PCIe Gen4 x16 8-Port M.2 NVMe RAID Controller + 7580 SSD7580 PCIe Gen4 x16 8-Port M.2 NVMe RAID Controller 1104 RasterOps Corp. 1105 Sigma Designs, Inc. 1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder @@ -13899,6 +13987,7 @@ 1043 808c VT62xx USB1.1 4 port controller 1043 80a1 A7V8X-X motherboard 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard + 1106 3038 USB 1.1 UHCI controller 1179 0001 Magnia Z310 1234 0925 MVP3 USB Controller 1458 5004 GA-7VAX Mainboard @@ -13931,6 +14020,7 @@ 1462 590d KT6 Delta-FIS2R (MS-6590) 1462 702d K8T NEO 2 motherboard 1462 971d MS-6917 + 153b 1146 Cameo DV Firewire controller 3050 VT82C596 Power Management 3051 VT82C596 Power Management 3053 VT6105M [Rhine-III] @@ -14026,7 +14116,7 @@ 1043 808c A7V8X motherboard 1043 80a1 A7V8X-X motherboard rev 1.01 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard - 1106 3104 USB 2.0 Controller + 1106 3104 USB 2.0 EHCI controller 1297 f641 FX41 motherboard 1458 5004 GA-7VAX Mainboard 1462 5901 KT6 Delta-FIS2R (MS-6590) @@ -14344,6 +14434,8 @@ # Superfastcom-PCI (Commtech, Inc.) or DSCC4 WAN Adapter 2102 DSCC4 PEB/PEF 20534 DMA Supported Serial Communication Controller with 4 Channels 2104 Eicon Diva 2.02 compatible passive ISDN card +# S30807-Q5474 + 3101 HiPath 4000 PCI card 3141 SIMATIC NET CP 5611 / 5621 3142 SIMATIC NET CP 5613 / 5614 3143 SIMATIC NET CP 1613 @@ -15473,6 +15565,7 @@ 0805 SD TypA Controller 0d01 FIR Port Type-DO 1179 0001 FIR Port Type-DO + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 117a A-Trend Technology 117b L G Electronics, Inc. 117c ATTO Technology, Inc. @@ -16988,7 +17081,7 @@ 1274 2000 Creative CT4810 [Sound Blaster AudioPCI 128] 1274 2003 Creative SoundBlaster AudioPCI 128 1274 5880 Creative CT4750 [Sound Blaster PCI 128] - 1274 8001 Sound Blaster 16PCI 4.1ch + 1274 8001 Creative CT4750 [Sound Blaster 16 PCI/PCI 128/4.1 Digital] 1458 a000 5880 AudioPCI On Motherboard 6OXET 1462 6880 5880 AudioPCI On Motherboard MS-6188 1.00 270f 2001 5880 AudioPCI On Motherboard 6CTR @@ -17192,6 +17285,7 @@ 1000 PXD1000 1296 Kofax Image Products 1297 Holco Enterprise Co, Ltd/Shuttle Computer + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1298 Spellcaster Telecommunications Inc. 1299 Knowledge Technology Lab. 129a VMetro, inc. @@ -17348,6 +17442,7 @@ 0009 DAC64 0018 Riva128 1048 0c10 VICTORY Erazor + 1048 0c15 VICTORY Erazor LT-8 107b 8030 STB Velocity 128 1092 0350 Viper V330 1092 1092 Viper V330 @@ -17387,13 +17482,14 @@ # PI7C9X20508GP 5Port-8Lane PCI Express Switch GreenPacket Family 0508 PI7C9X20508GP PCI Express Switch 5Port-8Lane 2304 PI7C9X2G304 EL/SL PCIe2 3-Port/4-Lane Packet Switch - 2308 PI7C9X2G308GP 8-lane PCI Express 2.0 Switch with 3 PCI Express ports + 2308 PI7C9X2G308GP 3-Ports/8-lane PCIe 2.0 Switch 2404 PI7C9X2G404 EL/SL PCIe2 4-Port/4-Lane Packet Switch 2608 PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch ea50 cc10 RXi2-BP - 400a PI7C9X442SL PCI Express Bridge Port - 400e PI7C9X442SL USB OHCI Controller - 400f PI7C9X442SL USB EHCI Controller + 400a PI7C9X442SL PCIe Bridge Port + 400c PI7C9X440SL PCIe Bridge Port + 400e PI7C9X440SL/PI7C9X442SL USB OHCI Controller + 400f PI7C9X440SL/PI7C9X442SL USB EHCI Controller 71e2 PI7C7300A/PI7C7300D PCI-to-PCI Bridge 71e3 PI7C7300A/PI7C7300D PCI-to-PCI Bridge (Secondary Bus 2) 8140 PI7C8140A PCI-to-PCI Bridge @@ -17402,9 +17498,11 @@ 8152 PI7C8152A/PI7C8152B/PI7C8152BI PCI-to-PCI Bridge 8154 PI7C8154A/PI7C8154B/PI7C8154BI PCI-to-PCI Bridge 8619 PI7C9X2G1616PR PCIe2 16-Port/16-Lane Packet Switch - e110 PI7C9X110 PCI Express to PCI bridge + e110 PI7C9X110 PCIe- to-PCI bridge 1775 11cc CC11/CL11 CompactPCI Bridge e111 PI7C9X111SL PCIe-to-PCI Reversible Bridge + e112 PI7C9X112SL PCIe-to-PCI Bridge + e113 PI7C9X113SL/PI7C9X118SL PCIe-to-PCI Bridge e130 PCI Express to PCI-XPI7C9X130 PCI-X Bridge 12d9 Aculab PLC 0002 PCI Prosody @@ -17798,6 +17896,7 @@ 5411 2450 NVMe SSD [HendrixV] (DRAM-less) 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD + 5415 3500 NVMe SSD 5416 2550 NVMe SSD (DRAM-less) 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19945,6 +20044,7 @@ 14c3 MEDIATEK Corp. 0608 MT7921K (RZ608) Wi-Fi 6E 80MHz 0616 MT7922 802.11ax PCI Express Wireless Network Adapter + 7603 MT7603E 802.11bgn PCI Express Wireless Network Adapter 7612 MT7612E 802.11acbgn PCI Express Wireless Network Adapter 7615 MT7615E 802.11ac PCI Express Wireless Network Adapter 7630 MT7630e 802.11bgn Wireless Network Adapter @@ -19957,6 +20057,7 @@ 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT 7961 MT7921 802.11ax PCI Express Wireless Network Adapter + 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB 14c6 Data Race Inc @@ -20204,6 +20305,8 @@ 14e4 d166 BCM95719-P41 4x1GBT Ethernet NIC 14e4 d366 BCM95719-N41 4x1GBT Ethernet NIC 193d 1025 NIC-ETH330T-LP-4P +# NIC-ETH330T-3S-4P 4xGE 1000Base-T for OCP3.0 + 193d 1086 NIC-ETH330T-3S-4P 1659 NetXtreme BCM5721 Gigabit Ethernet PCI Express 1014 02c6 eServer xSeries server mainboard 1028 01e6 PowerEdge 860 @@ -20485,6 +20588,8 @@ 152d 8b22 BCM57412 NetXtreme-E 25Gb RDMA Ethernet Controller # NIC-ETH531F-LP-2P BCM57412 2 x 10G SFP+ Ethernet PCIe Card 193d 1024 NIC-ETH531F-LP-2P +# NIC-ETH531F-3S-2P 2x10GbE SFP+ Adapter for OCP3.0 + 193d 1087 NIC-ETH531F-3S-2P 16d7 BCM57414 NetXtreme-E 10Gb/25Gb RDMA Ethernet Controller 117c 00cc FastFrame N422 Dual-port 25Gb Ethernet Adapter 14e4 1402 BCM957414A4142CC 10Gb/25Gb Ethernet PCIe @@ -20575,6 +20680,8 @@ 14e4 5425 NetXtreme-E Quad-port 25G SFP28 Ethernet OCP 3.0 Adapter (BCM957504-N425G) 14e4 d142 NetXtreme-E P425D BCM57504 4x25G SFP28 PCIE 1752 BCM57502 NetXtreme-E 10Gb/25Gb/40Gb/50Gb Ethernet + 1760 BCM57608 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet + 14e4 d125 BCM57608 2x200G PCIe Ethernet NIC 1800 BCM57502 NetXtreme-E Ethernet Partition 1801 BCM57504 NetXtreme-E Ethernet Partition 1802 BCM57508 NetXtreme-E Ethernet Partition @@ -20592,6 +20699,7 @@ 1809 BCM5750X NetXtreme-E RDMA Virtual Function 14e4 df24 BCM57508 NetXtreme-E NGM2100D 2x100G KR Mezz RDMA Virtual Function 2711 BCM2711 PCIe Bridge + 2712 BCM2712 PCIe Bridge 3352 BCM3352 3360 BCM3360 4210 BCM4210 iLine10 HomePNA 2.0 @@ -21435,6 +21543,7 @@ be00 PCI Express Bridge 1557 MEDIASTAR Co Ltd 1558 CLEVO/KAPOK Computer + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1559 SI LOGIC Ltd 155a INNOMEDIA Inc 155b PROTAC INTERNATIONAL Corp @@ -21639,6 +21748,8 @@ 0283 ArcusE RMA 0284 Sagitta 0285 Sagitta RMA + 0286 LibraE Flash Recovery + 0287 LibraE RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] 1003 MT27500 Family [ConnectX-3] 1014 04b5 PCIe3 40GbE RoCE Converged Host Bus Adapter for Power @@ -21817,6 +21928,7 @@ a2de BF4 Family Crypto disabled [BlueField-4 SoC Crypto disabled] a2df BF4 Family integrated network controller [BlueField-4 integrated network controller] b200 ArcusE + b201 LibraE c2d1 BlueField DPU Family Auxiliary Communication Channel [BlueField Family] c2d2 MT416842 BlueField SoC management interfac c2d3 MT42822 BlueField-2 SoC Management Interface @@ -21890,6 +22002,7 @@ 5028 WD CH SN560 NVMe SSD 5030 WD Black SN850X NVMe SSD 5041 WD Blue SN580 NVMe SSD (DRAM-less) + 5042 WD Black SN770M NVMe SSD (DRAM-less) 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) @@ -21911,6 +22024,10 @@ 117c 0022 Celerity FC-42XS Fibre Channel Adapter 117c 0025 Celerity FC-44ES Fibre Channel Adapter 117c 0026 Celerity FC-42ES Fibre Channel Adapter + 0500 Infiniium Memory Controller Interface + 0501 Infiniium Acquisition System Interface + 0507 Infiniium Acquisition System (80000 series) + 0508 Infiniium Acquisition Support 0b01 82350B PCI GPIB 1100 E8001-66442 PCI Express CIC 1218 82351A PCI Express GPIB @@ -21951,7 +22068,6 @@ 15d8 Cybernetics Technology Co Ltd 15d9 Super Micro Computer Inc 1b64 SCC-B8SB80-B1 - 1b67 AOC-S3916L-H16iR-32DD 1b9d Supermicro AOC-S3816L-L16IR 1c6e Supermicro AOC-SLG4-2H8M2 15da Cyberfirm Inc @@ -22610,6 +22726,9 @@ 7054 APA7-504 Reconfigurable Artix-7 52,160 Cell FPGA module 24 LVDS channels 7072 AP731 Multi-function I/O Module with 12-bit DAC 7073 AP730 Multi-function I/O Module 16 Digital I/O 8 Differential Analog In 4 Analog Out + 7731 APZU-301 Zynq Ultrascale+ Module 28 TTL channels + 7733 APZU-303 Zynq Ultrascale+ Module 20 TTL & 3 RS485/422 channels + 7734 APZU-304 Zynq Ultrascale+ Module 14 LVDS channels 16da Advantech Co., Ltd. 0011 INES GPIB-PCI 16df PIKA Technologies Inc. @@ -22710,6 +22829,7 @@ 13c8 AEP SureWare Runner 1000V3 # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1735 Aten International Co. Ltd. 1737 Linksys 0029 WPG54G ver. 4 PCI Card @@ -22732,6 +22852,7 @@ 1745 ViXS Systems, Inc. 2020 XCode II Series 2100 XCode 2100 Series + 1043 48c9 My Cinema PE6200 Analoog 1749 RLX Technologies 174b PC Partner Limited / Sapphire Technology 174d WellX Telecom SA @@ -22988,6 +23109,7 @@ 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 17ab Phillips Components 17af Hightech Information System Ltd. 17b3 Hawking Technologies @@ -23009,20 +23131,30 @@ 0002 AGN300 802.11 a/b/g True MIMO Wireless Card 1385 6d00 WPNT511 RangeMax 240 Mbps Wireless CardBus Adapter 1737 0054 WPC54GX4 v1 802.11g Wireless-G Notebook Adapter with SRX400 + 0104 APQ8096 PCIe Root Complex [Snapdragon 820] 0105 MSM8998 PCIe Root Complex + 0106 SDM850 PCIe Root Complex [Snapdragon 850] + 0107 SDM850 PCIe Root Port [Snapdragon 850] 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010b SM8250 PCIe Root Complex [Snapdragon 865/870 5G] + 010c SM8350 PCIe Root Complex [Snapdragon 888] 010e SC8280XP PCI Express Root Port + 0110 SM8475 PCIe Root Complex [Snapdragon 8+ Gen 1] 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] + 0304 SDX24 [Snapdragon X24 4G] + 0306 SDX55 [Snapdragon X55 5G] 0400 Datacenter Technologies QDF2432 PCI Express Root Port 0401 Datacenter Technologies QDF2400 PCI Express Root Port 1000 QCS405 PCIe Root Complex 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter - 1108 IPQ95xx/97xx PCI Express Root Port + 1107 WCN785x Wi-Fi 7(802.11be) 320MHz 2x2 [FastConnect 7800] + 105b e0f7 High Band Simultaneous Wireless Network Adapter + 1108 IPQ95xx/97xx PCIe Root Port 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 @@ -23319,6 +23451,7 @@ 0701 RT2760 Wireless 802.11n 1T/2R 1737 0074 WMP110 v2 802.11n RangePlus Wireless PCI Adapter 0781 RT2790 Wireless 802.11n 1T/2R PCIe + 11ad 7600 HP WN7600R 1814 2790 RT2790 Wireless 802.11n 1T/2R PCIe 3060 RT3060 Wireless 802.11n 1T/1R 1186 3c04 DWA-525 Wireless N 150 Desktop Adapter (rev.A1) @@ -23371,6 +23504,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD 1850 Advantest Corporation @@ -23919,10 +24053,12 @@ 1043 1477 N56VZ 10a0 QCA8172 Fast Ethernet 10a1 QCA8171 Gigabit Ethernet + 2010 QCA8175 card reader controller 2048 Attansic L2 Fast Ethernet 2060 AR8152 v1.1 Fast Ethernet 2062 AR8152 v2.0 Fast Ethernet 1043 8468 Eee PC 1015PX + 3010 QCA8175 SD controller # E2200, E2201, E2205 e091 Killer E220x Gigabit Ethernet Controller e0a1 Killer E2400 Gigabit Ethernet Controller @@ -23985,7 +24121,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller - 5008 E8 PCIe3 NVMe Controller + 5008 E8 PCIe3 x2 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013-E13 PCIe3 NVMe Controller (DRAM-less) 5015 PS5015-E15 PCIe3 NVMe Controller (DRAM-less) @@ -23994,6 +24130,7 @@ 5019 PS5019-E19 PCIe4 NVMe Controller (DRAM-less) 5021 PS5021-E21 PCIe4 NVMe Controller (DRAM-less) 5026 PS5026-E26 PCIe5 NVMe Controller + 5027 PS5027-E27T PCIe4 NVMe Controller (DRAM-less) 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile @@ -24458,41 +24595,57 @@ 1af5 Netezza Corp. 1afa J & W Electronics Co., Ltd. 1b00 Montage Technology Co., Ltd. + c001 CXL Memory Expander Controller M88MX5891 + 1ff9 00a2 CXL Memory Expander + 1ff9 00a4 CXL Memory Expander 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 7000 D7 Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder 1b08 MSC Technologies GmbH 1b0a Pegatron + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1b13 Jaton Corp 1b1a K&F Computing Research Co. 0e70 GRAPE 1b1c Corsair 1b21 ASMedia Technology Inc. - 0611 ASM1061 SATA IDE Controller - 0612 ASM1062 Serial ATA Controller + 0611 ASM1061 Serial ATA Controller + 0612 ASM1061/ASM1062 Serial ATA Controller 1849 0612 Motherboard + 0622 ASM106x Serial ATA AHCI Controller + 0624 ASM106x SATA/RAID Controller 0625 106x SATA/RAID Controller - 1040 ASM1040 XHCI Controller + 1040 ASM1040 SuperSpeed USB Host Controller + 1041 ASM1041 SuperSpeed USB Host Controller 1042 ASM1042 SuperSpeed USB Host Controller 1043 1059 K53SM motherboard 1043 8488 P8B WS Motherboard 1849 1042 Motherboard + 1064 ASM1064 Serial ATA Controller 1080 ASM1083/1085 PCIe to PCI Bridge 1849 1080 Motherboard 1142 ASM1042A USB 3.0 Host Controller + 1164 ASM1164 Serial ATA AHCI Controller 1166 ASM1166 Serial ATA Controller 1182 ASM1182e 2-Port PCIe x1 Gen2 Packet Switch 1b21 118f ASM1182e 2-Port PCIe x1 Gen2 Packet Switch 1184 ASM1184e 4-Port PCIe x1 Gen2 Packet Switch 1849 1184 ASM1184e 4-Port PCIe x1 Gen2 Packet Switch 1187 ASM1187e 7-Port PCIe x1 Gen2 Packet Switch + 118f ASM1187e 7-Port PCIe x1 Gen2 Packet Switch 1242 ASM1142 USB 3.1 Host Controller 1343 ASM1143 USB 3.1 Host Controller + 1806 ASM1806 4-Port PCIe x2 Gen2 Packet Switch 1812 ASM1812 6-Port PCIe x4 Gen2 Packet Switch + 1824 ASM1824 12-Port PCIe x8 Gen2 Packet Switch 2142 ASM2142/ASM3142 USB 3.1 Host Controller 1462 7a72 H270 PC MATE + 2806 ASM2806 4-Port PCIe x2 Gen3 Packet Switch + 2812 ASM2812 6-Port PCIe x4 Gen3 Packet Switch 2824 ASM2824 PCIe Gen3 Packet Switch 3042 ASM3042 USB 3.2 Gen 1 xHCI Controller + 3142 ASM3142 USB 3.2 Gen 2x1 xHCI Controller + 3241 ASM3241 USB 3.2 Gen 2 Host Controller 3242 ASM3242 USB 3.2 Host Controller 1b26 Netcope Technologies, a.s. c132 COMBO-LXT155 @@ -24862,7 +25015,13 @@ 1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. + 2170 CH351 PCIe Parallel Port Adapter + 2273 CH351 PCIe Dual Port Serial Adapter + 3050 CH382L PCIe Parallel Port Adapter + 3250 CH384 Dual Port Serial and Parallel Port Adapter 3252 CH382 PCIe Dual Port Serial Adapter +# Device ID reused: CH352 is for PCI bus, CH382 for PCIe. + 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -24889,6 +25048,7 @@ 0020 FD2110 0021 FD722 0022 FD788 + 0023 FD722-M2 1c28 Lite-On IT Corp. / Plextor 0122 M6e PCI Express SSD [Marvell 88SS9183] # previously Fiberblaze @@ -24917,6 +25077,7 @@ a000 FBC2CGG3 Capture 2x40Gb [Mango_02] a001 FBC2CGG3 Capture 2x100Gb [Mango_02] a003 FBC2CGG3 Capture 16x10Gb [Mango] + a006 FBC2CGG3 Capture 2x100Gb [Mango] a007 FBC2CGG3 Capture 2x40Gb [Mango] a008 FBC2CGG3 Capture 2x25Gb [Mango] a009 FBC2CGG3 Capture 16x10Gb [Mango] @@ -24929,6 +25090,8 @@ a013 FB2CGHH Capture 2x25Gb [Tivoli] a014 FB2CGHH Capture 8x10Gb [Tivoli] a015 FB2CGHH Capture 2x100Gb [Tivoli] + a016 FB2CG Capture 8x25Gb [Savona] + a017 FB2CGHH Capture 8x25Gb [Tivoli] a017 # Used on V120 VME Crate Controller 1c32 Highland Technology, Inc. 1c33 Daktronics, Inc @@ -25144,16 +25307,19 @@ 33f4 IM2P33F4 NVMe SSD (DRAM-less) 33f8 IM2P33F8 series NVMe SSD (DRAM-less) 41c3 SM2P41C3 NVMe SSD (DRAM-less) + 41c8 SM2P41C8 NVMe SSD (DRAM-less) 5236 XPG GAMMIX S70 BLADE NVMe SSD - 5350 XPG GAMMIX S50 NVMe SSD - 5762 FALCON NVMe SSD + 5350 XPG GAMMIX S50, S50 Lite NVMe SSD +# PREMIUM NVMe SSD for PlayStation 5 + 5370 GAMMIX S70 BLADE, PS5 PREMIUM NVMe SSD + 5762 FALCON, GAMMIX S41, SPECTRIX S40G NVMe SSD (DRAM-less) 5763 XPG GAMMIX S5 NVMe SSD (DRAM-less) - 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 5766 XPG GAMMIXS1 1L, XPG GAMMIX S5, LEGEND 710 / 740, SWORDFISH NVMe SSD (DRAM-less) 612a LEGEND 750 NVMe SSD (DRAM-less) - 613a LEGEND 840 NVMe SSD (DRAM-less) + 613a ATOM 50, LEGEND 840 NVMe SSD (DRAM-less) 621a LEGEND 850 NVMe SSD (DRAM-less) 622a LEGEND 960 NVMe SSD - 624a LEGEND 700 NVMe SSD (DRAM-less) + 624a LEGEND 700, XPG GAMMIX S20 NVMe SSD (DRAM-less) # 1TB 627a LEGEND 800 NVMe SSD (DRAM-less) # 500GB @@ -25260,6 +25426,7 @@ 7164 NeuronDevice (Trainium) 1d0f 0000 Trainium 7264 NeuronDevice (Inferentia2) + 7364 NeuronDevice (Trainium2) 8061 NVMe EBS Controller cd01 NVMe SSD Controller ec20 Elastic Network Adapter (ENA) @@ -25275,55 +25442,67 @@ 0714 ZX-100/ZX-200 PCI Express Root Port 0715 ZX-100/ZX-200 PCI Express Root Port 0716 ZX-D PCI Express Root Port - 0717 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 0718 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 0719 KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 0717 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 0718 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 0719 KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071a KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071b KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071c KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 071b KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port + 071c KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071d KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port - 071e KX-5000/KX-6000/KX-6000G/KH-40000 PCI Express Root Port + 071e KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 PCI Express Root Port 071f ZX-200 Upstream Port of PCI Express Switch 0720 ZX-200 PCIE RC6 controller 0721 ZX-200 Downstream Port of PCI Express Switch 0722 ZX-200 PCIE P2C bridge 0731 KH-40000 PCI Express Root Port - 0732 KH-40000 PCI Express Root Port + 0732 KH-40000/KX-7000 PCI Express Root Port + 0733 KX-7000 PCIE Express Root Port + 0734 KX-7000 PCIE Express Root Port + 0735 KX-7000 PCIE Express Root Port + 0736 KX-7000 PCIE Express Root Port + 0737 KX-7000 PCIE Express Root Port + 0738 KX-7000 PCIE Express Root Port + 0739 KX-7000 PCIE Express Root Port + 073a KX-7000 PCIE Express Root Port + 073b KX-7000 PCIE Express Root Port 1000 ZX-D Standard Host Bridge - 1001 ZX-D/ZX-E/KH-40000 Miscellaneous Bus + 1001 ZX-D/ZX-E/KH-40000/KX-7000 Miscellaneous Bus 1003 ZX-E Standard Host Bridge 1005 KH-40000 Standard Host Bridge 1006 KX-6000G Standard Host Bridge + 1007 KX-7000 Standard Host Bridge 3001 ZX-100 Standard Host Bridge 300a ZX-100 Miscellaneous Bus - 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Universal PCI to USB Host Controller - 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000 Standard Enhanced PCI to USB Host Controller - 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge - 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge - 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 DRAM Controller - 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Power Management Controller - 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 I/O APIC - 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Scratch Device - 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Standard Host Bridge + 3038 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Universal PCI to USB Host Controller + 3104 ZX-100/ZX-200/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Enhanced PCI to USB Host Controller + 31b0 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge + 31b1 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge + 31b2 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 DRAM Controller + 31b3 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Power Management Controller + 31b4 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 I/O APIC + 31b5 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Scratch Device + 31b7 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 Standard Host Bridge 31b8 ZX-100/ZX-D PCI to PCI Bridge - 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 High Definition Audio Controller + 3200 KX-7000 Host Bridge + 3288 ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000/KX-7000 High Definition Audio Controller 345b ZX-100/KX-5000/KX-6000/KX-6000G/KH-40000 Miscellaneous Bus 3a02 ZX-100 C-320 GPU 3a03 ZX-D C-860 GPU - 3a04 ZX-E C-960 GPU + 3a04 KX-6000 C-960 GPU + 3a05 KX-7000 C-1190 GPU 3b01 KH-40000 OPI Controller *** 1253 LINES SKIPPED *** From nobody Mon Mar 18 14:40:10 2024 X-Original-To: dev-commits-src-all@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 4TyyF63ym2z5DrWr; Mon, 18 Mar 2024 14:40: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 4TyyF63TDrz4TXt; Mon, 18 Mar 2024 14:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772810; 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=AfP0Trp4M8I9WT7sFzIgZzLZe9bnSUKap6tcmMP1C8M=; b=kgtXbBMjrD8D3M/Md65Uc0MuAl4dcrd7JCydMlXSeiMvXVIjjTNkVeMsXyfnCWmdCt+aiA JJa3TRC3zGP7Qw3lNq1yOwtQKe8zYcAp+9p79k9JGARxwvNQFfBrvRxNd82lMJCYmrQlhO xLSVMSytKcSqA1fV6iYMWrIpAm9nFcX5iqsNR4bEMNUMpXQYcc9mngrsCNBFa/uWpKFEdj 5Kx4532FbFyxCoizDmz4vw12JAtQtW9/rnvRAL9U3Q19jv5FJd7bqYARHG9ijgJDsd8sXh iY5KV+zUpeYBYIYJG30d54/7AfTVVQYHlMVcIvPYcXpgnV2TGB6ZycDRzppp5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710772810; a=rsa-sha256; cv=none; b=p8GX2vhzGswiMwT9cUsWpetxbrYoL27TkWz8OrPvtdWsOVJtmIblbUKYN4EEyCx0368R4/ flMRY1/PuqcsvC8U4tgnCNAJDurkYiT5xPZ+DQF2Bd8zcj9jeNLlzsJjtVDcOc0H3wmCaJ pSFTSeP6ZEZd/F/G7m3+dlvo1kOEAgipmDdXbnSdO7YQzKOsNUUNK6ArkJoSA/S2pZFE3r nTnsqHuS6im9FBRuKVp6j8CEDBy18uKenh5fFV78VxSLAf+i08U5xNJRvFAWinud0KUR4R /oTiTHTLwz4M4G94Ox1yyKh1egT/48BSDSv+GK+u2e5got2IQWE4zI1TOoFS+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710772810; 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=AfP0Trp4M8I9WT7sFzIgZzLZe9bnSUKap6tcmMP1C8M=; b=VWC1tg6IXKNZ6FHDcAPBFlpr6aOExGHIfqbfnnXDnlM9e2gUWeUB9iFQlEH37pgOlhjFs5 gKeUBPoM3uoASkeB5Pv/2yFVoFQZTcMFsu/4tg3M4eLooWs5sqJCRQLmNon4rU7zS7RPZ8 VD13t0yIYcEh6VA7SBPny9eCY0PlDZ5pWv9Dyg9cBpUMiwvdXZyM2aaAwzeCKqfwqZ3oP6 JHQAdQhGNN1Uon2+UU5h3noetVk+ZdALgt0toSX+ID8L/S0/zdPF5fLr01QPupHz9HI2qc oWhelSqCX5E3A+YgqM6LbXmIHkVKAFeIsN2xxwcPpYjhyUQH5dhBP21kq+fC1w== 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 4TyyF62z1dzRbl; Mon, 18 Mar 2024 14:40: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 42IEeAnv071082; Mon, 18 Mar 2024 14:40:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IEeAZT071072; Mon, 18 Mar 2024 14:40:10 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:40:10 GMT Message-Id: <202403181440.42IEeAZT071072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 104328e63034 - stable/14 - timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 104328e63034f34a7961c0ebfb2dfdf78717982d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=104328e63034f34a7961c0ebfb2dfdf78717982d commit 104328e63034f34a7961c0ebfb2dfdf78717982d Author: Baptiste Daroussin AuthorDate: 2024-03-06 14:11:32 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-18 14:39:52 +0000 timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME This is a common use case when using timerfd_create to actually use it with CLOCK_BOOTTIME on linux which is CLOCK_UPTIME for us. Note that currently on freebsd CLOCK_BOOTTIME is CLOCK_UPTIME, but the semantic is supposed to be different, this has to be fixed later. Tested with the fnott notification software Reviewed by: des, imp Differential Revision: https://reviews.freebsd.org/D44253 (cherry picked from commit cf742faa39a58a9b43b671c66097e6880459d4ae) (cherry picked from commit 0ecf0b26a750582b804e238e6446db55188d7fdc) --- sys/kern/sys_timerfd.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index d9c0e189baf2..80d1e9f4bfb2 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -431,8 +431,20 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) AUDIT_ARG_VALUE(clockid); AUDIT_ARG_FFLAGS(flags); - if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) + switch (clockid) { + case CLOCK_REALTIME: + /* FALLTHROUGH */ + case CLOCK_MONOTONIC: + /* FALLTHROUGH */ + case CLOCK_UPTIME: + /* + * CLOCK_BOOTTIME should be added once different from + * CLOCK_UPTIME + */ + break; + default: return (EINVAL); + } if ((flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)) != 0) return (EINVAL); From nobody Mon Mar 18 15:52:59 2024 X-Original-To: dev-commits-src-all@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 4Tyzs80ll3z5Dyct; Mon, 18 Mar 2024 15:53: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 4Tyzs76zYdz4bVl; Mon, 18 Mar 2024 15:52:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777180; 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=YVcY3s0G6VR9ZbYM+lujWHN4mxr4jrVVD7EGSOYwzDo=; b=ARXnbDKkGc5kW3bMgg2jc2Pw4OxnWUQu5TU+eb9BCRq2SUrQ1LLcoup44EwEQaqBzFxK4s 9OiaCSEJkTeXNqmOdmaxJn60EUrKC34TzoAqLdgwPWmdWdkr40RbKr02tipvn2tp6lsV/v AWzNAeLMYZx1xmClJn0ENm4KwHeRR0cJ8gr+RcL5q6P+G7VCgFtAgwlB5fAg8FL7lTvqtO xJ9XV8BQH0R9We5KG8Nb/tJcLaxPiejoX1VZyfbDMz6MHF9PO+6dePDEIVywEs3DSrzRD6 rK2KwVIuc67IdMUDyWzUd6urg2bSks/KKVvFXP/mElDxp14P9jgJPEqgha/t3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777180; a=rsa-sha256; cv=none; b=nmjKHQCyJiw+NV+dX2Q1W/VAAPJ7xSUzAilSbs4/6lIKkp4UC8YLOwmYWhiD8lNS3q05AM uq+kcgRPUPxRr+iSU+S2HhWhMMRqemfDdMw6A4Xp/8Wq0RF1iMinHjKl8+cKTrqa/i3wlq 6L4sU23DOYcEA9h42PF83ac8jKLpbKm+axQEn+PLCdsX1QO9Dcm9fd/A6C0yUTRc1J3vMx Rghse45h0HYiWeLP36+ttDQFqI0GQqXGrrHEcZ8vV8dWJFF2IWxSUH4tLO2uByhZn289Zb W96DdPsjX86SxikS6gGOePgIOEWIPzdX/ag7eq7jAGHfyT/xH4vRw787x3tD+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777180; 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=YVcY3s0G6VR9ZbYM+lujWHN4mxr4jrVVD7EGSOYwzDo=; b=Wlujt+JMluI+Iz5+/BDxoPjn7VxC+i1l+yFQmlhGjKV1lvgn8JcNqzU3pQ2t6d6IWBtOfk 0ZXT6JGJa5GlC8WqAcGjwV+tSk4X15z/f6LcseyyT8IT5Yd3oEBdSiK7cg3RuFTDJzdc6b W8Z7pwjg6305pRHDaDQ+TDp5HXthDBCiAguS73uQaRvxGVf7Na63jqnAY8jActrs46eoHF 4NT8at4d27AbY9WCNFmZCWk40XgsfIVQ67H0zwoIQjrEEr0GsYqc3qyT6FiKFblAjd0Qdy zzmXyd9u1qEdTaR/T/wPTxnSsD7/gxoeXZeFdgGq3ubyOvvEC5o4X/zHtvLR7A== 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 4Tyzs76ZxPzSy4; Mon, 18 Mar 2024 15:52: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 42IFqxLS000929; Mon, 18 Mar 2024 15:52:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFqxxA000926; Mon, 18 Mar 2024 15:52:59 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:52:59 GMT Message-Id: <202403181552.42IFqxxA000926@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: 027fda80fe8b - main - inpcb: remove unused KPIs to manipulate inpcbs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 027fda80fe8b8f7f76c9e1799753601674954901 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=027fda80fe8b8f7f76c9e1799753601674954901 commit 027fda80fe8b8f7f76c9e1799753601674954901 Author: Gleb Smirnoff AuthorDate: 2024-03-18 15:49:39 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 15:49:39 +0000 inpcb: remove unused KPIs to manipulate inpcbs These KPIs were added in 9d29c635daa69 and through 15 years had zero use. They slightly remind what IfAPI does for struct ifnet. But IfAPI does that for the sake of large collection of NIC drivers not being aware of struct ifnet. For the inpcb it is unclear what could be a large collection of externally written kernel modules that need extensively use inpcb and not be aware of its internals at the same time. This isolation of a structure knowledge requires a lot of work, and just throwing in a few KPIs isn't helpful. Reviewed by: kib, bz, markj Differential Revision: https://reviews.freebsd.org/D44310 --- sys/netinet/in_pcb.c | 22 ---------------------- sys/netinet/in_pcb.h | 4 ---- sys/netinet/toecore.h | 1 + 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 981654577deb..16a3707e7c89 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2835,28 +2835,6 @@ inp_inpcbtosocket(struct inpcb *inp) return (inp->inp_socket); } -struct tcpcb * -inp_inpcbtotcpcb(struct inpcb *inp) -{ - - INP_WLOCK_ASSERT(inp); - return ((struct tcpcb *)inp->inp_ppcb); -} - -int -inp_ip_tos_get(const struct inpcb *inp) -{ - - return (inp->inp_ip_tos); -} - -void -inp_ip_tos_set(struct inpcb *inp, int val) -{ - - inp->inp_ip_tos = val; -} - void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, uint32_t *faddr, uint16_t *fp) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 3d633741dc27..7e9de02b0c7c 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -479,12 +479,8 @@ void inp_unlock_assert(struct inpcb *); void inp_apply_all(struct inpcbinfo *, void (*func)(struct inpcb *, void *), void *arg); -int inp_ip_tos_get(const struct inpcb *inp); -void inp_ip_tos_set(struct inpcb *inp, int val); struct socket * inp_inpcbtosocket(struct inpcb *inp); -struct tcpcb * - inp_inpcbtotcpcb(struct inpcb *inp); void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, uint32_t *faddr, uint16_t *fp); diff --git a/sys/netinet/toecore.h b/sys/netinet/toecore.h index a8e5afd6b50a..612c2fe1caf5 100644 --- a/sys/netinet/toecore.h +++ b/sys/netinet/toecore.h @@ -36,6 +36,7 @@ #include #include +struct tcpcb; struct tcpopt; struct tcphdr; struct in_conninfo; From nobody Mon Mar 18 15:53:00 2024 X-Original-To: dev-commits-src-all@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 4Tyzs929Rzz5F06F; Mon, 18 Mar 2024 15:53: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 4Tyzs91F2Cz4bwJ; Mon, 18 Mar 2024 15:53:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777181; 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=yoKDcYdmIB11B96dhUf/gUfIow2ccrVGDAupBQF49Ko=; b=NbFpPPDJn2Xw8kcnUk+iIkShn06Nr0r93O/hXR0dFmudJQ17lDmk+2VKNv9pbdUwZsjtlP 4jn6ivPgFdj1yyFeO5SE/E4318ED/PtQ6GwLQAWcCmtxjHfCH6d2IVn5g5F78mrFapO72C 5f29yFZQ3zhHYp1ztwtYwZPXmJOgUU/VlBF/TzbvfGhdiddRGjSWphJ88DZy165IrEAb3N 0S9urQQqkO5zSv204uFqjGY/xLqjX1BFVMm0ijUOjg6OrJRC55Nv9THr9LsMTr3shTU1js I1Bwoa2SAfKtNZttgDLJRfC0X/1ONFecucrJV/FRlU6Rf+kLe/e183ZW0JTdew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777181; a=rsa-sha256; cv=none; b=Gg7aZtwA4oKqTi+rLPvgvYZI2575Fg3eJuf1R/fEmqEh2jB1dulJWp/32TeRxZc2PGrcx6 ZUXN9fMC4u8U4nHPSjcqn6TN53fSOxKbDafdTz5ANSSaBZGYFtQWVR5uNjBx34eiWDkubC 8GWnv06fuH2sVSljZ0+ocIV7aliLX2NZK7ZwCQ1rElR3C9rgbwzPWg3QS06F3ZqwW1ypWQ LtKvy3fqM0lRynejQoeoxacq8uGsLFauVsc+umgRXHgkrbanJzMH/GBJvLv9uoFxCVne+P 7GKHzY2alAFMYmi7BGgTPt1hSWyOuKLjTZ1kUabeS3AoVQfgzoeJWN6yagHVFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777181; 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=yoKDcYdmIB11B96dhUf/gUfIow2ccrVGDAupBQF49Ko=; b=tVcjqp9lfnG5ssHbHvZCPzi5kxBzu0idt60q+8NygWkeu5F2Wz55WlZ0C5/uD/8PVItVc3 8ZGmN68cZmYpp3ZHUDSI/L75PVtE0c5NJuJgGLOp1OUW48wMkihkCU6HiQfrJB++ek9rv7 0fsEddkgA3K1mQ6N/9zyHHkEr4VFMAh+dr6FdXAPWzrMqn9wO9u8/9spL6Eq9LVbSp5FPZ 6Wx663FeVP0D2WlSjR2D/h6kUV/c8tcLJQC1F4DLNL1plGpZoIROMh+qVv+ClQV7wNbOfR jK8LN7p0cVIOMit7SUv8TVkDUlTf38TA+Uu/uINGf0b+d1JIYy1bGM7innYTog== 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 4Tyzs90Y2wzT97; Mon, 18 Mar 2024 15:53: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 42IFr0ok000983; Mon, 18 Mar 2024 15:53:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFr0pZ000980; Mon, 18 Mar 2024 15:53:00 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:00 GMT Message-Id: <202403181553.42IFr0pZ000980@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: d62c4607e8a3 - main - sockets: remove unused KPIs to manipulate sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d62c4607e8a3613253d613c0d3417cccd02b2c57 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d62c4607e8a3613253d613c0d3417cccd02b2c57 commit d62c4607e8a3613253d613c0d3417cccd02b2c57 Author: Gleb Smirnoff AuthorDate: 2024-03-18 15:50:30 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 15:50:30 +0000 sockets: remove unused KPIs to manipulate sockets These KPIs were added in dd0e6c383a9f0 and through 15 years had zero use. They slightly remind what IfAPI does for struct ifnet. But IfAPI does that for the sake of large collection of NIC drivers not being aware of struct ifnet. For the sockets it is unclear what could be a large collection of externally written kernel modules that need extensively use sockets and not be aware of their internals at the same time. This isolation of a structure knowledge requires a lot of work, and just throwing in a few KPIs isn't helpful. Reviewed by: kib, olce, markj Differential Revision: https://reviews.freebsd.org/D44311 --- sys/kern/uipc_socket.c | 101 --------------------------------------------- sys/netinet/in_pcb.c | 7 ---- sys/netinet/tcp_fastopen.h | 1 + sys/netinet/tcp_offload.h | 2 + sys/sys/socket.h | 23 ----------- 5 files changed, 3 insertions(+), 131 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 18ecf1409fd7..9a29df8b0340 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -4254,34 +4254,6 @@ sotoxsocket(struct socket *so, struct xsocket *xso) } } -struct sockbuf * -so_sockbuf_rcv(struct socket *so) -{ - - return (&so->so_rcv); -} - -struct sockbuf * -so_sockbuf_snd(struct socket *so) -{ - - return (&so->so_snd); -} - -int -so_state_get(const struct socket *so) -{ - - return (so->so_state); -} - -void -so_state_set(struct socket *so, int val) -{ - - so->so_state = val; -} - int so_options_get(const struct socket *so) { @@ -4309,76 +4281,3 @@ so_error_set(struct socket *so, int val) so->so_error = val; } - -int -so_linger_get(const struct socket *so) -{ - - return (so->so_linger); -} - -void -so_linger_set(struct socket *so, int val) -{ - - KASSERT(val >= 0 && val <= USHRT_MAX && val <= (INT_MAX / hz), - ("%s: val %d out of range", __func__, val)); - - so->so_linger = val; -} - -struct protosw * -so_protosw_get(const struct socket *so) -{ - - return (so->so_proto); -} - -void -so_protosw_set(struct socket *so, struct protosw *val) -{ - - so->so_proto = val; -} - -void -so_sorwakeup(struct socket *so) -{ - - sorwakeup(so); -} - -void -so_sowwakeup(struct socket *so) -{ - - sowwakeup(so); -} - -void -so_sorwakeup_locked(struct socket *so) -{ - - sorwakeup_locked(so); -} - -void -so_sowwakeup_locked(struct socket *so) -{ - - sowwakeup_locked(so); -} - -void -so_lock(struct socket *so) -{ - - SOCK_LOCK(so); -} - -void -so_unlock(struct socket *so) -{ - - SOCK_UNLOCK(so); -} diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 16a3707e7c89..d966f8e386fe 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -2847,13 +2847,6 @@ inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp, *fp = inp->inp_fport; } -struct inpcb * -so_sotoinpcb(struct socket *so) -{ - - return (sotoinpcb(so)); -} - /* * Create an external-format (``xinpcb'') structure using the information in * the kernel-format in_pcb structure pointed to by inp. This is done to diff --git a/sys/netinet/tcp_fastopen.h b/sys/netinet/tcp_fastopen.h index ee860941fdb8..f70de4bb8947 100644 --- a/sys/netinet/tcp_fastopen.h +++ b/sys/netinet/tcp_fastopen.h @@ -79,6 +79,7 @@ struct tcp_fastopen_ccache { uint32_t secret; }; +struct tcpcb; #ifdef TCP_RFC7413 void tcp_fastopen_init(void); void tcp_fastopen_destroy(void); diff --git a/sys/netinet/tcp_offload.h b/sys/netinet/tcp_offload.h index b397336ab487..c76408ccd07f 100644 --- a/sys/netinet/tcp_offload.h +++ b/sys/netinet/tcp_offload.h @@ -38,6 +38,8 @@ extern int registered_toedevs; +struct tcpcb; + int tcp_offload_connect(struct socket *, struct sockaddr *); void tcp_offload_listen_start(struct tcpcb *); void tcp_offload_listen_stop(struct tcpcb *); diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 3e24db552618..91fafdec672a 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -713,33 +713,10 @@ __END_DECLS #ifdef _KERNEL struct socket; -struct inpcb *so_sotoinpcb(struct socket *so); -struct sockbuf *so_sockbuf_snd(struct socket *); -struct sockbuf *so_sockbuf_rcv(struct socket *); - -int so_state_get(const struct socket *); -void so_state_set(struct socket *, int); - int so_options_get(const struct socket *); void so_options_set(struct socket *, int); int so_error_get(const struct socket *); void so_error_set(struct socket *, int); - -int so_linger_get(const struct socket *); -void so_linger_set(struct socket *, int); - -struct protosw *so_protosw_get(const struct socket *); -void so_protosw_set(struct socket *, struct protosw *); - -void so_sorwakeup_locked(struct socket *so); -void so_sowwakeup_locked(struct socket *so); - -void so_sorwakeup(struct socket *so); -void so_sowwakeup(struct socket *so); - -void so_lock(struct socket *so); -void so_unlock(struct socket *so); - #endif /* _KERNEL */ #endif /* !_SYS_SOCKET_H_ */ From nobody Mon Mar 18 15:53:18 2024 X-Original-To: dev-commits-src-all@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 4TyzsW2gXjz5Dyk4; Mon, 18 Mar 2024 15:53: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 4TyzsV6zWVz4cf8; Mon, 18 Mar 2024 15:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777199; 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=N9qcZuR7pH+P0BN3IlxzHT2ZjGZqBCHQKefzugKaloI=; b=xYY+rXXg0jfQl58BAacT+jM+Mx/a/kVnk2PStx8qvBP5fjEO+VOy2zMgOpXAcD2pa0ONBi 6XMbx5VZvZb0PR6NTwYCKvWvL4EiEgeCi9glLX4ib+jhVlwPF4hhGA6od6nc6i4Oz0eUR4 RUC1AJi+GP0p2G1zPQsKkEXilDqLiuUK7BEngy/HEhRFgNexgzCIYbjam/s7m8epwB2H8D sVti99Nrcqvu+kWVxXIFfhe5IQpOl6fwMbkvNN+f/VD1MvKeKgY04iqZfFxOje2f/UOHBk UdHaEdVSPetmPz5SsQb+UBG0stGcDMkX73vxUiTxqKqsWHCsi02fdC8TzTN/aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777199; a=rsa-sha256; cv=none; b=gTZxzUa4jH4xeWBJXg3gZ+ksiqsrZu4aUdL8epms47Gf3fcG5nqYM9Lyg3lexS1HJ/4QYp 3TUt9atPyyvXkKAhcxu+vWZMw9FvvuCVfDuQdNnFesXCSDxSqu2yet6s0y5CyZLKk+J1gD R2jxZbKai6X3z371mtaM9GxLIWVfR4rnNQICHc9+9NxT9NcT0dAgDy12GipVgKFOJUEoT5 MSHWan4S2DntY1OEJIoOeIbytTKtFVlYgVq1u0tb2uCV1zP62W1CRr/aUMrBlIKhaKbDzY vD53rTV7iHYQyb0KyUwGYMRx3/ruj3y1miiDKkuE9faecmGpVw7+bu7GhRPMRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777199; 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=N9qcZuR7pH+P0BN3IlxzHT2ZjGZqBCHQKefzugKaloI=; b=e5h/2JO43uaNg11YIsk/TcqXJG5YHp74DmBl8jLZ4dEISC0AKtENbQcgNM5lAHGpqFe18L dQ6bgURhQLSP+JI5gmzdJFyD0dwmpjwWRf1nZcsETSRrN1feSYiUIzsKldB2KWuIFh3ZVx K+ZLebh9Uf3h2HcWpJ3s0RyBbpJVLUygDg4XwXYZQIhRJwPMru0Bcy/7V1KbP7HMAsOYg0 Er+m0Zy3wmEi4xnlfNHevZif7iZwbcCZcOs9ExRyekS3gIWrq+c/qeapWwbU2DqwvjAUMy ZyJ2Lb837EhBGnVVbAjYMguXWQIwrRDIZseAyAwKqm9djrbouO+l97+xhShPUg== 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 4TyzsV5JXlzTr2; Mon, 18 Mar 2024 15:53: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 42IFrIfr001184; Mon, 18 Mar 2024 15:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrI16001181; Mon, 18 Mar 2024 15:53:18 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:18 GMT Message-Id: <202403181553.42IFrI16001181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a7b90458a293 - stable/14 - rtld: add some dlopen tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: a7b90458a2931366faa24deee914c3fb75f8ed1b Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b90458a2931366faa24deee914c3fb75f8ed1b commit a7b90458a2931366faa24deee914c3fb75f8ed1b Author: Kyle Evans AuthorDate: 2024-02-13 15:38:02 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:57 +0000 rtld: add some dlopen tests dlopen_basic just tests that libthr.so can be dlopen()ed, which will just serve as a sanity check that "libthr.so" is a thing that can be dlopened in case we get a weird failure in dlopen_recursing. dlopen_recursing tests a regression reported after the libsys split, where some dlopen() may cause infinite recursion and a resulting crash. This case is inspired by bdrewery's description of what seemed to be causing his issue. The corresponding fix landed in commit 968a18975ad ("rtld: ignore load_filtees() calls if we already [...]") Reviewed by: kib (cherry picked from commit c5796f1572c82b88e8b6a2810c92f30e5ac3e118) --- libexec/rtld-elf/tests/Makefile | 2 ++ libexec/rtld-elf/tests/dlopen_test.c | 52 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index 06e143a441a1..e380e9850fc1 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -13,6 +13,8 @@ ATF_TESTS_C+= ld_preload_fds SRCS.$t= $t.c common.c .endfor +ATF_TESTS_C+= dlopen_test + WARNS?= 3 .include diff --git a/libexec/rtld-elf/tests/dlopen_test.c b/libexec/rtld-elf/tests/dlopen_test.c new file mode 100644 index 000000000000..ab1e8da1cb41 --- /dev/null +++ b/libexec/rtld-elf/tests/dlopen_test.c @@ -0,0 +1,52 @@ +/*- + * + * Copyright (C) 2024 Kyle Evans + * + * SPDX-License-Identifier: BSD-2-Clause + * + */ + +#include + +#include + +ATF_TC_WITHOUT_HEAD(dlopen_basic); +ATF_TC_BODY(dlopen_basic, tc) +{ + void *hdl, *sym; + + hdl = dlopen("libthr.so", RTLD_NOW); + ATF_REQUIRE(hdl != NULL); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym != NULL); + + dlclose(hdl); + + sym = dlsym(hdl, "pthread_create"); + ATF_REQUIRE(sym == NULL); +} + +ATF_TC_WITHOUT_HEAD(dlopen_recursing); +ATF_TC_BODY(dlopen_recursing, tc) +{ + void *hdl; + + /* + * If this doesn't crash, we're OK; a regression at one point caused + * some infinite recursion here. + */ + hdl = dlopen("libthr.so", RTLD_NOW | RTLD_GLOBAL); + ATF_REQUIRE(hdl != NULL); + + dlclose(hdl); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_basic); + ATF_TP_ADD_TC(tp, dlopen_recursing); + + return atf_no_error(); +} From nobody Mon Mar 18 15:53:19 2024 X-Original-To: dev-commits-src-all@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 4TyzsX124Cz5F01b; Mon, 18 Mar 2024 15:53: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 4TyzsW71sYz4cNh; Mon, 18 Mar 2024 15:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; 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=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=s5DnvyiIQDr0VxekhECykIl3D+tA6Jswp2XQZDucvu+fcIE5u423mUE7dZ5OJNobBGIyr9 dGF/zql1sMvP+hoZvhsPD6KDb7CQEVmhb7uJnErKreFzdUhPvId/qTvnslJ56z2Tuwe0OH /h7jky4eyBznW2dezvrF0ClUniWMYEGcyfkfYpz+MsSwt820rBoOaZ57hDW3uj5Q0cZPPL awu3K16FplTDcL9bwsQh/He9OgTczyb81hpvj4qXhUkVa9iRuzxGZYDe188Z+svC5jFApk m6OavaeEgKo9sdp5kMYMKH4wPPr43p8q3Msy8jgYsQHyhjcXcF1V1B7WUXW29A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777200; a=rsa-sha256; cv=none; b=RndDd3ffg/Qy3E9g85iZgzdRGWcVqt7ZIHiEvW43PdPRrw2F+LLsvlEYcgKfGjE3C+0mzl b8YBXkskcDqxC6eXMjbOI0Fgw4t63adzWOPVuX9SAz9+seOAf2xkLPBEgvjtUCBMr4eKLe WGuKnTyxgN5Pk1Hp59qxxkoYuVdjkuRi2PjpCl7HMTCuilBksvJonAmk1XIPFEWHrUYZS2 TX5szB15io7pPkHGLlFVakCPLLNYCPu80SwMEZIai3QxVnHlCr3aMkncWywqnELg0eu+9D sT0tCApZax3NyN+vlgJtAT1d6O/enzKQ/EPAnVY+RqtiRUDJRjJFeu3YZHYztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777200; 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=D1TLFUiHca2AX4oZ2icnoHFAKnZJwCmhLw9ZUpCZ4io=; b=YPI1ITeglJORY6DagleyiyqXr3pjfqDAwkEJprx9JU6ca3S+6OgstwTuKKQMQKPJ65RYF0 JFnxAyY+nqJIgeTud7fxdGOaJbe/dznsc8UlPeYamjKiYyZu6TMcu59av0kVcfehQr1jUs FodhoRvOXfoxhOQWnIfhpE44MsRzCSHmodSwYC5yckQFEnmEOklgKJjmqBPvvo8QaHgYd/ Ta08kBkSMqo8AK2I61bdcezch7aHSuz5AqOloE81a3o384xnVg+gn9waiGlqo4AfFmbP2s ykPAsEiFN+9MadppLMmOS7JbJ25pDi5qccpMpp5+lBI8zbBIDFSjlGjeDS19QA== 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 4TyzsW6fMzzTrK; Mon, 18 Mar 2024 15:53: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 42IFrJul001242; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrJc0001239; Mon, 18 Mar 2024 15:53:19 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:19 GMT Message-Id: <202403181553.42IFrJc0001239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 416547ba79c3 - stable/14 - kern: poll: tap out the pollfd array on successful return List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 416547ba79c3dec8e69502174abecf33dbf74606 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=416547ba79c3dec8e69502174abecf33dbf74606 commit 416547ba79c3dec8e69502174abecf33dbf74606 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:57 +0000 kern: poll: tap out the pollfd array on successful return We do this in kern_poll() to include freebsd32 but exclude the linux compat layer. The ABI should be the same, but the POLL constants are probably different or should be assumed so. Reviewed by: bapt, jhb (cherry picked from commit b5d2165b9046572c9361a8e8b09323a6001ac586) --- sys/kern/sys_generic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index b569a9f808d5..d0d0b1efa354 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1608,6 +1608,11 @@ kern_poll(struct thread *td, struct pollfd *ufds, u_int nfds, error = kern_poll_kfds(td, kfds, nfds, tsp, set); if (error == 0) error = pollout(td, kfds, ufds, nfds); +#ifdef KTRACE + if (error == 0 && KTRPOINT(td, KTR_STRUCT_ARRAY)) + ktrstructarray("pollfd", UIO_USERSPACE, ufds, nfds, + sizeof(*ufds)); +#endif out: if (nfds > nitems(stackfds)) From nobody Mon Mar 18 15:53:20 2024 X-Original-To: dev-commits-src-all@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 4TyzsY2KlZz5Dyk8; Mon, 18 Mar 2024 15:53: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 4TyzsY1GPVz4cNk; Mon, 18 Mar 2024 15:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777201; 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=RFEo53vlkebyx6uFISo6mMrZTYalj4Ghx5Vs5KGAzzs=; b=LpziFKDUJDgYhrNJKXj9KRIluME2rH2TGE7Q6vu+Rf7guImNKsKViNO0QWkCzj3EbL/sct PmHKXvmKmgtdTkqyA8jBuNmFZVMhMbEUH6vPJp1F7nRn/4BburaMbdKXtruLCnT//qhmjF QWNlbe0EhA8PEXRTaMffSkFXNftutknhhnpQCPU+XlkaHdP990U1jAxZsD+9wcJEiCGAo+ IrQmip11OzNIHp86omdAaqGLGOq85g0CIW972vCDTaokBy9ufhP5XkZlv1gXXvNn0L82Kg lDDwrC/FFTQf7hUwny0ZvDrNkt4q8gSLMvjZ9RkuDTF+Y4FJChqkMxlhofOKug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777201; a=rsa-sha256; cv=none; b=eq/hSrn3LQioFTHcRxY1P5aWV6k3vISuiQrsWwqdtg2PlxvwZ16xdZGVIkuc8xq2Q48mFD bAADQDtWwnr93g7LR4lNs8Oz0w5TN/WDzgUS1RS2gYq/9dqSFR9fjw9ODGFha6LhvCKpwq Fov2LGIh9cQCWNHcv/hl6eIGgcWcfLtzYL8I9NMojtbr+2aqrcwKtAfGDvYv8XnVlgFgVY cZSm3PKJkqw7QXlJXJWpW1g5ZRu3oD85PH6t0egZMTgQOa0QR19LrKndIfmpCRJqCkbLdm 4OZswCvasmw7EOKqzwU7u4UtKyegDJtp20w1W5RzK4Q4C2jRyh2es9gBjtEWaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777201; 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=RFEo53vlkebyx6uFISo6mMrZTYalj4Ghx5Vs5KGAzzs=; b=e38yMKC8r7QL3ANb1OgivrB6vrUtv873+xKgaXA4rQpxnOqEIFqWC6oDaaa88ue8CuPgKN Wjw7fAQ8JJgA/+56zGbNpLo43Dj3WAHksU5iNF6Nl3Y8ZwKNgLyTbCCsdwno8Qfj9pWXOM kEBwYQkLB7EoxtaPACl/L/1oDCuwomP8Anf08CWDxlPRnwOD4ugJBoQ5wbbeZlMzHmHlsQ tjgpt6BYVwQasITZyeb2QzsyRD/bLvUVYBjLq0FJD1EldXGzB2gmKV1SKyj9nQylgwXYHP F0/GBMwp9uxrFhvZ2zDTilSq/B4Nm8LtqrPyFK+3ks5zbnY4wHgfHHbJwYmWeg== 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 4TyzsY0bbJzTPP; Mon, 18 Mar 2024 15:53: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 42IFrKb9001300; Mon, 18 Mar 2024 15:53:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrKjB001297; Mon, 18 Mar 2024 15:53:20 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:20 GMT Message-Id: <202403181553.42IFrKjB001297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b983d4f63cb5 - stable/14 - kdump: decode pollfd struct arrays coming from poll(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b983d4f63cb5f8bd3955c092b4d166c4d0bd972d Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b983d4f63cb5f8bd3955c092b4d166c4d0bd972d commit b983d4f63cb5f8bd3955c092b4d166c4d0bd972d Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 kdump: decode pollfd struct arrays coming from poll(2) We'll handle these just as we do kevents, one per line with subsequent lines indented sufficiently to distinguish them from the upcoming return value. Sample, with indentation stripped and revents changed to '...' in the first one to keep the line length down: CALL poll(0x820610560,0x3,0) STRU struct pollfd[] = { { fd=0, events=0x1, revents=0x11<...> { fd=1, events=0x4, revents=0x4} { fd=-1, events=0x4, revents=0} } RET poll 2 Reviewed by: bapt, jhb (cherry picked from commit 02c57f7b48772c5ec4e3a0a3405273b387b9bb08) --- usr.bin/kdump/kdump.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 078b8a364db8..d69c019bd6be 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -58,6 +58,7 @@ static char sccsid[] = "@(#)kdump.c 8.1 (Berkeley) 6/6/93"; #include #include #include +#include #include #include #include @@ -122,6 +123,7 @@ void ktrcapfail(struct ktr_cap_fail *); void ktrfault(struct ktr_fault *); void ktrfaultend(struct ktr_faultend *); void ktrkevent(struct kevent *); +void ktrpollfd(struct pollfd *); void ktrstructarray(struct ktr_struct_array *, size_t); void ktrbitset(char *, struct bitset *, size_t); void ktrsyscall_freebsd(struct ktr_syscall *ktr, register_t **resip, @@ -2221,10 +2223,23 @@ ktrkevent(struct kevent *kev) printf(", data=%#jx, udata=%p }", (uintmax_t)kev->data, kev->udata); } +void +ktrpollfd(struct pollfd *pfd) +{ + + printf("{ fd=%d", pfd->fd); + printf(", events="); + print_mask_arg0(sysdecode_pollfd_events, pfd->events); + printf(", revents="); + print_mask_arg0(sysdecode_pollfd_events, pfd->revents); + printf("}"); +} + void ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) { struct kevent kev; + struct pollfd pfd; char *name, *data; size_t namelen, datalen; int i; @@ -2306,6 +2321,11 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); #endif + } else if (strcmp(name, "pollfd") == 0) { + if (ksa->struct_size != sizeof(pfd)) + goto bad_size; + memcpy(&pfd, data, sizeof(pfd)); + ktrpollfd(&pfd); } else { printf(" }\n"); return; From nobody Mon Mar 18 15:53:22 2024 X-Original-To: dev-commits-src-all@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 4TyzsZ51txz5F07y; Mon, 18 Mar 2024 15:53: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 4TyzsZ21Tdz4cfT; Mon, 18 Mar 2024 15:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777202; 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=WW/DDlmXtZHPTmJ4G1SLgwuHKUlAsF9rIfYJmMNRR/k=; b=eYiMCJ7aW6TVu+JzkwxD3YgIr6Dl+IIfBPfe9nBuxJy/r3vAcdDUMKYBFKP9iyN861IQCR ptoj2+DtTko1y2wEVlCwFosUlLIkFsbBhue958VOszihBiwbY3FgqihH6XtU6wrFN1ayG4 KZxYzgxMM4itXM9TXpG75GmarMkdPyKncTNJzVz5GimXCBG+XCIq2CWIsIQ8mwva/Qz/7D LHVPIXqXOZH8mJIGbke9MTPhmDgKqMyPu8NXg+htUqLPFzYHLhqi4tUPF2o3IXxQ97Zq8+ aDIZjBkyUJOAxYLMaW7zoGpy8TZDrlmvRNtwdcEZdf+JbSeX+kAPpNfnQuq5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777202; a=rsa-sha256; cv=none; b=nqWu6gPkrVO8st3P8x+iCOurhoTfW1i1qCrCkcRLnhoD90ZccIRWb52iiQlAikvhNbN7DF iEr/ZnzkXwWieuwN5uR0m9AH5FamEMooyqXThtBEDUMlVhphZcPfZW+xmImT1QrWIbWHfg WnWhYmzQIiqADh8dEq4fSosYgHaDa/TI8jNyv8vNDUzFiy14cdcRMSKdg9k/HkKd0vbp0/ Est4gPK+9Hj/jU6Iw8oCsPx2Ub5fyLJ7AZXNS+hNxIVIQj3idrzEGFdG9XrmNOREDGyjdW AOXzWuoaKoJIqByeFWcFswMku0ubqYu7Mbgem8AtyutIhDB31kfqDB2nGl0t2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777202; 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=WW/DDlmXtZHPTmJ4G1SLgwuHKUlAsF9rIfYJmMNRR/k=; b=eEDWLdse21h46dkkWH/a3GckLMdw/NeQ+DpWT1I8lwbg4Pr0N565N19Hre/363Vby5yYkr VGCsa5qMeA+/JB4Uzu2ULdQzNU10N1B7WU+ltW+rLYfYlEnDxa51xCZE6OonQzVrXYM0ue V3gjKf8nKFjvfOP83j6Yajjr5VE5kNzZF9ET7RsE/Pv0mkJtplrwKr/Q+XT/vxSUPtGs9f FqER5FnB9eMYPjb66fAo2PQ5kQZsO2MsvYp/fzkuPos8dTfcpc7BwlOByoQc+gP8ZJYsHD +PdOSdDogun6YbByGxWQXmywN+aAS9T3Zb3ot1NTeuvQDAcNg+Mi1qsbi6pHFg== 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 4TyzsZ1dsKzSjb; Mon, 18 Mar 2024 15:53: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 42IFrMj3001351; Mon, 18 Mar 2024 15:53:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrMc5001348; Mon, 18 Mar 2024 15:53:22 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:22 GMT Message-Id: <202403181553.42IFrMc5001348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 160788caa3c9 - stable/14 - ktrace: log genio events on failed write List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 160788caa3c9cac5f21d70962ce330e18a4fe9d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=160788caa3c9cac5f21d70962ce330e18a4fe9d5 commit 160788caa3c9cac5f21d70962ce330e18a4fe9d5 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:07 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 ktrace: log genio events on failed write Visibility into the contents of the buffer when a write(2) has failed can be immensely useful in debugging IPC issues -- pushing this to discuss the idea, or maybe an alternative where we can set a flag like KTRFAC_ERRIO to enable it. When a genio event is potentially raised after an error, currently we'll just free the uio and return. However, such data can be useful when debugging communication between processes to, e.g., understand what the remote side should have grabbed before closing a pipe. Tap out the entire buffer on failure rather than simply discarding it. Reviewed by: kib, markj (cherry picked from commit 47ad4f2d45e406c6316909bc12bc760b2fdd6afb) --- sys/kern/kern_ktrace.c | 2 +- sys/kern/sys_generic.c | 3 ++- sys/kern/uipc_syscalls.c | 3 ++- sys/netinet/sctp_syscalls.c | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 75b81457402b..4c1936edc301 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -769,7 +769,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error) int datalen; char *buf; - if (error) { + if (error != 0 && (rw == UIO_READ || error == EFAULT)) { freeuio(uio); return; } diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index d0d0b1efa354..f3fd39079a82 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -579,7 +579,8 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, cnt -= auio->uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = cnt; + if (error == 0) + ktruio->uio_resid = cnt; ktrgenio(fd, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index c7c2e6544902..85b2214eaeb9 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -791,7 +791,8 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(s, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index a5e4fa8f9603..d67e260b6f99 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -290,7 +290,8 @@ sys_sctp_generic_sendmsg(struct thread *td, struct sctp_generic_sendmsg_args *ua td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ @@ -404,7 +405,8 @@ sys_sctp_generic_sendmsg_iov(struct thread *td, struct sctp_generic_sendmsg_iov_ td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ From nobody Mon Mar 18 15:53:23 2024 X-Original-To: dev-commits-src-all@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 4Tyzsc1Z0fz5Dyd7; Mon, 18 Mar 2024 15:53: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 4Tyzsb5mNLz4ccS; Mon, 18 Mar 2024 15: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=1710777203; 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=BjornkipEQhW2wRL6Jn1tHMxLwGZq/Xo1PytZEcGoQ0=; b=oSYWFdEOmTTI0aXS7fDPJJSMMy/l50OI6+iE2KrW1A1tgbovwOrcgMNf2KLwKH/nbGGbzu QCJlZbltyJq2JOT2+0+xHy3Z2ZARJMDVz7zRW+K3yc2lpPQGP9F97dBkuJp83JuQUb/xfR 448OxAIUCFASUlDrFKQx36kQhEptgh20nGOQ5dkIixbV7rmZ+djQxmfrNXGtMHwQIpIQfI 17LwabAbQC5sqZR6lkjwXr9XnFrq0OznKuGkj7feOS0QCS+U4S3/K6e14yBxvs6TuupHYx Vu33h/zC8+0rkfkyNSIyjkZ+LTQChcFWzTMbZGWDtew7wbSqu5WIli2QI4iOWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777203; a=rsa-sha256; cv=none; b=Z0XZF58B+aPkMeD0fR4VZHkjlO8cYhPkB9kn14v/5OWDTKAJz3Uo0S6QL70lONUn5qOzf+ jMU44OW8ZroJWS6yQflYa5+S0KuY5Fimz5lBEZnSr7dfaLwwS/EkOQVged0aNuVigXevGn 2isVBPId2/vCnGFi4Y7FzBhWdnPpJQAEmT0Mu1RQdGrya2gMLVCx0cwcw3Dfz0ipF6qfk9 cOSCWZilQ+JJbw+5QkKK4uW5n3wcGKvi1Yjxu3b+WO9FglJTCy5x290A9cyxeBUnziVbW2 XVU7FVqd1yaed6VV/NU0YcGaZVUjIGDXYWs/RxrW57J6eRhmvYmH41WtO66RQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777203; 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=BjornkipEQhW2wRL6Jn1tHMxLwGZq/Xo1PytZEcGoQ0=; b=cKfdHnUeSAzujmQw03fmAwnWPNqicCkxaiiLzcmYDVLu7nhs7FWgKNeMqzwSS7HPVRg6R3 FVqqvOWtJUkHJiD8MfO2nX81bk5WR6zoTPcOd1OZUjv+3P8MRwojmBj9de+4ukOQjMDgS+ Px18srAeSz5TmywAFYDJetyyjEHL/IYYDqWzT4TQUozi4UgdHwEImkMVS3iyZiYuOk03Jw XncK1hD3C/CRJ6xS4DFj3ozrwJ5pgeRL4fShLAGJuBTl0VnhCVg/FX+k7kJRsCXXZnWnl8 Uv8POfI37aPJzRajkoU6Q/9ZRp9v5NuDQgnfj60t2pfuVVeXlVhRh8qMfWA3Pw== 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 4Tyzsb2hpQzT9L; Mon, 18 Mar 2024 15: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 42IFrN0R001399; Mon, 18 Mar 2024 15: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 42IFrNAl001396; Mon, 18 Mar 2024 15:53:23 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:23 GMT Message-Id: <202403181553.42IFrNAl001396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: efb74e16ddc0 - stable/14 - libsysdecode: add a decoder for pollfd events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: efb74e16ddc0ba0864abc9b7f284e17f72d40e78 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=efb74e16ddc0ba0864abc9b7f284e17f72d40e78 commit efb74e16ddc0ba0864abc9b7f284e17f72d40e78 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:58 +0000 libsysdecode: add a decoder for pollfd events We'll use this in another change to read pollfd arrays coming from a successful poll(2) operation. Reviewed by: bapt, jhb (cherry picked from commit bd23e71f91ceec5dfdffc28bbd0020849fdd20b4) --- lib/libsysdecode/Makefile | 1 + lib/libsysdecode/flags.c | 8 ++++++++ lib/libsysdecode/mktables | 1 + lib/libsysdecode/sysdecode.h | 1 + lib/libsysdecode/sysdecode_mask.3 | 12 +++++++++++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index e1d6c7e02ff0..504701ee99a2 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -93,6 +93,7 @@ MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ sysdecode_mask.3 sysdecode_msync_flags.3 \ sysdecode_mask.3 sysdecode_open_flags.3 \ sysdecode_mask.3 sysdecode_pipe2_flags.3 \ + sysdecode_mask.3 sysdecode_pollfd_events.3 \ sysdecode_mask.3 sysdecode_reboot_howto.3 \ sysdecode_mask.3 sysdecode_rfork_flags.3 \ sysdecode_mask.3 sysdecode_semget_flags.3 \ diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index 33c778c391ee..32829d35dbe0 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -565,6 +566,13 @@ sysdecode_pipe2_flags(FILE *fp, int flags, int *rem) return (print_mask_0(fp, pipe2flags, flags, rem)); } +bool +sysdecode_pollfd_events(FILE *fp, int flags, int *rem) +{ + + return (print_mask_int(fp, pollfdevents, flags, rem)); +} + const char * sysdecode_prio_which(int which) { diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index bf0dc34511d3..beb18e97f898 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -114,6 +114,7 @@ gen_table "mountflags" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/ gen_table "msyncflags" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" gen_table "nfssvcflags" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" gen_table "pathconfname" "_PC_[A-Z4_]+[[:space:]]+[0-9]+" "sys/unistd.h" +gen_table "pollfdevents" "POLL[A-Z]+[[:space:]]+" "sys/poll.h" gen_table "prio" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" gen_table "procctlcmd" "PROC_[A-Z_]+[[:space:]]+[0-9]" "sys/procctl.h" "PROC_TRACE_CTL_" gen_table "ptraceop" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" diff --git a/lib/libsysdecode/sysdecode.h b/lib/libsysdecode/sysdecode.h index 4c091bb14343..8dc0bbea6f0d 100644 --- a/lib/libsysdecode/sysdecode.h +++ b/lib/libsysdecode/sysdecode.h @@ -83,6 +83,7 @@ const char *sysdecode_nfssvc_flags(int _flags); bool sysdecode_open_flags(FILE *_fp, int _flags, int *_rem); const char *sysdecode_pathconf_name(int _name); bool sysdecode_pipe2_flags(FILE *_fp, int _flags, int *_rem); +bool sysdecode_pollfd_events(FILE *fp, int flags, int *rem); const char *sysdecode_prio_which(int _which); const char *sysdecode_procctl_cmd(int _cmd); const char *sysdecode_ptrace_request(int _request); diff --git a/lib/libsysdecode/sysdecode_mask.3 b/lib/libsysdecode/sysdecode_mask.3 index 171a086a5079..efcab331fe29 100644 --- a/lib/libsysdecode/sysdecode_mask.3 +++ b/lib/libsysdecode/sysdecode_mask.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 3, 2022 +.Dd February 29, 2024 .Dt sysdecode_mask 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Nm sysdecode_msync_flags , .Nm sysdecode_open_flags , .Nm sysdecode_pipe2_flags , +.Nm sysdecode_pollfd_events , .Nm sysdecode_reboot_howto , .Nm sysdecode_rfork_flags , .Nm sysdecode_semget_flags , @@ -96,6 +97,8 @@ .Ft bool .Fn sysdecode_pipe2_flags "FILE *fp" "int flags" "int *rem" .Ft bool +.Fn sysdecode_pollfd_events "FILE *fp" "int flags" "int *rem" +.Ft bool .Fn sysdecode_reboot_howto "FILE *fp" "int howto" "int *rem" .Ft bool .Fn sysdecode_rfork_flags "FILE *fp" "int flags" "int *rem" @@ -191,6 +194,13 @@ and .Dv F_SETFL .Xr fcntl 2 commands. +.It Fn sysdecode_pollfd_events +The +.Fa events +and +.Fa revents +members of a +.Vt struct pollfd . .It Fn sysdecode_sctp_nxt_flags The .Fa nxt_flags From nobody Mon Mar 18 15:53:24 2024 X-Original-To: dev-commits-src-all@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 4Tyzsd0Ds3z5Dyd8; Mon, 18 Mar 2024 15: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 4Tyzsc5xGwz4cnK; Mon, 18 Mar 2024 15: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=1710777204; 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=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=rQTZ9fyjjPsOqOe+5JwpTZK63nhw1MLo7T4IGFqRhnEqRKDNbCM7yLwLnFkPWngsD4+iDR MyOJrK6tK6XD/PqgwgQ1cRfDIC585yUIRzlNBbggxj4s2UbwjNqEcxi9NXAP14CocaFRcB vXEwTqeuxDFJ6JPEwkrFsJ6UIEGzSNv1YwvNg5JEXdXVDccLtJCUw8Mrs/Dloe6Lv3/edo VMs3VClumO0h+Q2HcW1Uo5lOFJR6XWe/K7OBsvXuftuFFKscBVCRIzfE1sugFMKzfQBNFf GnYMV2sJFXNiLDKQ1eJijt+yxPcoaPpPTu8n386ZdkmUuY2ln8jcpr2VemDT3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777204; a=rsa-sha256; cv=none; b=fHQEQfKV7n7j2GN7KdfJGgUXgX3i9ZLBARibQQm5Ie11ePBx1fHig5N9OvAOxFgH50Z7X4 nLBA5tY4yLsx0QSdwT45X4yjzY8RKWZ1oWVWffwAOTCdrF+qFg8ONwXiGWNb6srLk5a4Al rs8UHwPAi7FZyBdTFflQzbR3t691cxdWBonxA7PZTA2sd1Z/L/Jk5xFxsfrGzavvxeTrow NcxGzmfLIrHMdmKElqvcaRpq2/r4ZgEnOth29R6QTEA0fJ5IVebI053a+L0JoN1/hQ/rvT 5VicGZMtb/FCrcWwBhl5AeBnnclLMXGXPzc7rwhTT1Tr7shSMv3wbXOlNg8o4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777204; 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=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=bR+RJFq0Jb7r/W2A99BUUjuZ0PZ0wXadpQGQOfbJCyb6Ep7xmRhCBSlnpEfBcjOaAHI+YM k1soa9qh+UcC319pbWSJ1MC39YOKZE2DCmYh6IvEuBC19SlC+q/RtVsV+l9ETwcA6Hx/wm YSxMZrM7uNkEmU7JT+9D5cvShKKjuojn2+0e6kOb0JeYd+QE6538wdoViUW5SLQnjdjqIb vbeQTjogK7pSPb3wMqqPEAR5HQ/ILQiJ0gdc4CL5vk/Je/V/e65EY1lvqHthQcSrDs7Y1y gA9xZSb4Wh6ms/nhYdDh/gY16TSqLqheNZOp9jo3ekEb3uKyFPUyyXORZvutEg== 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 4Tyzsc3VYMzSyN; Mon, 18 Mar 2024 15: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 42IFrOtp001456; Mon, 18 Mar 2024 15: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 42IFrOCK001453; Mon, 18 Mar 2024 15:53:24 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:24 GMT Message-Id: <202403181553.42IFrOCK001453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 97bfe58ddc60 - stable/14 - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 commit 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:59 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp (cherry picked from commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f) --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 7b5f892cffbe..996db29dee8e 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1115,8 +1115,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From nobody Mon Mar 18 15:58:23 2024 X-Original-To: dev-commits-src-all@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 4TyzzN0vtGz5F0jj; Mon, 18 Mar 2024 15:58: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 4TyzzN0fJgz4fK4; Mon, 18 Mar 2024 15:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777504; 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=Diqm4pghtaBTlSTmQD+Jwu13+QG03yr9ppi9rxPA16U=; b=wFXomEzvxeAWneRu1rOAynmWCzucUsGRylXsdJ+HWTLqKlwMnmGllEILV15/mu6ok8uraL grmj35r7FWauHHmzrhadRfoRSAe+Zu//2PUs5PLwZDAdMo4VAMD/8M8yYpm2J0PaKjvCU/ QsErpmbAIgoZLt1uld2jfTBhCP/P7LtPy/N72e0Ln/hCka4WIKR2tzWRUXboj0+sv+IwGf QOh5T9RriLtwnB3G/SAoEvN+L/s1wD3B45TTCjCcM5GwkylzpCwnzQYlw8jJlDUleOJZns Fp5O45btpanQe9Qc381DOBqkO2Le9xedJZtxbVd2HVC9OFmnhswuTjOG70RXTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777504; a=rsa-sha256; cv=none; b=ktbV+V47cjBW0nARDcvaAoyRLmF4Y7krzrY1I3nQt0ZYRZh5XpQX3KYvENyPc1nL7fhCcm PZoFE/p9RvTuXtVX4YrH9N73936edcCuuym5LZgd/ymoqkJ2zZWMEi53Z/d9QqKduplxan ICJBU4BCL1inLGvZk6v9VgMOoihEWGEBRDbjnx1r29p6VXXTurz0EQSogDBEpiDPA1IcQd NNbtK70jXI0uK2AzUsrYst1Dts/yUPZTnZorX2gtm3U4vgw6LRgShj0/j2fg6bMmQ70/ni q7LQ4wGNaCA/36+Vb5rGTSs9ytlOX98VndFXwKLNEoqN53mz2po370YitPY5EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777504; 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=Diqm4pghtaBTlSTmQD+Jwu13+QG03yr9ppi9rxPA16U=; b=whnczFHG3WqPoQUE0nk7NqAhTYrubHM6oCrhOLHvBbvePH7nhcbLzMaNYZR5UWwFmEjt7b 5PWLS+Ogdo0j3a+X/8ADKimgSnwo83wf40JECG4aP8TLD6cPqQwMId0h/S/E4kncRn7HIg oOHOJ0xDOk0EYEQdf6dV0OQC7RP/7fgDGf4pgbnRPttSKmxl5V5DJgkz24FwdG1pMAljUJ 1/M8ZGJWXta+AuHnDteM6+cP7QZW3zNZrM1qrS+FmB2AuIa337fj1QFwEb4eCmCrrMn3up 3/GGaci45epVJV+GFxD2AT9cqnKU8DznAD/CreQCwnGcNjyMTxMxhIJt+pw74w== 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 4TyzzM71B0zTPf; Mon, 18 Mar 2024 15:58: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 42IFwNwd002335; Mon, 18 Mar 2024 15:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFwN0o002332; Mon, 18 Mar 2024 15:58:23 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:58:23 GMT Message-Id: <202403181558.42IFwN0o002332@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: dd7b86e2a010 - main - tcp: remove IS_FASTOPEN() macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: dd7b86e2a010818b53f42200815f1858300045d7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=dd7b86e2a010818b53f42200815f1858300045d7 commit dd7b86e2a010818b53f42200815f1858300045d7 Author: Gleb Smirnoff AuthorDate: 2024-03-18 15:56:17 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 15:56:17 +0000 tcp: remove IS_FASTOPEN() macro The macro is more obfuscating than helping as it just checks a single flag of t_flags. All other t_flags bits are checked without a macro. A bigger problem was that declaration of the macro in tcp_var.h depended on a kernel option. It is a bad practice to create such definitions in installable headers. Reviewed by: rscheff, tuexen, kib Differential Revision: https://reviews.freebsd.org/D44362 --- sys/netinet/tcp_input.c | 14 +++++++------- sys/netinet/tcp_output.c | 14 +++++++------- sys/netinet/tcp_stacks/bbr.c | 26 +++++++++++++------------- sys/netinet/tcp_stacks/rack.c | 35 ++++++++++++++++++----------------- sys/netinet/tcp_subr.c | 2 +- sys/netinet/tcp_syncache.c | 2 +- sys/netinet/tcp_usrreq.c | 15 +++++++-------- sys/netinet/tcp_var.h | 8 -------- 8 files changed, 54 insertions(+), 62 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8df975bcee54..8410cb490915 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1680,7 +1680,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, (tp->t_flags & TF_NOOPT))) { tp->t_flags &= ~TF_SACK_PERMIT; } - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { if ((to.to_flags & TOF_FASTOPEN) && !(tp->t_flags & TF_NOOPT)) { uint16_t mss; @@ -1989,7 +1989,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, tcp_log_end_status(tp, TCP_EI_STATUS_RST_IN_FRONT); goto dropwithreset; } - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { /* * When a TFO connection is in SYN_RECEIVED, the * only valid packets are the initial SYN, a @@ -2063,7 +2063,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * If not all the data that was sent in the TFO SYN * has been acked, resend the remainder right away. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->snd_una != tp->snd_max)) { tp->snd_nxt = th->th_ack; tfo_partial_ack = 1; @@ -2419,7 +2419,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if (tp->t_state == TCPS_SYN_RECEIVED || (tp->t_flags & TF_NEEDSYN)) { if (tp->t_state == TCPS_SYN_RECEIVED && - IS_FASTOPEN(tp->t_flags)) { + (tp->t_flags & TF_FASTOPEN)) { tp->snd_wnd = tiwin; cc_conn_init(tp); } @@ -2467,7 +2467,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * SYN-RECEIVED* -> FIN-WAIT-1 */ tp->t_starttime = ticks; - if (IS_FASTOPEN(tp->t_flags) && tp->t_tfo_pending) { + if ((tp->t_flags & TF_FASTOPEN) && tp->t_tfo_pending) { tcp_fastopen_decrement_counter(tp->t_tfo_pending); tp->t_tfo_pending = NULL; } @@ -2486,7 +2486,7 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, * snd_cwnd reduction that occurs when a TFO SYN|ACK * is retransmitted. */ - if (!IS_FASTOPEN(tp->t_flags)) + if (!(tp->t_flags & TF_FASTOPEN)) cc_conn_init(tp); tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp)); } @@ -3167,7 +3167,7 @@ dodata: /* XXX */ * connection then we just ignore the text. */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && - IS_FASTOPEN(tp->t_flags)); + (tp->t_flags & TF_FASTOPEN)); if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 26a8ed70ceff..6f7bf6f8b029 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -239,10 +239,10 @@ tcp_default_output(struct tcpcb *tp) * only allow the initial SYN or SYN|ACK and those sent * by the retransmit timer. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && ((tp->t_state == TCPS_SYN_SENT) || - (tp->t_state == TCPS_SYN_RECEIVED)) && - SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ + (tp->t_state == TCPS_SYN_RECEIVED)) && + SEQ_GT(tp->snd_max, tp->snd_una) && /* SYN or SYN|ACK sent */ (tp->snd_nxt != tp->snd_una)) /* not a retransmit */ return (0); @@ -436,7 +436,7 @@ after_sack_rexmit: * When sending additional segments following a TFO SYN|ACK, * do not include the SYN bit. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_state == TCPS_SYN_RECEIVED)) flags &= ~TH_SYN; off--, len++; @@ -464,7 +464,7 @@ after_sack_rexmit: * * - When the socket is in the CLOSED state (RST is being sent) */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (((flags & TH_SYN) && (tp->t_rxtshift > 0)) || ((tp->t_state == TCPS_SYN_SENT) && (tp->t_tfo_client_cookie_len == 0)) || @@ -801,7 +801,7 @@ send: * have caused the original SYN or SYN|ACK to have * been dropped by a middlebox. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_rxtshift == 0)) { if (tp->t_state == TCPS_SYN_RECEIVED) { to.to_tfo_len = TCP_FASTOPEN_COOKIE_LEN; @@ -875,7 +875,7 @@ send: * If we wanted a TFO option to be added, but it was unable * to fit, ensure no data is sent. */ - if (IS_FASTOPEN(tp->t_flags) && wanted_cookie && + if ((tp->t_flags & TF_FASTOPEN) && wanted_cookie && !(to.to_flags & TOF_FASTOPEN)) len = 0; } diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 934b35bd22d7..4be12e824926 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -8188,7 +8188,7 @@ bbr_process_data(struct mbuf *m, struct tcphdr *th, struct socket *so, * then we just ignore the text. */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && - IS_FASTOPEN(tp->t_flags)); + (tp->t_flags & TF_FASTOPEN)); if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; @@ -8773,7 +8773,7 @@ bbr_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, * If not all the data that was sent in the TFO SYN * has been acked, resend the remainder right away. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->snd_una != tp->snd_max)) { tp->snd_nxt = th->th_ack; tfo_partial = 1; @@ -8939,7 +8939,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); return (1); } - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { /* * When a TFO connection is in SYN_RECEIVED, the only valid * packets are the initial SYN, a retransmit/copy of the @@ -9015,7 +9015,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, * processing; else drop segment and return. */ if ((thflags & TH_ACK) == 0) { - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { cc_conn_init(tp); } return (bbr_process_data(m, th, so, tp, drop_hdrlen, tlen, @@ -9052,7 +9052,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, /* Drop off any SYN in the send map (probably not there) */ if (thflags & TH_ACK) bbr_log_syn(tp, to); - if (IS_FASTOPEN(tp->t_flags) && tp->t_tfo_pending) { + if ((tp->t_flags & TF_FASTOPEN) && tp->t_tfo_pending) { tcp_fastopen_decrement_counter(tp->t_tfo_pending); tp->t_tfo_pending = NULL; } @@ -9074,7 +9074,7 @@ bbr_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, * is not harmless as it would undo the snd_cwnd reduction * that occurs when a TFO SYN|ACK is retransmitted. */ - if (!IS_FASTOPEN(tp->t_flags)) + if (!(tp->t_flags & TF_FASTOPEN)) cc_conn_init(tp); } /* @@ -11408,7 +11408,7 @@ bbr_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_flags & TF_SACK_PERMIT) && (to.to_flags & TOF_SACKPERM) == 0) tp->t_flags &= ~TF_SACK_PERMIT; - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { if (to.to_flags & TOF_FASTOPEN) { uint16_t mss; @@ -12062,7 +12062,7 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval *tv) * For TFO connections in SYN_RECEIVED, only allow the initial * SYN|ACK and those sent by the retransmit timer. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && ((tp->t_state == TCPS_SYN_RECEIVED) || (tp->t_state == TCPS_SYN_SENT)) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ @@ -12381,7 +12381,7 @@ recheck_resend: * When sending additional segments following a TFO SYN|ACK, * do not include the SYN bit. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_state == TCPS_SYN_RECEIVED)) flags &= ~TH_SYN; sb_offset--, len++; @@ -12412,7 +12412,7 @@ recheck_resend: * actively created socket * - When the socket is in the CLOSED state (RST is being sent) */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (((flags & TH_SYN) && (tp->t_rxtshift > 0)) || ((tp->t_state == TCPS_SYN_SENT) && (tp->t_tfo_client_cookie_len == 0)) || @@ -12422,7 +12422,7 @@ recheck_resend: rsm = NULL; } /* Without fast-open there should never be data sent on a SYN */ - if ((flags & TH_SYN) && (!IS_FASTOPEN(tp->t_flags))) + if ((flags & TH_SYN) && !(tp->t_flags & TF_FASTOPEN)) len = 0; if (len <= 0) { /* @@ -12846,7 +12846,7 @@ send: * have caused the original SYN or SYN|ACK to have * been dropped by a middlebox. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_rxtshift == 0)) { if (tp->t_state == TCPS_SYN_RECEIVED) { to.to_tfo_len = TCP_FASTOPEN_COOKIE_LEN; @@ -12902,7 +12902,7 @@ send: * If we wanted a TFO option to be added, but it was unable * to fit, ensure no data is sent. */ - if (IS_FASTOPEN(tp->t_flags) && wanted_cookie && + if ((tp->t_flags & TF_FASTOPEN) && wanted_cookie && !(to.to_flags & TOF_FASTOPEN)) len = 0; } diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 1fe07fa8d641..f89fd46f2a85 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -13585,7 +13585,7 @@ rack_process_data(struct mbuf *m, struct tcphdr *th, struct socket *so, * then we just ignore the text. */ tfo_syn = ((tp->t_state == TCPS_SYN_RECEIVED) && - IS_FASTOPEN(tp->t_flags)); + (tp->t_flags & TF_FASTOPEN)); if ((tlen || (thflags & TH_FIN) || (tfo_syn && tlen > 0)) && TCPS_HAVERCVDFIN(tp->t_state) == 0) { tcp_seq save_start = th->th_seq; @@ -14194,7 +14194,7 @@ rack_do_syn_sent(struct mbuf *m, struct tcphdr *th, struct socket *so, * If not all the data that was sent in the TFO SYN * has been acked, resend the remainder right away. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->snd_una != tp->snd_max)) { /* Was it a partial ack? */ if (SEQ_LT(th->th_ack, tp->snd_max)) @@ -14373,7 +14373,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, ctf_do_dropwithreset(m, tp, th, BANDLIM_RST_OPENPORT, tlen); return (1); } - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { /* * When a TFO connection is in SYN_RECEIVED, the * only valid packets are the initial SYN, a @@ -14454,7 +14454,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, * processing; else drop segment and return. */ if ((thflags & TH_ACK) == 0) { - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { rack_cc_conn_init(tp); } return (rack_process_data(m, th, so, tp, drop_hdrlen, tlen, @@ -14475,7 +14475,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, * FIN-WAIT-1 */ tp->t_starttime = ticks; - if (IS_FASTOPEN(tp->t_flags) && tp->t_tfo_pending) { + if ((tp->t_flags & TF_FASTOPEN) && tp->t_tfo_pending) { tcp_fastopen_decrement_counter(tp->t_tfo_pending); tp->t_tfo_pending = NULL; } @@ -14492,7 +14492,7 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, struct socket *so, * is not harmless as it would undo the snd_cwnd reduction * that occurs when a TFO SYN|ACK is retransmitted. */ - if (!IS_FASTOPEN(tp->t_flags)) + if (!(tp->t_flags & TF_FASTOPEN)) rack_cc_conn_init(tp); } /* @@ -18198,7 +18198,7 @@ rack_do_segment_nounlock(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, if ((tp->t_flags & TF_SACK_PERMIT) && (to.to_flags & TOF_SACKPERM) == 0) tp->t_flags &= ~TF_SACK_PERMIT; - if (IS_FASTOPEN(tp->t_flags)) { + if (tp->t_flags & TF_FASTOPEN) { if (to.to_flags & TOF_FASTOPEN) { uint16_t mss; @@ -21346,7 +21346,7 @@ rack_output(struct tcpcb *tp) * For TFO connections in SYN_RECEIVED, only allow the initial * SYN|ACK and those sent by the retransmit timer. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_state == TCPS_SYN_RECEIVED) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN|ACK sent */ (rack->r_ctl.rc_resend == NULL)) { /* not a retransmit */ @@ -21494,7 +21494,7 @@ rack_output(struct tcpcb *tp) * only allow the initial SYN or SYN|ACK and those sent * by the retransmit timer. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && ((tp->t_state == TCPS_SYN_RECEIVED) || (tp->t_state == TCPS_SYN_SENT)) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ @@ -21949,7 +21949,8 @@ skip_fast_output: } SOCKBUF_LOCK(sb); if ((sack_rxmit == 0) && - (TCPS_HAVEESTABLISHED(tp->t_state) || IS_FASTOPEN(tp->t_flags))) { + (TCPS_HAVEESTABLISHED(tp->t_state) || + (tp->t_flags & TF_FASTOPEN))) { /* * We are not retransmitting (sack_rxmit is 0) so we * are sending new data. This is always based on snd_max. @@ -22075,7 +22076,7 @@ skip_fast_output: * no data please. */ if ((sack_rxmit == 0) && - (!IS_FASTOPEN(tp->t_flags))){ + !(tp->t_flags & TF_FASTOPEN)) { len = 0; sb_offset = 0; } @@ -22135,7 +22136,7 @@ skip_fast_output: * When sending additional segments following a TFO SYN|ACK, * do not include the SYN bit. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_state == TCPS_SYN_RECEIVED)) flags &= ~TH_SYN; } @@ -22160,7 +22161,7 @@ skip_fast_output: * * - When the socket is in the CLOSED state (RST is being sent) */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (((flags & TH_SYN) && (tp->t_rxtshift > 0)) || ((tp->t_state == TCPS_SYN_SENT) && (tp->t_tfo_client_cookie_len == 0)) || @@ -22169,7 +22170,7 @@ skip_fast_output: len = 0; } /* Without fast-open there should never be data sent on a SYN */ - if ((flags & TH_SYN) && (!IS_FASTOPEN(tp->t_flags))) { + if ((flags & TH_SYN) && !(tp->t_flags & TF_FASTOPEN)) { len = 0; } if ((len > segsiz) && (tcp_dsack_block_exists(tp))) { @@ -22498,7 +22499,7 @@ just_return_nolock: { int app_limited = CTF_JR_SENT_DATA; - if ((IS_FASTOPEN(tp->t_flags) == 0) && + if ((tp->t_flags & TF_FASTOPEN) == 0 && (flags & TH_FIN) && (len == 0) && (sbused(sb) == (tp->snd_max - tp->snd_una)) && @@ -22866,7 +22867,7 @@ send: * have caused the original SYN or SYN|ACK to have * been dropped by a middlebox. */ - if (IS_FASTOPEN(tp->t_flags) && + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_rxtshift == 0)) { if (tp->t_state == TCPS_SYN_RECEIVED) { to.to_tfo_len = TCP_FASTOPEN_COOKIE_LEN; @@ -22964,7 +22965,7 @@ send: * If we wanted a TFO option to be added, but it was unable * to fit, ensure no data is sent. */ - if (IS_FASTOPEN(tp->t_flags) && wanted_cookie && + if ((tp->t_flags & TF_FASTOPEN) && wanted_cookie && !(to.to_flags & TOF_FASTOPEN)) len = 0; } diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 2bb61cfcbc56..f618bc1ba04b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -3282,7 +3282,7 @@ tcp_drop_syn_sent(struct inpcb *inp, int errno) if (tp->t_state != TCPS_SYN_SENT) return (inp); - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) tcp_fastopen_disable_path(tp); tp = tcp_drop(tp, errno); diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index b462e2fd799d..c21dbbb58e31 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1447,7 +1447,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, win = so->sol_sbrcv_hiwat; ltflags = (tp->t_flags & (TF_NOOPT | TF_SIGNATURE)); - if (V_tcp_fastopen_server_enable && IS_FASTOPEN(tp->t_flags) && + if (V_tcp_fastopen_server_enable && (tp->t_flags & TF_FASTOPEN) && (tp->t_tfo_pending != NULL) && (to->to_flags & TOF_FASTOPEN)) { /* diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 916fe33e8704..abdc2de545e9 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -397,7 +397,7 @@ tcp_usr_listen(struct socket *so, int backlog, struct thread *td) } SOCK_UNLOCK(so); - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) tp->t_tfo_pending = tcp_fastopen_alloc_counter(); out: @@ -454,7 +454,7 @@ tcp6_usr_listen(struct socket *so, int backlog, struct thread *td) } SOCK_UNLOCK(so); - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) tp->t_tfo_pending = tcp_fastopen_alloc_counter(); if (error != 0) @@ -887,8 +887,7 @@ tcp_usr_rcvd(struct socket *so, int flags) * application response data, or failing that, when the DELACK timer * expires. */ - if (IS_FASTOPEN(tp->t_flags) && - (tp->t_state == TCPS_SYN_RECEIVED)) + if ((tp->t_flags & TF_FASTOPEN) && (tp->t_state == TCPS_SYN_RECEIVED)) goto out; #ifdef TCP_OFFLOAD if (tp->t_flags & TF_TOE) @@ -1095,7 +1094,7 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m, sbflush(&so->so_snd); goto out; } - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) tcp_fastopen_connect(tp); else { tp->snd_wnd = TTCP_CLIENT_SND_WND; @@ -1161,7 +1160,7 @@ tcp_usr_send(struct socket *so, int flags, struct mbuf *m, /* * Not going to contemplate SYN|URG */ - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) tp->t_flags &= ~TF_FASTOPEN; #ifdef INET6 if (isipv6) @@ -1578,7 +1577,7 @@ tcp_fill_info(const struct tcpcb *tp, struct tcp_info *ti) default: break; } - if (IS_FASTOPEN(tp->t_flags)) + if (tp->t_flags & TF_FASTOPEN) ti->tcpi_options |= TCPI_OPT_TFO; ti->tcpi_rto = tp->t_rxtcur * tick; @@ -2685,7 +2684,7 @@ tcp_disconnect(struct tcpcb *tp) * socket is still open. */ if (tp->t_state < TCPS_ESTABLISHED && - !(tp->t_state > TCPS_LISTEN && IS_FASTOPEN(tp->t_flags))) { + !(tp->t_state > TCPS_LISTEN && (tp->t_flags & TF_FASTOPEN))) { tp = tcp_close(tp); KASSERT(tp != NULL, ("tcp_disconnect: tcp_close() returned NULL")); diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 7b5c57d39213..e49d682896c0 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -812,14 +812,6 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY) #define EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY) -#if defined(_KERNEL) -#if !defined(TCP_RFC7413) -#define IS_FASTOPEN(t_flags) (false) -#else -#define IS_FASTOPEN(t_flags) (t_flags & TF_FASTOPEN) -#endif -#endif - #define BYTES_THIS_ACK(tp, th) (th->th_ack - tp->snd_una) /* From nobody Mon Mar 18 16:15:03 2024 X-Original-To: dev-commits-src-all@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 4Tz0Lc0NMsz5F1mg; Mon, 18 Mar 2024 16:15: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 4Tz0Lb5lW3z4gY1; Mon, 18 Mar 2024 16:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778503; 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=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=S89IRxNQ0XRIRsNZjWumkyyMpRqJqawMji/KgRN1hbjSH0e6hczp4IqNZQpbZ0QZJ8YjHs V21V6YbaOG/eEp8D6kSFYs3R0vi6zfiSW7YGnzHiVAWmXr/AQTes/Ynybgu4fAeE392APk JnqDJQGXUxIVGKwzT3+m69dddriGy7bbSUn3zwoNFyOR2GpKV2Sy8JH0d+0NxrISqlyXl0 IrlvPsDC8PeGNnlzzhFzOLPQfgJGXjilg8MCK5hM99x2QTUw+IY+1MdpT2nU4j9kzeFwHx W5PJBh2xDdZIQKnHPJodUY7/rgl8O0j1dZzCmGgyTWo6m6xTjUjzUCL7XRnkQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710778503; a=rsa-sha256; cv=none; b=lBywaaP/jhOTCtY6N08HnRSbgh5W5ijmSu9hMFlC1KzFPEdpvEGmHtcBSFtXju+hX8vnxC JNrwoX8KhwZZT4Z+WY0RWJrTIChSl51dg62V+9wEi+abc4lT05MBWz3DILyo39T2beON+V ssQKC4aiNGwKzpwrV4WdZAQwj/i0gaa2Zl9HF8cqq2MF9B2sDp5lPatBbYBeyFF8u+0T56 4Jl8tWRwwmahyEsA0FIb2NaWG+d3op3KDmJEEy14inAjDlk59atcM9pyGSKPZmhsxTZZBa b6/pE/uHyh/j4pXXLqopL5VmMGatIdeHOhmeKUA6wEyGmtEnQBUBVoyUmdtAWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778503; 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=l/BYiOuLU67P7q5Hnh0Wa6hViuh6+S+3YdnYcTwUiS0=; b=JWx/jtpXXDp3S7rJHTd46aAWYe/7ho9InC4leKsAU3KDx9nIHIb0MLNf1YLMYoHduxVmmK J9FWQNzaK7gLWrQKplmnIuNAdjyeHqXfAfegyYxGnpzH2l4sjou3/9EzXuwfJ9eJYlRRLI s/6zZ++dCdwffdCS2F1fCShlM+aH8L9N5Vyx0E1T0guGAcwIQPIvBeoW2gyHEgsFueaemO ouycWiIfRGcOoLHEq+XuIIclnUS7r1Xe6bVVz/4ojcSl3l5PgsMaXei4YfhBLRZmFHZPqu 4acrxrwa5KFmif2GiFQ5KtFiwEpVkFFS9PB2trioV5uA3a2dNaEinbKvKxo8WA== 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 4Tz0Lb5LZ1zW3c; Mon, 18 Mar 2024 16:15: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 42IGF3Ir036155; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGF3De036152; Mon, 18 Mar 2024 16:15:03 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:15:03 GMT Message-Id: <202403181615.42IGF3De036152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: d45714ade3de - stable/14 - netlink: fix route protocol constant values to match Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d45714ade3de0db24cb313c84674c2a8573f4690 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d45714ade3de0db24cb313c84674c2a8573f4690 commit d45714ade3de0db24cb313c84674c2a8573f4690 Author: Marek Zarychta AuthorDate: 2024-03-11 15:50:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 16:14:45 +0000 netlink: fix route protocol constant values to match Linux Although these particular constants aren't supported, the incorrect values break bird 2.15 operation. PR: 277618 Reported by: Ondrej Zajicek (cherry picked from commit 16f8d8829472dfdf6b3b2bb21d652f0bafefccbc) --- sys/netlink/route/route.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 9247a59855bb..1d4149e23d2f 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -282,8 +282,8 @@ struct rtvia { NL_RTAX_RTO_MIN = 13, /* not supported */ NL_RTAX_INITRWND = 14, /* not supported */ NL_RTAX_QUICKACK = 15, /* not supported */ - NL_RTAX_CC_ALGO = 15, /* not supported */ - NL_RTAX_FASTOPEN_NO_COOKIE = 16, /* not supported */ + NL_RTAX_CC_ALGO = 16, /* not supported */ + NL_RTAX_FASTOPEN_NO_COOKIE = 17, /* not supported */ __NL_RTAX_MAX }; #define NL_RTAX_MAX (__NL_RTAX_MAX - 1) From nobody Mon Mar 18 16:15:35 2024 X-Original-To: dev-commits-src-all@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 4Tz0MC3vGsz5F1pP; Mon, 18 Mar 2024 16:15: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 4Tz0MC3QpLz4gp6; Mon, 18 Mar 2024 16:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778535; 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=5T0ALIwwUHvkCpTGIsdrazsnyx5itAN2mvgWNjdxhJo=; b=Oe4TY6jia+0iN7HYtt7eG9X+jF9Z18BUoHxLeMerk6t8aYB3uglbOtcHTeXYjZi72OUOdy 5+NX0hXVd4fj+b94NVsqL1YtB9Xi8MzeFL6Y7chfNQxcYbg4TZ8e67t2CwI7/6vs+fLoBh khxTcpihJXNBpfzbzkLA5mpJOS0rzmTkFBfhozwNTw2LeSNlAvfZmLteCEJ9ogVZcvdUn1 r1XL3GmTjn3ekYagHb0Y/yBkfCJs9U19s8z5F/SD6WqQrXOzP4ci6lnhu2m0xQj8dKZHb/ c6qsvvb/7+2nbrrDl0Jo3TUx4DlnlgGPuQbjkf8jhsdXP5LTNpfTX4DtdXqQ4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710778535; a=rsa-sha256; cv=none; b=G7f6tf3BCQh0YFva82FONoLim5XD9merejrYFF7UyCb6iLcKEUpysLhW+G1R0v2B8BAAHx 6calpizA0swVId3oub7JFnA1CIXl5hN4WdvWxEhpDDiRF27eDcnRi4FqGAeRmjnU4tqFGo 4A2zgC0z0mdL57g6RbpUVVQI4M/w3SuS7blIpMMhTFvN1Lwv5vql/xvEhzqmZNJFxbEKOV VREGkv9vAoCEdVhpuEonITQpwjQVYjbogOKp3troDggET6COO7UHFivCiiQ+Q7cJe/um2H vsaOm/INRkhoDv3Bm//Emfv5y4Rn8ycl9ipjL/G8w151FogjHFMwk+RNzo3CUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710778535; 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=5T0ALIwwUHvkCpTGIsdrazsnyx5itAN2mvgWNjdxhJo=; b=wjCk+NIAmF0u1xmI160sC/nPXbSqFZtc8Z/xs80PDZ0LYjAeaEj5sFw1R/ST9aNxhp44qn ho3XKCQy8/yHTlzt0Ac0UlLaoUZ/hg0BCMR0YLnXTKjKE3mZjSVHPdzbCSvCZgtglAEnxW KPrCrqMS5HBnl2VbHCgxOs6P6sFhoaZJzUHtAUq3SDojOM5Bgiqfd/5mxEAlQ+Kd4ZLSgt N4iE3cklveQPZckWLbwxsxVe0DEHiEyWklpDaTJZ5eLY5tRgKgAoJ5aINm2KyK0q6BLKt/ lvvFjlhY8tv3f8v3DfB0XGtTzD4fgQItSiU2R52mMp0DBAZGcRfrMlENWnfaNg== 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 4Tz0MC32clzW5v; Mon, 18 Mar 2024 16:15: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 42IGFZ0l036366; Mon, 18 Mar 2024 16:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGFZVx036363; Mon, 18 Mar 2024 16:15:35 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:15:35 GMT Message-Id: <202403181615.42IGFZVx036363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: e5c1ba936955 - stable/13 - netlink: fix route protocol constant values to match Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: e5c1ba936955d6f74de988db38d6f215e26492cf Auto-Submitted: auto-generated The branch stable/13 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e5c1ba936955d6f74de988db38d6f215e26492cf commit e5c1ba936955d6f74de988db38d6f215e26492cf Author: Marek Zarychta AuthorDate: 2024-03-11 15:50:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 16:15:28 +0000 netlink: fix route protocol constant values to match Linux Although these particular constants aren't supported, the incorrect values break bird 2.15 operation. PR: 277618 Reported by: Ondrej Zajicek (cherry picked from commit 16f8d8829472dfdf6b3b2bb21d652f0bafefccbc) --- sys/netlink/route/route.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netlink/route/route.h b/sys/netlink/route/route.h index 9247a59855bb..1d4149e23d2f 100644 --- a/sys/netlink/route/route.h +++ b/sys/netlink/route/route.h @@ -282,8 +282,8 @@ struct rtvia { NL_RTAX_RTO_MIN = 13, /* not supported */ NL_RTAX_INITRWND = 14, /* not supported */ NL_RTAX_QUICKACK = 15, /* not supported */ - NL_RTAX_CC_ALGO = 15, /* not supported */ - NL_RTAX_FASTOPEN_NO_COOKIE = 16, /* not supported */ + NL_RTAX_CC_ALGO = 16, /* not supported */ + NL_RTAX_FASTOPEN_NO_COOKIE = 17, /* not supported */ __NL_RTAX_MAX }; #define NL_RTAX_MAX (__NL_RTAX_MAX - 1) From nobody Mon Mar 18 16:37:54 2024 X-Original-To: dev-commits-src-all@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 4Tz0ry2ZVqz5F3Yv; Mon, 18 Mar 2024 16:37: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 4Tz0ry23wVz4lC5; Mon, 18 Mar 2024 16:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779874; 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=KUKa2kL6O+pEpj+9s0h1rHWiTYJIicpEZtQQ5PXHHxA=; b=aTTZqRzw9bONaVZvaGGM1ceL0/sHiwE3AKh9oyAQiaAIbr791Q7Mb53tVIbE2WmNl6k8he oOIB0UEcD9JlQqx6MVWtoFwHMOfGrvVZJWYtH5lmOHk6gAocBgkZY+U58XowcV6rR/RItm nEvEtUZnX8woqKYbn3BvfFYKQ8KylYJzJV8mfdT0ejtmvob5qi2hLfxAlrTFQpk8vJFNs1 MeHsbzfVD5wL4Eij/pUCAQUyx/95dVMfE1l/2TlZrCE0Lr2BtHTIdfCsivju3fEuK86E47 pniuSj6L3pPh019A0Z5vGu1Zo9CbHQufS4meDDbAGiam/RWB9eadLU7Lnnfd5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710779874; a=rsa-sha256; cv=none; b=bvdfdTrmYadra5G/u0JTyazZ/oAOqcm+/MKRPj8dHjYneXUXJtLqISd+EqOLZDXAY6dAei deBSE8zjR+MJXP7baLfVlKG8i1BbI1S87UVvxxbQXwDMRvIkY7p5PVkwx2Q1Z1RfyLajBz M5q7ciXtljL1SOkwyhmaoCXp1R2zwal/7zrUnpnIl6Yf9k0jiP8JKxKfEtGYlarPE1mcey BkehLZqrKfEAgVRI652rrV3sT40fAEa69SYW0xSsNOUA6Sl1kGH4NkKtbHSd+sPA2Uqhz8 IKL+3p9lKucdHY2dv4XELIp01nEFafg0MpOp3p5ZqGBXw0fH1ZV9eHMSW9+sOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779874; 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=KUKa2kL6O+pEpj+9s0h1rHWiTYJIicpEZtQQ5PXHHxA=; b=BUgms5QPPaoUpZHZEm1q5GVQ/SV+CnSVeo/9cw7KKgu+kyhjw5IF2+3ip0bbHioKjGMj5V H3O7feMPz2dF5UT0Yn+iG7W2fvBfVYf1QA7cmfxFzlA5E5U6jHm5qvuNwZ5AlY9oWY4pV9 Ei7cqtdmYylW4sPHkZJimSG4dBmq5YgucyR30AWQC1bP413N6Gepj+NLWRhszPIR4hF+D9 S52/6s1zpuLbrrPGcrngBBmwWCcbozi3XofZ6u8QdFxx6J+gGcnulqyByQ72fEvn1Gyqp0 VihoFJ6sLCL2Mdi+93p6PGtDZjnnfRBjgmRfuHEQWSSshA7PkRKpWqvQ2s4GJw== 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 4Tz0ry1XfPzVPB; Mon, 18 Mar 2024 16:37: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 42IGbs9N070975; Mon, 18 Mar 2024 16:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGbsgZ070972; Mon, 18 Mar 2024 16:37:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:37:54 GMT Message-Id: <202403181637.42IGbsgZ070972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 801160f4c0a3 - main - arm64: Rename drop_to_el1 to enter_kernel_el List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=801160f4c0a3afbd136a1a6402c9ca233dfdc1eb commit 801160f4c0a3afbd136a1a6402c9ca233dfdc1eb Author: Andrew Turner AuthorDate: 2024-02-15 14:48:54 +0000 Commit: Andrew Turner CommitDate: 2024-03-18 16:20:51 +0000 arm64: Rename drop_to_el1 to enter_kernel_el In the future we may not drop to EL1, e.g. when we support FEAT_VHE where the kernel runs in EL2. Reviewed by: emaste, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43976 --- sys/arm64/arm64/locore.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 6589d3e35a3a..fd77938edae9 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -62,8 +62,8 @@ */ ENTRY(_start) - /* Drop to EL1 */ - bl drop_to_el1 + /* Enter the kernel exception level */ + bl enter_kernel_el /* * Disable the MMU. We may have entered the kernel with it on and @@ -201,8 +201,8 @@ ENTRY(mpentry) /* Disable interrupts */ msr daifset, #DAIF_INTR - /* Drop to EL1 */ - bl drop_to_el1 + /* Enter the kernel exception level */ + bl enter_kernel_el /* Set the context id */ msr contextidr_el1, xzr @@ -265,7 +265,7 @@ END(mpentry) * If we are started in EL2, configure the required hypervisor * registers and drop to EL1. */ -LENTRY(drop_to_el1) +LENTRY(enter_kernel_el) mrs x23, CurrentEL and x23, x23, #(CURRENTEL_EL_MASK) cmp x23, #(CURRENTEL_EL_EL2) @@ -358,7 +358,7 @@ LENTRY(drop_to_el1) .align 3 .Lsctlr_res1: .quad SCTLR_RES1 -LEND(drop_to_el1) +LEND(enter_kernel_el) /* * Get the physical address the kernel was loaded at. From nobody Mon Mar 18 16:37:55 2024 X-Original-To: dev-commits-src-all@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 4Tz0rz3FP2z5F3f4; Mon, 18 Mar 2024 16:37: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 4Tz0rz2NfFz4lFd; Mon, 18 Mar 2024 16:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779875; 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=cu78NRKMWoh+VMMLt+rsDfNPw29BK7matrt3ZRPq3Ic=; b=GtoRIb4ALKSjRwAqAu40fR3K9IioUkGlOstFeETbJQbM93DpP3MM1aMjmqb+B7hiOjhLJs C6Or3AYHhvCJli2dQHrKTV9/qB+iy+4EwjnA9ykDvS5bQPatMOelJkpSnno1HMDkV/I4V+ phRgVBqQNgOTQsmlugX5AfPXs2bHlEIuXUzbHcDiGLS8VgbkXP6P2F8C/KRYvVHh5VWoeZ lxeq9EbF9wHZahrGotRwWltBx8/sQTYBGvA7Iv8BX4uFCRkWw2ye7ryiMpRcXq6TriRb0J XT2HvYqdB09lghiH40OY5hdyY0leNbBV5j8+Nk42RZgk4yssX0ZhzmUGm5Bgcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710779875; a=rsa-sha256; cv=none; b=SQOGp3tHDbTQv7a9zuhq3Ug3zzFeofuyGwJRwhU2bTx6FTKtq5oXsC79ocMz8axa0m25pJ pVukkJ4ItnZyp36AjvDM1JHgl6MCNShjXAyAne4dQgtqGXS8WvsfO66Q4aZWNbKqZB5I8q 3yOhAuN7piDpS6qjIDv/SHTzi7yIoNutF+hu3tbcnRVRAvHPdARa49BkMxcV9un8/GcPql uTFDT+y2Uikxv/k8utiG4uTbbckAtcyq8vBpqNT1cEm8XrRFHWOsFDY7EjuczG/JzaynHq IiEsr/qtT1QO3mP3R+KQcXWUxgbRXnlPVjTUCVmVMfKDKWiCUeFALXI+xNRc3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779875; 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=cu78NRKMWoh+VMMLt+rsDfNPw29BK7matrt3ZRPq3Ic=; b=Ide3skeqtKYtJZSMxOaOiqAfC2l4sij6uTyilc/thmNCxUqicV72Lydl9QPQIVmqk4HKvL tHxzZYQA/OhRPMENbdBjr+pqxoUoZAOUoXWQcueJMtLP2ZSXmDP2OHysPxGW9HYLZgVL9C 5OqIChjc3dLh/UJlcB9Y2NNZBDkbGLvLGPv9YPWpSKsFuxH2gp6d9NqFF/UfiuiEUV+Emj 5QHhLHqnjEZf3DdBjMfEFRjVRQDVUgSTuyJGpMDW8N/Rv+Z2nakmnBz4yXNI4IHHIbFslG roRUrMr+TXGY+njikUCGCqsTYcUXIjkdZZn25Ogv8m1RLj4d7crIyyqvPYyvSQ== 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 4Tz0rz1zzMzWPp; Mon, 18 Mar 2024 16:37: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 42IGbtok071030; Mon, 18 Mar 2024 16:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGbt1T071027; Mon, 18 Mar 2024 16:37:55 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:37:55 GMT Message-Id: <202403181637.42IGbt1T071027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 473c0b44ae8c - main - uart: Split out initilisation of the acpi devinfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 473c0b44ae8c51b2aebc51887714b2ed14de50bf Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=473c0b44ae8c51b2aebc51887714b2ed14de50bf commit 473c0b44ae8c51b2aebc51887714b2ed14de50bf Author: Andrew Turner AuthorDate: 2024-03-12 18:06:18 +0000 Commit: Andrew Turner CommitDate: 2024-03-18 16:20:52 +0000 uart: Split out initilisation of the acpi devinfo Split out the common parts of building the uart devinfo from ACPI tables from the SPCR parser. This will be used when we support the DBG2 table to find the debug uart to be used by the kernel gdb stub. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44357 --- sys/dev/uart/uart_cpu_acpi.c | 86 +++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 37 deletions(-) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index 9bac5a0df170..09f69e951e81 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -69,35 +69,10 @@ uart_cpu_acpi_scan(uint8_t interface_type) return (NULL); } -int -uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) +static int +uart_cpu_acpi_init_devinfo(struct uart_devinfo *di, struct uart_class *class, + ACPI_GENERIC_ADDRESS *addr) { - vm_paddr_t spcr_physaddr; - ACPI_TABLE_SPCR *spcr; - struct acpi_uart_compat_data *cd; - struct uart_class *class; - int error = ENXIO; - - /* SPCR only tells us about consoles. */ - if (devtype != UART_DEV_CONSOLE) - return (error); - - /* Look for the SPCR table. */ - spcr_physaddr = acpi_find_table(ACPI_SIG_SPCR); - if (spcr_physaddr == 0) - return (error); - spcr = acpi_map_table(spcr_physaddr, ACPI_SIG_SPCR); - if (spcr == NULL) { - printf("Unable to map the SPCR table!\n"); - return (error); - } - - /* Search for information about this SPCR interface type. */ - cd = uart_cpu_acpi_scan(spcr->InterfaceType); - if (cd == NULL) - goto out; - class = cd->cd_class; - /* Fill in some fixed details. */ di->bas.chan = 0; di->bas.rclk = 0; @@ -107,7 +82,7 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) di->ops = uart_getops(class); /* Fill in details from SPCR table. */ - switch (spcr->SerialPort.SpaceId) { + switch (addr->SpaceId) { case 0: di->bas.bst = uart_bus_space_mem; break; @@ -116,10 +91,10 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) break; default: printf("UART in unrecognized address space: %d!\n", - (int)spcr->SerialPort.SpaceId); - goto out; + (int)addr->SpaceId); + return (ENXIO); } - switch (spcr->SerialPort.AccessWidth) { + switch (addr->AccessWidth) { case 0: /* EFI_ACPI_6_0_UNDEFINED */ /* FALLTHROUGH */ case 1: /* EFI_ACPI_6_0_BYTE */ @@ -136,10 +111,10 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) break; default: printf("UART unsupported access width: %d!\n", - (int)spcr->SerialPort.AccessWidth); - goto out; + (int)addr->AccessWidth); + return (ENXIO); } - switch (spcr->SerialPort.BitWidth) { + switch (addr->BitWidth) { case 0: /* FALLTHROUGH */ case 8: @@ -156,9 +131,46 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) break; default: printf("UART unsupported bit width: %d!\n", - (int)spcr->SerialPort.BitWidth); - goto out; + (int)addr->BitWidth); + return (ENXIO); } + + return (0); +} + +int +uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) +{ + vm_paddr_t spcr_physaddr; + ACPI_TABLE_SPCR *spcr; + struct acpi_uart_compat_data *cd; + struct uart_class *class; + int error = ENXIO; + + /* SPCR only tells us about consoles. */ + if (devtype != UART_DEV_CONSOLE) + return (error); + + /* Look for the SPCR table. */ + spcr_physaddr = acpi_find_table(ACPI_SIG_SPCR); + if (spcr_physaddr == 0) + return (error); + spcr = acpi_map_table(spcr_physaddr, ACPI_SIG_SPCR); + if (spcr == NULL) { + printf("Unable to map the SPCR table!\n"); + return (error); + } + + /* Search for information about this SPCR interface type. */ + cd = uart_cpu_acpi_scan(spcr->InterfaceType); + if (cd == NULL) + goto out; + class = cd->cd_class; + + error = uart_cpu_acpi_init_devinfo(di, class, &spcr->SerialPort); + if (error != 0) + goto out; + switch (spcr->BaudRate) { case 0: /* Special value; means "keep current value unchanged". */ From nobody Mon Mar 18 16:37:56 2024 X-Original-To: dev-commits-src-all@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 4Tz0s05Lrrz5F3WG; Mon, 18 Mar 2024 16:37: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 4Tz0s03VW7z4lFw; Mon, 18 Mar 2024 16:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779876; 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=KY4hjZsxQ7Pmpz7Pppyv7npDgHbvUYLh6m3D1sbt0xU=; b=v7uXBNKkW3ZwfV1XUU4TJk0SKD0CL83JxBlnhth7S4KcosSBcVTNm2FNaoZVaJTSQ13L4q hMKnMRjgELeg3whcnMzWyDIbc7nS771vj8xdTo9F8MAS2A9WA0wOnDMcoZJEmUDZo6CUYd pdqms6fRFHiuhSCOPJpPGrBV5OFEpqC5tiuPUepyRd3mU6qHbBbO4n1iMYIo8MRHqUaCYH 9TFjjQMHakiPwv0GNIjVFxDITPoKMPZ06KJCRzfF+gh8G1x6sAQMX+0a2dNR3CNtn2Akpt s9lHTOOImteZrmuo9hpzC5DYY0N0OxgZE1iKSltXPtiw32bi6giUltyxTPbSKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710779876; a=rsa-sha256; cv=none; b=EEd2BuX3MPkJWvIluOIxcXhUVu4XUCu5uNWgzhYgoeinWpV7NujIsp5dMSTiXBUPmJksuu IFNgRcUDe9MPjHSG3lW+Hf749NchGKUitZDvtf08WR54rmhP1PvR8bxoYxE2zaRYuqwCZV XBLymC0TFGqjYSOdO92YRbg+GTiBeCH2V4r2+i3swFKy4/f4CE+WFHh9mpvrMk9OadXdmG UEh1z2pW/5zWPM9ily19uYGYJ2kOZS+UR8O0Tj9OSFh3PYrev8hcX9XzFTsHnPt7dfrJ1S 4M2pKfofJoG09eSKlMD6Z7fn/Iz2+bu1eoX1v9sLiiecZWEice5g7xTEL1IP+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779876; 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=KY4hjZsxQ7Pmpz7Pppyv7npDgHbvUYLh6m3D1sbt0xU=; b=fKFwXlW9h/L5UU2kqYvbid93BG8eh/EYvgSw7ItNRgfV+Y5VDRm0EAHPHMYSauHttSxp4B 3smAywwCBkbWr26jfK/QNDbuTK9wZHW1ndLsno5nhK5M6+nyOFFqWIMqS7dtZUiaghXdLk MJ+5QUuU9T2J+On+nxOSL1NjxNhLSOXXZZ7UU3iCFT/sEo5hY/AJZACpjMWNiZXu5f6Jzq uwaLTo2PB7BBA2t9YdRXDdRrLZJN2JgrVQSPwlnw32NRFnh+r091+Oa82Mn9yrisBON6hh tpLl8p6nbYdoGt7sbPW46iQ47UxUZAcqXLO23piu9az3nSVLeECQzr0dQvbszQ== 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 4Tz0s031StzWPq; Mon, 18 Mar 2024 16:37: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 42IGbuH0071085; Mon, 18 Mar 2024 16:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGbuUo071082; Mon, 18 Mar 2024 16:37:56 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:37:56 GMT Message-Id: <202403181637.42IGbuUo071082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a931b85a0966 - main - uart: Add uart_cpu_acpi_setup to setup the uart List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a931b85a0966a6efd6b6105b3e4176d2c98340de Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a931b85a0966a6efd6b6105b3e4176d2c98340de commit a931b85a0966a6efd6b6105b3e4176d2c98340de Author: Andrew Turner AuthorDate: 2024-03-14 16:43:28 +0000 Commit: Andrew Turner CommitDate: 2024-03-18 16:20:52 +0000 uart: Add uart_cpu_acpi_setup to setup the uart In preperation for adding debug port support add a generic function to setup the uart from ACPI tables. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44358 --- sys/dev/uart/uart_cpu_acpi.c | 16 +++++++++++----- sys/dev/uart/uart_cpu_acpi.h | 4 ++-- sys/dev/uart/uart_cpu_arm64.c | 2 +- sys/dev/uart/uart_cpu_x86.c | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c index 09f69e951e81..9c9ffc1e3194 100644 --- a/sys/dev/uart/uart_cpu_acpi.c +++ b/sys/dev/uart/uart_cpu_acpi.c @@ -138,7 +138,7 @@ uart_cpu_acpi_init_devinfo(struct uart_devinfo *di, struct uart_class *class, return (0); } -int +static int uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) { vm_paddr_t spcr_physaddr; @@ -147,10 +147,6 @@ uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di) struct uart_class *class; int error = ENXIO; - /* SPCR only tells us about consoles. */ - if (devtype != UART_DEV_CONSOLE) - return (error); - /* Look for the SPCR table. */ spcr_physaddr = acpi_find_table(ACPI_SIG_SPCR); if (spcr_physaddr == 0) @@ -213,3 +209,13 @@ out: acpi_unmap_table(spcr); return (error); } + +int +uart_cpu_acpi_setup(int devtype, struct uart_devinfo *di) +{ + switch(devtype) { + case UART_DEV_CONSOLE: + return (uart_cpu_acpi_spcr(devtype, di)); + } + return (ENXIO); +} diff --git a/sys/dev/uart/uart_cpu_acpi.h b/sys/dev/uart/uart_cpu_acpi.h index 816644eb08ba..94329e1f1349 100644 --- a/sys/dev/uart/uart_cpu_acpi.h +++ b/sys/dev/uart/uart_cpu_acpi.h @@ -64,7 +64,7 @@ SET_DECLARE(uart_acpi_class_set, struct acpi_uart_compat_data); #define UART_ACPI_CLASS(data) \ DATA_SET(uart_acpi_class_set, data) -/* Try to initialize UART device from SPCR data. */ -int uart_cpu_acpi_spcr(int devtype, struct uart_devinfo *di); +/* Try to initialize UART device from ACPI tables */ +int uart_cpu_acpi_setup(int devtype, struct uart_devinfo *di); #endif /* _DEV_UART_CPU_ACPI_H_ */ diff --git a/sys/dev/uart/uart_cpu_arm64.c b/sys/dev/uart/uart_cpu_arm64.c index 51b195783636..80e67e65697c 100644 --- a/sys/dev/uart/uart_cpu_arm64.c +++ b/sys/dev/uart/uart_cpu_arm64.c @@ -125,7 +125,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) #ifdef DEV_ACPI /* Check if SPCR can tell us what console to use. */ - if (uart_cpu_acpi_spcr(devtype, di) == 0) + if (uart_cpu_acpi_setup(devtype, di) == 0) return (0); #endif #ifdef FDT diff --git a/sys/dev/uart/uart_cpu_x86.c b/sys/dev/uart/uart_cpu_x86.c index 63f68245f589..d152d5059786 100644 --- a/sys/dev/uart/uart_cpu_x86.c +++ b/sys/dev/uart/uart_cpu_x86.c @@ -70,7 +70,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) * !late_console, we haven't set up our own page tables yet, so we * can't map ACPI tables to look at them. */ - if (late_console && uart_cpu_acpi_spcr(devtype, di) == 0) + if (late_console && uart_cpu_acpi_setup(devtype, di) == 0) return (0); #endif From nobody Mon Mar 18 16:37:57 2024 X-Original-To: dev-commits-src-all@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 4Tz0s15yYYz5F3qR; Mon, 18 Mar 2024 16:37: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 4Tz0s14Wg0z4lCd; Mon, 18 Mar 2024 16:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779877; 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=DQqLqlBkiAiOrF7V/hG2OX6apEmFuaGeRs1tmm2b1n0=; b=weElYrs7yRMoYx53IRfSBTqf+v48mHRlFZ2S5DKKXKt37AzgB2gx6ILvgUXN6lKh4e6E55 ivYMmdMuO7kiXYKV2NZr/LzuH2sU4p4Ogpn8sfXQXRFogYhzCL1OCQ6GuSsyWwNo4kqpJz fNblfe6kfyAaCjHe9Y0a4iRUz1yCPusN9vDYuqWCPdrjPPppoFgxiS5oA1yaL9DApOJ6jM xUTdIwFH+Ah8ZvtPOzKhAXDWARx5BqnNcAqn6bl5PF3yr97j6RGUlLwZ2ag26goVKjJQgj CHgnWFy5m7HkTpQhidcNbybBhldUB00knltZq4WG+vY2Vcsj/xHc7DG6vmr3HA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710779877; a=rsa-sha256; cv=none; b=oPLEAVes18+j9yrmopbWpXpYmNwCtzZJsMQpkAZeBA2Nrj7SzuJFkZbv5m6gpckU6otvJi CVR2vGjjX70gcNem6lk05e6TY6NALEpm10oT3qvZRxke9ZRuXOUTfcc67RHki6UJxlJfoj HoW2dIR5wrvYIe9ikjIkcx6+b3ax6Np4GQzgeZEyQI2RFTzDQo3+t97Smek2Eof0jNVen7 5ajce1+glBA7Ntp6uhizW9JKKM0sfJqkNrD5zl9YapLl1eW0MbVKZUuAqIKQBTfO5CtNbB TV664EmOXxJVDR4K0bmHj9QjV/ty2gywDHujwUjeb6I3PAL+9XaYhFuFR6ojpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710779877; 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=DQqLqlBkiAiOrF7V/hG2OX6apEmFuaGeRs1tmm2b1n0=; b=BfLQ+qEUR9A52qgMd7E6RoM64OJbdBEguWxy9eIAyFxTA0oszChQGTrsjT/bcA0WKxqAhx J+MmOYG9z74NQDOoy+K/LzxQq7S++1MSWazHx25/2EIkr7STVe+4xx0lQtnWXR3Wj8kJzf kNDtNaTiP28BHJhi+DFV2ob5gft+FRQSsy1wRKb2dE/Ll+6RGvKyHsaBkpUGO0VaohnNl0 epLIHTStjZxPaNX1JyLKUstg3+3OBprC5HnTMLSaAZ99uUuXjktEW4FfcLGz+0m47Yvy7y dR8SYa6tzxh+gyIk4hXnfaXCsS3oA0Jrc5qWVaYBgO5vz1/x5Pl+i1BpIfgcnA== 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 4Tz0s1425QzWmf; Mon, 18 Mar 2024 16:37: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 42IGbvKg071136; Mon, 18 Mar 2024 16:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IGbv60071133; Mon, 18 Mar 2024 16:37:57 GMT (envelope-from git) Date: Mon, 18 Mar 2024 16:37:57 GMT Message-Id: <202403181637.42IGbv60071133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 0a5f7918fc0e - main - arm64: Return all registers to gdb when able List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a5f7918fc0e274a904b8fdd7c167bea7cdaf0f4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0a5f7918fc0e274a904b8fdd7c167bea7cdaf0f4 commit 0a5f7918fc0e274a904b8fdd7c167bea7cdaf0f4 Author: Andrew Turner AuthorDate: 2024-03-14 17:31:39 +0000 Commit: Andrew Turner CommitDate: 2024-03-18 16:22:18 +0000 arm64: Return all registers to gdb when able When the kdb thread is the current thread we read the registers from the trap frame. As this contains all general purpose registers we can use it to read these in the gdb stub. This allows us to include the non-callee saved registers, e.g. function arguments. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44360 --- sys/arm64/arm64/gdb_machdep.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/arm64/arm64/gdb_machdep.c b/sys/arm64/arm64/gdb_machdep.c index f93d7f83bd9d..dcfc91b33eb7 100644 --- a/sys/arm64/arm64/gdb_machdep.c +++ b/sys/arm64/arm64/gdb_machdep.c @@ -55,6 +55,10 @@ gdb_cpu_getreg(int regnum, size_t *regsz) case GDB_REG_SP: return (&kdb_frame->tf_sp); case GDB_REG_PC: return (&kdb_frame->tf_elr); case GDB_REG_CSPR: return (&kdb_frame->tf_spsr); + default: + if (regnum >= GDB_REG_X0 && regnum <= GDB_REG_X29) + return (&kdb_frame->tf_x[regnum - GDB_REG_X0]); + break; } } switch (regnum) { From nobody Mon Mar 18 17:00:19 2024 X-Original-To: dev-commits-src-all@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 4Tz1Lq4T3Kz5F5H7; Mon, 18 Mar 2024 17:00: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 4Tz1Lq2jb1z4pRQ; Mon, 18 Mar 2024 17:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710781219; 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=ihe0NytEi4bZQkoqOEVxZx10zsg4QC3VM8XnkxeoKCk=; b=WICQ+iEf+3BEeGNk3N94oqF0DMprRVlWWAG6iIMXXPkHJ79Ir5bwv9Ny5t4TpZDblmib1l YOXwRcgUIAPTxF7phznfUJZZvQyC0s355i/whw96z7v9xxEQc8YIuTO395KKuzBixGA04c yZd3LCb1uCQAmaxC9KGCFxH86/m/nlC3dKgP1eCeJlM8/ZJcjgYrIacu3El0thoq5FGvn/ FlzvMHOiqUVxdJcijF0IqyAoSTsOmva3M40Fe9WbjvWg0O2+NEZofCzdFWudHxdrYQKmdA FxWDhZpGP5P9sli3DG/sfvilwvrDmENad31pG/sdZaos0nRq35z8bNcQ4CkVUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710781219; a=rsa-sha256; cv=none; b=TJgrg4WPc9WI/Rm4taROwMDbYioxB6qOIcgiHsZ5wocd7H2rRdWKeU+OvK0IEdVJxxN+dH UVoPJ/+N/tqMqylOqfOJ3kFPMUM4i6efGzXWSoOgKi7Wy+0X6LUtzdbQF3oR0sMOWaQT5m ZZ+EEiKAbsbRB4MOrGptWLMRivqwG1exhV+aG5ZIauNKcOzGSSKow0dC5/KXtrlFlcd9Dy 8wNG6E4420h3vFbKHAtk0DtIB1NQBEZrubaXZrYJvDgRADPdRwdJhuVPQnR4WQoGY0UsbO 0Lcsma+yhct6uzkVNknNTkcId7TiMCBga5d06VA3MaIsUVBDeLEzk+GHjlCpuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710781219; 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=ihe0NytEi4bZQkoqOEVxZx10zsg4QC3VM8XnkxeoKCk=; b=ulDfGnQnQKuTLZdzw6lL9UVE3j9XkqPspfb7D3tgFTTeiUcA+O/gcuSCyy+NmGqtXEJKGF 3uABXOxijuSawas34stt6HwZxVbpN+l4NgiPY2gDgEWCSHHKXtzvRZG7E8Y+Wt48/Dtykg YcN6enVWqI/Azw1wORkRNugeFmlSuS4u+VuSiaRU1ychaQpbnKmFul3doucAJILlabNx22 xKbtd7zhDDgH346w8Z+H1Z1uBbCkjdEvrB5pGSQQEE/901jRrPpJkGuYFtJPs/PNFD9VNc YalveW1cHzdXFReUBEOhG7kq0f32mq9a4ChrCICoMRWzYptE2Qw+fn6zsonEIw== 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 4Tz1Lq2KyqzXJy; Mon, 18 Mar 2024 17:00: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 42IH0JTP014355; Mon, 18 Mar 2024 17:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IH0JS4014352; Mon, 18 Mar 2024 17:00:19 GMT (envelope-from git) Date: Mon, 18 Mar 2024 17:00:19 GMT Message-Id: <202403181700.42IH0JS4014352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hartmut Brandt Subject: git: c85d75a9fcd1 - main - Add myself (harti) to the calendar. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c85d75a9fcd17bea980522fd535778a069c79abc Auto-Submitted: auto-generated The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=c85d75a9fcd17bea980522fd535778a069c79abc commit c85d75a9fcd17bea980522fd535778a069c79abc Author: Hartmut Brandt AuthorDate: 2024-03-18 16:58:03 +0000 Commit: Hartmut Brandt CommitDate: 2024-03-18 16:58:03 +0000 Add myself (harti) to the calendar. Reminded by: mckusick --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 88f7f10282c7..0d8e57137d13 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -92,6 +92,7 @@ 02/23 Peter Wemm born in Perth, Western Australia, Australia, 1971 02/23 Mathieu Arnold born in Champigny sur Marne, Val de Marne, France, 1978 02/23 Vinícius Zavam born in Fortaleza, Ceará, Brazil, 1986 +02/23 Hartmut Brandt born in Gera, Germany, 1963 02/24 Johan Karlsson born in Mariannelund, Sweden, 1974 02/24 Colin Percival born in Burnaby, Canada, 1981 02/24 Brandon Bergren born in Edmond, Oklahoma, United States, 1984 From nobody Mon Mar 18 17:08:46 2024 X-Original-To: dev-commits-src-all@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 4Tz1Xb0Glpz5F6BY; Mon, 18 Mar 2024 17:08:47 +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 4Tz1XZ6ZGjz4qHv; Mon, 18 Mar 2024 17:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710781726; 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=V7AvkNLxULPWPegJtKYoJlpl/ec6YyaCWOmk2HaoiDg=; b=s/Kyfv3oP91uFLsKRDnt0CMpbdgvRciagrYZJ4eyj7RiuqLs1oYNME5YBPfWjurs7gEROQ FwAIScFGJALFNhPB7jwT7KfL9ub939qJT8D4kZRzAzx987YOX6mCN5k5AZ9odsEw++kSau LqpAid88OqBMQH8NOWIlaf84cOMghQaCWwBtDfC9jDtVHDu54fmbVbWjyCEVwzbfftk751 wcF/AFIBWilaPx1EkK/8PW6bcvMMrehQZ3MPxDDueXx53gj9GBTzulVguKb4o4a7REW1yC uhkZnyY5jLkY0TnjQ+4TrF34VSuxdmDOg6xgxbOPzidNbq/2a4xBYrd/n7yFOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710781726; a=rsa-sha256; cv=none; b=EawwrHYSExfkIKJJOEdZ+1w5QqxzGV+43RpsAS6PxIYWykKaPwkOsenU/wHGor+1gzUO1H jFKKgmkyS0r4DDqqzVUd2MT+fkd6kbC2tgR5q/kqBKUivGIr6o0iA3ox3Cz5zUoGur8+yy 8XzuPTc95LT2EfsMNohwOSfCqrs3TsRfn/H0q3PbKP/zHuqQyDkYgyzSVob49Mz5zqmVgk P7FyCw6ca67YJcv+Gwxq5wm9Gia0qstjb/kzMlNIdkiXMf3FXc4EHYoB+BqYC34lXSslvD wDNVf5wgCHJE7K+q23z4jaPGCifa6GX9lSrJ0KL52mYwkRFBB9Tk4Tp5Jd+6NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710781726; 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=V7AvkNLxULPWPegJtKYoJlpl/ec6YyaCWOmk2HaoiDg=; b=cWTiPbZzxL/iYzcnm7B/akYZ0aE2HxrHgl8VMu25ekTHBPuvMAom3kJgbMBTxvk7Ryf7I3 7RU7BPJ8GR79i8RZGWCPZKT5DqD8yMiYRQBvs8XwZ8YopYQaXcdxuivs59WTtVLwXmr7+z oRv6prNOF5yJbJf9LrHRHtI7QSd9biGSsF5XlaVnooQ7r8dEgQhm42kpJFXWmCT9tYt9mQ D3iNmCwX4Hsl/rZA2Pf0nrc7PwunYsbz5vwVVnYxQhinEJKGMAMqD3bsevUYdzqL5HZNs/ ap1CWvKnt/5uKH3z7e5Ovj/c4U5G+UHdSHSo9hIQZ6abWUjdywZ0Sxw/Q2aHVw== 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 4Tz1XZ63R2zX2Y; Mon, 18 Mar 2024 17:08:46 +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 42IH8kO3023272; Mon, 18 Mar 2024 17:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IH8kwv023269; Mon, 18 Mar 2024 17:08:46 GMT (envelope-from git) Date: Mon, 18 Mar 2024 17:08:46 GMT Message-Id: <202403181708.42IH8kwv023269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: b5a9299bb8b9 - main - ktls: catch invalid parameters earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5a9299bb8b9f1b0190899c93e0dc923b5b48343 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=b5a9299bb8b9f1b0190899c93e0dc923b5b48343 commit b5a9299bb8b9f1b0190899c93e0dc923b5b48343 Author: Richard Scheffenegger AuthorDate: 2024-03-18 01:55:59 +0000 Commit: Richard Scheffenegger CommitDate: 2024-03-18 02:37:49 +0000 ktls: catch invalid parameters earlier Move safety checks forward from ktls_session_create() to ktls_copyin_tls_enable(). Prevents zero mallocs, and excessively large kernel mallocs. Reported-by: syzbot+72022fa9163fa958b66c@syzkaller.appspotmail.com Reported-by: syzbot+8992893e13058ce0670a@syzkaller.appspotmail.com Sponsored by: NetApp, Inc. X-NetApp-PR: #79 Reviewed By: tuexen Differential Revision: https://reviews.freebsd.org/D44364 --- sys/kern/uipc_ktls.c | 69 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index df296090ec97..fd1bc7bf8bfe 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -329,7 +329,18 @@ ktls_copyin_tls_enable(struct sockopt *sopt, struct tls_enable *tls) error = sooptcopyin(sopt, tls, sizeof(*tls), sizeof(*tls)); if (error != 0) - goto done; + return (error); + + if (tls->cipher_key_len < 0 || tls->cipher_key_len > TLS_MAX_PARAM_SIZE) + return (EINVAL); + if (tls->iv_len < 0 || tls->iv_len > sizeof(((struct ktls_session *)NULL)->params.iv)) + return (EINVAL); + if (tls->auth_key_len < 0 || tls->auth_key_len > TLS_MAX_PARAM_SIZE) + return (EINVAL); + + /* All supported algorithms require a cipher key. */ + if (tls->cipher_key_len == 0) + return (EINVAL); /* * Now do a deep copy of the variable-length arrays in the struct, so that @@ -338,23 +349,35 @@ ktls_copyin_tls_enable(struct sockopt *sopt, struct tls_enable *tls) * error paths so that our caller need only worry about outstanding * allocations existing on successful return. */ - cipher_key = malloc(tls->cipher_key_len, M_KTLS, M_WAITOK); - iv = malloc(tls->iv_len, M_KTLS, M_WAITOK); - auth_key = malloc(tls->auth_key_len, M_KTLS, M_WAITOK); - if (sopt->sopt_td != NULL) { - error = copyin(tls->cipher_key, cipher_key, tls->cipher_key_len); - if (error != 0) - goto done; - error = copyin(tls->iv, iv, tls->iv_len); - if (error != 0) - goto done; - error = copyin(tls->auth_key, auth_key, tls->auth_key_len); - if (error != 0) - goto done; - } else { - bcopy(tls->cipher_key, cipher_key, tls->cipher_key_len); - bcopy(tls->iv, iv, tls->iv_len); - bcopy(tls->auth_key, auth_key, tls->auth_key_len); + if (tls->cipher_key_len != 0) { + cipher_key = malloc(tls->cipher_key_len, M_KTLS, M_WAITOK); + if (sopt->sopt_td != NULL) { + error = copyin(tls->cipher_key, cipher_key, tls->cipher_key_len); + if (error != 0) + goto done; + } else { + bcopy(tls->cipher_key, cipher_key, tls->cipher_key_len); + } + } + if (tls->iv_len != 0) { + iv = malloc(tls->iv_len, M_KTLS, M_WAITOK); + if (sopt->sopt_td != NULL) { + error = copyin(tls->iv, iv, tls->iv_len); + if (error != 0) + goto done; + } else { + bcopy(tls->iv, iv, tls->iv_len); + } + } + if (tls->auth_key_len != 0) { + auth_key = malloc(tls->auth_key_len, M_KTLS, M_WAITOK); + if (sopt->sopt_td != NULL) { + error = copyin(tls->auth_key, auth_key, tls->auth_key_len); + if (error != 0) + goto done; + } else { + bcopy(tls->auth_key, auth_key, tls->auth_key_len); + } } tls->cipher_key = cipher_key; tls->iv = iv; @@ -586,16 +609,6 @@ ktls_create_session(struct socket *so, struct tls_enable *en, en->tls_vminor > TLS_MINOR_VER_THREE) return (EINVAL); - if (en->auth_key_len < 0 || en->auth_key_len > TLS_MAX_PARAM_SIZE) - return (EINVAL); - if (en->cipher_key_len < 0 || en->cipher_key_len > TLS_MAX_PARAM_SIZE) - return (EINVAL); - if (en->iv_len < 0 || en->iv_len > sizeof(tls->params.iv)) - return (EINVAL); - - /* All supported algorithms require a cipher key. */ - if (en->cipher_key_len == 0) - return (EINVAL); /* No flags are currently supported. */ if (en->flags != 0) From nobody Mon Mar 18 18:27:53 2024 X-Original-To: dev-commits-src-all@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 4Tz3Hs4MZpz5FCqL; Mon, 18 Mar 2024 18:27: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 4Tz3Hs2Cwcz3xJD; Mon, 18 Mar 2024 18:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710786473; 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=MKyQEF4mRQ5QKthapYvdadOwYIW4CMuZQiYsVc3GSRk=; b=ZVNalcRnRa2Bsacx9bqiVUaH6aGMJQgoZxRRPBjBuJ8fa6I3OMvdidS9lz6tsnT4dB+1YN Nz92WDy0nSIcSD8QpHKt5rjOR7Bm6GbFMHwt/iqz27lWtOx4jxoScUTLKkGzNy2WfVlmw2 8aIKNK5e/fN36JzUSV0FD1vkWzxFlAc0YKBfNKnGjVNGb2wvV0MFiY1aSLc7xmsNh5L7HT ilqabbuqahYapOMBgyJCiJcPBmDxbuW784xPMqyyxN+7x4qinOhxn3Wal4SbQ1lw4YNtFl AG3wU+bF7pl3o3sTbJXzXbCEYhF7FsRQqK9Oauvdhm76oKP8PujccUx+qY0UBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710786473; a=rsa-sha256; cv=none; b=nt2Qqtrjf9rT/bHSRC6btUY3mbobT1ij45cLKrbux9mWiM3VqAstnMwI5Q6P/96WCxPToW 2Di0dosf2pIN39r6hr/RdyGoKo5qaSLJv6h5oWYac5PQivtzMtvxuSCChp0vC8toONYC2h JQspZJHXLBgDp+TVLLNXQU11XzApmvXgiCut+B073JciE6SCnEtyxl90Z+5pvIyTpWn2Ae sYwwdwu7262KgPdVwaMLacf4GGs7uIjz5amyuUNtfiLfhgjHRQquFnIdTPMw+5FdbwEivL /roOSiEzU02Fbrkiq3PHS02kswB1mHgSWG4cfJ38qO5Ngexz4KjT3I03GaaM7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710786473; 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=MKyQEF4mRQ5QKthapYvdadOwYIW4CMuZQiYsVc3GSRk=; b=mRu3L7AwVoyWGdshllIWfpYiAfAF2QrJBiJf1n0/hTbrhJiNoxXEIaYkMk6ugI54VSvwjw 2msf2DkC1oBv01kwT9G04M1m7lA/Gd2ig6mD0gDcPzeSG1GnQaoiGP3RNgnwyaUOs0P0FG KNFkttXpAhYAw14jNvRdNqARjpJqlvfnFG8S7IZVL2nAWweIyQBp/NShd6ShGKkRN981G1 fOwmoW429BCdOmYFVpKjfkPwfv1ZG+sp/jdSalOpQ3R3HFAOhC5KN+w5ZuhI+5TpyHGz2e lKGr024LwUDy6S9mM3wz1cvODp7ajS1D8B5LflTkcaJ8IQACHkx6tn05UiCgGg== 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 4Tz3Hs1rJDzZ8T; Mon, 18 Mar 2024 18:27: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 42IIRrlI057099; Mon, 18 Mar 2024 18:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IIRrv0057096; Mon, 18 Mar 2024 18:27:53 GMT (envelope-from git) Date: Mon, 18 Mar 2024 18:27:53 GMT Message-Id: <202403181827.42IIRrv0057096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: e29be0786117 - main - tcp_rack.4: Update the SEE ALSO section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e29be07861173f87b2dd46db1d0c7cbcf72d4ad0 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=e29be07861173f87b2dd46db1d0c7cbcf72d4ad0 commit e29be07861173f87b2dd46db1d0c7cbcf72d4ad0 Author: Gordon Bergling AuthorDate: 2024-03-18 18:25:11 +0000 Commit: Gordon Bergling CommitDate: 2024-03-18 18:25:11 +0000 tcp_rack.4: Update the SEE ALSO section Correct the surname of one of authors of RFC 8985 and add RFC 5681 and RFC 6937 (PRR: Proportional Rate Reduction for TCP). Reviewed by: tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44399 --- share/man/man4/tcp_rack.4 | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index 2ebffca08e26..73995d930a9a 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 5, 2024 +.Dd March 18, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -124,12 +124,28 @@ What method should we use for rate sampling 0=high, 1=low .Rs .%A "Neal Cardwell" .%A "Yuchung Cheng" -.%A "Nandita Dukkipat" +.%A "Nandita Dukkipati" .%A "Priyaranjan Jha" .%T "The RACK-TLP Loss Detection Algorithm for TCP" .%O "RFC 8985" .%D "February 2021" .Re +.Rs +.%A "M. Allman" +.%A "V. Paxson" +.%A "E. Blanton" +.%T "TCP Congestion Control" +.%O "RFC 5681" +.%D "September 2009" +.Re +.Rs +.%A "M. Mathis" +.%A "Nandita Dukkipati" +.%A "Yuchung Cheng" +.%T "Proportional Rate Reduction for TCP" +.%O "RFC 6937" +.%D "May 2013" +.Re .Sh HISTORY The .Nm From nobody Mon Mar 18 18:53:26 2024 X-Original-To: dev-commits-src-all@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 4Tz3sM15Grz5DmPW; Mon, 18 Mar 2024 18:53: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 4Tz3sL6QdZz42bh; Mon, 18 Mar 2024 18:53:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710788006; 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=j/Q4COyaBAcUwprRNfzE8euHHRVwuk9muReFFR4ZXKo=; b=IP7SmyFM6ygv66u0HTD/auFF35wamepvRn4qpF2LrBBErQSObCxAYtvRLksAlW3oS8aRLv yIMa0dcHDMc5CwsnbGDOVuLUT13emn7b72wzzwTsHqYsEmLJxMQn4mdWKZbjZou/VOx+Uw Znq8Qlpt2v86QwIF5pHpZ1krc37QXP0pRF9BYTpJSJEDdl+DjShR76MHoPIiZGP47cxB7c dbIIjlqjffFRzEy1XdpaVD/CqUOZiQRdx9jvLOYJRXloqRoIPxZ3B+AZG5vcBi7fYRl3/t uTQmLKIJi9mQTiO48obLxdRKzvdgubXBKIK192DtE2qSvlp/6JdZ9EMfQCHVPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710788006; a=rsa-sha256; cv=none; b=yQXfja2oSRmX/ubiLd9hNPA6dNuA/Q5YoQae/mGfmdhj3lwMAcFmN7fUiNns77ykgkoUG/ EzppPHLnRpJ3Myg4JA5KpTT8/j1xGp0ZpdtbJkTHLPU+QS9+K/a5dwuDMdTXZv5pGHvEZs wSkwLdkeWh62JiZkv9ptGQrWSqKp4eJZadcUcYoviZTJ4z6W8/nnXZUQ4vpWgSTe9LAvxY sidTNN0Z0mHg1EGK+RnNrvDv4EJIk+atZFGapr3/gKxhpJkPED7+5x2gBgf378FhV1o9Mk h2AJ9r5/jXZButQYhSkP2aZpHOZdkPUxvZ322fXcA150+M1iuA4smjmMN2Dm2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710788006; 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=j/Q4COyaBAcUwprRNfzE8euHHRVwuk9muReFFR4ZXKo=; b=innyTBTyvZPtA9xkDtBt2DXC9P5ce6qD+IUK53uPs0Ncf5B1RfHt/DFxPvEQPQd8+C/nWP I9r3+saLUDF0bf9QWyM5eq9iQvPx36xVZNLc6iHehu6egba6YXvfC4NfyjxSPHiKseZgKd AsF0WWvjnoEdtYClMKlYgmvmwgYo2NMKx3qU1Wxn2HTms23VYcfshkE2HggIBYiw+VBulZ dB7ejliR8Tg9lyRoO2eAsoFrthKnEw/BOdAlP6M5IsmvH8baw/sBFLnJ+3rqkZQY2Mw/aR 0/z2XnGqgrA9K3xjGizdZVhiSljWoNY9BoJDQGb1+b0YBEKuiuee7FHXZFb0zA== 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 4Tz3sL61WPzb1R; Mon, 18 Mar 2024 18:53: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 42IIrQ7w006742; Mon, 18 Mar 2024 18:53:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IIrQau006739; Mon, 18 Mar 2024 18:53:26 GMT (envelope-from git) Date: Mon, 18 Mar 2024 18:53:26 GMT Message-Id: <202403181853.42IIrQau006739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d9108adbc039 - main - lib{c,sys}: really fix incremental builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9108adbc0393a58d52cd9275bf582b02199427f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d9108adbc0393a58d52cd9275bf582b02199427f commit d9108adbc0393a58d52cd9275bf582b02199427f Author: Brooks Davis AuthorDate: 2024-03-18 17:06:41 +0000 Commit: Brooks Davis CommitDate: 2024-03-18 18:52:42 +0000 lib{c,sys}: really fix incremental builds Reported by: andrew Fixes: a650ec0e55a9 lib{c,sys}: fix incremental builds --- tools/build/depend-cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e327ee40a6df..71988e526369 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -222,8 +222,8 @@ clean_dep lib/libc statfs c # 20240308 e6ffc7669a56 Remove pointless MD syscall(2) # 20240308 0ee0ae237324 Remove pointless MD syscall(2) # 20240308 7b3836c28188 Remove pointless MD syscall(2) -if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o && \ - grep -eq 'libsys/[^ /]*/syscall.S' "$OBJTOP"/lib/libsys/.depend.syscall.*; then +if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o ] && \ + grep -q -e 'libsys/[^ /]*/syscall.S' "$OBJTOP"/lib/libsys/.depend.syscall.*; then echo "Removing stale /syscall.S depends" clean_dep lib/libsys syscall S clean_dep lib/libc syscall S From nobody Mon Mar 18 20:04:02 2024 X-Original-To: dev-commits-src-all@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 4Tz5Qp5SwGz5DtbX; Mon, 18 Mar 2024 20:04: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 4Tz5Qp4xJYz4Hl1; Mon, 18 Mar 2024 20:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710792242; 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=y+444adUS3jXUJbyK4UYsGXbjYoEdmAg0++TezpwDZo=; b=a4AKo9ydWn5VvLGd5RvXl0wBcYBPBVOCzXoCwc/AWldW3Xb08etnC+umrBZ/BStSWmfAEx Z5SprXv5bW3qYRLXipcScOkLnFf6grNds3F+gOTZdteAarHn4uJyEMJUcvNFPn79UrNw4Y XSLtM39Gzm6Kic3zGDtMtsZPdthKWtcR9xS94rZjk9FhVh8+uhJHiEz81T3Ijq9WyLqwsT 8i4Y0H7gW0i/RiIGPRFI7XK0llfAvpYlVHO26GuOeGWB9w364P/WJmNCI27oTPQ4iX4kjf /NSlHMZe9mHvi0i7SORKiXm5ojtM+129COYhVpvo9r7Fls6CmknC1Qtt0ZNS6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710792242; a=rsa-sha256; cv=none; b=W0snCGYT/vntzBfr3gotb3ynWhbJB4vKmfheOh45Lazg7KBwD9G9L7mpdHV8WjrkYOPnIN Q8IQ9ii506ceMBY+h0MuIzi3ZrLtwYsYsO8EgenPgeGFCBBRQIxTZo5RW2lqf7hSN/zVCA CbxW5sN0HwsPawL/aqHEdt3P4N1MRRjzHEVW2Kv+xChgZbdfk5DYVaS4TX+vxMdHc7EEo1 f203XDK1amZvOPPMfDaAOe0mZkUf3H1zt4o4+qDcVHmvkftnhKxCXsi0S6NGLMUei8Eyjz BT02a/ZDRKINwzC4J+U8AHS2x3XCzNo9EebHrrvjrPN2exWwJezPQNgo4Wc85g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710792242; 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=y+444adUS3jXUJbyK4UYsGXbjYoEdmAg0++TezpwDZo=; b=UxHnjMQhCwkgX+os1w0dGvwT2dnmEnpfbQ2wDuH8AjT0ylWvYArirwOXWsJGKq5G/brtRk M3baYieDMAW1VYaOfGs7DKybXSELwmWWcEur7E+nRWPEyEqffZSul11YYXK3jVaWUIVjht HjokhVToMA7yQBn5tVRIHAKetL9JiH3f9uXLtdIdJaiXzk3qA4tz04lSwjotWzCthnkIRg 0m5ginF2nvX022GvJao/22T7lk4nN+4UiJfKUz7hDx07Oh9+kKUXiJNy9Rk0NtPXPQgAu6 LuF4uWoeB4T4Q5ZJG1Bcus1ND7rOZjgVr/osg4lttYFGMio9lZSef7ToIVbnYg== 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 4Tz5Qp4X5fzcqy; Mon, 18 Mar 2024 20:04: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 42IK42N0026245; Mon, 18 Mar 2024 20:04:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IK42ci026242; Mon, 18 Mar 2024 20:04:02 GMT (envelope-from git) Date: Mon, 18 Mar 2024 20:04:02 GMT Message-Id: <202403182004.42IK42ci026242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f50322c1dcfe - main - random(9): bump removal to FreeBSD 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50322c1dcfe369ad73e1123541d18fc431384f6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f50322c1dcfe369ad73e1123541d18fc431384f6 commit f50322c1dcfe369ad73e1123541d18fc431384f6 Author: Ed Maste AuthorDate: 2024-03-18 20:02:08 +0000 Commit: Ed Maste CommitDate: 2024-03-18 20:03:49 +0000 random(9): bump removal to FreeBSD 15.0 It has not yet been removed, and still has some in-tree consumers. PR: 277655 Sponsored by: The FreeBSD Foundation --- share/man/man9/random.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/random.9 b/share/man/man9/random.9 index c0d58482416c..7fc721564897 100644 --- a/share/man/man9/random.9 +++ b/share/man/man9/random.9 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" " -.Dd March 22, 2021 +.Dd March 18, 2024 .Dt RANDOM 9 .Os .Sh NAME @@ -133,7 +133,7 @@ The deprecated .Fn random function will return a 31-bit value. It is obsolete and scheduled to be removed in -.Fx 14.0 . +.Fx 15.0 . Consider .Xr prng 9 instead and see From nobody Mon Mar 18 20:28:37 2024 X-Original-To: dev-commits-src-all@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 4Tz5z95Fpqz5DwJV; Mon, 18 Mar 2024 20:28:37 +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 4Tz5z94knXz4LHs; Mon, 18 Mar 2024 20:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710793717; 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=gPmoVZUpog3P0tsy+OQCvBqvRupUY2eNdN0+IYCUFHU=; b=LtesT61UgJRLwwEqbqczx+xc30UOG3w1poQa6doQl/W3g8yHDa9AFv8rNngM+GP8h4xRBl j+9p/A10NHQlGOZ8Ic+OiPl8HlwShRBRntvKTOV642W6lmG53bmX7/YbQWHBgfuvHc+stw l9GZnS7kasTkmN7/LxOjHk/Mk2mY6jTipcUD+hLi0Qxe2vL+rrGjMOvdDi0Ys7wcs58NtP 1mymO3uNIfM/ukb+zi9fq1uyLwsvdd+0SNJURhwt+UTYgPC/MTUFmOjLeaCq0sbMYqqvjS 5cqoRpULUrY4knUCvvjicG1ayKLd72+FTwmff/ZpM6x7U8wHgJGmoKlhpXiLIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710793717; a=rsa-sha256; cv=none; b=mK+xKFYck2QM7KTXtIVyhYPh1/YNmoIRMZMU0xbrT1/D/uTEHjbswS0pQJswgv5rKfquon us9e0+AvWEPVllUSjb6ZF7Pc23h8AeUeFCYwuPfa96fyPSs0U7EvuBvgTr/mWc25crbDkQ vDHWnhaydSxWRPAW5kyB3BqRvHhJWgv6tia2qm7R5kOvQ8HxTlGt9IV6kOJmIfzotzXR03 3t0qrc4ekCXynO5vKqSpwUG6fNhtMTLw1YjmxieJgebzlH27OwDS4WIGZDYy6WvwjeE3H+ eqPOFuMWlEUjOQv42NGcNY8Hzzd+JLNrZ5UPuXHNch15IQt7zB5MptAmZoixkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710793717; 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=gPmoVZUpog3P0tsy+OQCvBqvRupUY2eNdN0+IYCUFHU=; b=MiFe0nxnUYbFXkpV86XAZwU+1zsPdevwcZldeW9G+6basFfjQz/SaD60laNX3iEjw+hDwP Pgc1f0jKcBsPuB0nU56XTZDw1TZEdrWZKfr5vmMSk2Lg6cs2rSQNM4QeoPmVdHD6yohUgM 4mFyipO9hS3UwivU2z489tTp15XgXeOMOkAWfl7FbfojlFFP/iEDmfOSmPAhEoJWEvudSz /tsi2OCe1wQI4smb3BEhBpLVpSFWkxfFrqR9jTBKKDhg29v3r9w/w7Wqweg50EKC+7yzOL lVQnCEuTObr4B7uVSQGuIrOwxTsb2Fq109Wt+gjuqm77bFhuYZiyqr2+wYhfGw== 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 4Tz5z94JmMzdND; Mon, 18 Mar 2024 20:28: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 42IKSb2b059548; Mon, 18 Mar 2024 20:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IKSbTE059545; Mon, 18 Mar 2024 20:28:37 GMT (envelope-from git) Date: Mon, 18 Mar 2024 20:28:37 GMT Message-Id: <202403182028.42IKSbTE059545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "R. Christian McDonald" Subject: git: 576fbcbf2dc0 - main - Add myself (rcm) to the calendar. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 576fbcbf2dc08f6a4a9f373a916cec2af246f93b Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=576fbcbf2dc08f6a4a9f373a916cec2af246f93b commit 576fbcbf2dc08f6a4a9f373a916cec2af246f93b Author: R. Christian McDonald AuthorDate: 2024-03-18 20:25:43 +0000 Commit: R. Christian McDonald CommitDate: 2024-03-18 20:26:59 +0000 Add myself (rcm) to the calendar. Reminded by: mckusick --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 0d8e57137d13..32ad28c01d8c 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -418,6 +418,7 @@ 10/21 Daniel Ebdrup Jensen born in Aalborg, Denmark, 19XX 10/21 Vladimir Vladimirovich Druzenko born in Kishinev, USSR, 1979 10/22 Jean-Sebastien Pedron born in Redon, Ille-et-Vilaine, France, 1980 +10/22 R. Christian McDonald born in Columbia, South Carolina, United States, 1991 10/23 Mario Sergio Fujikawa Ferreira born in Brasilia, Distrito Federal, Brazil, 1976 10/23 Romain Tartière born in Clermont-Ferrand, France, 1984 10/25 Eric Melville born in Los Gatos, California, United States, 1980 From nobody Mon Mar 18 20:57:10 2024 X-Original-To: dev-commits-src-all@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 4Tz6c63kmXz5F0Kj; Mon, 18 Mar 2024 20:57: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 4Tz6c638WYz4NXZ; Mon, 18 Mar 2024 20:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710795430; 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=PFw1BDx8JtwOtNHmV08jYEHyNd9SixxZhs9gIz2n/+Q=; b=sV1IEePgTz7sMYtZe0fDZPH4dUO5lZyIMI1O9kSAmMv1X5nR1pbtbd2BCk/MT2JyhYq3a1 4KsCdGKrhvLDQ2EBvqrX0sN8gULnoVVXsDepRqalyCxwrkoopSaB+dfRDrLbgMJifOdO+D NZ0J2LtgQGqBAo7TNJMyZ8xva67yDBGWCZ01mVNPikpsRQhElQtwVmdSEO2pm7Xx+O6d7b WTV3SWEXnTIHeClJ3srtPxr12tNnzMLopZ2pNS+eFzeG6yOxWX8hVK5To6m9ueo5VvBnjt XsqxbbYiw9FF0gmw06uVpqpZ3LH3Dh1NM0FuOtkklXxwGNyYqk7EwwEMq1D/eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710795430; a=rsa-sha256; cv=none; b=Ueyn3VHca90Qbq7AKW+k0Qkq9eCNSjvrGH7Jh1JRPe48B+z8oj5TQ2C8c0S5bzgId9rxBR zmGDdKPTQMFR803r3RUCPyprFDDKu1KHN70PXikx29bCaWjeO5fT++uVkHxJKBKQohSFOT cnnxoupzZNEY23mdd6seQ1YF8gsZaAl7vsf5JqM1GS/U5BkAraiAkbBmRFr6a+amhaqTVr QSPt8IPlOS/wb++k63AGmU+nrVvCz/xHZXBbMqXJ0xskjL+sMn4OEa0mW00djLjd61doXo KpTL+Eh5C92a1IC7WDJO3lELKFU04WBlpKg2hE206FxFHefUwPaPrcKSznvbLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710795430; 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=PFw1BDx8JtwOtNHmV08jYEHyNd9SixxZhs9gIz2n/+Q=; b=faaTRW8w7CkEhuQdarByrIAOYHcuQ39J/jLvfSppqY15vw/5iWJVe6XAkoNJb3/OlrSVDf P9RBmgZXMef168BOEuQanWxeiJVkuNh/51NJFvVigcCuFs1hN6xGMNJAoZPqkL6MNy2slX Spwip94yjDLIxnCJeldW+n0TAcweC8jqevnJwTGdnZIQrdMLNKR32hT8HZerU+vaLLXscw b2Obi8rLwitJsGoBKctENr0iWK3r5URqHFP3i32d0c55oW+WrrfVuua/je0bx+HGnxHIVs cBgUJn35Byskne8zzpIk7N1TZrRPmKTinw4K1KZqYTaSoIcDwKNX3gMQN8nYJQ== 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 4Tz6c62m5Rzf9R; Mon, 18 Mar 2024 20:57: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 42IKvAiB009679; Mon, 18 Mar 2024 20:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IKvAad009676; Mon, 18 Mar 2024 20:57:10 GMT (envelope-from git) Date: Mon, 18 Mar 2024 20:57:10 GMT Message-Id: <202403182057.42IKvAad009676@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: e34ea0196f44 - main - tcp: clear all TCP timers in tcp_timer_stop() when in callout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e34ea0196f4497d3f3939025aff3a89ee77b652e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e34ea0196f4497d3f3939025aff3a89ee77b652e commit e34ea0196f4497d3f3939025aff3a89ee77b652e Author: Gleb Smirnoff AuthorDate: 2024-03-18 20:57:00 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-18 20:57:00 +0000 tcp: clear all TCP timers in tcp_timer_stop() when in callout When a TCP callout decides to disable self, e.g. tcp_timer_2msl() calling tcp_close(), we must also clear all other possible timers. Otherwise, upon return, the callout would be scheduled again in tcp_timer_enter(). Revert 57e27ff07aff, which was a temporary partial revert of otherwise correct 62d47d73b7eb, that exposed the problem being fixed now. Add an extra assertion in tcp_timer_enter() to check we aren't arming callout for a closed connection. Reviewed by: rscheff --- sys/netinet/tcp_subr.c | 3 +-- sys/netinet/tcp_timer.c | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index f618bc1ba04b..a6f84c297688 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -2395,10 +2395,9 @@ tcp_discardcb(struct tcpcb *tp) #endif INP_WLOCK_ASSERT(inp); + MPASS(!callout_active(&tp->t_callout)); MPASS(TAILQ_EMPTY(&tp->snd_holes)); - tcp_timer_stop(tp); - /* free the reassembly queue, if any */ tcp_reass_flush(tp); diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index ed50659abf8e..785f68be5621 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -881,6 +881,7 @@ tcp_timer_enter(void *xtp) if (tp_valid) { tcp_bblog_timer(tp, which, TT_PROCESSED, 0); if ((which = tcp_timer_next(tp, &precision)) != TT_N) { + MPASS(tp->t_state > TCPS_CLOSED); callout_reset_sbt_on(&tp->t_callout, tp->t_timers[which], precision, tcp_timer_enter, tp, inp_to_cpuid(inp), C_ABSOLUTE); @@ -939,8 +940,7 @@ tcp_timer_active(struct tcpcb *tp, tt_which which) /* * Stop all timers associated with tcpcb. * - * Called only on tcpcb destruction. The tcpcb shall already be dropped from - * the pcb lookup database and socket is not losing the last reference. + * Called when tcpcb moves to TCPS_CLOSED. * * XXXGL: unfortunately our callout(9) is not able to fully stop a locked * callout even when only two threads are involved: the callout itself and the @@ -963,6 +963,8 @@ tcp_timer_stop(struct tcpcb *tp) stopped = callout_stop(&tp->t_callout); MPASS(stopped == 0); + for (tt_which i = 0; i < TT_N; i++) + tp->t_timers[i] = SBT_MAX; } else while(__predict_false(callout_stop(&tp->t_callout) == 0)) { INP_WUNLOCK(inp); kern_yield(PRI_UNCHANGED); From nobody Mon Mar 18 21:13:54 2024 X-Original-To: dev-commits-src-all@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 4Tz6zQ3j9Bz5F1wG; Mon, 18 Mar 2024 21:13: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 4Tz6zQ35Ldz4SR2; Mon, 18 Mar 2024 21:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710796434; 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=LXnbXjo7yYjwhstIzmM0XdbuWkz17P3yyMpRActT3g4=; b=YM82RVba2Uo0wd+c1jm7oJaqJ2qDFh4kord2MKSTSkxPOOmdAJJhA12XLs9hTFPf/Ysy5V ZYJcQLu0lEXlM5HyUGx2Pzli2NeIoFv+fVSuzImbF1bc5K3th+/nU0hEP/vhlPY7paKG0A lMYfvcUWwmG3dyqbPel4T1h8m6whea8OpQqWou18CPpdMAwkb1z5OAEgUPBb3AW9R5L36S OlZ/mOTnstedalQP5E+4pD4pxnlgcYtxFYd/ECn71D0NER06WZJz2SsvFoanet3F6Oj5s/ V7AijtgdtnfarCzjF78hqcp3lhxN+WNJaPSj9OgsPxuKg/i8A03R07P2tPh8Qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710796434; a=rsa-sha256; cv=none; b=et+ptkTfbXL9uGTE/p5Mm1w0UXJMjfTQfZbFQyJBlR/Mk/I+zm9fkE4evZeDwOoA6TRjxp s1+0sAymSHpVqkQeHXAowE73VIkiatK0Yo622U4UeASmLL2b/GlKNMkYj4PLFbE1J1gwtA I5YhOEoNt9Z7D+v9EAgtdWAPysjcW0K2zVvBdkvaHck5arrOPTf1VCL2/B14WHEafldKeg yKcb6RolCG1PZm2unuqCA1TAqC8IcDydL3jbgnE2yB8N7XBfJeoV/Jak5L6M49hZRWiRhR 0DoRv1YVkK2QKtrLj4hdmDzZOfxXYAOHKP5FVppUdUc0rPlEN4yoRtdk71LIvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710796434; 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=LXnbXjo7yYjwhstIzmM0XdbuWkz17P3yyMpRActT3g4=; b=fnbGqj5S92TIYTzQi4gQzkda9i+JCuDKNd0a7EeMfAeSNEG+dD3wC+RdZWhYMcwca0okzi xnVP0DbzQFPQrOV4KWjEesPM5+J827KO8IsekH5BKs+YEEn4iFquw3TFL+4KcVpB8GdIlx 6OFiFkpJdDmj3a9ZVCASNmMcUxiJq5ZCZuenguM8u6glsKajpeadv0t3vo2X+YU4pWGLvw 0EV1jS4kqOZqCAUrJyRBA7KQw85yEMaVpMeXeXv53I7iru/FgCRTh6GGJBkHPj4GkL0IMZ OAEWdIqZiKdHpjbef1Z3ZK3ZMMrJR8W/IBnQt8nbKGCBj2DHuyCSqJsnPfZrmg== 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 4Tz6zQ2hZkzfwT; Mon, 18 Mar 2024 21:13: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 42ILDssb044114; Mon, 18 Mar 2024 21:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ILDsux044111; Mon, 18 Mar 2024 21:13:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 21:13:54 GMT Message-Id: <202403182113.42ILDsux044111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: 60bc9617e79e - main - kerneldump: add livedump_start_vnode(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60bc9617e79e99bdf670304923f3baed4b749ad3 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=60bc9617e79e99bdf670304923f3baed4b749ad3 commit 60bc9617e79e99bdf670304923f3baed4b749ad3 Author: Vijeyalakshumi Koteeswaran AuthorDate: 2024-03-18 19:26:29 +0000 Commit: Ka Ho Ng CommitDate: 2024-03-18 21:12:18 +0000 kerneldump: add livedump_start_vnode(9) livedump_start_vnode(9) is introduced such that the live minidump on the system could take a vnode. This interface could be used to extend support for the existing framework in downstream. Bump __FreeBSD_version for introducing livedump_start_vnode(9). Sponsored by: Juniper Networks, Inc. Reviewed by: khng Differential Revision: https://reviews.freebsd.org/D43471 --- sys/kern/kern_vnodedumper.c | 32 +++++++++++++++++++++++--------- sys/sys/kerneldump.h | 1 + sys/sys/param.h | 2 +- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c index 0104369b9d67..5a2c255390cc 100644 --- a/sys/kern/kern_vnodedumper.c +++ b/sys/kern/kern_vnodedumper.c @@ -61,11 +61,8 @@ int livedump_start(int fd, int flags, uint8_t compression) { #if MINIDUMP_PAGE_TRACKING == 1 - struct dumperinfo di, *livedi; - struct diocskerneldump_arg kda; - struct vnode *vp; struct file *fp; - void *rl_cookie; + struct vnode *vp; int error; error = priv_check(curthread, PRIV_KMEM_READ); @@ -84,8 +81,27 @@ livedump_start(int fd, int flags, uint8_t compression) error = EBADF; goto drop; } + error = livedump_start_vnode(vp, flags, compression); + if (error != 0) + goto drop; +drop: + fdrop(fp, curthread); + return (error); +#else + return (EOPNOTSUPP); +#endif /* MINIDUMP_PAGE_TRACKING == 1 */ +} - /* Set up a new dumper. */ +int +livedump_start_vnode(struct vnode *vp, int flags, uint8_t compression) +{ +#if MINIDUMP_PAGE_TRACKING == 1 + struct dumperinfo di, *livedi; + struct diocskerneldump_arg kda; + void *rl_cookie; + int error; + + /* Set up a new dumper. */ bzero(&di, sizeof(di)); di.dumper_start = vnode_dumper_start; di.dumper = vnode_dump; @@ -97,13 +113,13 @@ livedump_start(int fd, int flags, uint8_t compression) kda.kda_compression = compression; error = dumper_create(&di, "livedump", &kda, &livedi); if (error != 0) - goto drop; + return (error); /* Only allow one livedump to proceed at a time. */ if (sx_try_xlock(&livedump_sx) == 0) { dumper_destroy(livedi); error = EBUSY; - goto drop; + return (error); } /* To be used by the callback functions. */ @@ -126,8 +142,6 @@ out: vn_rangelock_unlock(vp, rl_cookie); sx_xunlock(&livedump_sx); dumper_destroy(livedi); -drop: - fdrop(fp, curthread); return (error); #else return (EOPNOTSUPP); diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h index 46f05b3c130d..1f03c4b9c2d5 100644 --- a/sys/sys/kerneldump.h +++ b/sys/sys/kerneldump.h @@ -161,6 +161,7 @@ void dumpsys_pb_progress(size_t); extern int do_minidump; int livedump_start(int, int, uint8_t); +int livedump_start_vnode(struct vnode *, int, uint8_t); /* Live minidump events */ typedef void (*livedump_start_fn)(void *arg, int *errorp); diff --git a/sys/sys/param.h b/sys/sys/param.h index 4369aba9bb46..d56255431ba2 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500015 +#define __FreeBSD_version 1500016 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Mon Mar 18 21:31:54 2024 X-Original-To: dev-commits-src-all@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 4Tz7NB3FWPz5F3Hh; Mon, 18 Mar 2024 21:31: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 4Tz7NB2nZFz4VKb; Mon, 18 Mar 2024 21:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710797514; 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=AcyhjfTbHZNHf61YCs6DvWmVlQx2nbV5FQwCa8uwRUQ=; b=kqOlxCcT5HuJ3W7yDOMmrBe3P2UvoBH08yH9BHfNGQE83n5dP+4D1Xt3yOBGeTU+xeiAoM aExhHaPUtaomp7kFFDJ4fedDos5zZfP7oAElJkhY4RQc/Be6sbZhkDlc71PnyNeZIBrxg2 ECJnyEOmRFDXeehBBtDP1J0TH8nvqgb/5Ftloc5O1lkVo6z45XDSfucKywIntzYoaXu/s6 UtBswxMPwHx6kQ4uSWZAiWp9oCnHLF3WcFYSeeopfA9iKMztO9AbKSuAQiZYZDwVD7RWj5 VeEEJAcBkb26ZrP3PXh3doqFDQSa69fCZat5AUnSJdTEknXVHXcd/FO+JsWoZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710797514; a=rsa-sha256; cv=none; b=QsaoWjfzp4AwAQqZRS6gyCX9FARyHVv5+s9sdnp+vDUUm32GtErKn//1AWQ8IbdAC3gBS2 OddHL2zNmArYpPTiqXB7wSu1injkZT1IihdEki3TVHKpd21utsKkoYrMD4A7d6PvBKcIwe +uP8eYcWkdHTNh1emJC+AyUkDKey4NrekqmU8LKSeW3m+KhnV3E+EzsOUlDbcTnbXkoSRQ AG+Br0msOP8ARUaHAvjFr5lEu2f/uxmD6nyli2syHbSyiz/gxEqFPhS5QJ1+smf9JlwfXE b6cVGYEhYWjeHYKVnWd1TGGjoG1/S9jCN4I7OrmJFzVZGc0Y8E/atdDdhRL0ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710797514; 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=AcyhjfTbHZNHf61YCs6DvWmVlQx2nbV5FQwCa8uwRUQ=; b=JjkuIiMtxxzJmwsfXxiaI2XXHhF2GaHNAtB9bvdYkqWSAhCwixykdWE4nKGMmlNcZMzUC1 3+8QtWRCs0+tqggRmS2PF0zuuV0vcHroiuMNxcpz/VER/d26b20NugfPciAmxRXff2H4Cx /GTXfd2CAnp3MyCrrdo3BJ3loIKPki90Y//ueABWqEbl74SjHC4T0nfYaL6tnUIUB0pUvo cAhanQkkTb58XoU/DPJvOJsmWtdlrVj7ORoqx7/ci7Y+6j4QKBVKeZMCnaChz5nksPRrru yP5J//GKTRpx4cmJyj3xWsisr06Y+T4uNZKHejuqgSniVs4dCRbUHAoMRlAFIw== 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 4Tz7NB2NnYzg1g; Mon, 18 Mar 2024 21:31: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 42ILVsFP076865; Mon, 18 Mar 2024 21:31:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ILVsDY076862; Mon, 18 Mar 2024 21:31:54 GMT (envelope-from git) Date: Mon, 18 Mar 2024 21:31:54 GMT Message-Id: <202403182131.42ILVsDY076862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: d4135972ae74 - main - add myself(oh) to the calendar List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4135972ae74803e88d3a4a2ca72afac35401949 Auto-Submitted: auto-generated The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=d4135972ae74803e88d3a4a2ca72afac35401949 commit d4135972ae74803e88d3a4a2ca72afac35401949 Author: Oskar Holmlund AuthorDate: 2024-03-18 21:33:03 +0000 Commit: Oskar Holmlund CommitDate: 2024-03-18 21:33:03 +0000 add myself(oh) to the calendar Reported by: McKusick Approved by: Manu (mentor) Differential Revision: https://reviews.freebsd.org/D44408 --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 32ad28c01d8c..78ed86fe593e 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -281,6 +281,7 @@ 07/04 Jake Freeland born in St. Paul, Minnesota, United States, 2003 07/05 Olivier Cochard-Labbe born in Brest, France, 1977 07/05 Sergey Kandaurov born in Gubkin, Russian Federation, 1985 +07/06 Oskar Holmlund born in Solleftea, Sweden, 1981 07/07 Andrew Thompson born in Lower Hutt, Wellington, New Zealand, 1979 07/07 Maxime Henrion born in Metz, France, 1981 07/07 George Reid born in Frimley, Hampshire, United Kingdom, 1983 From nobody Mon Mar 18 22:42:26 2024 X-Original-To: dev-commits-src-all@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 4Tz8xZ2vbFz5F903; Mon, 18 Mar 2024 22:42: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 4Tz8xZ2SP5z4cXW; Mon, 18 Mar 2024 22:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710801746; 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=wnExVjaVejBwC5UmdbP3T4wmC9gxs/Hw6svK2JykceA=; b=WhrJyELtP/zaDC5bbpcDt3qEBMC+6jwH02qbEQT47FdUrLyhzJ/mKp32+hXRh2BKTaSGqQ l/h+zxH5dZDw/H1p6MB1mdBk05QrzUeyBhIdQ8VKmV18PEkKxVgAh7myPQG+mkFpCruq0C aPXCV7J3OoulPVjiq7YAjWUmUmhQXxU34f7ElCZqKX7DkQ4uXSHzlzmu4vxW0EyNlQLjT8 T+lt5yRRYgqTzU9kqltgApLBuWQp8VQESXEd0Ax8+BPwlp2WwiUTkGkaTHg6xYHzte0/pM 2yGNNElKbl7ylymAU5MgdQJyGWGft5ZhICJeMuK55UPbqGhbLWcS91/Yj61Fpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710801746; a=rsa-sha256; cv=none; b=drHbWM1nNkZOnrNlGHj1En9H1UtRRcXsU2l0rN/3Qq8hBM4Ofny2gQte4BXG+V+u/EkY6A STwiUyk/ZoKijj06QIEXwPFxTbTzsAsL5g+uz7eW22pMRTB14JqNS1SYJe0rPZ7tNPdRLc YrrxXZKAY01LLe14tzlAkcPCHC4hCw3t0nLpR2IArAgjVGtZZ7ay+DWfSnJCW8RnIW4HcB vu5E6l/1ExNOh6WXl2srs3j826Mmq3wBHq8EX6ZsS3jiFmzGCKgifS1N2BHNaO5DNcfbCU Ea+eqjiYlhv8QthN/lokZgzN6vQVqjtfjQGBDga3qXb+qljmat7fIhGdeycs1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710801746; 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=wnExVjaVejBwC5UmdbP3T4wmC9gxs/Hw6svK2JykceA=; b=S826JafNdYr0BTlFYOfKUH7HVfK4bg8KxD0nEi+bwJFfzvSjSnH+bCbt7IUOY+v+Cy62rh /VWNZOC1mboDpniC39Dvz53Ke99R5fscegC6JyDnua3aSucYI23nueZuXj+3r3uhx7crhC X3wwU8f4VKRQnNbXEZ2/k5XPnJav2yPqRZk9ZSMtvraWUk7Ylagto/goU62WJ+mLZspPJp LDsgLJh4tIXEyX7WJ/lkWERj/OtDfgJey2ZuSwhEBozqQ6emdS74IaDm3SVLuRFrUZ9+S9 ktyraGmmlQxdPCssyNjCaSworMQMSwH6KewIX5TbbRCM1akWvIz5R9M3yX0VoA== 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 4Tz8xZ24KJzjBj; Mon, 18 Mar 2024 22:42: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 42IMgQJE094217; Mon, 18 Mar 2024 22:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IMgQ47094214; Mon, 18 Mar 2024 22:42:26 GMT (envelope-from git) Date: Mon, 18 Mar 2024 22:42:26 GMT Message-Id: <202403182242.42IMgQ47094214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 8f13abb4fd2f - main - nfsd.8: Document ways to minimize Copy operation times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f13abb4fd2f3c5d25bde830607a4aec6cec42d9 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8f13abb4fd2f3c5d25bde830607a4aec6cec42d9 commit 8f13abb4fd2f3c5d25bde830607a4aec6cec42d9 Author: Rick Macklem AuthorDate: 2024-03-18 22:40:41 +0000 Commit: Rick Macklem CommitDate: 2024-03-18 22:40:41 +0000 nfsd.8: Document ways to minimize Copy operation times For NFSv4.2, a Copy operation can take a long time to complete. If there is a concurrent ExchangeID or DelegReturn operation which requires the exclusive lock on all NFSv4 state, this can result in a stall of the nfsd server. This patch documents ways to avoid this problem. This is a content change. Reviewed by: karels, wollman, pauamma_gundo.com (manpages) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44395 --- usr.sbin/nfsd/nfsd.8 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8 index df73661169df..9051df4bcb31 100644 --- a/usr.sbin/nfsd/nfsd.8 +++ b/usr.sbin/nfsd/nfsd.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 22, 2023 +.Dd March 16, 2024 .Dt NFSD 8 .Os .Sh NAME @@ -353,3 +353,25 @@ to be set to one on the MDS as a workaround. Linux 5.n kernels appear to have been patched such that this .Xr sysctl 8 does not need to be set. +.Pp +For NFSv4.2, a Copy operation can take a long time to complete. +If there is a concurrent ExchangeID or DelegReturn operation +which requires the exclusive lock on all NFSv4 state, this can +result in a +.Dq stall +of the +.Nm +server. +If your storage is on ZFS without block cloning enabled, +setting the +.Xr sysctl 8 +.Va vfs.zfs.dmu_offset_next_sync +to 0 can often avoid this problem. +It is also possible to set the +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 10-100 megabytes to try and reduce Copy operation times. +As a last resort, setting +.Xr sysctl 8 +.Va vfs.nfsd.maxcopyrange +to 0 disables the Copy operation. From nobody Mon Mar 18 23:15:35 2024 X-Original-To: dev-commits-src-all@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 4Tz9gr06Lvz5FDQL; Mon, 18 Mar 2024 23:15:36 +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 4Tz9gq6fjyz4gLh; Mon, 18 Mar 2024 23:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710803735; 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=shuhwL7V9BqDQdPTr0ZK+pyq/L2CjYEk65Tp56hVblk=; b=Do7+a04a1ZBHD0D/EM8cUwP/Tcf3aE/5wfUCrwb5AatvY6jALTFozNo8vafe26VghfKDmC uYgUc4pNj7CW0uMvVI7HciQvgwJGoYFT5vNjEezWcTtnaP7u1KWgwDjUSBOv11SP8YWWB8 uJfaJLNV+YFuPfKaF5m6YQpXE7NACaLNnFdq2YbBfwNFh5Y5zAzpAD3AGL7ZtLULXtTHTi pdBm9MHJ7xfhc3oyAIPDNeLrpS0/6FE/IyxMICMMg43BI1mQBkoSz319zlaANTfqZjMDsQ nrdC5FjYs7WrvrIVcF4RBjktsAIbmzruw1nzsIN+Rnat6oPCBugecTc+GuAepg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710803735; a=rsa-sha256; cv=none; b=m8zllytJib6Rt7VMc/maAIxiXuMUkfll2SxrL+qZqeOKiWn0Fb8iSsULDRzRsjkl70pf67 f3D1J0L6+/gqszYlREBnZ0EWIN0F/Vs1oEVxoppGkc3W57d9qcyTY3Zee3FbuatMT2OXZf rFQoht4a767BPYyHNtRdOeJY6uq9QzNXRQQJZV3NEOk6FwBX1dLQmJTiOdzLAZNuDOZSSj 6/C2G5dzq6kGr0r1exNoEeJ8ExTdm8Em9KIKZHQiusfwMyFpDjolnAUg3dlRF3ek6ZoiH+ tl2NlOE5ljaJjRPzA/De/6e3+0e+NbqXUuZy++EzN5N+cAi4u2HZME0hpFKnYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710803735; 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=shuhwL7V9BqDQdPTr0ZK+pyq/L2CjYEk65Tp56hVblk=; b=ei1JjW8Y9gN8zo0lPBhmr9ahcaPzZ9y6nl+VL8qNPFqW0gT8uyv6jw1ru/b1elN/o473Vy LzLcNBrU4fC/rkG6r7+sh9Qq0O3vsSQyOtLAfkc3NbTQmIrWMEeoeSaLsqHuANGonHFL/2 46MjZwfomHBqP/u2QfeBzG/EUA5+ROghcy1Trv1At0Jl3BtFvlJwz+5wU57ntiyvtd+4PF YGAgcvdFBFngpiKSBWtVJyxJIFVX34KxwT7xYlZp/3rxUszxpHcAXL79xNO6qMw0lOjhyK IwMPytafpsO0QSts3hPR4zd/0CyhCtIAop72gBQOyraT+FWnINVT/oghkNRG7w== 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 4Tz9gq6CHszk2K; Mon, 18 Mar 2024 23:15: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 42INFZrJ046872; Mon, 18 Mar 2024 23:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42INFZG3046869; Mon, 18 Mar 2024 23:15:35 GMT (envelope-from git) Date: Mon, 18 Mar 2024 23:15:35 GMT Message-Id: <202403182315.42INFZG3046869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 01f3abbfcd59 - main - uboot/Makefile move BINDIR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01f3abbfcd59848e37118e5e2b868a7b3e98cc62 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=01f3abbfcd59848e37118e5e2b868a7b3e98cc62 commit 01f3abbfcd59848e37118e5e2b868a7b3e98cc62 Author: Simon J. Gerraty AuthorDate: 2024-03-18 23:14:15 +0000 Commit: Simon J. Gerraty CommitDate: 2024-03-18 23:14:15 +0000 uboot/Makefile move BINDIR Set BINDIR before we include bsd.init.mk so we can override it via local.init.mk Reviewed by: imp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44413 --- stand/uboot/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index ccd02c44957f..791cfcb47bfe 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -10,6 +10,8 @@ LOADER_GZIP_SUPPORT?= no LOADER_BZIP2_SUPPORT?= no LOADER_DISK_SUPPORT?= yes +BINDIR= /boot/uboot + .include .include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc" @@ -22,7 +24,6 @@ PROG= ubldr .endif NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} -BINDIR= /boot/uboot INSTALLFLAGS= -b WARNS?= 1 From nobody Mon Mar 18 23:17:08 2024 X-Original-To: dev-commits-src-all@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 4Tz9jc3K9wz5FDCy; Mon, 18 Mar 2024 23:17: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 4Tz9jc2nYcz4gLM; Mon, 18 Mar 2024 23:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710803828; 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=l41KnD7HePppZ4PLSU42SDd2fR8G9m9pVOq7oJUR2QU=; b=MKlSDyiFjFyeP8NCCDPXJm9GQqctl1xrpt0bLLYOFJ8eKpl3FYjV4YODlIbNXoHxBfE8ox L+gb6cfCzP7FS9ErRLb2I4KXYEKJhXSLQuV30AELy29iCyOxxEL2zRzjGz0q9GNULB4UdU gKBBwu/kZqu74jn2a6vyc1AIyzrl5uuuewAbHmZcjyNWHaIb3ugWiDCUg4iIrv5JjEBG7l XCHfIfdkpt97VRmzU+Opl0vZ6zgXlJN2gUelhfdFaFz6iTNxwDTYxFbxjtUN5/lNFKiKoh LrdJx2y5a54y1Go/30KSfjM4U1aze65JvCNUvAJpK3jMePTcJafO15twq+lDQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710803828; a=rsa-sha256; cv=none; b=Cb47IDE9s5c6FONJ5vg3aKMwFXkKdPS3yK+IKhawvMy6pu+RxmMBtb4xv+mKYLaSBUUeIn Lox7MLigCCQb4hvgiVfFPzGHwzNwzHLit/lWjo1Ji/lA5tIBlTYggf1xBIZcukVd58upKj oPZB9SSjcAG614xE9NcAkwnHk4KV6XA0YJzkLFMurtGEXqzsf5pFGMeIGuc8VZN2vscTfk qz2rEIPhtLJScrregCHQVuXOhlWV/yznzTTox+lQfyjBkC54T93rBGjI6g8SfdU+l/P5i7 xk2gUj2JjXGkZgVNzf+VJD2r7GskOvomN9z+L+7sr+z/Pm9HEkeuZGEcZDlzsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710803828; 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=l41KnD7HePppZ4PLSU42SDd2fR8G9m9pVOq7oJUR2QU=; b=FoZUV+aj27o9kbqtudr5NuXYeqszticvZ4wnDhEGAV99sNoZpUrwA+y8r3DD62G95ZQaLc KybhnJ87pyVDwLxX6aJ2CXIA3DqWZRiUAJttA/k+X4+3EDoKt269jKurBDB5+lKVLnnsg+ tE/kSyVD4/gqUtY06enDKzhM9mMpJQrRfNDZbAK6MBLuvWAUX8XTXxrREImkiSw9AiWlh4 kTiETIbJlcWLX3Em4yHQUXhEHL7nOtmpZGHpcU9Exvl03WxXxGnCXOhEg1Z8UT6h1/VLQf yhsBecjyrHvo/QU5PRAapuyDmsSR6E6/6np0YIeh2820cynAONGxa7o9jWszCw== 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 4Tz9jc2Np6zjn7; Mon, 18 Mar 2024 23:17: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 42INH839047165; Mon, 18 Mar 2024 23:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42INH84Y047162; Mon, 18 Mar 2024 23:17:08 GMT (envelope-from git) Date: Mon, 18 Mar 2024 23:17:08 GMT Message-Id: <202403182317.42INH84Y047162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: a8eb3b365eb6 - main - loader.4th dictthreshold too small List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8eb3b365eb63d2a569b166f2dfc982967d3a7fa Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a8eb3b365eb63d2a569b166f2dfc982967d3a7fa commit a8eb3b365eb63d2a569b166f2dfc982967d3a7fa Author: Simon J. Gerraty AuthorDate: 2024-03-18 23:16:29 +0000 Commit: Simon J. Gerraty CommitDate: 2024-03-18 23:16:29 +0000 loader.4th dictthreshold too small The dictthreshold in stand/forth/loader.4th is too small resulting in full dictionary. Reviewed by: stevek, imp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44414 --- stand/forth/loader.4th | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th index 574077ea5710..db31461f5454 100644 --- a/stand/forth/loader.4th +++ b/stand/forth/loader.4th @@ -61,8 +61,8 @@ s" arch-i386" environment? [if] [if] [then] [then] [then] -256 dictthreshold ! \ 256 cells minimum free space -2048 dictincrease ! \ 2048 additional cells each time +512 dictthreshold ! \ cells minimum free space +2048 dictincrease ! \ additional cells each time include /boot/support.4th include /boot/color.4th From nobody Tue Mar 19 00:01:54 2024 X-Original-To: dev-commits-src-all@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 4TzBjG3zx3z5FHr6; Tue, 19 Mar 2024 00:01: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 4TzBjG3Zk0z4k5W; Tue, 19 Mar 2024 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710806514; 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=aGamEHO+dRyjPZYSM5tO7Nvz9KTmqxZVdJbhOc0mgCI=; b=KTZUHblkSDltKl2IinnhihI6Qlw7ZjGQ/jvMTOq/VpGliizQi7hMKFRNhDs43V7yZB2pNd OK5nGWP7dHPdC0xJCO7gGO3cKBgo028VsqLV4CCP14aNbhoqHFwyTBWpqpAT2vcwvEPUqU 8BRbJO6SzxInvqJnQQQHKjoQeA8P7bQy3CVbISJrloH1tfkSlkT2pNHgdtsteu8nC++hmD 3Lsf7vhry8u28gdaSjUGAE9K0fFjgwEdJXbLohsv9pOq5ek6syRRKsfiNLuQU0Q2tY8Kj9 XjJ9xnY8HrfVoGHbDdmvO+XfrPaf6mNlvZ6dPRkhU+TCVosAcRac0DXuV+/vGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710806514; a=rsa-sha256; cv=none; b=Ycwz0fzGQ3rMjMsuyIe9B+AdZJCXnNSmfEcPU/73V6BTIPgLGeu0erfkt69HkB8I0jvXsY GXbkw5pLdk7iWnIFTrUl5z5Gqn5YxDb/537T2k2xDwBin1/ZRgFVkdnX9BiM2Wym6FN+7Z rzjZvCTu4FPDAoJoYSS9cn/e8kMDbmTq8yFeamgYcCgQ+fpAIlmZnDdG4tVUnt0nIRjquw tan21CDa9fq/J3v4ScCABfRGfHDZR0ibWsxU/cEGuRsof71U1XuwQHRMYv6L98M6t3cri6 BVZIoIRmmb9US6e97ObPaCTUhEqpIQmJJO1sBL1q2TdaBjP06RQzKqbjOe/Tbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710806514; 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=aGamEHO+dRyjPZYSM5tO7Nvz9KTmqxZVdJbhOc0mgCI=; b=t4m4hU+G9apZslR6UEkKFfnlaiI0wsJtRHmC2VcVuFD3fCd5EV1w5vnoSqq61jDA66yK5b +2IebAerqzMfvReMtfX2ZOSSEHWrZFwiwiJdb8akArWzZQVowE1ncUaHwKB8t5kqx+tper 4yNRUr12PBQiLYMLqWY/hRfzzEsqkw9U+XHbmpTVHCE7LRe3cLlqPfYUhVlyfOWNk5uHYM YF4OKlzEsLdQG7Q9Sp13Hhes1njZ/1k+uQ4vSCSS93Ejbmx0VNkZdJs/1538tto3e1ieWe iYozi3iRW/ovvJSYRI5exBUoW4WwJmQb/w84UMruqtzMKkJvaIPP+xuOO26jLQ== 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 4TzBjG2tFTzl50; Tue, 19 Mar 2024 00:01: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 42J01s3u030092; Tue, 19 Mar 2024 00:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J01sAG030089; Tue, 19 Mar 2024 00:01:54 GMT (envelope-from git) Date: Tue, 19 Mar 2024 00:01:54 GMT Message-Id: <202403190001.42J01sAG030089@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: 785600d0fb13 - main - kldxref: Properly handle reading strings near the end of an ELF file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 785600d0fb13d6f0b4595bf4dbbc048113dda71d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=785600d0fb13d6f0b4595bf4dbbc048113dda71d commit 785600d0fb13d6f0b4595bf4dbbc048113dda71d Author: John Baldwin AuthorDate: 2024-03-19 00:01:23 +0000 Commit: John Baldwin CommitDate: 2024-03-19 00:01:23 +0000 kldxref: Properly handle reading strings near the end of an ELF file If a string is at or near the end of an input file and the amount of remaining data in the file is smaller than the maximum string size, the pread(2) system call would return a short read which is treated as an error. Instead, add a new helper function for reading a string which permits short reads so long as the data read from the file contains a terminated string. Reported by: jrtc27 Reviewed by: jrtc27 Sponsored by: University of Cambridge, Google, Inc. Differential Revision: https://reviews.freebsd.org/D44419 --- usr.sbin/kldxref/ef.c | 9 +-------- usr.sbin/kldxref/ef.h | 4 ++++ usr.sbin/kldxref/ef_obj.c | 9 +-------- usr.sbin/kldxref/elf.c | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c index 1ef27f2bc54a..77ddada946f2 100644 --- a/usr.sbin/kldxref/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -549,7 +549,6 @@ static int ef_seg_read_string(elf_file_t ef, GElf_Addr address, size_t len, char *dest) { GElf_Off ofs; - int error; ofs = ef_get_offset(ef, address); if (ofs == 0) { @@ -559,13 +558,7 @@ ef_seg_read_string(elf_file_t ef, GElf_Addr address, size_t len, char *dest) return (EFAULT); } - error = elf_read_raw_data(ef->ef_efile, ofs, dest, len); - if (error != 0) - return (error); - if (strnlen(dest, len) == len) - return (EFAULT); - - return (0); + return (elf_read_raw_string(ef->ef_efile, ofs, dest, len)); } int diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h index 25dc5216b169..9d3dc1b1b435 100644 --- a/usr.sbin/kldxref/ef.h +++ b/usr.sbin/kldxref/ef.h @@ -189,6 +189,10 @@ int elf_read_raw_data(struct elf_file *efile, off_t offset, void *dst, int elf_read_raw_data_alloc(struct elf_file *efile, off_t offset, size_t len, void **out); +/* Reads a single string at the given offset from an ELF file. */ +int elf_read_raw_string(struct elf_file *efile, off_t offset, char *dst, + size_t len); + /* * Read relocated data from an ELF file and return it in a * dynamically-allocated buffer. Note that no translation diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c index 1274a14c10af..ac83137cd394 100644 --- a/usr.sbin/kldxref/ef_obj.c +++ b/usr.sbin/kldxref/ef_obj.c @@ -248,7 +248,6 @@ static int ef_obj_seg_read_string(elf_file_t ef, GElf_Addr address, size_t len, char *dest) { GElf_Off ofs; - int error; ofs = ef_obj_get_offset(ef, address); if (ofs == 0) { @@ -258,13 +257,7 @@ ef_obj_seg_read_string(elf_file_t ef, GElf_Addr address, size_t len, char *dest) return (EFAULT); } - error = elf_read_raw_data(ef->ef_efile, ofs, dest, len); - if (error != 0) - return (error); - if (strnlen(dest, len) == len) - return (EFAULT); - - return (0); + return (elf_read_raw_string(ef->ef_efile, ofs, dest, len)); } int diff --git a/usr.sbin/kldxref/elf.c b/usr.sbin/kldxref/elf.c index e5fe90169d2c..a93cf996ccc7 100644 --- a/usr.sbin/kldxref/elf.c +++ b/usr.sbin/kldxref/elf.c @@ -197,6 +197,24 @@ elf_read_raw_data_alloc(struct elf_file *efile, off_t offset, size_t len, return (0); } +int +elf_read_raw_string(struct elf_file *efile, off_t offset, char *dst, size_t len) +{ + ssize_t nread; + + nread = pread(efile->ef_fd, dst, len, offset); + if (nread == -1) + return (errno); + if (nread == 0) + return (EIO); + + /* A short read is ok so long as the data contains a terminator. */ + if (strnlen(dst, nread) == nread) + return (EFAULT); + + return (0); +} + int elf_read_data(struct elf_file *efile, Elf_Type type, off_t offset, size_t len, void **out) From nobody Tue Mar 19 00:05:31 2024 X-Original-To: dev-commits-src-all@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 4TzBnR6Lp8z5FJFc for ; Tue, 19 Mar 2024 00:05: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 4TzBnR4h0Kz4l78; Tue, 19 Mar 2024 00:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710806731; 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=O+8uCdpZ7eDugK23znOBmZlZqJ4auan3jB+3iPBScag=; b=EKNx1B8Wybcb5EwTP86MjQ+011UWYP9KvOvA2mUd8ZNwxY53wKMMuSv44rokei0uaLl3xC hr1B7+4Z2dmXtHBWaPCWQ8/vGqH+U+Xh32haOIvNa9BHytyFQzg2H8AyzZ1hEDy/rWjoqS DZJHCKdmcocHGH2r+4mMNJuKERYHnNG+DUWR1VaxTkkI/QTbIzZi0dynCtEczTmLKWBkWx Q0iK+pC/EvAkZXsOQaxJIo3a7Jm1o1ozgTZdoF1Ogxau12sqogCksHsdMTnlM0f6dr/h0e bFfiBucDfa5tJlFFjtB9l0El+VokA1pXmqI+vTQiQjQzNukidlGzRq7INY18RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710806731; a=rsa-sha256; cv=none; b=iKR+uAlSjQYe2igGl648EW91bZCD1cgVYYCMew9S2ejpOuZbP64h7L+A6u2kTNSJhaVQ/e DKxvt1D32MDbFolArKN9DuaKStT/ilodfLGL+H/j8fKOhgf5cLjp2NcccOvNbwhO+nbwkx 8i/RasN7rjfJ/Bfb0bxKXqTLNZQKdp/aRWHjzU/L+fWS+pWKlNE2v7GJEWxKreYjg91fNN 1+zqAX1/k2vXIyvgd+fUfFr088tRfUxnSwYj3KVlXb9Q/iKsLBklXS5qQpbAMqWNv2bZq4 jnBf6G8XZvmkKV5USZSpX1Uz+cYkhZ5vA7GBpNB+fbjRQoHFkIsROAfH3lCoYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710806731; 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=O+8uCdpZ7eDugK23znOBmZlZqJ4auan3jB+3iPBScag=; b=klqntqlVMFsw0AdMbKXpGnamCkKEy7GF2vP1q5i8zcKT/llIn0m3aR3lLVjQHiUb3nbaIU h0uA6S6lbuDfrLOsUjQ23nv6Ug2KgCOnzrxh+tWxebr0OnqP8fH61RBgavbZogcry7f9/D bHfgz9PwqvKgBfEQ8CpKGb1EHxKUps8bO2M4GiFIqmI8nyfzzhWIy/2ntXLegxOI7DsYUH wctbXfH4TYtnaQC6vwz41zIrNfP21tXAg7HZDcp/tvyRLZRcctZm+GEfologCd8UvNXE04 gnm5tvxwWjnw0F0qiAS8UgQgi46bsD9bdDYOT0XZjFmqe/nXkARQ/nFVrYhbeQ== 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 4TzBnR4JQzzlDP; Tue, 19 Mar 2024 00:05: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 42J05V2i031659; Tue, 19 Mar 2024 00:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J05VtE031656; Tue, 19 Mar 2024 00:05:31 GMT (envelope-from git) Date: Tue, 19 Mar 2024 00:05:31 GMT Message-Id: <202403190005.42J05VtE031656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 5500b398e794 - internal/admin - Reactivate lstewart's commit bit per request List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/internal/admin X-Git-Reftype: branch X-Git-Commit: 5500b398e794d8ed2efe96ac0874d791b7f1fe8c Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5500b398e794d8ed2efe96ac0874d791b7f1fe8c commit 5500b398e794d8ed2efe96ac0874d791b7f1fe8c Author: John Baldwin AuthorDate: 2024-03-19 00:04:49 +0000 Commit: John Baldwin CommitDate: 2024-03-19 00:04:49 +0000 Reactivate lstewart's commit bit per request Approved by: core --- access | 1 + 1 file changed, 1 insertion(+) diff --git a/access b/access index 97f3fc78a1b7..76577f8c60dc 100644 --- a/access +++ b/access @@ -94,6 +94,7 @@ kevlo khng kib kp +lstewart luporl lwhsu manu From nobody Tue Mar 19 02:59:47 2024 X-Original-To: dev-commits-src-all@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 4TzGfW4xYLz5FYyF; Tue, 19 Mar 2024 02:59:47 +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 4TzGfW2mYzz55Yk; Tue, 19 Mar 2024 02:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710817187; 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=Vp36pGNOteaa1PXYpk2w4WcZBRLepKJAxrW0Q5kSPwI=; b=o2+dFVPv6RyUS63/NNveXRN2Q1c7Ltog8rVHVEPsqGbfsbXqByxHfzkXIG6ozRdxeiuEVz X9a9G8N6d1iOUJrnrx+Syb1NGfFzyo8r1SRbBhOlgWGmFrHCoJWUcQhBBdiUnmYfvlyW+j lpFaDVUzo6H7BmMz9bH2X32emkm+CZMPb/wcmLApcBcTwEnyrQEb+jupo/JJ2mZomu9Nun rcBzLVd09yKger/z/ZX1+54wm/URifQKYewSRPucP8Z9BG7UXnoA4gjveXicrfW4W41/81 ttcHvmNhzoB8x6/ljK9EODXD4Sm69CTPZE4YtlXlCQFPwUWoN9fiNUDQascNNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710817187; a=rsa-sha256; cv=none; b=vgK7rIDqItUPRtIbVL+E8NUTOCVKCP0m7LjxZIIUhCWxVgfCnCW+oLaA1qFdOm+UaHLCMZ +K42kxSgprsP8QY3IbZZOWoh2oS8gMD+QMFsqCTm41EL1SwNhzMPBQsXt+pKgN11r4uykK WEkBzDsZJhU1v6pUzNPqllLNJatyMGOexnzmpb69FvNbAtiptxw3xlmV9yJHpLKfu48Q6G FCkt3bigOj1S+nlgOSgdQOc1qSxkLZpwKyDK428C+HmSAMEIhzpsCDv6CTSnJf3oi8FKy5 5VzrK9wDcK+Z/JJ7rGdAVeVqe50P2pv/sSVTQZf+6MgH7RJqUa/VwP+PNtC/Ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710817187; 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=Vp36pGNOteaa1PXYpk2w4WcZBRLepKJAxrW0Q5kSPwI=; b=BCWFoZkA9XinorgkW3W4qILQpncA5rIMSZ2zk8uDEhd0ZEr3+tld4uA+Bpfdd2h7sGqNys 9JhpEfb9Ohzid80CfN9wyC1d3ZDBiWcFsjoB3VT7ylsiQ9XO2GJy1lQIw3GOBOWvX0MmIx HENQBKxsJLYK6/WBejHT9VDOQbHrhtBa6cmHWuBIuEeU+c0/O0Y9PZvS5N9D1TBhGi1Tob TcsWHnBGacpArrlC/MZ84PoY+bVwUlFM7KmX0ON5gpbcSQoywo4XAx6GPu0namZaS2VPW4 rWvBO1IAPbPYRwnsyGDLICBA3JDEp1SZAJX1gJerdlOjZdxIVs8zwE0tC4uc4g== 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 4TzGfW2FlJzphC; Tue, 19 Mar 2024 02:59:47 +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 42J2xlvt018297; Tue, 19 Mar 2024 02:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J2xljF018294; Tue, 19 Mar 2024 02:59:47 GMT (envelope-from git) Date: Tue, 19 Mar 2024 02:59:47 GMT Message-Id: <202403190259.42J2xljF018294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6561c0eceb9a - main - diff: Improve history section. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 6561c0eceb9a504f8b755e991bc5e6ac0c803007 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6561c0eceb9a504f8b755e991bc5e6ac0c803007 commit 6561c0eceb9a504f8b755e991bc5e6ac0c803007 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-19 02:59:00 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-19 02:59:00 +0000 diff: Improve history section. Reviewed by: gbe Differential Revision: https://reviews.freebsd.org/D44409 --- usr.bin/diff/diff.1 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1 index 29ee32cb8d2b..1df2d5f8081f 100644 --- a/usr.bin/diff/diff.1 +++ b/usr.bin/diff/diff.1 @@ -750,10 +750,12 @@ command appeared in .At v6 . The .Nm -implimentation in -.Fx 1.0 -until -.Fx 11.4 -was GNU diff. This was replaced in +implementation used in +.Fx +was GNU diff until +.Fx 11.4 . +This was replaced in .Fx 12.0 -by a BSD licensed diff implimentation. Some GNU'isms were lost in process. +by a BSD-licensed implementation written by +.An Todd Miller . +Some GNUisms were lost in the process. From nobody Tue Mar 19 06:51:57 2024 X-Original-To: dev-commits-src-all@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 4TzMpP4qFbz5Dgjr; Tue, 19 Mar 2024 06: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 4TzMpP4Nwlz49sZ; Tue, 19 Mar 2024 06: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=1710831117; 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=V6NGNsJJExa3FI5NY2r80MAsnyTswA1xIuZS3UonBeg=; b=QD3LQp/2R5c7JagM0X57zg6E9habiEj/k7nUSxvOC/03HCMlhJDMTjcza/l9yRHJvrkEbv CKGfisinYSuBelhAd2e7MyBn6ZgVe5Kl1VH3q5Fmok4lETDMjaGQLrXZmB2q/Kd8mShn1Y BQs7ZkJcFUY+Q4PlIjvCCZ9o/tFVOaVVUKgKcCa1NeolKvbj3pvIKyo51BroVQxSZdThqg dWsG6BhPE94d7INwFrhcTbtf9N8azzQeqlw9BDiXU/gh54C77y4A80Xafkgt1rMnXvPI4r NS4c7Te0EBvIcvUUwts3yK/jISsL28qWdawONggPFmY7IhHPND9DfRCwEt1EuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831117; a=rsa-sha256; cv=none; b=rUDX1SN4enrqPPKQ4X05jrll4aOKR0uLO1ZZoWBykxpDkc+fz/Sjmp8mZrhKq53diXLRAB PMZ1R3q55ZBmeAuevSpQ92pXLZ6i78v3FjdvJz5q/dNwCfmre+CouX4k/UYaNuGldyzr31 ApWMMHUYHiiqCygM+pmXeL6OGYM4ciY5lcHoRgkUzmaQsGoK+F1WasornyZ4cuD7q1sbIA k2ZjqAsPO+V/PLM+Up/BXGT2/oCDvfZnN9QIWxfViNZwUXxoYaryhjpTdbpKinDLkDRR05 zbMIvDY+P+oYT44pH1bUul3W4TKpAO5Qm2xOGzaAhkewMqJdZPzDT8xAsUacww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831117; 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=V6NGNsJJExa3FI5NY2r80MAsnyTswA1xIuZS3UonBeg=; b=jRjq0bmwPT5spQZQqqAWhf2A9UFRCAzabWBqQgT/hZay9CVwmsJMZQSKpAKh7i94QbhYmp TBcZxSO7ZVAjGADg5WqbY0ofDNcqBlCp7joO2kVxXF8f2cVwfWu7BDEVkLRAVvhEYf3zvl kPWEYwWeaaFB9GJjPcw+9APt7i5ONHGSOpLZugrKwoXEfxTJ0c5WnFBhIriYW8z51bIFEo vj1GiEeyTBlkhIQLmnDW7/CGe2ZvYlSdhbgWOoqGfEIfeDH+NCy2AHtVpj4I+SdBTq3mGm jPIqsTY7qpXcF0WwdxDRm8yiKcRe/SHHcn7PVrtsAtBasWz8TdVmVOrdoNFtYg== 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 4TzMpP3j4Rzx9F; Tue, 19 Mar 2024 06: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 42J6pvP8022210; Tue, 19 Mar 2024 06: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 42J6pvHi022207; Tue, 19 Mar 2024 06:51:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:51:57 GMT Message-Id: <202403190651.42J6pvHi022207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c7f1512739c7 - stable/14 - MFC: mkimg(1): process non-seekable output gracefully List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c7f1512739c729cd82042cf229a3ab7c56920b70 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f1512739c729cd82042cf229a3ab7c56920b70 commit c7f1512739c729cd82042cf229a3ab7c56920b70 Author: Eugene Grosbein AuthorDate: 2024-03-12 15:55:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:51:13 +0000 MFC: mkimg(1): process non-seekable output gracefully mkimg may make severe load only to fail in the end if output is non-seekable pipe, socket or FIFO unless output format is raw disk image. Check it out and fail early. Make it clear in the manual. (cherry picked from commit 7f0dc6e2cdfa0317c9917dd46e9da9d3897a8fbb) --- usr.bin/mkimg/mkimg.1 | 3 ++- usr.bin/mkimg/mkimg.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 28ed0ca03ccf..333b8b8a5ecb 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 28, 2024 +.Dd March 12, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -64,6 +64,7 @@ The image file is a raw disk image by default, but the format of the image file can be specified with the .Ar format argument. +Most formats require seekable output, except of raw disk image. .Pp The disk image can be made bootable by specifying the scheme-specific boot block contents with the diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index bcf500cd675f..f3bb9cb05708 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -556,6 +556,7 @@ mkimg(void) int main(int argc, char *argv[]) { + const char *format_name; int bcfd, outfd; int c, error; @@ -700,6 +701,7 @@ main(int argc, char *argv[]) errc(EX_DATAERR, error, "boot code"); } + format_name = format_selected()->name; if (verbose) { fprintf(stderr, "Logical sector size: %u\n", secsz); fprintf(stderr, "Physical block size: %u\n", blksz); @@ -710,10 +712,20 @@ main(int argc, char *argv[]) fprintf(stderr, "Partitioning scheme: %s\n", scheme_selected()->name); fprintf(stderr, "Output file format: %s\n", - format_selected()->name); + format_name); fputc('\n', stderr); } +#if defined(SPARSE_WRITE) + /* + * sparse_write() fails if output is not seekable so fail early + * not wasting some load unless output format is raw + */ + if (strcmp("raw", format_name) && + lseek(outfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) + errx(EX_USAGE, "%s: output must be seekable", format_name); +#endif + error = image_init(); if (error) errc(EX_OSERR, error, "cannot initialize"); From nobody Tue Mar 19 06:53:09 2024 X-Original-To: dev-commits-src-all@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 4TzMqn50pxz5Dh0F; Tue, 19 Mar 2024 06:53: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 4TzMqn4VJDz4Bq0; Tue, 19 Mar 2024 06:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831189; 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=ivHNyxflLr+zUunaiJQ3XpPnXqrhhqEBpjXVMN4AHBc=; b=FRHrgAH0TEKW8DdnNyJzsI9cYmUvk4YMy6ZG2LCpazA+m77uwBKZ4+JmPAmJzZwzi+BTOM YXC+eUnnocUld5oeT7dFyxvuvGD++QwT9oxyufkFec3AHlmjIirMwtyo4IgKL6QRG/yNNB YjUVSqMyIIlB/uEDBOX0dPNtgwx8fwRRFPSKQ1WQu9ddAcekXeRluB5RnJouSqq5lipSUK 1CMJ7151hCHLZHND0d9BivAjg7eViwZeLnXAaA9Nz6hsVL5sSW+RR1w+3qp4hdpmL6ZFge 5U0ulnRZ5kmw3HywbpEeX6i5HFIeddog2h5R99SYPzXC9h4sxFn9W4eB5lDbFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831189; a=rsa-sha256; cv=none; b=qhR8CUPeIqqUGsXTEyiivFGDYj+H8AsMwOm/H4SrXjA3NrNDszdLbYJcQ3PscmkSyvyI3E g51fLJ6nKRQkueQ+9Ay7zWkIucvPKUzIVehbV1NXBFn/HTMeaYOubEIIAGDksDFBZFSgd5 e4d3Ujxz2469MsJ9ZsR0+I34+3tSG+8msItwqrbzkFs2UVqfJvtABuA29Ho2Bss1aTfCTC QoogrEpEey0cDtnMgKcwLgtrn9+lklfrg3x4YD4m9Ev1IA6O6PEmlBcTWJqEFhLKWhNjcK Lst2ej1W2DY6OjjXhZDwBbTobHEy+O62jwzLIUfmQ0pecqEhRv8espS8pir1QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831189; 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=ivHNyxflLr+zUunaiJQ3XpPnXqrhhqEBpjXVMN4AHBc=; b=g84858prt2eAA9rNS6dI/mH/T51L7W5XfUCQE25+vNn+oS1mtIcPfWdiBGP+HMMvDSyVhu E3QdVb/gzplhNics1ggqVv5NQ58X0WgiiX26Z+XSzUhS9p8oPE3kpDQrHm4QxwPmiSUai/ yI0nE5wqsVCaDMetiRBFYoo/3/qPYPFssIZiMFXmXtMHBuetVsdGo/UYshlJkaYMk7Pq01 vjkED8/aj6QOhrqt3OuvP0uV5+Gfh3f9xUuqKC8iTbIaRkde2Hu2cMX4fbW1GNiU/gdKTQ kdjmXnobdcjGaywXkTfYw1zB//GUwx6EEjwi2sHha55H4eFHwHl9JioNBlNc5A== 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 4TzMqn45s3zxf0; Tue, 19 Mar 2024 06:53: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 42J6r9Ob023433; Tue, 19 Mar 2024 06:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6r9FR023430; Tue, 19 Mar 2024 06:53:09 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:53:09 GMT Message-Id: <202403190653.42J6r9FR023430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 229bdf30930b - stable/13 - mkimg(1): MFC: process non-seekable output gracefully List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 229bdf30930b543d31b593c22e0c3d2b061cc5e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=229bdf30930b543d31b593c22e0c3d2b061cc5e2 commit 229bdf30930b543d31b593c22e0c3d2b061cc5e2 Author: Eugene Grosbein AuthorDate: 2024-03-12 15:55:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:53:05 +0000 mkimg(1): MFC: process non-seekable output gracefully mkimg may make severe load only to fail in the end if output is non-seekable pipe, socket or FIFO unless output format is raw disk image. Check it out and fail early. Make it clear in the manual. (cherry picked from commit 7f0dc6e2cdfa0317c9917dd46e9da9d3897a8fbb) --- usr.bin/mkimg/mkimg.1 | 3 ++- usr.bin/mkimg/mkimg.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1 index 28ed0ca03ccf..333b8b8a5ecb 100644 --- a/usr.bin/mkimg/mkimg.1 +++ b/usr.bin/mkimg/mkimg.1 @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 28, 2024 +.Dd March 12, 2024 .Dt MKIMG 1 .Os .Sh NAME @@ -64,6 +64,7 @@ The image file is a raw disk image by default, but the format of the image file can be specified with the .Ar format argument. +Most formats require seekable output, except of raw disk image. .Pp The disk image can be made bootable by specifying the scheme-specific boot block contents with the diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index bcf500cd675f..f3bb9cb05708 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -556,6 +556,7 @@ mkimg(void) int main(int argc, char *argv[]) { + const char *format_name; int bcfd, outfd; int c, error; @@ -700,6 +701,7 @@ main(int argc, char *argv[]) errc(EX_DATAERR, error, "boot code"); } + format_name = format_selected()->name; if (verbose) { fprintf(stderr, "Logical sector size: %u\n", secsz); fprintf(stderr, "Physical block size: %u\n", blksz); @@ -710,10 +712,20 @@ main(int argc, char *argv[]) fprintf(stderr, "Partitioning scheme: %s\n", scheme_selected()->name); fprintf(stderr, "Output file format: %s\n", - format_selected()->name); + format_name); fputc('\n', stderr); } +#if defined(SPARSE_WRITE) + /* + * sparse_write() fails if output is not seekable so fail early + * not wasting some load unless output format is raw + */ + if (strcmp("raw", format_name) && + lseek(outfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) + errx(EX_USAGE, "%s: output must be seekable", format_name); +#endif + error = image_init(); if (error) errc(EX_OSERR, error, "cannot initialize"); From nobody Tue Mar 19 06:55:37 2024 X-Original-To: dev-commits-src-all@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 4TzMtf182cz5Dh8l; Tue, 19 Mar 2024 06:55: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 4TzMtf0dbpz4DVD; Tue, 19 Mar 2024 06:55:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831338; 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=Je0Id6lOrvGyDgiiZRFwPRkD5Ut1H9XZ2AqMAtCAoK0=; b=bDi725sIZdbrOWs3mhaUBU/l425HP0dZEziUmKPNXuio4D2iHW8ThkDggPBk0daqe/Y9KE shfPHmtNw3nSF000tCnjXpgsUWIfixyKrqWTDk7dPPLxXDBmYES6LEiZ551bgjOKtQ5Ny6 YhZwNgO9q1wVsZl2QzwOlzxvDQndRPq2OQaJBlH+Oz2c6ee/lFsJwrEx9AQ151uYkTLY0a szjnCgTHbariZfLN+r+7YTDmu5xMIqBfi9FQndMeia7O3jEOPaSzOYNlb8DfM4s7vZfoc2 DpWX+JtB7sRo2zv6ltY70K4lk7jTvlhGLmcJRiolFdJXCj4UiihYxq62PxDegw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831338; a=rsa-sha256; cv=none; b=h6tmS6lUmgibP7XgIG/glpOkAAQ6MWVnXz4v0nF01buyLOhEtlqXZ5maroe5aCqx6+uT61 MMB9SH3C3vs5jLRf7He7/dcEQZNaqN5B3aVDQqEIcm0d+uvKTeZ5e4O2APBMoatJN8LDfc 5Z1uWbN0NPgbjWqPLFrGmW+cVrAj2SkP0bp6YNlBLgYrxClyDIkXl3cM51Q6vV+Vk/0QYM QkkvetuogBPrkfm0WePp4amIj8ekDm08meVHvMAMuqrsH95mJFIYubVyrnf5aKEgOGhECr cBG3CEPYK3yICEZneHPiE3Ahz4Amyd8DZkRlq107eZ/QCHCh+jCuouBPuFKJ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831338; 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=Je0Id6lOrvGyDgiiZRFwPRkD5Ut1H9XZ2AqMAtCAoK0=; b=rTOEjxh0t07Q7qSbBkIYaUHbX1jJeG61HFZwZtV+uln5b4ti2GeOO5qff2tCEvKuyUunET MHvdzISJ/CvU0orjB0sQ3eNwnCCkUvbyOYM+Yhn9wyYEHWo3mO2mVbHUMrKWL2QVq7yJ2n lS52itMrbOWnOZNsL06WkLj9q7Y9E4MR48hlOTePnoxxtyw7z5tw7f4b9gyENtMCEZ2T7I 4vF5dRMa+vLKla9AXEUEHxtFg7+/JgDKN46NqfIHA6JkgZJNN12enl/DTY+zEM69TLusVT GJuKCR8YaUPg50L6QG686j5CAkyc0esQOog6aSKYHz0+LwcFj6GVHWyjDyHimw== 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 4TzMtd6vhVzx9Q; Tue, 19 Mar 2024 06:55: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 42J6tbj1023968; Tue, 19 Mar 2024 06:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6tbH4023965; Tue, 19 Mar 2024 06:55:37 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:55:37 GMT Message-Id: <202403190655.42J6tbH4023965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 947d9b023137 - stable/14 - MFC: diskinfo(8): introduce new option -l List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 947d9b023137c18d9982509a6575310ea99b2b70 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=947d9b023137c18d9982509a6575310ea99b2b70 commit 947d9b023137c18d9982509a6575310ea99b2b70 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:54:18 +0000 MFC: diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? (cherry picked from commit e333110d1de748e50051d1305b5438d1bc54eeb4) --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 4cc4517a1f26..f091d0ccfbea 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath); From nobody Tue Mar 19 06:57:27 2024 X-Original-To: dev-commits-src-all@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 4TzMwl6k16z5DhFR; Tue, 19 Mar 2024 06:57: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 4TzMwl6CFZz4Dk5; Tue, 19 Mar 2024 06:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831447; 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=bqe7eUATJ/GaDqrnO8VAN64YgG318iu0JKBKxTdS0nY=; b=Nl5abUzr2aoZy+JlqLd8nmv7AqzHqhvT7wOWUHMZnCm25cI9ghlL/29YijKHaQUqHVATzx r6pYGQhze8RGJpOBDl/xlj2hqu8l/82yfsrdfX2YyRqL+iOIY88WlbyDxzalR3Ef49X5L5 P6EZMtBayS/5TJBZcJpqOR/qG22j7EsF/QSyJSr9X/+ZCZZkoxhYMXx2TZ2fcEt7JK+9kZ OSQsjGSw+SaCBAmLM6IZ6KZzaBW8MKhnlCWR4VhjHQlRbp1vov1yz+4oAEjE5w73BN7gxD DtuGhYUrNE8/v/m+8l2suv28qQEjHatUGnHpjVTTDBuj1doIwf6EJlOo0gJhQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831447; a=rsa-sha256; cv=none; b=AyKzVv3e1kbmqG7s3/vPu2P1+B1m4jCmiHm/3Fats3ZstwtazNq9eHF1nc19P7dGI6Hg2i 3GldgLiQqb0INdOn7/tzWirsYmpzIk47j4usBZ4qd9b4RtxL17zosoFwAzVOeMeYAP4vCh tCKyo+NA6rmbJw2Y+60+SRtG+fCk2TZaJvhNW9nfRLI28jCBoLloCwkMDxcBG+mSI0G7GD F8nq3h2yuWnaKROIZjbYre2D2zt3atLE8/yrw7o0S2Ij77PuUwLZLDxb9ASkbqm22fQysg nTDLk7MHZE/2TsVkit5mUh78CAIPUvZwPqLXQHKdeuV4bfb1u6Ys0PD9J8sM7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831447; 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=bqe7eUATJ/GaDqrnO8VAN64YgG318iu0JKBKxTdS0nY=; b=ZP1D0Y2ruyg+plbzHdmU1vtD9xDTESy+xrrW3+PiPCi51D/xmtBY3qWTP5nWKTaL+gGUv4 aY/7bwWCWDXQMa5jXjCSzBZUEeOexddeu38v3F5Cx1FsLGUdnVYxVzJO3Vvjn+waksuk0s 1cjUZmN9yhApbGSSO52s35kO/IDrwDjkPvfChDkCgJSGBcbrlBvMkuXA9gAL6bgHK7I64B 8bqZOzv1eWZVJOUWBxHaroxJdP5eXMxZxs6KfI4TZEjCusY9iCwVqCpIzafK8JADIYHmi/ LgQlkBgatBIoiLNx33IwFh1FbDDbfDTtVEiBj79x/trdF1UlI8Uf6bRPTPoLRg== 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 4TzMwl5l2Tzx9S; Tue, 19 Mar 2024 06:57: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 42J6vR7A024313; Tue, 19 Mar 2024 06:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6vRXD024310; Tue, 19 Mar 2024 06:57:27 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:57:27 GMT Message-Id: <202403190657.42J6vRXD024310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 9fd628361bd8 - stable/13 - diskinfo(8): introduce new option -l List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fd628361bd86a6bf59166d433646ea1e7831949 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9fd628361bd86a6bf59166d433646ea1e7831949 commit 9fd628361bd86a6bf59166d433646ea1e7831949 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-19 06:56:45 +0000 diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? (cherry picked from commit e333110d1de748e50051d1305b5438d1bc54eeb4) --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 42227d793e99..0f62817ef1cb 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath); From nobody Tue Mar 19 06:58:57 2024 X-Original-To: dev-commits-src-all@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 4TzMyT6fylz5DhNN; Tue, 19 Mar 2024 06:58: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 4TzMyT6Q6Rz4Dp3; Tue, 19 Mar 2024 06:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831537; 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=H9a6h89XLVr3NUeQz2Ax932zL4AC6Sv21In00D64fos=; b=f3cf+gsAflfmwtkot5ImZMHxqTyICgsAGgT2NlA4YRaXSNwNXTmbBXixreJAuTCt/Wx6Dc 80beKoOEY0WyVPWSPqA2M/uK5rZ7cjrR008mQWoknzmAj/2V9lr34kj0M1fVBScpBNnAB6 lA3PARgBa6/p5uxAW/ou+5l3dnZ9iGlZDLo9RY+0brIzPVGvvq5GD1aFsuwaw1UAPYgYyK Ub2SgcbpvgxG0C39ROmwHlStJS+qzNgK8cGDYO+6gdqNvnJcdiidyCaMwfJjVyTnZDSIz8 5SEIAPaHOiB8rs9LkjYsmyAQfaPLDrdRyeTHrFJ1gJbAl6LVnPJfUc3h91E8PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710831537; a=rsa-sha256; cv=none; b=orSiFFoAxKbCUB7nD08Jhderd0Wk/2QvKhGUOvVGGnXJpzcfYUjATblqZsLLTdp9ZJmpV6 H8MbZpmBJ2TyuTkF69b5GJIG9x+TOLCDqKq1YZBqTPvYaa1ntnnPC7/qP1GVvlHr3ALyFE OIfmo0jqXrH55ocEKL3z/rcVJppCMUujMCykSaaEpJQyF2OdsMSwVbB8cE0+JRCH92xKM8 56kW2lvs8uNZnEPGo+HIIiTUVMGIordiMYp9rSiFxdcFtF5PAksxLihd+UsPWb9xrpLIyC be2QJklVY879v7ARhuh5utScCIZMHYvy0K6z0K1rVdor++6WpNPok4c2V3tFGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710831537; 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=H9a6h89XLVr3NUeQz2Ax932zL4AC6Sv21In00D64fos=; b=A4CuAurhFGSNz6w1ZH2jkn4m6eFgIA8E7fbWaJq8AmEbHvrYTcHLvyEyVmSvl3wXAhXDPw FgDfiaV5iCZDRNiYJTB6bpYR7bBpXh9oGK1nyCoh2lvZBMOEyHFeZRCcOB7ZnoEpuN/tFX meIj4YjgiAAdNBBKcS15BHc6/K0aUU5zCNx6EtUoAfImmvdd5qqaiRUTQ701PQHrpvIERD Bso7pigyJdOkHtfBmlSyLEfR9Xsw/oODiXxivZYGDo4M93gwhEdQgAkkRh0vFhlgnxGYmF S5OB8ZVveTrNLd4ttBpa8NF/9yqCmzx07nADXRAuYtrP55ldcM5nuxMBuObLrA== 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 4TzMyT5xSfzwtW; Tue, 19 Mar 2024 06:58: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 42J6wvJW024688; Tue, 19 Mar 2024 06:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42J6wvAM024685; Tue, 19 Mar 2024 06:58:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 06:58:57 GMT Message-Id: <202403190658.42J6wvAM024685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: f8e46fd61e05 - main - pkgbase: rework certctl package to only run rehash on the main package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8e46fd61e055fcc767c2038d867f58c38e43ec3 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f8e46fd61e055fcc767c2038d867f58c38e43ec3 commit f8e46fd61e055fcc767c2038d867f58c38e43ec3 Author: Baptiste Daroussin AuthorDate: 2024-01-31 12:42:16 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-19 06:58:29 +0000 pkgbase: rework certctl package to only run rehash on the main package Rework how ucl manifest are generated leveraging ucl features and flua now the ucl generation is done via a lua script which uses libucl to ingest the template and use variables as defined in its command line. the template will include only if it exist a ucl file named after the package name which will complement the template or overwrite what was defined in the template if defined in this specific ucl file this allows to overwrite license, but add script only to the packages who actually needs them. As a results the post install scripts are now only added to the right package and not also added to the subpackages like -man or -dev Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D44374 --- Makefile.inc1 | 60 +++++++++++++++++++++------------------ release/packages/certctl.ucl | 16 ----------- release/packages/clang-all.ucl | 1 + release/packages/clang.ucl | 17 ----------- release/packages/clibs.ucl | 1 + release/packages/dtb.ucl | 16 ----------- release/packages/generate-ucl.lua | 35 +++++++++++++++++++++++ release/packages/generate-ucl.sh | 36 +++++++++-------------- release/packages/jail.ucl | 18 ------------ release/packages/kernel.ucl | 18 +----------- release/packages/lld-all.ucl | 1 + release/packages/lld.ucl | 17 ----------- release/packages/lldb-all.ucl | 1 + release/packages/lldb.ucl | 17 ----------- release/packages/runtime.ucl | 26 ++++------------- release/packages/src-sys.ucl | 17 ----------- release/packages/src.ucl | 17 ----------- release/packages/ssh-all.ucl | 1 + release/packages/ssh.ucl | 17 ----------- release/packages/template.ucl | 15 +++++----- release/packages/unbound-all.ucl | 1 + release/packages/unbound.ucl | 17 ----------- release/packages/utilities.ucl | 21 ++------------ 23 files changed, 104 insertions(+), 282 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f97e53cc7f9a..003aaf513644 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2101,22 +2101,28 @@ create-source-packages: _pkgbootstrap .PHONY ( echo "@override_prefix /usr/src" ; \ ${GIT_CMD} ls-files --recurse-submodules "sys/" ) \ > ${SSTAGEDIR}/src-sys.plist - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%DESC%/FreeBSD sources/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/src.ucl \ - > ${SSTAGEDIR}/src.ucl - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%DESC%/FreeBSD Kernel sources/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/src-sys.ucl \ - > ${SSTAGEDIR}/src-sys.ucl + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "src" \ + PKGGENNAME "src" \ + VERSION "${PKG_VERSION}" \ + DESC "FreeBSD Kernel Sources" \ + COMMENT "FreeBSD Userland Sources" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${SSTAGEDIR}/src.ucl + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "src-sys" \ + PKGGENNAME "src" \ + VERSION "${PKG_VERSION}" \ + DESC "FreeBSD Kernel Sources" \ + COMMENT "FreeBSD Kernel Sources" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${SSTAGEDIR}/src-sys.ucl ${PKG_CMD} -o ABI=${PKG_ABI} \ -o OSVERSION="${SRCRELDATE}" \ create -f ${PKG_FORMAT} \ @@ -2212,17 +2218,17 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \ - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \ - -e "s/%KERNELDIR%/kernel/" \ - -e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ - -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/kernel.ucl \ - > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \ + VERSION "${PKG_VERSION}" \ + KERNELDIR "kernel" \ + COMMENT "FreeBSD ${INSTALLKERNEL} kernel ${flavor}" \ + DESC "FreeBSD ${INSTALLKERNEL} kernel ${flavor}" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ awk -F\" ' \ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ diff --git a/release/packages/certctl.ucl b/release/packages/certctl.ucl index f6dbb012ce64..664a6d139585 100644 --- a/release/packages/certctl.ucl +++ b/release/packages/certctl.ucl @@ -1,19 +1,3 @@ -# -# - -name = "%PKG_NAME_PREFIX%-%PKGNAME%" -origin = "base" -version = "%VERSION%" -comment = "%COMMENT%" -categories = [ base ] -maintainer = %PKG_MAINTAINER% -www = "%PKG_WWW%" -prefix = "/" -licenselogic = "single" -licenses = [ BSD2CLAUSE ] -desc = < ]... + +In the files the variable (in the form ${variablename} +in the ) will be expanded to . + +The undefined variables will reamin unmofifier "${variablename}" +]]-- + +local ucl = require("ucl") + +if #arg < 2 or #arg % 2 ~= 0 then + io.stderr:write(arg[0] .. ": expected an even number of arguments, got " .. #arg) + os.exit(1) +end + +local parser = ucl.parser() +for i = 2, #arg - 2, 2 do + parser:register_variable(arg[i - 1], arg[i]) +end +local res,err = parser:parse_file(arg[#arg - 1]) +if not res then + io.stderr:write(arg[0] .. ": fail to parse("..arg[#arg - 1].."): "..err) + os.exit(1) +end +local f,err = io.open(arg[#arg], "w") +if not f then + io.stderr:write(arg[0] .. ": fail to open("..arg[#arg].."): ".. err) + os.exit(1) +end +local obj = parser:get_object() +f:write(ucl.to_format(obj, 'ucl')) +f:close() diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index e5563c51a4cd..c7147a97a868 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -30,17 +30,10 @@ main() { shift $(( ${OPTIND} - 1 )) - vital="false" - case "${outname}" in bootloader) pkgdeps="" ;; - clibs) - vital="true" - # clibs should not have any dependencies or anything - # else imposed on it. - ;; certctl) pkgdeps="caroot openssl" ;; @@ -68,7 +61,6 @@ main() { runtime) outname="runtime" _descr="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESCR)" - vital="true" ;; *-lib32_dev) outname="${outname%%-lib32_dev}" @@ -111,10 +103,7 @@ main() { desc="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_DESC)" comment="$(make -C ${srctree}/release/packages -f Makefile.package -V ${outname}_COMMENT)" - uclsource="${srctree}/release/packages/${outname}.ucl" - if [ ! -e "${uclsource}" ]; then - uclsource="${srctree}/release/packages/template.ucl" - fi + uclsource="${srctree}/release/packages/template.ucl" if [ ! -z "${debug}" ]; then echo "" @@ -153,16 +142,19 @@ EOF echo '}' >> ${uclfile} fi cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )" - sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/${origname}/" \ - -e "s/%COMMENT%/${comment}/" \ - -e "s/%DESC%/${desc}/" \ - -e "s/%VITAL%/${vital}/" \ - -e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - ${uclfile} + ${srctree}/release/packages/generate-ucl.lua \ + VERSION "${PKG_VERSION}" \ + PKGNAME "${origname}" \ + PKGGENNAME "${outname}" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + COMMENT "${comment}" \ + DESC "${desc}" \ + CAP_MKDB_ENDIAN "${cap_arg}" \ + PKG_WWW "${PKG_WWW}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + UCLFILES "${srctree}/release/packages/" \ + ${uclsource} ${uclfile} + return 0 } diff --git a/release/packages/jail.ucl b/release/packages/jail.ucl deleted file mode 100644 index bc137f009db9..000000000000 --- a/release/packages/jail.ucl +++ /dev/null @@ -1,18 +0,0 @@ -# -# - -name = "%PKG_NAME_PREFIX%-%PKGNAME%" -origin = "base" -version = "%VERSION%" -comment = "%COMMENT%" -categories = [ base ] -maintainer = "%PKG_MAINTAINER%" -www = "%PKG_WWW%" -prefix = "/" -vital = %VITAL% -licenselogic = "single" -licenses = [ BSD2CLAUSE ] -desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 76229061601f - main - pkgbase: fix kernel packing after switch ucl rework List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76229061601f495d3c80fdca5914e394e71ec07a Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=76229061601f495d3c80fdca5914e394e71ec07a commit 76229061601f495d3c80fdca5914e394e71ec07a Author: Baptiste Daroussin AuthorDate: 2024-03-19 09:00:15 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-19 09:00:15 +0000 pkgbase: fix kernel packing after switch ucl rework --- Makefile.inc1 | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 003aaf513644..8bf8ad03a971 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2255,17 +2255,18 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \ - -e "s/%KERNELDIR%/kernel.${_kernel}/" \ - -e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \ - -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/kernel.ucl \ - > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "kernel-${_kernel:tl}${flavor}/" \ + PKGGENNAME "kernel" \ + VERSION "${PKG_VERSION}" \ + KERNELDIR "kernel.${_kernel}" \ + DESC "FreeBSD ${_kernel} kernel ${flavor}" \ + COMMENT "FreeBSD ${_kernel} kernel ${flavor}" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ awk -F\" ' \ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ From nobody Tue Mar 19 13:05:16 2024 X-Original-To: dev-commits-src-all@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 4TzX585Tw0z5FJ4Y; Tue, 19 Mar 2024 13:05: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 4TzX583Cn7z40Bt; Tue, 19 Mar 2024 13:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710853516; 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=7Um+054mMASRJ89Y7KzI9uFNFcvsDWIPAKja1dyGlWs=; b=tzbtalri7phAuMUHSCo5FGp0rxlbKVGOf+ZAOqnfRTiobw6yip2C/NQZWupvFQR29CzCDU XUvJlLkSWvqDajnqNDVh/0orQc8HttjoXtfnY2YjTqA8xn+qn8lqYUyRMEnoz9kcELlBVG lwiAvR75ilebMk2liEpnPbLNZ71OyZYpQ4jxS5SQfC9221dw4BpVZkbmiUdOI3d24OBk3V 5G74VxSvqIO4hBBvORdL3zv1bmboxxdVjDjAvv3WdFn7EoLSYycXzvVjvG4HAQY7H308Hk xYTm/WOQKecmq+ldMiUdUJ9ZSWNIfLTY4xf/cu6pEdus5HOIrAg7V4+Jx53lrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710853516; a=rsa-sha256; cv=none; b=hwUU/yYCW2w/aMPDIlDWWJRzzO7Nu1w7FJeGC9HDzBxQtcFIJv9xkWVAQVEotzO9R8eB7C JHU/TgQ7NKPeuOs1aZsWBdsAIVQ4AULHmsvZ+Wv/9ppznPp8wWBatOjyRysEOvOdzbQGGE MpF81aTdoudZOtOTj4Yo9SihqNqkkT7+sOZKClA2pF3ogI9/WfqxeTG9LTixFwch+Qut7J AByVg4Ql+uJc1SY7beWWjuxAs+jIskDIaCEMSZMsnfdzelfUh9KgiEAy4UGizixBK557Yh B8H1l5aAm+X/ZD3U94E7a7d1B2xil/56iWreRdkNimiHNz84nEEZ1ag37woAPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710853516; 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=7Um+054mMASRJ89Y7KzI9uFNFcvsDWIPAKja1dyGlWs=; b=K+6rmha1ZG6aF3U77b1R5ndApH/udpjOtqp94Qs9w+UpRsAM11oT8Cj6+oUasxQ5LI8bdP HG8lUrKuQxNuWtAlaWVIuQ1bwePjhVLk/eCIUWbCPouZ4xMxRHeUMKvHsHhuNm1nNymZqS m4h7ss5Cmkiw2ewF3oRTVf1HTjYJR9khh14LyGcRHxStnYNISEyKbkgKe89klXlDMRqobZ jL9hFqxGPPqJIM6ChE2H9FuaWHahyDDdzJRBYCUUg0xBDDvxRG3+zPDy2azkxuce+yglei qtwB4ZGFPdcKsf8zrMssak1V0k9z0n7RUs6iWWXx33krlb23eNAygXi14ESQrQ== 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 4TzX582qNJz17lY; Tue, 19 Mar 2024 13:05: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 42JD5GFA048591; Tue, 19 Mar 2024 13:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JD5Gig048588; Tue, 19 Mar 2024 13:05:16 GMT (envelope-from git) Date: Tue, 19 Mar 2024 13:05:16 GMT Message-Id: <202403191305.42JD5Gig048588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2addba5caf92 - main - pkgbase: fix typo preventing packaging kernels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2addba5caf92b78d5d32835e60ec28df7eb05aef Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2addba5caf92b78d5d32835e60ec28df7eb05aef commit 2addba5caf92b78d5d32835e60ec28df7eb05aef Author: Baptiste Daroussin AuthorDate: 2024-03-19 13:05:12 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-19 13:05:12 +0000 pkgbase: fix typo preventing packaging kernels --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 8bf8ad03a971..1f1418c0eadb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2256,7 +2256,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ -v kernel=yes -v _kernconf=${_kernel} ; \ ${SRCDIR}/release/packages/generate-ucl.lua \ - PKGNAME "kernel-${_kernel:tl}${flavor}/" \ + PKGNAME "kernel-${_kernel:tl}${flavor}" \ PKGGENNAME "kernel" \ VERSION "${PKG_VERSION}" \ KERNELDIR "kernel.${_kernel}" \ From nobody Tue Mar 19 14:07:57 2024 X-Original-To: dev-commits-src-all@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 4TzYTV1Qr9z5FQ3M; Tue, 19 Mar 2024 14:07: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 4TzYTV0wyVz45nk; Tue, 19 Mar 2024 14:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710857278; 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=zB95e/CfvrbFoLvfLKl+M0quBbBkdRX27bA7L7r19oU=; b=OPFyvh4Avn7JDd9/eJBzHcOs2cajZP+cQMknV+cMIVyShTH34mr/mg43kc/bmMVyDay4Hy 8Rgw2c8ULFclHsUPJ6WMujEkMR2WVkbVqrSGCWTg4RYQBEh3F7vRxjrDe+lrdU6LkLCRgW yYfOU/vudbfwkVTz//is32YO+KsYMXoJ89AiM6eAQNCYaZ++GyBxEKzABm/mVdRQyyMuy1 RrQGvLBy1vxGLZqHWQMfRZ41w1QlbPNXjR3hyaxJX1Jq44IAnWxKQR3JDFE0bFfBZiZnbA eTK9RjRcxoHRRwciW1KpSiYQbFgqDk3uLcJIKNJSsqu0z/mlC57Lx9d3gjVIrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710857278; a=rsa-sha256; cv=none; b=VL6nlmfOaHvMMZf8JOd1kL7ptEI6C09wuxGu8qtlVEB9o39rbBt9HpKIrNe63iV2Ymf4+w UlW6VC+TUYe7rrwPSarpEMgajTR6u5eKW1v7ZxIRYs+CXrzYRU/V443CoGZRSeLvKE5+Fp mTFO3LLr+rf+8ckXGXPIllq8pTUmjWBZjKxxK/Qg4ZMvYBvkiJo4vOZVikbFaDUb6XDwNJ P3G6fPGrYPWaI7U98SzPGdIQYn/ZlavGhmBAjrpqggSErJvTAL+tmU5xdukRV+u0bM+QI4 cH3vqSeD5ftan7XkmO4f65b7psfRTnBSqrRCKl7PFFwiC7s21rPhIJQcHJoU1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710857278; 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=zB95e/CfvrbFoLvfLKl+M0quBbBkdRX27bA7L7r19oU=; b=C5/C/o4kCbIGeG1AbAKLhGR40edKiPuuB0byIrJl8RK6nQ0XDSGzMgsPMK7ioMV5s9ixZS +L4gSB8LoAbYK9wESvjeXT2kY5u4IEl8Qvruk1MVrWOg1K41UZENXz1g5x1dXLLZlTF6WN sRmifXZTkwnRxNS0a7AJo/Qm55Vc6fafUn/g0QP71aVdLYvB3g3vA8trfkSLytPAX+CSIZ Eqmt/dIMz7zdRhLvxtluxQ3fXxGrvXEODaRqifF+wNKa1FuPTHAg74Xmoh3vhUoe5c+2Mt YWVn5JvMNTTra6oUOjFTjlE/e6Fngkpvq+EuFkSytvM/Df7m2QQfZjywh1yFzA== 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 4TzYTV0Xy2z192X; Tue, 19 Mar 2024 14:07: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 42JE7vr5049273; Tue, 19 Mar 2024 14:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JE7vwt049270; Tue, 19 Mar 2024 14:07:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 14:07:57 GMT Message-Id: <202403191407.42JE7vwt049270@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 02b25ccfc0b1 - main - pkgbase: fix packaging of dtb List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 commit 02b25ccfc0b13759ce04c291b6569dcfa22a9fa0 Author: Baptiste Daroussin AuthorDate: 2024-03-19 14:06:02 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-19 14:07:28 +0000 pkgbase: fix packaging of dtb --- Makefile.inc1 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1f1418c0eadb..0c9213ea5104 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2187,16 +2187,16 @@ _debug=-dbg create-dtb-package: @if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \ - sed -e "s/%VERSION%/${PKG_VERSION}/" \ - -e "s/%PKGNAME%/dtb/" \ - -e "s/%COMMENT%/FreeBSD Devicetree Blobs/" \ - -e "s/%DESC%/FreeBSD Devicetree Blobs/" \ - -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ - -e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \ - -e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \ - -e "s|%PKG_WWW%|${PKG_WWW}|" \ - ${SRCDIR}/release/packages/dtb.ucl \ - > ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ + ${SRCDIR}/release/packages/generate-ucl.lua \ + PKGNAME "dtb" \ + VERSION "${PKG_VERSION}" \ + COMMENT "FreeBSD Devicetree Blobs" \ + DESC "FreeBSD Devicetree Blobs" \ + PKG_NAME_PREFIX "${PKG_NAME_PREFIX}" \ + PKG_MAINTAINER "${PKG_MAINTAINER}" \ + PKG_WWW "${PKG_WWW}" \ + ${SRCDIR}/release/packages/template.ucl \ + ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ awk -F\" ' \ /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ From nobody Tue Mar 19 15:30:32 2024 X-Original-To: dev-commits-src-all@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 4TzbJn0MFQz5FfT5; Tue, 19 Mar 2024 15:30: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 4TzbJm5gwgz4Lv6; Tue, 19 Mar 2024 15:30:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862232; 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=6dJqDaCZFvvmXhWmrs8E5R368mUyXD/UyTgcP43bXvY=; b=TIkyfKIFfh4yiKpYpAVMTLSriQszAexB13tu0+1n4truGmI9zuXUp6fxwwf+uJ8lgqR9gc w13y1M8D+/zWfss2D7j7tXE//Sur+Dg5kzSKSbV1gfYoWr6QlRiH8J5OgJYC5X2QhRh3dm Q783Eo3cJbyEfcciEQkwS+xLbdqeuwRyg77Ut1u64Hz2Qz0AqwWGrvu4Yo1p3SmiJmcuTQ ykKZoXnYfoUnku8XYZkJnJCPCV23mutCKh2M5d5LzEd86s3HUCmjiJ4WQCod6BvAt6kC4T ox8o7zr1tztC5gz+V+YIbkNr1gKdFFVSa601mZYFJxUp5zK3nUbJri/EKSwsNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710862232; a=rsa-sha256; cv=none; b=hxgsL8mwDdva0zJEV7wvPHnkEzVdeLAbisOiYGEJMzvqaZsJdWdFkbLrtjtrv/jF1sfQk6 e7vdawEAJmMGduZHbvTWlUZd/kbWn+Leh7qBwh+IVTkzdvevt1y5O4CBZ/w1BuxfFaU9wB pJAnslJb+jmU9br9rR/4bipa1LOq5FakfmRbGD+6rwSoKs3cnZkaVwCvHQYSjmEanbXKHQ 0cmvJ9jhSx31O1vcO9xkj3fhgVONR1e5Z0nM1oBlf8JYuvBO7rTUBKWkz7DHKJJ23tg18i xrP3SSVOy9/2oJbnRVYYw055mBN7jLU5mzpXDn4rwToNFpOqMj21VMFFuJcjuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862232; 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=6dJqDaCZFvvmXhWmrs8E5R368mUyXD/UyTgcP43bXvY=; b=JMcNzcZvt+W/UU4mQhegQfuGgqbNdNfhppQjRX9tIlJgkf7W2fUMqNtuvDZXT6TDAdUiO+ aA+kk8MTDWYDfHMIBFxjCl4qLTOCACcaDIO0I+ynlFtRK+wxdHum3P2oCfidSysb9HVoxd ccRlR9NKSHREfmSRL4DUKWeLniHX5G+AiyFYiGr+yWUgs55QBlfwZziMQoSGpfGAxQndAc lQS4fXjsObeBFdvL2p21Rg3OH083LLTk3AqQUfx7hYXI2CqGLoEw0ygkdN9FtobyBSlGo0 IBI1CFMWPkA8d50oJcVQA0Dm9D8R9aMOTw/eM+g8wtUlW+alhFoBWE4mO8iSpQ== 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 4TzbJm5Hhhz1Bq4; Tue, 19 Mar 2024 15:30: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 42JFUWe4096114; Tue, 19 Mar 2024 15:30:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JFUW90096091; Tue, 19 Mar 2024 15:30:32 GMT (envelope-from git) Date: Tue, 19 Mar 2024 15:30:32 GMT Message-Id: <202403191530.42JFUW90096091@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: 0ea0c026557b - main - pf: avoid passing through dummynet multiple times List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 0ea0c026557b46292881d5a75babeb3cc0fd9696 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea0c026557b46292881d5a75babeb3cc0fd9696 commit 0ea0c026557b46292881d5a75babeb3cc0fd9696 Author: Kristof Provost AuthorDate: 2024-03-11 13:44:17 +0000 Commit: Kristof Provost CommitDate: 2024-03-19 15:29:29 +0000 pf: avoid passing through dummynet multiple times In some setups we end up with multiple states created for a single packet, which in turn can mean we run the packet through dummynet multiple times. That's not expected or intended. Mark each packet when it goes through dummynet, and do not pass packet through dummynet if they're marked as having already passed through. See also: https://redmine.pfsense.org/issues/14854 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44365 --- sys/netpfil/pf/pf.c | 4 +++ sys/netpfil/pf/pf_mtag.h | 2 +- tests/sys/netpfil/pf/route_to.sh | 53 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index b1f93f605b4f..5089b3ea2570 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7795,6 +7795,9 @@ pf_pdesc_to_dnflow(const struct pf_pdesc *pd, const struct pf_krule *r, dndir = pd->dir; } + if (pd->pf_mtag->flags & PF_MTAG_FLAG_DUMMYNETED) + return (false); + memset(dnflow, 0, sizeof(*dnflow)); if (pd->dport != NULL) @@ -7936,6 +7939,7 @@ pf_dummynet_route(struct pf_pdesc *pd, struct pf_kstate *s, if (pf_pdesc_to_dnflow(pd, r, s, &dnflow)) { pd->pf_mtag->flags |= PF_MTAG_FLAG_DUMMYNET; + pd->pf_mtag->flags |= PF_MTAG_FLAG_DUMMYNETED; ip_dn_io_ptr(m0, &dnflow); if (*m0 != NULL) { pd->pf_mtag->flags &= ~PF_MTAG_FLAG_ROUTE_TO; diff --git a/sys/netpfil/pf/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h index 5c6fb1c386f1..6ecc33c25a73 100644 --- a/sys/netpfil/pf/pf_mtag.h +++ b/sys/netpfil/pf/pf_mtag.h @@ -41,7 +41,7 @@ #define PF_MTAG_FLAG_TRANSLATE_LOCALHOST 0x04 #define PF_MTAG_FLAG_PACKET_LOOPED 0x08 #define PF_MTAG_FLAG_FASTFWD_OURS_PRESENT 0x10 -/* 0x20 unused */ +#define PF_MTAG_FLAG_DUMMYNETED 0x20 #define PF_MTAG_FLAG_DUPLICATED 0x40 #define PF_MTAG_FLAG_SYNCOOKIE_RECREATED 0x80 diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index d5d29709fe06..4df9b790359a 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -615,6 +615,58 @@ dummynet_frag_cleanup() pft_cleanup } +atf_test_case "dummynet_double" "cleanup" +dummynet_double_head() +{ + atf_set descr 'Ensure dummynet is not applied multiple times' + atf_set require.user root +} + +dummynet_double_body() +{ + pft_init + dummynet_init + + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + + ifconfig ${epair_one}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair_one}b ${epair_two}a + jexec alcatraz ifconfig ${epair_one}b 192.0.2.2/24 up + jexec alcatraz ifconfig ${epair_two}a 198.51.100.1/24 up + jexec alcatraz sysctl net.inet.ip.forwarding=1 + + vnet_mkjail singsing ${epair_two}b + jexec singsing ifconfig ${epair_two}b 198.51.100.2/24 up + jexec singsing route add default 198.51.100.1 + + route add 198.51.100.0/24 192.0.2.2 + + jexec alcatraz dnctl pipe 1 config delay 800 + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set reassemble yes" \ + "nat on ${epair_two}a from 192.0.2.0/24 -> (${epair_two}a)" \ + "pass in route-to (${epair_two}a 198.51.100.2) inet proto icmp all icmp-type echoreq dnpipe (1, 1)" \ + "pass out route-to (${epair_two}a 198.51.100.2) inet proto icmp all icmp-type echoreq" + + ping -c 1 198.51.100.2 + jexec alcatraz pfctl -sr -vv + jexec alcatraz pfctl -ss -vv + + # We expect to be delayed 1.6 seconds, so timeout of two seconds passes, but + # timeout of 1 does not. + atf_check -s exit:0 -o ignore ping -t 2 -c 1 198.51.100.2 + atf_check -s exit:2 -o ignore ping -t 1 -c 1 198.51.100.2 +} + +dummynet_double_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4" @@ -628,4 +680,5 @@ atf_init_test_cases() atf_add_test_case "ifbound_reply_to" atf_add_test_case "ifbound_reply_to_v6" atf_add_test_case "dummynet_frag" + atf_add_test_case "dummynet_double" } From nobody Tue Mar 19 15:30:33 2024 X-Original-To: dev-commits-src-all@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 4TzbJp0yLbz5FfdQ; Tue, 19 Mar 2024 15:30: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 4TzbJn6HBcz4M0x; Tue, 19 Mar 2024 15:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862233; 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=LKvXWaszGYsxWujcvPOL5Uvdv58kl3boLYMwJkJDRcA=; b=MIuOHFrn87BkQZkBhtz8XSQa9t6XQgWoGGBcTA7eKyqBDhAf9/Q/dORyIVLg9bBlxX8BFZ 994kKukam038uBrbA4ghMSQ4FotCWcOqWiH4Em3jFTw7vmCY4aGrZ43G1WWVHgqLpXRUIw WPKF4t8QLrvy0CdMKr9sa2KAbxh3ChyxGdI+rIPSJiBzdCTnW+HHPeePA/KFAGXx+o/92X Ag20a44VPqQDDiHKUlCSpeLmzzY2S7Gp1Ji830Emkxwq+pq3621Wn5sDehnPW5OVnphw5Z XCbaWQppYSchxMofL1KZJnhXTWADNVr9gyxxaGGXK4Maw8+2Qz3qCkzH8UDnuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710862233; a=rsa-sha256; cv=none; b=Qpj4dKD+XK2VnPjbBHvnJMtQsW4jtAtsqYQnY4htPkyd4YtY2nTVB/sb7/PzRVEPYqcYXF gw93qDLsFeWrHBln75VOWw6NfLqOb4lwQiQci9brHTxYhmqL9H0hGebfO5uaIl4F8xGjQe dJmByxJuMlGOu7aZU0m9AKmt+nAaoGE2D2oOvTTj+0J1u56AYUwiopl53KGk+yqaQ5vKaa RnoYznHvLdUjxuNWOX2hvD2fiNU85ufy89CARhI6KPNcitl7f9toxrf55tTsgjQCaNC6EP zQGJdQhgSEAwpOCB5Pk7tZWg6CyORGzQrN9/oUToca0Wm76uaxFOibtZf/Gwzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862233; 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=LKvXWaszGYsxWujcvPOL5Uvdv58kl3boLYMwJkJDRcA=; b=lg+Rxlau78rx+rVEMAPD6g2SkylHQkRlwdz+lRrgQA3bBcVgfT4dCyRUWLqo1GiUBvzJMe 9w1tZLYh0hXLbvCoPpzgKwEQa93mwqLlhXLfdboqirGlJowaOMGe0md9UOS76w4VMntPAq qYxgOOBft3XsiCHK8V63AcyhLOugdQ73DwmXjRR5ozw6rP2DsXghWMPtadfOkC+NjmAY1l qYcY+FxT0UUYnu+yr6HaB+yrHKkYgm9ON24rrZrfahxYV5bZZeHiYzZp2RK8lXjPQhXCmQ Wl7Ch0UHRyT/5cRCDxr36q+YW7iSkJWqa9JCwM9H4J7TQUHBU/u4zsTVihiZnA== 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 4TzbJn5tqMz1Brt; Tue, 19 Mar 2024 15:30: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 42JFUXMh096811; Tue, 19 Mar 2024 15:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JFUXdx096808; Tue, 19 Mar 2024 15:30:33 GMT (envelope-from git) Date: Tue, 19 Mar 2024 15:30:33 GMT Message-Id: <202403191530.42JFUXdx096808@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: c6f111635790 - main - pf: fix dummynet + route-to List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c6f1116357904d3c2e95430e27213e4d0948fc64 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c6f1116357904d3c2e95430e27213e4d0948fc64 commit c6f1116357904d3c2e95430e27213e4d0948fc64 Author: Kristof Provost AuthorDate: 2024-03-12 12:29:08 +0000 Commit: Kristof Provost CommitDate: 2024-03-19 15:29:29 +0000 pf: fix dummynet + route-to Ensure that we pick the correct dummynet pipe (i.e. forward vs. reverse direction) when applying route-to. We mark the processing as outbound so that dummynet will re-inject in the correct phase of processing after it's done with the packet, but that will cause us to pick the wrong pipe number. Reverse them so that the incorrect decision ends up picking the correct pipe. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44366 --- sys/netpfil/pf/pf.c | 26 ++++++++++++---- tests/sys/netpfil/pf/route_to.sh | 65 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5089b3ea2570..d7536e44623e 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7240,6 +7240,7 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, struct pf_ksrc_node *sn = NULL; int error = 0; uint16_t ip_len, ip_off; + uint16_t tmp; int r_rt, r_dir; KASSERT(m && *m && r && oifp, ("%s: invalid parameters", __func__)); @@ -7381,11 +7382,26 @@ pf_route(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, m0->m_pkthdr.csum_flags &= ~CSUM_SCTP; } - /* - * Make sure dummynet gets the correct direction, in case it needs to - * re-inject later. - */ - pd->dir = PF_OUT; + if (pd->dir == PF_IN) { + /* + * Make sure dummynet gets the correct direction, in case it needs to + * re-inject later. + */ + pd->dir = PF_OUT; + + /* + * The following processing is actually the rest of the inbound processing, even + * though we've marked it as outbound (so we don't look through dummynet) and it + * happens after the outbound processing (pf_test(PF_OUT) above). + * Swap the dummynet pipe numbers, because it's going to come to the wrong + * conclusion about what direction it's processing, and we can't fix it or it + * will re-inject incorrectly. Swapping the pipe numbers means that its incorrect + * decision will pick the right pipe, and everything will mostly work as expected. + */ + tmp = pd->act.dnrpipe; + pd->act.dnrpipe = pd->act.dnpipe; + pd->act.dnpipe = tmp; + } /* * If small enough for interface, or the interface will take diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index 4df9b790359a..44fe6786e896 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -345,7 +345,7 @@ dummynet_body() # The ping request will pass, but take 1.2 seconds # So this works: - atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 -t 2 192.0.2.1 # But this times out: atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.1 @@ -355,7 +355,7 @@ dummynet_body() # The ping request will pass, but take 1.2 seconds # So this works: - atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 -t 2 192.0.2.1 # But this times out: atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.1 } @@ -365,6 +365,66 @@ dummynet_cleanup() pft_cleanup } +atf_test_case "dummynet_in" "cleanup" +dummynet_in_head() +{ + atf_set descr 'Thest that dummynet works as expected on pass in route-to packets' + atf_set require.user root +} + +dummynet_in_body() +{ + dummynet_init + + epair_srv=$(vnet_mkepair) + epair_gw=$(vnet_mkepair) + + vnet_mkjail srv ${epair_srv}a + jexec srv ifconfig ${epair_srv}a 192.0.2.1/24 up + jexec srv route add default 192.0.2.2 + + vnet_mkjail gw ${epair_srv}b ${epair_gw}a + jexec gw ifconfig ${epair_srv}b 192.0.2.2/24 up + jexec gw ifconfig ${epair_gw}a 198.51.100.1/24 up + jexec gw sysctl net.inet.ip.forwarding=1 + + ifconfig ${epair_gw}b 198.51.100.2/24 up + route add -net 192.0.2.0/24 198.51.100.1 + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 -t 1 192.0.2.1 + + jexec gw dnctl pipe 1 config delay 1200 + pft_set_rules gw \ + "pass in route-to (${epair_srv}b 192.0.2.1) to 192.0.2.1 dnpipe 1" + jexec gw pfctl -e + + # The ping request will pass, but take 1.2 seconds + # So this works: + echo "Expect 1.2 s" + ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 -t 2 192.0.2.1 + # But this times out: + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.1 + + # return path dummynet + pft_set_rules gw \ + "pass in route-to (${epair_srv}b 192.0.2.1) to 192.0.2.1 dnpipe (0, 1)" + + # The ping request will pass, but take 1.2 seconds + # So this works: + echo "Expect 1.2 s" + ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 -t 2 192.0.2.1 + # But this times out: + atf_check -s exit:2 -o ignore ping -c 1 -t 1 192.0.2.1 +} + +dummynet_in_cleanup() +{ + pft_cleanup +} + atf_test_case "ifbound" "cleanup" ifbound_head() { @@ -675,6 +735,7 @@ atf_init_test_cases() atf_add_test_case "multiwanlocal" atf_add_test_case "icmp_nat" atf_add_test_case "dummynet" + atf_add_test_case "dummynet_in" atf_add_test_case "ifbound" atf_add_test_case "ifbound_v6" atf_add_test_case "ifbound_reply_to" From nobody Tue Mar 19 15:30:34 2024 X-Original-To: dev-commits-src-all@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 4TzbJq25M3z5FfkS; Tue, 19 Mar 2024 15:30: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 4TzbJq0RSPz4Lp6; Tue, 19 Mar 2024 15:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862235; 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=Yf+tzHUd8tRlXmBSFmBUnaUhdoEOyPexljg/qfo3m90=; b=Y3EieRxZk1bMB7v0xc4pJCwm2eNo9j6c6ef4cwi09mzBBeBEolmVqDT0zUzsX81Bkh2/JJ b6nBqX3XXpSQaYXFqTQDSepIOtUf11RsIvaQjikK/dxSWtRkQFu6FPoIuz065QTwde9QLz 4zPbEth5v1dh1kfIjSTG4UMZ4AKN4jxTmZa0cOSV60LZfMTF5IxiJLN3je1YGbHxJcn2hP mBn50B6GM737WQ9ELib+P7g4q92xvEjNGBubdST3vbP/d//1/pbXIstpfBFBNi01sCYj8a kO3H4znI7gGNCkBu/KZsat5Jqc1Y6GPgshOSZ8QEtC3sJVcJACB0DBvesIRtqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710862235; a=rsa-sha256; cv=none; b=wMktB0q6TWI4KFeZ+oMOYOzw8Ly9mX5a+EQa6KcTBgkJVC6MbnrMV6HAAbHzKdb8gFcmzm k3v/2ztRc+tQoOiZzDuMBZT2PhPLhjZFGUY0EzoSZUYJlisQpHVpEyeI5xmASxnATbJhJF 4t09aVdBFKsuVTheGnUW7begONlkaKE9Lbh0cYYmam1C7H4alfnqjVOov2ATKOvSNhgwvr XQd2JK5C5yw80IZC1diwKJqA/a0oHrs3GSJjWgnWBEf9xDPoegb8ewcSwno87tsMxWaiDI 8CYXVMwYIHfTVdJdUy9c4wRjzM15nUhJyueLMqQBGB4i8U9GMmG6dIW8A+yReg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710862235; 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=Yf+tzHUd8tRlXmBSFmBUnaUhdoEOyPexljg/qfo3m90=; b=IfhQw/0bUMMJbsB+fT0+TsHEmEw7+k2cvyBmyJ3H4ylXPclQgsbljATwwrzXsEbZSS/nts sXPYZgWhUzAZhN96O+gpZf+iEreYbsjLHmXmE5PGdJGAkZUpVbjFfZt638GIwC5YgBud+6 X+/rV3QIvIt2ctUtkJ+Br7Ep1DmKPW2LnSjL8IhRTdCLYZftAOddiyk9gOGVpN72XBxiLl 2lFAJmDcPc4s8wbtVBxNQ5ZnUmImYylfcjelkGDvC4fy+RWMJlC1AVlMBGwdVdJ9jaxhhQ t598N06yW4ciWrLc3Ny+KxkMajhV+FQ/hs01kWAoWjWc6Y7/tMxplvy/DlAhNA== 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 4TzbJp6vksz1Bq5; Tue, 19 Mar 2024 15:30: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 42JFUYxf096854; Tue, 19 Mar 2024 15:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JFUYOb096851; Tue, 19 Mar 2024 15:30:34 GMT (envelope-from git) Date: Tue, 19 Mar 2024 15:30:34 GMT Message-Id: <202403191530.42JFUYOb096851@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: 470a2b334661 - main - pf: convert DIOCSETSTATUSIF to netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 470a2b3346612fbf2f6415ec8df63c92703035dd Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=470a2b3346612fbf2f6415ec8df63c92703035dd commit 470a2b3346612fbf2f6415ec8df63c92703035dd Author: Kristof Provost AuthorDate: 2024-03-18 09:56:25 +0000 Commit: Kristof Provost CommitDate: 2024-03-19 15:30:08 +0000 pf: convert DIOCSETSTATUSIF to netlink While here also add a basic test case for it. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44368 --- lib/libpfctl/libpfctl.c | 32 +++++++++++++ lib/libpfctl/libpfctl.h | 2 + sbin/pfctl/pfctl.c | 12 +---- sys/netpfil/pf/pf_nl.c | 38 ++++++++++++++++ sys/netpfil/pf/pf_nl.h | 5 +++ tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/loginterface.sh | 87 ++++++++++++++++++++++++++++++++++++ 7 files changed, 167 insertions(+), 10 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index f12e45291fc1..e732c8eef854 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -2218,3 +2218,35 @@ int pfctl_table_get_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr, *size = io.pfrio_size; return (0); } + +int +pfctl_set_statusif(struct pfctl_handle *h, const char *ifname) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_SET_STATUSIF); + + snl_add_msg_attr_string(&nw, PF_SS_IFNAME, ifname); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (! snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + } + + return (e.error); +} diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index b16caf1f6480..4e06981a79c7 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -464,4 +464,6 @@ int pfctl_table_set_addrs(int dev, struct pfr_table *tbl, struct pfr_addr int flags); int pfctl_table_get_addrs(int dev, struct pfr_table *tbl, struct pfr_addr *addr, int *size, int flags); +int pfctl_set_statusif(struct pfctl_handle *h, const char *ifname); + #endif diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f8ecded066d2..8d59871701f8 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2547,19 +2547,11 @@ pfctl_set_logif(struct pfctl *pf, char *ifname) int pfctl_load_logif(struct pfctl *pf, char *ifname) { - struct pfioc_if pi; - - memset(&pi, 0, sizeof(pi)); - if (ifname && strlcpy(pi.ifname, ifname, - sizeof(pi.ifname)) >= sizeof(pi.ifname)) { + if (ifname != NULL && strlen(ifname) >= IFNAMSIZ) { warnx("pfctl_load_logif: strlcpy"); return (1); } - if (ioctl(pf->dev, DIOCSETSTATUSIF, &pi)) { - warnx("DIOCSETSTATUSIF"); - return (1); - } - return (0); + return (pfctl_set_statusif(pfh, ifname ? ifname : "")); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e4558c156aef..5f33e49b4a2e 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1079,11 +1079,42 @@ pf_handle_kill_states(struct nlmsghdr *hdr, struct nl_pstate *npt) return (pf_handle_killclear_states(hdr, npt, PFNL_CMD_KILLSTATES)); } +struct nl_parsed_set_statusif { + char ifname[IFNAMSIZ]; +}; +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct nl_parsed_set_statusif, _field) +static const struct nlattr_parser nla_p_set_statusif[] = { + { .type = PF_SS_IFNAME, .off = _OUT(ifname), .arg = (const void *)IFNAMSIZ, .cb = nlattr_get_chara }, +}; +static const struct nlfield_parser nlf_p_set_statusif[] = {}; +#undef _IN +#undef _OUT +NL_DECLARE_PARSER(set_statusif_parser, struct genlmsghdr, nlf_p_set_statusif, nla_p_set_statusif); + +static int +pf_handle_set_statusif(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + int error; + struct nl_parsed_set_statusif attrs = {}; + + error = nl_parse_nlmsg(hdr, &set_statusif_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_RULES_WLOCK(); + strlcpy(V_pf_status.ifname, attrs.ifname, IFNAMSIZ); + PF_RULES_WUNLOCK(); + + return (0); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, &getrules_parser, &clear_states_parser, + &set_statusif_parser, }; static int family_id; @@ -1152,6 +1183,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_SET_STATUSIF, + .cmd_name = "SETSTATUSIF", + .cmd_cb = pf_handle_set_statusif, + .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + } }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index 0ae4a9283072..c44e331722b7 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -45,6 +45,7 @@ enum { PFNL_CMD_GETRULE = 7, PFNL_CMD_CLRSTATES = 8, PFNL_CMD_KILLSTATES = 9, + PFNL_CMD_SET_STATUSIF = 10, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -281,6 +282,10 @@ enum pf_clear_states_type_t { PF_CS_KILLED = 13, /* u32 */ }; +enum pf_set_statusif_types_t { + PF_SS_UNSPEC, + PF_SS_IFNAME = 1, /* string */ +}; #ifdef _KERNEL void pf_nl_register(void); diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index ce718c4ba900..867b98e5f6c2 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -16,6 +16,7 @@ ATF_TESTS_SH+= altq \ fragmentation_no_reassembly \ get_state \ icmp \ + loginterface \ killstate \ macro \ map_e \ diff --git a/tests/sys/netpfil/pf/loginterface.sh b/tests/sys/netpfil/pf/loginterface.sh new file mode 100644 index 000000000000..6decb69fe63d --- /dev/null +++ b/tests/sys/netpfil/pf/loginterface.sh @@ -0,0 +1,87 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Rubicon Communications, LLC (Netgate) +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + + +atf_test_case "basic" "cleanup" +basic_head() +{ + atf_set descr 'Basic loginterface test' + atf_set require.user root +} + +basic_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + + # Sanity check + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + + # No interface stats until we configure a loginterface + atf_check -o not-match:"Interface Stats for" \ + jexec alcatraz pfctl -s info + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set loginterface ${epair}b" \ + "pass" + + # We do get Interface Stats listed when we've configured a loginterface + atf_check -o match:"Interface Stats for ${epair}b" \ + jexec alcatraz pfctl -s info + + # And after we've sent traffic there's non-zero counters + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + + atf_check -o match:"Interface Stats for ${epair}b" \ + jexec alcatraz pfctl -s info + atf_check -o match:"Passed 1" \ + jexec alcatraz pfctl -s info + + # And no interface stats once we remove the loginterface + pft_set_rules alcatraz \ + "pass" + atf_check -o not-match:"Interface Stats for ${epair}b" \ + jexec alcatraz pfctl -s info +} + +basic_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "basic" +} From nobody Tue Mar 19 16:13:03 2024 X-Original-To: dev-commits-src-all@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 4TzcFr11wYz5DlTZ; Tue, 19 Mar 2024 16:13: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 4TzcFr02hFz4Rw3; Tue, 19 Mar 2024 16:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864784; 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=qUzCnjYWd6WNak6uFiHfjap5h1yq/G2XDM5SCj/xnq0=; b=J1gNH2434K+YlYZgw+va31FCmGCjJyIez8ThT+k0oRpPJ70d/jiYi9/910Zw6hOpkiLlF+ oVw8scTcdcIE9XUucdGEriltI+U7OI0BORVlFMkI5VtWY2tuw3mdzP1DH5Q0v5LLbHjfdq tRjoSoSd+d5G7ITC1zqcpImJxALwXQmESDABh7RQBqRAKtuk5AJhufN1u4YsRCWKUY3hQy 3dDe1oiM89J4/21oJOjpOtxPSvGryEL02XJLgjoSDicE8+XlEehcwy1pWfwDjMMKfW+Zrh nxW2X4zqCtYtyN7O9hOVqVywuDYv4LQlp1QBpzuooR8vZoQ3u17p0qzZHEbP1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710864784; a=rsa-sha256; cv=none; b=g7iLYwQVYJTkWyv2hlJ1HWXMvoEo9gt7AtL1gUp4lZujZHAinHDVQBykBfMwgeox8E6fus L0HIHbqUdrzV8Zz/+2f+ZKH1xJ9l+hJwi4IaVsuhh45UOJeqZoTYSsJM0qRUuk7xlYS9pL TIF7sJv4a7oar44FfdF7upJ04mB8UQNziplBozcm8yxEe4dNqiNAuWjbcizTzxY6C2uyT8 ir8ByVyGBZ+iXSPP5Dj5l4zBWvl4rgVMP0Z9rSirlssYku/ifivM5qNTTlPIZioR+ho8aL 5bNi/+GrKy53PTK2QnjAfOeUpFmWtc1ahMNy8is7BERUiX6/1ch/hWQ5FcfYww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864784; 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=qUzCnjYWd6WNak6uFiHfjap5h1yq/G2XDM5SCj/xnq0=; b=MEwRyMwLPI/sh4Y1T3At0gy5hbydLGLfcwMjiRJzQo3d+k/Hv3d2IfpmwZJdSOPGB+e+JI hG6E0zQE96CCzfr1f5V+rNuuCtSxphoI9meNNO9eTi++WAdrMF0S18y2SGhDoSEmMiwRUi SiPcYGa0+fIUVSZ1sqLG1/2wLu6UfJLoNRZ4HoHLymRzAugSd5612z/BTDND5VFHL78YyB QX5QEkT7pDDNH4mbqoMPnLkEvz9pS2rwumL4FhRURLlh5DOXsxkVs2l9v5UkliZbLgbTE0 LtuJ1H+w9sQocnHHvj9gDpdf6Vo43/H3lcL/8C8hxFomfbhv8aPiqpNUJNS3Kg== 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 4TzcFq6lDDzFKG; Tue, 19 Mar 2024 16:13: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 42JGD3r0069805; Tue, 19 Mar 2024 16:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JGD35H069801; Tue, 19 Mar 2024 16:13:03 GMT (envelope-from git) Date: Tue, 19 Mar 2024 16:13:03 GMT Message-Id: <202403191613.42JGD35H069801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a322c2cd1946 - stable/14 - sqlite3: Vendor import of sqlite3 3.45.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a322c2cd194647a2b03fd73296c3f050d38d1ba3 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a322c2cd194647a2b03fd73296c3f050d38d1ba3 commit a322c2cd194647a2b03fd73296c3f050d38d1ba3 Author: Cy Schubert AuthorDate: 2024-03-12 14:01:21 +0000 Commit: Cy Schubert CommitDate: 2024-03-19 16:12:46 +0000 sqlite3: Vendor import of sqlite3 3.45.1 Release notes at https://www.sqlite.org/releaselog/3_45_1.html. Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz Merge commit '1e59a00476c9801952e7319719fcdb095a0cd007' into main (cherry picked from commit 937a0055858a098027f464abf0b2b1ec5d36748f) --- contrib/sqlite3/configure | 20 ++-- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/sqlite3.c | 220 +++++++++++++++++++++++---------------- contrib/sqlite3/sqlite3.h | 6 +- contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 ++-- contrib/sqlite3/tea/configure.ac | 2 +- 7 files changed, 157 insertions(+), 113 deletions(-) diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 037050503b74..472e8acd0097 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.45.0' + VERSION='3.45.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 984c283a2e1d..3ce8855cc762 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.45.0, http://www.sqlite.org) +AC_INIT(sqlite, 3.45.1, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 6e6dc8a6c8c7..139ee46a6a94 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.45.0. By combining all the individual C code files into this +** version 3.45.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** 1066602b2b1976fe58b5150777cced894af1. +** e876e51a0ed5c5b3126f52e532044363a014. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -43408,11 +43408,16 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = unixMapfile(pFd, -1); if( rc!=SQLITE_OK ) return rc; } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; } @@ -50765,6 +50770,11 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = winMapfile(pFd, -1); if( rc!=SQLITE_OK ){ @@ -50773,7 +50783,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ return rc; } } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ assert( pFd->pMapRegion!=0 ); *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; @@ -76402,7 +76412,10 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){ } pPage = pCur->pPage; - assert( pPage->isInit ); + if( sqlite3FaultSim(412) ) pPage->isInit = 0; + if( !pPage->isInit ){ + return SQLITE_CORRUPT_BKPT; + } if( !pPage->leaf ){ int idx = pCur->ix; rc = moveToChild(pCur, get4byte(findCell(pPage, idx))); @@ -166812,7 +166825,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */ testcase( pOrderBy && pOrderBy->nExpr==BMS-1 ); - if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0; + if( pOrderBy && pOrderBy->nExpr>=BMS ){ + pOrderBy = 0; + wctrlFlags &= ~WHERE_WANT_DISTINCT; + } /* The number of tables in the FROM clause is limited by the number of ** bits in a Bitmask @@ -184749,6 +184765,8 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int); SQLITE_PRIVATE int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*); +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk); + #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */ #endif /* _FTSINT_H */ @@ -188471,7 +188489,7 @@ static int fts3ShadowName(const char *zName){ ** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual ** table. */ -static int fts3Integrity( +static int fts3IntegrityMethod( sqlite3_vtab *pVtab, /* The virtual table to be checked */ const char *zSchema, /* Name of schema in which pVtab lives */ const char *zTabname, /* Name of the pVTab table */ @@ -188479,30 +188497,21 @@ static int fts3Integrity( char **pzErr /* Write error message here */ ){ Fts3Table *p = (Fts3Table*)pVtab; - char *zSql; int rc; - char *zErr = 0; + int bOk = 0; - assert( pzErr!=0 ); - assert( *pzErr==0 ); UNUSED_PARAMETER(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, zTabname); - if( zSql==0 ){ - return SQLITE_NOMEM; - } - rc = sqlite3_exec(p->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); - if( (rc&0xff)==SQLITE_CORRUPT ){ - *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", - p->bFts4 ? 4 : 3, zSchema, zTabname); - }else if( rc!=SQLITE_OK ){ + rc = sqlite3Fts3IntegrityCheck(p, &bOk); + assert( rc!=SQLITE_CORRUPT_VTAB || bOk==0 ); + if( rc!=SQLITE_OK && rc!=SQLITE_CORRUPT_VTAB ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS%d table %s.%s: %s", - p->bFts4 ? 4 : 3, zSchema, zTabname, zErr); + p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc)); + }else if( bOk==0 ){ + *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", + p->bFts4 ? 4 : 3, zSchema, zTabname); } - sqlite3_free(zErr); + sqlite3Fts3SegmentsClose(p); return SQLITE_OK; } @@ -188533,7 +188542,7 @@ static const sqlite3_module fts3Module = { /* xRelease */ fts3ReleaseMethod, /* xRollbackTo */ fts3RollbackToMethod, /* xShadowName */ fts3ShadowName, - /* xIntegrity */ fts3Integrity, + /* xIntegrity */ fts3IntegrityMethod, }; /* @@ -200087,7 +200096,7 @@ static u64 fts3ChecksumIndex( ** If an error occurs (e.g. an OOM or IO error), return an SQLite error ** code. The final value of *pbOk is undefined in this case. */ -static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){ int rc = SQLITE_OK; /* Return code */ u64 cksum1 = 0; /* Checksum based on FTS index contents */ u64 cksum2 = 0; /* Checksum based on %_content contents */ @@ -200165,7 +200174,7 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ sqlite3_finalize(pStmt); } - *pbOk = (cksum1==cksum2); + *pbOk = (rc==SQLITE_OK && cksum1==cksum2); return rc; } @@ -200205,7 +200214,7 @@ static int fts3DoIntegrityCheck( ){ int rc; int bOk = 0; - rc = fts3IntegrityCheck(p, &bOk); + rc = sqlite3Fts3IntegrityCheck(p, &bOk); if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB; return rc; } @@ -203758,6 +203767,16 @@ static void jsonAppendChar(JsonString *p, char c){ } } +/* Remove a single character from the end of the string +*/ +static void jsonStringTrimOneChar(JsonString *p){ + if( p->eErr==0 ){ + assert( p->nUsed>0 ); + p->nUsed--; + } +} + + /* Make sure there is a zero terminator on p->zBuf[] ** ** Return true on success. Return false if an OOM prevents this @@ -203765,7 +203784,7 @@ static void jsonAppendChar(JsonString *p, char c){ */ static int jsonStringTerminate(JsonString *p){ jsonAppendChar(p, 0); - p->nUsed--; + jsonStringTrimOneChar(p); return p->eErr==0; } @@ -205231,8 +205250,8 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ (pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8]; n = 9; } - if( i+sz+n > pParse->nBlob - && i+sz+n > pParse->nBlob-pParse->delta + if( (i64)i+sz+n > pParse->nBlob + && (i64)i+sz+n > pParse->nBlob-pParse->delta ){ sz = 0; n = 0; @@ -205282,6 +205301,7 @@ static u32 jsonTranslateBlobToText( } case JSONB_INT: case JSONB_FLOAT: { + if( sz==0 ) goto malformed_jsonb; jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz); break; } @@ -205290,6 +205310,7 @@ static u32 jsonTranslateBlobToText( sqlite3_uint64 u = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; int bOverflow = 0; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205312,6 +205333,7 @@ static u32 jsonTranslateBlobToText( case JSONB_FLOAT5: { /* Float literal missing digits beside "." */ u32 k = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205425,11 +205447,12 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '['); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, ','); } - if( sz>0 ) pOut->nUsed--; + if( j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, ']'); break; } @@ -205438,17 +205461,18 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '{'); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, (x++ & 1) ? ',' : ':'); } - if( x & 1 ) pOut->eErr |= JSTRING_MALFORMED; - if( sz>0 ) pOut->nUsed--; + if( (x & 1)!=0 || j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, '}'); break; } default: { + malformed_jsonb: pOut->eErr |= JSTRING_MALFORMED; break; } @@ -206375,6 +206399,38 @@ jsonInsertIntoBlob_patherror: return; } +/* +** If pArg is a blob that seems like a JSONB blob, then initialize +** p to point to that JSONB and return TRUE. If pArg does not seem like +** a JSONB blob, then return FALSE; +** +** This routine is only called if it is already known that pArg is a +** blob. The only open question is whether or not the blob appears +** to be a JSONB blob. +*/ +static int jsonArgIsJsonb(sqlite3_value *pArg, JsonParse *p){ + u32 n, sz = 0; + p->aBlob = (u8*)sqlite3_value_blob(pArg); + p->nBlob = (u32)sqlite3_value_bytes(pArg); + if( p->nBlob==0 ){ + p->aBlob = 0; + return 0; + } + if( NEVER(p->aBlob==0) ){ + return 0; + } + if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT + && (n = jsonbPayloadSize(p, 0, &sz))>0 + && sz+n==p->nBlob + && ((p->aBlob[0] & 0x0f)>JSONB_FALSE || sz==0) + ){ + return 1; + } + p->aBlob = 0; + p->nBlob = 0; + return 0; +} + /* ** Generate a JsonParse object, containing valid JSONB in aBlob and nBlob, ** from the SQL function argument pArg. Return a pointer to the new @@ -206431,29 +206487,24 @@ rebuild_from_cache: return p; } if( eType==SQLITE_BLOB ){ - u32 n, sz = 0; - p->aBlob = (u8*)sqlite3_value_blob(pArg); - p->nBlob = (u32)sqlite3_value_bytes(pArg); - if( p->nBlob==0 ){ - goto json_pfa_malformed; - } - if( NEVER(p->aBlob==0) ){ - goto json_pfa_oom; - } - if( (p->aBlob[0] & 0x0f)>JSONB_OBJECT ){ - goto json_pfa_malformed; - } - n = jsonbPayloadSize(p, 0, &sz); - if( n==0 - || sz+n!=p->nBlob - || ((p->aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0) - ){ - goto json_pfa_malformed; - } - if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ - goto json_pfa_oom; + if( jsonArgIsJsonb(pArg,p) ){ + if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ + goto json_pfa_oom; + } + return p; } - return p; + /* If the blob is not valid JSONB, fall through into trying to cast + ** the blob into text which is then interpreted as JSON. (tag-20240123-a) + ** + ** This goes against all historical documentation about how the SQLite + ** JSON functions were suppose to work. From the beginning, blob was + ** reserved for expansion and a blob value should have raised an error. + ** But it did not, due to a bug. And many applications came to depend + ** upon this buggy behavior, espeically when using the CLI and reading + ** JSON text using readfile(), which returns a blob. For this reason + ** we will continue to support the bug moving forward. + ** See for example https://sqlite.org/forum/forumpost/012136abd5292b8d + */ } p->zJson = (char*)sqlite3_value_text(pArg); p->nJson = sqlite3_value_bytes(pArg); @@ -207429,12 +207480,12 @@ static void jsonValidFunc( return; } case SQLITE_BLOB: { - if( (flags & 0x0c)!=0 && jsonFuncArgMightBeBinary(argv[0]) ){ + if( jsonFuncArgMightBeBinary(argv[0]) ){ if( flags & 0x04 ){ /* Superficial checking only - accomplished by the ** jsonFuncArgMightBeBinary() call above. */ res = 1; - }else{ + }else if( flags & 0x08 ){ /* Strict checking. Check by translating BLOB->TEXT->BLOB. If ** no errors occur, call that a "strict check". */ JsonParse px; @@ -207445,8 +207496,11 @@ static void jsonValidFunc( iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1); res = iErr==0; } + break; } - break; + /* Fall through into interpreting the input as text. See note + ** above at tag-20240123-a. */ + /* no break */ deliberate_fall_through } default: { JsonParse px; @@ -207571,7 +207625,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207581,7 +207635,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC); @@ -207691,7 +207745,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207701,7 +207755,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC); @@ -208182,13 +208236,9 @@ static int jsonEachFilter( memset(&p->sParse, 0, sizeof(p->sParse)); p->sParse.nJPRef = 1; p->sParse.db = p->db; - if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){ - if( jsonFuncArgMightBeBinary(argv[0]) ){ - p->sParse.nBlob = sqlite3_value_bytes(argv[0]); - p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); - }else{ - goto json_each_malformed_input; - } + if( jsonFuncArgMightBeBinary(argv[0]) ){ + p->sParse.nBlob = sqlite3_value_bytes(argv[0]); + p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); }else{ p->sParse.zJson = (char*)sqlite3_value_text(argv[0]); p->sParse.nJson = sqlite3_value_bytes(argv[0]); @@ -250497,7 +250547,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT); } /* @@ -250528,27 +250578,21 @@ static int fts5IntegrityMethod( char **pzErr /* Write error message here */ ){ Fts5FullTable *pTab = (Fts5FullTable*)pVtab; - Fts5Config *pConfig = pTab->p.pConfig; - char *zSql; - char *zErr = 0; int rc; + assert( pzErr!=0 && *pzErr==0 ); UNUSED_PARAM(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, pConfig->zName); - if( zSql==0 ) return SQLITE_NOMEM; - rc = sqlite3_exec(pConfig->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); + rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0); if( (rc&0xff)==SQLITE_CORRUPT ){ *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s", zSchema, zTabname); }else if( rc!=SQLITE_OK ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS5 table %s.%s: %s", - zSchema, zTabname, zErr); + zSchema, zTabname, sqlite3_errstr(rc)); } - sqlite3_free(zErr); + sqlite3Fts5IndexCloseReader(pTab->p.pIndex); + return SQLITE_OK; } diff --git a/contrib/sqlite3/sqlite3.h b/contrib/sqlite3/sqlite3.h index c2d2456dde6f..4fdfde004ebe 100644 --- a/contrib/sqlite3/sqlite3.h +++ b/contrib/sqlite3/sqlite3.h @@ -146,9 +146,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/contrib/sqlite3/sqlite3rc.h b/contrib/sqlite3/sqlite3rc.h index 7459598ae493..561c3e00aeef 100644 --- a/contrib/sqlite3/sqlite3rc.h +++ b/contrib/sqlite3/sqlite3rc.h @@ -1,3 +1,3 @@ #ifndef SQLITE_RESOURCE_VERSION -#define SQLITE_RESOURCE_VERSION 3,45,0 +#define SQLITE_RESOURCE_VERSION 3,45,1 #endif diff --git a/contrib/sqlite3/tea/configure b/contrib/sqlite3/tea/configure index 9992b6434dce..8bd47a5e0187 100755 --- a/contrib/sqlite3/tea/configure +++ b/contrib/sqlite3/tea/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1496,7 +1496,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1795,7 +1795,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9560,7 +9560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9615,7 +9615,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/tea/configure.ac b/contrib/sqlite3/tea/configure.ac index 4df57344bee2..740bd9749d3d 100644 --- a/contrib/sqlite3/tea/configure.ac +++ b/contrib/sqlite3/tea/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.45.0]) +AC_INIT([sqlite],[3.45.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. From nobody Tue Mar 19 16:13:21 2024 X-Original-To: dev-commits-src-all@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 4TzcG96NLKz5Dlsn; Tue, 19 Mar 2024 16:13: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 4TzcG96DHxz4SZf; Tue, 19 Mar 2024 16:13:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864801; 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=KhrpxK9oA+Y30m5F3+C2Ln+NoXPPLiOwyRzrQiAwyGA=; b=ldoT5AVbGxBW1ZkhV0GLbl+xkN5p2rjxu+7anw8be1ssAbvBF+s+r1TW5Xdm4AEg3+xDMb J/oH2uz9HzNhxlkc0h4n//g8NF7y76v4en1vlSeeIeMQH343iH4AHiS3gHSeASM9AtIm5f QUYginC/DEWi/IYO7xEHqMu8e3sCFvuE510JoHzXCCVu/53EMtj07THkmvtkl+oGWOaxn7 im6P3KZh9Iz6Z8RL8MsFI05fzUG0bm9N9pptfO1liXkYRDU+yppRpCxK4BOk+HHZrgtFtj e7vXcdZJJbSAJPmKTKR/M4BTvHv4+ohAfqQTcuaK7Dnh58+7myGLC8IaSBd1ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710864801; a=rsa-sha256; cv=none; b=Xw85bCqlRp3lXHl0ciyJYGbVvKCJmziCX97I4xo2II088MUrbYDfHS/Y7fMv8rZDZ3Ynlc fODRL5Ge56uR1Fy7tYUZe5hH+7qNpmkUnvdp1dC+SrUKaaVYVRjXUGY/tVTDZ5p8kcqcDA vKP+dGN4KZ90fmgAidJRRXSgeU5KfP016SmR8z9ObI0ReakrUuS461ToHFWHpGh9HRtYmN j7p+tRqecLHHrAQllcfmgo+rnZAdPfl1cx5CWgVmN3UHrVQWGDuxChlmam9THNDpXQLdkx Yq+FyMXqt+e6zoODb2YpIOAJqYPB5AGYDx2VvDkO0O2kBc3RexylA+rzPqhXhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864801; 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=KhrpxK9oA+Y30m5F3+C2Ln+NoXPPLiOwyRzrQiAwyGA=; b=NKxb2czEAbAjLhmcUNl/624ALw13u72zL1Ten6SAWHEsFHysWf0IOeybdn8bC0env8jeca PugROeJMMr4f9usU1ZMp+dB8FLDNhzXoirTXqy8zNiar6IdMg3exMTX16s6F/KtnjJKlNh xlXhIQ2VPhOdpAE5iXuIaGml631O4YOK7PpXtZgSVHlUKJXWi6IPj1rktgje9VV262N3zs VWPrl/GDz7u1wyczttW626ZWtp7mZxmGGe5CvwCtDRNYArU0r8/kACHzy1bvMZntirqn/n 33IwBrU6oWe0O6WR4OcVzMkO6jfk6YJnOn/aRmhLpywUdsiPyPRZc26+J/lcug== 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 4TzcG95rHQzFDG; Tue, 19 Mar 2024 16:13: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 42JGDLG5069968; Tue, 19 Mar 2024 16:13:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JGDLm9069965; Tue, 19 Mar 2024 16:13:21 GMT (envelope-from git) Date: Tue, 19 Mar 2024 16:13:21 GMT Message-Id: <202403191613.42JGDLm9069965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 6b073e0ec62d - stable/13 - sqlite3: Vendor import of sqlite3 3.45.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 commit 6b073e0ec62d52ea3aa2a1c8cff2b87b893b8208 Author: Cy Schubert AuthorDate: 2024-03-12 14:01:21 +0000 Commit: Cy Schubert CommitDate: 2024-03-19 16:13:15 +0000 sqlite3: Vendor import of sqlite3 3.45.1 Release notes at https://www.sqlite.org/releaselog/3_45_1.html. Obtained from: https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz Merge commit '1e59a00476c9801952e7319719fcdb095a0cd007' into main (cherry picked from commit 937a0055858a098027f464abf0b2b1ec5d36748f) --- contrib/sqlite3/configure | 20 ++-- contrib/sqlite3/configure.ac | 2 +- contrib/sqlite3/sqlite3.c | 220 +++++++++++++++++++++++---------------- contrib/sqlite3/sqlite3.h | 6 +- contrib/sqlite3/sqlite3rc.h | 2 +- contrib/sqlite3/tea/configure | 18 ++-- contrib/sqlite3/tea/configure.ac | 2 +- 7 files changed, 157 insertions(+), 113 deletions(-) diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure index 037050503b74..472e8acd0097 100755 --- a/contrib/sqlite3/configure +++ b/contrib/sqlite3/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='http://www.sqlite.org' PACKAGE_URL='' @@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1563,7 +1563,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3106,7 +3106,7 @@ fi # Define the identity of the package. PACKAGE='sqlite' - VERSION='3.45.0' + VERSION='3.45.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -15314,7 +15314,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15373,7 +15373,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac index 984c283a2e1d..3ce8855cc762 100644 --- a/contrib/sqlite3/configure.ac +++ b/contrib/sqlite3/configure.ac @@ -10,7 +10,7 @@ # AC_PREREQ(2.61) -AC_INIT(sqlite, 3.45.0, http://www.sqlite.org) +AC_INIT(sqlite, 3.45.1, http://www.sqlite.org) AC_CONFIG_SRCDIR([sqlite3.c]) AC_CONFIG_AUX_DIR([.]) diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c index 6e6dc8a6c8c7..139ee46a6a94 100644 --- a/contrib/sqlite3/sqlite3.c +++ b/contrib/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.45.0. By combining all the individual C code files into this +** version 3.45.1. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** 1066602b2b1976fe58b5150777cced894af1. +** e876e51a0ed5c5b3126f52e532044363a014. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -43408,11 +43408,16 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = unixMapfile(pFd, -1); if( rc!=SQLITE_OK ) return rc; } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; } @@ -50765,6 +50770,11 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ #if SQLITE_MAX_MMAP_SIZE>0 if( pFd->mmapSizeMax>0 ){ + /* Ensure that there is always at least a 256 byte buffer of addressable + ** memory following the returned page. If the database is corrupt, + ** SQLite may overread the page slightly (in practice only a few bytes, + ** but 256 is safe, round, number). */ + const int nEofBuffer = 256; if( pFd->pMapRegion==0 ){ int rc = winMapfile(pFd, -1); if( rc!=SQLITE_OK ){ @@ -50773,7 +50783,7 @@ static int winFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){ return rc; } } - if( pFd->mmapSize >= iOff+nAmt ){ + if( pFd->mmapSize >= (iOff+nAmt+nEofBuffer) ){ assert( pFd->pMapRegion!=0 ); *pp = &((u8 *)pFd->pMapRegion)[iOff]; pFd->nFetchOut++; @@ -76402,7 +76412,10 @@ static SQLITE_NOINLINE int btreePrevious(BtCursor *pCur){ } pPage = pCur->pPage; - assert( pPage->isInit ); + if( sqlite3FaultSim(412) ) pPage->isInit = 0; + if( !pPage->isInit ){ + return SQLITE_CORRUPT_BKPT; + } if( !pPage->leaf ){ int idx = pCur->ix; rc = moveToChild(pCur, get4byte(findCell(pPage, idx))); @@ -166812,7 +166825,10 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin( /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */ testcase( pOrderBy && pOrderBy->nExpr==BMS-1 ); - if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0; + if( pOrderBy && pOrderBy->nExpr>=BMS ){ + pOrderBy = 0; + wctrlFlags &= ~WHERE_WANT_DISTINCT; + } /* The number of tables in the FROM clause is limited by the number of ** bits in a Bitmask @@ -184749,6 +184765,8 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsdiacritic(int); SQLITE_PRIVATE int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*); +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk); + #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */ #endif /* _FTSINT_H */ @@ -188471,7 +188489,7 @@ static int fts3ShadowName(const char *zName){ ** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual ** table. */ -static int fts3Integrity( +static int fts3IntegrityMethod( sqlite3_vtab *pVtab, /* The virtual table to be checked */ const char *zSchema, /* Name of schema in which pVtab lives */ const char *zTabname, /* Name of the pVTab table */ @@ -188479,30 +188497,21 @@ static int fts3Integrity( char **pzErr /* Write error message here */ ){ Fts3Table *p = (Fts3Table*)pVtab; - char *zSql; int rc; - char *zErr = 0; + int bOk = 0; - assert( pzErr!=0 ); - assert( *pzErr==0 ); UNUSED_PARAMETER(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, zTabname); - if( zSql==0 ){ - return SQLITE_NOMEM; - } - rc = sqlite3_exec(p->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); - if( (rc&0xff)==SQLITE_CORRUPT ){ - *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", - p->bFts4 ? 4 : 3, zSchema, zTabname); - }else if( rc!=SQLITE_OK ){ + rc = sqlite3Fts3IntegrityCheck(p, &bOk); + assert( rc!=SQLITE_CORRUPT_VTAB || bOk==0 ); + if( rc!=SQLITE_OK && rc!=SQLITE_CORRUPT_VTAB ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS%d table %s.%s: %s", - p->bFts4 ? 4 : 3, zSchema, zTabname, zErr); + p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc)); + }else if( bOk==0 ){ + *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s", + p->bFts4 ? 4 : 3, zSchema, zTabname); } - sqlite3_free(zErr); + sqlite3Fts3SegmentsClose(p); return SQLITE_OK; } @@ -188533,7 +188542,7 @@ static const sqlite3_module fts3Module = { /* xRelease */ fts3ReleaseMethod, /* xRollbackTo */ fts3RollbackToMethod, /* xShadowName */ fts3ShadowName, - /* xIntegrity */ fts3Integrity, + /* xIntegrity */ fts3IntegrityMethod, }; /* @@ -200087,7 +200096,7 @@ static u64 fts3ChecksumIndex( ** If an error occurs (e.g. an OOM or IO error), return an SQLite error ** code. The final value of *pbOk is undefined in this case. */ -static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ +SQLITE_PRIVATE int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){ int rc = SQLITE_OK; /* Return code */ u64 cksum1 = 0; /* Checksum based on FTS index contents */ u64 cksum2 = 0; /* Checksum based on %_content contents */ @@ -200165,7 +200174,7 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){ sqlite3_finalize(pStmt); } - *pbOk = (cksum1==cksum2); + *pbOk = (rc==SQLITE_OK && cksum1==cksum2); return rc; } @@ -200205,7 +200214,7 @@ static int fts3DoIntegrityCheck( ){ int rc; int bOk = 0; - rc = fts3IntegrityCheck(p, &bOk); + rc = sqlite3Fts3IntegrityCheck(p, &bOk); if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB; return rc; } @@ -203758,6 +203767,16 @@ static void jsonAppendChar(JsonString *p, char c){ } } +/* Remove a single character from the end of the string +*/ +static void jsonStringTrimOneChar(JsonString *p){ + if( p->eErr==0 ){ + assert( p->nUsed>0 ); + p->nUsed--; + } +} + + /* Make sure there is a zero terminator on p->zBuf[] ** ** Return true on success. Return false if an OOM prevents this @@ -203765,7 +203784,7 @@ static void jsonAppendChar(JsonString *p, char c){ */ static int jsonStringTerminate(JsonString *p){ jsonAppendChar(p, 0); - p->nUsed--; + jsonStringTrimOneChar(p); return p->eErr==0; } @@ -205231,8 +205250,8 @@ static u32 jsonbPayloadSize(const JsonParse *pParse, u32 i, u32 *pSz){ (pParse->aBlob[i+7]<<8) + pParse->aBlob[i+8]; n = 9; } - if( i+sz+n > pParse->nBlob - && i+sz+n > pParse->nBlob-pParse->delta + if( (i64)i+sz+n > pParse->nBlob + && (i64)i+sz+n > pParse->nBlob-pParse->delta ){ sz = 0; n = 0; @@ -205282,6 +205301,7 @@ static u32 jsonTranslateBlobToText( } case JSONB_INT: case JSONB_FLOAT: { + if( sz==0 ) goto malformed_jsonb; jsonAppendRaw(pOut, (const char*)&pParse->aBlob[i+n], sz); break; } @@ -205290,6 +205310,7 @@ static u32 jsonTranslateBlobToText( sqlite3_uint64 u = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; int bOverflow = 0; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205312,6 +205333,7 @@ static u32 jsonTranslateBlobToText( case JSONB_FLOAT5: { /* Float literal missing digits beside "." */ u32 k = 0; const char *zIn = (const char*)&pParse->aBlob[i+n]; + if( sz==0 ) goto malformed_jsonb; if( zIn[0]=='-' ){ jsonAppendChar(pOut, '-'); k++; @@ -205425,11 +205447,12 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '['); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, ','); } - if( sz>0 ) pOut->nUsed--; + if( j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, ']'); break; } @@ -205438,17 +205461,18 @@ static u32 jsonTranslateBlobToText( jsonAppendChar(pOut, '{'); j = i+n; iEnd = j+sz; - while( jeErr==0 ){ j = jsonTranslateBlobToText(pParse, j, pOut); jsonAppendChar(pOut, (x++ & 1) ? ',' : ':'); } - if( x & 1 ) pOut->eErr |= JSTRING_MALFORMED; - if( sz>0 ) pOut->nUsed--; + if( (x & 1)!=0 || j>iEnd ) pOut->eErr |= JSTRING_MALFORMED; + if( sz>0 ) jsonStringTrimOneChar(pOut); jsonAppendChar(pOut, '}'); break; } default: { + malformed_jsonb: pOut->eErr |= JSTRING_MALFORMED; break; } @@ -206375,6 +206399,38 @@ jsonInsertIntoBlob_patherror: return; } +/* +** If pArg is a blob that seems like a JSONB blob, then initialize +** p to point to that JSONB and return TRUE. If pArg does not seem like +** a JSONB blob, then return FALSE; +** +** This routine is only called if it is already known that pArg is a +** blob. The only open question is whether or not the blob appears +** to be a JSONB blob. +*/ +static int jsonArgIsJsonb(sqlite3_value *pArg, JsonParse *p){ + u32 n, sz = 0; + p->aBlob = (u8*)sqlite3_value_blob(pArg); + p->nBlob = (u32)sqlite3_value_bytes(pArg); + if( p->nBlob==0 ){ + p->aBlob = 0; + return 0; + } + if( NEVER(p->aBlob==0) ){ + return 0; + } + if( (p->aBlob[0] & 0x0f)<=JSONB_OBJECT + && (n = jsonbPayloadSize(p, 0, &sz))>0 + && sz+n==p->nBlob + && ((p->aBlob[0] & 0x0f)>JSONB_FALSE || sz==0) + ){ + return 1; + } + p->aBlob = 0; + p->nBlob = 0; + return 0; +} + /* ** Generate a JsonParse object, containing valid JSONB in aBlob and nBlob, ** from the SQL function argument pArg. Return a pointer to the new @@ -206431,29 +206487,24 @@ rebuild_from_cache: return p; } if( eType==SQLITE_BLOB ){ - u32 n, sz = 0; - p->aBlob = (u8*)sqlite3_value_blob(pArg); - p->nBlob = (u32)sqlite3_value_bytes(pArg); - if( p->nBlob==0 ){ - goto json_pfa_malformed; - } - if( NEVER(p->aBlob==0) ){ - goto json_pfa_oom; - } - if( (p->aBlob[0] & 0x0f)>JSONB_OBJECT ){ - goto json_pfa_malformed; - } - n = jsonbPayloadSize(p, 0, &sz); - if( n==0 - || sz+n!=p->nBlob - || ((p->aBlob[0] & 0x0f)<=JSONB_FALSE && sz>0) - ){ - goto json_pfa_malformed; - } - if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ - goto json_pfa_oom; + if( jsonArgIsJsonb(pArg,p) ){ + if( (flgs & JSON_EDITABLE)!=0 && jsonBlobMakeEditable(p, 0)==0 ){ + goto json_pfa_oom; + } + return p; } - return p; + /* If the blob is not valid JSONB, fall through into trying to cast + ** the blob into text which is then interpreted as JSON. (tag-20240123-a) + ** + ** This goes against all historical documentation about how the SQLite + ** JSON functions were suppose to work. From the beginning, blob was + ** reserved for expansion and a blob value should have raised an error. + ** But it did not, due to a bug. And many applications came to depend + ** upon this buggy behavior, espeically when using the CLI and reading + ** JSON text using readfile(), which returns a blob. For this reason + ** we will continue to support the bug moving forward. + ** See for example https://sqlite.org/forum/forumpost/012136abd5292b8d + */ } p->zJson = (char*)sqlite3_value_text(pArg); p->nJson = sqlite3_value_bytes(pArg); @@ -207429,12 +207480,12 @@ static void jsonValidFunc( return; } case SQLITE_BLOB: { - if( (flags & 0x0c)!=0 && jsonFuncArgMightBeBinary(argv[0]) ){ + if( jsonFuncArgMightBeBinary(argv[0]) ){ if( flags & 0x04 ){ /* Superficial checking only - accomplished by the ** jsonFuncArgMightBeBinary() call above. */ res = 1; - }else{ + }else if( flags & 0x08 ){ /* Strict checking. Check by translating BLOB->TEXT->BLOB. If ** no errors occur, call that a "strict check". */ JsonParse px; @@ -207445,8 +207496,11 @@ static void jsonValidFunc( iErr = jsonbValidityCheck(&px, 0, px.nBlob, 1); res = iErr==0; } + break; } - break; + /* Fall through into interpreting the input as text. See note + ** above at tag-20240123-a. */ + /* no break */ deliberate_fall_through } default: { JsonParse px; @@ -207571,7 +207625,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207581,7 +207635,7 @@ static void jsonArrayCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "[]", 2, SQLITE_STATIC); @@ -207691,7 +207745,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ if( isFinal ){ if( !pStr->bStatic ) sqlite3RCStrUnref(pStr->zBuf); }else{ - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } return; }else if( isFinal ){ @@ -207701,7 +207755,7 @@ static void jsonObjectCompute(sqlite3_context *ctx, int isFinal){ pStr->bStatic = 1; }else{ sqlite3_result_text(ctx, pStr->zBuf, (int)pStr->nUsed, SQLITE_TRANSIENT); - pStr->nUsed--; + jsonStringTrimOneChar(pStr); } }else{ sqlite3_result_text(ctx, "{}", 2, SQLITE_STATIC); @@ -208182,13 +208236,9 @@ static int jsonEachFilter( memset(&p->sParse, 0, sizeof(p->sParse)); p->sParse.nJPRef = 1; p->sParse.db = p->db; - if( sqlite3_value_type(argv[0])==SQLITE_BLOB ){ - if( jsonFuncArgMightBeBinary(argv[0]) ){ - p->sParse.nBlob = sqlite3_value_bytes(argv[0]); - p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); - }else{ - goto json_each_malformed_input; - } + if( jsonFuncArgMightBeBinary(argv[0]) ){ + p->sParse.nBlob = sqlite3_value_bytes(argv[0]); + p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]); }else{ p->sParse.zJson = (char*)sqlite3_value_text(argv[0]); p->sParse.nJson = sqlite3_value_bytes(argv[0]); @@ -250497,7 +250547,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT); } /* @@ -250528,27 +250578,21 @@ static int fts5IntegrityMethod( char **pzErr /* Write error message here */ ){ Fts5FullTable *pTab = (Fts5FullTable*)pVtab; - Fts5Config *pConfig = pTab->p.pConfig; - char *zSql; - char *zErr = 0; int rc; + assert( pzErr!=0 && *pzErr==0 ); UNUSED_PARAM(isQuick); - zSql = sqlite3_mprintf( - "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');", - zSchema, zTabname, pConfig->zName); - if( zSql==0 ) return SQLITE_NOMEM; - rc = sqlite3_exec(pConfig->db, zSql, 0, 0, &zErr); - sqlite3_free(zSql); + rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, 0); if( (rc&0xff)==SQLITE_CORRUPT ){ *pzErr = sqlite3_mprintf("malformed inverted index for FTS5 table %s.%s", zSchema, zTabname); }else if( rc!=SQLITE_OK ){ *pzErr = sqlite3_mprintf("unable to validate the inverted index for" " FTS5 table %s.%s: %s", - zSchema, zTabname, zErr); + zSchema, zTabname, sqlite3_errstr(rc)); } - sqlite3_free(zErr); + sqlite3Fts5IndexCloseReader(pTab->p.pIndex); + return SQLITE_OK; } diff --git a/contrib/sqlite3/sqlite3.h b/contrib/sqlite3/sqlite3.h index c2d2456dde6f..4fdfde004ebe 100644 --- a/contrib/sqlite3/sqlite3.h +++ b/contrib/sqlite3/sqlite3.h @@ -146,9 +146,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.0" -#define SQLITE_VERSION_NUMBER 3045000 -#define SQLITE_SOURCE_ID "2024-01-15 17:01:13 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d" +#define SQLITE_VERSION "3.45.1" +#define SQLITE_VERSION_NUMBER 3045001 +#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/contrib/sqlite3/sqlite3rc.h b/contrib/sqlite3/sqlite3rc.h index 7459598ae493..561c3e00aeef 100644 --- a/contrib/sqlite3/sqlite3rc.h +++ b/contrib/sqlite3/sqlite3rc.h @@ -1,3 +1,3 @@ #ifndef SQLITE_RESOURCE_VERSION -#define SQLITE_RESOURCE_VERSION 3,45,0 +#define SQLITE_RESOURCE_VERSION 3,45,1 #endif diff --git a/contrib/sqlite3/tea/configure b/contrib/sqlite3/tea/configure index 9992b6434dce..8bd47a5e0187 100755 --- a/contrib/sqlite3/tea/configure +++ b/contrib/sqlite3/tea/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for sqlite 3.45.0. +# Generated by GNU Autoconf 2.71 for sqlite 3.45.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sqlite' PACKAGE_TARNAME='sqlite' -PACKAGE_VERSION='3.45.0' -PACKAGE_STRING='sqlite 3.45.0' +PACKAGE_VERSION='3.45.1' +PACKAGE_STRING='sqlite 3.45.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sqlite 3.45.0 to adapt to many kinds of systems. +\`configure' configures sqlite 3.45.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sqlite 3.45.0:";; + short | recursive ) echo "Configuration of sqlite 3.45.1:";; esac cat <<\_ACEOF @@ -1496,7 +1496,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sqlite configure 3.45.0 +sqlite configure 3.45.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1795,7 +1795,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sqlite $as_me 3.45.0, which was +It was created by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9560,7 +9560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sqlite $as_me 3.45.0, which was +This file was extended by sqlite $as_me 3.45.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9615,7 +9615,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -sqlite config.status 3.45.0 +sqlite config.status 3.45.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/sqlite3/tea/configure.ac b/contrib/sqlite3/tea/configure.ac index 4df57344bee2..740bd9749d3d 100644 --- a/contrib/sqlite3/tea/configure.ac +++ b/contrib/sqlite3/tea/configure.ac @@ -19,7 +19,7 @@ dnl to configure the system for the local environment. # so that we create the export library with the dll. #----------------------------------------------------------------------- -AC_INIT([sqlite],[3.45.0]) +AC_INIT([sqlite],[3.45.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. From nobody Tue Mar 19 16:31:21 2024 X-Original-To: dev-commits-src-all@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 4TzcgJ09qtz5Dp0Q; Tue, 19 Mar 2024 16:31:40 +0000 (UTC) (envelope-from jamie@catflap.org) Received: from donotpassgo.dyslexicfish.net (donotpassgo.dyslexicfish.net [IPv6:2001:19f0:7400:8808:123::1]) by mx1.freebsd.org (Postfix) with ESMTP id 4TzcgH0N06z4Tb6; Tue, 19 Mar 2024 16:31:38 +0000 (UTC) (envelope-from jamie@catflap.org) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=catflap.org; spf=pass (mx1.freebsd.org: domain of jamie@catflap.org designates 2001:19f0:7400:8808:123::1 as permitted sender) smtp.mailfrom=jamie@catflap.org X-Catflap-Envelope-From: X-Catflap-Envelope-To: src-committers@FreeBSD.org Received: from donotpassgo.dyslexicfish.net (donotpassgo.dyslexicfish.net [209.250.224.51]) by donotpassgo.dyslexicfish.net (8.14.5/8.14.5) with ESMTP id 42JGVMbe030204; Tue, 19 Mar 2024 16:31:22 GMT (envelope-from jamie@donotpassgo.dyslexicfish.net) Received: (from jamie@localhost) by donotpassgo.dyslexicfish.net (8.14.5/8.14.5/Submit) id 42JGVLij030203; Tue, 19 Mar 2024 16:31:21 GMT (envelope-from jamie) From: Jamie Landeg-Jones Message-Id: <202403191631.42JGVLij030203@donotpassgo.dyslexicfish.net> Date: Tue, 19 Mar 2024 16:31:21 +0000 Organization: Dyslexic Fish To: imp@bsdimp.com, bz@FreeBSD.org Cc: src-committers@FreeBSD.org, imp@FreeBSD.org, glebius@FreeBSD.org, freebsd@igalic.co, freebsd-arch@FreeBSD.org, dev-commits-src-main@FreeBSD.org, dev-commits-src-all@FreeBSD.org Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> In-Reply-To: User-Agent: Heirloom mailx 12.4 7/29/08 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.2.7 (donotpassgo.dyslexicfish.net [209.250.224.51]); Tue, 19 Mar 2024 16:31:22 +0000 (GMT) X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.69 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.992]; DMARC_POLICY_ALLOW(-0.50)[catflap.org,none]; R_SPF_ALLOW(-0.20)[+mx:dyslexicfish.net]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; TO_DN_NONE(0.00)[]; ASN(0.00)[asn:20473, ipnet:2001:19f0:7400::/38, country:US]; HAS_ORG_HEADER(0.00)[]; FREEFALL_USER(0.00)[jamie]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org,freebsd-arch@FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_SEVEN(0.00)[9]; R_DKIM_NA(0.00)[] X-Rspamd-Queue-Id: 4TzcgH0N06z4Tb6 Warner Losh wrote: > name makes sense and one of two renamings happen: Either we rename GENERIC > to GENERIC-STATIC and MINIMAL to GENERIC, or we rename MINIMAL to MODULAR > and have it (eventually) become the new default. Or we need to create a new If you decide to delay the move to minimal as a default, I think GENERIC-MODULAR make more sense than just MODULAR, especially for the layperson. From nobody Tue Mar 19 18:57:16 2024 X-Original-To: dev-commits-src-all@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 4TzgvK2PGmz5F8Wr; Tue, 19 Mar 2024 18:57: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 4TzgvJ71wZz4nxV; Tue, 19 Mar 2024 18:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710874637; 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=I2shPjCWjnNYj7uhxnKKxM104SiOZ5YjyFrBDLXTUdI=; b=IWjh6XuBY6/oH4sqpsHHt2nHX0zfn9uht6ECiy4PXu+/gm+RUHbYg6TNEsVB4MzCzgLMOW N+tNbf7k/SvAyzxqGv//UU6kgoZleB04HfGlrYbmlPO+ABAGpetP59NBoVYffjI0ydTnJ5 D2grpPRjkunRDfvGWmhQlPQ41EjLCHI0V2YTgiNNiw7upOtMrDPTW2WvngZzIT6iOAuWNx VRARCWC0g1oe+Jfv3h8dAmq2rFqp8nwt1feaJm2XkhAiuHcug4Wm9v+gVHNv8HIxDZI10f OSp5Kp69fEa/KGaOmUpX0SmfsjBBPMpB9E3HE9mkNPsjQEd8DuLMqXyMOboTuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710874637; a=rsa-sha256; cv=none; b=WuydLjV6AdZPBoT3pHBL/hyuioR2jtsnOb74nyx7xGW0ZWiHGh0ZyayzLHi3DK7Rw6WciV lOl4dw9bJBdrUAN/iAF/0R4ktNdl3pOVGmRM4pwZRJ1hLwW+8MVZfrj3EB4kfMzCiHZTU8 SU2kgN2B+GCO4bYcs1v1ywT/wzVmt8EIMZfg/wqxMceIAcbI/a6bDObuxkhPSfDpKIHeSx I1/W3kQXa10E7ESxqJKawv+TO0hNaXJjf7Y68CqdMRrv5ahiwVHSsb61mKIH4ngSwz7FH/ xFRUpDOqdjfz0StEnrb4dF/fmr2ihtrJZDOHVFovDwF1cwXVNBjXHpoHKUG/tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710874637; 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=I2shPjCWjnNYj7uhxnKKxM104SiOZ5YjyFrBDLXTUdI=; b=ygcsfVo0ttD66IzH12fU9Ct90EVwJ7yw4akTdt081iYvCPH8sR7IVo4ISO/8VfMCgKMfr1 VvvHMKqvwmWoOOCR2A3rMF9qimq5DR2jDaGZh5iYVYaW3gYP+ebIaIP7ur1MovqWCVH7mC 1k/y9ERPh4tiGD1ZBUHveKM3f7DUvAxzhMl433VNl0qY2xRBRN9aDSGG+Tmmkw4+0/iicu 28df+FlysLNes3GQBXRaKcfMJ3usnkT/TbbbrXldBDUwr7STD3MSoQWUos/fwZU+V1JwQC OoTgQuM8lAvv5O2Cz/8L4Zrs/fP1/sMTLzF6Qqnl6X4+PtWgZ/zwjKcsy7isfw== 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 4TzgvJ6KgtzJQ9; Tue, 19 Mar 2024 18:57: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 42JIvGtM038242; Tue, 19 Mar 2024 18:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JIvGd5038239; Tue, 19 Mar 2024 18:57:16 GMT (envelope-from git) Date: Tue, 19 Mar 2024 18:57:16 GMT Message-Id: <202403191857.42JIvGd5038239@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: 56f7860087ee - main - carp: check CARP status in in_localip_fib(), in6_localip_fib() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 56f7860087eec14b4a65310b70bd704e79e1b48c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=56f7860087eec14b4a65310b70bd704e79e1b48c commit 56f7860087eec14b4a65310b70bd704e79e1b48c Author: Gleb Smirnoff AuthorDate: 2024-03-19 18:48:59 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-19 18:48:59 +0000 carp: check CARP status in in_localip_fib(), in6_localip_fib() Don't report a BACKUP CARP address as local. These two functions are used only by source address validation for input packets, controlled by sysctls net.inet.ip.source_address_validation and net.inet6.ip6.source_address_validation. For this purpose we definitely want to treat BACKUP addresses as non local. This change is conservative and doesn't modify compat in_localip() and in6_localip(). They are used more widely than the FIB-aware versions. The change would modify the notion of ipfw(4) 'me' keyword. There might be other consequences as in_localip() is used by various tunneling protocols. PR: 277349 --- sys/netinet/in.c | 4 +++- sys/netinet6/in6.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 1c6e87485ace..940b197d9e95 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -165,7 +165,7 @@ in_localip(struct in_addr in) } /* - * Like in_localip(), but FIB-aware. + * Like in_localip(), but FIB-aware and carp(4)-aware. */ bool in_localip_fib(struct in_addr in, uint16_t fib) @@ -176,6 +176,8 @@ in_localip_fib(struct in_addr in, uint16_t fib) CK_LIST_FOREACH(ia, INADDR_HASH(in.s_addr), ia_hash) if (IA_SIN(ia)->sin_addr.s_addr == in.s_addr && + (ia->ia_ifa.ifa_carp == NULL || + carp_master_p(&ia->ia_ifa)) && ia->ia_ifa.ifa_ifp->if_fib == fib) return (true); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index aca98d2b86b2..20e19b2197d7 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1805,7 +1805,7 @@ in6_localip(struct in6_addr *in6) } /* - * Like in6_localip(), but FIB-aware. + * Like in6_localip(), but FIB-aware and carp(4)-aware. */ bool in6_localip_fib(struct in6_addr *in6, uint16_t fib) @@ -1816,6 +1816,8 @@ in6_localip_fib(struct in6_addr *in6, uint16_t fib) IN6_IFADDR_RLOCK(&in6_ifa_tracker); CK_LIST_FOREACH(ia, IN6ADDR_HASH(in6), ia6_hash) { if (IN6_ARE_ADDR_EQUAL(in6, &ia->ia_addr.sin6_addr) && + (ia->ia_ifa.ifa_carp == NULL || + carp_master_p(&ia->ia_ifa)) && ia->ia_ifa.ifa_ifp->if_fib == fib) { IN6_IFADDR_RUNLOCK(&in6_ifa_tracker); return (true); From nobody Tue Mar 19 21:25:04 2024 X-Original-To: dev-commits-src-all@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 4Tzl9r5vkgz5FV6k; Tue, 19 Mar 2024 21:25: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 4Tzl9r5JLDz45V3; Tue, 19 Mar 2024 21:25:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710883504; 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=McnsxoQENJ15sY0qdUIrgxQfTlE8PUi7M6WQnYTMc2o=; b=SRo88psxPKvPahlWRhra7V6SyWS8GbukEFzg2HqUjSbXVAZRNLQkVMMskncx2nLN9sbWgs fenQCtpQlHtLv+o7HM+iuTtHjTauTX490uupP7RWvANQj+EEyxM2SgTUkfPCb0IG8uc0jT Hrtxy+kyJcQFcWluwxlNUSrm5uxaIiZ5H5CSOch7bCFX3QrJEdLtqwcAwYX4oz+fQ6Wtva /bgVzDZtHevDtGgWs41l1LbqVRk1SWk8N5LpSdPeitnKit6XtBZU99HxDKskP7mMzlFa9W YJsOqLKeYmnUxMpP0PzjiDHYLh17Ldb94+7L95m09R7AKDhhJjQygL9vlP0wHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710883504; a=rsa-sha256; cv=none; b=D9O7tp9h5M0CzZkvLR8AXJAcyZAesbo8MZn8CGEhU7/DL1QEhy2bllZlbR8dnJ1qBMIWDT 45XD4Y6sBAyrDY49zbgiK9GZYRNS9j2V6qQM0Bh5dXfoXDiRrkx6YwYQqfRnAEhF7Z1wzv utpIykaTK0rNPfh5hIcfStvEcIm5o1zPU20FWBIqIrxHGrQMnpMPHI9fP5lHCrQ53RMwA9 LiWkFwuCM2UthJ05uCDbcR4hwgY+2SRRtzTYWq9tWgCAb0JnugK63iRdGGMCtOOEbHBUww WkdyzhZedMmPaIce/4A47xyYKpWglQnsZLyQOnc8w0gFMBTyTsbfv1iWWipgiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710883504; 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=McnsxoQENJ15sY0qdUIrgxQfTlE8PUi7M6WQnYTMc2o=; b=vR+4ZDWjJ2SNuRvqDTduFvvkHPF/X+qdpHfUbreLBiXRu3ukVmSeSsOUpvP2OMhFq7Xs6K g+7MkPZqnKnJ6mvVHzxPsSFAESvfostjR89aU2QRR5tl0YEg2GDuUz3j5kqd6J7v0a22w+ MXNDCFmkkinySDhXVtNFD2B9JJhXY8rwsWLSfmxoMqyjvqZj/KUZlWuuwiGjlYwBUJHpiY Zv1YC0gSKbG9NFLC/NXnPZDf4Nyus0QdY8DPCzZMXTs2SBnOeW6mYvs8ruzXYzdvhEtdBW g5MTIdEVW6Kq29T/6VHXnHg3YRcihMJYmzWq8RBgGguh3jWpYr1XBDBlu9oZDQ== 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 4Tzl9r4nsDzNvq; Tue, 19 Mar 2024 21:25: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 42JLP4IQ092151; Tue, 19 Mar 2024 21:25:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JLP4XJ092148; Tue, 19 Mar 2024 21:25:04 GMT (envelope-from git) Date: Tue, 19 Mar 2024 21:25:04 GMT Message-Id: <202403192125.42JLP4XJ092148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Nuno Teixeira Subject: git: e37471440e60 - main - Add myself (eduardo) to the calendar. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e37471440e6000d8ce1dbe079f5862529928afe3 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/src/commit/?id=e37471440e6000d8ce1dbe079f5862529928afe3 commit e37471440e6000d8ce1dbe079f5862529928afe3 Author: Nuno Teixeira AuthorDate: 2024-03-19 21:21:04 +0000 Commit: Nuno Teixeira CommitDate: 2024-03-19 21:21:04 +0000 Add myself (eduardo) to the calendar. Reminded by: mckusick --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 78ed86fe593e..f2f374f35c76 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -176,6 +176,7 @@ 04/26 Rene Ladan born in Geldrop, the Netherlands, 1980 04/28 Oleg Bulyzhin born in Kharkov, USSR, 1976 04/28 Andriy Voskoboinyk born in Bila Tserkva, Ukraine, 1992 +04/28 Nuno Teixeira born in Aveiro, Portugal, 1974 04/29 Adam Weinberger born in Berkeley, California, United States, 1980 04/29 Eric Anholt born in Portland, Oregon, United States, 1983 05/01 Randall Stewart born in Spokane, Washington, United States, 1959 From nobody Tue Mar 19 22:17:22 2024 X-Original-To: dev-commits-src-all@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 4TzmLB4sD0z5FbgJ; Tue, 19 Mar 2024 22:17: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 4TzmLB4J6Lz4Bs6; Tue, 19 Mar 2024 22:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710886642; 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=F+5VsW31ZpgPsCUHoG3aVit4Rz0qE6V4a8DwhkArc0I=; b=bYvepibluiFZPnzGzH/NMGZc/MUKZDQ2eZ/4wF/nGTeBNN82cEu4NWkzlQAJBTeIT+edpb TxUdpXjIsT90+f9G0IMlu3el9J5BBNbuVM6efW6D2rrubpzkDSt3O66NX202LS1j0c/i/v HlcuBB8NynuUflwaL6hEeTKA3UXMX5U8bXdwnEwMxweqH1rnTK7jmT/n2IoCANCoFmiWIu bzOdbW9a9i4NwPlIDQsMLipigzrzePXNCUmY7IEyC5IX6orwbRopqW/A8wHl7PP2sfLcH+ Fssue0bWFzj00nw8jpUuo9hUQUQ5N+fwmCa0wFZWK63SkLtj5nxuYaIbhIdeVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710886642; a=rsa-sha256; cv=none; b=kHllffJgT1Q+g3EoC9CQqrI7H1S13pxmBjFxAElVRxRnaSs2lr4jNiHOTJnwOwBK+HQolT 5lEzDiXGKNJXZxnmsl5X7ZRFfdwRxQqwJHWDmcucNYaDqQoldGte1ihpmB7fBSAMcw8d/N xJtl+TPuhk+QSsWk/JxKobFmx+eQ8KmWvsaRD/fHuknSGEu7XVZqY7o2ggDdWhb2yvlM6a 1nuGFGKltcZYVRvGFJOOQ6QaUi5jwA8gAsB5JwegDCr0htScSvyyfuf/O46Wznjchtr1lG hG73Is5XK8XBOsnff21V4YRGCtp7cgj8GNm3+aiAebhV9ardFBj6s8GinR1CNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710886642; 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=F+5VsW31ZpgPsCUHoG3aVit4Rz0qE6V4a8DwhkArc0I=; b=T55/X6ZZtAr+Eg56J8XC9xrPdbw19Ff19BXlFhVGiLyrstNHnGJplzfTVkR2WUXTsXjy02 sMC5d61cqtcak74dtTG2FBg7Nj4owo1FIPBnq3mH0H8HcpSBYe23QuFCsR7c+KdgeeDnlx TwynHx0nvNRjpBnrxkZAwd414QtkQ0ebhNgm3lt3Rbtzv7fesaV40Wg9RINUr8qd4Bgoqg aoYRaC1xF6O/f5GZTg9JlSgJE3misiJpYm4NAGKwue8v2q40w+5ZUADwlAr8cQ84ZhP0nt Gp1xNFbLPhBCmJy/iRn6khEtlgLCqRw/CPMmGsuQwWiXnGPiJQ7qh4w1RPDlcA== 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 4TzmLB3vZyzPmk; Tue, 19 Mar 2024 22:17: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 42JMHMWZ077777; Tue, 19 Mar 2024 22:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JMHMq0077774; Tue, 19 Mar 2024 22:17:22 GMT (envelope-from git) Date: Tue, 19 Mar 2024 22:17:22 GMT Message-Id: <202403192217.42JMHMq0077774@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: a1e516a731e3 - main - arm64: Move curthread setup earlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a1e516a731e3d45e10dab65bb8ccb0484f316d55 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1e516a731e3d45e10dab65bb8ccb0484f316d55 commit a1e516a731e3d45e10dab65bb8ccb0484f316d55 Author: Isaac Cilia Attard AuthorDate: 2024-03-13 18:06:19 +0000 Commit: Colin Percival CommitDate: 2024-03-19 22:16:48 +0000 arm64: Move curthread setup earlier In 469cfa3c30ee cperciva added TSLOG profiling to link_elf_ireloc. This requires curthread to be read when the kernel linker is invoked, but it hadn't yet been initialized. On amd64 this was harmless since [gs:0] was readable; but on arm64 this broke since [x18] was not readable. Move the curthread (and associated PCPU) setup earlier on arm64 in order to allow TSLOG to work there. Fixes: 469cfa3c30ee ("tslog: Annotate some early boot functions") Differential Revision: https://reviews.freebsd.org/D44317 --- sys/arm64/arm64/machdep.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 50b2cd15df3f..d566a8e2298c 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -920,6 +920,22 @@ initarm(struct arm64_bootparams *abp) update_special_regs(0); + /* Set the pcpu data, this is needed by pmap_bootstrap */ + pcpup = &pcpu0; + pcpu_init(pcpup, 0, sizeof(struct pcpu)); + + /* + * Set the pcpu pointer with a backup in tpidr_el1 to be + * loaded when entering the kernel from userland. + */ + __asm __volatile( + "mov x18, %0 \n" + "msr tpidr_el1, %0" :: "r"(pcpup)); + + /* locore.S sets sp_el0 to &thread0 so no need to set it here. */ + PCPU_SET(curthread, &thread0); + PCPU_SET(midr, get_midr()); + link_elf_ireloc(kmdp); #ifdef FDT try_load_dtb(kmdp); @@ -952,22 +968,6 @@ initarm(struct arm64_bootparams *abp) physmem_exclude_region(efifb->fb_addr, efifb->fb_size, EXFLAG_NOALLOC); - /* Set the pcpu data, this is needed by pmap_bootstrap */ - pcpup = &pcpu0; - pcpu_init(pcpup, 0, sizeof(struct pcpu)); - - /* - * Set the pcpu pointer with a backup in tpidr_el1 to be - * loaded when entering the kernel from userland. - */ - __asm __volatile( - "mov x18, %0 \n" - "msr tpidr_el1, %0" :: "r"(pcpup)); - - /* locore.S sets sp_el0 to &thread0 so no need to set it here. */ - PCPU_SET(curthread, &thread0); - PCPU_SET(midr, get_midr()); - /* Do basic tuning, hz etc */ init_param1(); From nobody Tue Mar 19 23:15:49 2024 X-Original-To: dev-commits-src-all@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 4Tzndf0YrYz5Fk64; Tue, 19 Mar 2024 23:15: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 4Tzndf02htz4J0V; Tue, 19 Mar 2024 23:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890150; 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=OFlvVIro0EWEe3mQcYwt5fD49Vo0CNSnIctk1/HDDBk=; b=xvzAG8V0e3ackM55kKFUCCCBxQjcHepfbmSPGSzuC5tTXHFX/5aCl8BvezMmoAJ+7H5Kk2 1MDpyZEaW2d9KIdNqayOGaAhJTnUfryuDZwOOgc9hti+tYM4xEilBNJA5p0qTna49zT5Sn EuvK2IP6sTCJ2PlcPN78nl5Z0unWb+bPAyNuApUBRH6a2udHiGX/Iprn5U57zQfFJaOClP qgRmCbw8/NeTtydy4xW8OrlI+YY26GL/2x9VvG5j/Dlfs0t/C6TYln9bRhpF6XkcjxldSz 7Dc6yx4YJHxqoJq7EckIrqJrjDEArWWvARIas107zuhVg2u6w4BobESJEBhirg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890150; a=rsa-sha256; cv=none; b=vupTxXNG1GvuQbHY32EX9n87r/QmfIQuiAYwz4ZSniokbouLhWQG8DjcYAqJvbP7bYmMq0 /Erm+w4ZwkrTAPW074Oa6RqW2BIRw8TxaO5vp9+ZoN+mpz8eijMEi2B5opEaQYbwR6LPKC 7iX6XLVMDpcZfMilKDBSkBS+uRwod4d8XtewTTfhbiI7nTrGSCxfS8enFrzN0e9Vz8+ygI LsNb4+NR/FD5OrJGVCn2Pzz9vR7ejVnWA3+zyR8Cw9vAOw24Y/pbLRVE5Ww9UGg+roawfx nXUOLfS0+Cpi0guI9ev72b9UNDOHwGNaI8gDnrUX6zrTWJAW1KJMC8rZVDj50w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890150; 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=OFlvVIro0EWEe3mQcYwt5fD49Vo0CNSnIctk1/HDDBk=; b=V+2IzdCx+0xQQ9NmjXbmm7E7vC2pnqj4EDKTo4Vp45tjvNZMSdRt/dW6W9B4i5WifUwTGU X2jqPc2Gq2IDyvkjjVmwmYn+6isNwjhZwGCUo23PZVD93ZCe7eq6Qmz9mUMOWdyAeqec2f 5MOjJQEkKdxkJi2vAzKF0kIFWgJiCF7XxfembMoGjwIxom6h1gdW1jqnmot5GRnspClEYq m5yH8HseLYhis73XjFgEWFqB1SevZJmUZg/eN2XPL1hWaYDIdI17dbxUX/5pmZ6054n96F 5vXeGNKhJpw6Mlb63zPvpL9lpz3lA0d1I8lMvzu8NOrbDzgO4SQ4msRwBSgoJw== 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 4Tzndd6lwDzRJ7; Tue, 19 Mar 2024 23:15: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 42JNFnJY078909; Tue, 19 Mar 2024 23:15:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFn0X078906; Tue, 19 Mar 2024 23:15:49 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:49 GMT Message-Id: <202403192315.42JNFn0X078906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fba329a195e8 - main - Define stack_t in sys/_sigaltstack.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba329a195e8cfd52a0c59314d40f0143f32af10 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fba329a195e8cfd52a0c59314d40f0143f32af10 commit fba329a195e8cfd52a0c59314d40f0143f32af10 Author: Brooks Davis AuthorDate: 2024-03-19 00:24:37 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:25 +0000 Define stack_t in sys/_sigaltstack.h The sigaltstack(2) definition needs this type so make it available without all of sys/signal.h. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44383 --- sys/sys/_sigaltstack.h | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/signal.h | 24 +------------------ 2 files changed, 66 insertions(+), 23 deletions(-) diff --git a/sys/sys/_sigaltstack.h b/sys/sys/_sigaltstack.h new file mode 100644 index 000000000000..d1378eeeec4f --- /dev/null +++ b/sys/sys/_sigaltstack.h @@ -0,0 +1,65 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1982, 1986, 1989, 1991, 1993 + * The Regents of the University of California. All rights reserved. + * (c) UNIX System Laboratories, Inc. + * All or some portions of this file are derived from material licensed + * to the University of California by American Telephone and Telegraph + * Co. or Unix System Laboratories, Inc. and are reproduced herein with + * the permission of UNIX System Laboratories, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SYS__SIGALTSTACK_H_ +#define _SYS__SIGALTSTACK_H_ + +#include + +#if __XSI_VISIBLE +#if __BSD_VISIBLE +#define __stack_t sigaltstack +#endif +typedef struct __stack_t stack_t; + +#define SS_ONSTACK 0x0001 /* take signal on alternate stack */ +#define SS_DISABLE 0x0004 /* disable taking signals on alternate stack */ +#define MINSIGSTKSZ __MINSIGSTKSZ /* minimum stack size */ +#define SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended stack size */ +#endif + +/* + * Structure used in sigaltstack call. Its definition is always + * needed for __ucontext. If __BSD_VISIBLE is defined, the structure + * tag is actually sigaltstack. + */ +struct __stack_t { + void *ss_sp; /* signal stack base */ + __size_t ss_size; /* signal stack length */ + int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */ +}; + +#endif /* !_SYS__SIGALTSTACK_H_ */ diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 0ab2a205a92c..6112b69886f3 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -40,6 +40,7 @@ #include #include #include +#include #include /* __MINSIGSTKSZ */ #include /* sig_atomic_t; trap codes; sigcontext */ @@ -426,29 +427,6 @@ typedef __sighandler_t *sig_t; /* type of pointer to a signal function */ typedef void __siginfohandler_t(int, struct __siginfo *, void *); #endif -#if __XSI_VISIBLE -#if __BSD_VISIBLE -#define __stack_t sigaltstack -#endif -typedef struct __stack_t stack_t; - -#define SS_ONSTACK 0x0001 /* take signal on alternate stack */ -#define SS_DISABLE 0x0004 /* disable taking signals on alternate stack */ -#define MINSIGSTKSZ __MINSIGSTKSZ /* minimum stack size */ -#define SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended stack size */ -#endif - -/* - * Structure used in sigaltstack call. Its definition is always - * needed for __ucontext. If __BSD_VISIBLE is defined, the structure - * tag is actually sigaltstack. - */ -struct __stack_t { - void *ss_sp; /* signal stack base */ - __size_t ss_size; /* signal stack length */ - int ss_flags; /* SS_DISABLE and/or SS_ONSTACK */ -}; - #if __BSD_VISIBLE /* * 4.3 compatibility: From nobody Tue Mar 19 23:15:50 2024 X-Original-To: dev-commits-src-all@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 4Tzndg17Z1z5Fk67; Tue, 19 Mar 2024 23:15:51 +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 4Tzndg0hfhz4JBV; Tue, 19 Mar 2024 23:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890151; 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=9XhNguifRu6W+chxF1E8ZBZSNlrInpb7YzEIEcGDiAQ=; b=AEAjibmrK+TuzWbjYkEv0XffGQaGKhC6+xbi1r4JnluyDGj/YeWMSubNk3aQcIdD8ARtPF e+o0vmfoRpC73XS0hdPV55sIQZsoXWWsUrj4tDLBLSk9vCroa2fI4RKj4lJfzxlJI6vtB7 zs+0QgCRNg/n8zgB/kn7Uyy827C3hU0DFzxCfQqURGY7INhz5sW6AqcKlhn+1tHHFUos6e XtlVcPQqfGXcsIEl1Uosza+cKgF9d0PB438gbzrxPVhoBAi+0vONBR88HHrgzWlchbliy5 pjAx49cllU2GHoehmG8OZwK+9t3PTMb4eY8KmgD7Evnb0ItcxhzSyvWmtswlNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890151; a=rsa-sha256; cv=none; b=KNgGbnLO0Yb5ukl6ThB+0WcH1a1EemO1PQnj/QrBy28nNRGo/SX+qbd4xuMycGs+bFBaBX KpL+xT9zC/1L5uYtAt6JaFIYpYq6uRqwU3tdfEMXgVOY9cPVjz7RmBNvxpYhQguH2RXJS8 In9N15wMyBAYS5/78ClXpTCdZQpKGlVn/qAnwi4/PqUj48y12d9HDJVwlkIvnGa83Ruo3U ChzlREZBbkyhReNf7xXm+uubN2jxn610cLgwD5r8n7ZBw7orDXk3rxzdxt99fhVRScFl3e kRV4Zp4Vynv3LSNfuM9PCPTqR9Eyv58+BLCxFq9yQiRHt2oqI0r0GdxNqeSi4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890151; 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=9XhNguifRu6W+chxF1E8ZBZSNlrInpb7YzEIEcGDiAQ=; b=pxJ1o3nRj62Pdu5xZOYYDqclFP6TnaYBsgRyljfPMtbQCP5o6o5ytatAV/upqEQJdJekch pWLjEvSFMAWoZV7UutgWc57ARP8X7pWsfDhT+MAvuWj7goyAdiYC/QuT8Hq0duVZqqnaNZ HxwQ4EIUnC4G+2e1vGSgJ9p2Aj2noDX7Gt/cDCw36kMBK9SuVbvjSxEuXd/rE2UQpr/z0p MTgfBM68MoVSE9cNs6Uh7eOtYtdEuqKtxw9Z55dy6RV2tZ4iEhv+5s4OhWtdLOIhjS31Zq FqP4sKFkNI+ugfzY9gVWCPCNxnYxJYiNT+geqjnw5mDj3qXpDnrVbpE8Y0mtOw== 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 4Tzndg0Jj8zRt0; Tue, 19 Mar 2024 23:15:51 +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 42JNFoo5078958; Tue, 19 Mar 2024 23:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFo4K078955; Tue, 19 Mar 2024 23:15:50 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:50 GMT Message-Id: <202403192315.42JNFo4K078955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 694ef157b9b7 - main - freebsd32: freebsd32_copyinuio takes const iovp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 694ef157b9b755b13fb724ef02b7964f59008d8c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=694ef157b9b755b13fb724ef02b7964f59008d8c commit 694ef157b9b755b13fb724ef02b7964f59008d8c Author: Brooks Davis AuthorDate: 2024-03-19 21:47:55 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:25 +0000 freebsd32: freebsd32_copyinuio takes const iovp We only read the iovp so make it const like in copyinuio. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44376 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/compat/freebsd32/freebsd32_util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index facbf00a4c51..d96a85f922f9 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1191,7 +1191,7 @@ freebsd32_ptrace(struct thread *td, struct freebsd32_ptrace_args *uap) } int -freebsd32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop) +freebsd32_copyinuio(const struct iovec32 *iovp, u_int iovcnt, struct uio **uiop) { struct iovec32 iov32; struct iovec *iov; diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h index c32c7a2ef4c1..dca61da714f0 100644 --- a/sys/compat/freebsd32/freebsd32_util.h +++ b/sys/compat/freebsd32/freebsd32_util.h @@ -114,7 +114,7 @@ int freebsd32_copyout_strings(struct image_params *imgp, uintptr_t *stack_base); int freebsd32_copyiniov(struct iovec32 *iovp, u_int iovcnt, struct iovec **iov, int error); -int freebsd32_copyinuio(struct iovec32 *iovp, u_int iovcnt, +int freebsd32_copyinuio(const struct iovec32 *iovp, u_int iovcnt, struct uio **uiop); void freebsd32_rusage_out(const struct rusage *s, struct rusage32 *s32); From nobody Tue Mar 19 23:15:52 2024 X-Original-To: dev-commits-src-all@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 4Tzndh3bHnz5FkH8; Tue, 19 Mar 2024 23:15: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 4Tzndh213bz4HtY; Tue, 19 Mar 2024 23:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890152; 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=InbqaSD2yMpTRUwdRgzo13ZmHBB5CfoS9JgOc4K6NEo=; b=IU9sPAG601nDMrApOiCWCT4JVTOUzl2y8btG74gb6Ly/VPlVhRfnqZp6Vnf9XK5ZsNxpfv eJbvblISGaulzmponCFP4koGdjpX8OMp2dYqEDLP7UZ+iu0JkWranL0QvPzn+o54UNVb4J K49wQ58IlDup2aOq+pvjVUYGtziaKcJcKrAKwB1OWldRqM96IehkGjho2WTJRNNKLaeiOQ SulWeCfJl6HPlQxP4lRt3/2GR638w9HgrhT1v8ZgA6tdW78Zx+YvbLGbCXBWze9LeQj2wa i8SpsYFnSXlAlUyeQMmXoRwSx5tbhNliT6I7GvAuVW4YU3NYbYFzm8Ulr3Ir7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890152; a=rsa-sha256; cv=none; b=RTXTBaRrQfkEWYlzoOyuDEugxonfxACWKRFqWNfBLDW1l7DTtdVHby02WOoeTFQpEk7R7u U4f8v3IBHIo1ImcXsbAFSI7KH6UrbThU5knbE1+ufTsbJLPZepzW6PB5DoG/EY3hzl4U2J cIXUwhs1WSEtaPQVsMJw3AxlVnqvcmrF169TPaB7K9FFwUeiLK3IyAlrO7Bbi0oF9Cn3Cm yFtqJ6JgSiZBE3kXKT9GkwQxHC9HMvhko8cE7XbeeX7OXTEcViq9nXNTKqOUG8K3qd+jkz QJKY5cQHUfFFBOmTfzRB80IcnSsmjtqlgBzRMhLziQOnvfVVzAEurY9UnbmTpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890152; 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=InbqaSD2yMpTRUwdRgzo13ZmHBB5CfoS9JgOc4K6NEo=; b=KLI3Wg94951azTGhs8nWTMC17FvZHM0rs4an4/Gu/Tu57b9yKB2zEAS6wnBfwiaJjB0Zyo 2mUdi6sWL8mIqycpe5WLnQEhXW+afsowm0UyZreNLzpADAimZxd8qZ/BjYzxkgnpNZp5eh wpgDxesf9Gf/0F9HvM+lNxc//cur77BlsIgnhhnYmj4QRUltkrtpCPvT4MFV/1rT17CxnQ ePF/UDOfVxSzC8elATfpdG2fZv235+wR68VCHSAguXYecS6D8DnflDkpdTqa/gRdEiylf4 YjhIMVodR3CKx88Jxh5XE2c6CsxcCrD0cblc9hmbxzYF3cfreAEHWLRmNyi1gw== 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 4Tzndh1bV9zRvB; Tue, 19 Mar 2024 23:15: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 42JNFqgZ079006; Tue, 19 Mar 2024 23:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFql1079003; Tue, 19 Mar 2024 23:15:52 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:52 GMT Message-Id: <202403192315.42JNFql1079003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 128443a9f2b2 - main - syscalls.master: fix readv and writev iovp decl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 128443a9f2b21df4bc844faa3a7288cd081d18c7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=128443a9f2b21df4bc844faa3a7288cd081d18c7 commit 128443a9f2b21df4bc844faa3a7288cd081d18c7 Author: Brooks Davis AuthorDate: 2024-03-19 21:50:09 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:25 +0000 syscalls.master: fix readv and writev iovp decl Both take const struct iovec * and only read the values. Reviewed by: olce, kib Differential Revision: https://reviews.freebsd.org/D44377 --- sys/kern/syscalls.master | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index e85bc2796401..5775e1573c75 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -784,14 +784,14 @@ 120 AUE_READV STD|CAPENABLED { int readv( int fd, - _Inout_updates_(iovcnt) _Contains_long_ptr_ struct iovec *iovp, + _In_reads_(iovcnt) _Contains_long_ptr_ const struct iovec *iovp, u_int iovcnt ); } 121 AUE_WRITEV STD|CAPENABLED { int writev( int fd, - _In_reads_opt_(iovcnt) _Contains_long_ptr_ struct iovec *iovp, + _In_reads_(iovcnt) _Contains_long_ptr_ const struct iovec *iovp, u_int iovcnt ); } From nobody Tue Mar 19 23:15:53 2024 X-Original-To: dev-commits-src-all@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 4Tzndj4wtwz5Fk69; Tue, 19 Mar 2024 23:15: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 4Tzndj2gPHz4Htv; Tue, 19 Mar 2024 23:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890153; 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=9CEHZBbMKWcRAjL9nlHs4vy6xdD0WObeNycObQktIAQ=; b=tt9q4Cp4YJkmz2nL1dz6DwEJBq6lQSHpRhTlXgxomPcnPcyYvqlAygSyz27juGDdUCJ1vK xnIMApLD4q7EV6/XtrAvTJ33NgaijK9+f8v8KH3319Zi07D8LwJCfE2HtHfRLVOv6ee6ta oTR8Jre+fK7x35UqHHFDB0+dKcvvPtV9WyfkDa9DJJIvWMyBKSIxiyfcZfABS3L1texISv GaCqIkFfHrralMakWLMIVPJ4BbKB97NAMkR8EgaJTgG7NXV3EYUjDwM+xOCYEyOKS+6vCA 7KgLmh5H22SaVQ0ja8KX6SHW0bh1km/2Z1fTtiWZozpIw4F/+HKhHWMa8L1gzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890153; a=rsa-sha256; cv=none; b=tay9eFMNtDBxMxiXBN8fe4bryzgVSqAcWW2WHBAp2X9l9gC3FJo5jtreorZWHmc4UEYMmg dj83OgBvWP4C6Se4PbrmAe+OO31MncU7tUba+Dhq7Z6L+vFgKYN/aFEY04LpZkWmmfwUsx 0XcpsQn2EreKFeELWH/w5druCq8ECVmyn6R1TkUEJfZBd1wCqS5c5LzMw2o1aVsBkurok2 LJWXEPbNsbgN9abhVgM3PQRjz1BYUDpoCGTU0jVIJN/f/ar0JlcBNjdI2h8KfyVbewgfs+ ViCM21WXEa4v2uHxkwouPn9KVef3KUbhjAezc4WCNWJce9hUc3ae+2iMOqN6iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890153; 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=9CEHZBbMKWcRAjL9nlHs4vy6xdD0WObeNycObQktIAQ=; b=TC1jU1sOH14aO7S82c6jG79QdETXoqMud3a9SERMBYp93P5q31TYpRuSELctyQVs8ODkfr QfCi4pTmHu+iExBxaywLJa82RDdtOd7BYM6huiTk5jMn1puhWWFl3s6PWhL0tMMnTHBg0j +NgavfQ+hJbGLsjwCAGjO6A0BjTI18zu8NZlgWFnAv8V/tRuD3bolFuq81MX1lb6eVZ5i7 ZgbxGFLlzzHx1/YvGBnUObiC9zhLea8iDfx8fSeGKnazIWf0g+AMGVLDoDg28ognFi2lIQ bRduqgBYGkWrs0dhyVfNOAvrvz1//vusVPOmFGvoc2Es3HxnFz/AV/FZr+OTeA== 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 4Tzndj2D43zRTd; Tue, 19 Mar 2024 23:15: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 42JNFrhv079045; Tue, 19 Mar 2024 23:15:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFrYf079042; Tue, 19 Mar 2024 23:15:53 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:53 GMT Message-Id: <202403192315.42JNFrYf079042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d8d4ed26c92d - main - syscall.master: fix aio_suspend signature List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8d4ed26c92de27cf883d05fddb97a0c23123215 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d8d4ed26c92de27cf883d05fddb97a0c23123215 commit d8d4ed26c92de27cf883d05fddb97a0c23123215 Author: Brooks Davis AuthorDate: 2024-03-19 21:50:18 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 syscall.master: fix aio_suspend signature It takes a `const struct iovec *iovp`. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44378 --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 5775e1573c75..3ce60f7d3820 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1645,7 +1645,7 @@ } 315 AUE_AIO_SUSPEND STD|CAPENABLED { int aio_suspend( - _Inout_updates_(nent) _Contains_long_ptr_ struct aiocb * const * aiocbp, + _Inout_updates_(nent) _Contains_long_ptr_ const struct aiocb * const * aiocbp, int nent, _In_opt_ _Contains_long_timet_ const struct timespec *timeout ); From nobody Tue Mar 19 23:15:54 2024 X-Original-To: dev-commits-src-all@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 4Tzndk618wz5FkN0; Tue, 19 Mar 2024 23:15: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 4Tzndk3cj9z4JGs; Tue, 19 Mar 2024 23:15:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890154; 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=9zyTqU3GDPyCZpQBzn929AgJRpPvh5clBcwmn+4fmJw=; b=nnx0ns9ivUPE9ggmAH6L7mrAw6/mcyh8EinHEW7/Rz4zgp67oVjHHF73mXO9N6g6B8Mpnv 0/Jk8X9T0CPHXfiwgcPv0Z8iMHGvXT9Pxuhv2FCRJ3YgeQVwVXK83jJuuZfkI2wEPpAPEW NXPlq9trhiszkveHEezBfpJNiecTUuNiqH/S850kWGXJNHcZ+tUQYBiIdpbMI4jdMjf0Vy hxlZh5NypaxjGkjifxGldTpFUT4Tnqb9amvqE20LHuVECMTkxoCUuRDBT7JUnivLIoPQUX 3LUn8fATVY0S5UrJtdFG0zESQTKcdPkRwQhMy2G8LR0jvjroQ/lfUTU1K7K3hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890154; a=rsa-sha256; cv=none; b=a5NA5NUBnNeL7T9bfygO+ptJGz+L8yDStTVMLUqudKhtNfqdI9WcFa2bp0JUwMrIWiRvpH pDjymHjLRp0jGR6lOLZaC0XKOY/DfSXKuZoWBf3p5LBQ8uYnMjviOZA+pIcjjtEY+rGRRC fDlb1MLOFR5Z449ljrDRuY62jYtz9fnjQiIfKtbbWBKjogJdTvRtIn/DaGgT6PUN/zON9b 68TdvpY/j/OVFxb7np9LnPMK024npnf5rapDOHrOCZbT8nbn8NVPaNLpObAwfiRR6irP0I fb0iBprsmtBrREe+ybnPgpgQyyc+YNo3ZHJcOFDoT6njI68pWXl+3g9G3LrNtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890154; 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=9zyTqU3GDPyCZpQBzn929AgJRpPvh5clBcwmn+4fmJw=; b=BGG7xPic37QgJF8Wfs6yD1dzjUIhbDRZdEmQU0nu8TzVCnMMqHHGV9MWoDHJMxAmcjBW0J H5seOJqOImFkiuD4yxHLpDrlNLDtkQUP0Jsl1IBewYlegKL7pwMlvq/bzEMhNsWxFePQ/O NFNyfDVWzsjvzTfxNUHwTvcVl61A3/8tkWXa7p9/AwKQ6QV7cU+HHgy3Qci85ELLj6aUPT elK1bf2LUWRajZO8ydMNZuBi4UWQy3apeyjs1jtSjrbxIY6ieMEx7KGASitr5RqQqnwZ0d yFA6Nruwj1bnd4LE/nHtVavU7soksHLc2ed9WGvCcFscvTwOVU0DGCbAkEYyqw== 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 4Tzndk3DWszRWJ; Tue, 19 Mar 2024 23:15: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 42JNFsh7079088; Tue, 19 Mar 2024 23:15:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFseI079085; Tue, 19 Mar 2024 23:15:54 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:54 GMT Message-Id: <202403192315.42JNFseI079085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7936d4e4d082 - main - syscalls.master: align with sigfastblock declaration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7936d4e4d082136b54994da0ac1246967a899f2a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7936d4e4d082136b54994da0ac1246967a899f2a commit 7936d4e4d082136b54994da0ac1246967a899f2a Author: Brooks Davis AuthorDate: 2024-03-19 21:51:40 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 syscalls.master: align with sigfastblock declaration sigfastblock is declared to take a void * argument in the manpage in headers so declare it that way and use SAL annotations to say it interacts with a 32-bit word. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44379 --- sys/kern/syscalls.master | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 3ce60f7d3820..0d3cc796bdf4 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -3231,7 +3231,7 @@ 573 AUE_NULL STD|CAPENABLED { int sigfastblock( int cmd, - _Inout_opt_ uint32_t *ptr + _Inout_updates_bytes_opt_(4) void *ptr ); } 574 AUE_REALPATHAT STD { From nobody Tue Mar 19 23:15:55 2024 X-Original-To: dev-commits-src-all@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 4Tzndm1CLqz5Fk6M; Tue, 19 Mar 2024 23:15: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 4Tzndl4mYhz4JFC; Tue, 19 Mar 2024 23:15:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890155; 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=gBguxGFgHpVJWf2v082D1Ms7IlkPlITr3oWlrcWG2qo=; b=LTj1wdKnHQ/2gGXs0cUtSGmIjnkxVCGdTPRuOKa+fbGfmN17hWqeSYVZaps4tNJKM4W6/w GmAojf2QpxuhP5quCr3aiihWoHt1pq7sJsBYSvchPBWbsevqz6IGF0XnUfB52mQFZm6yCZ 8h/n2+v5qLcE06CZ/C77VWd6xejIW7x9MAlvlALDui+NbrFBfbZAx9sB0flVLduHm/qMJk 5cyOd2PBYN6JfByIwuJasRp78/w4mDe9T2Sy1zelj1S4Rl9CwIVASfzMo6OH0amQ2jBIhl 7zON/+ux5ZI1+R2NTGUAbnJQT+4WcurLptfllUdzkEVHSbOA4B1hXnFcO6eqDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890155; a=rsa-sha256; cv=none; b=NaeIcZCmpnPQqdx5cxlXeWs3Nreh485ouNhybNpAc5DgF0ZpB9XONfcq1rA/bpuPosjvI9 VTXkCniMMHPeI9UIpCvA7XctY2sc1iidAOMHN/MijRb9JRd+kuLYuW7Q7WwAzlAznyGrIx +lSPSUoVetWEHS8Y26t9Qr1ZhZRX3mRmfN0xIqLSEUYUCovcIHOD3XqFMBmHxya2xO2pQc chL6EOjrHMj3dkVlBrfCJsVdzNrIfYXFkqQlTr5keXwW3O+jdD9mKJ0kHJ5REnzidraxbv RnH0T4qZFBrrxFjm98aNMzDzLg+mm5hgr0565SFTyiMZUctP/DBzuQPUjEL0Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890155; 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=gBguxGFgHpVJWf2v082D1Ms7IlkPlITr3oWlrcWG2qo=; b=HrWHSuT5D6GCFE25w2v2HOjN5aMorJ8vA5nv1GYtLtN+fH0rIDRr+jdaWV4HbECEXStObf Knjr3UgY4forhxX5fdEC7+ekteSoeX8U5P7QddwkiWZRbHnn+h0acvY0jzV2aEsltnx7aZ v5b3OBKuZ7WZbFq5KIL3XkD/yDfRN8/481MgXInMSoKbVa1FkRAQUvgdmZkjt3QEtxzzrs +//Alavzq98ukYVmR6hYsVCdbPbzXpo4iKKijMzsiOZVGSDzFLPhJmKPYEvBAb1TUIm8+7 bsiZSCcIy3PTlGCGfZGdrkmmmyiTeBhXWM3W8IpTdVlVMWf6U8E6GAvN6I/Kkw== 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 4Tzndl4GzXzRt1; Tue, 19 Mar 2024 23:15: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 42JNFt47079140; Tue, 19 Mar 2024 23:15:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFtnv079137; Tue, 19 Mar 2024 23:15:55 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:55 GMT Message-Id: <202403192315.42JNFtnv079137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d060b420e0f6 - main - freebsd32: struct siginfo32 -> struct __siginfo32 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d060b420e0f6d8f6535dfcda6f580dad3f5613d3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d060b420e0f6d8f6535dfcda6f580dad3f5613d3 commit d060b420e0f6d8f6535dfcda6f580dad3f5613d3 Author: Brooks Davis AuthorDate: 2024-03-18 21:37:39 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 freebsd32: struct siginfo32 -> struct __siginfo32 In the next commit I will update syscalls.master to use struct __siginfo (which actually exists) so this update will be needed to make generated files (from make sysent) align. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44380 --- sys/amd64/ia32/ia32_signal.c | 4 ++-- sys/arm64/arm64/freebsd32_machdep.c | 5 +++-- sys/arm64/include/frame.h | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 14 +++++++------- sys/compat/freebsd32/freebsd32_signal.h | 2 +- sys/compat/ia32/ia32_signal.h | 4 ++-- sys/compat/ia32/ia32_sysvec.c | 2 +- sys/powerpc/powerpc/exec_machdep.c | 6 +++--- sys/sys/ptrace.h | 2 +- sys/sys/signal.h | 2 +- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c index d7af857524c7..dea12c5346a3 100644 --- a/sys/amd64/ia32/ia32_signal.c +++ b/sys/amd64/ia32/ia32_signal.c @@ -439,7 +439,7 @@ static void freebsd4_ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_freebsd4_sigframe sf, *sfp; - struct siginfo32 siginfo; + struct __siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; @@ -550,7 +550,7 @@ void ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { struct ia32_sigframe sf, *sfp; - struct siginfo32 siginfo; + struct __siginfo32 siginfo; struct proc *p; struct thread *td; struct sigacts *psp; diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index fc979e193d1a..d0218dc1dc80 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -49,7 +49,8 @@ _Static_assert(sizeof(mcontext32_t) == 208, "mcontext32_t size incorrect"); _Static_assert(sizeof(ucontext32_t) == 260, "ucontext32_t size incorrect"); -_Static_assert(sizeof(struct siginfo32) == 64, "struct siginfo32 size incorrect"); +_Static_assert(sizeof(struct __siginfo32) == 64, + "struct __siginfo32 size incorrect"); extern void freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); @@ -351,7 +352,7 @@ freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct trapframe *tf; struct sigframe32 *fp, frame; struct sigacts *psp; - struct siginfo32 siginfo; + struct __siginfo32 siginfo; struct sysentvec *sysent; int onstack; int sig; diff --git a/sys/arm64/include/frame.h b/sys/arm64/include/frame.h index a958ff240023..5593532ac287 100644 --- a/sys/arm64/include/frame.h +++ b/sys/arm64/include/frame.h @@ -70,7 +70,7 @@ struct frame { #ifdef COMPAT_FREEBSD32 struct sigframe32 { - struct siginfo32 sf_si; + struct __siginfo32 sf_si; ucontext32_t sf_uc; mcontext32_vfp_t sf_vfp; }; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index d96a85f922f9..6c703f14e408 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -247,7 +247,7 @@ freebsd32_wait6(struct thread *td, struct freebsd32_wait6_args *uap) { struct __wrusage32 wru32; struct __wrusage wru, *wrup; - struct siginfo32 si32; + struct __siginfo32 si32; struct __siginfo si, *sip; int error, status; @@ -1026,7 +1026,7 @@ freebsd32_ptrace(struct thread *td, struct freebsd32_ptrace_args *uap) */ data = sizeof(r.pl); if (uap->data < offsetof(struct ptrace_lwpinfo32, pl_siginfo) + - sizeof(struct siginfo32)) + sizeof(struct __siginfo32)) data = offsetof(struct ptrace_lwpinfo, pl_siginfo); break; case PT_GETREGS: @@ -3271,7 +3271,7 @@ freebsd32_thr_suspend(struct thread *td, struct freebsd32_thr_suspend_args *uap) } void -siginfo_to_siginfo32(const siginfo_t *src, struct siginfo32 *dst) +siginfo_to_siginfo32(const siginfo_t *src, struct __siginfo32 *dst) { bzero(dst, sizeof(*dst)); dst->si_signo = src->si_signo; @@ -3320,7 +3320,7 @@ freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *ua struct timespec *timeout; sigset_t set; ksiginfo_t ksi; - struct siginfo32 si32; + struct __siginfo32 si32; int error; if (uap->timeout) { @@ -3343,7 +3343,7 @@ freebsd32_sigtimedwait(struct thread *td, struct freebsd32_sigtimedwait_args *ua if (uap->info) { siginfo_to_siginfo32(&ksi.ksi_info, &si32); - error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + error = copyout(&si32, uap->info, sizeof(struct __siginfo32)); } if (error == 0) @@ -3358,7 +3358,7 @@ int freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap) { ksiginfo_t ksi; - struct siginfo32 si32; + struct __siginfo32 si32; sigset_t set; int error; @@ -3372,7 +3372,7 @@ freebsd32_sigwaitinfo(struct thread *td, struct freebsd32_sigwaitinfo_args *uap) if (uap->info) { siginfo_to_siginfo32(&ksi.ksi_info, &si32); - error = copyout(&si32, uap->info, sizeof(struct siginfo32)); + error = copyout(&si32, uap->info, sizeof(struct __siginfo32)); } if (error == 0) td->td_retval[0] = ksi.ksi_signo; diff --git a/sys/compat/freebsd32/freebsd32_signal.h b/sys/compat/freebsd32/freebsd32_signal.h index 910206c77328..379387dc3a8b 100644 --- a/sys/compat/freebsd32/freebsd32_signal.h +++ b/sys/compat/freebsd32/freebsd32_signal.h @@ -61,6 +61,6 @@ struct sigevent32 { struct sigevent; int convert_sigevent32(struct sigevent32 *sig32, struct sigevent *sig); -void siginfo_to_siginfo32(const siginfo_t *src, struct siginfo32 *dst); +void siginfo_to_siginfo32(const siginfo_t *src, struct __siginfo32 *dst); #endif /* !_COMPAT_FREEBSD32_SIGNAL_H_ */ diff --git a/sys/compat/ia32/ia32_signal.h b/sys/compat/ia32/ia32_signal.h index bb16555eeee5..fbb50c4ef1f2 100644 --- a/sys/compat/ia32/ia32_signal.h +++ b/sys/compat/ia32/ia32_signal.h @@ -154,7 +154,7 @@ struct ia32_freebsd4_sigframe { uint32_t sf_addr; /* undocumented 4th arg */ uint32_t sf_ah; /* action/handler pointer */ struct ia32_freebsd4_ucontext sf_uc; /* = *sf_ucontext */ - struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ + struct __siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ }; struct ia32_sigframe { @@ -165,7 +165,7 @@ struct ia32_sigframe { uint32_t sf_ah; /* action/handler pointer */ /* Beware, hole due to ucontext being 16 byte aligned! */ struct ia32_ucontext sf_uc; /* = *sf_ucontext */ - struct siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ + struct __siginfo32 sf_si; /* = *sf_siginfo (SA_SIGINFO case) */ }; struct ia32_osiginfo { diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c index 974bed85480c..5174438bc40a 100644 --- a/sys/compat/ia32/ia32_sysvec.c +++ b/sys/compat/ia32/ia32_sysvec.c @@ -76,7 +76,7 @@ CTASSERT(sizeof(struct ia32_mcontext) == 640); CTASSERT(sizeof(struct ia32_ucontext) == 704); CTASSERT(sizeof(struct ia32_sigframe) == 800); -CTASSERT(sizeof(struct siginfo32) == 64); +CTASSERT(sizeof(struct __siginfo32) == 64); #ifdef COMPAT_FREEBSD4 CTASSERT(sizeof(struct ia32_freebsd4_mcontext) == 260); CTASSERT(sizeof(struct ia32_freebsd4_ucontext) == 324); diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c index 94e561ddd33a..9ab323a0e300 100644 --- a/sys/powerpc/powerpc/exec_machdep.c +++ b/sys/powerpc/powerpc/exec_machdep.c @@ -117,7 +117,7 @@ typedef struct __ucontext32 { struct sigframe32 { ucontext32_t sf_uc; - struct siginfo32 sf_si; + struct __siginfo32 sf_si; }; static int grab_mcontext32(struct thread *td, mcontext32_t *, int flags); @@ -138,7 +138,7 @@ _Static_assert(sizeof(siginfo_t) == 80, "siginfo_t size incorrect"); #ifdef COMPAT_FREEBSD32 _Static_assert(sizeof(mcontext32_t) == 1224, "mcontext32_t size incorrect"); _Static_assert(sizeof(ucontext32_t) == 1280, "ucontext32_t size incorrect"); -_Static_assert(sizeof(struct siginfo32) == 64, "struct siginfo32 size incorrect"); +_Static_assert(sizeof(struct __siginfo32) == 64, "struct __siginfo32 size incorrect"); #endif /* COMPAT_FREEBSD32 */ #else /* powerpc */ _Static_assert(sizeof(mcontext_t) == 1224, "mcontext_t size incorrect"); @@ -155,7 +155,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct thread *td; struct proc *p; #ifdef COMPAT_FREEBSD32 - struct siginfo32 siginfo32; + struct __siginfo32 siginfo32; struct sigframe32 sf32; #endif size_t sfpsize; diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h index 29569a1f0996..3a7b87bfc85f 100644 --- a/sys/sys/ptrace.h +++ b/sys/sys/ptrace.h @@ -150,7 +150,7 @@ struct ptrace_lwpinfo32 { int pl_flags; /* LWP flags. */ sigset_t pl_sigmask; /* LWP signal mask */ sigset_t pl_siglist; /* LWP pending signal */ - struct siginfo32 pl_siginfo; /* siginfo for signal */ + struct __siginfo32 pl_siginfo; /* siginfo for signal */ char pl_tdname[MAXCOMLEN + 1]; /* LWP name. */ pid_t pl_child_pid; /* New child pid */ u_int pl_syscall_code; diff --git a/sys/sys/signal.h b/sys/sys/signal.h index 6112b69886f3..068a7e7bc6da 100644 --- a/sys/sys/signal.h +++ b/sys/sys/signal.h @@ -274,7 +274,7 @@ typedef struct __siginfo { #define si_syscall _reason._capsicum._syscall #if defined(_WANT_LWPINFO32) || (defined(_KERNEL) && defined(__LP64__)) -struct siginfo32 { +struct __siginfo32 { int si_signo; /* signal number */ int si_errno; /* errno association */ int si_code; /* signal code */ From nobody Tue Mar 19 23:15:56 2024 X-Original-To: dev-commits-src-all@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 4Tzndn1Y68z5FkGF; Tue, 19 Mar 2024 23:15: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 4Tzndm5vSjz4JMR; Tue, 19 Mar 2024 23:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890156; 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=W3JOdTDfbR/bUFub+XjDu7g0rLxhULf/QhvIacH5DpY=; b=sPeWrL1voCh9y3GHCgvFG7z4Iex1mRUiRBZwjQbbzIbS5rH4Ou1ZnYA3zLP5T9ToKE0BTj 6kH2LXLayEBSLPHxXjWOQ/PvlKYxPf1vOKIruQ/52w4nASgj5/FULPgLja7182r9H4NJgB Dcq1YwEGinBMjQc09lIJMmlarqAnIstNq0NmI/YL66hv6w632HIHxIQP98cBXih0anlLAt PtUF3AjDfxtwbG6LxHjXmwbXuyg7c5fCOCA7Vo4TxbVvRc0QCz2ajb6ZhgUYdTWdNcMoZl 6fukKJikJZWw+SIMgOofTAW292kKT/GopwmSgz4vnwqBVFvTKjROi6o0//P0Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890156; a=rsa-sha256; cv=none; b=JOyxWBvhipta8S+GmQmAfNqT5W0/bMHpQUauE1K0tdTT7kg7jDUKUffZO8GaAZ4YghL2qV mEhQcUrDaJeWdw+I5VXtGed+kt+0BRSplNeBCXBKfgspYjJoCbmdA09ox9ZL8cGo94B/A4 mtfQjkjkgSIc3NEHD2dUYQTHuuiATEwpZV7Ne3xADXJ21kTZkzCkkTPtrTaoY/sEp5Iq16 YQdpebM5sCarpAfjaS/1Yc412jph8oSWufCFUbxOsKcJhxVcdO8hYIZDm/kwLcPcqtOQk/ LWo5wztrgSA0E274TmQVWSCz6WDERQmSZhCrwsCAWS+fSEgnIjp+rMr/zDR9+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890156; 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=W3JOdTDfbR/bUFub+XjDu7g0rLxhULf/QhvIacH5DpY=; b=VHB/+I77JHcnbQImd259gX+krlzpFbWHFvCQdhWdKgQAO/iKpYrOCwFoq7sQ2dempJV56n /Y3sANHMAaUWF9BORx2CF66gw5uA3eDIrtxCuzRck59KBh6p595dp8qUhRzGiKXRDN5yeZ f4D1Pvq9U4FKFxtlBKrQ7fEmpdD77N1JSf5si9iLF/rMcFfHYpzh1HsQKHj1t7KsUNUlUl seI+z0HoMym8W8AgJZmxzAvfLUr9urOcMy56g6SAb51znoAhk4EUkXpF1RiAM9ksMIjLmX 9t417Pp3ZUxSQIBgwpXk0jE+wjFNKoL+9slGmYzxAzN0BpUwvdXl6cPFUkLx9w== 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 4Tzndm5M1KzRvC; Tue, 19 Mar 2024 23:15: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 42JNFumF079185; Tue, 19 Mar 2024 23:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFu4u079182; Tue, 19 Mar 2024 23:15:56 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:56 GMT Message-Id: <202403192315.42JNFu4u079182@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cab73e530564 - main - syscalls.master: struct siginfo -> struct __siginfo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cab73e530564b814a7f95945e42c05f1d2dcc1f4 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cab73e530564b814a7f95945e42c05f1d2dcc1f4 commit cab73e530564b814a7f95945e42c05f1d2dcc1f4 Author: Brooks Davis AuthorDate: 2024-03-18 21:40:07 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 syscalls.master: struct siginfo -> struct __siginfo struct siginfo doesn't exist, it's struct __siginfo (and siginfo_t). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44380 --- sys/kern/syscalls.master | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 0d3cc796bdf4..874223f6f238 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1811,14 +1811,14 @@ 345 AUE_SIGWAIT STD|CAPENABLED { int sigtimedwait( _In_ const sigset_t *set, - _Out_opt_ _Contains_long_ptr_ struct siginfo *info, + _Out_opt_ _Contains_long_ptr_ struct __siginfo *info, _In_opt_ _Contains_long_timet_ const struct timespec *timeout ); } 346 AUE_NULL STD|CAPENABLED { int sigwaitinfo( _In_ const sigset_t *set, - _Out_opt_ _Contains_long_ptr_ struct siginfo *info + _Out_opt_ _Contains_long_ptr_ struct __siginfo *info ); } 347 AUE_ACL_GET_FILE STD { @@ -2943,7 +2943,7 @@ _Out_opt_ int *status, int options, _Out_opt_ _Contains_long_ struct __wrusage *wrusage, - _Out_opt_ _Contains_long_ptr_ struct siginfo *info + _Out_opt_ _Contains_long_ptr_ struct __siginfo *info ); } 533 AUE_CAP_RIGHTS_LIMIT STD|CAPENABLED { From nobody Tue Mar 19 23:15:57 2024 X-Original-To: dev-commits-src-all@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 4Tzndp2vTZz5FkQt; Tue, 19 Mar 2024 23:15: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 4Tzndn6qhhz4JYF; Tue, 19 Mar 2024 23:15:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890158; 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=2Ym4F/fk6iRFpqB6JM/fP58ohLiQmgaivPu4MTxxyJU=; b=Qc1UzreEQZq/a+DXU2uaQjDtIO5PM79DY9PQxx0T7dX7vj1Km9Lyg1CrI1FkYnt34j1ZOP oPs+YipIGoDZ/hmXJRhrUjb5P+1w2QtpUoq2nnRf8AedC8kjO/ZJ9Zl19itQENL/6Q5uL5 RNZKdgeuHdWXYh7F1cCLjbUfG7USbiBx2jM41F69y7fIrypLdwQ6n6iMs7lwBfkwq4CwCU DL74aed/y+4MuUDGMscBj3vFr8xGL8TDADKpA5sOd3PKlNHM7cnYvciwSEilzgMCCdxNA/ rcHWTSdUTnkOsb6ZbDZ//+1XvKiNf8X3Q5a4i0bAokoOzxODd/Z1Fs390UbzAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890158; a=rsa-sha256; cv=none; b=IxukVUdBf3gD3CAcIq48H4AN7IlmF1tsMP7vQZsOXSNNc//oYOGG95sajO6+uyxjenJs4L l/rYPcg/jW8PDaHiJxGs66h9zZ1HETWs9geaslKKqN7dJHMzJFeDlsmQoW1ASCZzzUbSqk gbhQSBIjA/ise3LbnCKUO+xwU5paYzQh4qTsh6+MeUOti0GrdmLC05TSzE6Ul+keerXLtX v03ctZzkfHdX3OQ5qXMj4oQ7wmFjQLGAoGErWXyAzBZAyNbLCajyNpKfW/1XSlvQkSvXAw f37ohl25FV+Fs7iDU2eeAJ0JK+Nb2cRpQt16vPLxv7MJAXF6BAo9H7zys6Xy9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890158; 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=2Ym4F/fk6iRFpqB6JM/fP58ohLiQmgaivPu4MTxxyJU=; b=u3G2RLZ1yM7FotXslSg5l/Ki89qNk8G3gxVLu76KsgHsnvbDcYX/9LQQN0pahPtor0cKvl vvkUoY2IS4Ch6PGMU4ilVxqgBHR1Cez3QQ39DJu4CNQFvY3dGXnrgqaR8M17EyShKmQJPm UH1rhLUAJ45KWJEmsGsMopoj/EYEdwio49HzfpCwD8QirHyt0iZzSRphsJgz6bYBsAporP Jst5iuzeH44/yWhEuY89l3DgWTC3Wf7idsRqmrKCWd/VcQ/T4OK2VcwUDzCYAVbV3dtdT1 QQRvSgGOew5HtiJ9anOPAIz5JIoqw85yULudHGkpMtd5klbZbZkD52frKgRc9Q== 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 4Tzndn6RpNzRxT; Tue, 19 Mar 2024 23:15: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 42JNFvSj079230; Tue, 19 Mar 2024 23:15:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFvc8079227; Tue, 19 Mar 2024 23:15:57 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:57 GMT Message-Id: <202403192315.42JNFvc8079227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d0efabdf15d9 - main - syscalls.master: make __sys_fcntl take an intptr_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0efabdf15d956e9bc0414356ed798ca3c846e08 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d0efabdf15d956e9bc0414356ed798ca3c846e08 commit d0efabdf15d956e9bc0414356ed798ca3c846e08 Author: Brooks Davis AuthorDate: 2024-03-19 21:52:39 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 syscalls.master: make __sys_fcntl take an intptr_t The (optional) third argument of fcntl is sometimes a pointer so change the type to intptr_t. Update the libc-internal defintion (actually used by libthr) to take a fixed intptr_t argument rather than pretending it's a variadic function. (That worked because all supported architectures pass variadic arguments as though the function was declared with those types. In CheriBSD that changes because variadic arguments are passed via a bounded array.) Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44381 --- lib/libc/include/libc_private.h | 2 +- lib/libthr/thread/thr_syscalls.c | 4 ++-- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/kern/kern_descrip.c | 10 +++++----- sys/kern/syscalls.master | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h index b3f31f6e4e87..629889a6ff17 100644 --- a/lib/libc/include/libc_private.h +++ b/lib/libc/include/libc_private.h @@ -344,7 +344,7 @@ int __sys_clock_nanosleep(__clockid_t, int, int __sys_close(int); int __sys_close_range(unsigned, unsigned, int); int __sys_connect(int, const struct sockaddr *, __socklen_t); -int __sys_fcntl(int, int, ...); +int __sys_fcntl(int, int, __intptr_t); int __sys_fdatasync(int); int __sys_fstat(int fd, struct stat *); int __sys_fstatfs(int fd, struct statfs *); diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c index c931f2cc310e..348825cd6198 100644 --- a/lib/libthr/thread/thr_syscalls.c +++ b/lib/libthr/thread/thr_syscalls.c @@ -198,10 +198,10 @@ __thr_fcntl(int fd, int cmd, ...) va_start(ap, cmd); if (cmd == F_OSETLKW || cmd == F_SETLKW) { _thr_cancel_enter(curthread); - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __sys_fcntl(fd, cmd, (intptr_t)va_arg(ap, void *)); _thr_cancel_leave(curthread, ret == -1); } else { - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); + ret = __sys_fcntl(fd, cmd, (intptr_t)va_arg(ap, void *)); } va_end(ap); diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 6c703f14e408..e6aea3acdecd 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -3942,7 +3942,7 @@ freebsd32_procctl(struct thread *td, struct freebsd32_procctl_args *uap) int freebsd32_fcntl(struct thread *td, struct freebsd32_fcntl_args *uap) { - long tmp; + intptr_t tmp; switch (uap->cmd) { /* diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 65b1f74d310b..7f9318a7ceda 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -414,7 +414,7 @@ sys_fcntl(struct thread *td, struct fcntl_args *uap) } int -kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg) +kern_fcntl_freebsd(struct thread *td, int fd, int cmd, intptr_t arg) { struct flock fl; struct __oflock ofl; @@ -430,7 +430,7 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg) /* * Convert old flock structure to new. */ - error = copyin((void *)(intptr_t)arg, &ofl, sizeof(ofl)); + error = copyin((void *)arg, &ofl, sizeof(ofl)); fl.l_start = ofl.l_start; fl.l_len = ofl.l_len; fl.l_pid = ofl.l_pid; @@ -455,7 +455,7 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg) case F_SETLK: case F_SETLKW: case F_SETLK_REMOTE: - error = copyin((void *)(intptr_t)arg, &fl, sizeof(fl)); + error = copyin((void *)arg, &fl, sizeof(fl)); arg1 = (intptr_t)&fl; break; default: @@ -473,9 +473,9 @@ kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg) ofl.l_pid = fl.l_pid; ofl.l_type = fl.l_type; ofl.l_whence = fl.l_whence; - error = copyout(&ofl, (void *)(intptr_t)arg, sizeof(ofl)); + error = copyout(&ofl, (void *)arg, sizeof(ofl)); } else if (cmd == F_GETLK) { - error = copyout(&fl, (void *)(intptr_t)arg, sizeof(fl)); + error = copyout(&fl, (void *)arg, sizeof(fl)); } return (error); } diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 874223f6f238..c5485294dcd0 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -616,7 +616,7 @@ int fcntl( int fd, int cmd, - long arg + intptr_t arg ); } ; XXX should be { int fcntl(int fd, int cmd, ...); } From nobody Tue Mar 19 23:15:58 2024 X-Original-To: dev-commits-src-all@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 4Tzndq2y18z5FkGK; Tue, 19 Mar 2024 23:15: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 4Tzndq0pfPz4JFm; Tue, 19 Mar 2024 23:15:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890159; 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=vs71L0QByNsQ3pngJHy9QXYAAQnHj2/XSICce6upD7s=; b=GpWQNPc0h+muDx7ZJecx5U4FlJsVzRuE79HU0AUK2YsTc7Yf/FHWonsqgoS/zIzZz5aSYS Kx35vHgFQPth0g9YVd/LowdZvg7WFfV32x2bc7J9zzuvBapJbgbb9a/TBsgd2alAqP4XdF JrpjtIWn4DyLOPTaGknZQmLrXvzl5eGZkoH7z9P1huGNQ7Au6LhadnHueEc210DHCPo4QG /lVgildjhNSZcDdnL8UpyGvlqZpBQdcz8BUBvVdq3lRYeno2GKtUlnarsj/jHb84EhA7th ZA7BKFJ2z4q6wDUn+OcFQu5Q8GLWGX7SH/WOT9NUAXSdj9kWKw25hvWjbduJ8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890159; a=rsa-sha256; cv=none; b=VKq0P+Xdm4T7u91t4htC56oOfo49v9CcckXfGMQAVfgk2c9awqUnu7tumGO7nE/aTzPOm/ XZDkv8zYbRucw8XQCbXerOHcND8Y59k0m4eMj3iNg0Ly5JsUOamlH/GwQY0IO8AACyKD2W n6t+hG7meFMLwTfYhQA7XHaEtuIK0TTRgFC1hA/SSqQA4jRTC4kTcEZwesRWli/x52begz MEc5iLpVjnXZ/oV9ayozYwCUL3GRXJwD0uQhtGCjB6U41AijVBqa5hSwrd7fSQ0SnocLAV gShoe9D+VlFSYp2l3mrYVQrcwJD8mCFBlw0dk8ngby9NDQ5JS0Y2qPJMLXjnJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890159; 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=vs71L0QByNsQ3pngJHy9QXYAAQnHj2/XSICce6upD7s=; b=WQImV96a928gB06hCgGDUl18Eu0WLrfjJ6HgnxkZ/zPElG172V0rtY06u7ApMzqsJJ47s3 VePnZyfmkB3hp7Bil4vEqyKFic4lUTieVq2rtF7KWQXYFxED45npQnJ6LmcSZjPG64eZFs 0Yf32LvCBG67uFAXeQCrqijCWeb+2NUjK6R4PTj/22UHdH9bHxM7YSFtWCSdHPlSOaXFYP Rd64IrJby9xY31Zx4U9foHh/FBIGGKOxuxbskwQ44de4aI++xbesSr6cWpRqi34qrqVQTN cty2ftSzs3pWNVYz/Y9bg+9zGc/wnkXjvUEbgAjmsEN1mYe25naZ5naZPLTH3g== 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 4Tzndq0KT6zRWK; Tue, 19 Mar 2024 23:15: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 42JNFwoA079275; Tue, 19 Mar 2024 23:15:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNFwvM079272; Tue, 19 Mar 2024 23:15:58 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:15:58 GMT Message-Id: <202403192315.42JNFwvM079272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 55513a1b6e4b - main - sys/acl.h: move main typedefs to sys/_types.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55513a1b6e4b46cc5f19bbf35980ff0db874a93b Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=55513a1b6e4b46cc5f19bbf35980ff0db874a93b commit 55513a1b6e4b46cc5f19bbf35980ff0db874a93b Author: Brooks Davis AuthorDate: 2024-03-18 21:45:42 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:26 +0000 sys/acl.h: move main typedefs to sys/_types.h Make __ prefixed versions available without the pollution of sys/acl.h (and by extension sys/param.h). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44382 --- sys/sys/_types.h | 9 +++++++++ sys/sys/acl.h | 14 +++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 769451299b19..c84b84edd2b8 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -187,6 +187,15 @@ typedef struct { #endif } __max_align_t; +/* Types for sys/acl.h */ +typedef __uint32_t __acl_tag_t; +typedef __uint32_t __acl_perm_t; +typedef __uint16_t __acl_entry_type_t; +typedef __uint16_t __acl_flag_t; +typedef __uint32_t __acl_type_t; +typedef __uint32_t *__acl_permset_t; +typedef __uint16_t *__acl_flagset_t; + typedef __uint64_t __dev_t; /* device number */ typedef __uint32_t __fixpt_t; /* fixed point number */ diff --git a/sys/sys/acl.h b/sys/sys/acl.h index f679808dceca..66517cff543e 100644 --- a/sys/sys/acl.h +++ b/sys/sys/acl.h @@ -44,13 +44,13 @@ * POSIX.1e and NFSv4 ACL types and related constants. */ -typedef uint32_t acl_tag_t; -typedef uint32_t acl_perm_t; -typedef uint16_t acl_entry_type_t; -typedef uint16_t acl_flag_t; -typedef int acl_type_t; -typedef int *acl_permset_t; -typedef uint16_t *acl_flagset_t; +typedef __acl_tag_t acl_tag_t; +typedef __acl_perm_t acl_perm_t; +typedef __acl_entry_type_t acl_entry_type_t; +typedef __acl_flag_t acl_flag_t; +typedef __acl_type_t acl_type_t; +typedef __acl_permset_t acl_permset_t; +typedef __acl_flagset_t acl_flagset_t; /* * With 254 entries, "struct acl_t_struct" is exactly one 4kB page big. From nobody Tue Mar 19 23:16:00 2024 X-Original-To: dev-commits-src-all@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 4Tzndr5984z5Fk6b; Tue, 19 Mar 2024 23:16: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 4Tzndr1hRFz4JJ9; Tue, 19 Mar 2024 23:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890160; 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=E/xgSx3U+79Dv1Z7RA3HfDtrfglPvxIZRJwSsq9rWWA=; b=GC+Hg/vYAEa3jcy8++V0zkicBnPEkOim4L0Q07P56AjmigXxLi3+RTflh/swSl4qiOxDzJ 5DxPM14tX1CYQbZd6l8ZHs7flKySbMWAZRrSV/gIny23RZT/VppoCcX5ku3bOSQANejx3v TFd8yRUMwCJK0XBcUCobXsOY5NpK6XQiCNyGQm3Z4CnLU2wZ9wrghCBSEeU/crOEj+h7Pu ZbnRY9NAOvqbn82iWm/k3SYPSrksJrq6gMsoEK+qOD78c4ZJlZZiFac+R1hkqP752XM0QB IZA60kaEXDbxWs9p08wcTeJBTq6wPh6h9ou5VdtSahhQ72SNpC6M8yQx/G+R4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890160; a=rsa-sha256; cv=none; b=rE+qzvbbh7aS/ir1isk3TuEHkG31mRp9FucWcijXfh0Sn0GIr1mQLRjBT5y98w7ZTmR3LW THG3rfarihHqY4D0tZaQO5PewiH8xKHpmKs4b0OntdRjD0HbY2aJo6DqHLyYi6Ngt8xzpI Fku8UmdM1DKIWOLyTq+U8yWIMqKLAtCpoKXHZtuAhwGpIuZCBrL0Sgu5ZfV9LFWS2emzla GA3EpxA13xMIQjx6CurUsJljvMFUPgddswnFUUJjJ1hN8uN7oMkISH28VhMIZpx47CWrT0 63HpYFrGOPOYLeUmtIPXggYNRlTsEOpzKpCO98epKGwnmYz4zRV0qXeMzW2xIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890160; 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=E/xgSx3U+79Dv1Z7RA3HfDtrfglPvxIZRJwSsq9rWWA=; b=THqU7Mxq4BsUkHwFvcvIVLa2+vRBSbgYM/qgreRx3YXfh3+cGB+BsFgk9eUdkkGkiVxjQf V9VVzNVCwgHyABPMtUnTwRZXbf/dEOkwf+abW3Z7KEqV9vQmWJQa1mcPAKMetVLSzL3tN9 Vcr9xwHrd9FMh9eMBQM9LZYPIWMx6LP48O1YehGzQT5tRTgBl6gaYzDLIMXknxKxMrvSlb mmvwCzClERrUD5Gt8vYkdByTY0EKhSeOYMaL+hG9aYA/z4PvPgAOCwtPaReLrsRzMI11Ai ccgRhjfiv7PaBQW0Z0eSbLYmHjDyCgbIMF5NHszH1RzoZQPj4DsF0GLS9tL4TA== 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 4Tzndr1JByzRJ8; Tue, 19 Mar 2024 23:16: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 42JNG0PS079318; Tue, 19 Mar 2024 23:16:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNG00a079315; Tue, 19 Mar 2024 23:16:00 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:16:00 GMT Message-Id: <202403192316.42JNG00a079315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 27676ae365f6 - main - syscalls.master: use __acl_type_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27676ae365f62c22f8daa816bf7a07d22bd081d9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=27676ae365f62c22f8daa816bf7a07d22bd081d9 commit 27676ae365f62c22f8daa816bf7a07d22bd081d9 Author: Brooks Davis AuthorDate: 2024-03-19 21:53:50 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:27 +0000 syscalls.master: use __acl_type_t Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44418 --- sys/kern/syscalls.master | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index c5485294dcd0..8a681889cc6a 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1824,54 +1824,54 @@ 347 AUE_ACL_GET_FILE STD { int __acl_get_file( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _Out_ struct acl *aclp ); } 348 AUE_ACL_SET_FILE STD { int __acl_set_file( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } 349 AUE_ACL_GET_FD STD|CAPENABLED { int __acl_get_fd( int filedes, - acl_type_t type, + __acl_type_t type, _Out_ struct acl *aclp ); } 350 AUE_ACL_SET_FD STD|CAPENABLED { int __acl_set_fd( int filedes, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } 351 AUE_ACL_DELETE_FILE STD { int __acl_delete_file( _In_z_ const char *path, - acl_type_t type + __acl_type_t type ); } 352 AUE_ACL_DELETE_FD STD|CAPENABLED { int __acl_delete_fd( int filedes, - acl_type_t type + __acl_type_t type ); } 353 AUE_ACL_CHECK_FILE STD { int __acl_aclcheck_file( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } 354 AUE_ACL_CHECK_FD STD|CAPENABLED { int __acl_aclcheck_fd( int filedes, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } @@ -2246,27 +2246,27 @@ 425 AUE_ACL_GET_LINK STD { int __acl_get_link( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _Out_ struct acl *aclp ); } 426 AUE_ACL_SET_LINK STD { int __acl_set_link( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } 427 AUE_ACL_DELETE_LINK STD { int __acl_delete_link( _In_z_ const char *path, - acl_type_t type + __acl_type_t type ); } 428 AUE_ACL_CHECK_LINK STD { int __acl_aclcheck_link( _In_z_ const char *path, - acl_type_t type, + __acl_type_t type, _In_ struct acl *aclp ); } From nobody Tue Mar 19 23:16:01 2024 X-Original-To: dev-commits-src-all@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 4Tznds4ZPBz5FkSv; Tue, 19 Mar 2024 23:16: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 4Tznds28RMz4JQT; Tue, 19 Mar 2024 23:16:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890161; 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=L2cvblHv0R8X1tJCE2X2jNn7wtTxHufLNRTrUGK8Gi4=; b=Cz/r2F9ENf6knIu2CKozcxSCVxDqAp1tOKo/uri5ZizSMOE0XjzjPGpU99iybIzjyVit1+ mP32XH2mUKy3pZC3FNxz/Ru1IK3NsT6Rt8hnhCdK026t1zsu5aqS5jlEkJeoX/hZhpihnh JlJ9p+HG306UcP5sY9QN1pBRahVANRqMIcbbM+kXtBz0wUiJgo2tX5p/oxR6HqA+G5A32F DG/pEly1g3fbspRnLWLnuLpj21wrV+NxxOzv5YXy/TOLJhFlqGVAWii23Q1vmqsGf6tyDZ UihyCQ/B6Pq6ExPpnMK9E9xETibTxIslVg7DlzTNT/xPn2NHJp2CzKz4aC7zPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710890161; a=rsa-sha256; cv=none; b=Ar0nIuFGpFWpLGcpx7K0df6wm3lf64NTJGIytUnCCiin6hqwlUSUbGMQFHFumfEEm57S7y J9pfdTFBrOyuBlAr1IhD77y/wdzyK1IJb3R9+MlRX1P3g4RJEKHa9iytPxxup83SmCCglJ iCA7gVba7uHAqEga9P1CegCRXcjFTGExTTPMLR7HQJHp2xORFfIiOGeBk1Q4O+19+0bWz5 Y0Uj6H+Yjb9OfV1pxaSo50cI+pjR+UWcMC5Kp/odpbM0TSwza5I5mS0HnV3R68qSjdxmsA tvpPRCLy4WYxJ1QmwBUczesdNnoQuTVwX1TMTdg+2sTetHQMhWzlkAULnXNQAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710890161; 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=L2cvblHv0R8X1tJCE2X2jNn7wtTxHufLNRTrUGK8Gi4=; b=sOUq4GynaHUL5/w1dOZoseoyYOg3MkpDNozPmiFJ/lVuoFZx0sW4rqPyzAJd17ztkXukyg KDDkAI4tNDYLgZ/zAoqfiacKS7fDTC/m+1z6bvtqY4cn7yq3JH0slEABmpA8PTWCx2H0/Y acU77LpSreeKKFAuPdNpNMpVVfn0vp+SfkbYqzXYed6c8C+Ei9IPwmVhEixzhok2cO0pVc jruxp4y8a6mxdng8lcJbd/Smg8dmWLH6jEw+yPX7G9UGw0RfOE0iiaIbYcQvdBHloJh/bF gUZOSAFJMDZVQTdR7VMVdSOKLwQUZveYZ/89XJ5XD3EwBKQ+TuKn/NWxdIS6Wg== 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 4Tznds1l1hzRhq; Tue, 19 Mar 2024 23:16: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 42JNG1l4079357; Tue, 19 Mar 2024 23:16:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JNG1Go079354; Tue, 19 Mar 2024 23:16:01 GMT (envelope-from git) Date: Tue, 19 Mar 2024 23:16:01 GMT Message-Id: <202403192316.42JNG1Go079354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e07d37c7056a - main - sysent: regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e07d37c7056a549ce1ed5dd0dfdbeadfe1b82605 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e07d37c7056a549ce1ed5dd0dfdbeadfe1b82605 commit e07d37c7056a549ce1ed5dd0dfdbeadfe1b82605 Author: Brooks Davis AuthorDate: 2024-03-19 22:04:37 +0000 Commit: Brooks Davis CommitDate: 2024-03-19 23:13:27 +0000 sysent: regen --- sys/compat/freebsd32/freebsd32_proto.h | 12 ++-- sys/compat/freebsd32/freebsd32_systrace_args.c | 76 ++++++++++++------------ sys/kern/systrace_args.c | 80 +++++++++++++------------- sys/sys/sysproto.h | 40 ++++++------- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index c2d3a700eb6d..c56a5b55f06c 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -89,7 +89,7 @@ struct freebsd32_getitimer_args { struct freebsd32_fcntl_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char arg_l_[PADL_(int32_t)]; int32_t arg; char arg_r_[PADR_(int32_t)]; + char arg_l_[PADL_(intptr_t)]; intptr_t arg; char arg_r_[PADR_(intptr_t)]; }; struct freebsd32_select_args { char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; @@ -108,12 +108,12 @@ struct freebsd32_getrusage_args { }; struct freebsd32_readv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovp_l_[PADL_(const struct iovec32 *)]; const struct iovec32 * iovp; char iovp_r_[PADR_(const struct iovec32 *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; struct freebsd32_writev_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; + char iovp_l_[PADL_(const struct iovec32 *)]; const struct iovec32 * iovp; char iovp_r_[PADR_(const struct iovec32 *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; struct freebsd32_settimeofday_args { @@ -294,12 +294,12 @@ struct freebsd32_jail_args { }; struct freebsd32_sigtimedwait_args { char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; - char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)]; + char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)]; char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; }; struct freebsd32_sigwaitinfo_args { char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; - char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)]; + char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)]; }; struct freebsd32_aio_waitcomplete_args { char aiocbp_l_[PADL_(uint32_t *)]; uint32_t * aiocbp; char aiocbp_r_[PADR_(uint32_t *)]; @@ -574,7 +574,7 @@ struct freebsd32_wait6_args { char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)]; char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; char wrusage_l_[PADL_(struct __wrusage32 *)]; struct __wrusage32 * wrusage; char wrusage_r_[PADR_(struct __wrusage32 *)]; - char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)]; + char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)]; }; struct freebsd32_cap_ioctls_limit_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index f2617872a952..bfcf9a46b485 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -527,7 +527,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct freebsd32_fcntl_args *p = params; iarg[a++] = p->fd; /* int */ iarg[a++] = p->cmd; /* int */ - iarg[a++] = p->arg; /* int32_t */ + uarg[a++] = (intptr_t)p->arg; /* intptr_t */ *n_args = 3; break; } @@ -643,7 +643,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 120: { struct freebsd32_readv_args *p = params; iarg[a++] = p->fd; /* int */ - uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */ + uarg[a++] = (intptr_t)p->iovp; /* const struct iovec32 * */ uarg[a++] = p->iovcnt; /* u_int */ *n_args = 3; break; @@ -652,7 +652,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 121: { struct freebsd32_writev_args *p = params; iarg[a++] = p->fd; /* int */ - uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */ + uarg[a++] = (intptr_t)p->iovp; /* const struct iovec32 * */ uarg[a++] = p->iovcnt; /* u_int */ *n_args = 3; break; @@ -1583,7 +1583,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 345: { struct freebsd32_sigtimedwait_args *p = params; uarg[a++] = (intptr_t)p->set; /* const sigset_t * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */ uarg[a++] = (intptr_t)p->timeout; /* const struct timespec32 * */ *n_args = 3; break; @@ -1592,7 +1592,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 346: { struct freebsd32_sigwaitinfo_args *p = params; uarg[a++] = (intptr_t)p->set; /* const sigset_t * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */ *n_args = 2; break; } @@ -1600,7 +1600,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 347: { struct __acl_get_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1609,7 +1609,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 348: { struct __acl_set_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1618,7 +1618,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 349: { struct __acl_get_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1627,7 +1627,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 350: { struct __acl_set_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1636,7 +1636,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 351: { struct __acl_delete_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -1644,7 +1644,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 352: { struct __acl_delete_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -1652,7 +1652,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 353: { struct __acl_aclcheck_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1661,7 +1661,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 354: { struct __acl_aclcheck_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1985,7 +1985,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 425: { struct __acl_get_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1994,7 +1994,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 426: { struct __acl_set_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2003,7 +2003,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 427: { struct __acl_delete_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -2011,7 +2011,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 428: { struct __acl_aclcheck_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2862,7 +2862,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) uarg[a++] = (intptr_t)p->status; /* int * */ iarg[a++] = p->options; /* int */ uarg[a++] = (intptr_t)p->wrusage; /* struct __wrusage32 * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */ *n_args = 8; break; } @@ -3236,7 +3236,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 573: { struct sigfastblock_args *p = params; iarg[a++] = p->cmd; /* int */ - uarg[a++] = (intptr_t)p->ptr; /* uint32_t * */ + uarg[a++] = (intptr_t)p->ptr; /* void * */ *n_args = 2; break; } @@ -4174,7 +4174,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 2: - p = "int32_t"; + p = "intptr_t"; break; default: break; @@ -4379,7 +4379,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland struct iovec32 *"; + p = "userland const struct iovec32 *"; break; case 2: p = "u_int"; @@ -4395,7 +4395,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland struct iovec32 *"; + p = "userland const struct iovec32 *"; break; case 2: p = "u_int"; @@ -5865,7 +5865,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const sigset_t *"; break; case 1: - p = "userland struct siginfo32 *"; + p = "userland struct __siginfo32 *"; break; case 2: p = "userland const struct timespec32 *"; @@ -5881,7 +5881,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const sigset_t *"; break; case 1: - p = "userland struct siginfo32 *"; + p = "userland struct __siginfo32 *"; break; default: break; @@ -5894,7 +5894,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -5910,7 +5910,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -5926,7 +5926,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -5942,7 +5942,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -5958,7 +5958,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -5971,7 +5971,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -5984,7 +5984,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6000,7 +6000,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6564,7 +6564,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6580,7 +6580,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6596,7 +6596,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -6609,7 +6609,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -8179,7 +8179,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland struct __wrusage32 *"; break; case 7 - _P_: - p = "userland struct siginfo32 *"; + p = "userland struct __siginfo32 *"; break; default: break; @@ -8876,7 +8876,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland uint32_t *"; + p = "userland void *"; break; default: break; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index a7320cbe9377..59152b25177c 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -524,7 +524,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct fcntl_args *p = params; iarg[a++] = p->fd; /* int */ iarg[a++] = p->cmd; /* int */ - iarg[a++] = p->arg; /* long */ + uarg[a++] = (intptr_t)p->arg; /* intptr_t */ *n_args = 3; break; } @@ -640,7 +640,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 120: { struct readv_args *p = params; iarg[a++] = p->fd; /* int */ - uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */ + uarg[a++] = (intptr_t)p->iovp; /* const struct iovec * */ uarg[a++] = p->iovcnt; /* u_int */ *n_args = 3; break; @@ -649,7 +649,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 121: { struct writev_args *p = params; iarg[a++] = p->fd; /* int */ - uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */ + uarg[a++] = (intptr_t)p->iovp; /* const struct iovec * */ uarg[a++] = p->iovcnt; /* u_int */ *n_args = 3; break; @@ -1457,7 +1457,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* aio_suspend */ case 315: { struct aio_suspend_args *p = params; - uarg[a++] = (intptr_t)p->aiocbp; /* struct aiocb * const * */ + uarg[a++] = (intptr_t)p->aiocbp; /* const struct aiocb * const * */ iarg[a++] = p->nent; /* int */ uarg[a++] = (intptr_t)p->timeout; /* const struct timespec * */ *n_args = 3; @@ -1624,7 +1624,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 345: { struct sigtimedwait_args *p = params; uarg[a++] = (intptr_t)p->set; /* const sigset_t * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */ uarg[a++] = (intptr_t)p->timeout; /* const struct timespec * */ *n_args = 3; break; @@ -1633,7 +1633,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 346: { struct sigwaitinfo_args *p = params; uarg[a++] = (intptr_t)p->set; /* const sigset_t * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */ *n_args = 2; break; } @@ -1641,7 +1641,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 347: { struct __acl_get_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1650,7 +1650,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 348: { struct __acl_set_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1659,7 +1659,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 349: { struct __acl_get_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1668,7 +1668,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 350: { struct __acl_set_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1677,7 +1677,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 351: { struct __acl_delete_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -1685,7 +1685,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 352: { struct __acl_delete_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -1693,7 +1693,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 353: { struct __acl_aclcheck_file_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -1702,7 +1702,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 354: { struct __acl_aclcheck_fd_args *p = params; iarg[a++] = p->filedes; /* int */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2118,7 +2118,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 425: { struct __acl_get_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2127,7 +2127,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 426: { struct __acl_set_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2136,7 +2136,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 427: { struct __acl_delete_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ *n_args = 2; break; } @@ -2144,7 +2144,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 428: { struct __acl_aclcheck_link_args *p = params; uarg[a++] = (intptr_t)p->path; /* const char * */ - iarg[a++] = p->type; /* acl_type_t */ + iarg[a++] = p->type; /* __acl_type_t */ uarg[a++] = (intptr_t)p->aclp; /* struct acl * */ *n_args = 3; break; @@ -2959,7 +2959,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) uarg[a++] = (intptr_t)p->status; /* int * */ iarg[a++] = p->options; /* int */ uarg[a++] = (intptr_t)p->wrusage; /* struct __wrusage * */ - uarg[a++] = (intptr_t)p->info; /* struct siginfo * */ + uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */ *n_args = 6; break; } @@ -3323,7 +3323,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 573: { struct sigfastblock_args *p = params; iarg[a++] = p->cmd; /* int */ - uarg[a++] = (intptr_t)p->ptr; /* uint32_t * */ + uarg[a++] = (intptr_t)p->ptr; /* void * */ *n_args = 2; break; } @@ -4261,7 +4261,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 2: - p = "long"; + p = "intptr_t"; break; default: break; @@ -4466,7 +4466,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland struct iovec *"; + p = "userland const struct iovec *"; break; case 2: p = "u_int"; @@ -4482,7 +4482,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland struct iovec *"; + p = "userland const struct iovec *"; break; case 2: p = "u_int"; @@ -5760,7 +5760,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 315: switch (ndx) { case 0: - p = "userland struct aiocb * const *"; + p = "userland const struct aiocb * const *"; break; case 1: p = "int"; @@ -6016,7 +6016,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const sigset_t *"; break; case 1: - p = "userland struct siginfo *"; + p = "userland struct __siginfo *"; break; case 2: p = "userland const struct timespec *"; @@ -6032,7 +6032,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const sigset_t *"; break; case 1: - p = "userland struct siginfo *"; + p = "userland struct __siginfo *"; break; default: break; @@ -6045,7 +6045,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6061,7 +6061,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6077,7 +6077,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6093,7 +6093,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6109,7 +6109,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -6122,7 +6122,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -6135,7 +6135,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6151,7 +6151,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6870,7 +6870,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6886,7 +6886,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -6902,7 +6902,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; default: break; @@ -6915,7 +6915,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland const char *"; break; case 1: - p = "acl_type_t"; + p = "__acl_type_t"; break; case 2: p = "userland struct acl *"; @@ -8358,7 +8358,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland struct __wrusage *"; break; case 5: - p = "userland struct siginfo *"; + p = "userland struct __siginfo *"; break; default: break; @@ -9021,7 +9021,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "int"; break; case 1: - p = "userland uint32_t *"; + p = "userland void *"; break; default: break; diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index afec9d186a7a..3d4c30a89a82 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -313,7 +313,7 @@ struct dup2_args { struct fcntl_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char arg_l_[PADL_(long)]; long arg; char arg_r_[PADR_(long)]; + char arg_l_[PADL_(intptr_t)]; intptr_t arg; char arg_r_[PADR_(intptr_t)]; }; struct select_args { char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; @@ -377,12 +377,12 @@ struct getsockopt_args { }; struct readv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovp_l_[PADL_(const struct iovec *)]; const struct iovec * iovp; char iovp_r_[PADR_(const struct iovec *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; struct writev_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovp_l_[PADL_(const struct iovec *)]; const struct iovec * iovp; char iovp_r_[PADR_(const struct iovec *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; struct settimeofday_args { @@ -777,7 +777,7 @@ struct aio_return_args { char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; }; struct aio_suspend_args { - char aiocbp_l_[PADL_(struct aiocb * const *)]; struct aiocb * const * aiocbp; char aiocbp_r_[PADR_(struct aiocb * const *)]; + char aiocbp_l_[PADL_(const struct aiocb * const *)]; const struct aiocb * const * aiocbp; char aiocbp_r_[PADR_(const struct aiocb * const *)]; char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)]; }; @@ -862,49 +862,49 @@ struct sigpending_args { }; struct sigtimedwait_args { char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; - char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)]; + char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)]; char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)]; }; struct sigwaitinfo_args { char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; - char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)]; + char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)]; }; struct __acl_get_file_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_set_file_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_get_fd_args { char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_set_fd_args { char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_delete_file_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; }; struct __acl_delete_fd_args { char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; }; struct __acl_aclcheck_file_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_aclcheck_fd_args { char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct extattrctl_args { @@ -1130,21 +1130,21 @@ struct swapcontext_args { }; struct __acl_get_link_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_set_link_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct __acl_delete_link_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; }; struct __acl_aclcheck_link_args { char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; - char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)]; + char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)]; char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)]; }; struct sigwait_args { @@ -1597,7 +1597,7 @@ struct wait6_args { char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)]; char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)]; - char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)]; + char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)]; }; struct cap_rights_limit_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; @@ -1805,7 +1805,7 @@ struct shm_rename_args { }; struct sigfastblock_args { char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char ptr_l_[PADL_(uint32_t *)]; uint32_t * ptr; char ptr_r_[PADR_(uint32_t *)]; + char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)]; }; struct __realpathat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; From nobody Wed Mar 20 00:53:51 2024 X-Original-To: dev-commits-src-all@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 4Tzqpl2V7gz5Fw2D; Wed, 20 Mar 2024 00:53:51 +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 4Tzqpl1yjRz4VNg; Wed, 20 Mar 2024 00:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896031; 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=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=MEksaQqFvzbhEc0gBkbT5Rb8gqGxlysQBFdcUglvzLcnqK02qVoP5HUyEMwZ6TvpOJavXX mYyOpa/a6tfW6rgy2HZAGPoNurfYdeinZhqIZaNDGKKSF7OAVmkFKdZNPOfGhuJlU6vxuq OO6bUgRLS+GfGlzomh3+/w/pM27m+n7lI8b9J8D7PGQPh9AJpXgD+sIUK3lY2tgc9FDCMM hnkoLugyTrz3DDNqgMA8FwzeyPa0EWFzhd7tM4QLLr3B50JNtOI/gqeGyepkzRq4rf2ZER U+CoEJYWop5DfO7GHD2FgLqG5SkukLWxKpy+mPfmrFXWQ/7CayyTC7zTyTnGXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896031; a=rsa-sha256; cv=none; b=c7yPOMxhlTC5h9fVlxOblVgbtjgt5ou0iuoTGnWuTk2DkTjr22APzJ+zfqT1qsB9Rv8abJ Un/dODDgk4vn+EmsX3XNmiKZ7PMHNH9rxRvkbLD1zEhAEXrkjS3DhHy/OK6eYVkpBMzYg7 fU3QDwrRcNS0xF1YkQ2laffUOhDCqjO6NUWIncKuVaAxvDd/Tn+i9dTIamhWSzOIHaG7CW LkXbaPqvRhV62cgmjKGr+ZIlOulDCLlihwESutH37zpVvGcs9UIHmy2tizOMIY6twn5450 ww0pPcWndwFdkT4Yz0DKTgSg4OI5a61bntqBvnCLkhyRjw3T06Mmn4YE9BV49Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896031; 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=uQnzs623cxozRNtpygC0TKafRdyutxFlWvRDah9Bk64=; b=BoSFkjuw+bwow2Od3dFv+sf0VhLHG4GcvomxGU4WL78ABzO8tCd+WVxPYSkw4lv4Q95H6f Em0WbhafvsxGTrHyMn6B0iU9Yl+F/HM7osizC214nTntVh9SpsvV6Khg4EnE7HCBmEZ9Di PTIAC0wr2oOZagGWALbJIfmYRVm0HVISbwwfKsXA20Gu7gjveQqUW2RKiUvehePF8+HGNz oHbucOlXaFZaGIJvcVnFQJnsNMfjjsd1J1wQPJdiupej4Rs4wEhspf38kouCm/rnC/PiDq XYpMU7DhNbLATKC6a9tTNBbPNUxPIb6IYYZMAaCv95wt/ygV6I/KGH9Ce9at6w== 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 4Tzqpl1YgQzVyQ; Wed, 20 Mar 2024 00:53:51 +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 42K0rpJ1047964; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0rpYd047961; Wed, 20 Mar 2024 00:53:51 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:53:51 GMT Message-Id: <202403200053.42K0rpYd047961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 87c7f74ff4da - stable/14 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87c7f74ff4dac9b3bb4138216292e68871acb0c5 commit 87c7f74ff4dac9b3bb4138216292e68871acb0c5 Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 00:53:28 +0000 netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env (cherry picked from commit 220ee18f196482c534a659d1eb50db26c54ca7d0) --- sys/netinet/tcp_var.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 4be7fc1baad5..8e2a17204ae3 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -816,11 +816,13 @@ tcp_packets_this_ack(struct tcpcb *tp, tcp_seq ack) #define ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY) #define EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY) -#if defined(_KERNEL) && !defined(TCP_RFC7413) +#if defined(_KERNEL) +#if !defined(TCP_RFC7413) #define IS_FASTOPEN(t_flags) (false) #else #define IS_FASTOPEN(t_flags) (t_flags & TF_FASTOPEN) #endif +#endif #define BYTES_THIS_ACK(tp, th) (th->th_ack - tp->snd_una) From nobody Wed Mar 20 00:54:18 2024 X-Original-To: dev-commits-src-all@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 4TzqqG4S34z5FwGV; Wed, 20 Mar 2024 00:54: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 4TzqqG3Yf6z4W3J; Wed, 20 Mar 2024 00:54:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; 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=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=wMIfgzyPsx5d+6+6y7kGpLunKPpgCeSKcIkj8RONtAZDDClwan8A+c/GwJjzVw31nfVUWh L83W9GPCLN/3D3prwans8i6OHxtAtbj0NEFSgCtlD07VyNnERekgMDC0MA5+9ZuNlUug1V isMxCG8Wtn4t6WkERIJAnUtkJO6qewaKrmd+0mxvZ0ALpL00A4B8EAPh4WzLYLS0mrSyoq UI/2VrUL7Tl9bFNRsExAwjTs3TosXWlvr1AjKd4IAkXwJ77mZqCifefUIes+f3KmYw8E8z OJe2g2hS81wjdLhBDQOYTB6X3H9vbBYmxYnczwelxDarCWnZFp4esaDonE9D5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896058; a=rsa-sha256; cv=none; b=g43vI9X7ahcsIsI34C3lYSMoo8r/mo3Tfz6IHleLZSqR21wN7wgTqhykrZ2EYjru5rEzy4 Z5XsaIV+27DN0pD3qLbWnolO7vPUqf9Cs3sU+EAkq8fLYCIL0/iZzDiN2LZvUkguMACsIR fXEwRNaGC1RVo8FiswQ9eKsBs74r6+S/kan5wW5ZgjXzRzGjRFquRSBmdKewERLBK9Y7pG QQvcOsdZOnmBFD9rL+P7YeM+5nafH8qOCyG39sgQZ5YxkoBeHo5J/KmBgjQ0LP2g+cZrSl QDScIR/x7BEaGAPbW2cmypDEnhb4KDgQOvJPXrz0Reut5YZ93ErXmAnpgudfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896058; 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=2I8AF/wTJBv8JcPNXI5KZgvHHwgirN9fhjRxPqdi1PU=; b=CgVK3ThIYFO9ME8Nl3+8G0glutI0NsNAu5X0vpb62Sc8DAkJL5MGIl4FqFpP0dyIAywy/x dg+yJ5+hGR3i+unvJ+JiuHO5BxccboCMakWAXniKFn6vSQmTHzW6H/w0RQ34jr49yMzEET Wa1OOxisMveN45a5T6FnquxIfbcPapSJlZYkNPKpitIvE8UHypSwQxXfgtgit5emOCYzA/ Rc6UZpXAEwpbhBk35sR0DNIV9DuAMq1qDRl+X1KPuOs/3mE4qXB7b+urWHDhmow2jaleRr KuSM8HMlaUszRCBtZi5+0FeYt66x6s/FAZC/V9Q+RWomzlPrsOZ0Y7KyjR2oVQ== 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 4TzqqG393TzWJ9; Wed, 20 Mar 2024 00:54: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 42K0sICe048173; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K0sIpC048170; Wed, 20 Mar 2024 00:54:18 GMT (envelope-from git) Date: Wed, 20 Mar 2024 00:54:18 GMT Message-Id: <202403200054.42K0sIpC048170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6fd2c94c8a04 - stable/13 - netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fd2c94c8a04814fb9258c1a6181923e141ac9ca commit 6fd2c94c8a04814fb9258c1a6181923e141ac9ca Author: Konstantin Belousov AuthorDate: 2024-03-13 11:54:50 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 00:53:59 +0000 netinet/tcp_var.h: always define IS_FASTOPEN() for kernel compilation env (cherry picked from commit 220ee18f196482c534a659d1eb50db26c54ca7d0) --- sys/netinet/tcp_var.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index c3d28f1ad6e1..6815c6533073 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -431,11 +431,13 @@ TAILQ_HEAD(tcp_funchead, tcp_function); #define ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY) #define EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY) -#if defined(_KERNEL) && !defined(TCP_RFC7413) +#if defined(_KERNEL) +#if !defined(TCP_RFC7413) #define IS_FASTOPEN(t_flags) (false) #else #define IS_FASTOPEN(t_flags) (t_flags & TF_FASTOPEN) #endif +#endif #define BYTES_THIS_ACK(tp, th) (th->th_ack - tp->snd_una) From nobody Wed Mar 20 01:07:13 2024 X-Original-To: dev-commits-src-all@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 4Tzr695yW6z5FxrC; Wed, 20 Mar 2024 01:07: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 4Tzr695640z4YFg; Wed, 20 Mar 2024 01:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896833; 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=IhaPRIqaK/Lb8ERg98M91LwQKvB4MY01bqBSCIhD9vE=; b=JII4QGfiTXiDVWW+zL5D+OaUZ7Xtjy1cPGwLGPhU5qt9Oivt63ikrECnUPgH0vsb6PVtkH lLcQ6fZAyfqSVw7lJ6lBwmV3Z1C/EV+5V+CM8Hqbjv5OWq4nP7LDbSKqW3wy71x2/KzHe3 fbh1IB9iaLXF6TAAe5N85j/OjcsuzzYjTk5YKBkcTgJtY1ZWyLZslDDGt2c0oIEEfitNJc JjGlElBZUhdteUAntU1T0GH1rTFsSCsMgIGEeUZ5LthrRA7mQq34h9NYByG0tjVd8wn+Sh f32dS6DI5J+yc7aEQ2yJP4zxQlvyMV/h7yOcPolMv5jJf7SwftOWDml3IhlBKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710896833; a=rsa-sha256; cv=none; b=JaXX2CT+71fTbN78CZZ4Q4S9Efv0qB4VKQBBHB1znE+N5zh77kXtE6InwpQlCQwwRV7eGN arP22qRgi1fgzT7EDgEF6EojDemI2dXaxTxGQzIeMbYAQW5zNnjbIFuFq9bLmXD/S7nKYw ZcaRNTunYvp6ge9nOOTkY4B7HA7QqLclKAkjmUInuezKcRi7RpJKLN0gQuqjE9nAgw2hsK SZLMZWODHEoG1JqG0v1fUAi+6OfXXUUd8zwR4vHq71gi4FcvHX6FtzWzT1EBOJ8khLILT3 5ImUrwhB1ZPMzZO9o3Zakl+v/LAMfIghfG5oYd5mAmmtBgpnWAw8XWCVrd/Kjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710896833; 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=IhaPRIqaK/Lb8ERg98M91LwQKvB4MY01bqBSCIhD9vE=; b=A1iqV5+jFg7FKpQ5z4ct6QY42zV8UlQeAsInHHNIVBObBlxzf9Okh1mEYWB6LiAi+2rHn1 as27bsmVxel9rtuD9F1mue/CT4aiYzkLmhsXNA/T6kG6+5dNQbOQxpNjKfcbBK6AfC2aaK ry1OZGzuGCDIYNfdTPhlUTh3ENP9Oais+oPf5Q3WniUzm9BpfWnsOeKH1ZlFoHJ+gOeukk xPuX1QUlJFmOR9rMsJQ2O9nval31jT4vszWaihmwvJAUxjkRDJwOWpRHiqYbUPYyT0w6R4 8xTclkly0QIo0aQIEzp/H0S/b5jFsIVBcbASrNPJF9vYBXTsAs1RpGJaoTYnYw== 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 4Tzr694jn8zVJN; Wed, 20 Mar 2024 01:07: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 42K17D65066542; Wed, 20 Mar 2024 01:07:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K17DBr066539; Wed, 20 Mar 2024 01:07:13 GMT (envelope-from git) Date: Wed, 20 Mar 2024 01:07:13 GMT Message-Id: <202403200107.42K17DBr066539@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: 8eaa6be80d6a - main - daemon(8): handle case of waitpid() returning without exited child List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8eaa6be80d6aef6a118fa854a860bfdaeb7ed753 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8eaa6be80d6aef6a118fa854a860bfdaeb7ed753 commit 8eaa6be80d6aef6a118fa854a860bfdaeb7ed753 Author: Konstantin Belousov AuthorDate: 2024-03-18 08:44:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 01:07:00 +0000 daemon(8): handle case of waitpid() returning without exited child Not checking for either WIFEXITED(status) or zero result results in never finishing the loop. PR: 277764 Reviewed by: kevans (previous version) Discussed with: Daniel Tameling Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44401 --- usr.sbin/daemon/daemon.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 6cde194cf16e..bce215af75d1 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -755,18 +755,22 @@ daemon_terminate(struct daemon_state *state) } /* - * Returns true if SIGCHILD came from state->pid - * This function could hang if SIGCHILD was emittied for a reason other than - * child dying (e.g., ptrace attach). + * Returns true if SIGCHILD came from state->pid due to its exit. */ static bool daemon_is_child_dead(struct daemon_state *state) { + int status; + for (;;) { - int who = waitpid(-1, NULL, WNOHANG); - if (state->pid == who) { + int who = waitpid(-1, &status, WNOHANG); + if (state->pid == who && (WIFEXITED(status) || + WIFSIGNALED(status))) { return true; } + if (who == 0) { + return false; + } if (who == -1 && errno != EINTR) { warn("waitpid"); return false; From nobody Wed Mar 20 03:50:22 2024 X-Original-To: dev-commits-src-all@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 4TzvkQ69rtz5Dqfw; Wed, 20 Mar 2024 03:50: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 4TzvkQ5g3Zz4p9h; Wed, 20 Mar 2024 03:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710906622; 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=Uct2D4kTW3egLz25X6xmontW4tGnp2ha6hr4fV5guSk=; b=HgpPAOXda/IjErrR9thv75V2Y9TBKpJop9lUFNvrhtJF7Co0tKMVwzsvZjFM5xXQZ2lO7u o5jmJf95ctxP1+G756RgS2sQUgY/Jh5CE/b/zD6SVtXBps956dbF1h2ywtkYG+xfwyu6zc YpHp+Q8fvs5QkIh0b+nqEI8o5NlwIDFuIWfMSG1LKN11+CKaFsraZglXehxo3lSHVbwDvL 0KOfhZEiU77DwRbix2T3nlORL0fvsGLlkKjCL3anCyTu+vQRP7QPlsPl4amSLb7SDCNz4q egp3VsvlNM9UkAVV61BmQXGKG99c6raH4YD/HhilD1iAQJ+BrdG35RpPcfEZQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710906622; a=rsa-sha256; cv=none; b=QX9RkBsRkzfePON9VxQfD8EhhOxNK4Db6uWyaCX7stNGqy+1Hc/3a4rmcub4NJtJjB7HYV ArRKCumlUjJb2/7QT8VD+9ohLxBfYncJYZ48cw7mDQXDUeLjfHOyk1Zn1VYo4rspRjaoo7 gN+OPPj8dQpWPZIwFE5oCmixtpyFCnnHf5eToRguXNcNui0n3z7QQ4PXc/IgDEVzmGscoh ktD3vMJVib11wDQH9kVXbvTz1HFhLRLmVAtOW/C0GAx8J21pnQqaU+n3NUtvdxHjy1NWnD W68JKUQVwXHxHxy/WB7FSql1LTAwhTDlDZpikLbHh5wFbs8V9JzWJi1h/Wuf8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710906622; 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=Uct2D4kTW3egLz25X6xmontW4tGnp2ha6hr4fV5guSk=; b=lAHmMJU37PJ9yGaB3CkIlbq3y2PFSb5LxFddsmgsxbpDEdUQGz0UENbqUq7yHlb1BypNEa gh/41YH46ziQ3ncAXQyEHknW7mfrYRsKfj8p2TwPLeZkuoJop7yDMNnAaz4+dqVC7PasGd Y7NhshpEMdbltqrxscU+Om8akzAKwIlI9Zb/CUKCiij7MPx/Wgr5ppM61V6D9+pdkYf6nL 2OQMon+4VyCtjzdhhkbMJV6K4O5liYN0ou+2tZhg9eDpCXxX09WDa4Re7kzBVEPsWbqFyB 4ivaY00f3i9QnohHq8zXs6v0aIQtLwkPWHNRjOqOLsARMsTBobKWoMRTS83NLQ== 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 4TzvkQ5GKZzbmQ; Wed, 20 Mar 2024 03:50: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 42K3oMhA047459; Wed, 20 Mar 2024 03:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K3oMEU047456; Wed, 20 Mar 2024 03:50:22 GMT (envelope-from git) Date: Wed, 20 Mar 2024 03:50:22 GMT Message-Id: <202403200350.42K3oMEU047456@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: f54495100fbf - main - sys/syscallsubr.h: align definition of kern_fcntl_freebsd() on 32bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f54495100fbf8f662dc9cdeca4ba70ba31255bc9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f54495100fbf8f662dc9cdeca4ba70ba31255bc9 commit f54495100fbf8f662dc9cdeca4ba70ba31255bc9 Author: Konstantin Belousov AuthorDate: 2024-03-20 03:49:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 03:49:01 +0000 sys/syscallsubr.h: align definition of kern_fcntl_freebsd() on 32bit Fixes: d0efabdf15d956e9bc0414356ed798ca3c846e08 --- sys/sys/syscallsubr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 25df3f03f1de..6652619287ad 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -164,7 +164,7 @@ int kern_fchmodat(struct thread *td, int fd, const char *path, int kern_fchownat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int uid, int gid, int flag); int kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg); -int kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg); +int kern_fcntl_freebsd(struct thread *td, int fd, int cmd, intptr_t arg); int kern_fhopen(struct thread *td, const struct fhandle *u_fhp, int flags); int kern_fhstat(struct thread *td, fhandle_t fh, struct stat *buf); int kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf); From nobody Wed Mar 20 04:59:03 2024 X-Original-To: dev-commits-src-all@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 4TzxFg1p2Kz5F0cR; Wed, 20 Mar 2024 04:59: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 4TzxFg1FyBz3xfW; Wed, 20 Mar 2024 04:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710910743; 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=IpmUQf85jRu2I2cRrsIjuOWmx57IcPR4Pp/G+/S6hoQ=; b=YrF/MG4Lw/9F28hjsvrqokneoVairmW45uHaAAKy8d2pyPrhfR8e1n6VvSR+g1D8g+I299 lLN6vf3qGe14TvwxjkY/ITLM1+ZOpmiiC5murDgJYdV4x4MbB53QzIoPKCSbYwcYO157Sq 5QGefUDl3pklLUfPvCMRsv1q9ksPaSj4SbvmRxvEndQojRgxXhAvPvDJ82tPHI2t7SFYzL dasRmSBpw/4aKOjDhqG436tugfvUkZirOIZoSRRv4pa7BdV6od/yq2+08R99CIaGlMHq9N RdvLRAqwltWogxbT89Jn5611/YnOqN0DvJMVKYzbQAnfRHCZiwT603D/fNOoTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710910743; a=rsa-sha256; cv=none; b=Ei0xP92/qCXj9ml2qABFXglcN7Oi2goiFdpT/GjeXmfM5EQZ544eIltqEk0gaWLGSlv7th AvuOXhLD/SUWAJCrA/QM/F8EUM9C1KERN01suKAsCiwFA8OTXF3/zRLLlK35n5gllgpair Q1jtFWHXmt4Svov6DS2dzb4LFclLMDos7SpphovaaevBQTLNcX3wW9N+MAspfx4XFoH8rS GhyRdTANHjqgHZdEtb/Sclj0elrtZhoPiVnh1A239i8jvpdFPrej5nwWvO2uYipX8kbNt9 0XbXlmAZWd38M27+3hoSu5Wg+EaDiHUjxHVJDUOrKvuBVmHpfo0HVil/SMpq4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710910743; 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=IpmUQf85jRu2I2cRrsIjuOWmx57IcPR4Pp/G+/S6hoQ=; b=wY+HcWIUV7Icced9TxBjVF7sxwPbcUdaoGVsQlktSwaNS0OnDLdJJJCti+BxT/eR7nM1tf Efi0f9J2edrc4uaL2VFHwL4Ymn8dnC7oPqOnuqImdDpkVL/GQqAvC/x9liI8lu13ThpZ05 D1hDv9GZMC+3BOqwK3I4lg4hNXsoYVjUhKRVVw8kSUGeUxwe6VlckU6IeSf1KDNVWijBAN c2TudX1iS9cjJiwHBr1HJtu4Vx8GJxxSgg5N62SEJlRyGwai23I7lfZ0FgNI1JtaYFAzy2 ov2lKqXZd0pMcFSf8AJXyS9B4cUDaU0iCRJlnIWQ9CV+vnIQHDIHm73xtosw3A== 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 4TzxFg0sZpzd0r; Wed, 20 Mar 2024 04:59: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 42K4x3Ub055854; Wed, 20 Mar 2024 04:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K4x3qY055851; Wed, 20 Mar 2024 04:59:03 GMT (envelope-from git) Date: Wed, 20 Mar 2024 04:59:03 GMT Message-Id: <202403200459.42K4x3qY055851@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: bb4116576f2e - main - rc.initdiskless: Disable soft-updates in mdmfs (again) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bb4116576f2edf466ada3885cf851599ce7a4792 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bb4116576f2edf466ada3885cf851599ce7a4792 commit bb4116576f2edf466ada3885cf851599ce7a4792 Author: Jose Luis Duran AuthorDate: 2024-03-20 04:54:18 +0000 Commit: Mark Johnston CommitDate: 2024-03-20 04:54:18 +0000 rc.initdiskless: Disable soft-updates in mdmfs (again) Re-apply the -S switch to disable soft-updates in memory disks (commit 8b1292ac5219). This might be beneficial when tmpfs(5) is not present in the kernel, as this can cause mdmfs(8)'s auto keyword to fallback to using md(4). PR: 85558 MFC after: 1 week Reviewed by: imp, emaste, brooks Differential Revision: https://reviews.freebsd.org/D43242 --- libexec/rc/rc.initdiskless | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.initdiskless b/libexec/rc/rc.initdiskless index 8b4a01187636..a6820a546e55 100644 --- a/libexec/rc/rc.initdiskless +++ b/libexec/rc/rc.initdiskless @@ -208,9 +208,9 @@ handle_remount() { # $1 = mount point # $1 is size in 512-byte sectors, $2 is the mount point. mount_md() { if [ ${o_verbose} -gt 0 ] ; then - /sbin/mdmfs -XL -s $1 auto $2 + /sbin/mdmfs -XL -S -s $1 auto $2 else - /sbin/mdmfs -s $1 auto $2 + /sbin/mdmfs -S -s $1 auto $2 fi } From nobody Wed Mar 20 05:13:15 2024 X-Original-To: dev-commits-src-all@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 4TzxZ41NJQz5F2H4; Wed, 20 Mar 2024 05:13:16 +0000 (UTC) (envelope-from brooks@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 4TzxZ40l0Nz40cr; Wed, 20 Mar 2024 05:13:16 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710911596; 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=ntDa3lOlgD0SCz3QBVyw2FwUnhat59FogCzM9JMIJBA=; b=c7pC8q2vVdZEZ+9xyZGRQ5OKulvymBTplsFLNm2l6gL/8bWyyh3diOKPCVyAfszblMMVAU NaYmHm6yqSaqgAtI7cVpvfm7poa6WC9Z7b7h5LuxZI13ZZ7spNmiTGq0Yb67Ebp7D+4FOI D8x5JxcIdnZwUHsp9v7Eqo2TdiLYPO8HQ8Gi4ixHrAq/X1VK7BVoYgWqpx0vJuGRn0t4Lk UkKW4iJrpQXgm90oeaD2lpJNMdvNpaOByX8EUYj4f03L1Axhiy8/23OmuAWTpdFqdbq/Gc xU0/fi2jwTlDTGq/tmRMnEilnVp13FvqqmpI3JZL702WBZRTskAyUz61L+A40A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710911596; a=rsa-sha256; cv=none; b=TVwU0CrNzWcPuOMA3eF2S9g3Qjtp8fHrtC3LPPm+LfT/AeZ8UOGe+xU2Lo3m35SQjyK0q+ TnutffMNsNdBtfphsdVm+lOpLvuOl7KH9ZnHtOlIkQ+ajPDHpaBG9MxQuebXsDtgkvx4es /W3t9RgQ0Gt7vAhX6bu06Rsv2JXY8H0IFQ/nEvrEIRW6mT0xR5UnzlcqbUpKCAVHwdDpLb pqvpmLBQTaO2M0B+MryN55JJg9i/U/JAY/OmhAwMKmTMVbF1JpFJGcQkOVBQRfEFeMQJBd meDsWeICFonsu4pf4vBdOnKBLBpfLdzN6Pk5djuNHYWKj/XrE5j6LNO2DusstQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710911596; 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=ntDa3lOlgD0SCz3QBVyw2FwUnhat59FogCzM9JMIJBA=; b=UKKa3sdq7gYkl6wuhFj2DCSMlNC1VkeluNm+rKuYe5peeux8DCFJcWRB/bSYmP1X6mh1H8 XxUJ8Eo1XmvAyOHrtRYADLoBiKMqYTOMAkvpG0lq4iZBFaLh0zRVGRuGFj34nqd8Rc55Uf RMcAfzu08mBt7MoRCSRSoJSI5CrwYv318Mhh16lAEe6asnID5o/KluvVRh20I4hzeG0c4Y ze9TaLXfOMMPBNSa3qwkv0BdISwVdWXMFZv/M6jX7PkaDOZKjRhq6nZ5GqkW6nwxwtGn+m f4RFgwA7MDycqYCxB1H9WwXjylgGVXtbq2bRsARoTGNQe1Lmz38z612mIo5kDg== 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) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TzxZ40CdNz1LK2; Wed, 20 Mar 2024 05:13:16 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 3FF513C019B; Wed, 20 Mar 2024 05:13:15 +0000 (UTC) Date: Wed, 20 Mar 2024 05:13:15 +0000 From: Brooks Davis To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: f54495100fbf - main - sys/syscallsubr.h: align definition of kern_fcntl_freebsd() on 32bit Message-ID: References: <202403200350.42K3oMEU047456@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202403200350.42K3oMEU047456@gitrepo.freebsd.org> On Wed, Mar 20, 2024 at 03:50:22AM +0000, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f54495100fbf8f662dc9cdeca4ba70ba31255bc9 > > commit f54495100fbf8f662dc9cdeca4ba70ba31255bc9 > Author: Konstantin Belousov > AuthorDate: 2024-03-20 03:49:01 +0000 > Commit: Konstantin Belousov > CommitDate: 2024-03-20 03:49:01 +0000 > > sys/syscallsubr.h: align definition of kern_fcntl_freebsd() on 32bit Thank you for the fix! I compiled many things around these changes, but apparently not a 32bit kernel. -- Brooks From nobody Wed Mar 20 05:34:13 2024 X-Original-To: dev-commits-src-all@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 4Tzy2G0bNPz5F4mn; Wed, 20 Mar 2024 05:34:14 +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 4Tzy2G04J6z42JL; Wed, 20 Mar 2024 05:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710912854; 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=05ZnDa+mJg2e0i1C32WH9jgnfXh8eYGiBzVYSeqYKyQ=; b=hflLWYpbobMNrmJw5Szbxj9p/GA8u3GFNh0DwLPq71F9iVAoROKU0QMFJOs2LcaiVhJLSm 1lFiaes3r5XQA2FD0R+/4ZusRBTX5ONKJoB24agOe6nH1bguvWJY3EWlJsUkx3cgTDp2GD ExZJbWjRgyKjSN0KeFhY/07LGOsXVpkAUU0iZJcTqWRuDlVnhbCPC93MAIr2YgfBDdfZnM a86k+5U0HJuEVzigcdmAkMaK3BSJA8cmd5URC3MuOUpRWOpq7NYd4UN4OJxraQ/C21n72f wS8gsHI7AyDLv9lJ2tcqNyRTnfX7ZwCfIoXdEljRsNt/mS9Ox5aOzIO7aIMIUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710912854; a=rsa-sha256; cv=none; b=YfIHg9h5GbXtU7wH72XxsfUu5Cla7PCvJIuvhfNWueqma75SZvUcJDjBuOb2DvVIoHAC8d LD5av54L5R3ntGGOR+6XBolprUXRz9uoT0EVCG1r5/I8zyNxziKJN2i9qtsg03gA1W+nd/ AVZ5nUgvzcFx9qVYGJJvYTzaPKcpdQBO947KPAOZ6h0+KzGosgtMyss1IV1W5vDeZLjI7z aVXiTFbnn3abbosJGptXXz7e135jUpD8YWNF21Os/mOHrc+qyF7S21+yQkTn+SDyMM8osJ LTpawBw+/mnZQoDAT4t4NDqrDPfQsZciBADqorU/7mvd8eg71C6ZD2RvSmMGgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710912854; 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=05ZnDa+mJg2e0i1C32WH9jgnfXh8eYGiBzVYSeqYKyQ=; b=WmYr1/Pon1GMuOaSxuzqlhK1OM66HWR1VY0oUiJS22GcmzZ52G4Tbr4s/qhweODOCTKXA8 Ns3s3jKANJMD85TSBt7z/+3IcdryMsul5fqBV1uFwZlDlOfFqONADZLfdlZvjFUWN3iUN1 m9EeqZMz4pQuW5ESd11MZkHFoDrGGkslh3oRmQwAZI2kokTvOhJgGpexZuus3zfxz0v0wW PCfG6IwPvcaZRQfLlgGpd9AN2C6+41le7cfU3HQ4JSdkAROdyQUW2a4mFmXAq/YNxbZsz9 7UxVDhYAi/iZ7xv2a79Mm+braO+ibOcU5dha5jwXLmnsunH19oDoJvI8jZGh+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 4Tzy2F6nYTzf4S; Wed, 20 Mar 2024 05:34: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 42K5YD7e022809; Wed, 20 Mar 2024 05:34:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K5YDIw022806; Wed, 20 Mar 2024 05:34:13 GMT (envelope-from git) Date: Wed, 20 Mar 2024 05:34:13 GMT Message-Id: <202403200534.42K5YDIw022806@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: 49a3780aeac3 - main - build: Order kernel-toolchain and buildkernel targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 49a3780aeac3e6f53a3be8e3ce5210c28a205c2a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=49a3780aeac3e6f53a3be8e3ce5210c28a205c2a commit 49a3780aeac3e6f53a3be8e3ce5210c28a205c2a Author: Mark Johnston AuthorDate: 2024-01-25 17:46:58 +0000 Commit: Mark Johnston CommitDate: 2024-03-20 05:32:24 +0000 build: Order kernel-toolchain and buildkernel targets MFC after: 1 week --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 04d8a014b0c6..b622897b6678 100644 --- a/Makefile +++ b/Makefile @@ -232,6 +232,7 @@ META_TGT_WHITELIST+= build${libcompat} .ORDER: buildkernel installkernel.debug .ORDER: buildkernel reinstallkernel .ORDER: buildkernel reinstallkernel.debug +.ORDER: kernel-toolchain buildkernel # Only sanitize PATH on FreeBSD. # PATH may include tools that are required to cross-build From nobody Wed Mar 20 08:53:49 2024 X-Original-To: dev-commits-src-all@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 4V02SY2mgzz5FVCv; Wed, 20 Mar 2024 08:53: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 4V02SY23ytz4LsW; Wed, 20 Mar 2024 08:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710924829; 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=BwAhCw1SEhwpkRhz8vr0x4MVAOp6+rzVZKyZNMKoBYk=; b=nZcbYEnrmToaDrIxNMjl3PtCKcb7ic8x6vJROmJK4vAvlGJZuM5P1+uSIFdln1lBCRPP3V 0sFs4xdeFQlJV//x+/VxumkwOO+GTvENtHkuf1i2XqAHmRQflCQDdLJl5JRnzGDJVyJMWC EGo0fjHIru998vFaQBAfJcztrQmMuoobvc4yy8LlgfIMaxpuVBmOmsNOCZm8yT1aTob7qK xTT+HbDnE4uYCeMQLcFO66CkzxhCNdSUd8RQR3E7SunD9z7+pPoIBEDUElxuukqSGThT6b 9LbtETiy5b17WnvxjH3BNgC6dhHR4LRKzT302pvg3wBLaQHb21bhjCz/pD5isQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710924829; a=rsa-sha256; cv=none; b=sLyGKtBQhQIcdtTkQUvtsHPd0+jiD/ExFDmasT+glvRoPOv4Gr/Ninf0zIcairM2PLTW9x MOpfhKJmcrpNu+36JHvQL+XP8LhfhS/ej4eQ+kjifsDQUbX8c97aPhqydmBuhGIsyRTRev yx3QABhkZagzLEXnpeMCt+hVk3N1l/ew9L1laCpE4iOubRLk+SR9OYVlTw/wnJqe9L0SNT YSBVhwCt56cUR/J6TF2unb7Z/bsLLqGgvXrCovDbBWgmqUz8KY5IQSHCEu9kPYokyjj2tG ky0CQaSHR4SoysyLSC9Zk/rKO5hWGwnZt4jnlBTlMuKr/VTkpdyox06hMZr4fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710924829; 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=BwAhCw1SEhwpkRhz8vr0x4MVAOp6+rzVZKyZNMKoBYk=; b=dVyYa8ygVYZrQX1ot4TYLL9pbCblErW10zpf5jWNhYt1FPafyJawXSFeM4/aKN6M0qS4L9 laRKHWy1zicsZODWuLWlVHktrxvo31J1+32LPpIztWsVGxCeteUufoXpHRTfTG+jwu3a+J 8HXn00neIXecB56N6KJmLqrZkVaR2axU4kgCUe5J4Q2jIO2bQxY3wgX6BeuvtsJVn++s4P LVbQEgYe0VaDFixtwsW48luTtrgpVrD6ozyuFnCE/UPCGcBtmSRL8O6a+U+XqU+n4AS3Lp QF8kZomfqiUMK4LrnGLrXGzTfKRR6XskU2DgJbvZDQyymN8kRp8PEKtE3O8/ow== 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 4V02SY1WVpzl6r; Wed, 20 Mar 2024 08:53: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 42K8rndq059941; Wed, 20 Mar 2024 08:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42K8rn7e059938; Wed, 20 Mar 2024 08:53:49 GMT (envelope-from git) Date: Wed, 20 Mar 2024 08:53:49 GMT Message-Id: <202403200853.42K8rn7e059938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 45d83c39262d - main - pkgbase: add a mechanism to be able to force a give ucl include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45d83c39262d9e2727c6f409e19c653f19a5d7cc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=45d83c39262d9e2727c6f409e19c653f19a5d7cc commit 45d83c39262d9e2727c6f409e19c653f19a5d7cc Author: Baptiste Daroussin AuthorDate: 2024-03-20 08:35:47 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 08:39:18 +0000 pkgbase: add a mechanism to be able to force a give ucl include This is made in order to be able to find add the post-install scripts for the kernel, where PKGNAME varies for each KERNCONF but we don't want to dynamically duplicated the kernel.ucl file. At the same time we don't want the *-dbg* packages to actually include those post-install scripts --- Makefile.inc1 | 2 ++ release/packages/template.ucl | 1 + 2 files changed, 3 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0c9213ea5104..2ed76aa68c65 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2258,6 +2258,8 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kerne ${SRCDIR}/release/packages/generate-ucl.lua \ PKGNAME "kernel-${_kernel:tl}${flavor}" \ PKGGENNAME "kernel" \ + FORCEINCLUDE "kernel${flavor}" \ + UCLFILES "${SRCDIR}/release/packages/" \ VERSION "${PKG_VERSION}" \ KERNELDIR "kernel.${_kernel}" \ DESC "FreeBSD ${_kernel} kernel ${flavor}" \ diff --git a/release/packages/template.ucl b/release/packages/template.ucl index 2e325e623336..a65f58868118 100644 --- a/release/packages/template.ucl +++ b/release/packages/template.ucl @@ -16,3 +16,4 @@ ${DESC} EOD .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGGENNAME}-all.ucl" .include(try=true,duplicate=rewrite) "${UCLFILES}/${PKGNAME}.ucl" +.include(try=true,duplicate=rewrite) "${UCLFILES}/${FORCEINCLUDE}.ucl" From nobody Wed Mar 20 15:45:05 2024 X-Original-To: dev-commits-src-all@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 4V0Cb56Pdwz5Fnh1; Wed, 20 Mar 2024 15: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 4V0Cb55wQ6z55NQ; Wed, 20 Mar 2024 15: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=1710949505; 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=RUraHRQlUxN/khLm4C1LEgh3847iDPlIkXbmP4qBl7o=; b=VskCFmc4sWkHOBTnheYOlOe0Cxfxf03hAcAs1DNxx80diEiDQYDQDUcO4noQB3wphQakaw 1fQ0Bv0wLhNX5gnzb8/ttg5LtCVyijZ1+2MxlTuP1peeaEvybH2oiy8UcL/EG2e4NnfgYg Xd0Lnh6e9XuB6UfQvGQsigUoBE4XgT46Ne+Uj0XSjsZWsgEsK9WoU4WEjWXH4uDYsv9ZZm QOcZEoa767P+driTFZwocz6YMyruixbhKM3S3qK8LZccB4xaPc3vkEYw/q9R6rEQh/DT+H m/x6p3A+1GijnJDWqyGNfagqFKeXooHeX03jWx2RAnXaDKSt/3lL1okDT5nShA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710949505; a=rsa-sha256; cv=none; b=KHGQTT4ubrO+d4tfeWgAMAfUuPRF17tZy8A3IIbW7XfAnq8wKNOFHVUPKFhCm/505CoXVt gVEs5qdDzWKlIdRmsyyXxnpy7tcJ8s702fhbnMYbRwHw/0JfiPLjPS6TeFo5XbXYCwBQpj 7b/hv9VespC1N6Xrs6CDI/ahnFuNSnykfD35hHLx7dOmtN2WX1svn2OXPjHN03f6OP5lHz Z4K7qDbGsv68d6uJ3daXP4tKgIB0+j5jXPGrDR6qaY621BWKYmf/wjlYzVtr5VDYDhT5B+ SO1oQf5U9Yr2UjaKHt5Pm7Y/gJ+6E2gaHdXbWXMSZLgM/XE69hR1dqBBaT3uVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710949505; 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=RUraHRQlUxN/khLm4C1LEgh3847iDPlIkXbmP4qBl7o=; b=AO4fn0ZaWT3kEeQKy4owL/6knBtbkymHHUeU4OquR1SJUic0Xd2AiW/elUSBg42sWvC0up wzaKuZ956XdC3h4d1CSbFuIVhJfIcXQ2IuA+6yjJofWlKewEAWY6kPD2k6rcp/mJYtwhBr LPDkmI/LzQz3zRXcDGDNUhPmHpoWoSDjJ5uE7uWfi/mbaNdl3tNfdtmg+MIjmQtIdnIf5d LAoVHJmRmygyn6zQfZaSweGqETkGC7+pLNXdQIiSBIJ0gmzc5Wlk3eTBvXy8CrAvvHS5e4 mNjuKdKX7b+GE7zGcQ6pAsS7ngg32qoZvZN12JQBnSEHlnWASmqQnroKnhKLsA== 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 4V0Cb55PmjzxDC; Wed, 20 Mar 2024 15: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 42KFj5ah052573; Wed, 20 Mar 2024 15: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 42KFj5PU052570; Wed, 20 Mar 2024 15:45:05 GMT (envelope-from git) Date: Wed, 20 Mar 2024 15:45:05 GMT Message-Id: <202403201545.42KFj5PU052570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8cd7841d8435 - main - pkgbase: separate /etc/mail/aliases from the sendmail package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cd7841d84356adb91450e3daf2c25454a102221 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8cd7841d84356adb91450e3daf2c25454a102221 commit 8cd7841d84356adb91450e3daf2c25454a102221 Author: Baptiste Daroussin AuthorDate: 2024-03-20 15:39:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 15:39:39 +0000 pkgbase: separate /etc/mail/aliases from the sendmail package move /etc/aliases and /etc/mail/aliases into the runtime package this file is used by both sendmail and dma. While here mark this file as a config file so 3way merge is performed --- etc/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 229d9380901d..848176fef914 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -20,7 +20,7 @@ SUBDIR+=sendmail ETCMAIL=aliases .if ${MK_SENDMAIL} != "no" -ETCMAIL+=Makefile README access.sample virtusertable.sample \ +ETCMAIL_SENDMAIL+=Makefile README access.sample virtusertable.sample \ mailertable.sample .endif @@ -78,13 +78,17 @@ distribution: .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - -T "package=sendmail" ${ETCMAIL} ${DESTDIR}/etc/mail + -T "package=runtime,config" ${ETCMAIL} ${DESTDIR}/etc/mail if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ - ${INSTALL_SYMLINK} -T "package=sendmail" \ + ${INSTALL_SYMLINK} -T "package=runtime" \ mail/aliases ${DESTDIR}/etc/aliases; \ fi .endif +.if ${MK_SENDMAIL} != "no" + cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ + -T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail +.endif .if ${MK_LOCATE} != "no" ${INSTALL} -o nobody -g ${BINGRP} -m 644 -T "package=runtime"\ /dev/null ${DESTDIR}/var/db/locate.database From nobody Wed Mar 20 15:45:06 2024 X-Original-To: dev-commits-src-all@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 4V0Cb712Ldz5Fnb4; Wed, 20 Mar 2024 15:45: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 4V0Cb66PJjz55QZ; Wed, 20 Mar 2024 15:45:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710949506; 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=erf7vA+kNdKxj36ISDcCx55JeFu/YD92TFaqAKTAoDQ=; b=F8+dVErbnacdf48myKLs+jpiYRg9Oi3QOb4awYJiQppUNHExFp+tRYk+X/FnDPh4iVigbk DRs29ybHGZOsb9JbVGGrDJB568nQRnEDNSrpssuJv/d5Bt+eafw4jveDX/B9mfFuxdFDsb 4vnpZ+niHhwJz8k29Ocd/WQN/E0Z4U3wHlDDmo6TGS1IvncyVq82BJ8nI7XbD9N//lo6UN 713neO3uCwho51kXEqQhMJP08ubajY2CLintBt4Y/oemRidx5HZSPbtV2exZ7nBaiSWchy gqM/KCOLrn1Gy9g5U0E/uLvd5esxKAFaxo8as0WhCwCRbhRMya+r2baQUnnRIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710949506; a=rsa-sha256; cv=none; b=aYSm0IEcS2z3U5yR7vfYoLRKcYESomRlwudjln4GGSbi906/Su+YI7EpoiEY8p3u8irDU3 5CEPO7RPrkbzpcTgKPQ5HXEk3Xzg5DZaY86KF9F0klSsSuXwfB48fenOH3g3N3y15D9XwG NbyFT32q3TsmTLT2cv774s46jS4leRzdwTfBycUGY+VITqKiI0HnbOsRhSqa5xaJssoz/O v1vJFUhwrWDXvW9J3rkKgog0oW2IxeecfDL9xOWy0UC3t0XUSLT80mZy7b4l730RRL5tND t1wVIHXwuHVxxmlYfdr12kzNZidEh0lPgB+NNY9UfG/03HnczRK/djXq23TOcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710949506; 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=erf7vA+kNdKxj36ISDcCx55JeFu/YD92TFaqAKTAoDQ=; b=IsO4GA8EYcWoGAk20zcc9iQnVN1i7/qPMiWHcEyze2ty+qY9IK2zVmp6jsb2CZM0KnwVe/ Q+p1Uii/Wz4g3AFdcORDBp65F1+MKh7eMXCvWAVV4gm7A6lMVyr/U9eRAkfXDb94axPMKb lMa/m6op7f374nP94H5fiB7y3YrfhyKg7XX1eRiWi/rSdsB0WPoxl7p7/OnJkURCTKJKKV qRPOY7KYqSyZrvFOKwCQFNUaEH9OZaaIs95cNbUSXDPapGKT/SuG/5laYXGPMunodjXrpw 4Rkn/pgEp+dZ33/i22eF+VfOQBekUcFYCFtM3vZ1L3dLd4RO1805mA2FuVKsOA== 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 4V0Cb661Qjzxb6; Wed, 20 Mar 2024 15:45: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 42KFj6Rq052627; Wed, 20 Mar 2024 15:45:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KFj6sa052624; Wed, 20 Mar 2024 15:45:06 GMT (envelope-from git) Date: Wed, 20 Mar 2024 15:45:06 GMT Message-Id: <202403201545.42KFj6sa052624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8c3a85eaeb05 - main - pkgbase: make sendmail config files as config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c3a85eaeb0552569e81be43091a18b9e702cc41 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8c3a85eaeb0552569e81be43091a18b9e702cc41 commit 8c3a85eaeb0552569e81be43091a18b9e702cc41 Author: Baptiste Daroussin AuthorDate: 2024-03-20 15:44:35 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 15:44:35 +0000 pkgbase: make sendmail config files as config --- etc/sendmail/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 93260e2e49d9..5135bf326e65 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -62,29 +62,29 @@ ${mc:T:R}.cf: ${mc} all: ${ALL} distribution: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail,config" \ ${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail,config" \ ${.CURDIR}/freebsd.submit.mc freebsd.submit.cf ${DESTDIR}/etc/mail - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail,config" \ ${SMDIR}/helpfile ${DESTDIR}/etc/mail .if defined(INSTALL_CF) - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail,config" \ ${INSTALL_CF} ${DEST_CF} .else - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail,config" \ freebsd.cf ${DEST_CF} .endif .if defined(SENDMAIL_ADDITIONAL_CF) - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "package=sendmail,config" \ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail .endif .if !defined(SENDMAIL_SET_USER_ID) .if defined(INSTALL_SUBMIT_CF) - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail,config" \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .else - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail" \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 -T "package=sendmail,config" \ freebsd.submit.cf ${DEST_SUBMIT_CF} .endif .endif From nobody Wed Mar 20 16:14:53 2024 X-Original-To: dev-commits-src-all@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 4V0DFV0Bd5z5FrNk; Wed, 20 Mar 2024 16:14: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 4V0DFT6sflz57hp; Wed, 20 Mar 2024 16:14:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710951294; 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=N+4EtGThNuFTRyDqW4euSp5lNpMSIVE/Wl2EpVGyKnk=; b=gmkSL0+ysLj1KqYchHtvZ/9m5AlPtbDshNiq42wmu/v7v+B141OfafXyIGbfkHUw1Cbp5z e4c8hUdt5TLogZx9LILh7E/WVA5SMLaJKyNQyllxC0XQQePf73d0CMUpwg3x6m44jJOsOR J4mRD18EM3DnJHYESyhCt6z2FxlPLYdXY8/Mzp/4YIo207Hm3LXNgEp8H69KYILwXLGDKb i7w3+E92PNh6toOOnsRVfyT+lMBt7Q4Sk8iU1tvky2iivQCmYKh+ZlUolN1KWDAFUSzMT6 JYwCsYnKcGO0rTzPda/tpjPkz/zKcw7k2hWuPVw1vdWT9sre6F1Yq6ZOfEw2YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710951294; a=rsa-sha256; cv=none; b=xFg4LOkv3YT+n2xeWh6eBxUQ6OD0+i+tcLTmvvlzraxCBmi9e/H9fjzv2hpG+IGZ+39Gpf KzS7uUDgEl/uHqs6ZW2UCGi6W5WAZd7SGlRrn50UuqsBx+voc2s5zoQ6J2yK9tSzTMrv4D YL4LywBmFvFOcqb51LuLE+1o3PX+IQh4mAMBzhFwUv0+AbFPagGVFwYFEVOEfA4pRWZ1Du z0Z8RWhDZDkl4EGNnlyyi0Zsusnho1gq68mUmALlnD5yZkUTJ9+Fgsc8nYqSRDcI2W1JQz AqCfujuLDP7MvmXezalH62LNmmSC4kXLhiaXHjKObk8TagkWln55E8PcU+RjPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710951294; 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=N+4EtGThNuFTRyDqW4euSp5lNpMSIVE/Wl2EpVGyKnk=; b=dWrZI0/y0rDCJLFOBjYQ0RaUm1ZMoBBdDDpB4ufnbHwjVKdq7D5tA9vNh50vhdCHkWXt4v 0wCS6p6IIO9lsTBAe3o8+G9F5NnIukraJJWIsrL88AWjdWhGbejJ9FEsluIJ64G/7PXiRS 6h1HpuI+wsfw+35L4cWhIlm21rKGNrN+rCfgM5enBJM4Go3WY/ZlX3VVYbkM4Cpn/R2zjH 5P3KZzCKRGYYfC/u/w9u5VdO3t2U9bFUGerPYqI6VzgNbJMdV9PnPUC0WNUI/4cxvwEPpD fZo4zhmbyYWNTtie6WKNCmYMzp8zc6yyFB+D71ViSNxTXSCVwYk2kml+0wWSiQ== 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 4V0DFT6SXFzy5b; Wed, 20 Mar 2024 16:14: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 42KGEro9003920; Wed, 20 Mar 2024 16:14:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KGErtW003917; Wed, 20 Mar 2024 16:14:53 GMT (envelope-from git) Date: Wed, 20 Mar 2024 16:14:53 GMT Message-Id: <202403201614.42KGErtW003917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3a9ddfa1ab46 - main - pkgbase: install all libc test files into the tests package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a9ddfa1ab46b492c861022ea254b3277ef74dde Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3a9ddfa1ab46b492c861022ea254b3277ef74dde commit 3a9ddfa1ab46b492c861022ea254b3277ef74dde Author: Baptiste Daroussin AuthorDate: 2024-03-20 16:13:56 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-20 16:13:56 +0000 pkgbase: install all libc test files into the tests package --- lib/libc/tests/stdlib/dynthr_mod/Makefile | 1 + lib/libc/tests/tls/dso/Makefile | 1 + lib/libc/tests/tls_dso/Makefile | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/libc/tests/stdlib/dynthr_mod/Makefile b/lib/libc/tests/stdlib/dynthr_mod/Makefile index 3c6330cb712f..1db3a3c9d571 100644 --- a/lib/libc/tests/stdlib/dynthr_mod/Makefile +++ b/lib/libc/tests/stdlib/dynthr_mod/Makefile @@ -3,6 +3,7 @@ SHLIB_NAME= dynthr_mod.so SHLIBDIR= ${TESTSDIR} SRCS= dynthr_mod.c LIBADD= pthread +PACKAGE= tests TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/:H} diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile index ec996105f4d3..2e08d6899d63 100644 --- a/lib/libc/tests/tls/dso/Makefile +++ b/lib/libc/tests/tls/dso/Makefile @@ -6,6 +6,7 @@ SHLIB_NAME= h_tls_dlopen.so SRCS= h_tls_dlopen.c MAN= +PACKAGE= tests LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile index 403d789a01f7..bae78739708d 100644 --- a/lib/libc/tests/tls_dso/Makefile +++ b/lib/libc/tests/tls_dso/Makefile @@ -7,6 +7,7 @@ SRCS= h_tls_dynamic.c LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 +PACKAGE= tests WITHOUT_STATIC= WITHOUT_PROFILE= From nobody Wed Mar 20 19:41:57 2024 X-Original-To: dev-commits-src-all@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 4V0JrP2mGSz5DmbS for ; Wed, 20 Mar 2024 19:41: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 4V0JrP2Kbvz4JfC; Wed, 20 Mar 2024 19:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710963717; 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=G8z1SBk/uF3POkrGccwcdHkBtJ2b+SwmKbETDgCa31g=; b=BKBAg+47vydZK5pChX5mfb/dKZC9EFqdUBgtCJCrgzMGsfIjdPYv0h9N+DyggrW8MUHjSn wrzCq0kUQyvSpddq3iwj0o7OUajXNWJ6+F/cf8iF8IfO73NgX8CpG1uuYf9a3pdrZLi0pg xC+RPKWo7nBhadndooWnzeS36Z+WGBDcmCzUfy1M4Az5ycPxZRVEjLbGtAfU01NZ1Hghz5 l6PEcp+QycIVHVF1/L38yJ4xcNBxLToPh+vUwlsxSIs1d2tH9hvRrqxhjRrLc8bND67o0E 0MLDF3/UXw+fR23fUKKd4CE5sPGYiOPsj9iBq14Ye+ApNeMtSTCt5Xhau9wDFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710963717; a=rsa-sha256; cv=none; b=rKUyl45nu7G4+ihywzBJcwbiDWBUmWRuQIZBYg7Et7+2bOaUjNUAmhNcykI8DJ5l+kM8kv dAoywc9fg7Su/zeHevoAJbH96YgtQm124hF6xCtVba39RGU1Y8XwjlRhABjqc/LgQiD6Sd fEaeJmDdBs2IlSWziVpRFKj+4un1l3aoAkA0uokP0Nkzc9u0fVCX3l1qnsKZv6tHcpl+jM R1ywW8U2pfaDHKDqBFZP3zF6h2H8zDDg+bbB0xadHyL/3Db8RQGGZ82tLskBRTu6wgG4pN oAqy6TtUFYZ4i8owImhqOjMOulD2m8UxRchEfGfgBljcfF+RAoXv5YjA4QCzew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710963717; 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=G8z1SBk/uF3POkrGccwcdHkBtJ2b+SwmKbETDgCa31g=; b=F/TMW0T3meh51QsLbNJ07BIaQEZAhE/ydVvY/mvUdJwMNg5v6x8dWSBiR0b5DvwlIeyOTK LjZghrQuAeamx1+Co4Y120lRpO9MXdSy0CKA8WwPTBTxPn6khcvY1buSt98Cvq6/Di44L6 jalJum9U51NUY9Akuf6xbtyX6A2nSvrF1c5VyjhLxWX9p+PF4g9yABYeNkMdwQtvA+7QNO aE51kzqYMATaDgxvlVJdwZDnHmkB6m3d/o3k4woIOEFvgTW5UJjYwJbRyDwjIDMkXsIURx rAfEp8DaaNuks0fxGmUIhkUVNkgL0Fkqg6e2svYyVqhEWEkybhu/Hz/bvUsCCA== 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 4V0JrP1d3nz13Zv; Wed, 20 Mar 2024 19:41: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 42KJfv7k056008; Wed, 20 Mar 2024 19:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KJfvS3056007; Wed, 20 Mar 2024 19:41:57 GMT (envelope-from git) Date: Wed, 20 Mar 2024 19:41:57 GMT Message-Id: <202403201941.42KJfvS3056007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: c47d0ea18398..309417d444d2 - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 309417d444d2524fe6e9c2912879724afe191bee X-Git-Oldrev: c47d0ea183983e0631f8cc41e9d25e4854368a0a X-Git-Newrev: 309417d444d2524fe6e9c2912879724afe191bee Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=c47d0ea18398..309417d444d2 309417d444d2 Import device-tree files from Linux 6.5 From nobody Wed Mar 20 19:41:57 2024 X-Original-To: dev-commits-src-all@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 4V0JrP4yXwz5Dm3d for ; Wed, 20 Mar 2024 19:41: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 4V0JrP3PdNz4JSt; Wed, 20 Mar 2024 19:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710963717; 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=iepXEq9BrBtos/q71wOzoj90GyJl7BzYIh3skoEsTns=; b=kbnBgfHWjg9JDBhfhFftAZb87S6ceAdFwX/PKYindn8+aaxZjN342l6Ogt8FJR79a0S+Pi PqBXTkyrwa1VSQYGFNOEmEYACZ0KS1lEzgRxIhCDp0kll7stfyNHiL40ujZbHWqqPop8ap 5PbQSRhT6mfS8Y9T7iLdWT0oOlLtYD6RLy/mtxtZRQ6gkPJXNSZ14Bf4EVpUzKZfyZQaG0 DA3SyOUCozQX8KzOpGxbxPC+WTxZOmRkjomeTYqjLf8JagudAd6Esz1YHgIWpuZDfHyjQl MIqphcHejmsv0++uedtgEhYWG9W38QJHCvEJln52z5Myy+rnGd3QJcepwGwI7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710963717; a=rsa-sha256; cv=none; b=uqYQ9l/oO2xs+uUJk8+A0RVkJjJrUg2gmlVKWgWOsTbegwtWhGfR7elyLiKmeWf2WUP5yO WZDHEONju+ZjJTrn8x0ZaJA95UO8ZNVP6qsdw3f+vip7BByq9FVU2uNbFcGjzYHIzXYoF8 6yrZAxkHJZ3m3xiZQG7mHbu1rUNSIf1Kb7Rrpqv8YikyyHEmMvSS8BVMSw808fmxRT63Gr nBnhq0mq9j/F5pY4SDXp7kU3oWePXDfzTC2vMtG0F8b/bbqf8H1wl8a2NkHUxRDGPZH9l+ r4jQgRdtE0fNLGy/2x0/olWQvYlYQaInI/T1vFy3Kcu3Z4FKHO4+AZemgqk5Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710963717; 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=iepXEq9BrBtos/q71wOzoj90GyJl7BzYIh3skoEsTns=; b=hUrh7JqfeiLjKqCBL36NGRcwdQHUV+AqR7Cx5v4jsz3yhAlPnVzOKezSvR9Hksi+MjHTep nAEKF4hkYuXMgafj3XfoTm/gghvH20BBLdcdX6YyWsli6Ik0iJVQLPtj90E5O+U+4abnqv PYw4rrQhPO6hFSVOHllWhnaGNOFY50XuLbP0XoBIdBtj4IGe658/wR58iD+q8k4yXRbHSl Cg8nXxYjgtTZqcHONLMAex1U4NSJx4vsGgvpxjePFIaBOOs+eMS5cyd6YngCSDap+NYRaU m6+ZtOzkKDljEWOHEPHToKLsfT+KjvPft5s9zPcYK/YouxgoaaHYhVZNMMW5BQ== 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 4V0JrP31GWz13wS; Wed, 20 Mar 2024 19:41: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 42KJfvG2056027; Wed, 20 Mar 2024 19:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KJfvm5056026; Wed, 20 Mar 2024 19:41:57 GMT (envelope-from git) Date: Wed, 20 Mar 2024 19:41:57 GMT Message-Id: <202403201941.42KJfvm5056026@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 7250bc53efff - Create tag vendor/device-tree/6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.5 X-Git-Reftype: annotated tag X-Git-Commit: 7250bc53efff1da18d481d2f1fda3532104fc42c Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.5 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.5 tag vendor/device-tree/6.5 Tagger: Emmanuel Vadot TaggerDate: 2024-03-20 19:40:48 +0000 Tag device tree files from Linux 6.5 commit 309417d444d2524fe6e9c2912879724afe191bee Author: Emmanuel Vadot AuthorDate: 2024-03-20 19:38:54 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-20 19:38:54 +0000 Import device-tree files from Linux 6.5 From nobody Wed Mar 20 19:51:13 2024 X-Original-To: dev-commits-src-all@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 4V0K352hJJz5DnGQ; Wed, 20 Mar 2024 19:51: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 4V0K352Dn8z4KgG; Wed, 20 Mar 2024 19:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710964273; 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=cOB93JpRpP7PFo0x62yV4GER7QqU8ls3xTksFTT1TEc=; b=TSHCCXEkROmRNfKdVMLRUvCxFGO+jWZkudot6CI5iSGt/+wI+amYqWc7qefRcnODAL3T3U /RRLwYFw4nBg6R6syvGWqsWP/XYWB6uHC3kqhvnbqRA3lzMGp9CRaSho3p+BFPxAJcqb/U NkwOt0QS66fknv/L3MmcuiTI0/mR5YB+4vi4Xh96/QEOqkfMwTHpxY4zl6vT150LkYjsrt jEWO5KElqKMtqwK1B2NTpQbutZTo6F3v9HkRWMlodAORshaOoPCq03ryKR67vZKldzsJRg /U3dZ7/LLUsd8qU0KkTRGOnslFfWzfcOdfFcQAXj6Z9hrlJ81M73u0M+hEdJuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710964273; a=rsa-sha256; cv=none; b=Qh6WQVR2XthTPrFBCaQKhBD8R1Sw2Wr4o0Z2jwFQDAtf943qcwqiqhH/TijIk1dy8nHwbg EI8hzizQzDja2ZclIMFDWRSix3sdzi2OhHXPYuczYcse78huBbxPGQembc86aEoXsR4lA/ BAVyJsCKu8nlaZodxtvlKa/76f1iMbVj8MjSWRcZWka56Idnn3tRI0ueVZhRnzv5ZE5fc3 F330RVCyQ5YGIa8YwmX/c8mXUfkUjAQXWk+Mm4gM70nxVnb2If3HjZeUZWMAt3wDd+xZM9 qrO3FPTd8ccQItdxh7Z48qvCkW8B8b9X9A/vRZUCK9kQEksVKiswwPVEF6EuLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710964273; 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=cOB93JpRpP7PFo0x62yV4GER7QqU8ls3xTksFTT1TEc=; b=CqIqjZgFy+taAJyR9TIpReVYEWQKBFBE5S44Qwjnm+11WRzY1dvQwVhhpG5QtU7CrR5gZ5 dq8mcf7y7q4vfJpqWreVoJn5oeo18ETieZQ6Ud+FWkXF03QJq+PyX68qv5qvaWtOxXYF/5 vcJqbxqcHPf/awJa9x52rPu/eTKjvLiv7gPOvKGp87xULppg9L+4QJn6FNRireG3Jg/MTH 5zQnmKGim6U1mf9B+ROOiegGXl4HJsvvQmwY/tfzSCaHtQECVUe5ij4Ysx8xw80m6v6fbo EqIw9W0+VToIIupzxPC4o8CvV7RiAenxRhPKCnEC865DO6mBhiCXzBQqbyo8rA== 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 4V0K351nV1z13x1; Wed, 20 Mar 2024 19:51: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 42KJpDdp071259; Wed, 20 Mar 2024 19:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KJpDJh071256; Wed, 20 Mar 2024 19:51:13 GMT (envelope-from git) Date: Wed, 20 Mar 2024 19:51:13 GMT Message-Id: <202403201951.42KJpDJh071256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 530c2c30b0c7 - main - ip6_output: Reduce cache misses on pktopts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 530c2c30b0c75f1a71df637ae1e09b352f8256cb Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=530c2c30b0c75f1a71df637ae1e09b352f8256cb commit 530c2c30b0c75f1a71df637ae1e09b352f8256cb Author: Andrew Gallatin AuthorDate: 2024-03-20 19:46:01 +0000 Commit: Andrew Gallatin CommitDate: 2024-03-20 19:50:57 +0000 ip6_output: Reduce cache misses on pktopts When profiling an IP6 heavy workload, I noticed that we were getting a lot of cache misses in ip6_output() around ip6_pktopts. This was happening because the TCP stack passes inp->in6p_outputopts even if all options are unused. So in the common case of no options present, pkt_opts is not null, and is checked repeatedly for different options. Since ip6_pktopts is large (4 cachelines), and every field is checked, we take 4 cache misses (2 of which tend to be hidden by the adjacent line prefetcher). To fix this common case, I introduced a new flag in ip6_pktopts (ip6po_valid) which tracks which options have been set. In the common case where nothing is set, this causes just a single cache miss to load. It also eliminates a test for some options (if (opt != NULL && opt->val >= const) vs if ((optvalid & flag) !=0 ) To keep the struct the same size in 64-bit kernels, and to keep the integer values (like ip6po_hlim, ip6po_tclass, etc) on the same cacheline, I moved them to the top. As suggested by zlei, the null check in MAKE_EXTHDR() becomes redundant, and can be removed. For our web server workload (with the ip6po_tclass option set), this drops the CPI from 2.9 to 2.4 for ip6_output Differential Revision: https://reviews.freebsd.org/D44204 Reviewed by: bz, glebius, zlei No Objection from: melifaro Sponsored by: Netflix Inc. --- sys/netinet6/ip6_output.c | 67 ++++++++++++++++++++++++++++++++--------------- sys/netinet6/ip6_var.h | 56 +++++++++++++++++++++++++-------------- 2 files changed, 83 insertions(+), 40 deletions(-) diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index a2c3efad749b..530f86c36689 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -159,14 +159,12 @@ static int copypktopts(struct ip6_pktopts *, struct ip6_pktopts *, int); */ #define MAKE_EXTHDR(hp, mp, _ol) \ do { \ - if (hp) { \ - struct ip6_ext *eh = (struct ip6_ext *)(hp); \ - error = ip6_copyexthdr((mp), (caddr_t)(hp), \ - ((eh)->ip6e_len + 1) << 3); \ - if (error) \ - goto freehdrs; \ - (_ol) += (*(mp))->m_len; \ - } \ + struct ip6_ext *eh = (struct ip6_ext *)(hp); \ + error = ip6_copyexthdr((mp), (caddr_t)(hp), \ + ((eh)->ip6e_len + 1) << 3); \ + if (error) \ + goto freehdrs; \ + (_ol) += (*(mp))->m_len; \ } while (/*CONSTCOND*/ 0) /* @@ -431,6 +429,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, uint32_t fibnum; struct m_tag *fwd_tag = NULL; uint32_t id; + uint32_t optvalid; NET_EPOCH_ASSERT(); @@ -491,14 +490,17 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, * Keep the length of the unfragmentable part for fragmentation. */ bzero(&exthdrs, sizeof(exthdrs)); - optlen = 0; + optlen = optvalid = 0; unfragpartlen = sizeof(struct ip6_hdr); if (opt) { + optvalid = opt->ip6po_valid; + /* Hop-by-Hop options header. */ - MAKE_EXTHDR(opt->ip6po_hbh, &exthdrs.ip6e_hbh, optlen); + if ((optvalid & IP6PO_VALID_HBH) != 0) + MAKE_EXTHDR(opt->ip6po_hbh, &exthdrs.ip6e_hbh, optlen); /* Destination options header (1st part). */ - if (opt->ip6po_rthdr) { + if ((optvalid & IP6PO_VALID_RHINFO) != 0) { #ifndef RTHDR_SUPPORT_IMPLEMENTED /* * If there is a routing header, discard the packet @@ -524,11 +526,13 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, * options, which might automatically be inserted in * the kernel. */ - MAKE_EXTHDR(opt->ip6po_dest1, &exthdrs.ip6e_dest1, - optlen); + if ((optvalid & IP6PO_VALID_DEST1) != 0) + MAKE_EXTHDR(opt->ip6po_dest1, &exthdrs.ip6e_dest1, + optlen); } /* Routing header. */ - MAKE_EXTHDR(opt->ip6po_rthdr, &exthdrs.ip6e_rthdr, optlen); + if ((optvalid & IP6PO_VALID_RHINFO) != 0) + MAKE_EXTHDR(opt->ip6po_rthdr, &exthdrs.ip6e_rthdr, optlen); unfragpartlen += optlen; @@ -538,7 +542,8 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, */ /* Destination options header (2nd part). */ - MAKE_EXTHDR(opt->ip6po_dest2, &exthdrs.ip6e_dest2, optlen); + if ((optvalid & IP6PO_VALID_DEST2) != 0) + MAKE_EXTHDR(opt->ip6po_dest2, &exthdrs.ip6e_dest2, optlen); } /* @@ -627,7 +632,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, /* Route packet. */ ro_pmtu = ro; - if (opt && opt->ip6po_rthdr) + if ((optvalid & IP6PO_VALID_RHINFO) != 0) ro = &opt->ip6po_route; if (ro != NULL) dst = (struct sockaddr_in6 *)&ro->ro_dst; @@ -641,7 +646,7 @@ again: * Do not override if a non-zero value is already set. * We check the diffserv field and the ECN field separately. */ - if (opt && opt->ip6po_tclass >= 0) { + if ((optvalid & IP6PO_VALID_TC) != 0){ int mask = 0; if (IPV6_DSCP(ip6) == 0) @@ -653,7 +658,7 @@ again: } /* Fill in or override the hop limit field, if necessary. */ - if (opt && opt->ip6po_hlim != -1) + if ((optvalid & IP6PO_VALID_HLIM) != 0) ip6->ip6_hlim = opt->ip6po_hlim & 0xff; else if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { if (im6o != NULL) @@ -855,7 +860,7 @@ nonh6lookup: /* All scope ID checks are successful. */ if (nh && !IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { - if (opt && opt->ip6po_nextroute.ro_nh) { + if ((optvalid & IP6PO_VALID_NHINFO) != 0) { /* * The nexthop is explicitly specified by the * application. We assume the next hop is an IPv6 @@ -2648,10 +2653,14 @@ ip6_clearpktopts(struct ip6_pktopts *pktopt, int optname) free(pktopt->ip6po_pktinfo, M_IP6OPT); pktopt->ip6po_pktinfo = NULL; } - if (optname == -1 || optname == IPV6_HOPLIMIT) + if (optname == -1 || optname == IPV6_HOPLIMIT) { pktopt->ip6po_hlim = -1; - if (optname == -1 || optname == IPV6_TCLASS) + pktopt->ip6po_valid &= ~IP6PO_VALID_HLIM; + } + if (optname == -1 || optname == IPV6_TCLASS) { pktopt->ip6po_tclass = -1; + pktopt->ip6po_valid &= ~IP6PO_VALID_TC; + } if (optname == -1 || optname == IPV6_NEXTHOP) { if (pktopt->ip6po_nextroute.ro_nh) { NH_FREE(pktopt->ip6po_nextroute.ro_nh); @@ -2660,16 +2669,19 @@ ip6_clearpktopts(struct ip6_pktopts *pktopt, int optname) if (pktopt->ip6po_nexthop) free(pktopt->ip6po_nexthop, M_IP6OPT); pktopt->ip6po_nexthop = NULL; + pktopt->ip6po_valid &= ~IP6PO_VALID_NHINFO; } if (optname == -1 || optname == IPV6_HOPOPTS) { if (pktopt->ip6po_hbh) free(pktopt->ip6po_hbh, M_IP6OPT); pktopt->ip6po_hbh = NULL; + pktopt->ip6po_valid &= ~IP6PO_VALID_HBH; } if (optname == -1 || optname == IPV6_RTHDRDSTOPTS) { if (pktopt->ip6po_dest1) free(pktopt->ip6po_dest1, M_IP6OPT); pktopt->ip6po_dest1 = NULL; + pktopt->ip6po_valid &= ~IP6PO_VALID_DEST1; } if (optname == -1 || optname == IPV6_RTHDR) { if (pktopt->ip6po_rhinfo.ip6po_rhi_rthdr) @@ -2679,11 +2691,13 @@ ip6_clearpktopts(struct ip6_pktopts *pktopt, int optname) NH_FREE(pktopt->ip6po_route.ro_nh); pktopt->ip6po_route.ro_nh = NULL; } + pktopt->ip6po_valid &= ~IP6PO_VALID_RHINFO; } if (optname == -1 || optname == IPV6_DSTOPTS) { if (pktopt->ip6po_dest2) free(pktopt->ip6po_dest2, M_IP6OPT); pktopt->ip6po_dest2 = NULL; + pktopt->ip6po_valid &= ~IP6PO_VALID_DEST2; } } @@ -2730,6 +2744,7 @@ copypktopts(struct ip6_pktopts *dst, struct ip6_pktopts *src, int canwait) PKTOPT_EXTHDRCPY(ip6po_dest1); PKTOPT_EXTHDRCPY(ip6po_dest2); PKTOPT_EXTHDRCPY(ip6po_rthdr); /* not copy the cached route */ + dst->ip6po_valid = src->ip6po_valid; return (0); bad: @@ -2959,6 +2974,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, return (ENOBUFS); } bcopy(pktinfo, opt->ip6po_pktinfo, sizeof(*pktinfo)); + opt->ip6po_valid |= IP6PO_VALID_PKTINFO; break; } @@ -2981,6 +2997,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, return (EINVAL); opt->ip6po_hlim = *hlimp; + opt->ip6po_valid |= IP6PO_VALID_HLIM; break; } @@ -2995,6 +3012,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, return (EINVAL); opt->ip6po_tclass = tclass; + opt->ip6po_valid |= IP6PO_VALID_TC; break; } @@ -3045,6 +3063,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, if (opt->ip6po_nexthop == NULL) return (ENOBUFS); bcopy(buf, opt->ip6po_nexthop, *buf); + opt->ip6po_valid |= IP6PO_VALID_NHINFO; break; case IPV6_2292HOPOPTS: @@ -3083,6 +3102,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, if (opt->ip6po_hbh == NULL) return (ENOBUFS); bcopy(hbh, opt->ip6po_hbh, hbhlen); + opt->ip6po_valid |= IP6PO_VALID_HBH; break; } @@ -3150,6 +3170,10 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, if (*newdest == NULL) return (ENOBUFS); bcopy(dest, *newdest, destlen); + if (newdest == &opt->ip6po_dest1) + opt->ip6po_valid |= IP6PO_VALID_DEST1; + else + opt->ip6po_valid |= IP6PO_VALID_DEST2; break; } @@ -3192,6 +3216,7 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt, if (opt->ip6po_rthdr == NULL) return (ENOBUFS); bcopy(rth, opt->ip6po_rthdr, rthlen); + opt->ip6po_valid |= IP6PO_VALID_RHINFO; break; } diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index aeeda14f281f..f3ac13a9caad 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -130,27 +130,26 @@ struct ip6po_nhinfo { #define ip6po_nexthop ip6po_nhinfo.ip6po_nhi_nexthop #define ip6po_nextroute ip6po_nhinfo.ip6po_nhi_route +/* + * Note that fields with valid data must be flagged in ip6po_valid. + * This is done to reduce cache misses in ip6_output(). Before + * ip6po_valid, ip6_output needed to check all the individual fields + * of ip6_pktopts needed to be checked themselves, and they are spread + * across 4 cachelines. ip6_output() is currently the only consumer of + * these flags, as it is in the critical path of every packet sent. + */ struct ip6_pktopts { - struct mbuf *ip6po_m; /* Pointer to mbuf storing the data */ - int ip6po_hlim; /* Hoplimit for outgoing packets */ - - /* Outgoing IF/address information */ - struct in6_pktinfo *ip6po_pktinfo; - - /* Next-hop address information */ - struct ip6po_nhinfo ip6po_nhinfo; - - struct ip6_hbh *ip6po_hbh; /* Hop-by-Hop options header */ - - /* Destination options header (before a routing header) */ - struct ip6_dest *ip6po_dest1; - - /* Routing header related info. */ - struct ip6po_rhinfo ip6po_rhinfo; - - /* Destination options header (after a routing header) */ - struct ip6_dest *ip6po_dest2; + uint32_t ip6po_valid; +#define IP6PO_VALID_HLIM 0x0001 +#define IP6PO_VALID_PKTINFO 0x0002 +#define IP6PO_VALID_NHINFO 0x0004 +#define IP6PO_VALID_HBH 0x0008 +#define IP6PO_VALID_DEST1 0x0010 +#define IP6PO_VALID_RHINFO 0x0020 +#define IP6PO_VALID_DEST2 0x0040 +#define IP6PO_VALID_TC 0x0080 + int ip6po_hlim; /* Hoplimit for outgoing packets */ int ip6po_tclass; /* traffic class */ int ip6po_minmtu; /* fragment vs PMTU discovery policy */ @@ -171,6 +170,25 @@ struct ip6_pktopts { #endif #define IP6PO_DONTFRAG 0x04 /* disable fragmentation (IPV6_DONTFRAG) */ #define IP6PO_USECOA 0x08 /* use care of address */ + + struct mbuf *ip6po_m; /* Pointer to mbuf storing the data */ + + /* Outgoing IF/address information */ + struct in6_pktinfo *ip6po_pktinfo; + + /* Next-hop address information */ + struct ip6po_nhinfo ip6po_nhinfo; + + struct ip6_hbh *ip6po_hbh; /* Hop-by-Hop options header */ + + /* Destination options header (before a routing header) */ + struct ip6_dest *ip6po_dest1; + + /* Routing header related info. */ + struct ip6po_rhinfo ip6po_rhinfo; + + /* Destination options header (after a routing header) */ + struct ip6_dest *ip6po_dest2; }; /* From nobody Wed Mar 20 20:04:22 2024 X-Original-To: dev-commits-src-all@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 4V0KLG2Ypsz5Dpsf; Wed, 20 Mar 2024 20:04: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 4V0KLG22J0z4Lrm; Wed, 20 Mar 2024 20:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710965062; 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=0wUdbepTcA1EPitZpw8G6eZM3vEPyBwjXvoboa5WjUo=; b=UwrCsgJ92Z0DY8bu4qTNJF9XUWB8SKJ7r6eDWd8sicaTKtQk/EFR9lj52A1xiV2LDIk/9X xjgs8U8sHljS70JZj7o0BpNHKGYVtEp4BmD1AVx7fPxWz9+2adOx0YEyQyzpdv92USyGib bv+OL9GgVxVnTjtfvwZ7QzWkbNnXXpGLJj4hWh31vx1u33Jxp46MRIjdE3kmUtyViaIzS7 Rfyq3NaQ1hFAN2P5HrYzB+SJ9N7ggygWdwUEJ/Zq6pilFFKF5p9PNMU6qvFxUyKohlQ9WM Pf4C4Wfz5qjA2z617KEoA6WDyDgx7RMq8xCcTeIFsOJdOnf1zjrvS5NJwcg82w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710965062; a=rsa-sha256; cv=none; b=tSQraj5AFZlYxCrq42AYTUSTH86zC0TLEHhmRNNqVCc6qdtlew01fFkSU1te2/HzCSjw1w a93YbEt/WgufC+UtR3QqucQdgfuV7gRNjOdBeBnp6iSH3QBLtNnggnQRi35bLn2S//lBaA Ekg/WI59IbKBBrJknKG6fVsAxJZSB7GyHIunMpgjLoK6RKZhjojUGykbN4WuyQotByVIED z/6Z2CgvcGNv6G7wxart78o9sGCF1gxS2Vpw/6m97UpTgEjZkBjMS7PDKn9vcnljrqCYu1 jupN4wHfwBqH/Q6Ycqe+VNOG4HGDIvUnEJw9JwAxXvD8G3Cj22PAJYaiAK8uEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710965062; 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=0wUdbepTcA1EPitZpw8G6eZM3vEPyBwjXvoboa5WjUo=; b=OKHceKDnvI16yrP2v04fYVNbO/GhMKDP8g6hTrcy2cO3UpEAABTIv9LNJPMzCCIFm2+tF9 KnnuXi4dHH8Z8kOwjDh133gvRDe1g2sLIohFL0l1sH9FQamMnCpSjBN6HTAc2q09kD279n ASWmEFZB7MiiMykcuh3fWYHxmJl2/xh8vvdPkpzXzHb7jt5tX+hmvsOIsirEpG9l//CsYy tYMCFwdwWiRnURBsV+52lSGTED+/VGqzQFu2HcNgz9I4cG5rh1uGyBy1jI4rBU06fKhHiy ux7zIrqt8OlwmcjgxymkQIamu56kgXKoDRGZO4kwAsU4wmLcWPeFcoIR3y75oQ== 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 4V0KLG1dgrz14tP; Wed, 20 Mar 2024 20:04: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 42KK4M80094969; Wed, 20 Mar 2024 20:04:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KK4MQC094966; Wed, 20 Mar 2024 20:04:22 GMT (envelope-from git) Date: Wed, 20 Mar 2024 20:04:22 GMT Message-Id: <202403202004.42KK4MQC094966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7ad2e83d5e1e - main - arm/GENERIC: Remove TI DTBs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ad2e83d5e1eb76e5449cca2a08e382ed37129f8 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7ad2e83d5e1eb76e5449cca2a08e382ed37129f8 commit 7ad2e83d5e1eb76e5449cca2a08e382ed37129f8 Author: Emmanuel Vadot AuthorDate: 2024-03-20 20:03:01 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-20 20:04:12 +0000 arm/GENERIC: Remove TI DTBs We've removed TI support in 3416e102c4e9 ("arm: Remove TI code from GENERIC") so no need to build the DTBs now. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/arm/conf/GENERIC | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index ea4076230c5e..16830340df4f 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -266,10 +266,8 @@ device hid # Generic HID support # Flattened Device Tree options FDT # Configure using FDT/DTB data makeoptions MODULES_EXTRA+="dtb/allwinner" -makeoptions MODULES_EXTRA+="dtb/am335x" makeoptions MODULES_EXTRA+="dtb/imx6" makeoptions MODULES_EXTRA+="dtb/nvidia" -makeoptions MODULES_EXTRA+="dtb/omap4" makeoptions MODULES_EXTRA+="dtb/rockchip" makeoptions MODULES_EXTRA+="dtb/rpi" makeoptions MODULES_EXTRA+="dtb/zynq" From nobody Wed Mar 20 21:25:00 2024 X-Original-To: dev-commits-src-all@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 4V0M7K0WFKz5F0JF; Wed, 20 Mar 2024 21:25: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 4V0M7K054zz4X4K; Wed, 20 Mar 2024 21:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710969901; 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=Hbn+HBvWso0QqEVbgIxu4cZddo7T4WlgCCHZZrj6seo=; b=ucmZKyhlHUR+Y7Um3WlUwnZbG0BsxscWAQ8jLwp+YtUHTRdgUc4q1irMDYLafLiMvosfji QKI4cn03VgBLQS23RbyZa7NZJDmF1n9fVb5xygBwctP20lq2+fljOgl82ce51iL55w30LP Ww76vmGWjHJ49kMPiEhlkJjMKIhVUyUDWEG1WEKZ4NxYuLSiUsryHPv08QLV4kg8f9l7lu Eeg2HSKNGEWxu+cBicSEsPuBIgwIexgkBYfUJTralVmuPWzx2UqHHrQ3vEaDjIa038Lt58 RWzWDlThJp6Yk4W8X5po1uMKSLHNUZia3Z2F3lnpCpTPAyvZtQFFVn7cEE+n6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710969901; a=rsa-sha256; cv=none; b=KIkjkg66BS4xvHZgIq+oAOD/ygXMRJFQHIH6/gVpw9D/FO1nsLmXQAt7E5G91nsiaLNXec absnMV/0nMZhY2SVFQ9z6cyR9BYec66SXnscUkhTllqhgEZPF8734vS/nWlgUlI5ZiCJTJ DnjWf5+19KfYuZHidHtG0S5BaKtbDt7Tv2WjCEfzlsrPz6Cjmq5L7XdHRpQCKUWAhWrho4 QJz7QcnBlJz+fTvgHOxKHVGv3JgDnFUxpHSFn6KUHd03RTmUO/e+tfJ/uUgpbVWFEpie8T jIu7eYf6+pOKfPlutZAJb38DweHf0zVamOjf5+if+IiF2cqach87w/C7UX6sXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710969901; 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=Hbn+HBvWso0QqEVbgIxu4cZddo7T4WlgCCHZZrj6seo=; b=Sv6cp+4MDPTfzREeNktuYrTMCVLy1p7NqnZdw5HhgsmnHaf5IOOheenCkdgCyZO9qm3tcE GFpsclxqc/KyHGQ953qAIERfCaI2NfMC2CaqO8JeWu18EicRTeBj35TSXektDUEXvHI9YU g2/C02nMg+U37Eed/LO1kGQW4k8SIoBrQ1l5F++Fd5WZ6L3R43m4fkd05R56sTWEPK3jt+ Q3jX/ebtsPgemHXKzm5VzS1hIhF+MgcmLDnqBa67zC0QgJ0KLpsy+dIqO0fC2UDirL5nW9 UAz/827Hdp/RysoLeUYPJ68fImuCBKlRJbEImcEG/a8xkDmFo5Nh/AtcB49kbg== 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 4V0M7J6nglz16Vm; Wed, 20 Mar 2024 21:25: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 42KLP0CQ029917; Wed, 20 Mar 2024 21:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KLP0TO029914; Wed, 20 Mar 2024 21:25:00 GMT (envelope-from git) Date: Wed, 20 Mar 2024 21:25:00 GMT Message-Id: <202403202125.42KLP0TO029914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Silvers Subject: git: 083608e4669e - stable/13 - UFS: panic rather than forcibly unmount the root fs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 083608e4669e0eb3d31d4e7d9ced00ae822807e6 Auto-Submitted: auto-generated The branch stable/13 has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=083608e4669e0eb3d31d4e7d9ced00ae822807e6 commit 083608e4669e0eb3d31d4e7d9ced00ae822807e6 Author: Chuck Silvers AuthorDate: 2023-08-10 16:55:47 +0000 Commit: Chuck Silvers CommitDate: 2024-03-20 20:25:49 +0000 UFS: panic rather than forcibly unmount the root fs If the root fs is forcibly unmounted then basically every process will die with a SEGV as soon as it tries to run again because libc.so is gone, which leaves the system basically hung. It seems better to just panic instead, so let's do that. PR: 276944 Requested-by: karels Reviewed-by: imp, mckusick, karels Sponsored-by: Netflix Differential Revision: https://reviews.freebsd.org/D41387 (cherry picked from commit 60a41168d195cc09f7351c2c2bcafc389ed52406) --- sys/ufs/ffs/ffs_vfsops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index a7c619fe98ef..433df476f563 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -324,6 +324,9 @@ ffs_fsfail_cleanup_locked(struct ufsmount *ump, int error) mtx_assert(UFS_MTX(ump), MA_OWNED); if (error == ENXIO && (ump->um_flags & UM_FSFAIL_CLEANUP) == 0) { ump->um_flags |= UM_FSFAIL_CLEANUP; + if (ump->um_mountp == rootvnode->v_mount) + panic("UFS: root fs would be forcibly unmounted"); + /* * Queue an async forced unmount. */ From nobody Wed Mar 20 22:28:16 2024 X-Original-To: dev-commits-src-all@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 4V0NXL2tdNz5F6Lk; Wed, 20 Mar 2024 22:28:18 +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 4V0NXL2NGXz4cSt; Wed, 20 Mar 2024 22:28:18 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710973698; 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=SqXBTpL4lcje4hV2qzh7/FThSejNtGQgrswhO77kESQ=; b=WS2bvjiUIRzAuKvyOqrFqAtK5isQLwLpTPtb0K0bv1RpiWD6btkbhz+e3bQzqm2uRZSHyV YWsnOmukzww1uqbQu3rqzjXwWwOKR9WGVWvDclAq4PaV4pQnohzVer322ppQSGAPEp3RWT 7uaU1ly/agJDIHk7rDiJ6Qfvk1O7yJ5Wlvc01ZkiPndx8Qa5h/WKjUX2eVst3o9Hkmd8do WRroEKW+7Ag7iEkWzVZnKEAEukM6jVNrcrh1i4J7WwaD00sCO1ccvC2TpjdtKL7Nr4BnId +zo6mJup6hVzZjvuwYmEXp6JjLfGu2aAqBb18Ik7dgbRtFXgpOr+WEFGyC63zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710973698; a=rsa-sha256; cv=none; b=qDY/fWTBAAewmDEaz3mTmqLD+W9fHr+o7fdlR/WvFBafU8glnr0MOy0uB/8+Jh2FRcxNft H4IHrZDX5qMp1er2aO0O6cFpZzEGeypHKU91/T7t1v3cluLMAH368rf2lh8+OJaokJbmx5 r2ZIywMmmSc3lD5K9Atua0OgaYrKsF3Kiim4HQK433dcVpxzNgdJ8IdzpId+1jrANei9dk pM3U/94BFeUEGkDTuu7U3XZ1qif2A2d8sXAgdrvIOvNuQyOc2/CKH1jPmyDdBSMth3LhQC McCikvPtAF08a+jYQfN352lFmwonI6VRSRdx6NatDO39ZvcP2ourkubctldK7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710973698; 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=SqXBTpL4lcje4hV2qzh7/FThSejNtGQgrswhO77kESQ=; b=m6Mrfpwvi//Vi2rOZEg01eP1WSVquWk4Z0h6xsmCUIPueEp0E3Thxwkb0Eotuf7QjGRSrx +smI4PGwqwEEP8zAvRgtK6Na3qXWb3yMAQdeDM3f40sPssV0X3KL/YeXPeymUxNEQd50BT /c4pW8M2Ejzokx1SmsfE2W71bGQS8/DojuiQj91CMANiyscCSIAsdzXuhsxqZ3SzYVi+Dy HWgnsrYu8mJQ7CU+sXrkOf0Fc0y7QTdvag54esInr/IL6c7dOYJTTYpHSuejhmHdtTVaiF 8J8VhwBUCboW7L0kX7ep6PJxLr+vg0Sqalm+qylaO9oX/HZRMXx05HvM/oX0Iw== Received: from [IPV6:2601:644:937f:4c50:8511:5903:3902:6538] (unknown [IPv6:2601:644:937f:4c50:8511:5903:3902:6538]) (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 4V0NXK65XhzSMR; Wed, 20 Mar 2024 22:28:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <990ebe44-e240-4e74-9cbd-3a2a061b2b4b@FreeBSD.org> Date: Wed, 20 Mar 2024 15:28:16 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 45d83c39262d - main - pkgbase: add a mechanism to be able to force a give ucl include Content-Language: en-US To: Baptiste Daroussin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403200853.42K8rn7e059938@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202403200853.42K8rn7e059938@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/20/24 1:53 AM, Baptiste Daroussin wrote: > The branch main has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=45d83c39262d9e2727c6f409e19c653f19a5d7cc > > commit 45d83c39262d9e2727c6f409e19c653f19a5d7cc > Author: Baptiste Daroussin > AuthorDate: 2024-03-20 08:35:47 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-03-20 08:39:18 +0000 > > pkgbase: add a mechanism to be able to force a give ucl include > > This is made in order to be able to find add the post-install scripts > for the kernel, where PKGNAME varies for each KERNCONF but we don't want > to dynamically duplicated the kernel.ucl file. > > At the same time we don't want the *-dbg* packages to actually include > those post-install scripts FYI, now that kldxref is a cross-tool, it shouldn't need to be run as a post-install step anymore. Instead, the package for a given kernel should come with a linker.hints file. -- John Baldwin From nobody Wed Mar 20 22:34:37 2024 X-Original-To: dev-commits-src-all@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 4V0Ngd5Xbsz5F6l9; Wed, 20 Mar 2024 22:34:37 +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 4V0Ngd3FFdz4fBR; Wed, 20 Mar 2024 22:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974077; 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=DYDzzIdDkrwtYKYHrlL3GvP5Xj5PVqBcxgm8JEsWDqY=; b=QQbmvNavDNQtU0fi4lpoZBxiZ42kOOtOG4omLKhAccz72gIkkwhGFfwM2qg3ROYMRzi5wU cXWQjwNrqsRjZUJS4LvPR8dpMX8aNohF5NpyFyExK53GrCIQD7vjoL/8afqFT5M5SOVjzW uwlpuwJy2JEMsePb4nAknQwKEw22IbdG3+kfytMqXek7I16TBexzY6g4/bVRYAGNDmH5V7 205AGa5WRtqubA3sacKG3PhI9l3Gterk64PYYKZNmVGkEGCyUdA55rLtR/u9g34KkXugsQ Avp+CJKNpjpgLqYWyhdavEaXFpc2u2KAO4Tc8qeymKsNsEdpY0r9KiqB1ObUGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974077; a=rsa-sha256; cv=none; b=O06B1nJNI6xalk8XVns1grzBwbDKDmjEmI2Nl6U6rgA9du9QC6HSQdUg2T6EyvCu2JHS1f x/lgUX5pluyWBdTr7kbExMW7Bj8n/T6DgsnNd8/O2mmpbasLOCThhvMG5SmZpbkXBgK87l XhnBVQu6EEkwA6+bEk2X/4iKNrx4PkrvqwBhoNcpXq4jH478jN3cG+WT49eEX4n1ELySb+ LmIauXV8T/Dd1fDwT/Tc4f29OIEJvhFSe+cow00RyBka3hRwvaBM15qWbgYK6PhIpa1a9M JqZTKBdbH3lYJmjV1vpJY2KHjF3eFroXfVGOSjr9lYgF+VZBBlX00O+4sMo5EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974077; 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=DYDzzIdDkrwtYKYHrlL3GvP5Xj5PVqBcxgm8JEsWDqY=; b=rDg6wx/MAV5h+XRlBjIE8Du4g5Kfp7aRVrRerFhZx5w04O0FB6NCGq9isvGmheQB672kMY Fc/jS/p/CYe36RZuTOB9psZuO0yQjZlrap+9RoLHhOhOh+YOKzwBQd0QbaINvt+9pv5or7 rKwyfeGFWheFqCQ7iZEWaMjzmVedc0h0DkfgJV8fIZg6TgvPRpmXl1NlzMc1aD3NnATcQf U/R5/UfUlneAu/4F4jPnXs6+LEppLMGaD7gK4kXwT3aZuaqZgDSPKoNM7L3iCqmaqQxF0q aWD2Gfjh30lx8WNJ5bVQwjPi2fuKPKy3rsXIA7Q4tyen6/j+eAfmIRgqm/scAA== 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 4V0Ngd2rsZz18Pv; Wed, 20 Mar 2024 22:34: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 42KMYbCA047853; Wed, 20 Mar 2024 22:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMYbsv047850; Wed, 20 Mar 2024 22:34:37 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:34:37 GMT Message-Id: <202403202234.42KMYbsv047850@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: 3d0a736796a9 - main - tcp: Add a new kernel-only TCP_USE_DDP socket option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3d0a736796a99fe70be9de97beec8f10970c6905 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3d0a736796a99fe70be9de97beec8f10970c6905 commit 3d0a736796a99fe70be9de97beec8f10970c6905 Author: John Baldwin AuthorDate: 2024-03-20 22:29:02 +0000 Commit: John Baldwin CommitDate: 2024-03-20 22:29:02 +0000 tcp: Add a new kernel-only TCP_USE_DDP socket option This socket option can be used by in-kernel consumers (like NFS) to request a NIC to use optimized receive of large buffers for a connection. The current use case is to support DDP by the TOE on Chelsio NICs. Reviewed by: rscheff, tuexen, glebius Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44000 --- sys/netinet/tcp.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index a8259fa30a3a..c97a3e04d9b6 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -202,6 +202,9 @@ __tcp_set_flags(struct tcphdr *th, uint16_t flags) #define TCP_RXTLS_MODE 42 /* Receive TLS mode */ #define TCP_IWND_NB 43 /* Override initial window (units: bytes) */ #define TCP_IWND_NSEG 44 /* Override initial window (units: MSS segs) */ +#ifdef _KERNEL +#define TCP_USE_DDP 45 /* Use direct data placement for so_rcvbuf */ +#endif #define TCP_LOGID_CNT 46 /* get number of connections with the same ID */ #define TCP_LOG_TAG 47 /* configure tag for grouping logs */ #define TCP_USER_LOG 48 /* userspace log event */ From nobody Wed Mar 20 22:34:38 2024 X-Original-To: dev-commits-src-all@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 4V0Ngf5mJfz5F6cX; Wed, 20 Mar 2024 22:34: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 4V0Ngf4BDbz4fNq; Wed, 20 Mar 2024 22:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974078; 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=wqbksUVsXbegc3+fHo3UZDDaomkTuiKbbh1yX/wmfSw=; b=q1eewJ/s4jcBKQkWaETkhncZ+WUBRGP6GfBjE3sJCc/ZDclaYWwyJqVqNwwHOdC7Hm75fo swwWsJZSVqgpWgLIFAQSWoRY7SL4FN+4p5OaaytMxXE3ndLdo+f1Q/hyLl/oGk2uzUZYvD LfBGWQejHByxPk7tHiZlLK9tZH8N5Td5F0YEI8t3TZEfmedR/DjnhsUcwP1K9wyzDcpzuO LMPxtDb/lBA71XUDOhU1GhZAg0cGMzOCKXlKkomiatEPxX0+Z+dofmIL7kh3B8x83U+7Ok 6liSdQVvz15IbVnn2ggnk1kep1NaxgSJDQjxOEWP2xVZccNneoP5VdgYYDgGCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974078; a=rsa-sha256; cv=none; b=OXN2nYPfCJs34MmFiaIVJpUJBNxWFWjX32KCEDYWyIRMt+zwmT5xx3wlxoXCI6DhmwDYRJ E8KHhvIxYZUJB/734fACDQjRcZ5D6xW4sMM22/G+0u9FqdcX8XjkGN34dTAU8jkw/NIlT2 DRVndedknvbh0rUFJnU1U88hnLA4fLpzH1qTX8BmQULxzLlzMVAXpFBI/hdN098y2kvWMy +OC35UDgjVm/dXByyQWEGXsSAQjRsoBij1F1lyqBnm8CUue6sIfzIyRhQ8d3W0mukpTSrA rLK17n6nehV8jnEbymEVZhcsPCn7BSoChKmHoM5QZM/u98JPQd8b1se0kkDCbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974078; 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=wqbksUVsXbegc3+fHo3UZDDaomkTuiKbbh1yX/wmfSw=; b=v9NmmV36vO+gK3cXP9qhD08APBtjewRt1mUdz+uLCwR2Xgf5B2OVxtT78SetDA+PU6tRZa Eb1c9d9rfKnqZViRCEfFiyLZ2TTogjlKwkosHE062FD/HVIruQm3Pnwo2edQ9EcDbi/348 wHnnyOeLrZcWdz2mn0TYqAlaUEPLmqPgDv4QV51FsnHQunscbKqZO/rVjWeu1Qzf+KidiA RDiYFEh2WgOdwH+lIuJ+Tq7RXXYSkbnJ15qVCz4FEtK3MXOU3d7v0QF/dwpFqAMdHrZLJV nhy0ADArDDAIAuM0M/Yjw7my26+xtSnpkjSHHQ2rSPJMOqMWdWHL0eIzlyP1zg== 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 4V0Ngf3n59z18ST; Wed, 20 Mar 2024 22:34: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 42KMYccd047902; Wed, 20 Mar 2024 22:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMYcvx047899; Wed, 20 Mar 2024 22:34:38 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:34:38 GMT Message-Id: <202403202234.42KMYcvx047899@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: eba13bbc37ab - main - cxgbe: Support TCP_USE_DDP on offloaded TOE connections List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: eba13bbc37ab4f45a8a3502d59c37d56d9a04ca5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eba13bbc37ab4f45a8a3502d59c37d56d9a04ca5 commit eba13bbc37ab4f45a8a3502d59c37d56d9a04ca5 Author: John Baldwin AuthorDate: 2024-03-20 22:29:28 +0000 Commit: John Baldwin CommitDate: 2024-03-20 22:29:28 +0000 cxgbe: Support TCP_USE_DDP on offloaded TOE connections When this socket option is enabled, relatively large contiguous buffers are allocated and used to receive data from the remote connection. When data is received a wrapper M_EXT mbuf is queued to the socket's receive buffer. This reduces the length of the linked list of received mbufs and allows consumers to consume receive data in larger chunks. To minimize reprogramming the page pods in the adapter, receive buffers for a given connection are recycled. When a buffer has been fully consumed by the receiver and freed, the buffer is placed on a per-connection free buffers list. The size of the receive buffers defaults to 256k and can be set via the hw.cxgbe.toe.ddp_rcvbuf_len sysctl. The hw.cxgbe.toe.ddp_rcvbuf_cache sysctl (defaults to 4) determines the maximum number of free buffers cached per connection. Note that this limit does not apply to "in-flight" receive buffers that are associated with mbufs in the socket's receive buffer. Co-authored-by: Navdeep Parhar Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44001 --- sys/dev/cxgbe/adapter.h | 6 + sys/dev/cxgbe/t4_main.c | 13 + sys/dev/cxgbe/t4_sge.c | 18 + sys/dev/cxgbe/tom/t4_cpl_io.c | 7 +- sys/dev/cxgbe/tom/t4_ddp.c | 786 +++++++++++++++++++++++++++++++++++++++--- sys/dev/cxgbe/tom/t4_tom.c | 31 ++ sys/dev/cxgbe/tom/t4_tom.h | 51 ++- 7 files changed, 853 insertions(+), 59 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 3157d08cc67b..b9780809421f 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -690,6 +690,10 @@ struct sge_ofld_rxq { uint64_t rx_aio_ddp_octets; u_long rx_toe_tls_records; u_long rx_toe_tls_octets; + u_long rx_toe_ddp_octets; + counter_u64_t ddp_buffer_alloc; + counter_u64_t ddp_buffer_reuse; + counter_u64_t ddp_buffer_free; } __aligned(CACHE_LINE_SIZE); static inline struct sge_ofld_rxq * @@ -1344,6 +1348,8 @@ extern int t4_tmr_idx; extern int t4_pktc_idx; extern unsigned int t4_qsize_rxq; extern unsigned int t4_qsize_txq; +extern int t4_ddp_rcvbuf_len; +extern unsigned int t4_ddp_rcvbuf_cache; extern device_method_t cxgbe_methods[]; int t4_os_find_pci_capability(struct adapter *, int); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index e20c697d2865..6cb434295b42 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -412,6 +412,15 @@ SYSCTL_INT(_hw_cxgbe_toe_rexmt_backoff, OID_AUTO, 14, CTLFLAG_RDTUN, &t4_toe_rexmt_backoff[14], 0, ""); SYSCTL_INT(_hw_cxgbe_toe_rexmt_backoff, OID_AUTO, 15, CTLFLAG_RDTUN, &t4_toe_rexmt_backoff[15], 0, ""); + +int t4_ddp_rcvbuf_len = 256 * 1024; +SYSCTL_INT(_hw_cxgbe_toe, OID_AUTO, ddp_rcvbuf_len, CTLFLAG_RWTUN, + &t4_ddp_rcvbuf_len, 0, "length of each DDP RX buffer"); + +unsigned int t4_ddp_rcvbuf_cache = 4; +SYSCTL_UINT(_hw_cxgbe_toe, OID_AUTO, ddp_rcvbuf_cache, CTLFLAG_RWTUN, + &t4_ddp_rcvbuf_cache, 0, + "maximum number of free DDP RX buffers to cache per connection"); #endif #ifdef DEV_NETMAP @@ -12046,6 +12055,10 @@ clear_stats(struct adapter *sc, u_int port_id) ofld_rxq->rx_aio_ddp_octets = 0; ofld_rxq->rx_toe_tls_records = 0; ofld_rxq->rx_toe_tls_octets = 0; + ofld_rxq->rx_toe_ddp_octets = 0; + counter_u64_zero(ofld_rxq->ddp_buffer_alloc); + counter_u64_zero(ofld_rxq->ddp_buffer_reuse); + counter_u64_zero(ofld_rxq->ddp_buffer_free); } #endif diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index 76293b06a6a9..2ef05b5a9f86 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -4098,6 +4098,9 @@ alloc_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq *ofld_rxq, int idx, ofld_rxq->rx_iscsi_ddp_setup_ok = counter_u64_alloc(M_WAITOK); ofld_rxq->rx_iscsi_ddp_setup_error = counter_u64_alloc(M_WAITOK); + ofld_rxq->ddp_buffer_alloc = counter_u64_alloc(M_WAITOK); + ofld_rxq->ddp_buffer_reuse = counter_u64_alloc(M_WAITOK); + ofld_rxq->ddp_buffer_free = counter_u64_alloc(M_WAITOK); add_ofld_rxq_sysctls(&vi->ctx, oid, ofld_rxq); } @@ -4132,6 +4135,9 @@ free_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq *ofld_rxq) MPASS(!(ofld_rxq->iq.flags & IQ_SW_ALLOCATED)); counter_u64_free(ofld_rxq->rx_iscsi_ddp_setup_ok); counter_u64_free(ofld_rxq->rx_iscsi_ddp_setup_error); + counter_u64_free(ofld_rxq->ddp_buffer_alloc); + counter_u64_free(ofld_rxq->ddp_buffer_reuse); + counter_u64_free(ofld_rxq->ddp_buffer_free); bzero(ofld_rxq, sizeof(*ofld_rxq)); } } @@ -4158,6 +4164,18 @@ add_ofld_rxq_sysctls(struct sysctl_ctx_list *ctx, struct sysctl_oid *oid, SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_toe_tls_octets", CTLFLAG_RD, &ofld_rxq->rx_toe_tls_octets, "# of payload octets in received TOE TLS records"); + SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, + "rx_toe_ddp_octets", CTLFLAG_RD, &ofld_rxq->rx_toe_ddp_octets, + "# of payload octets received via TCP DDP"); + SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, + "ddp_buffer_alloc", CTLFLAG_RD, &ofld_rxq->ddp_buffer_alloc, + "# of DDP RCV buffers allocated"); + SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, + "ddp_buffer_reuse", CTLFLAG_RD, &ofld_rxq->ddp_buffer_reuse, + "# of DDP RCV buffers reused"); + SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, + "ddp_buffer_free", CTLFLAG_RD, &ofld_rxq->ddp_buffer_free, + "# of DDP RCV buffers freed"); oid = SYSCTL_ADD_NODE(ctx, children, OID_AUTO, "iscsi", CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "TOE iSCSI statistics"); diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 4d61189f5fe3..842e72bf8b2b 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1352,8 +1352,6 @@ do_peer_close(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) if (toep->flags & TPF_ABORT_SHUTDOWN) goto done; - so = inp->inp_socket; - socantrcvmore(so); if (ulp_mode(toep) == ULP_MODE_TCPDDP) { DDP_LOCK(toep); if (__predict_false(toep->ddp.flags & @@ -1361,6 +1359,8 @@ do_peer_close(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) handle_ddp_close(toep, tp, cpl->rcv_nxt); DDP_UNLOCK(toep); } + so = inp->inp_socket; + socantrcvmore(so); if (ulp_mode(toep) == ULP_MODE_RDMA || (ulp_mode(toep) == ULP_MODE_ISCSI && chip_id(sc) >= CHELSIO_T6)) { @@ -1782,7 +1782,8 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) sbappendstream_locked(sb, m, 0); t4_rcvd_locked(&toep->td->tod, tp); - if (ulp_mode(toep) == ULP_MODE_TCPDDP && toep->ddp.waiting_count > 0 && + if (ulp_mode(toep) == ULP_MODE_TCPDDP && + (toep->ddp.flags & DDP_AIO) != 0 && toep->ddp.waiting_count > 0 && sbavail(sb) != 0) { CTR2(KTR_CXGBE, "%s: tid %u queueing AIO task", __func__, tid); diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 1cd1ea68826c..c1d4af45fd70 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -81,6 +81,10 @@ static void aio_ddp_requeue_task(void *context, int pending); static void ddp_complete_all(struct toepcb *toep, int error); static void t4_aio_cancel_active(struct kaiocb *job); static void t4_aio_cancel_queued(struct kaiocb *job); +static int t4_alloc_page_pods_for_rcvbuf(struct ppod_region *pr, + struct ddp_rcv_buffer *drb); +static int t4_write_page_pods_for_rcvbuf(struct adapter *sc, + struct sge_wrq *wrq, int tid, struct ddp_rcv_buffer *drb); static TAILQ_HEAD(, pageset) ddp_orphan_pagesets; static struct mtx ddp_orphan_pagesets_lock; @@ -89,15 +93,15 @@ static struct task ddp_orphan_task; #define MAX_DDP_BUFFER_SIZE (M_TCB_RX_DDP_BUF0_LEN) /* - * A page set holds information about a buffer used for DDP. The page - * set holds resources such as the VM pages backing the buffer (either - * held or wired) and the page pods associated with the buffer. - * Recently used page sets are cached to allow for efficient reuse of - * buffers (avoiding the need to re-fault in pages, hold them, etc.). - * Note that cached page sets keep the backing pages wired. The - * number of wired pages is capped by only allowing for two wired - * pagesets per connection. This is not a perfect cap, but is a - * trade-off for performance. + * A page set holds information about a user buffer used for AIO DDP. + * The page set holds resources such as the VM pages backing the + * buffer (either held or wired) and the page pods associated with the + * buffer. Recently used page sets are cached to allow for efficient + * reuse of buffers (avoiding the need to re-fault in pages, hold + * them, etc.). Note that cached page sets keep the backing pages + * wired. The number of wired pages is capped by only allowing for + * two wired pagesets per connection. This is not a perfect cap, but + * is a trade-off for performance. * * If an application ping-pongs two buffers for a connection via * aio_read(2) then those buffers should remain wired and expensive VM @@ -174,8 +178,99 @@ ddp_complete_one(struct kaiocb *job, int error) } static void -free_ddp_buffer(struct tom_data *td, struct ddp_buffer *db) +free_ddp_rcv_buffer(struct toepcb *toep, struct ddp_rcv_buffer *drb) { + t4_free_page_pods(&drb->prsv); + contigfree(drb->buf, drb->len, M_CXGBE); + free(drb, M_CXGBE); + counter_u64_add(toep->ofld_rxq->ddp_buffer_free, 1); + free_toepcb(toep); +} + +static void +recycle_ddp_rcv_buffer(struct toepcb *toep, struct ddp_rcv_buffer *drb) +{ + DDP_CACHE_LOCK(toep); + if (!(toep->ddp.flags & DDP_DEAD) && + toep->ddp.cached_count < t4_ddp_rcvbuf_cache) { + TAILQ_INSERT_HEAD(&toep->ddp.cached_buffers, drb, link); + toep->ddp.cached_count++; + DDP_CACHE_UNLOCK(toep); + } else { + DDP_CACHE_UNLOCK(toep); + free_ddp_rcv_buffer(toep, drb); + } +} + +static struct ddp_rcv_buffer * +alloc_cached_ddp_rcv_buffer(struct toepcb *toep) +{ + struct ddp_rcv_buffer *drb; + + DDP_CACHE_LOCK(toep); + if (!TAILQ_EMPTY(&toep->ddp.cached_buffers)) { + drb = TAILQ_FIRST(&toep->ddp.cached_buffers); + TAILQ_REMOVE(&toep->ddp.cached_buffers, drb, link); + toep->ddp.cached_count--; + counter_u64_add(toep->ofld_rxq->ddp_buffer_reuse, 1); + } else + drb = NULL; + DDP_CACHE_UNLOCK(toep); + return (drb); +} + +static struct ddp_rcv_buffer * +alloc_ddp_rcv_buffer(struct toepcb *toep, int how) +{ + struct tom_data *td = toep->td; + struct adapter *sc = td_adapter(td); + struct ddp_rcv_buffer *drb; + int error; + + drb = malloc(sizeof(*drb), M_CXGBE, how | M_ZERO); + if (drb == NULL) + return (NULL); + + drb->buf = contigmalloc(t4_ddp_rcvbuf_len, M_CXGBE, how, 0, ~0, + t4_ddp_rcvbuf_len, 0); + if (drb->buf == NULL) { + free(drb, M_CXGBE); + return (NULL); + } + drb->len = t4_ddp_rcvbuf_len; + drb->refs = 1; + + error = t4_alloc_page_pods_for_rcvbuf(&td->pr, drb); + if (error != 0) { + contigfree(drb->buf, drb->len, M_CXGBE); + free(drb, M_CXGBE); + return (NULL); + } + + error = t4_write_page_pods_for_rcvbuf(sc, toep->ctrlq, toep->tid, drb); + if (error != 0) { + t4_free_page_pods(&drb->prsv); + contigfree(drb->buf, drb->len, M_CXGBE); + free(drb, M_CXGBE); + return (NULL); + } + + hold_toepcb(toep); + counter_u64_add(toep->ofld_rxq->ddp_buffer_alloc, 1); + return (drb); +} + +static void +free_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db) +{ + if ((toep->ddp.flags & DDP_RCVBUF) != 0) { + if (db->drb != NULL) + free_ddp_rcv_buffer(toep, db->drb); +#ifdef INVARIANTS + db->drb = NULL; +#endif + return; + } if (db->job) { /* @@ -192,7 +287,7 @@ free_ddp_buffer(struct tom_data *td, struct ddp_buffer *db) } if (db->ps) { - free_pageset(td, db->ps); + free_pageset(toep->td, db->ps); #ifdef INVARIANTS db->ps = NULL; #endif @@ -203,11 +298,10 @@ static void ddp_init_toep(struct toepcb *toep) { - TAILQ_INIT(&toep->ddp.aiojobq); - TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task, toep); toep->ddp.flags = DDP_OK; toep->ddp.active_id = -1; mtx_init(&toep->ddp.lock, "t4 ddp", NULL, MTX_DEF); + mtx_init(&toep->ddp.cache_lock, "t4 ddp cache", NULL, MTX_DEF); } void @@ -215,24 +309,38 @@ ddp_uninit_toep(struct toepcb *toep) { mtx_destroy(&toep->ddp.lock); + mtx_destroy(&toep->ddp.cache_lock); } void release_ddp_resources(struct toepcb *toep) { + struct ddp_rcv_buffer *drb; struct pageset *ps; int i; DDP_LOCK(toep); + DDP_CACHE_LOCK(toep); toep->ddp.flags |= DDP_DEAD; + DDP_CACHE_UNLOCK(toep); for (i = 0; i < nitems(toep->ddp.db); i++) { - free_ddp_buffer(toep->td, &toep->ddp.db[i]); + free_ddp_buffer(toep, &toep->ddp.db[i]); } - while ((ps = TAILQ_FIRST(&toep->ddp.cached_pagesets)) != NULL) { - TAILQ_REMOVE(&toep->ddp.cached_pagesets, ps, link); - free_pageset(toep->td, ps); + if ((toep->ddp.flags & DDP_AIO) != 0) { + while ((ps = TAILQ_FIRST(&toep->ddp.cached_pagesets)) != NULL) { + TAILQ_REMOVE(&toep->ddp.cached_pagesets, ps, link); + free_pageset(toep->td, ps); + } + ddp_complete_all(toep, 0); + } + if ((toep->ddp.flags & DDP_RCVBUF) != 0) { + DDP_CACHE_LOCK(toep); + while ((drb = TAILQ_FIRST(&toep->ddp.cached_buffers)) != NULL) { + TAILQ_REMOVE(&toep->ddp.cached_buffers, drb, link); + free_ddp_rcv_buffer(toep, drb); + } + DDP_CACHE_UNLOCK(toep); } - ddp_complete_all(toep, 0); DDP_UNLOCK(toep); } @@ -242,13 +350,20 @@ ddp_assert_empty(struct toepcb *toep) { int i; - MPASS(!(toep->ddp.flags & DDP_TASK_ACTIVE)); + MPASS((toep->ddp.flags & (DDP_TASK_ACTIVE | DDP_DEAD)) != DDP_TASK_ACTIVE); for (i = 0; i < nitems(toep->ddp.db); i++) { - MPASS(toep->ddp.db[i].job == NULL); - MPASS(toep->ddp.db[i].ps == NULL); + if ((toep->ddp.flags & DDP_AIO) != 0) { + MPASS(toep->ddp.db[i].job == NULL); + MPASS(toep->ddp.db[i].ps == NULL); + } else + MPASS(toep->ddp.db[i].drb == NULL); + } + if ((toep->ddp.flags & DDP_AIO) != 0) { + MPASS(TAILQ_EMPTY(&toep->ddp.cached_pagesets)); + MPASS(TAILQ_EMPTY(&toep->ddp.aiojobq)); } - MPASS(TAILQ_EMPTY(&toep->ddp.cached_pagesets)); - MPASS(TAILQ_EMPTY(&toep->ddp.aiojobq)); + if ((toep->ddp.flags & DDP_RCVBUF) != 0) + MPASS(TAILQ_EMPTY(&toep->ddp.cached_buffers)); } #endif @@ -256,13 +371,18 @@ static void complete_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db, unsigned int db_idx) { + struct ddp_rcv_buffer *drb; unsigned int db_flag; toep->ddp.active_count--; if (toep->ddp.active_id == db_idx) { if (toep->ddp.active_count == 0) { - KASSERT(toep->ddp.db[db_idx ^ 1].job == NULL, - ("%s: active_count mismatch", __func__)); + if ((toep->ddp.flags & DDP_AIO) != 0) + KASSERT(toep->ddp.db[db_idx ^ 1].job == NULL, + ("%s: active_count mismatch", __func__)); + else + KASSERT(toep->ddp.db[db_idx ^ 1].drb == NULL, + ("%s: active_count mismatch", __func__)); toep->ddp.active_id = -1; } else toep->ddp.active_id ^= 1; @@ -276,10 +396,18 @@ complete_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db, ("%s: active count mismatch", __func__)); } - db->cancel_pending = 0; - db->job = NULL; - recycle_pageset(toep, db->ps); - db->ps = NULL; + if ((toep->ddp.flags & DDP_AIO) != 0) { + db->cancel_pending = 0; + db->job = NULL; + recycle_pageset(toep, db->ps); + db->ps = NULL; + } else { + drb = db->drb; + if (atomic_fetchadd_int(&drb->refs, -1) == 1) + recycle_ddp_rcv_buffer(toep, drb); + db->drb = NULL; + db->placed = 0; + } db_flag = db_idx == 1 ? DDP_BUF1_ACTIVE : DDP_BUF0_ACTIVE; KASSERT(toep->ddp.flags & db_flag, @@ -288,6 +416,47 @@ complete_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db, toep->ddp.flags &= ~db_flag; } +/* Called when m_free drops the last reference. */ +static void +ddp_rcv_mbuf_done(struct mbuf *m) +{ + struct toepcb *toep = m->m_ext.ext_arg1; + struct ddp_rcv_buffer *drb = m->m_ext.ext_arg2; + + recycle_ddp_rcv_buffer(toep, drb); +} + +static void +queue_ddp_rcvbuf_mbuf(struct toepcb *toep, u_int db_idx, u_int len) +{ + struct inpcb *inp = toep->inp; + struct sockbuf *sb; + struct ddp_buffer *db; + struct ddp_rcv_buffer *drb; + struct mbuf *m; + + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) { + printf("%s: failed to allocate mbuf", __func__); + return; + } + m->m_pkthdr.rcvif = toep->vi->ifp; + + db = &toep->ddp.db[db_idx]; + drb = db->drb; + m_extaddref(m, (char *)drb->buf + db->placed, len, &drb->refs, + ddp_rcv_mbuf_done, toep, drb); + m->m_pkthdr.len = len; + m->m_len = len; + + sb = &inp->inp_socket->so_rcv; + SOCKBUF_LOCK_ASSERT(sb); + sbappendstream_locked(sb, m, 0); + + db->placed += len; + toep->ofld_rxq->rx_toe_ddp_octets += len; +} + /* XXX: handle_ddp_data code duplication */ void insert_ddp_data(struct toepcb *toep, uint32_t n) @@ -302,10 +471,12 @@ insert_ddp_data(struct toepcb *toep, uint32_t n) #ifdef INVARIANTS unsigned int db_flag; #endif + bool ddp_rcvbuf; INP_WLOCK_ASSERT(inp); DDP_ASSERT_LOCKED(toep); + ddp_rcvbuf = (toep->ddp.flags & DDP_RCVBUF) != 0; tp->rcv_nxt += n; #ifndef USE_DDP_RX_FLOW_CONTROL KASSERT(tp->rcv_wnd >= n, ("%s: negative window size", __func__)); @@ -321,6 +492,16 @@ insert_ddp_data(struct toepcb *toep, uint32_t n) #endif MPASS((toep->ddp.flags & db_flag) != 0); db = &toep->ddp.db[db_idx]; + if (ddp_rcvbuf) { + placed = n; + if (placed > db->drb->len - db->placed) + placed = db->drb->len - db->placed; + if (placed != 0) + queue_ddp_rcvbuf_mbuf(toep, db_idx, placed); + complete_ddp_buffer(toep, db, db_idx); + n -= placed; + continue; + } job = db->job; copied = job->aio_received; placed = n; @@ -423,12 +604,13 @@ mk_rx_data_ack_ulp(struct ulp_txpkt *ulpmc, struct toepcb *toep) static struct wrqe * mk_update_tcb_for_ddp(struct adapter *sc, struct toepcb *toep, int db_idx, - struct pageset *ps, int offset, uint64_t ddp_flags, uint64_t ddp_flags_mask) + struct ppod_reservation *prsv, int offset, uint32_t len, + uint64_t ddp_flags, uint64_t ddp_flags_mask) { struct wrqe *wr; struct work_request_hdr *wrh; struct ulp_txpkt *ulpmc; - int len; + int wrlen; KASSERT(db_idx == 0 || db_idx == 1, ("%s: bad DDP buffer index %d", __func__, db_idx)); @@ -441,21 +623,21 @@ mk_update_tcb_for_ddp(struct adapter *sc, struct toepcb *toep, int db_idx, * The ULPTX master commands that follow must all end at 16B boundaries * too so we round up the size to 16. */ - len = sizeof(*wrh) + 3 * roundup2(LEN__SET_TCB_FIELD_ULP, 16) + + wrlen = sizeof(*wrh) + 3 * roundup2(LEN__SET_TCB_FIELD_ULP, 16) + roundup2(LEN__RX_DATA_ACK_ULP, 16); - wr = alloc_wrqe(len, toep->ctrlq); + wr = alloc_wrqe(wrlen, toep->ctrlq); if (wr == NULL) return (NULL); wrh = wrtod(wr); - INIT_ULPTX_WRH(wrh, len, 1, 0); /* atomic */ + INIT_ULPTX_WRH(wrh, wrlen, 1, 0); /* atomic */ ulpmc = (struct ulp_txpkt *)(wrh + 1); /* Write the buffer's tag */ ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, W_TCB_RX_DDP_BUF0_TAG + db_idx, V_TCB_RX_DDP_BUF0_TAG(M_TCB_RX_DDP_BUF0_TAG), - V_TCB_RX_DDP_BUF0_TAG(ps->prsv.prsv_tag)); + V_TCB_RX_DDP_BUF0_TAG(prsv->prsv_tag)); /* Update the current offset in the DDP buffer and its total length */ if (db_idx == 0) @@ -464,14 +646,14 @@ mk_update_tcb_for_ddp(struct adapter *sc, struct toepcb *toep, int db_idx, V_TCB_RX_DDP_BUF0_OFFSET(M_TCB_RX_DDP_BUF0_OFFSET) | V_TCB_RX_DDP_BUF0_LEN(M_TCB_RX_DDP_BUF0_LEN), V_TCB_RX_DDP_BUF0_OFFSET(offset) | - V_TCB_RX_DDP_BUF0_LEN(ps->len)); + V_TCB_RX_DDP_BUF0_LEN(len)); else ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, W_TCB_RX_DDP_BUF1_OFFSET, V_TCB_RX_DDP_BUF1_OFFSET(M_TCB_RX_DDP_BUF1_OFFSET) | V_TCB_RX_DDP_BUF1_LEN((u64)M_TCB_RX_DDP_BUF1_LEN << 32), V_TCB_RX_DDP_BUF1_OFFSET(offset) | - V_TCB_RX_DDP_BUF1_LEN((u64)ps->len << 32)); + V_TCB_RX_DDP_BUF1_LEN((u64)len << 32)); /* Update DDP flags */ ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, W_TCB_RX_DDP_FLAGS, @@ -484,7 +666,8 @@ mk_update_tcb_for_ddp(struct adapter *sc, struct toepcb *toep, int db_idx, } static int -handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len) +handle_ddp_data_aio(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, + int len) { uint32_t report = be32toh(ddp_report); unsigned int db_idx; @@ -607,11 +790,239 @@ out: return (0); } +static bool +queue_ddp_rcvbuf(struct toepcb *toep, struct ddp_rcv_buffer *drb) +{ + struct adapter *sc = td_adapter(toep->td); + struct ddp_buffer *db; + struct wrqe *wr; + uint64_t ddp_flags, ddp_flags_mask; + int buf_flag, db_idx; + + DDP_ASSERT_LOCKED(toep); + + KASSERT((toep->ddp.flags & DDP_DEAD) == 0, ("%s: DDP_DEAD", __func__)); + KASSERT(toep->ddp.active_count < nitems(toep->ddp.db), + ("%s: no empty DDP buffer slot", __func__)); + + /* Determine which DDP buffer to use. */ + if (toep->ddp.db[0].drb == NULL) { + db_idx = 0; + } else { + MPASS(toep->ddp.db[1].drb == NULL); + db_idx = 1; + } + + /* + * Permit PSH to trigger a partial completion without + * invalidating the rest of the buffer, but disable the PUSH + * timer. + */ + ddp_flags = 0; + ddp_flags_mask = 0; + if (db_idx == 0) { + ddp_flags |= V_TF_DDP_PSH_NO_INVALIDATE0(1) | + V_TF_DDP_PUSH_DISABLE_0(0) | V_TF_DDP_PSHF_ENABLE_0(1) | + V_TF_DDP_BUF0_VALID(1); + ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE0(1) | + V_TF_DDP_PUSH_DISABLE_0(1) | V_TF_DDP_PSHF_ENABLE_0(1) | + V_TF_DDP_BUF0_FLUSH(1) | V_TF_DDP_BUF0_VALID(1); + buf_flag = DDP_BUF0_ACTIVE; + } else { + ddp_flags |= V_TF_DDP_PSH_NO_INVALIDATE1(1) | + V_TF_DDP_PUSH_DISABLE_1(0) | V_TF_DDP_PSHF_ENABLE_1(1) | + V_TF_DDP_BUF1_VALID(1); + ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE1(1) | + V_TF_DDP_PUSH_DISABLE_1(1) | V_TF_DDP_PSHF_ENABLE_1(1) | + V_TF_DDP_BUF1_FLUSH(1) | V_TF_DDP_BUF1_VALID(1); + buf_flag = DDP_BUF1_ACTIVE; + } + MPASS((toep->ddp.flags & buf_flag) == 0); + if ((toep->ddp.flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE)) == 0) { + MPASS(db_idx == 0); + MPASS(toep->ddp.active_id == -1); + MPASS(toep->ddp.active_count == 0); + ddp_flags_mask |= V_TF_DDP_ACTIVE_BUF(1); + } + + /* + * The TID for this connection should still be valid. If + * DDP_DEAD is set, SBS_CANTRCVMORE should be set, so we + * shouldn't be this far anyway. + */ + wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &drb->prsv, 0, drb->len, + ddp_flags, ddp_flags_mask); + if (wr == NULL) { + recycle_ddp_rcv_buffer(toep, drb); + printf("%s: mk_update_tcb_for_ddp failed\n", __func__); + return (false); + } + +#ifdef VERBOSE_TRACES + CTR(KTR_CXGBE, + "%s: tid %u, scheduling DDP[%d] (flags %#lx/%#lx)", __func__, + toep->tid, db_idx, ddp_flags, ddp_flags_mask); +#endif + /* + * Hold a reference on scheduled buffers that is dropped in + * complete_ddp_buffer. + */ + drb->refs = 1; + + /* Give the chip the go-ahead. */ + t4_wrq_tx(sc, wr); + db = &toep->ddp.db[db_idx]; + db->drb = drb; + toep->ddp.flags |= buf_flag; + toep->ddp.active_count++; + if (toep->ddp.active_count == 1) { + MPASS(toep->ddp.active_id == -1); + toep->ddp.active_id = db_idx; + CTR2(KTR_CXGBE, "%s: ddp_active_id = %d", __func__, + toep->ddp.active_id); + } + return (true); +} + +static int +handle_ddp_data_rcvbuf(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, + int len) +{ + uint32_t report = be32toh(ddp_report); + struct inpcb *inp = toep->inp; + struct tcpcb *tp; + struct socket *so; + struct sockbuf *sb; + struct ddp_buffer *db; + struct ddp_rcv_buffer *drb; + unsigned int db_idx; + bool invalidated; + + db_idx = report & F_DDP_BUF_IDX ? 1 : 0; + + invalidated = (report & F_DDP_INV) != 0; + + INP_WLOCK(inp); + so = inp_inpcbtosocket(inp); + sb = &so->so_rcv; + DDP_LOCK(toep); + + KASSERT(toep->ddp.active_id == db_idx, + ("completed DDP buffer (%d) != active_id (%d) for tid %d", db_idx, + toep->ddp.active_id, toep->tid)); + db = &toep->ddp.db[db_idx]; + + if (__predict_false(inp->inp_flags & INP_DROPPED)) { + /* + * This can happen due to an administrative tcpdrop(8). + * Just ignore the received data. + */ + CTR5(KTR_CXGBE, "%s: tid %u, seq 0x%x, len %d, inp_flags 0x%x", + __func__, toep->tid, be32toh(rcv_nxt), len, inp->inp_flags); + if (invalidated) + complete_ddp_buffer(toep, db, db_idx); + goto out; + } + + tp = intotcpcb(inp); + + /* + * For RX_DDP_COMPLETE, len will be zero and rcv_nxt is the + * sequence number of the next byte to receive. The length of + * the data received for this message must be computed by + * comparing the new and old values of rcv_nxt. + * + * For RX_DATA_DDP, len might be non-zero, but it is only the + * length of the most recent DMA. It does not include the + * total length of the data received since the previous update + * for this DDP buffer. rcv_nxt is the sequence number of the + * first received byte from the most recent DMA. + */ + len += be32toh(rcv_nxt) - tp->rcv_nxt; + tp->rcv_nxt += len; + tp->t_rcvtime = ticks; +#ifndef USE_DDP_RX_FLOW_CONTROL + KASSERT(tp->rcv_wnd >= len, ("%s: negative window size", __func__)); + tp->rcv_wnd -= len; +#endif +#ifdef VERBOSE_TRACES + CTR5(KTR_CXGBE, "%s: tid %u, DDP[%d] placed %d bytes (%#x)", __func__, + toep->tid, db_idx, len, report); +#endif + + /* receive buffer autosize */ + MPASS(toep->vnet == so->so_vnet); + CURVNET_SET(toep->vnet); + SOCKBUF_LOCK(sb); + if (sb->sb_flags & SB_AUTOSIZE && + V_tcp_do_autorcvbuf && + sb->sb_hiwat < V_tcp_autorcvbuf_max && + len > (sbspace(sb) / 8 * 7)) { + struct adapter *sc = td_adapter(toep->td); + unsigned int hiwat = sb->sb_hiwat; + unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc, + V_tcp_autorcvbuf_max); + + if (!sbreserve_locked(so, SO_RCV, newsize, NULL)) + sb->sb_flags &= ~SB_AUTOSIZE; + } + + if (len > 0) { + queue_ddp_rcvbuf_mbuf(toep, db_idx, len); + t4_rcvd_locked(&toep->td->tod, tp); + } + sorwakeup_locked(so); + SOCKBUF_UNLOCK_ASSERT(sb); + CURVNET_RESTORE(); + + if (invalidated) + complete_ddp_buffer(toep, db, db_idx); + else + KASSERT(db->placed < db->drb->len, + ("%s: full DDP buffer not invalidated", __func__)); + + if (toep->ddp.active_count != nitems(toep->ddp.db)) { + drb = alloc_cached_ddp_rcv_buffer(toep); + if (drb == NULL) + drb = alloc_ddp_rcv_buffer(toep, M_NOWAIT); + if (drb == NULL) + ddp_queue_toep(toep); + else { + if (!queue_ddp_rcvbuf(toep, drb)) { + ddp_queue_toep(toep); + } + } + } +out: + DDP_UNLOCK(toep); + INP_WUNLOCK(inp); + + return (0); +} + +static int +handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len) +{ + if ((toep->ddp.flags & DDP_RCVBUF) != 0) + return (handle_ddp_data_rcvbuf(toep, ddp_report, rcv_nxt, len)); + else + return (handle_ddp_data_aio(toep, ddp_report, rcv_nxt, len)); +} + void handle_ddp_indicate(struct toepcb *toep) { DDP_ASSERT_LOCKED(toep); + if ((toep->ddp.flags & DDP_RCVBUF) != 0) { + /* + * Indicates are not meaningful for RCVBUF since + * buffers are activated when the socket option is + * set. + */ + return; + } + MPASS(toep->ddp.active_count == 0); MPASS((toep->ddp.flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE)) == 0); if (toep->ddp.waiting_count == 0) { @@ -654,6 +1065,8 @@ do_ddp_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) /* * XXX: This duplicates a lot of code with handle_ddp_data(). */ + KASSERT((toep->ddp.flags & DDP_AIO) != 0, + ("%s: DDP_RCVBUF", __func__)); db_idx = G_COOKIE(cpl->cookie) - CPL_COOKIE_DDP0; MPASS(db_idx < nitems(toep->ddp.db)); INP_WLOCK(inp); @@ -707,6 +1120,8 @@ do_ddp_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) void handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt) { + struct socket *so = toep->inp->inp_socket; + struct sockbuf *sb = &so->so_rcv; struct ddp_buffer *db; struct kaiocb *job; long copied; @@ -715,14 +1130,19 @@ handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt) unsigned int db_flag; #endif int len, placed; + bool ddp_rcvbuf; INP_WLOCK_ASSERT(toep->inp); DDP_ASSERT_LOCKED(toep); + ddp_rcvbuf = (toep->ddp.flags & DDP_RCVBUF) != 0; + /* - 1 is to ignore the byte for FIN */ len = be32toh(rcv_nxt) - tp->rcv_nxt - 1; tp->rcv_nxt += len; + CTR(KTR_CXGBE, "%s: tid %d placed %u bytes before FIN", __func__, + toep->tid, len); while (toep->ddp.active_count > 0) { MPASS(toep->ddp.active_id != -1); db_idx = toep->ddp.active_id; @@ -731,6 +1151,20 @@ handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt) #endif MPASS((toep->ddp.flags & db_flag) != 0); db = &toep->ddp.db[db_idx]; + if (ddp_rcvbuf) { + placed = len; + if (placed > db->drb->len - db->placed) + placed = db->drb->len - db->placed; + if (placed != 0) { + SOCKBUF_LOCK(sb); + queue_ddp_rcvbuf_mbuf(toep, db_idx, placed); + sorwakeup_locked(so); + SOCKBUF_UNLOCK_ASSERT(sb); + } + complete_ddp_buffer(toep, db, db_idx); + len -= placed; + continue; + } job = db->job; copied = job->aio_received; placed = len; @@ -758,7 +1192,8 @@ handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt) } MPASS(len == 0); - ddp_complete_all(toep, 0); + if ((toep->ddp.flags & DDP_AIO) != 0) + ddp_complete_all(toep, 0); } #define DDP_ERR (F_DDP_PPOD_MISMATCH | F_DDP_LLIMIT_ERR | F_DDP_ULIMIT_ERR |\ @@ -892,6 +1327,7 @@ set_ddp_ulp_mode(struct toepcb *toep) static void enable_ddp(struct adapter *sc, struct toepcb *toep) { + uint64_t ddp_flags; KASSERT((toep->ddp.flags & (DDP_ON | DDP_OK | DDP_SC_REQ)) == DDP_OK, ("%s: toep %p has bad ddp_flags 0x%x", @@ -900,13 +1336,16 @@ enable_ddp(struct adapter *sc, struct toepcb *toep) CTR3(KTR_CXGBE, "%s: tid %u (time %u)", __func__, toep->tid, time_uptime); + ddp_flags = 0; + if ((toep->ddp.flags & DDP_AIO) != 0) + ddp_flags |= V_TF_DDP_BUF0_INDICATE(1) | + V_TF_DDP_BUF1_INDICATE(1); DDP_ASSERT_LOCKED(toep); toep->ddp.flags |= DDP_SC_REQ; t4_set_tcb_field(sc, toep->ctrlq, toep, W_TCB_RX_DDP_FLAGS, V_TF_DDP_OFF(1) | V_TF_DDP_INDICATE_OUT(1) | V_TF_DDP_BUF0_INDICATE(1) | V_TF_DDP_BUF1_INDICATE(1) | - V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_BUF1_VALID(1), - V_TF_DDP_BUF0_INDICATE(1) | V_TF_DDP_BUF1_INDICATE(1), 0, 0); + V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_BUF1_VALID(1), ddp_flags, 0, 0); t4_set_tcb_field(sc, toep->ctrlq, toep, W_TCB_T_FLAGS, V_TF_RCV_COALESCE_ENABLE(1), 0, 0, 0); } @@ -1103,6 +1542,19 @@ have_pgsz: return (0); } +static int +t4_alloc_page_pods_for_rcvbuf(struct ppod_region *pr, + struct ddp_rcv_buffer *drb) +{ + struct ppod_reservation *prsv = &drb->prsv; + + KASSERT(prsv->prsv_nppods == 0, + ("%s: page pods already allocated", __func__)); + + return (t4_alloc_page_pods_for_buf(pr, (vm_offset_t)drb->buf, drb->len, + prsv)); +} + int t4_alloc_page_pods_for_sgl(struct ppod_region *pr, struct ctl_sg_entry *sgl, int entries, struct ppod_reservation *prsv) @@ -1223,7 +1675,6 @@ t4_write_page_pods_for_ps(struct adapter *sc, struct sge_wrq *wrq, int tid, ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)]; ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask); for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) { - /* How many page pods are we writing in this cycle */ n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS); chunk = PPOD_SZ(n); @@ -1276,6 +1727,96 @@ t4_write_page_pods_for_ps(struct adapter *sc, struct sge_wrq *wrq, int tid, return (0); } +static int +t4_write_page_pods_for_rcvbuf(struct adapter *sc, struct sge_wrq *wrq, int tid, + struct ddp_rcv_buffer *drb) +{ + struct wrqe *wr; + struct ulp_mem_io *ulpmc; + struct ulptx_idata *ulpsc; + struct pagepod *ppod; + int i, j, k, n, chunk, len, ddp_pgsz; + u_int ppod_addr, offset; + uint32_t cmd; + struct ppod_reservation *prsv = &drb->prsv; + struct ppod_region *pr = prsv->prsv_pr; + uintptr_t end_pva, pva; + vm_paddr_t pa; + + MPASS(prsv->prsv_nppods > 0); + + cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE)); + if (is_t4(sc)) *** 423 LINES SKIPPED *** From nobody Wed Mar 20 22:34:39 2024 X-Original-To: dev-commits-src-all@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 4V0Ngh0tFlz5F6dw; Wed, 20 Mar 2024 22:34:40 +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 4V0Ngg5nyZz4fNs; Wed, 20 Mar 2024 22:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974079; 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=0DwnG7CV1zDB4Wh125Uk2qJqj1wxd9JdpzPJdIZvTzc=; b=SoVmGdF85y7GixP2gCUuRE8omFtqbjvOR6hiEQjjUzN5srNFy5Dgo9a3LNqth+zXRnSY3R lYheOzpg4og+CSZtwyU9VONFeya2NzdfkknssDUn9zsGgMPdJFQLgORy07PYpkXcLAKQ1R AzCX/VGtrl2h4fb5VVHY+Msd3aW91FIzymOGcopT0wzb+sTijicdMDgY1k2vBomXdhKcwo lmcKtnGGZlN8JpPWploD7WXGKGHnMEuDf2XSj1E4Tu05+MruGfgKicrcuuswCDD2mX3c/T yCh6VXk0jTtpgIdgfLQ5DJ140Ex8w5DL6C8VDMvmx4F11AkHzboak2yjZteivw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974079; a=rsa-sha256; cv=none; b=ofmRfEuGh0l/NOwXi26Wg05Q2G8nkxQHAjNkMTnJZZEjh4wifMdurjeVkTFNA5OBPpDPBG Txy1s8bmQvw9U40WYLncFrBSeG/x5T0vFV8tHsFDI9owqxKQwJsbqIVkr/C7mJLFqXc8XK pv+F5C8Uvzej7zfInWDSnbRQuK7VGHQomkGKNnSyGsfxBQxRLnye4zOuJtaY9EP3ExPxNn 2jwqDT607DnhzMolEjocO/TVBMCSZugZUpL9UaEI5XLglhzYz+MpG7TPDIKDso59DaxeDt xdezV0MnXiFsZ3rVEoo0cGRJX3+II6DaQ2tqd0iYrsKmELA6rWgHeBkOD7zmIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974079; 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=0DwnG7CV1zDB4Wh125Uk2qJqj1wxd9JdpzPJdIZvTzc=; b=xyNpZpyvuHeRNqYpI7q77ESYmWlhGvsq959S3RdwZegjm/hmOolqgZTwoV+FhHMM5v9dR8 6P2iL/Jwj3tAJHk77PHAkK3bsUoFUeffIYH78t9Yts3VDVDCt4BAMirUquudZLMxFPKuhH V+tzp96Vr6grtFTvr7X2AFtfipn4lCtSjWp1Ix18Irt7+INE6QgEiZLcTETVa6JNwTcJb2 G098U1LsDzV1fRLAsmGrRiGEzzmJ2XwYPkn1J8Ba2W5+wff8bYfYWKzk/ajXEObP++ay+O 67u3fzuEnwLr+ZMU/Jfnv7aED+YKbZ9rL0hYz7skxNCZSx3vocWdXIR09ESK/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 4V0Ngg56MQz18Zx; Wed, 20 Mar 2024 22:34:39 +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 42KMYdDG047956; Wed, 20 Mar 2024 22:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMYdvE047953; Wed, 20 Mar 2024 22:34:39 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:34:39 GMT Message-Id: <202403202234.42KMYdvE047953@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: a16ff32f04b5 - main - NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 commit a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 Author: John Baldwin AuthorDate: 2024-03-20 22:29:51 +0000 Commit: John Baldwin CommitDate: 2024-03-20 22:29:51 +0000 NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets Since this is an optimization, ignore failures to enable the option. For the server side, defer enabling DDP until the first non-NULLPROC RPC is received. This allows TLS handling (which uses NULLPROC RPCs) to enable TLS offload first. Reviewed by: rmacklem Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44002 --- sys/rpc/clnt_rc.c | 8 ++++++++ sys/rpc/svc.c | 20 ++++++++++++++++++++ sys/rpc/svc.h | 1 + 3 files changed, 29 insertions(+) diff --git a/sys/rpc/clnt_rc.c b/sys/rpc/clnt_rc.c index b2ee4551149b..ebd52d305a4b 100644 --- a/sys/rpc/clnt_rc.c +++ b/sys/rpc/clnt_rc.c @@ -42,6 +42,8 @@ #include #include +#include + #include #include #include @@ -212,6 +214,12 @@ clnt_reconnect_connect(CLIENT *cl) goto out; } } + if (newclient != NULL) { + int optval = 1; + + (void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP, + &optval, sizeof(optval)); + } if (newclient != NULL && rc->rc_reconcall != NULL) (*rc->rc_reconcall)(newclient, rc->rc_reconarg, rc->rc_ucred); diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index f96c00dd2f2a..99678f693a3e 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -57,6 +58,8 @@ #include #include +#include + #include #include #include @@ -987,6 +990,23 @@ svc_getreq(SVCXPRT *xprt, struct svc_req **rqstp_ret) goto call_done; } + /* + * Defer enabling DDP until the first non-NULLPROC RPC + * is received to allow STARTTLS authentication to + * enable TLS offload first. + */ + if (xprt->xp_doneddp == 0 && r->rq_proc != NULLPROC && + atomic_cmpset_int(&xprt->xp_doneddp, 0, 1)) { + if (xprt->xp_socket->so_proto->pr_protocol == + IPPROTO_TCP) { + int optval = 1; + + (void)so_setsockopt(xprt->xp_socket, + IPPROTO_TCP, TCP_USE_DDP, &optval, + sizeof(optval)); + } + } + /* * Everything checks out, return request to caller. */ diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h index 87862d4b9001..cfeb2a92c54e 100644 --- a/sys/rpc/svc.h +++ b/sys/rpc/svc.h @@ -185,6 +185,7 @@ typedef struct __rpc_svcxprt { int xp_ngrps; /* Cred. from TLS cert. */ uid_t xp_uid; gid_t *xp_gidp; + int xp_doneddp; #else int xp_fd; u_short xp_port; /* associated port number */ From nobody Wed Mar 20 22:34:40 2024 X-Original-To: dev-commits-src-all@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 4V0Ngj1wlsz5F6hv; Wed, 20 Mar 2024 22:34:41 +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 4V0Ngh6jDKz4fBd; Wed, 20 Mar 2024 22:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974080; 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=nzPCQbKzKFEKyGtefLlzSYtyk+0e48gxYEBydI0SgBo=; b=UAflxD0y9XRFBHmL/+QrFPKPBz0r96uZdOhqTXeTl2esSAJ6GIS4pfi6z9koyH77ywoO87 EzD96K8hEdzmlvnRVSlwXg5qXxXUMj5u3GiHIuPCVgCzotIDP1qxN3TYQCDcnM7nfJMdxx vrTLY7E1uwV7Cd/oCcaSqLH/ApStWmhUUMRS8XatFC6l1X30oFQkfQjBdJQPb6YBXy9pvU 1zG4bRftdDyJBGftGs0kgctIyB8MTE8KsNVhHPvZ9evqXdVC3ECDQ4GAuspjg93vRwpovy Bmwctyps036LbJ8gUn0ecoIviJ3FcYheJvNWNuoOVqSvccwgwccKDtIbe9WpPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974080; a=rsa-sha256; cv=none; b=lO/OZQUCJj8ZEiXRzMvJH5ZphH4JvBxkvqJz5G0/DmfNdsus2j6PsOge3X27kOdTYZ/tZN MnhRYSniQCl8JfSXjT+llVKeZzxUIdZNKT6C/vWjjbRZoeMrGwIauZjp9zeig3NtF9Jsiu KJqs2bPPQbrevEd0eh5KlyKtztGqLK27fSF2SsuPd9VEsinMsPPXFwIXPoQL/JMUDJPdHF ExfsuVHP2Ab8sJKRRCGfn4d/ZaYsUktOWqZGhhUpCTXazm8l0UP1whi3+M8SYFFEOmfecs pE3eWZvnu5MJASD7QCSJl0vVU2BR0cXQ9Ro/x5TIUQZIH5uSy05Cnsi6qFLmIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974080; 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=nzPCQbKzKFEKyGtefLlzSYtyk+0e48gxYEBydI0SgBo=; b=FmOQdB4SyME6gmuYWYclXemlQpZ7Uv82E1ZQlNa1hlxZClHRqO8xL2QU6R3vHiFmDnUnfU sejaVEHUVfWDA3M718ZA7sbGQljCQPo+HrUDigUTzky4akU+I/7PKwoOt3TVx9/33fE7eP 5g3Z2yuRMoMjNYcVkyb1jVxov71pYSF8yIo1zbbh6e1H/b+X+v1ZghC7MRclT+sjMIKGrA 5cpHOQzFP22OfpFVlQlQoEPoYsxtOW7DX173JuaOvbAb0r382G3zBlq7MJ13DX1Kv/3AhD kiCVeM2OX5/xrGEiwwvMuJU5hmoO1T1WFjXhGj+PIw2ecc90f2JwtLmhu9JgOw== 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 4V0Ngh6DZHz18cx; Wed, 20 Mar 2024 22:34:40 +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 42KMYeQK048013; Wed, 20 Mar 2024 22:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMYev9048010; Wed, 20 Mar 2024 22:34:40 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:34:40 GMT Message-Id: <202403202234.42KMYev9048010@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: 9978c6289d62 - main - cxgbe tom: Handle a race condition when enabling TLS offload List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9978c6289d621ac9edc95acb4e0f527a62a49b03 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9978c6289d621ac9edc95acb4e0f527a62a49b03 commit 9978c6289d621ac9edc95acb4e0f527a62a49b03 Author: John Baldwin AuthorDate: 2024-03-20 22:30:09 +0000 Commit: John Baldwin CommitDate: 2024-03-20 22:30:09 +0000 cxgbe tom: Handle a race condition when enabling TLS offload Use a separate state for when a request to set RX_QUIESCE has been sent but the resulting TCB reply has not been received. In particular, this correctly handles the case where data has been received and queued in the receive queue before the quiesce request takes effect. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44435 --- sys/dev/cxgbe/tom/t4_tls.c | 12 ++++++++++-- sys/dev/cxgbe/tom/t4_tom.h | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 3a0c1a392e6c..bdd03edd3a6f 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -315,7 +315,7 @@ tls_alloc_ktls(struct toepcb *toep, struct ktls_session *tls, int direction) tls->params.max_frame_len; toep->tls.tx_key_info_size = t4_tls_key_info_size(tls); } else { - toep->flags |= TPF_TLS_STARTING | TPF_TLS_RX_QUIESCED; + toep->flags |= TPF_TLS_STARTING | TPF_TLS_RX_QUIESCING; toep->tls.rx_version = tls->params.tls_vmajor << 8 | tls->params.tls_vminor; @@ -1243,6 +1243,10 @@ tls_received_starting_data(struct adapter *sc, struct toepcb *toep, { MPASS(toep->flags & TPF_TLS_STARTING); + /* Data was received before quiescing took effect. */ + if ((toep->flags & TPF_TLS_RX_QUIESCING) != 0) + return; + /* * A previous call to tls_check_rx_sockbuf needed more data. * Now that more data has arrived, quiesce receive again and @@ -1250,7 +1254,7 @@ tls_received_starting_data(struct adapter *sc, struct toepcb *toep, */ if ((toep->flags & TPF_TLS_RX_QUIESCED) == 0) { CTR(KTR_CXGBE, "%s: tid %d quiescing", __func__, toep->tid); - toep->flags |= TPF_TLS_RX_QUIESCED; + toep->flags |= TPF_TLS_RX_QUIESCING; t4_set_rx_quiesce(toep); return; } @@ -1287,6 +1291,10 @@ do_tls_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) if ((toep->flags & TPF_TLS_STARTING) == 0) panic("%s: connection is not starting TLS RX\n", __func__); + MPASS((toep->flags & TPF_TLS_RX_QUIESCING) != 0); + + toep->flags &= ~TPF_TLS_RX_QUIESCING; + toep->flags |= TPF_TLS_RX_QUIESCED; so = inp->inp_socket; sb = &so->so_rcv; diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index be810d6364b1..805d8bc0d644 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -73,8 +73,9 @@ enum { TPF_KTLS = (1 << 11), /* send TLS records from KTLS */ TPF_INITIALIZED = (1 << 12), /* init_toepcb has been called */ TPF_TLS_RECEIVE = (1 << 13), /* should receive TLS records */ - TPF_TLS_RX_QUIESCED = (1 << 14), /* RX quiesced for TLS RX startup */ - TPF_WAITING_FOR_FINAL = (1<< 15), /* waiting for wakeup on final CPL */ + TPF_TLS_RX_QUIESCING = (1 << 14), /* RX quiesced for TLS RX startup */ + TPF_TLS_RX_QUIESCED = (1 << 15), /* RX quiesced for TLS RX startup */ + TPF_WAITING_FOR_FINAL = (1<< 16), /* waiting for wakeup on final CPL */ }; enum { From nobody Wed Mar 20 22:39:43 2024 X-Original-To: dev-commits-src-all@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 4V0NnW6tgSz5F7R6; Wed, 20 Mar 2024 22:39:43 +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 4V0NnW60PCz4h3Q; Wed, 20 Mar 2024 22:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974383; 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=LQeQxVKThf8DaC0JeR6+P2XKkkKTE81paamtCThnps0=; b=eEblReWI9GFsVEIHPEffzHH42WxyX8X6Saj0zowYjNPOkSZFtjxGsmHPBrSSLmhZo9Wt++ 0ZOvN0JDgG0X8eFpvD8M/pqtJ0eNBaScfeAqS7fgro99vE+vGvPMBiD4VPDi6KtHRzvQaT QYh6BY0LoNnq6JWBkIsrqG91qvZio7z4vfOMC0Ouj8DPwEmhH1lSJ8IO8kIWl63Ww4F5/O Krf9XDaWhCc/NOSxbzp8JnLCYgFV1sRJGlH3ijITzwLPShArlyFiAtAhca0t/gR4pvOaGN fUCHVCeiA1F3WzBYVuv2H9npiP7tPXEKE0/bme+rCJ7UwLZDo5MxoiiUZK09tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974383; a=rsa-sha256; cv=none; b=wn6pWbQA+qXPXU4bSE/BaOTr9NjQWMBrNJbRklQHf9swpIprjlONLqMdhA6Z6e4F5r3U2r v1Eh/ULiwQ/hFF7GE7waof7aiHFpcSX722ODOm7pD8G9D5S8JBv+O/6T5TKvihSomXusVe B5HVlfJCGzxdycH2LWNM798KydjakkxdMOamqQrgUliPkMeDIHw9g1/wyBDw+xFF/31Z8Q 8IPyJPf59tVsSZtL7jZx6ZGGciszYlv1iGYcobEd7Fr7h2gDozEwH6fWJal0bYvuWKmYW/ WxTnobUxX2RCqrwBlKZW3XKJUzncDcTbpyjwzv0rv0bGJvYV0ofgz7elkQliCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974383; 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=LQeQxVKThf8DaC0JeR6+P2XKkkKTE81paamtCThnps0=; b=clKJ+Y28KxIBFnrP+mdd+rX81I1FxgCNieyTOsPvGuOsLcb8lxhGgM0KHE1DDBk3H7Jbal zDu1P9bILQvE20t+msB9B77ZO+jHT/QpkDmBiVtzDy7Js3+f7tofl9JyTi7806D3s8gZ7f NZqchVX3e/iQSxzz5aSUwbyV6xL6oKINu9U1YGgm1Ni2+Wi3+MfgweGLyck+2wV/brzhuS +PjppUvcwnaKeIHxqNGiRPnj5ZAN6vGTzfiO2hIEQwPb2qquXsi6dMAAPjbuKDXNxslqhX vTYZG+/HfE8AoClm4/zsarqjF4wGqb13kL2IHx/VsWt30umwVkT0JgAjaZ3Vrw== 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 4V0NnW5RHYz18d2; Wed, 20 Mar 2024 22:39:43 +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 42KMdhrB048883; Wed, 20 Mar 2024 22:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMdhRe048881; Wed, 20 Mar 2024 22:39:43 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:39:43 GMT Message-Id: <202403202239.42KMdhRe048881@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: bcd401b5a39c - main - Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: bcd401b5a39c6186bb1fe450286299f2a481244c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd401b5a39c6186bb1fe450286299f2a481244c commit bcd401b5a39c6186bb1fe450286299f2a481244c Author: Dimitry Andric AuthorDate: 2024-03-20 22:39:06 +0000 Commit: Dimitry Andric CommitDate: 2024-03-20 22:39:11 +0000 Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): [Clang] Fix ResolveConstructorOverload to not select a conversion function if we are going use copy elision ResolveConstructorOverload needs to check properly if we are going to use copy elision we can't use a conversion function. This fixes: https://github.com/llvm/llvm-project/issues/39319 https://github.com/llvm/llvm-project/issues/60182 https://github.com/llvm/llvm-project/issues/62157 https://github.com/llvm/llvm-project/issues/64885 https://github.com/llvm/llvm-project/issues/65568 Differential Revision: https://reviews.llvm.org/D148474 This should fix 'Assertion failed: (isa(Val) && "cast() argument of incompatible type!")' errors when building devel/boost-libs, specifically libs/url/src/segments_view.cpp. Bump __FreeBSD_version so this fix can easily be detected from devel/boost-all/compiled.mk. PR: 273335 --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 51 +++++++++++----------- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 ++ sys/sys/param.h | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 32c9215184eb..1e9078cda26a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4092,16 +4092,13 @@ static bool hasCopyOrMoveCtorParam(ASTContext &Ctx, return Ctx.hasSameUnqualifiedType(ParmT, ClassT); } -static OverloadingResult -ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, - MultiExprArg Args, - OverloadCandidateSet &CandidateSet, - QualType DestType, - DeclContext::lookup_result Ctors, - OverloadCandidateSet::iterator &Best, - bool CopyInitializing, bool AllowExplicit, - bool OnlyListConstructors, bool IsListInit, - bool SecondStepOfCopyInit = false) { +static OverloadingResult ResolveConstructorOverload( + Sema &S, SourceLocation DeclLoc, MultiExprArg Args, + OverloadCandidateSet &CandidateSet, QualType DestType, + DeclContext::lookup_result Ctors, OverloadCandidateSet::iterator &Best, + bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, + bool IsListInit, bool RequireActualConstructor, + bool SecondStepOfCopyInit = false) { CandidateSet.clear(OverloadCandidateSet::CSK_InitByConstructor); CandidateSet.setDestAS(DestType.getQualifiers().getAddressSpace()); @@ -4164,7 +4161,7 @@ ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, // Note: SecondStepOfCopyInit is only ever true in this case when // evaluating whether to produce a C++98 compatibility warning. if (S.getLangOpts().CPlusPlus17 && Args.size() == 1 && - !SecondStepOfCopyInit) { + !RequireActualConstructor && !SecondStepOfCopyInit) { Expr *Initializer = Args[0]; auto *SourceRD = Initializer->getType()->getAsCXXRecordDecl(); if (SourceRD && S.isCompleteType(DeclLoc, Initializer->getType())) { @@ -4232,6 +4229,12 @@ static void TryConstructorInitialization(Sema &S, return; } + bool RequireActualConstructor = + !(Entity.getKind() != InitializedEntity::EK_Base && + Entity.getKind() != InitializedEntity::EK_Delegating && + Entity.getKind() != + InitializedEntity::EK_LambdaToBlockConversionBlockElement); + // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4241,11 +4244,7 @@ static void TryConstructorInitialization(Sema &S, // class or delegating to another constructor from a mem-initializer. // ObjC++: Lambda captured by the block in the lambda to block conversion // should avoid copy elision. - if (S.getLangOpts().CPlusPlus17 && - Entity.getKind() != InitializedEntity::EK_Base && - Entity.getKind() != InitializedEntity::EK_Delegating && - Entity.getKind() != - InitializedEntity::EK_LambdaToBlockConversionBlockElement && + if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { // Convert qualifications if necessary. @@ -4293,11 +4292,10 @@ static void TryConstructorInitialization(Sema &S, // If the initializer list has no elements and T has a default constructor, // the first phase is omitted. if (!(UnwrappedArgs.empty() && S.LookupDefaultConstructor(DestRecordDecl))) - Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/true, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, + CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); } // C++11 [over.match.list]p1: @@ -4307,11 +4305,10 @@ static void TryConstructorInitialization(Sema &S, // elements of the initializer list. if (Result == OR_No_Viable_Function) { AsInitializerList = false; - Result = ResolveConstructorOverload(S, Kind.getLocation(), UnwrappedArgs, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/false, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), UnwrappedArgs, CandidateSet, DestType, Ctors, + Best, CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/false, IsListInit, RequireActualConstructor); } if (Result) { Sequence.SetOverloadFailure( @@ -6776,6 +6773,7 @@ static ExprResult CopyObject(Sema &S, S, Loc, CurInitExpr, CandidateSet, T, Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true)) { case OR_Success: break; @@ -6921,6 +6919,7 @@ static void CheckCXX98CompatAccessibleCopy(Sema &S, S, Loc, CurInitExpr, CandidateSet, CurInitExpr->getType(), Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true); PartialDiagnostic Diag = S.PDiag(diag::warn_cxx98_compat_temp_copy) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp index 394006a57747..7bf228851de2 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -790,6 +790,10 @@ void Sema::PrintInstantiationStack() { Diags.Report(Active->PointOfInstantiation, diag::note_template_nsdmi_here) << FD << Active->InstantiationRange; + } else if (ClassTemplateDecl *CTD = dyn_cast(D)) { + Diags.Report(Active->PointOfInstantiation, + diag::note_template_class_instantiation_here) + << CTD << Active->InstantiationRange; } else { Diags.Report(Active->PointOfInstantiation, diag::note_template_type_alias_instantiation_here) diff --git a/sys/sys/param.h b/sys/sys/param.h index d56255431ba2..da48839fdd3b 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -73,7 +73,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500016 +#define __FreeBSD_version 1500017 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Mar 20 22:46:10 2024 X-Original-To: dev-commits-src-all@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 4V0Nwz0gCLz5F8GW; Wed, 20 Mar 2024 22:46: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 4V0Nwz08gXz4hvT; Wed, 20 Mar 2024 22:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974771; 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=j0orcWpdtHsmdj3pCSV7XE+1lYZ8EBMNQGxoDT3KyVc=; b=OYkIw5GK4ITMKjLo312g9LrHMmvhDdIYs+VwDFLh+4b/HVT8n/cM0acJFtjXvJm5GeaHCu HTkPAYISRBkRZcNapTdxqNZbfuGjjoY/xVY3i7b9MdxTB+2q7uaUwxPBTF+NRk55HHT3EP Bdkg5+Fc2NTtbmqM1O5XkLzCMkgJCe01q0JtrWJ2XoI2EpWTbd7kgpJrZXFXt/OTg0iFre OmKljfrThg+uRe/YCfPL1oEgXh33PcWAeC0dX441RmMEEF24F+px0UYaoAfvh38S6V1FYP 8AfgiDS8X7YKR9aCX6d545CUmuWLJG+/RNmi3/rMAPVyIlQpcfRp0T2cgd0Z7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710974771; a=rsa-sha256; cv=none; b=Cs/+xz/NX3cY7YulZQYcGm+qZZkANTSpK8lHHS9EUmcMQzJptmedprA7f5WqWraSLgbM6w 4q9k4CUs1sPsUtJG9mD2X/fl2dNN4GkWUoAXjpAQMFFBcEhTvqjebo3RBPYtjo2Mv/uM0p lkgC7fmZ2UZcqg18Goi9Pt0wi0Fw1wbpee3e7vA6sDSlk5OfatzscNQi2SKta/UZUVly9R r+R/hrrUHq+wOPQa8V+Jh3zLvOFPoZXQQnjtT5nrpHJ8sUi9yL9mdEQ4DmjfzGrydMTPzg 0jPcbZOgTEycRfTfZMTif1xcsiHkAyocXNZQcGe1Lg2wvdsBK3yEJ9LP6L1bcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710974771; 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=j0orcWpdtHsmdj3pCSV7XE+1lYZ8EBMNQGxoDT3KyVc=; b=mQ5rzYQ0Q+7Azz7MAvefRTQEuBU1/mmbaoB7JmAiisYjXYHaWRIpKyAgSH7lBaIKpqt7zu +9m3Vm21hfmQaAI6meICZK4J1BlnIE/2ZBw2eSgmuaB7HyQV3dcavgPmElkM/1GJPPQOVO vhLGsPtvgg0n6cRUQJAzq5t8eufJ2+Xh64A9oIB6if/fXCf9ptlHh9JmMqGfNIYt02X7t3 GxplyQ9C8KjQTWcc61hajao3l3ct6OOI7saI5FrV7+IlzLD8hbUsMHSwYc6GdumCUsmHGP F4Buo182zBSIvtJ+Fy0FOmAxC4eJhHs4o+r+yuWs31GkGeu+FoBt5iXeYxGR0Q== 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 4V0Nwy6lXFz18f1; Wed, 20 Mar 2024 22:46: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 42KMkAUN065303; Wed, 20 Mar 2024 22:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42KMkAlr065300; Wed, 20 Mar 2024 22:46:10 GMT (envelope-from git) Date: Wed, 20 Mar 2024 22:46:10 GMT Message-Id: <202403202246.42KMkAlr065300@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: 55e2187a091b - main - Translate linux_newlstat name argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 55e2187a091b7c397b3682b5ded2143c43e31a18 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=55e2187a091b7c397b3682b5ded2143c43e31a18 commit 55e2187a091b7c397b3682b5ded2143c43e31a18 Author: John F. Carr AuthorDate: 2024-03-20 22:44:23 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-20 22:45:55 +0000 Translate linux_newlstat name argument PR: 277847 MFC after: 1 week --- usr.bin/truss/syscalls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index f9763d10c1b4..47d6aef8f6ff 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -615,6 +615,8 @@ static const struct syscall_decode decoded_syscalls[] = { .args = { { Name | IN, 0 }, { Int, 1 } } }, { .name = "linux_newfstat", .ret_type = 1, .nargs = 2, .args = { { Int, 0 }, { Ptr | OUT, 1 } } }, + { .name = "linux_newlstat", .ret_type = 1, .nargs = 2, + .args = { { Name | IN, 0 }, { Ptr | OUT, 1 } } }, { .name = "linux_newstat", .ret_type = 1, .nargs = 2, .args = { { Name | IN, 0 }, { Ptr | OUT, 1 } } }, { .name = "linux_open", .ret_type = 1, .nargs = 3, From nobody Thu Mar 21 02:27:18 2024 X-Original-To: dev-commits-src-all@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 4V0Tr824L2z5FYmT for ; Thu, 21 Mar 2024 02:27:20 +0000 (UTC) (envelope-from 0100018e5ed590e8-f08d708b-e2f0-406f-bb37-85f232b3a936-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4V0Tr727dZz4Dcj for ; Thu, 21 Mar 2024 02:27:19 +0000 (UTC) (envelope-from 0100018e5ed590e8-f08d708b-e2f0-406f-bb37-85f232b3a936-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1710988038; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=sJPM2WyTF449PRnL85U62NGtUBTVkW/at98M88X6/Ro=; b=FmSNY9yNY2UrM3E0z6df7YsJVRMrXNDp7AR8f9+FjIN7FxVoeloz8EyTfgsgfTPR Mqznf0spgEgvauMlLk0LG5MgktYF0G7ePgq8ePb+VhzG5XJJ1XMmOXDqChG6xwy1RmG +SKceEf6ee9MCNc6aNIDjy7WkSRlGA4J+d97X724= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1710988038; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=sJPM2WyTF449PRnL85U62NGtUBTVkW/at98M88X6/Ro=; b=r2gjG97Lmu9CYRYz/NcQSJwq7mxD54Jzpbn36iEfbA6hi7jKzEiyiZlsFmJl44xY gDZDs+Kl7tO09Gar7I1Sf95IzVp/qWPDIamjIN0+p8XQeW9JfiOwY1SKEvMc4SElsjG FmBifJJIZKdNpPVwcK5eK4l2UTfz92M01WJjLIYk= Message-ID: <0100018e5ed590e8-f08d708b-e2f0-406f-bb37-85f232b3a936-000000@email.amazonses.com> Date: Thu, 21 Mar 2024 02:27:18 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a16ff32f04b5 - main - NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets Content-Language: en-US To: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403202234.42KMYdvE047953@gitrepo.freebsd.org> From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202403202234.42KMYdvE047953@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.03.21-54.240.8.237 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4V0Tr727dZz4Dcj On 3/20/24 15:34, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 > > commit a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 > Author: John Baldwin > AuthorDate: 2024-03-20 22:29:51 +0000 > Commit: John Baldwin > CommitDate: 2024-03-20 22:29:51 +0000 > > NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets I think this commit broke buildworld: > In file included from /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode/flags.c:82: > /releng/15-i386-GENERIC-snap/tmp/obj/releng/15-i386-GENERIC-snap/usr/src/i386.i386/lib/libsysdecode/tables.h:1323:13: error: use of undeclared identifier 'TCP_USE_DDP' > 1323 | TABLE_ENTRY(TCP_USE_DDP) > | ^ > /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode/flags.c:79:21: note: expanded from macro 'TABLE_ENTRY' > 79 | #define TABLE_ENTRY X > | ^ > 1 error generated. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Mar 21 03:02:19 2024 X-Original-To: dev-commits-src-all@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 4V0Vcc0cZFz5Fd02; Thu, 21 Mar 2024 03:02:24 +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 4V0Vcb1wTxz4HkN; Thu, 21 Mar 2024 03:02:23 +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 ESMTPS id mwz3rOvGgdrxEn8hCrG8Sm; Thu, 21 Mar 2024 03:02:22 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id n8hArxBuiWhyfn8hBrfGZC; Thu, 21 Mar 2024 03:02:22 +0000 X-Authority-Analysis: v=2.4 cv=MenPuI/f c=1 sm=1 tr=0 ts=65fba33e a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=K6JAEmCyrfEA:10 a=B8ibFTVmAAAA:8 a=6I5d2MoRAAAA:8 a=tKatY2OJAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=xmghZ2Wf_lflzcDj6lYA:9 a=CjuIK1q_8ugA:10 a=xvSgdcfEVHFitugM1GHH:22 a=IjZwj45LgO3ly-622nXo:22 a=ce2VFjyCEyIfsGOlKAFV: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 120C4A82; Wed, 20 Mar 2024 20:02:20 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id CF3AE28F; Wed, 20 Mar 2024 20:02:19 -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: Colin Percival cc: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: a16ff32f04b5 - main - NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets In-reply-to: <0100018e5ed59116-ed05047b-c4ef-4363-b740-46148241b8a8-000000@email.amazonses.com> References: <202403202234.42KMYdvE047953@gitrepo.freebsd.org> <0100018e5ed59116-ed05047b-c4ef-4363-b740-46148241b8a8-000000@email.amazonses.com> Comments: In-reply-to Colin Percival message dated "Thu, 21 Mar 2024 02:27:18 -0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 20 Mar 2024 20:02:19 -0700 Message-Id: <20240321030219.CF3AE28F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHvu/fgBd5mtxfXswOipWaCNuEU2nQYYn6xHOYCqCOeh3Qs0zugKCAfVY38LCbksm7u5vVcQ9yCG+hracwVN2imob3PoXndCDWHuFxM9+NkzBMIwCO2T YUhCXX0JXgUnJBRDsgrV34/Y89D6ON5m0v0bl3/RMHYHhBScyDFKp3Gq9Pakq2guTlqvnbsoN+5TdLmkBtZUbavzdQ4tuF/prsykrfC6fEVPZLtXAQliLhOg Ny6SA/2GPmxQzK/bDlokpoTETn4l6iS+BnMTe7kKN8mmbY7coxBV6vhe7BiBKEDSK2rHv7cyUedaStpk1IkXB9xJwrfViTnMrPnu6ZtyT03aQcY6SMdoLqLX L5wSVcsN X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4V0Vcb1wTxz4HkN In message <0100018e5ed59116-ed05047b-c4ef-4363-b740-46148241b8a8-000000@ema il. amazonses.com>, Colin Percival writes: > On 3/20/24 15:34, John Baldwin wrote: > > The branch main has been updated by jhb: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=a16ff32f04b5b891a2d9b0427a2fd9 > c48e866da3 > > > > commit a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 > > Author: John Baldwin > > AuthorDate: 2024-03-20 22:29:51 +0000 > > Commit: John Baldwin > > CommitDate: 2024-03-20 22:29:51 +0000 > > > > NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets > > I think this commit broke buildworld: > > > In file included from /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode > /flags.c:82: > > /releng/15-i386-GENERIC-snap/tmp/obj/releng/15-i386-GENERIC-snap/usr/src/i3 > 86.i386/lib/libsysdecode/tables.h:1323:13: error: use of undeclared identifie > r 'TCP_USE_DDP' > > 1323 | TABLE_ENTRY(TCP_USE_DDP) > > | ^ > > /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode/flags.c:79:21: note: > expanded from macro 'TABLE_ENTRY' > > 79 | #define TABLE_ENTRY X > > | ^ > > 1 error generated. > > -- > Colin Percival > FreeBSD Release Engineering Lead & EC2 platform maintainer > Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid > 3d0a736796a9 broke the build. TCP_USE_DDP is enclosed in #ifdef KERNEL breaking this userland build. I've temporarily commented out the #ifdef bracketing here to allow my builds to continue for now. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Mar 21 03:16:08 2024 X-Original-To: dev-commits-src-all@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 4V0VwT03dCz5Ff9Z; Thu, 21 Mar 2024 03:16: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 4V0VwS6NRhz4JkV; Thu, 21 Mar 2024 03:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710990968; 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=DyXRZIjy87xMeGMJvqdw2YQXOui6UefPqjp5VczyHC0=; b=YNh8aEungARiIPRQ7sARcGXErQuhE3e1sbu46P3sgTWTpmEgT070vv+vq5SBZkcegHY1hS 9s9IcV0W92dO0cO4O6Vw3pPX4Fd1oMDfuqHQp3ng02ZKFci+WTicVtAWfVO+AbBI7+Dpkl iRJzkFcXd5pHUMguyyOnZBsqnU21/29vLbin7po7ihAUi/WrVioXnfFn9y/ECdvvxUMEDl 3woc7dYfnpJsnlWHypzwzZwOHnNuPtYkOPhbKWVw5RAbS0uaqNT4IDM5ylVOO135aHH8Z/ V7sgtVk7S4Z9UqdSUVaB84g3f6aNHYjL24k0OLq0rssWoU80pe0j299tjdvm+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710990968; a=rsa-sha256; cv=none; b=xvpZyoAWYkIQR4AK2o2b0hYeAWrjw9a9ipoia3gFWqVMBW5ztaVxl9zGAW9pP0oDA0H9S9 oCL2+CJqn+XxT4yA3ik8QA413USPoJlNperavkxrPnmp8pmGoxs9Spm5lIaPNBq15shGx9 wVIQS0mCfKRH/4T4RgPRloZrhQBw/9d9qN1U97iBUWxsmb41hFs9gSGjXeXzuDOIqXqWmH LgJPYG106PbjNRtBxJZVZEQamuVwcZ0wTyZBHWIymRE4HHaOzajbnvyG7HV1ppxpNK4yVQ LHd/BkeqScywYQ3TxmMlbS0z9FdtPn8Il50t/7RB5TedzeWKdRpAv6o+aBO8Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710990968; 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=DyXRZIjy87xMeGMJvqdw2YQXOui6UefPqjp5VczyHC0=; b=px7NziMx8a17haBzHYUB/a9wNXDz9REdTW9p3VPimJHRNQuZKOX0Z/d+PMqt3ENL0S2lEj nAM3XnxVSNxe+jn00iEuCrrcdmRIsWFtWZErsr/8xtjUUZmRg9lg0zofV22Gqeg5CNTu5D IGsDs8bW8AOqX5AbMUXyT26UfGnZu7xCH57ysuCs1VW/+qsgiBzTUR27sjjXYEf4lmOaHT fT6zfbbzFp9ky+vkxa3CQsfIWW5pgMHPKvknWjBopFmxFHH6vk6dK4HyqyOG/uPOLeA4Dr EpmR+BIHuuvDtyRcOVvITLInpfKUaZIuDpGoyhubZDfp9TX1LiPkRmes7ymBvg== 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 4V0VwS5XTczJKY; Thu, 21 Mar 2024 03:16: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 42L3G87e022020; Thu, 21 Mar 2024 03:16:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L3G8F8022017; Thu, 21 Mar 2024 03:16:08 GMT (envelope-from git) Date: Thu, 21 Mar 2024 03:16:08 GMT Message-Id: <202403210316.42L3G8F8022017@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: 6b3db5d7793f - main - libsysdecode: fix build after 3d0a736796a9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 6b3db5d7793f57fa0020a78d61aae7ec318557cc Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6b3db5d7793f57fa0020a78d61aae7ec318557cc commit 6b3db5d7793f57fa0020a78d61aae7ec318557cc Author: Kyle Evans AuthorDate: 2024-03-21 03:14:49 +0000 Commit: Kyle Evans CommitDate: 2024-03-21 03:14:49 +0000 libsysdecode: fix build after 3d0a736796a9 TCP_USE_DDP is a kernel-only macro, so we must exclude it in libsysdecode to avoid breaking the build. Fixes: 3d0a736796a9 ("tcp: Add a new kernel-only TCP_USE_DDP [...]") --- lib/libsysdecode/mktables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index beb18e97f898..8a990e0408d5 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -141,7 +141,7 @@ gen_table "sockopt" "SO_[A-Z_]+[[:space:]]+0x[0-9]+" "sys/ gen_table "sockoptip" "(IP_[[:alnum:]_]+|MCAST_[[:alnum:]_]+_GROUP)[[:space:]]+" "netinet/in.h" "IP_DEFAULT|IP_MIN|IP_MAX|IP_PORTRANGE" gen_table "sockoptipv6" "IPV6_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet6/in6.h" "IPV6_ADDR_|IPV6_TAG_DIRECT|IPV6_OPTIONS|IPV6_RECVOPTS|IPV6_RECVRETOPTS|IPV6_RECVDSTADDR|IPV6_RETOPTS|IPV6_2292|IPV6_RECVRTHDRDSTOPTS|IPV6_REACHCONF|IPV6_PKTOPTIONS" gen_table "sockoptsctp" "SCTP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/sctp.h" -gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN" +gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN|TCP_USE_DDP" gen_table "sockoptudp" "UDP_[[:alnum:]]+[[:space:]]+[0-9]+" "netinet/udp.h" "UDP_ENCAP_" gen_table "sockoptudplite" "UDPLITE_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/udplite.h" gen_table "socktype" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h" From nobody Thu Mar 21 03:16:35 2024 X-Original-To: dev-commits-src-all@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 4V0Vx13CT5z5Ff4t; Thu, 21 Mar 2024 03:16:37 +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 4V0Vx12fKCz4KJf; Thu, 21 Mar 2024 03:16:37 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710990997; 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=q6gPOuy5RYAibCeEZaVoj14WQtURMrbx3uQL6AGpug0=; b=LFA34GMKSub5tgY/j/pM/WLHdTZr7PD5e1pcS5ZEDOfBYQZHqtNcrCK+QABJru49H0pW34 nTx3fsdXN7Q17Gfi5EbZy0G2861C+IGxUEIaqIlJidgoELcvfvyvkHKqQLHG+2quOTr99G pvfJ/5cauX6HS/P80t8jHhYsLdTNGK5QXZuKvXhb7RAYNdTFobZJ1xaaEgtI5QRtHgXyZC hWRqR9ibGdTBjLgQc3n+iH/c9VpSFLfQ8ELMbIc71sb2sHgh+0C1ix4j1PtMykgDz0Gehu kbdFrbRjFLba4Psb97CyNzpJ9J42hsSOWlY2/bc8Nu2xz6vThrGf3cc62j3u3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710990997; a=rsa-sha256; cv=none; b=hz7N4DsEC/56JuckZkupnPa20DMkeDP0vkhRqlQjxzeTyc5bwH0dNvZddAVfaBgI8btaRd u50b/8Tj15j/4A8Hv3aStBnEzxmqbJ46+UYHS4/7c6DsKeo/c895uPeJU6LpP+pBXQlTMo fFmFAOoM8qmv+r5v8ibLxARxpwsmqskOKvmKoYTyDUX6ALy6PZmpvrtlg6r623iwkIIg2w V9oTUysbcpDfsokuwFKmpUOf7AQfqG/drnRHv7PE2K36JJQx2c4ywE4yjywjrR1cgRMexs NnpBKHDcA8vZXgqGKvYqrDKyM/Ucrj+kkiIlqAzx3HYWNyYULOz0lq0WfqDMgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710990997; 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=q6gPOuy5RYAibCeEZaVoj14WQtURMrbx3uQL6AGpug0=; b=reg54E1cN3z4EcMPkuZL10H2swQrvBxjziPnFDh49oO6b8xCP99vOjyPo0y03kOlQFXwdb ekQmzLsS3NtfAMZi92YH8SlHRmKSw4/CRGHRH9PupUl993HojRpl8YliX5/ufKSKRPjyZ1 +xav6Nkt8SFNXNz8t7vjUdOq7cAXyRUzrcQyUkLJGQ0tFEoTUFO6DQjSb3JFVYRZ3t3Qrf NF1+D7uYgPgxu5FU0aTTmDZ4dbVdeFS0+iI5pVGepPMAlHz/rVt4olHK4iEd0SbwbTM0mw z9Y4BAziw4I+F86WI66JYxUsoUccdM6lf1Bd+eMgjGMiKOj16TBDhvDfxmaqxA== 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 4V0Vx05Sj5zWqL; Thu, 21 Mar 2024 03:16:36 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <5add8ca6-bce7-46ec-8f85-6d2d11800510@FreeBSD.org> Date: Wed, 20 Mar 2024 22:16:35 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: a16ff32f04b5 - main - NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets Content-Language: en-US To: Cy Schubert , Colin Percival Cc: John Baldwin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403202234.42KMYdvE047953@gitrepo.freebsd.org> <0100018e5ed59116-ed05047b-c4ef-4363-b740-46148241b8a8-000000@email.amazonses.com> <20240321030219.CF3AE28F@slippy.cwsent.com> From: Kyle Evans In-Reply-To: <20240321030219.CF3AE28F@slippy.cwsent.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/20/24 22:02, Cy Schubert wrote: > In message <0100018e5ed59116-ed05047b-c4ef-4363-b740-46148241b8a8-000000@ema > il. > amazonses.com>, Colin Percival writes: >> On 3/20/24 15:34, John Baldwin wrote: >>> The branch main has been updated by jhb: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=a16ff32f04b5b891a2d9b0427a2fd9 >> c48e866da3 >>> >>> commit a16ff32f04b5b891a2d9b0427a2fd9c48e866da3 >>> Author: John Baldwin >>> AuthorDate: 2024-03-20 22:29:51 +0000 >>> Commit: John Baldwin >>> CommitDate: 2024-03-20 22:29:51 +0000 >>> >>> NFS: Request use of TCP_USE_DDP for in-kernel TCP sockets >> >> I think this commit broke buildworld: >> >>> In file included from /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode >> /flags.c:82: >>> /releng/15-i386-GENERIC-snap/tmp/obj/releng/15-i386-GENERIC-snap/usr/src/i3 >> 86.i386/lib/libsysdecode/tables.h:1323:13: error: use of undeclared identifie >> r 'TCP_USE_DDP' >>> 1323 | TABLE_ENTRY(TCP_USE_DDP) >>> | ^ >>> /releng/15-i386-GENERIC-snap/usr/src/lib/libsysdecode/flags.c:79:21: note: >> expanded from macro 'TABLE_ENTRY' >>> 79 | #define TABLE_ENTRY X >>> | ^ >>> 1 error generated. >> >> -- >> Colin Percival >> FreeBSD Release Engineering Lead & EC2 platform maintainer >> Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid >> > > 3d0a736796a9 broke the build. TCP_USE_DDP is enclosed in #ifdef KERNEL > breaking this userland build. I've temporarily commented out the #ifdef > bracketing here to allow my builds to continue for now. > > 6b3db5d7793f57fa0020a78d61aae7ec318557cc should fix this. From nobody Thu Mar 21 03:49:28 2024 X-Original-To: dev-commits-src-all@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 4V0Wfw4BBdz5FhsK; Thu, 21 Mar 2024 03:49: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 4V0Wfw3PWgz4MPS; Thu, 21 Mar 2024 03:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710992968; 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=8a7fWlD8TTpJapOq9py635K6iLs9w9qvIpb0UwE41w0=; b=uhsw7kDd527CdtfDGcGERfOTKslMuqUs4dhJRbwYaYArxe06hAl4SBNxllaLbmMEkqTUyS aB6DbdEMEge0J6dat0WbGV8XeRBdQSp6q4qKdErEjyRJg+BSg2NR5iXFc4eoba+oehcFcu X+FI5pNnciSaf6Bcf11VmgxcXV68NTdjXst1TffesQFu09z52mmUOaBTPyWFkwGavNTRhJ ZngKdApGKl1HOKHzsOCKYLCsPVnS+SUzojyF0O/S4x3gV9m7Fqc2TaR0G2Z+DTgvm3hWia agbsyaB0sUlxHpojKWuC76i7EfIcmBnIiYISjmkwe1IycE76hw+LkimgVvmzkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710992968; a=rsa-sha256; cv=none; b=V1RpkaupGihbi/Jo5HQoJvKtfSj3SueUEsisZTDw9C+Fkpxdzyg6IooczSylsfsbDKK6fq gsUx0Axwsv0X3mVeCqv+jOpOx533jmmOPkYnRBynKGYSSGh2m1H0UqWvvj7gtWxaL/2diW OnQ8MZ55I5bWtPCmqsKdEG1EABd54L4DJ4PiouNBWXGCdsBwUS0f7RnWr0XNXA67A8ZT63 SLBPhxuOxMQ++MvROR8ywKZXEsAsCOfjmzdY+hAr4Pou0dmCJ7c3vJcCJ5eucxtwtsPzku EAaAE2kkC9VPY6GYgSGZyno158p+WvCr+syFh7WHi4U3bC0MsNzxj6qE615IEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710992968; 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=8a7fWlD8TTpJapOq9py635K6iLs9w9qvIpb0UwE41w0=; b=iousMFkHoEvghLYCwT6oict+SiGM+F+lk8ZygzEuNh9Uxkntay84BN0eURSetdVqNJy4nm 49GEUqoO69AZX8Biqm4Jq+s2n+o3eEHJeop1U3I8ntXNtXJ+y0gQs525jqonGSOicZ65KK IEn7jlmX+7OHh46T3dmC2wJzW+lbOxvYSS9gMmPATnDYlUqitzkVf2mnyvgSaWcovnMsJW IwhaZqV7gpmvmQzVOX2MzisyiZjG4ktwwOIpe2sR4Dwt+I+CxpG40TAG5sZqtzUuVz+DHX 9QGsIyBN/lcTaVVPM6lc5399asIM266Spd1LGZpN6xGEy6f3dTGMQyO3CE9cIw== 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 4V0Wfw30X5zK4n; Thu, 21 Mar 2024 03:49: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 42L3nSaj072105; Thu, 21 Mar 2024 03:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L3nS7X072102; Thu, 21 Mar 2024 03:49:28 GMT (envelope-from git) Date: Thu, 21 Mar 2024 03:49:28 GMT Message-Id: <202403210349.42L3nS7X072102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 984caafec11e - stable/14 - zlib: use more memory for a small deflate speedup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 984caafec11e2b9b044d23dda23a67270f6108ea Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=984caafec11e2b9b044d23dda23a67270f6108ea commit 984caafec11e2b9b044d23dda23a67270f6108ea Author: Xin LI AuthorDate: 2024-02-19 23:01:04 +0000 Commit: Xin LI CommitDate: 2024-03-21 03:49:04 +0000 zlib: use more memory for a small deflate speedup. The LIT_MEM option uses slightly more memory (for base gzip(1), about 16kiB; according to the author, about 6% for default deflate settings) for a small speedup. The performance gain is more noticeable for input data with higher entropy and less significant for data that is highly compressible, such as source code and logs. (cherry picked from commit aea57ebcb1b053370ea1f0e29cdc666291bc5d5e) --- sys/contrib/zlib/deflate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h index 300c6ada62b8..df76fc6fc5d1 100644 --- a/sys/contrib/zlib/deflate.h +++ b/sys/contrib/zlib/deflate.h @@ -25,7 +25,7 @@ /* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at the cost of a larger memory footprint */ -/* #define LIT_MEM */ +#define LIT_MEM /* =========================================================================== * Internal compression state. From nobody Thu Mar 21 03:50:26 2024 X-Original-To: dev-commits-src-all@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 4V0Wh30J87z5FhqT; Thu, 21 Mar 2024 03:50: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 4V0Wh26rSpz4N3y; Thu, 21 Mar 2024 03:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710993027; 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=8aJlHgeN+IwPRuhQVlTWf9lbM1Ztp8n32mJzJU+jPmg=; b=JAVi9jTuDpDED73G/GIFXJtg9QlKmRmXWAZjz5jgmK5ELIkLCE0gY+Rn31Yv72QVYiSZw9 sh3JBpXewhkOdsuvCr9p5nCnGAI2x6AgClTva/IcMrNV4/T250nw399JYci/EPSvUssNIW 6ln+J4U4LZfwz+D727J+O8nhb32GCS4On6KCQRlMyS58oMvPD8XPeg2lLhG6mhvojnyUsB dKxXhb/KMDvPFGgwMIJRCyNcBwerqkRzrUf5KrVay5mxlq0JrXap27DKgqbsXjVxk8uPme 6Z3Xupjkzv8xd55sDhTkcvHHN5LZS/NIy7pMAc7YJ2JzHJVtd15PHQjttArztg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710993027; a=rsa-sha256; cv=none; b=TiDle21pUjUjQi86MylNW8RmTQ7M9cDjtGDW3BuZoGBUeknHOGwsDVnWLxge2PwSiymHzU lucbxeDnu1MfrQJXUA3o7pAZvBlaO7VrsFSB69fWprAHUhpnKzgUVgfceEKRhBvRdGWr2Q qTD/TNgd3zeJlnEViTWkYKG1kTadH7gFKLqD7+UnDqF8ZA/178H/C75NK4QNVIKnCaln6S VxTl6y7mNqp7RBDBZuuOaYlthS44gMZn1ZVjInXhUn2t55CtPmaTVuIehqKqxHqvwUUzuF Wrt8XVw77NCReqvQahgZPSmaQ9zINUCCfAH6hFoY5VopECXIQxI44+fhGEXYvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710993027; 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=8aJlHgeN+IwPRuhQVlTWf9lbM1Ztp8n32mJzJU+jPmg=; b=u4KN9opUUPJfHCc4HrNbte6YZU2fWR7wX8N6HzaG7BqCXbiqYrWn+THdAz7tcbeIiuqcRw vUB0DcDnNUDVdO4RmqMVZlhFO1WVqIipxljIDj3Hggmb1ukeUELypjQaiQsNAAlJsx16WK qiHoJWjhsSTOc//NSid/Rn1w+do/AtP8CdXklwavjh35liRWSJ899Uw/j0d8nbWUikc/8s KSnBHPSyAB3qovQiCgBKywsAoYnQUlwFH5k3WcMGehHob9abke3ULlU/ZglFrEBvP5uqWj wtHzzxwSv0Oi9T7iXYC46YBGozVl58N5g3+ICEZx36DJtnRvEOyFWZt0mnqVwg== 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 4V0Wh26SCRzJMV; Thu, 21 Mar 2024 03:50: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 42L3oQ0U080966; Thu, 21 Mar 2024 03:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L3oQ2x080963; Thu, 21 Mar 2024 03:50:26 GMT (envelope-from git) Date: Thu, 21 Mar 2024 03:50:26 GMT Message-Id: <202403210350.42L3oQ2x080963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 66844fdbaea0 - stable/13 - zlib: use more memory for a small deflate speedup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 66844fdbaea091e732c5839791a0f85a32379518 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=66844fdbaea091e732c5839791a0f85a32379518 commit 66844fdbaea091e732c5839791a0f85a32379518 Author: Xin LI AuthorDate: 2024-02-19 23:01:04 +0000 Commit: Xin LI CommitDate: 2024-03-21 03:50:02 +0000 zlib: use more memory for a small deflate speedup. The LIT_MEM option uses slightly more memory (for base gzip(1), about 16kiB; according to the author, about 6% for default deflate settings) for a small speedup. The performance gain is more noticeable for input data with higher entropy and less significant for data that is highly compressible, such as source code and logs. (cherry picked from commit aea57ebcb1b053370ea1f0e29cdc666291bc5d5e) --- sys/contrib/zlib/deflate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h index 300c6ada62b8..df76fc6fc5d1 100644 --- a/sys/contrib/zlib/deflate.h +++ b/sys/contrib/zlib/deflate.h @@ -25,7 +25,7 @@ /* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at the cost of a larger memory footprint */ -/* #define LIT_MEM */ +#define LIT_MEM /* =========================================================================== * Internal compression state. From nobody Thu Mar 21 05:06:21 2024 X-Original-To: dev-commits-src-all@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 4V0YMf0z1Lz5F7B7; Thu, 21 Mar 2024 05:06: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 4V0YMd6gxLz4VJ5; Thu, 21 Mar 2024 05:06:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710997581; 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=a5HO+C1IbPRQsipNzip6w/BxbGGbVR7CC+/Me+Q8o/A=; b=fidTCc/gD6WkCAmk0jMlbGrJYgMyEQedarHg+hSmzn/VYvojIhzgkiSEym3SHyTajxNJ+5 5aid3n5rZ5UAappvULbJiCcpB86cerMXoETChyHZb1StsvqG/a11f57iNfpEWTzTftkUIJ FOyo3ggA/8ptPWLFnS7EClxu6g9Th5MV80ucfs9f5OUfYPPcSq4a/UE6hb8d1xvBsYcMWa Spwz6fhBsDjhGjWcKaJfWOT9H1ehx0qf2jtg77UZ8H9VeISYkZsKTnCTiOktfne7052wNM SM/WxuXPSBvBHM5IsgOKsZsazstmApk+PWsnOg8Xm9BmUYNF8slYKgrJTaw/IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710997581; a=rsa-sha256; cv=none; b=ky9jPwTih5WVhkDgByUviWUcfw6Mn1kb7gHOGyY7gC91fmpUylDWYpXntOYD3+H7znUBcj 4QEM+0AFGtgl9qd1C/G+5tFm0Obeqq24HVJP8X4jqEn4dmmaXOn8oV8Dql6HQZecsIjML2 8dNpkwY2WHcZgVW7m94es/OoKkIHUquRsv5YaWeUBylBWjmQm+ZF3bKbnnzn5gynna4CBY nZBqg3ZyUinlCAlmNzmk2WHsUbEQ9qdkiOMd/FR9mhBDy8fIMzJTuCYFe/rxjD2rVTJigZ 0c1hwhNO5EHMdmhcLcQAjANdV0k7BomkTiSwr1Li5BFsgGogoSprPuEmKF/2Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710997581; 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=a5HO+C1IbPRQsipNzip6w/BxbGGbVR7CC+/Me+Q8o/A=; b=o/CzZQEggRAA1AEN7+K0pkLXLn4pqnGCnK1mGKoDwoEkcXKQ3qqVff6DelYU51FHh/NaDK vTnjCgKMcxZ/tVQdNgPqrwM94FikxqJbgjQJqIHtwEadjoW0JiYP1ftlZextJ904OBpg/r VT2KV0k7hObkheAeEqaoslnqjHbqj0XPYHRmrr1qJBCPh4GFyk+SARGQOOCImBZqr6N6Me ekyIg/DE/m/bAgROltwI1kcIvH1Gn8ZhNPJJgm0hsiRszMq2mcUdUVH7C94GHl1HkSrDMi jdiTMHFfdAlGVHBsC8p64Zntg1wCoUgZMX+UevdcrobNixVrhTimDiaFzbS0NA== 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 4V0YMd68MhzMKB; Thu, 21 Mar 2024 05:06: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 42L56LtK008348; Thu, 21 Mar 2024 05:06:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L56LWD008345; Thu, 21 Mar 2024 05:06:21 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:06:21 GMT Message-Id: <202403210506.42L56LWD008345@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: d1c5d0cfcc17 - main - bhyve: Move device model-independent UART code into a separate file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d1c5d0cfcc1733c243d87f20477b115db4cf24b6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c5d0cfcc1733c243d87f20477b115db4cf24b6 commit d1c5d0cfcc1733c243d87f20477b115db4cf24b6 Author: Mark Johnston AuthorDate: 2024-03-21 04:20:37 +0000 Commit: Mark Johnston CommitDate: 2024-03-21 05:04:48 +0000 bhyve: Move device model-independent UART code into a separate file Currently bhyve implements a ns16550-compatible UART in uart_emul.c. This file also contains generic code to manage RX FIFOs and to handle reading from and writing to a TTY. bhyve instantiates UARTs to implement COM devices (via pci_lpc.c) and PCI UART devices. The arm64 port will bring with it a PL011 device model which is used as the default console (i.e., no COM ports). To simplify its integration, add a UART "backend" layer which lets UART device models allocate an RX FIFO and interact with TTYs without duplicating code. In particular, code in uart_backend.* is to be shared among device models, and the namespace for uart_emul.* is changed to uart_ns16550_*. This is based on andrew@'s work in https://github.com/zxombie/freebsd/tree/bhyvearm64 but I've made a number of changes, particularly with respect to naming and source code organization. No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40993 --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/amd64/pci_lpc.c | 31 ++-- usr.sbin/bhyve/pci_uart.c | 13 +- usr.sbin/bhyve/uart_backend.c | 348 +++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/uart_backend.h | 55 +++++++ usr.sbin/bhyve/uart_emul.c | 344 +++++----------------------------------- usr.sbin/bhyve/uart_emul.h | 20 ++- 7 files changed, 478 insertions(+), 334 deletions(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index c9d571daebbc..03ea77769754 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -56,6 +56,7 @@ SRCS= \ tpm_emul_passthru.c \ tpm_intf_crb.c \ tpm_ppi_qemu.c \ + uart_backend.c \ uart_emul.c \ usb_emul.c \ usb_mouse.c \ diff --git a/usr.sbin/bhyve/amd64/pci_lpc.c b/usr.sbin/bhyve/amd64/pci_lpc.c index d6e7689ccce1..57d2333edcc6 100644 --- a/usr.sbin/bhyve/amd64/pci_lpc.c +++ b/usr.sbin/bhyve/amd64/pci_lpc.c @@ -69,7 +69,7 @@ static struct pci_devinst *lpc_bridge; #define LPC_UART_NUM 4 static struct lpc_uart_softc { - struct uart_softc *uart_softc; + struct uart_ns16550_softc *uart_softc; int iobase; int irq; int enabled; @@ -226,17 +226,19 @@ lpc_uart_io_handler(struct vmctx *ctx __unused, int in, switch (bytes) { case 1: if (in) - *eax = uart_read(sc->uart_softc, offset); + *eax = uart_ns16550_read(sc->uart_softc, offset); else - uart_write(sc->uart_softc, offset, *eax); + uart_ns16550_write(sc->uart_softc, offset, *eax); break; case 2: if (in) { - *eax = uart_read(sc->uart_softc, offset); - *eax |= uart_read(sc->uart_softc, offset + 1) << 8; + *eax = uart_ns16550_read(sc->uart_softc, offset); + *eax |= + uart_ns16550_read(sc->uart_softc, offset + 1) << 8; } else { - uart_write(sc->uart_softc, offset, *eax); - uart_write(sc->uart_softc, offset + 1, *eax >> 8); + uart_ns16550_write(sc->uart_softc, offset, *eax); + uart_ns16550_write(sc->uart_softc, offset + 1, + *eax >> 8); } break; default: @@ -275,13 +277,14 @@ lpc_init(struct vmctx *ctx) } pci_irq_reserve(sc->irq); - sc->uart_softc = uart_init(lpc_uart_intr_assert, - lpc_uart_intr_deassert, sc); + sc->uart_softc = uart_ns16550_init(lpc_uart_intr_assert, + lpc_uart_intr_deassert, sc); asprintf(&node_name, "lpc.%s.path", name); backend = get_config_value(node_name); free(node_name); - if (uart_set_backend(sc->uart_softc, backend) != 0) { + if (backend != NULL && + uart_ns16550_tty_open(sc->uart_softc, backend) != 0) { EPRINTLN("Unable to initialize backend '%s' " "for LPC device %s", backend, name); return (-1); @@ -290,7 +293,7 @@ lpc_init(struct vmctx *ctx) bzero(&iop, sizeof(struct inout_port)); iop.name = name; iop.port = sc->iobase; - iop.size = UART_IO_BAR_SIZE; + iop.size = UART_NS16550_IO_BAR_SIZE; iop.flags = IOPORT_F_INOUT; iop.handler = lpc_uart_io_handler; iop.arg = sc; @@ -423,7 +426,7 @@ pci_lpc_uart_dsdt(void) dsdt_line(" Name (_CRS, ResourceTemplate ()"); dsdt_line(" {"); dsdt_indent(2); - dsdt_fixed_ioport(sc->iobase, UART_IO_BAR_SIZE); + dsdt_fixed_ioport(sc->iobase, UART_NS16550_IO_BAR_SIZE); dsdt_fixed_irq(sc->irq); dsdt_unindent(2); dsdt_line(" })"); @@ -588,12 +591,12 @@ static int pci_lpc_snapshot(struct vm_snapshot_meta *meta) { int unit, ret; - struct uart_softc *sc; + struct uart_ns16550_softc *sc; for (unit = 0; unit < LPC_UART_NUM; unit++) { sc = lpc_uart_softc[unit].uart_softc; - ret = uart_snapshot(sc, meta); + ret = uart_ns16550_snapshot(sc, meta); if (ret != 0) goto done; } diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c index 054f9af0f5cc..f0f05c731a18 100644 --- a/usr.sbin/bhyve/pci_uart.c +++ b/usr.sbin/bhyve/pci_uart.c @@ -67,7 +67,7 @@ pci_uart_write(struct pci_devinst *pi, int baridx, uint64_t offset, int size, assert(baridx == 0); assert(size == 1); - uart_write(pi->pi_arg, offset, value); + uart_ns16550_write(pi->pi_arg, offset, value); } static uint64_t @@ -78,7 +78,7 @@ pci_uart_read(struct pci_devinst *pi, int baridx, uint64_t offset, int size) assert(baridx == 0); assert(size == 1); - val = uart_read(pi->pi_arg, offset); + val = uart_ns16550_read(pi->pi_arg, offset); return (val); } @@ -94,10 +94,10 @@ pci_uart_legacy_config(nvlist_t *nvl, const char *opts) static int pci_uart_init(struct pci_devinst *pi, nvlist_t *nvl) { - struct uart_softc *sc; + struct uart_ns16550_softc *sc; const char *device; - pci_emul_alloc_bar(pi, 0, PCIBAR_IO, UART_IO_BAR_SIZE); + pci_emul_alloc_bar(pi, 0, PCIBAR_IO, UART_NS16550_IO_BAR_SIZE); pci_lintr_request(pi); /* initialize config space */ @@ -105,11 +105,12 @@ pci_uart_init(struct pci_devinst *pi, nvlist_t *nvl) pci_set_cfgdata16(pi, PCIR_VENDOR, COM_VENDOR); pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_SIMPLECOMM); - sc = uart_init(pci_uart_intr_assert, pci_uart_intr_deassert, pi); + sc = uart_ns16550_init(pci_uart_intr_assert, pci_uart_intr_deassert, + pi); pi->pi_arg = sc; device = get_config_value_node(nvl, "path"); - if (uart_set_backend(sc, device) != 0) { + if (device != NULL && uart_ns16550_tty_open(sc, device) != 0) { EPRINTLN("Unable to initialize backend '%s' for " "pci uart at %d:%d", device, pi->pi_slot, pi->pi_func); return (-1); diff --git a/usr.sbin/bhyve/uart_backend.c b/usr.sbin/bhyve/uart_backend.c new file mode 100644 index 000000000000..8d91f4f671e1 --- /dev/null +++ b/usr.sbin/bhyve/uart_backend.c @@ -0,0 +1,348 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2012 NetApp, Inc. + * Copyright (c) 2013 Neel Natu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "debug.h" +#include "mevent.h" +#include "uart_backend.h" + +struct ttyfd { + bool opened; + int rfd; /* fd for reading */ + int wfd; /* fd for writing, may be == rfd */ +}; + +#define FIFOSZ 16 + +struct fifo { + uint8_t buf[FIFOSZ]; + int rindex; /* index to read from */ + int windex; /* index to write to */ + int num; /* number of characters in the fifo */ + int size; /* size of the fifo */ +}; + +struct uart_softc { + struct ttyfd tty; + struct fifo rxfifo; + struct mevent *mev; +}; + +static bool uart_stdio; /* stdio in use for i/o */ +static struct termios tio_stdio_orig; + +static void +ttyclose(void) +{ + tcsetattr(STDIN_FILENO, TCSANOW, &tio_stdio_orig); +} + +static void +ttyopen(struct ttyfd *tf) +{ + struct termios orig, new; + + tcgetattr(tf->rfd, &orig); + new = orig; + cfmakeraw(&new); + new.c_cflag |= CLOCAL; + tcsetattr(tf->rfd, TCSANOW, &new); + if (uart_stdio) { + tio_stdio_orig = orig; + atexit(ttyclose); + } + raw_stdio = 1; +} + +static int +ttyread(struct ttyfd *tf) +{ + unsigned char rb; + + if (read(tf->rfd, &rb, 1) == 1) + return (rb); + else + return (-1); +} + +static void +ttywrite(struct ttyfd *tf, unsigned char wb) +{ + (void)write(tf->wfd, &wb, 1); +} + +static bool +rxfifo_available(struct uart_softc *sc) +{ + return (sc->rxfifo.num < sc->rxfifo.size); +} + +int +uart_rxfifo_getchar(struct uart_softc *sc) +{ + struct fifo *fifo; + int c, error, wasfull; + + wasfull = 0; + fifo = &sc->rxfifo; + if (fifo->num > 0) { + if (!rxfifo_available(sc)) + wasfull = 1; + c = fifo->buf[fifo->rindex]; + fifo->rindex = (fifo->rindex + 1) % fifo->size; + fifo->num--; + if (wasfull) { + if (sc->tty.opened) { + error = mevent_enable(sc->mev); + assert(error == 0); + } + } + return (c); + } else + return (-1); +} + +int +uart_rxfifo_numchars(struct uart_softc *sc) +{ + return (sc->rxfifo.num); +} + +static int +rxfifo_putchar(struct uart_softc *sc, uint8_t ch) +{ + struct fifo *fifo; + int error; + + fifo = &sc->rxfifo; + + if (fifo->num < fifo->size) { + fifo->buf[fifo->windex] = ch; + fifo->windex = (fifo->windex + 1) % fifo->size; + fifo->num++; + if (!rxfifo_available(sc)) { + if (sc->tty.opened) { + /* + * Disable mevent callback if the FIFO is full. + */ + error = mevent_disable(sc->mev); + assert(error == 0); + } + } + return (0); + } else + return (-1); +} + +void +uart_rxfifo_drain(struct uart_softc *sc, bool loopback) +{ + int ch; + + if (loopback) { + (void)ttyread(&sc->tty); + } else { + while (rxfifo_available(sc) && + ((ch = ttyread(&sc->tty)) != -1)) + rxfifo_putchar(sc, ch); + } +} + +int +uart_rxfifo_putchar(struct uart_softc *sc, uint8_t ch, bool loopback) +{ + if (loopback) { + return (rxfifo_putchar(sc, ch)); + } else if (sc->tty.opened) { + ttywrite(&sc->tty, ch); + return (0); + } else { + /* Drop on the floor. */ + return (0); + } +} + +void +uart_rxfifo_reset(struct uart_softc *sc, int size) +{ + char flushbuf[32]; + struct fifo *fifo; + ssize_t nread; + int error; + + fifo = &sc->rxfifo; + bzero(fifo, sizeof(struct fifo)); + fifo->size = size; + + if (sc->tty.opened) { + /* + * Flush any unread input from the tty buffer. + */ + while (1) { + nread = read(sc->tty.rfd, flushbuf, sizeof(flushbuf)); + if (nread != sizeof(flushbuf)) + break; + } + + /* + * Enable mevent to trigger when new characters are available + * on the tty fd. + */ + error = mevent_enable(sc->mev); + assert(error == 0); + } +} + +int +uart_rxfifo_size(struct uart_softc *sc __unused) +{ + return (FIFOSZ); +} + +#ifdef BHYVE_SNAPSHOT +int +uart_rxfifo_snapshot(struct uart_softc *sc, struct vm_snapshot_meta *meta) +{ + int ret; + + SNAPSHOT_VAR_OR_LEAVE(sc->rxfifo.rindex, meta, ret, done); + SNAPSHOT_VAR_OR_LEAVE(sc->rxfifo.windex, meta, ret, done); + SNAPSHOT_VAR_OR_LEAVE(sc->rxfifo.num, meta, ret, done); + SNAPSHOT_VAR_OR_LEAVE(sc->rxfifo.size, meta, ret, done); + SNAPSHOT_BUF_OR_LEAVE(sc->rxfifo.buf, sizeof(sc->rxfifo.buf), + meta, ret, done); + +done: + return (ret); +} +#endif + +static int +uart_stdio_backend(struct uart_softc *sc) +{ +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t cmds[] = { TIOCGETA, TIOCSETA, TIOCGWINSZ }; +#endif + + if (uart_stdio) + return (-1); + + sc->tty.rfd = STDIN_FILENO; + sc->tty.wfd = STDOUT_FILENO; + sc->tty.opened = true; + + if (fcntl(sc->tty.rfd, F_SETFL, O_NONBLOCK) != 0) + return (-1); + if (fcntl(sc->tty.wfd, F_SETFL, O_NONBLOCK) != 0) + return (-1); + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ); + if (caph_rights_limit(sc->tty.rfd, &rights) == -1) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (caph_ioctls_limit(sc->tty.rfd, cmds, nitems(cmds)) == -1) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + + uart_stdio = true; + + return (0); +} + +static int +uart_tty_backend(struct uart_softc *sc, const char *path) +{ +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t cmds[] = { TIOCGETA, TIOCSETA, TIOCGWINSZ }; +#endif + int fd; + + fd = open(path, O_RDWR | O_NONBLOCK); + if (fd < 0) + return (-1); + + if (!isatty(fd)) { + close(fd); + return (-1); + } + + sc->tty.rfd = sc->tty.wfd = fd; + sc->tty.opened = true; + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ, CAP_WRITE); + if (caph_rights_limit(fd, &rights) == -1) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (caph_ioctls_limit(fd, cmds, nitems(cmds)) == -1) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + + return (0); +} + +struct uart_softc * +uart_init(void) +{ + return (calloc(1, sizeof(struct uart_softc))); +} + +int +uart_tty_open(struct uart_softc *sc, const char *path, + void (*drain)(int, enum ev_type, void *), void *arg) +{ + int retval; + + if (strcmp("stdio", path) == 0) + retval = uart_stdio_backend(sc); + else + retval = uart_tty_backend(sc, path); + if (retval == 0) { + ttyopen(&sc->tty); + sc->mev = mevent_add(sc->tty.rfd, EVF_READ, drain, arg); + assert(sc->mev != NULL); + } + + return (retval); +} diff --git a/usr.sbin/bhyve/uart_backend.h b/usr.sbin/bhyve/uart_backend.h new file mode 100644 index 000000000000..fa7949ad6d1c --- /dev/null +++ b/usr.sbin/bhyve/uart_backend.h @@ -0,0 +1,55 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2012 NetApp, Inc. + * Copyright (c) 2013 Neel Natu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _UART_BACKEND_H_ +#define _UART_BACKEND_H_ + +#include + +#include "mevent.h" + +struct uart_softc; +struct vm_snapshot_meta; + +void uart_rxfifo_drain(struct uart_softc *sc, bool loopback); +int uart_rxfifo_getchar(struct uart_softc *sc); +int uart_rxfifo_numchars(struct uart_softc *sc); +int uart_rxfifo_putchar(struct uart_softc *sc, uint8_t ch, bool loopback); +void uart_rxfifo_reset(struct uart_softc *sc, int size); +int uart_rxfifo_size(struct uart_softc *sc); +#ifdef BHYVE_SNAPSHOT +int uart_rxfifo_snapshot(struct uart_softc *sc, + struct vm_snapshot_meta *meta); +#endif + +struct uart_softc *uart_init(void); +int uart_tty_open(struct uart_softc *sc, const char *path, + void (*drain)(int, enum ev_type, void *), void *arg); + +#endif /* _UART_BACKEND_H_ */ diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c index a8c28fb5f230..58d6697e4fea 100644 --- a/usr.sbin/bhyve/uart_emul.c +++ b/usr.sbin/bhyve/uart_emul.c @@ -29,29 +29,20 @@ #include #include -#ifndef WITHOUT_CAPSICUM -#include -#include -#endif #include +#include #include #include -#include -#include #include -#include -#include #include #include #include #include -#include -#include "mevent.h" +#include "uart_backend.h" #include "uart_emul.h" -#include "debug.h" #define COM1_BASE 0x3F8 #define COM1_IRQ 4 @@ -76,11 +67,6 @@ #define REG_SCR com_scr #endif -#define FIFOSZ 16 - -static bool uart_stdio; /* stdio in use for i/o */ -static struct termios tio_stdio_orig; - static struct { int baseaddr; int irq; @@ -94,21 +80,9 @@ static struct { #define UART_NLDEVS (sizeof(uart_lres) / sizeof(uart_lres[0])) -struct fifo { - uint8_t buf[FIFOSZ]; - int rindex; /* index to read from */ - int windex; /* index to write to */ - int num; /* number of characters in the fifo */ - int size; /* size of the fifo */ -}; - -struct ttyfd { - bool opened; - int rfd; /* fd for reading */ - int wfd; /* fd for writing, may be == rfd */ -}; +struct uart_ns16550_softc { + struct uart_softc *backend; -struct uart_softc { pthread_mutex_t mtx; /* protects all softc elements */ uint8_t data; /* Data register (R/W) */ uint8_t ier; /* Interrupt enable register (R/W) */ @@ -122,10 +96,6 @@ struct uart_softc { uint8_t dll; /* Baudrate divisor latch LSB */ uint8_t dlh; /* Baudrate divisor latch MSB */ - struct fifo rxfifo; - struct mevent *mev; - - struct ttyfd tty; bool thre_int_pending; /* THRE interrupt pending */ void *arg; @@ -133,158 +103,6 @@ struct uart_softc { uart_intr_func_t intr_deassert; }; -static void uart_drain(int fd, enum ev_type ev, void *arg); - -static void -ttyclose(void) -{ - - tcsetattr(STDIN_FILENO, TCSANOW, &tio_stdio_orig); -} - -static void -ttyopen(struct ttyfd *tf) -{ - struct termios orig, new; - - tcgetattr(tf->rfd, &orig); - new = orig; - cfmakeraw(&new); - new.c_cflag |= CLOCAL; - tcsetattr(tf->rfd, TCSANOW, &new); - if (uart_stdio) { - tio_stdio_orig = orig; - atexit(ttyclose); - } - raw_stdio = 1; -} - -static int -ttyread(struct ttyfd *tf) -{ - unsigned char rb; - - if (read(tf->rfd, &rb, 1) == 1) - return (rb); - else - return (-1); -} - -static void -ttywrite(struct ttyfd *tf, unsigned char wb) -{ - - (void)write(tf->wfd, &wb, 1); -} - -static void -rxfifo_reset(struct uart_softc *sc, int size) -{ - char flushbuf[32]; - struct fifo *fifo; - ssize_t nread; - int error; - - fifo = &sc->rxfifo; - bzero(fifo, sizeof(struct fifo)); - fifo->size = size; - - if (sc->tty.opened) { - /* - * Flush any unread input from the tty buffer. - */ - while (1) { - nread = read(sc->tty.rfd, flushbuf, sizeof(flushbuf)); - if (nread != sizeof(flushbuf)) - break; - } - - /* - * Enable mevent to trigger when new characters are available - * on the tty fd. - */ - error = mevent_enable(sc->mev); - assert(error == 0); - } -} - -static int -rxfifo_available(struct uart_softc *sc) -{ - struct fifo *fifo; - - fifo = &sc->rxfifo; - return (fifo->num < fifo->size); -} - -static int -rxfifo_putchar(struct uart_softc *sc, uint8_t ch) -{ - struct fifo *fifo; - int error; - - fifo = &sc->rxfifo; - - if (fifo->num < fifo->size) { - fifo->buf[fifo->windex] = ch; - fifo->windex = (fifo->windex + 1) % fifo->size; - fifo->num++; - if (!rxfifo_available(sc)) { - if (sc->tty.opened) { - /* - * Disable mevent callback if the FIFO is full. - */ - error = mevent_disable(sc->mev); - assert(error == 0); - } - } - return (0); - } else - return (-1); -} - -static int -rxfifo_getchar(struct uart_softc *sc) -{ - struct fifo *fifo; - int c, error, wasfull; - - wasfull = 0; - fifo = &sc->rxfifo; - if (fifo->num > 0) { - if (!rxfifo_available(sc)) - wasfull = 1; - c = fifo->buf[fifo->rindex]; - fifo->rindex = (fifo->rindex + 1) % fifo->size; - fifo->num--; - if (wasfull) { - if (sc->tty.opened) { - error = mevent_enable(sc->mev); - assert(error == 0); - } - } - return (c); - } else - return (-1); -} - -static int -rxfifo_numchars(struct uart_softc *sc) -{ - struct fifo *fifo = &sc->rxfifo; - - return (fifo->num); -} - -static void -uart_opentty(struct uart_softc *sc) -{ - - ttyopen(&sc->tty); - sc->mev = mevent_add(sc->tty.rfd, EVF_READ, uart_drain, sc); - assert(sc->mev != NULL); -} - static uint8_t modem_status(uint8_t mcr) { @@ -325,12 +143,13 @@ modem_status(uint8_t mcr) * Return an interrupt reason if one is available. */ static int -uart_intr_reason(struct uart_softc *sc) +uart_intr_reason(struct uart_ns16550_softc *sc) { if ((sc->lsr & LSR_OE) != 0 && (sc->ier & IER_ERLS) != 0) return (IIR_RLS); - else if (rxfifo_numchars(sc) > 0 && (sc->ier & IER_ERXRDY) != 0) + else if (uart_rxfifo_numchars(sc->backend) > 0 && + (sc->ier & IER_ERXRDY) != 0) return (IIR_RXTOUT); else if (sc->thre_int_pending && (sc->ier & IER_ETXRDY) != 0) return (IIR_TXRDY); @@ -341,7 +160,7 @@ uart_intr_reason(struct uart_softc *sc) } static void -uart_reset(struct uart_softc *sc) +uart_reset(struct uart_ns16550_softc *sc) { uint16_t divisor; @@ -350,7 +169,7 @@ uart_reset(struct uart_softc *sc) sc->dlh = divisor >> 16; sc->msr = modem_status(sc->mcr); - rxfifo_reset(sc, 1); /* no fifo until enabled by software */ + uart_rxfifo_reset(sc->backend, 1); } /* @@ -358,7 +177,7 @@ uart_reset(struct uart_softc *sc) * interrupt condition to report to the processor. */ static void -uart_toggle_intr(struct uart_softc *sc) +uart_toggle_intr(struct uart_ns16550_softc *sc) { uint8_t intr_reason; @@ -371,14 +190,13 @@ uart_toggle_intr(struct uart_softc *sc) } static void -uart_drain(int fd, enum ev_type ev, void *arg) +uart_drain(int fd __unused, enum ev_type ev, void *arg) { - struct uart_softc *sc; - int ch; + struct uart_ns16550_softc *sc; + bool loopback; sc = arg; - assert(fd == sc->tty.rfd); assert(ev == EVF_READ); /* @@ -388,21 +206,16 @@ uart_drain(int fd, enum ev_type ev, void *arg) */ pthread_mutex_lock(&sc->mtx); - if ((sc->mcr & MCR_LOOPBACK) != 0) { - (void) ttyread(&sc->tty); - } else { - while (rxfifo_available(sc) && - ((ch = ttyread(&sc->tty)) != -1)) { - rxfifo_putchar(sc, ch); - } + loopback = (sc->mcr & MCR_LOOPBACK) != 0; + uart_rxfifo_drain(sc->backend, loopback); + if (!loopback) uart_toggle_intr(sc); - } pthread_mutex_unlock(&sc->mtx); } void -uart_write(struct uart_softc *sc, int offset, uint8_t value) +uart_ns16550_write(struct uart_ns16550_softc *sc, int offset, uint8_t value) { int fifosz; uint8_t msr; @@ -426,12 +239,9 @@ uart_write(struct uart_softc *sc, int offset, uint8_t value) switch (offset) { case REG_DATA: - if (sc->mcr & MCR_LOOPBACK) { - if (rxfifo_putchar(sc, value) != 0) - sc->lsr |= LSR_OE; - } else if (sc->tty.opened) { - ttywrite(&sc->tty, value); - } /* else drop on floor */ + if (uart_rxfifo_putchar(sc->backend, value, + (sc->mcr & MCR_LOOPBACK) != 0)) + sc->lsr |= LSR_OE; sc->thre_int_pending = true; break; case REG_IER: @@ -450,8 +260,9 @@ uart_write(struct uart_softc *sc, int offset, uint8_t value) * the FIFO contents are reset. */ if ((sc->fcr & FCR_ENABLE) ^ (value & FCR_ENABLE)) { - fifosz = (value & FCR_ENABLE) ? FIFOSZ : 1; - rxfifo_reset(sc, fifosz); + fifosz = (value & FCR_ENABLE) ? + uart_rxfifo_size(sc->backend) : 1; + uart_rxfifo_reset(sc->backend, fifosz); } /* @@ -462,7 +273,8 @@ uart_write(struct uart_softc *sc, int offset, uint8_t value) sc->fcr = 0; } else { if ((value & FCR_RCV_RST) != 0) - rxfifo_reset(sc, FIFOSZ); + uart_rxfifo_reset(sc->backend, + uart_rxfifo_size(sc->backend)); sc->fcr = value & (FCR_ENABLE | FCR_DMA | FCR_RX_MASK); @@ -521,7 +333,7 @@ done: } uint8_t -uart_read(struct uart_softc *sc, int offset) +uart_ns16550_read(struct uart_ns16550_softc *sc, int offset) { *** 191 LINES SKIPPED *** From nobody Thu Mar 21 05:06:22 2024 X-Original-To: dev-commits-src-all@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 4V0YMg1f8Vz5F70x; Thu, 21 Mar 2024 05:06: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 4V0YMg0B3Dz4VJ7; Thu, 21 Mar 2024 05:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710997583; 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=fedwxC2naDjIQCD6h8smuBg2qU7qvGg6nRSEb8C2pXs=; b=Hr+jLAMcTPsLQS9/stVByrxG+kmhBSlPoNOoQSQbCYUT1td4wAAAG56BF/7GTsUZQlRct5 j/Zy5k+f/WERyZnbW7ZLj+GctVHFkskC8KA+5WEMZgOK4NWQJ6HwuVtUvJw1qR6tNjVGs8 nnYQCrDEt0bziJn1HoSyU1oKjIdUUjP9QQODENwcoj8/Mt3tRDoLiMZK5uB6OodRv4C7pF apmiZ8atRixNUciJmQIcFdfK48h2j5I186slnqbL4PDCgTbz0nCE+pNhRV2pqyS0856mv+ IcR/Ehuh/u1OqPuMGAkDDsgj1DTIeUw/UbtIF4oVcLNaAYi060NdaIu72vCVtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710997583; a=rsa-sha256; cv=none; b=bFzre5U4aPJ+VL78PyCARzTE9SqyY4uecJq9d0scEfzBXM0AVbKUYMAJKXaNKIHrC22O8M KY98gkDf/IFw2CZKbAPkljjKCbFI29pRiCC18lW5nQWBTbcmQ6KPjGUB9xCIEcnGsfadKH f9XGLTpubGWdVOhYQWi3NV4cXx7+JkZ0SX1M+hK+AqtPMa9TCTR4N44wxB3Qkc/JGBn7i5 Jd7PEZhpjcV1WLl5pbOqbokRDHNPfaEGjFsZ5woOFO98Hd6Gz2p8pwj/cjd4I+JS8wlxgG 54xbyro0vZU29ap4Rc7xoBOoJkhILOwfBuYNpyhL2xhUxcdSEe0y8VKTNopmog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710997583; 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=fedwxC2naDjIQCD6h8smuBg2qU7qvGg6nRSEb8C2pXs=; b=LSb1Nks3G77NLNnHiXLuVROIQKfc16exRDc5jVDjOOvuwxO7TrngU891PLrSuMHY0/Yf82 944AB0NGEy8Qb4Mc0Ek4Rj417OfOfR7Dgkcxzu861TyCJFdJw+qOyaHve1mIGxv05bBrqY RWguEgRa3ob+nKLmS2la4yO9nd0sde30D2Kj7qQ2wlTcerWgf7ru0g4eBTCOrUeyisE0Ib o69SZrknGHAnbMEzymHyZsTyEGhaAOQFJEb8/UsxBcXkw1Dl3hwhj7EwX1Q0NKqV/sUShc NmksFLkyzJXUiSZFsk9NYpFTuDgaLW4P1xoE4lcWSvg/vQIz93Lu3OGkQ1m/UQ== 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 4V0YMf6txHzMKn; Thu, 21 Mar 2024 05:06: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 42L56Mn8008402; Thu, 21 Mar 2024 05:06:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L56MAb008399; Thu, 21 Mar 2024 05:06:22 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:06:22 GMT Message-Id: <202403210506.42L56MAb008399@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: f29af8618bf9 - main - libfdt: Make an internal FDT library available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f29af8618bf94f1e58877feb6dbef35bd8bbf56b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f29af8618bf94f1e58877feb6dbef35bd8bbf56b commit f29af8618bf94f1e58877feb6dbef35bd8bbf56b Author: Mark Johnston AuthorDate: 2024-03-21 04:21:16 +0000 Commit: Mark Johnston CommitDate: 2024-03-21 05:05:05 +0000 libfdt: Make an internal FDT library available This will be used by bhyve to build a device tree when booting arm64 guests. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40994 --- lib/Makefile | 1 + lib/libfdt/Makefile | 29 +++++++++++++++++++++++++++++ share/mk/src.libnames.mk | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index 9d2531820c8b..a632a77e6071 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -171,6 +171,7 @@ SUBDIR+= clang SUBDIR.${MK_CUSE}+= libcuse SUBDIR.${MK_TOOLCHAIN}+=libpe SUBDIR.${MK_DIALOG}+= libdpv libfigpar +SUBDIR.${MK_FDT}+= libfdt SUBDIR.${MK_FILE}+= libmagic SUBDIR.${MK_GPIO}+= libgpio SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile new file mode 100644 index 000000000000..c4ada46c3b2e --- /dev/null +++ b/lib/libfdt/Makefile @@ -0,0 +1,29 @@ +LIB= fdt + +INTERNALLIB= + +LIBFDTSRCDIR= ${SRCTOP}/sys/contrib/libfdt +.PATH: ${LIBFDTSRCDIR} + +SRCS= \ + fdt.c \ + fdt_addresses.c \ + fdt_empty_tree.c \ + fdt_overlay.c \ + fdt_ro.c \ + fdt_rw.c \ + fdt_strerror.c \ + fdt_sw.c \ + fdt_wip.c + +INCS= \ + fdt.h \ + libfdt.h \ + ibfdt_env.h + +CFLAGS+= -I${LIBFDTSRCDIR} +WARNS?= 2 + +MAN= + +.include diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 0fd349d0d00f..d9fe88146dbe 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -44,6 +44,7 @@ _INTERNALLIBS= \ c_nossp_pic \ cron \ elftc \ + fdt \ fifolog \ ifconfig \ ipf \ @@ -546,6 +547,9 @@ _LIB_OBJTOP?= ${OBJTOP} LIBELFTCDIR= ${_LIB_OBJTOP}/lib/libelftc LIBELFTC?= ${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a +LIBFDTDIR= ${_LIB_OBJTOP}/lib/libfdt +LIBFDT?= ${LIBFDTDIR}/libfdt${PIE_SUFFIX}.a + LIBLUADIR= ${_LIB_OBJTOP}/lib/liblua LIBLUA?= ${LIBLUADIR}/liblua${PIE_SUFFIX}.a From nobody Thu Mar 21 05:51:38 2024 X-Original-To: dev-commits-src-all@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 4V0ZMv181Hz5FCV3; Thu, 21 Mar 2024 05:51: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 4V0ZMv0hvvz4YbM; Thu, 21 Mar 2024 05:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000299; 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=/GYeiH4YhsrFmZd2NV9duSSwtoPuWXZ41ImTQiLGRDw=; b=ZVu79ceLa11mqf5Fg2ZtxH/otN3LqW5HjHU0Ebzie5tE10cp7DPiIHfzzEpvr7Dhy2HwB1 90GwQ2Al39Q2KqXHpOYV9tD1qlqwHDLO3KaDW0dLmEm7L0vJQtqVYwyhixKRNaHerLr5d1 FWve5QkEWA2YvVtbe+AU8dsk8YtsBHA/hNQPDEaVRpNX055sK5vdKZ5pn2Bey2B4O5a1We YSWxM81YjC9HxCrcGeNQn8KVGbicspBvqHgKqT1tuhgQ6t1/q4li8xFC3nTleqBB50hGuk Qc3oYdIbMHdHuY8vS2dgm4nSOIQu/lVtfQGtTzMb+jsO/ZYOEqvHU+FDkra3bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711000299; a=rsa-sha256; cv=none; b=fHMoWaCf8RfB+AO+xPgQjSRgUPH0kD940+qGA0j+CKw3SpasG9sDsikUP1WsEryNhJKNE2 2TTYbNm71+zNNMpUSwr+khX3tN5HowR9mINEOJOZ6eZRkkEDhG4Vk8PmP+h1V/28M6L+FP 4Mj1u3RnBWA3YHuVbOM4IEoWGXBoY9GSfoXwBmZuW9aQqbML5oqKvv49EECX6iUFNHfBhP W6m/WhEBJkq4vtXXvgBavKxIrlgtgDrnDn3dBlNStYSmT10IUmMpM758bnYYBtxqaUghXh L416J4S7uXKAGlStoNxYJIA3G7WS3CUJOUAkK2QmidvMNeN5DX7tUzeTt0GwkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000299; 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=/GYeiH4YhsrFmZd2NV9duSSwtoPuWXZ41ImTQiLGRDw=; b=aSkL8afPus52dL5sQDjqm1Uq4CV6/+0Oa3SuJcoI+jgWz4XGJZiDyfUaZF5A6CQUGsepzM uAd2+3dmGkizsx9ym8TScJpzjQhqdFddE7OMWqAevxGsW8iQnjpyAHVNDpvrFHKa/+/A2y y6Ir3pPSDAwgIPtFOhXSI1NPE8xa5gap/dg8KllLaGA91yvi0RiNe4AfMMvX5EbWXJMkTL N9EBNC1XG/l79HsHFZJCEcUo0RCqzwgDDKSeCkUpVMudCyZKe7+KWErYe406OuzJiCbCEc +7qos5TeJXQ1vux0X6hnZxQql1m532+Hoqo2OYkPHFUzhe2IFEdYSVg9vj9w0A== 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 4V0ZMv0JQqzN4k; Thu, 21 Mar 2024 05:51:39 +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 42L5pc6m084214; Thu, 21 Mar 2024 05:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L5pcux084211; Thu, 21 Mar 2024 05:51:38 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:51:38 GMT Message-Id: <202403210551.42L5pcux084211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 8f13a2c52504 - stable/14 - OpenBSM: Remove $FreeSBD$ tags from the configuration files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f13a2c52504a504686ed20c70869f254491ce98 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8f13a2c52504a504686ed20c70869f254491ce98 commit 8f13a2c52504a504686ed20c70869f254491ce98 Author: Gordon Bergling AuthorDate: 2024-03-14 06:02:44 +0000 Commit: Gordon Bergling CommitDate: 2024-03-21 05:51:30 +0000 OpenBSM: Remove $FreeSBD$ tags from the configuration files In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration files were taken off the vendor branch to help mergemaster comparing them. Since mergemaster will be deprecated and $FreeBSD$ tags aren't used anymore, remove them. While here, sync audit_filter with upstream commit 5e6da76 (typo). Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D44318 (cherry picked from commit 6a6ec90681cf30eac2512ab96362a35e259fab62) --- contrib/openbsm/etc/audit_class | 3 --- contrib/openbsm/etc/audit_control | 3 --- contrib/openbsm/etc/audit_event | 5 +---- contrib/openbsm/etc/audit_filter | 3 --- contrib/openbsm/etc/audit_user | 3 --- contrib/openbsm/etc/audit_warn | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class index 47868b17d5da..4fdb14efeea0 100644 --- a/contrib/openbsm/etc/audit_class +++ b/contrib/openbsm/etc/audit_class @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# 0x00000000:no:invalid class 0x00000001:fr:file read 0x00000002:fw:file write diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control index d71b9a817452..aec726820f1e 100644 --- a/contrib/openbsm/etc/audit_control +++ b/contrib/openbsm/etc/audit_control @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# dir:/var/audit dist:off flags:lo,aa diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event index be3557597eee..31b4adc221a6 100644 --- a/contrib/openbsm/etc/audit_event +++ b/contrib/openbsm/etc/audit_event @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, # and programs, such as the kernel, may need to be recompiled to recognize @@ -442,7 +439,7 @@ 43079:AUE_CAPGET:capget(2):pc 43080:AUE_CAPSET:capset(2):pc 43081:AUE_PIVOT_ROOT:pivot_root(2):pc -43082:AUE_RTPRIO::rtprio(2):pc +43082:AUE_RTPRIO:rtprio(2):pc 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter index d0dc1c0baa5c..8e3fa719d232 100644 --- a/contrib/openbsm/etc/audit_filter +++ b/contrib/openbsm/etc/audit_filter @@ -1,5 +1,2 @@ -# -# $FreeBSD$ -# # modulename:various arguments here # diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user index 035066228e91..303b0c137efd 100644 --- a/contrib/openbsm/etc/audit_user +++ b/contrib/openbsm/etc/audit_user @@ -1,4 +1 @@ -# -# $FreeBSD$ -# root:lo:no diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn index 4b8498ea4144..8feb0fa4954f 100644 --- a/contrib/openbsm/etc/audit_warn +++ b/contrib/openbsm/etc/audit_warn @@ -1,6 +1,3 @@ #!/bin/sh -# -# $FreeBSD$ -# logger -p security.warning "audit warning: $@" From nobody Thu Mar 21 05:51:59 2024 X-Original-To: dev-commits-src-all@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 4V0ZNH2Bvmz5FCV5; Thu, 21 Mar 2024 05: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 4V0ZNH1nH9z4Ykg; Thu, 21 Mar 2024 05: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=1711000319; 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=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=EMUC2236N2+9M6qfhzez85s6w9brdULs8WTtuCF2hU39JJYZfAabRRI+1K/AOMd3jiXtCr t7C6UraFJu1b+vaRwTxpL7H3Ab5NBBp4vFvxX+ouJs6WvvJrOhDURK+p+DROap3FbEp+oC b0kZJztTedaZhUDGMzb1vurK8iW0tZmg6iBWLp5hWbBYzEYQonRLXrKrz7J5ZaQ+manQSU C3knveMwm64+WJvb99D1FWAr5wCWdyWSqi4yrvXyqGgOLNhRpQQt1UhW6iDVK8qm5oIXG7 lOJJN9PyGWEHAfnN1xshXJAzltgMS/+Dpod86veIAzlZ6Mc1b8R1vKvYraIeLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711000319; a=rsa-sha256; cv=none; b=QiVcwCdcsTCuI++MfGUYTWpCk9ZYeonDW8LUdQmJQK0zr5dUUzny2f5ZtRyNELdEJgSXHU WG7NJZZD7xwUYa4AirzNjQ4LqLV/wj4WjaKibIrLOa4hAhS8JWSDfDioEcKrIgYwH8Q5Uy hbRnq2FPqOO25KsAerImbT/V6tZZSgglbeVL+kDP3A6f+4lYXgc/zyqGV037EmftkSp0wV Yrj4dzxdRt1s9Nctup2sr8Sz75hCYakwejG3MT3AiIAThMVkJF0/eif+j9MUl28i/6urnC tUUVxEDNtGWhb8p2NymkJtRLgtDbUCQ8Ouc489oaWSSJzOluvuc8ChQZFn7JCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711000319; 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=pt/NRYVxoe05B8LiVrwxCM7Qc+8IQ8UAjypTuAgTZm8=; b=IvhJJhICzFkdvAEGDQvcXKHzseKTlSKJwA7ZUdfb/SO61PLwSg6plvXzDR2nP7iRbSt9be o042mOBJs9sep5mGb0wmeybP1O/EVh0Vd3CbkLjUxXGuNr5UASosFkh3ik5ahMcbOvEH6M Nv1HnJViO6/H/dSSa0Y7oo7TUKNmmwhXTXL6SQn2kYRH1CBoXTV0FrVrQh8fVFR1rgT6q1 KEeDaRHxCFfgakgJhJUEsJjTVsaVWnxbHLZKhemUNfhz/8jmM5wV10tt/CrnLlBPs7o1py 01RXMgwkFk3hTxobZ9MWcHlYYoN0xJ7aAcHb1E3c+M+t6Y6gQrBtjPZ0QePcOA== 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 4V0ZNH1NmjzN4n; Thu, 21 Mar 2024 05: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 42L5pxg2086956; Thu, 21 Mar 2024 05: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 42L5pxwK086953; Thu, 21 Mar 2024 05:51:59 GMT (envelope-from git) Date: Thu, 21 Mar 2024 05:51:59 GMT Message-Id: <202403210551.42L5pxwK086953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 550eedaee1c7 - stable/13 - OpenBSM: Remove $FreeSBD$ tags from the configuration files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=550eedaee1c7c28234c87d7703c0aaa4432ffc92 commit 550eedaee1c7c28234c87d7703c0aaa4432ffc92 Author: Gordon Bergling AuthorDate: 2024-03-14 06:02:44 +0000 Commit: Gordon Bergling CommitDate: 2024-03-21 05:51:52 +0000 OpenBSM: Remove $FreeSBD$ tags from the configuration files In e61dc6cac4001f1abfc48ee27e4e623c2c044fa8 the configuration files were taken off the vendor branch to help mergemaster comparing them. Since mergemaster will be deprecated and $FreeBSD$ tags aren't used anymore, remove them. While here, sync audit_filter with upstream commit 5e6da76 (typo). Reviewed by: imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D44318 (cherry picked from commit 6a6ec90681cf30eac2512ab96362a35e259fab62) --- contrib/openbsm/etc/audit_class | 3 --- contrib/openbsm/etc/audit_control | 3 --- contrib/openbsm/etc/audit_event | 5 +---- contrib/openbsm/etc/audit_filter | 3 --- contrib/openbsm/etc/audit_user | 3 --- contrib/openbsm/etc/audit_warn | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/contrib/openbsm/etc/audit_class b/contrib/openbsm/etc/audit_class index 47868b17d5da..4fdb14efeea0 100644 --- a/contrib/openbsm/etc/audit_class +++ b/contrib/openbsm/etc/audit_class @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# 0x00000000:no:invalid class 0x00000001:fr:file read 0x00000002:fw:file write diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control index d71b9a817452..aec726820f1e 100644 --- a/contrib/openbsm/etc/audit_control +++ b/contrib/openbsm/etc/audit_control @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# dir:/var/audit dist:off flags:lo,aa diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event index be3557597eee..31b4adc221a6 100644 --- a/contrib/openbsm/etc/audit_event +++ b/contrib/openbsm/etc/audit_event @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, # and programs, such as the kernel, may need to be recompiled to recognize @@ -442,7 +439,7 @@ 43079:AUE_CAPGET:capget(2):pc 43080:AUE_CAPSET:capset(2):pc 43081:AUE_PIVOT_ROOT:pivot_root(2):pc -43082:AUE_RTPRIO::rtprio(2):pc +43082:AUE_RTPRIO:rtprio(2):pc 43083:AUE_SCHED_GETPARAM:sched_getparam(2):ad 43084:AUE_SCHED_SETPARAM:sched_setparam(2):ad 43085:AUE_SCHED_GET_PRIORITY_MAX:sched_get_priority_max(2):ad diff --git a/contrib/openbsm/etc/audit_filter b/contrib/openbsm/etc/audit_filter index d0dc1c0baa5c..8e3fa719d232 100644 --- a/contrib/openbsm/etc/audit_filter +++ b/contrib/openbsm/etc/audit_filter @@ -1,5 +1,2 @@ -# -# $FreeBSD$ -# # modulename:various arguments here # diff --git a/contrib/openbsm/etc/audit_user b/contrib/openbsm/etc/audit_user index 035066228e91..303b0c137efd 100644 --- a/contrib/openbsm/etc/audit_user +++ b/contrib/openbsm/etc/audit_user @@ -1,4 +1 @@ -# -# $FreeBSD$ -# root:lo:no diff --git a/contrib/openbsm/etc/audit_warn b/contrib/openbsm/etc/audit_warn index 4b8498ea4144..8feb0fa4954f 100644 --- a/contrib/openbsm/etc/audit_warn +++ b/contrib/openbsm/etc/audit_warn @@ -1,6 +1,3 @@ #!/bin/sh -# -# $FreeBSD$ -# logger -p security.warning "audit warning: $@" From nobody Thu Mar 21 08:40:18 2024 X-Original-To: dev-commits-src-all@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 4V0f6W1PKrz5FXfQ; Thu, 21 Mar 2024 08:40: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 4V0f6W0YPQz4sY7; Thu, 21 Mar 2024 08:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711010419; 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=oZvI08M+xwQMiS+M2216PSAWULejKXiargU/bv1dRM4=; b=J04WjxDli2fU8rSlqc0vvJneI+vhqzexfDyiVgQiaqZrHNndP56vKpVGPk0HQc/xDSvtGa BMwLsxS9kE/tL926XJ6/loO30bQ+SYhQ7ePVmUAvdaAWyo7u75WWS/1ZS8IsjUmYjh9yKl oucD4d9bJFRRjQD9pnmRHx7xYAHieD/+EnKBGeTvroC4beoVyDZzldJgKgwTZ4kDIBDeT6 +hHuNI2XyXcnEYyeXTt1x975iXkKL3Ern5zk4oks4+b8Y2/wdVmWlv93ARSY5RzBMZ3o5L IdQ89wXcKkvdwnOpTpzVRvFGIVm5KFl3SH1ieHnGbgc1ztB8j9L+EwTLlEreuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711010419; a=rsa-sha256; cv=none; b=ErNOvNWP6WZUatu5BXgdSxq2bklqy7FL0itInJPOVR2hlmENbWb/ov8t3k9byLUf0s9mYx BzTBq1GNuc92ijd2ohqEpjPCkVh7U7FKDBO4wsjT1DugPiyjCPgfi6cSwmzEN85m+I5D2j rKlYH+D1YVwib53fHeq6H6OTHBxuFYmCwCN0H84PYTYE+OpiFbebxRZdYue9JDDs00YFwu 2xW2COOZ9/XBzOXN4ApqiSw0ZRPB4sd1Nsm50PZTDH/6MJvaeVjGVtSjijYvL+RJNPKGu4 XPGvyMi+z5lA1JBtDC0zZ6vESErkt2w8z6x+N+9RVNWc8eGd56fZqY6tqJ1o7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711010419; 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=oZvI08M+xwQMiS+M2216PSAWULejKXiargU/bv1dRM4=; b=iPOvmxXqjB0K1S6dJSa/lQWFVZHYXMl2NjhTr8h3u/x6atDkJc6zDa6wzVOE8D5m6XgqKM GuPGMzMGJa1FSQKPANYftIFuzQyfl3oJMg26r8Ol1CQDQsO7Z+YMgdgvpGEcqkkqA/jR26 h6wnJWG7/YklcVDfnin++eUL4lp9A9Y0HeFeaecmG3LkQshhVOzuVUpJI1XR28iLCU9rQn 57IQnDsBaLG1Iuu8ysXYRcqRLsrNc/ouUjkaOQI76jJLW0Zep3mY+Nbtbrh2GB+YDTCWC1 yJFn7i4U4U/DQLp7Tp1FMl+By1tq217pkbyRQrwwglSvpUyO2xDQ+1Ic4kHQbw== 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 4V0f6W02VHzSMQ; Thu, 21 Mar 2024 08:40: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 42L8eILU071368; Thu, 21 Mar 2024 08:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42L8eIFO071365; Thu, 21 Mar 2024 08:40:18 GMT (envelope-from git) Date: Thu, 21 Mar 2024 08:40:18 GMT Message-Id: <202403210840.42L8eIFO071365@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: 69d5783ae81b - main - wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 69d5783ae81b74295118950d01b6dddb3e504a56 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=69d5783ae81b74295118950d01b6dddb3e504a56 commit 69d5783ae81b74295118950d01b6dddb3e504a56 Author: Konstantin Belousov AuthorDate: 2024-03-21 08:38:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-21 08:40:08 +0000 wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() PR: 277855 Reported by: Paul Floyd Sponsored by: The FreeBSD Foundation MFC after: 3 days --- lib/libc/string/wmemchr.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3 index f88c7d49b252..c1701facb7d5 100644 --- a/lib/libc/string/wmemchr.3 +++ b/lib/libc/string/wmemchr.3 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 14, 2021 +.Dd March 21, 2024 .Dt WMEMCHR 3 .Os .Sh NAME @@ -80,9 +80,9 @@ .Ft wchar_t * .Fn wmemset "wchar_t *s" "wchar_t c" "size_t n" .Ft wchar_t * -.Fn wcpcpy "wchar_t *s1" "wchar_t *s2" +.Fn wcpcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" .Ft wchar_t * -.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n" +.Fn wcpncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n" .Ft int .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2" .Ft wchar_t * From nobody Thu Mar 21 10:13:43 2024 X-Original-To: dev-commits-src-all@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 4V0hBH520Yz5FkjB; Thu, 21 Mar 2024 10:13:43 +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 4V0hBH2vqxz457j; Thu, 21 Mar 2024 10:13:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016023; 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=RudWHXf1XQsAWyT5svmW5FZf8jx163k/ynjIZJWypoU=; b=QXkKGQ+CqtUyQ+S52khjDiEghao7JWXllZJsW/m7D6+VTbpjwRnfbQGalWXCRYWyDdDdBd K6ofdbUc2mm2U9lddwh2uwKunkvsThzL79a82Sd3VlrLqQiu7fTIWrRzds+Xdad9uUwu4E XqrZGba2gi4z3HinABbb4LuQrpVGJeCKPU0uXVwlyj4PgtUN7lyv4qSP6V1wKsTgpTuorg xjCmweb01ZeD66CgdIFUfLR7ybUo1lxb7Y47uYA3NyWyjaRyyr50BtzHurIi2v/SbsVO8E Eh0acm+ZXCGl1XKGHPLyfSXaAF9tPyJnwK2W9+juH9gLoqUGcABfR+/38GKrNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016023; a=rsa-sha256; cv=none; b=hbSsz3iT0yDTzOnlDJFvsQB0fLufwp/oZdxQ5oPLxoSsTOhNEQju9KLq5cfcdxfIBobnBM s710qMNmJNPQDca6WJwQp9OXTZupy/5s7zzWlx+dE671pDQwcvzl3/lIyWa+bGhmpflOzl bzhI/Dmx+tup/DHBw3KvKl3wE5RnjuxnhsWxeCzgXbRI+ItR1j4jZIE95WbqIESwFhEnP1 I/qCdcS1zPrD8T2dLUKWlSo9shE+t3nxVZCABVkgGRKrkRmq8FFltC6NDgqvJjAg0EwLxo PdkxR2ZfJwZKugI0k6K50TC6rVq1Yuv2n8CCPM6ADRIrBXrs4a4E2zKY3vkFLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016023; 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=RudWHXf1XQsAWyT5svmW5FZf8jx163k/ynjIZJWypoU=; b=TlpaM1dqOL3xlOF7QNOm4IbK25Ze50//lywE5VC9g3jfqrNfKHlN1FvxOOSiBBfOGQXaxd NNzr0HoqiG8J4U8c6hRA+8rtQHcYcq5VxacwBgmoR2rCZxPSZ79X4lSc9QFxHoKPRnR8Kr beFYZGbNt1vETqmrIjlq+/V/OIKzYfZa5FjbQ+bl2CF9ZRAUOUDd1lEnwEWUi363bXqk7j AI7MfvRU71DWx8ubO5vZMzP46vQ0bIhidfAWMtn31GPnqlmTVA7ANBE+o8VKWw1RioVkHo zzv7R5sQixtnG12LdjKFo2mcOUNsfEPpGHQuEmeVZho2fOraZMxvLF+OE5Qb2Q== 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 4V0hBH2Qw4zXNc; Thu, 21 Mar 2024 10:13:43 +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 42LADhp5032211; Thu, 21 Mar 2024 10:13:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADhs0032208; Thu, 21 Mar 2024 10:13:43 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:43 GMT Message-Id: <202403211013.42LADhs0032208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7e6437c08415 - main - arm64: Support passing more registers to signals List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e6437c08415ade75403f1ecad75167257e8ea3c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7e6437c08415ade75403f1ecad75167257e8ea3c commit 7e6437c08415ade75403f1ecad75167257e8ea3c Author: Andrew Turner AuthorDate: 2024-03-21 10:13:16 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:16 +0000 arm64: Support passing more registers to signals To support recent extensions to the Arm architecture we may need to store more or larger registers when sending a signal. To support this create a list of these extra registers. Userspace that needs to access a register in the signal handler can then walk the list to find the correct register struct and read/write its contents. Reviewed by: kib, markj (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43302 --- sys/arm64/arm64/exec_machdep.c | 85 +++++++++++++++++++++++++++++++++++++++--- sys/arm64/include/ucontext.h | 16 +++++++- 2 files changed, 94 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 52c63f801693..1bff70450b69 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -461,8 +461,12 @@ int set_mcontext(struct thread *td, mcontext_t *mcp) { #define PSR_13_MASK 0xfffffffful + struct arm64_reg_context ctx; struct trapframe *tf = td->td_frame; uint64_t spsr; + vm_offset_t addr; + int error; + bool done; spsr = mcp->mc_gpregs.gp_spsr; #ifdef COMPAT_FREEBSD13 @@ -501,8 +505,35 @@ set_mcontext(struct thread *td, mcontext_t *mcp) READ_SPECIALREG(mdscr_el1) | MDSCR_SS); isb(); } + set_fpcontext(td, mcp); + /* Read any register contexts we find */ + if (mcp->mc_ptr != 0) { + addr = mcp->mc_ptr; + + done = false; + do { + if (!__is_aligned(addr, + _Alignof(struct arm64_reg_context))) + return (EINVAL); + + error = copyin((const void *)addr, &ctx, sizeof(ctx)); + if (error != 0) + return (error); + + switch (ctx.ctx_id) { + case ARM64_CTX_END: + done = true; + break; + default: + return (EINVAL); + } + + addr += ctx.ctx_size; + } while (!done); + } + return (0); #undef PSR_13_MASK } @@ -585,6 +616,31 @@ sys_sigreturn(struct thread *td, struct sigreturn_args *uap) return (EJUSTRETURN); } +static bool +sendsig_ctx_end(struct thread *td, vm_offset_t *addrp) +{ + struct arm64_reg_context end_ctx; + vm_offset_t ctx_addr; + + *addrp -= sizeof(end_ctx); + ctx_addr = *addrp; + + memset(&end_ctx, 0, sizeof(end_ctx)); + end_ctx.ctx_id = ARM64_CTX_END; + end_ctx.ctx_size = sizeof(end_ctx); + + if (copyout(&end_ctx, (void *)ctx_addr, sizeof(end_ctx)) != 0) + return (false); + + return (true); +} + +typedef bool(*ctx_func)(struct thread *, vm_offset_t *); +static const ctx_func ctx_funcs[] = { + sendsig_ctx_end, /* Must be first to end the linked list */ + NULL, +}; + void sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) { @@ -593,6 +649,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct trapframe *tf; struct sigframe *fp, frame; struct sigacts *psp; + vm_offset_t addr; int onstack, sig; td = curthread; @@ -612,19 +669,15 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate and validate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !onstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - fp = (struct sigframe *)((uintptr_t)td->td_sigstk.ss_sp + + addr = ((uintptr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size); #if defined(COMPAT_43) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else { - fp = (struct sigframe *)td->td_frame->tf_sp; + addr = td->td_frame->tf_sp; } - /* Make room, keeping the stack aligned */ - fp--; - fp = (struct sigframe *)STACKALIGN(fp); - /* Fill in the frame to copy out */ bzero(&frame, sizeof(frame)); get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); @@ -636,6 +689,26 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(td->td_proc); + for (int i = 0; ctx_funcs[i] != NULL; i++) { + if (!ctx_funcs[i](td, &addr)) { + /* Process has trashed its stack. Kill it. */ + CTR4(KTR_SIG, + "sendsig: frame sigexit td=%p fp=%#lx func[%d]=%p", + td, addr, i, ctx_funcs[i]); + PROC_LOCK(p); + sigexit(td, SIGILL); + /* NOTREACHED */ + } + } + + /* Point at the first context */ + frame.sf_uc.uc_mcontext.mc_ptr = addr; + + /* Make room, keeping the stack aligned */ + fp = (struct sigframe *)addr; + fp--; + fp = (struct sigframe *)STACKALIGN(fp); + /* Copy the sigframe out to the user's stack. */ if (copyout(&frame, fp, sizeof(*fp)) != 0) { /* Process has trashed its stack. Kill it. */ diff --git a/sys/arm64/include/ucontext.h b/sys/arm64/include/ucontext.h index e9b914315a19..dedbd061ec6b 100644 --- a/sys/arm64/include/ucontext.h +++ b/sys/arm64/include/ucontext.h @@ -51,15 +51,29 @@ struct fpregs { int fp_pad; }; +/* + * Support for registers that don't fit into gpregs or fpregs, e.g. SVE. + * There are some registers that have been added so are optional. To support + * these create an array of headers that point at the register data. + */ +struct arm64_reg_context { + __uint32_t ctx_id; + __uint32_t ctx_size; +}; + +#define ARM64_CTX_END 0xa5a5a5a5 + struct __mcontext { struct gpregs mc_gpregs; struct fpregs mc_fpregs; int mc_flags; #define _MC_FP_VALID 0x1 /* Set when mc_fpregs has valid data */ int mc_pad; /* Padding */ - __uint64_t mc_spare[8]; /* Space for expansion, set to zero */ + __uint64_t mc_ptr; /* Address of extra_regs struct */ + __uint64_t mc_spare[7]; /* Space for expansion, set to zero */ }; + typedef struct __mcontext mcontext_t; #ifdef COMPAT_FREEBSD32 From nobody Thu Mar 21 10:13:44 2024 X-Original-To: dev-commits-src-all@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 4V0hBJ5zk7z5FkNb; Thu, 21 Mar 2024 10:13:44 +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 4V0hBJ3qzrz44sk; Thu, 21 Mar 2024 10:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016024; 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=HU9xsPD5kYYKn0Dn3bNESVQxeD+au7b6KWf9BuaYSek=; b=tMaVEcnEDhqgo2ibpyacqYLkZreO9O3FFoLaM2dc8vF+nvt95gWYP43+QnnjDQfq/cD0Ii wenJOxmT82f0PsUFQ0FB5gGAoryMZGloCzi7LmXpdM7VnBpq8hnJboIWXp65WnFMRVM6tn 0HkcajPipMUljwp0zAHESKf3Uksq1cPhgdm4yFIfbV5DCbcOYZN8mBDBJs1bnRWT84q0Ae PHy2l7grogWyjOnfM+oBOsfbBO63dvbYLfWXGiVaGIWGLHtDsISWSWbgZxbw3+4J/LeUkh ZsZB5W0ezqwcPTuB/Ajy+RyPmmD0rHt9QUYU9uam9sh17Wy+buaNXXaqc8tqtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016024; a=rsa-sha256; cv=none; b=ZARPQPjx52c1o8TayWUzNPD0vfnV9RGOzC0kv40mDQbh6qJixAlyxTuJiIrUGqd4hKuGRS lzZAj6N+NnL6sDNRMupZ+h+wvfooGBCo6rTa/GUJ/mqZsz2sAh4xlxfa/eE0u6lzQ7uMQH pEGQuaNk0OMnF4D47tfCPQzGQM8u+Ph8szzWcLLIi9RQB4/s3HPquc46aj8Ryg/KUeZpLj db1L6bdPD2TVP/srVamuqJTyfyu72Q/GZLBPVwqf/0rP4kNIox9TM4FC+yUGvr4XPgWxDc jz8GFMCu5QArweLTFcJq0+Ckb3T9hFp/3wwS8cRshtNJxWBhlsxY8gVABDqsWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016024; 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=HU9xsPD5kYYKn0Dn3bNESVQxeD+au7b6KWf9BuaYSek=; b=OYCouYVwavTS463Ifrl/EeeUt1hwFvoXZlabthY64YE9R/636otyXjzvx1bP/rhoW3blWK weOGCGANxqqF94XvjvmlBdImauDzhwu4DHY+8o+aAq/CMMPaeUmA6B6l6p+3WlN9JtlUAh ve85P2Ud0DQvJrgOhvTcx1SlciKtd/C0OYTBLNYfl1jP3DLGu8HS957z85JQBrxMVEZxbc kAjwOFmnHYKYCKbiNAz96mWFKKFpJPWH/zkDj1dS89G/LsME08ZwFChonntO+oOyx994an coE8DrktbXujsapS4GnkVmxnSBHduQ6UJLKXCeUv5mzRdk/G6rPUg0HABX9d0A== 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 4V0hBJ3QSCzX3g; Thu, 21 Mar 2024 10:13:44 +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 42LADip0032260; Thu, 21 Mar 2024 10:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADi4w032257; Thu, 21 Mar 2024 10:13:44 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:44 GMT Message-Id: <202403211013.42LADi4w032257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: fd6b1cc34e41 - main - libc/aarch64: Copy the trivial getcontextx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd6b1cc34e4175c1e223f42540debb74cfe3c3e6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fd6b1cc34e4175c1e223f42540debb74cfe3c3e6 commit fd6b1cc34e4175c1e223f42540debb74cfe3c3e6 Author: Andrew Turner AuthorDate: 2024-02-28 16:09:17 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 libc/aarch64: Copy the trivial getcontextx This will be used as the base of a non-trivial implementation. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44254 --- lib/libc/aarch64/gen/Makefile.inc | 4 +-- lib/libc/aarch64/gen/getcontextx.c | 73 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/lib/libc/aarch64/gen/Makefile.inc b/lib/libc/aarch64/gen/Makefile.inc index 5e4fccf143e4..4f4fb3d199bf 100644 --- a/lib/libc/aarch64/gen/Makefile.inc +++ b/lib/libc/aarch64/gen/Makefile.inc @@ -6,10 +6,10 @@ SRCS+= _ctx_start.S \ flt_rounds.c \ fpgetmask.c \ fpsetmask.c \ + getcontextx.c \ infinity.c \ ldexp.c \ makecontext.c \ _setjmp.S \ setjmp.S \ - sigsetjmp.S \ - trivial-getcontextx.c + sigsetjmp.S diff --git a/lib/libc/aarch64/gen/getcontextx.c b/lib/libc/aarch64/gen/getcontextx.c new file mode 100644 index 000000000000..b9d4522d96ee --- /dev/null +++ b/lib/libc/aarch64/gen/getcontextx.c @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2011 Konstantin Belousov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +int +__getcontextx_size(void) +{ + + return (sizeof(ucontext_t)); +} + +int +__fillcontextx2(char *ctx) +{ + + return (0); +} + +int +__fillcontextx(char *ctx) +{ + ucontext_t *ucp; + + ucp = (ucontext_t *)ctx; + return (getcontext(ucp)); +} + +__weak_reference(__getcontextx, getcontextx); + +ucontext_t * +__getcontextx(void) +{ + char *ctx; + int error; + + ctx = malloc(__getcontextx_size()); + if (ctx == NULL) + return (NULL); + if (__fillcontextx(ctx) == -1) { + error = errno; + free(ctx); + errno = error; + return (NULL); + } + return ((ucontext_t *)ctx); +} From nobody Thu Mar 21 10:13:45 2024 X-Original-To: dev-commits-src-all@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 4V0hBK66kyz5FkRP; Thu, 21 Mar 2024 10:13:45 +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 4V0hBK4RmMz457k; Thu, 21 Mar 2024 10:13:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016025; 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=Vt6ICX5uyutDcrhtOQVvDO1sU83HVtKf+VOsD/vzz24=; b=c+mhOHh43IDCdP9fR0OiOmeJSmUsouenlxmL0XLDV+WFXy/h9TjK/850/CsHpfDsUkesfq A8k15pHND+r5+te0+8ezC6QJmGlFpaBVOatUV32k4WkvU/YEofDpToRggwj6CMKJdX/LZm vad7mlu6mZS1tssXqdrJBi4sCNMWNsMW3T6kk4DiohO6QaV8P85tMApfupgscn6kenh74A FOtzFuiwEIBkwHUKmY7uXnNsfjoXsDB420682YvCKqsUixo2u/iXgyuV34uCYUHi9r6PZE +2WsjQOxKdkFKOz0CF58FDEj6uFcpQaKXieVYvQlzhDITtFgebKqncU0e8jz+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016025; a=rsa-sha256; cv=none; b=KYzUgiB5FjQ5hHUjtv54G8NjQXk6QVemcjE5AMxijveJUmswSluOy1Id8X5pJy3MkDgWwX WWH162kq0EuZ9B/N5YB3d+SE939R0sWhbaJx1WtzaAtPMvlStTuCU/vqYsNZJ/fHdtserj L94vvMyXMkGHIYLGZrP46jVBTb8XCFrLwUkwCOmZBSkz2kQJ6Zr8CVJXeynOC7+n5llzEo ca/ijIB/pJJ1oh9JbhgB0RhKkyZ6bQKR+ojUSti2ENM0DsDEiZ+mbq0bJ2GUzQ4xa6a3ME Hb6UlmUeSMl3LY0DdhpJc7F3LkVkkKHAGlIdLet1TH636o2DQwzZj/hW9KRcbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016025; 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=Vt6ICX5uyutDcrhtOQVvDO1sU83HVtKf+VOsD/vzz24=; b=MeFstHbyXCm6IWPV+a4GE/o9voUM6KXV2mu9aFZnGy4vizwWg/JcM1WelNxfKdHcDgXuUs o7SwtOBOTN8E3cnn3ZG0IhOLC8BHb2CkWSYug733dRaxfuMxW00EAdT1GHEIw4wVpo2nQK zYVrmW1HowPZJhYFCoF+kF0fgvA2C0VJ3Bk+fC9N3hGs04Bj1KF7lrT1V9bUCeKslb8VIV JAAmGm2EbG6Nzznh0eMXcbFFvEG18h+JMLNGb08IYkHRu1TtH2qjSplOlkQFlSzZ5bOQvg 9H5zeFW1jpy9GZ8A3Esit+xvTD7vWmOkLdb35JM/v/3yuvUcZxlhUJwQf1KPYg== 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 4V0hBK4316zXR5; Thu, 21 Mar 2024 10:13:45 +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 42LADjFS032302; Thu, 21 Mar 2024 10:13:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADjc8032299; Thu, 21 Mar 2024 10:13:45 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:45 GMT Message-Id: <202403211013.42LADjc8032299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5202ca77aaf5 - main - libc/aarch64: Add a non-trivial getcontextx List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5202ca77aaf552310bcbaccba750ee9f0888d0d8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5202ca77aaf552310bcbaccba750ee9f0888d0d8 commit 5202ca77aaf552310bcbaccba750ee9f0888d0d8 Author: Andrew Turner AuthorDate: 2024-03-06 12:51:18 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 libc/aarch64: Add a non-trivial getcontextx Add support for extra registers to the arm64 getcontextx. As no registers are defined this just adds the extra register list and an end context. Reviewed by: kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44255 --- lib/libc/aarch64/gen/getcontextx.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libc/aarch64/gen/getcontextx.c b/lib/libc/aarch64/gen/getcontextx.c index b9d4522d96ee..9972d3208d08 100644 --- a/lib/libc/aarch64/gen/getcontextx.c +++ b/lib/libc/aarch64/gen/getcontextx.c @@ -32,13 +32,26 @@ int __getcontextx_size(void) { + size_t size; - return (sizeof(ucontext_t)); + size = sizeof(ucontext_t); + size += sizeof(struct arm64_reg_context); /* Space for ARM64_CTX_END */ + + return (size); } int __fillcontextx2(char *ctx) { + struct arm64_reg_context *reg_ctx; + ucontext_t *ucp; + + ucp = (ucontext_t *)ctx; + ucp->uc_mcontext.mc_ptr = (uint64_t)(ucp + 1); + + reg_ctx = (struct arm64_reg_context *)ucp->uc_mcontext.mc_ptr; + reg_ctx->ctx_id = ARM64_CTX_END; + reg_ctx->ctx_size = sizeof(struct arm64_reg_context); return (0); } @@ -49,7 +62,10 @@ __fillcontextx(char *ctx) ucontext_t *ucp; ucp = (ucontext_t *)ctx; - return (getcontext(ucp)); + if (getcontext(ucp) == -1) + return (-1); + __fillcontextx2(ctx); + return (0); } __weak_reference(__getcontextx, getcontextx); From nobody Thu Mar 21 10:13:46 2024 X-Original-To: dev-commits-src-all@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 4V0hBN64sdz5FkpF; Thu, 21 Mar 2024 10:13:48 +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 4V0hBN0j1Gz4548; Thu, 21 Mar 2024 10:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016028; 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=1GEQyjjkIChFFSoauKF/ZwOYKeLnX8J/Rkm3JAHAOpE=; b=khdEWLWM8Z7o/KP+D/2PNCn71tzq3xNJvrxlk7CcuM6kaoxpINzqNiQRwsZZQDPewbHrvd Frsra6ZLg+YyCbITG0hD+gp8Zws0lW0RADXRs37ssxF9JXtT3+P71Qx+mqFXJNDMZlz5ZG 3qHO3RKJSEjnBRTGRHL8cWKSov5TfbuXHXxOAqhuLxLi8zT3RktfoZsMIOPRnYSSMQGPXs CpR+m6zRGeS2k7x1/0Y86RQ7Z6x8q4/zUZKuFGnCNCNJDrUFzawdZhTkK05GcKwk5GIEO5 bRSJTIk1cJQRrnf9Sx16MSHbfY4qXb8Qdko9ED6R7U26/9vimhiWZXxM+MU63w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016028; a=rsa-sha256; cv=none; b=iAf2Lx/8FQyO2h1u3B9ECFvA4UfR+CxzlGm954i0AfDQLY19H6Ic3MeHEfxebfL/3D4g1b OW4cANwYdz1jLh9/20nNjLPAwxRq/2ABA6mo7cW/RvgLP/w1xVo+CgSM62zrni3d4DODQ1 bMPmwAImVG/umKEuiHEBaFm/euA69KrfLEctqsBa6wf7feJye8P0wUctSz5nQ6mALxDbAg f4oT/HyOWQ2j0iqrwqvIZXtB7ZpEovi7HT1CeuPynFDOquZwy0p97Qlv/0+3vjiX5SnoaO NWIdzraFSq3pOShSfdJ7XT9H9O4rvpGJ7B+ZqR+3d995Y/Qw92Sfk16enmrQTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016028; 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=1GEQyjjkIChFFSoauKF/ZwOYKeLnX8J/Rkm3JAHAOpE=; b=jtan9RTET6JabqbY1Pqp2CG9+dVf+Ok6Xi+f897/scP/emHLZoMD9opRfnF6bjak2S+fN6 ehUd1TLl/lQk3B52RARKyGYqkGiEMYUfF8BX+Mp+5d8ecfQIgbWyJrxvDLIcnrQ6Tdnqvy A0MRf4K6ve+qmNDsnGbPr0CcaLSGMlU9XJbf6N8aKRWGYpficFLFQMpTfZjrMRXEE92xl5 Vq2qn9ARLOcCorBi70JULWeF2dgistb9dN2ovqdMmctNc5HEMO7apcRrVOKzAMQnn1rGqt gWPkWUch40q9Mkc9eFPvWjufItQKOUMTKuvVayIFbaMPFb+NJP2rTfb1T95wyA== 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 4V0hBL5d7XzXR6; Thu, 21 Mar 2024 10:13:46 +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 42LADk7I032353; Thu, 21 Mar 2024 10:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADk3F032350; Thu, 21 Mar 2024 10:13:46 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:46 GMT Message-Id: <202403211013.42LADk3F032350@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 12257233e8fd - main - arm64: Split out a savectx version of vfp_save_state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12257233e8fd94ab24e1a84ad87126af2a7be33b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=12257233e8fd94ab24e1a84ad87126af2a7be33b commit 12257233e8fd94ab24e1a84ad87126af2a7be33b Author: Andrew Turner AuthorDate: 2024-01-03 17:41:42 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 arm64: Split out a savectx version of vfp_save_state Rather than try to detect when vfp_save_state is called by savectx use a separate function that sets up the pcb as needed. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43304 --- sys/arm64/arm64/swtch.S | 4 +--- sys/arm64/arm64/vfp.c | 42 ++++++++++++++++++++++++++---------------- sys/arm64/include/vfp.h | 1 + 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 4c9851da3dc6..9c43de3a9eae 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -270,9 +270,7 @@ ENTRY(savectx) /* Store the VFP registers */ #ifdef VFP mov x28, lr - mov x1, x0 /* move pcb to the correct register */ - mov x0, xzr /* td = NULL */ - bl vfp_save_state + bl vfp_save_state_savectx mov lr, x28 #endif diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index ced1a446f0a8..749d5b81bfc8 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -166,25 +166,11 @@ vfp_restore(struct vfpstate *state) : : "r"(fpcr), "r"(fpsr), "r"(vfp_state)); } -void -vfp_save_state(struct thread *td, struct pcb *pcb) +static void +vfp_save_state_common(struct thread *td, struct pcb *pcb) { uint32_t cpacr; - KASSERT(pcb != NULL, ("NULL vfp pcb")); - KASSERT(td == NULL || td->td_pcb == pcb, ("Invalid vfp pcb")); - - /* - * savectx() will be called on panic with dumppcb as an argument, - * dumppcb doesn't have pcb_fpusaved set, so set it to save - * the VFP registers. - */ - if (pcb->pcb_fpusaved == NULL) - pcb->pcb_fpusaved = &pcb->pcb_fpustate; - - if (td == NULL) - td = curthread; - critical_enter(); /* * Only store the registers if the VFP is enabled, @@ -202,6 +188,30 @@ vfp_save_state(struct thread *td, struct pcb *pcb) critical_exit(); } +void +vfp_save_state(struct thread *td, struct pcb *pcb) +{ + KASSERT(td != NULL, ("NULL vfp thread")); + KASSERT(pcb != NULL, ("NULL vfp pcb")); + KASSERT(td->td_pcb == pcb, ("Invalid vfp pcb")); + + vfp_save_state_common(td, pcb); +} + +void +vfp_save_state_savectx(struct pcb *pcb) +{ + /* + * savectx() will be called on panic with dumppcb as an argument, + * dumppcb doesn't have pcb_fpusaved set, so set it to save + * the VFP registers. + */ + MPASS(pcb->pcb_fpusaved == NULL); + pcb->pcb_fpusaved = &pcb->pcb_fpustate; + + vfp_save_state_common(curthread, pcb); +} + /* * Update the VFP state for a forked process or new thread. The PCB will * have been copied from the old thread. diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 8c3d56918822..7f4c86e7737d 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -78,6 +78,7 @@ void vfp_new_thread(struct thread *, struct thread *, bool); void vfp_reset_state(struct thread *, struct pcb *); void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); +void vfp_save_state_savectx(struct pcb *); struct fpu_kern_ctx; From nobody Thu Mar 21 10:13:47 2024 X-Original-To: dev-commits-src-all@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 4V0hBQ5Q9lz5Fkrk; Thu, 21 Mar 2024 10:13: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 4V0hBN3YHJz456b; Thu, 21 Mar 2024 10:13:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016028; 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=MFMkFnpWXmnFW6xdcNrNLCAVuQNcW+vHJcnv/0dgi8s=; b=EYKJ+IsyyJXXt0FRV3SCe9ALOrahfimvBQib5oEfR1LA+AQuknYzS2cFZOKi1ceGN61/dx dXXwGc4thcMa7g5EXSjbbLDYI9mOihDoPtAlnbz68BLnHyLJpAq7vYB8hNNjjIUOBR8CT4 vvjvxsloeBeEd8IMrTtipMG0ClD3uIzS3w+K6ff9nwuvIDU9mnsSByjeBPCK5xSrI4M8m2 UC6KLpuA9cKYO+/F5qJnzg+ZzYOblXqsACEytAfc7mI0QzGEN5Afecf8EsQdfG/T2VT4Hl bP1GoG++QUrILFgLKgJFC5hTGFm9CEi4iYThEHlbJ/HntITVRRqXy6t/8ZeiVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016028; a=rsa-sha256; cv=none; b=LERIZ8NXjYmJyXSBUn4h206Ixqj98/NRw0CWqbPSZBh04StCNg4iDTKW330UvCJx98g44X sE7If/29MDxEzsyttrx1ZSGr+T0pLFzX4BAuvMdRO3giP6pPLYAjSRdZ4iBTYx1dG9uB+u eJg88qJbL8t5OEEKyFA052hQIgTcUs+daj0Ssw/icbKFd7J8mjdk5tJB9c+9xxblIhEUMF D0zGbwynAykBFY+Ls0l0r66ws00ZflY1vxlIJuhTV6txBmy5OUyp9i+gvA5NLTH2ixXaG8 fRAz54GsxFnOzGRVNaims60X4ajFqlYHB2vNmhfOQxhKxUph6LnvLGIM0luAHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016028; 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=MFMkFnpWXmnFW6xdcNrNLCAVuQNcW+vHJcnv/0dgi8s=; b=jyMdyhbLUBQdoFqda6cY89yyU0/kE1DHTVYB3K8DyTnWinj1MTDn4V5eyBtmzFavfrJyr/ FqGIL5uUmsxUY2fQo15sIoxJoTMKKuuDlN7vhdmxgt7gENYN/OQ4i7735mAEh/e000gcRh /dYLq25lK8OIuPDk2UQDrIKwL6XNPqxC1xv3IQbX/cvWLWUDTV0Stl08TP4/cLxkUfrs5T EV+pjAEp1Lzu7FGPFoNGWaOJOZKY4dVd1Q+62Jf6VFZDXb03Tkb22N/Nj9c/Ykd28Q4f4j O5JB4C2WyIHdRDM8S5wVtC/RLzHT5vOL9NJnqbei2zKgRetXSgtjgVvnbrIDvQ== 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 4V0hBM6f7jzX87; Thu, 21 Mar 2024 10:13:47 +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 42LADl38032403; Thu, 21 Mar 2024 10:13:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADloU032400; Thu, 21 Mar 2024 10:13:47 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:47 GMT Message-Id: <202403211013.42LADloU032400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ed3c6cd76de8 - main - arm64: Mask non-debug exceptions when single stepping List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed3c6cd76de8560c46607abe506a03568e9acab2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3c6cd76de8560c46607abe506a03568e9acab2 commit ed3c6cd76de8560c46607abe506a03568e9acab2 Author: Andrew Turner AuthorDate: 2024-03-14 14:02:56 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 arm64: Mask non-debug exceptions when single stepping When an exception is pending when single stepping we may execute the handler for that exception rather than the single step handler. This could cause the scheduler to fire to run a new thread. This will mean we single step to a new thread causing unexpected results. Handle this by masking non-debug exceptions. This will cause issues when stepping over instructions that access the DAIF values so future work is needed to handle these cases, but for most code this now works as expected. Reviewed by: jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44350 --- sys/arm64/arm64/debug_monitor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c index b8164b70c5c8..480a6da817a2 100644 --- a/sys/arm64/arm64/debug_monitor.c +++ b/sys/arm64/arm64/debug_monitor.c @@ -193,6 +193,15 @@ kdb_cpu_set_singlestep(void) ("%s: debug exceptions are not masked", __func__)); kdb_frame->tf_spsr |= PSR_SS; + + /* + * TODO: Handle single stepping over instructions that access + * the DAIF values. On a read the value will be incorrect. + */ + kernel_monitor.dbg_flags &= ~PSR_DAIF; + kernel_monitor.dbg_flags |= kdb_frame->tf_spsr & PSR_DAIF; + kdb_frame->tf_spsr |= (PSR_A | PSR_I | PSR_F); + WRITE_SPECIALREG(mdscr_el1, READ_SPECIALREG(mdscr_el1) | MDSCR_SS | MDSCR_KDE); @@ -214,6 +223,9 @@ kdb_cpu_clear_singlestep(void) KASSERT((READ_SPECIALREG(daif) & PSR_D) == PSR_D, ("%s: debug exceptions are not masked", __func__)); + kdb_frame->tf_spsr &= ~PSR_DAIF; + kdb_frame->tf_spsr |= kernel_monitor.dbg_flags & PSR_DAIF; + WRITE_SPECIALREG(mdscr_el1, READ_SPECIALREG(mdscr_el1) & ~(MDSCR_SS | MDSCR_KDE)); From nobody Thu Mar 21 10:13:48 2024 X-Original-To: dev-commits-src-all@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 4V0hBV0hhJz5Fkdb; Thu, 21 Mar 2024 10:13: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 4V0hBP6xBFz4503; Thu, 21 Mar 2024 10:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016030; 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=xZbsVbqHpFwo7UBEA16hxe49GH1bf5DYg0fjkB2zCuI=; b=LbGcKjC8GFq4tXF7wUVTW7fhG8Vn49r/0UU7jkWai2wxACQdGz1IjLNfECxKkfJioOdcBv AZydRrKk6xpERG8ZabxZDE98RkLGSh/or/JZsRG6OpowqqKj74yDTIdSsS5XxfCXlYU4Et WB7uOAJixk/vjgUl2YmzuEeMYJ3IbuxDAysSNoaPRWN0tHsBvqZBUBZwdKFCmLyPsGzDih hWeGlOm4+yNvb7LJU+rxxr2Sro2NU2ur+yUiEr47harq6bYAoHaxD1OCgJeQC4eMFui/Oy rj7IHPyxiayggf226ywQYv9uG+BQnEZM2tXjzMME6mqOCavEl8hMQfUNTwa6gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016030; a=rsa-sha256; cv=none; b=BeZqzWSWU9LAykpdgQ0ZwTPrnavXt0jl9Pe0CaZ1a7QJoAl3joS2Q79hzkq7f94SUaFivE e0PdBdI1N/OMXGid6QDDAvVLrwKpkw2BrzQ6WJaw2BXGo1chM5FPYWv8wn8VEyKwwZr6id BwSdgq4NVcF73+N5XlXmdHurfBHHpVHepwNc9gx3R4LqYUU80i0LzHX8SAOdLrBeGczo7v 0aH/MXLZG/tCna56nhzJgGBlvr2iiiQ+scCpgLTZyg5881uAgfIKJdxudgJLUKeHAqn6qI FHPMgE5w40L2sNP5drIPdylPXsyMDLpvutlf+6TN52/PZDN+HVzYdo+16nDkvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016030; 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=xZbsVbqHpFwo7UBEA16hxe49GH1bf5DYg0fjkB2zCuI=; b=aGOyAtV5G9X3FRh8r3a8d70kXcyVTI/+Mf/7IqyV6Uh1vpI2d5zs0ENpTBS9bNMS6kZVm+ E8sM/IjLeqRu8bLK8dTnnQ5WqZTjsAaNTeVgUcK5iBvc5nW8OD4Oxn5fCtqqGTWfILHjPo DUobBRBUaKequux21QGRJIFZ+X9nR9SzJKZGzSriWPCSUGZeRm+KWhYFofC175HuqSQdyo 45zylvTaDo+NWqoFcfx8RcNv++l7U8gA5I/amhiGJeuxIrysCNugUBUe6r/CttIAHesFZM XfngAG9beGeRaVvv4zriarQCKcy1wgDRdMdvf/q8xO9GDE/X8RIa9yTrYr4HDA== 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 4V0hBN6vqQzXR7; Thu, 21 Mar 2024 10:13: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 42LADm2B032458; Thu, 21 Mar 2024 10:13:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADmeQ032455; Thu, 21 Mar 2024 10:13:48 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:48 GMT Message-Id: <202403211013.42LADmeQ032455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2e2c983d5234 - main - arm64: Always set the debug control and value regs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e2c983d5234cb5457548fc75608d93b2309b254 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2e2c983d5234cb5457548fc75608d93b2309b254 commit 2e2c983d5234cb5457548fc75608d93b2309b254 Author: Andrew Turner AuthorDate: 2024-03-12 16:34:41 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 arm64: Always set the debug control and value regs When listing watchpoints we read the raw registers. To ensure we print an accurate list always set the watchpoint and breakpoint registers. Sponsored by: Arm Ltd Reviewed by: jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44351 --- sys/arm64/arm64/debug_monitor.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c index 480a6da817a2..3d8e753e1c45 100644 --- a/sys/arm64/arm64/debug_monitor.c +++ b/sys/arm64/arm64/debug_monitor.c @@ -495,23 +495,24 @@ dbg_register_sync(struct debug_monitor_state *monitor) if (monitor == NULL) monitor = &kernel_monitor; + for (i = 0; i < dbg_breakpoint_num; i++) { + dbg_wb_write_reg(DBG_REG_BASE_BCR, i, + monitor->dbg_bcr[i]); + dbg_wb_write_reg(DBG_REG_BASE_BVR, i, + monitor->dbg_bvr[i]); + } + + for (i = 0; i < dbg_watchpoint_num; i++) { + dbg_wb_write_reg(DBG_REG_BASE_WCR, i, + monitor->dbg_wcr[i]); + dbg_wb_write_reg(DBG_REG_BASE_WVR, i, + monitor->dbg_wvr[i]); + } + mdscr = READ_SPECIALREG(mdscr_el1); if ((monitor->dbg_flags & DBGMON_ENABLED) == 0) { mdscr &= ~(MDSCR_MDE | MDSCR_KDE); } else { - for (i = 0; i < dbg_breakpoint_num; i++) { - dbg_wb_write_reg(DBG_REG_BASE_BCR, i, - monitor->dbg_bcr[i]); - dbg_wb_write_reg(DBG_REG_BASE_BVR, i, - monitor->dbg_bvr[i]); - } - - for (i = 0; i < dbg_watchpoint_num; i++) { - dbg_wb_write_reg(DBG_REG_BASE_WCR, i, - monitor->dbg_wcr[i]); - dbg_wb_write_reg(DBG_REG_BASE_WVR, i, - monitor->dbg_wvr[i]); - } mdscr |= MDSCR_MDE; if ((monitor->dbg_flags & DBGMON_KERNEL) == DBGMON_KERNEL) mdscr |= MDSCR_KDE; From nobody Thu Mar 21 10:13:50 2024 X-Original-To: dev-commits-src-all@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 4V0hBV0mpfz5FkNv; Thu, 21 Mar 2024 10:13: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 4V0hBQ5TY2z4505; Thu, 21 Mar 2024 10:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016030; 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=SL0EWkbHlKh5YV0ZJHGRmAqz0yALlxPg2tQGfsgGeW8=; b=rZ6ueoq+usrfxDLeDTD7mt2ElGXkskLaKz62N+a/ZGDUVMDIEYwHSmg1PU6e93p0eKo9TO UoRASfqAc+NvRZGRmm2+NPed8JrCb+hmqYM3TMD6RSlHuTcRaku/mAecMDzn3JfYSxfIJ1 UxFL7y4KIVTYol3DzKtnTIWBmLoKTE2i+nZxtgO/9qDffgK4bh+hBBxYhY6iy3wwo6zbhV Ic3hT50swNJ9PJRUOmamk2zrhUoL1LHYr/lwIxJjDGp6IyTTJ0CTwW9Fd+ZJLw1HmywNNg vWdbnyYO6/iXlsrI9CBx5obvSBN4bZN6CS1fb4/Wn+4MPdK5ed6UpLgxPa2VMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016030; a=rsa-sha256; cv=none; b=ZXrXUYypqOmCXiLs3G6tNq4f/pRtRKS38+MGvleqjQJRNAkRiFtswNfUKMU9oqVCoqPJxz iUlGhmijhv9UnkMEOV5Il6cJthxzHzeQGRxHFjdWl0RUZHnK++AHzT6cnDYrQBmloavhIh zY3Q6RTnIuR85HetsWJq5IVxDGl7FUeN3n2DIiljcwwDAnS1RV5GrSwVbbp2BnQ6PEsKOv wDxHGMgOdY1ujhCbrdqaJPnl0M9H0ZOBoqvAuUnuN59Wrxdk7trT7gUpHuJMRle9rFVSqr dlZ/Nk1g+ZzchylSQqp+1DAhf9tbOGNd8mrmc07cMrECxo/KHsVFyF3oWSaTgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016030; 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=SL0EWkbHlKh5YV0ZJHGRmAqz0yALlxPg2tQGfsgGeW8=; b=cxU+zK58umQ843g5CsXDEN5w3Y8IQimQ3fs4J2eyPFbAMTNY8R1KNsAj4PyeCll0NSpSl7 1fvL70hCkoLG+qzPXZscaFtojZCFutIkiZ2dUbMoclimVq5HVj9ZGO6NtnacOba9pOCMTc 3hWzdz+Iy1kwE8l7HELUgSYQiqvnubQvGa+Bul+sQIwbZLdixwUnhZ/n0rHdORmDfmWoMB BZuiHqWEeHcs6jdQB6LpTE37R9DJOFYvL38sWu2+txXf70a653kClMWgKl2qpl4SMNQP7u Sq8xeKDw2ge13Kro6KGG2wC/XrDvunDA0KwO/QQbR9/wytAP2/6FtLoN8AAMaQ== 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 4V0hBQ1Z4VzWmj; Thu, 21 Mar 2024 10:13: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 42LADo8n032521; Thu, 21 Mar 2024 10:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADoY6032518; Thu, 21 Mar 2024 10:13:50 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:50 GMT Message-Id: <202403211013.42LADoY6032518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d93b3a65f769 - main - arm64: Use a switch to decide when to enable debug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d93b3a65f7697630ca1dd2635fc976f3ef36b602 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d93b3a65f7697630ca1dd2635fc976f3ef36b602 commit d93b3a65f7697630ca1dd2635fc976f3ef36b602 Author: Andrew Turner AuthorDate: 2024-03-12 16:47:38 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 arm64: Use a switch to decide when to enable debug Use a switch statement to decide which exceptions we need to call dbg_enable for. This simplifies adding more esceptions to the list in the future. Reviewed by: jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44352 --- sys/arm64/arm64/trap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index c0066ae7dcad..ec4598c5356f 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -498,9 +498,15 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) * Enable debug exceptions if we aren't already handling one. They will * be masked again in the exception handler's epilogue. */ - if (exception != EXCP_BRK && exception != EXCP_WATCHPT_EL1 && - exception != EXCP_SOFTSTP_EL1) + switch (exception) { + case EXCP_BRK: + case EXCP_WATCHPT_EL1: + case EXCP_SOFTSTP_EL1: + break; + default: dbg_enable(); + break; + } switch (exception) { case EXCP_FP_SIMD: From nobody Thu Mar 21 10:13:51 2024 X-Original-To: dev-commits-src-all@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 4V0hBV1lHvz5FkRt; Thu, 21 Mar 2024 10:13: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 4V0hBV05f8z44t3; Thu, 21 Mar 2024 10:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016034; 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=aIHstsVxCfn0DKIZsVU7fR9OuSRPWqemneMw3O717kQ=; b=gAZp8DNWCqBNHPimQtxtrBKVIl0tVhKqn8zGGkVytx1A2c+6Wet+mydDsDaPZp4VTUYr38 pYrszGifLS+1E1T5SKPU7re5B4G6JqBHsGCADhuYiORnEGxjYZ6tEZF43f+EKxjVAgtf1D zN0VBu/PAYH1LBFwsugGKl20TgKW1p3nkvvAvIiieWdBfG+utUE0hfxvPA8ACij1HJp//Q AbdkIs4FYeTBAgK8noO7oYnyg8T5dyjXLOrCDuOXzk8bHssLkQIsggciLx9DTqamvxo3lo g2sSR8BKVOCn/c6YV7WLf74pdsRKRjlQpCjOJJH5QAENxOc56oPyeaznMNXBxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016034; a=rsa-sha256; cv=none; b=NlOktwyat/tWmz0XHi0mRtjSvE2NExEG+eoFFOXYLcUREjlC+9mrj0l47tUF02RmR2Ox2j H282U16y+ZkCqJbxy7EhgS2+QWPBiUejUOVys6jVZbnINquC6BD/BiguTDIR2q+SFoAyTm p++55yreKmDAoVZp3iK6usCE60To+5phNjifsmdUnxpgVVBiULriH1oG16Hcjl8OhWOVKJ hAGZyeSQf6uAhGUJOacAFER6FPhUU7Kl4jgQngmax/13mHBrSWLQQzec9FijHqj+j3HMql yk9LbOBt/u2yH4YdILOg7HXMju4zS3IPcaRl/cj5cc1ib+GXRruwi96l6YxVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016034; 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=aIHstsVxCfn0DKIZsVU7fR9OuSRPWqemneMw3O717kQ=; b=CJdLX35uFm6UF/FuQ2OdulMXqkd1qZR6hpMULj8q4XNj7AH4vyWEyJyA11UD6gRlGLERRl ZnW7h8/ZqMR5lmwqHGNGNU3r53bIMwvNevlaaMlbkMjCD86VfRctdzOFsdiil09VGcmPCn FZZm1aw6MG29jsnePWk3+6XfZOwd7zZxdxsztoPYlgQIFh5ko0GQ4/fdI9YyXpbKC3/DYF x3db0EIpCh1kleKGd/zzvNgo38wPds36U8/z6SlUPc7pzCARHrBbkXJsSsaVokREZiwuFW eaH9Sc9gat80WRxBg3ZMrNpbkwf9KeKWjGeiKUcD8pkO6UHrLaO0VGyONehmfA== 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 4V0hBR35ByzXBR; Thu, 21 Mar 2024 10:13:51 +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 42LADpOc032566; Thu, 21 Mar 2024 10:13:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LADp2B032563; Thu, 21 Mar 2024 10:13:51 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:13:51 GMT Message-Id: <202403211013.42LADp2B032563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c802b486ddfd - main - arm64: Add EL1 hardware breakpoint exceptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c802b486ddfd796ea35b770148af9a5b0cd0ee64 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c802b486ddfd796ea35b770148af9a5b0cd0ee64 commit c802b486ddfd796ea35b770148af9a5b0cd0ee64 Author: Andrew Turner AuthorDate: 2024-03-12 16:50:04 +0000 Commit: Andrew Turner CommitDate: 2024-03-21 10:13:24 +0000 arm64: Add EL1 hardware breakpoint exceptions Reviewed by: jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44353 --- sys/arm64/arm64/gdb_machdep.c | 1 + sys/arm64/arm64/trap.c | 2 ++ sys/arm64/include/armreg.h | 1 + sys/arm64/include/db_machdep.h | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gdb_machdep.c b/sys/arm64/arm64/gdb_machdep.c index dcfc91b33eb7..7b21675ea927 100644 --- a/sys/arm64/arm64/gdb_machdep.c +++ b/sys/arm64/arm64/gdb_machdep.c @@ -110,6 +110,7 @@ gdb_cpu_signal(int type, int code __unused) switch (type) { case EXCP_WATCHPT_EL1: case EXCP_SOFTSTP_EL1: + case EXCP_BRKPT_EL1: case EXCP_BRK: return (SIGTRAP); } diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index ec4598c5356f..6cc1933095c8 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -500,6 +500,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) */ switch (exception) { case EXCP_BRK: + case EXCP_BRKPT_EL1: case EXCP_WATCHPT_EL1: case EXCP_SOFTSTP_EL1: break; @@ -551,6 +552,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) panic("No debugger in kernel."); #endif break; + case EXCP_BRKPT_EL1: case EXCP_WATCHPT_EL1: case EXCP_SOFTSTP_EL1: #ifdef KDB diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 41ab55a49c76..9391b1e2c1b7 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -439,6 +439,7 @@ #define EXCP_TRAP_FP 0x2c /* Trapped FP exception */ #define EXCP_SERROR 0x2f /* SError interrupt */ #define EXCP_BRKPT_EL0 0x30 /* Hardware breakpoint, from same EL */ +#define EXCP_BRKPT_EL1 0x31 /* Hardware breakpoint, from same EL */ #define EXCP_SOFTSTP_EL0 0x32 /* Software Step, from lower EL */ #define EXCP_SOFTSTP_EL1 0x33 /* Software Step, from same EL */ #define EXCP_WATCHPT_EL0 0x34 /* Watchpoint, from lower EL */ diff --git a/sys/arm64/include/db_machdep.h b/sys/arm64/include/db_machdep.h index f1f638a7882c..45b97443aec5 100644 --- a/sys/arm64/include/db_machdep.h +++ b/sys/arm64/include/db_machdep.h @@ -36,6 +36,7 @@ #include #define T_BREAKPOINT (EXCP_BRK) +#define T_HW_BREAKPOINT (EXCP_BRKPT_EL1) #define T_SINGLESTEP (EXCP_SOFTSTP_EL1) #define T_WATCHPOINT (EXCP_WATCHPT_EL1) @@ -56,7 +57,8 @@ typedef long db_expr_t; #define db_clear_single_step kdb_cpu_clear_singlestep #define db_set_single_step kdb_cpu_set_singlestep -#define IS_BREAKPOINT_TRAP(type, code) (type == T_BREAKPOINT) +#define IS_BREAKPOINT_TRAP(type, code) \ + (type == T_BREAKPOINT || type == T_HW_BREAKPOINT) #define IS_SSTEP_TRAP(type, code) (type == T_SINGLESTEP) #define IS_WATCHPOINT_TRAP(type, code) (type == T_WATCHPOINT) From nobody Thu Mar 21 14:19:19 2024 X-Original-To: dev-commits-src-all@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 4V0ndh0hhkz5DkKp; Thu, 21 Mar 2024 14:19: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 4V0ndh09sSz4Z8V; Thu, 21 Mar 2024 14:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711030760; 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=349cKPnbhF6hCgcHJ5Uw/T+LZLDDk25osyKBGPTdZzw=; b=QM0+akfAVtn5oHK4rpMhEiMhd9FHSHSxrzT9PxlCgKjssDVFvOE8cNA2CPnVTQfpZcQ8XP KOE2ez21Jbg7jKBJaOCNUzgEw89j/qgMmD7koEjHoXTNkbBU2paPP5xspJI/l/USUblB15 MB0J3A/yKglbjpvc74K8LQerb1UqOmH84vZBdTafQxmwXSfFb/W0M9znzjE8eHfDdICMUB eahtdQB/rm8ORdNHRQgzCx8W+htSjmHVBqqa98zAWivyD6eqgie1Gq9tWIztzoYs6B7Hkv +1mKTNoMeCL+T+IGXYZCSLyXOzVGRCzu2QEO0vgzPlqRLIfEOxVTTwAFT+wGYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711030760; a=rsa-sha256; cv=none; b=OlWVC6Skuw8/1shQG7c/BodUax84DqpE0IHTEmSd15gvY45vhvdzLSkzf6+WLJVFnp4dS5 YYmTTUIH7EcgOQNh/am7reiMJwSWoP9tV1eb6cOYz8nl8CutP4UqvmlAeeejgzMCGBD0LM sLn1ibh7QjmYQDJQUpnGT1sYJsZKX2Zhv4ZntosmApP45Ka2Bmtd3GeBosEdM+oYGDRpTP VRRrYWgHpCRIn5qYqzSmaGJV28cLq/w3ovzAHiUV5VW64ygtqUmhtbtOPEWzf+gBklH47y eu7FbLR5kQjzij8ij+j58iTlurnl2hXdwG9p/LVR9JeiwuGYtGKqdBqz7zhYJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711030760; 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=349cKPnbhF6hCgcHJ5Uw/T+LZLDDk25osyKBGPTdZzw=; b=Jl7gEv9Gnw30gniCFqg2re7noxjHSgVVA7/MMfRUGoUZ0qjl5siTdwxDMJ9wsbsmaYSgDS Gf225iuboS/CGanK7BwXuHfiAWRxRJyiXPXVd4BEXnYRFtZ9kY0s5YCiStQs258r0cRsfj qK9clxbbi6GzSbu/S88dpa9jAvLmPN01L82abY6UtZ/iY3ir7Rdcim5qXBnTFE146UmasW Njdy9lLHWHFYb6r2tt8jWYyvn+rXYGOCPKoNZkGPl8K1+QcU7Xi3CpEAYo/gY23SfUs3Sg Ljrdmw4PAnatAUSv3ynkBufuCiHST1NzU+JAB0H3ZMPm1xVFgmVN9sQlgNSg2Q== 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 4V0ndg6mqFzf9K; Thu, 21 Mar 2024 14:19: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 42LEJJEK037991; Thu, 21 Mar 2024 14:19:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LEJJDD037988; Thu, 21 Mar 2024 14:19:19 GMT (envelope-from git) Date: Thu, 21 Mar 2024 14:19:19 GMT Message-Id: <202403211419.42LEJJDD037988@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: 501f7e7bf847 - main - em.4: add interfaces to name section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 501f7e7bf847c66e3869b533805e76897e4685b9 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=501f7e7bf847c66e3869b533805e76897e4685b9 commit 501f7e7bf847c66e3869b533805e76897e4685b9 Author: Alexander Ziaee AuthorDate: 2024-03-20 17:15:51 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 14:16:24 +0000 em.4: add interfaces to name section Improving first-glance comprehension that this manual page applies to igb/lem interfaces provided by the em(4) driver. While here, tag SPDX, link the framework, and shuffle a sentence to fix linter warning. Co-authored-by: mhorne Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1134 --- share/man/man4/em.4 | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index 13bbfbf148bc..0e9c08560545 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2001-2003, Intel Corporation .\" All rights reserved. .\" @@ -29,11 +32,13 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd August 3, 2023 +.Dd March 20, 2024 .Dt EM 4 .Os .Sh NAME -.Nm em +.Nm em , +.Nm lem , +.Nm igb .Nd "Intel(R) PRO/1000 Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, @@ -72,9 +77,9 @@ Controller Hub (ICH) and Platform Controller Hub (PCH) including Intel The .Nm driver provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82575, 82576, 82580, i210, i211, and i35x. These -appear as -.Cm igb +based on the Intel 82575, 82576, 82580, i210, i211, and i35x. +These appear as +.Nm igb interfaces to maintain compatibility with existing infrastructure. .Pp The driver supports Transmit/Receive checksum offload and Jumbo Frames @@ -319,7 +324,12 @@ The device driver first appeared in .Fx 4.4 . .Nm -was merged with the lem and igb device driver and converted to the iflib +was merged with the +.Nm lem +and +.Nm igb +device drivers and converted to the +.Xr iflib 4 framework in .Fx 12.0 . .Sh AUTHORS @@ -328,7 +338,11 @@ The .Nm driver was originally written by .An Intel Corporation Aq Mt freebsd@intel.com . -It was merged with igb driver and converted to the iflib framework by +It was merged with the +.Nm igb +driver and converted to the +.Xr iflib 4 +framework by .An Matthew Macy Aq Mt mmacy@mattmacy.io and .An Sean Bruno Aq Mt sbruno@FreeBSD.org . From nobody Thu Mar 21 14:43:19 2024 X-Original-To: dev-commits-src-all@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 4V0p9M3RBnz5DmlC; Thu, 21 Mar 2024 14:43: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 4V0p9M2qv2z4cmm; Thu, 21 Mar 2024 14:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711032199; 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=miL9/EGMBFcTG/wrrkGchO/3yTvA8NxbtDX2uEq0eB8=; b=MntSKTYKnfy2VUlRE5aDJPHrnXF0kifX9dJftIzLkLdHHqGWrX6W5sO/xLQNZfkHl81/wF SsPbKBkT3k24u4cqU35YqVBDReXRAJ0ptVpwH2PG/GL5WLxbTCvIVPujWuVcw7JjriFNfv BFbMLqBTVE6fiHq0rnpcb/SKdMqJwPfr2IIWHPBMDrg2+YvqQ+cnsmBrNsH37ZUngLPXAn 4gs47GwAeV+BAIzFotDbwMp7Bzwt4l4RC0a4JWm2siAtMflXvKn8rryCdi/d3KwndkAGeJ /tTMoqStEtr5pvOZosQFX0efxSZZ5efSqxKNhI+hSOC9riBLuuPE0PLr0hWVWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711032199; a=rsa-sha256; cv=none; b=OCQT1kuVaC3FIf3Yu31qB+PK11SM24WMovxwdspV0Ag/F5W5M7uKalDJqnUlsO0EFmdYLe ugUa0mahn30cLYuyiv5xjENMlydtssTkIc2ndToONJfXYMcAzjx7KicMwohYgWrwQpfXqp yAxe+t2sUODNm9wiwLURvMvl4BjXQ57nPn1BsXg8MaNd93ZPXiflgx287+QOiYpki4CFf9 ZO80gLgyELq4LMcUE+lwbKwPTGOLCqA9RgcnE2tynPmXRg0kFL7TsHNnbzqOaxFGG8b6P7 hs2K8YndLCrJPmjkvxuXYVM034Zo+To6BYenFlNkEu33PvQ4upo1e/d1kBIXuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711032199; 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=miL9/EGMBFcTG/wrrkGchO/3yTvA8NxbtDX2uEq0eB8=; b=iz0mqfgOuGBpu6SDfrLHCbsOvX71+yO7ZZBuBt38YJgAaSz8ZqrtnrLZlWk6LA2ZEtxdT6 0lVXMy0MIAgGEz/vsKrS2aaUEY/l9cbLJJxi0xbaiuw/+E3BUWGoyYWoK+Sj8VVjslolft G+x03BgvrRrjYOxvJL8q3vYK3JYOHmAy6XNf+q3/+2pYPZYlmDBPT3jDd69iEfWJiMg9Gl M/tA7dFVq8DJlNXbtZadKpJrL6Ba5BDiNr0B9btP66brPK8Qf5xifIIL+wbtNuLh8sVhJP J9AihQvrpsKpeFiBWVZHnNdTJxBUkPAsVulN47WMMPnzoVv9P5DtGgoyjdM0DQ== 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 4V0p9M2RbmzfDb; Thu, 21 Mar 2024 14:43: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 42LEhJnn087013; Thu, 21 Mar 2024 14:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LEhJhV087010; Thu, 21 Mar 2024 14:43:19 GMT (envelope-from git) Date: Thu, 21 Mar 2024 14:43:19 GMT Message-Id: <202403211443.42LEhJhV087010@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: 8b864151856f - main - cp: Remove useless ssize_t cast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8b864151856fbba97fed16b1200248cf9f6f3ccf Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8b864151856fbba97fed16b1200248cf9f6f3ccf commit 8b864151856fbba97fed16b1200248cf9f6f3ccf Author: Collin Funk AuthorDate: 2024-02-13 02:52:58 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 14:43:04 +0000 cp: Remove useless ssize_t cast Both wcount and wresid are ssize_t so this cast is not needed. Just remove it so the code is easier to read. Signed-off-by: Collin Funk Reviewed by: emaste, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/1116 --- bin/cp/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 80a0c1fce824..6c99d4c63f4a 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -91,7 +91,7 @@ copy_fallback(int from_fd, int to_fd) wcount = write(to_fd, bufp, wresid); if (wcount <= 0) break; - if (wcount >= (ssize_t)wresid) + if (wcount >= wresid) break; } return (wcount < 0 ? wcount : rcount); From nobody Thu Mar 21 15:25:27 2024 X-Original-To: dev-commits-src-all@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 4V0q5z2nYvz5DsHx; Thu, 21 Mar 2024 15: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 4V0q5z2GTbz4k2C; Thu, 21 Mar 2024 15: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=1711034727; 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=BhUBi23isEUGt+AP4eQnnAu+3zg7Vf/hytimcSCRYAg=; b=Bchtrft2M+/prfdtGnSTNTbBMHlwwNdqQemXjnpN8rbOqptpZEhWUPJPhO3M9rh2CXZH3g GvjW8wYoQzi+GFUBkaUDLnW87oQkAKnF+S9VRmbF9KIoKNhR+qqgwzvMTarmyevYtt8BSS CqhSLGGY/Vtvw1Nt1cA6P8s/VXSYuy53ss3rxYzCT8RhaTsZXzMOrF01RAZDpw1ErVJ3+l 8xpWk/+uCIOKjU4uLhkDwImkbcDyih7s1rLmjXsLiZ6wp40uH2HEO/SLxvweUQnKs/9ntI obYuO6ib8HdRvWWiTmddWoPtFkdx2p/uE+gIpnNBIXG0hCyWoaibEGBm3OblxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711034727; a=rsa-sha256; cv=none; b=d6v+nktcSmIvJoKvN0CP305iT0jijEG+hdYY//ya9sx7jcCzuThMTvgKMpVVuFnlqPApf9 2ElQpK9oQlhxmx16s2fj0+UwWgVMnIOHf0vY/5AbMuREMAwdtmB5Yfw1EH1iJheF8fYNHV bUPRupPyJ7Esn40Wpxhh6CfONkM14/rclamPTDYjqpA89CZhDMwzqU9W/oxnnayIpE7eLy MkpSyJVURqRQu7Hlw6lCwnFoFrWbfNq5Fknnya3E7OHYuDeIWj3RkTJ/u98s7TKB/xqZT6 cxqv93FmXoox5Lvi2782s5zr/nSoODJwHb+8P3BnIg4XPBKKdh6XDQa+I5BaHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034727; 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=BhUBi23isEUGt+AP4eQnnAu+3zg7Vf/hytimcSCRYAg=; b=bzRAK4gu5LJEj7YNe4oPDLBRe6t6dSBxY93khEByKIyO+RQKaNBJgk92XyEhgd07SA2AyP s4U6vV6gv/CCouP2eTQKhEHzvHVlgwkbcGgl0QS7osZJuIpzCqwOObV0J1dxc2foN+s4Lb XVZLGwUKeNjN55/2qNpHzgepMw5BQMPLOZiEYCg6Jfk+iOWDq+qxTLF7Dt15ccksVkclFK YATwN5bkt8bNIBnxLMsZD8c5BzzBnx+yKD9QUhUInI0Badcteb08CG+q4uXFUd8ooNIhTt 9mWHuPRWg5Ti8z0JkOYjSoNGHNXrjzS6GYpg3UfXxMz++PXqMv0QUdN/DlNG3Q== 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 4V0q5z1rB7zhCX; Thu, 21 Mar 2024 15: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 42LFPRnY055941; Thu, 21 Mar 2024 15:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LFPR9O055938; Thu, 21 Mar 2024 15:25:27 GMT (envelope-from git) Date: Thu, 21 Mar 2024 15:25:27 GMT Message-Id: <202403211525.42LFPR9O055938@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: cc1268a92677 - main - BSD.usr.dist: remove empty /usr/libdata/gcc directory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: cc1268a926772900a08c61fd791bb66df1e6c30c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cc1268a926772900a08c61fd791bb66df1e6c30c commit cc1268a926772900a08c61fd791bb66df1e6c30c Author: Mitchell Horne AuthorDate: 2024-03-21 14:53:55 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 15:22:57 +0000 BSD.usr.dist: remove empty /usr/libdata/gcc directory I am unsure of its exact historical usage, but, we no longer ship GCC with FreeBSD, and it should have been removed. Reviewed by: imp, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44440 --- ObsoleteFiles.inc | 3 +++ etc/mtree/BSD.usr.dist | 2 -- share/man/man7/hier.7 | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 1586f310ecc9..4015246a0ba5 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20240321: remove empty /usr/libdata/gcc directory +OLD_DIRS+=usr/libdata/gcc + # 20240307: Improperly installed awk tests removed OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/missing-precision.ok OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/negative-nf.ok diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 0d43b657530b..bb83e832c1d3 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -85,8 +85,6 @@ .. .. libdata - gcc - .. ldscripts .. pkgconfig diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 10847993c0f5..8cd6ff338b5c 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 27, 2024 +.Dd March 21, 2024 .Dt HIER 7 .Os .Sh NAME @@ -406,8 +406,6 @@ shared libraries for internationalization miscellaneous utility data files .Pp .Bl -tag -width Fl -compact -.It Pa gcc/ -GCC configuration data .It Pa ldscripts/ linker scripts; see .Xr ld 1 From nobody Thu Mar 21 15:25:28 2024 X-Original-To: dev-commits-src-all@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 4V0q604pn3z5Ds97; Thu, 21 Mar 2024 15:25: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 4V0q603hj0z4k4R; Thu, 21 Mar 2024 15:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034728; 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=EG9Hhd34uixVhmd2meRykRVbsbzTcTxfjAqPBGSEndw=; b=WKe6kpdGs97hcQsY7o/4Ebw8n/Zt8YejTjO9qY/JLdAm/qRDR4SavbkVOq6nzlQfBeqoOW 97AFIo8XDJR15t0qWTIcfXAIqAxsFRMTwG6CX98XLZ7+I6SNAB14zHkJMtdtRbYQan7yWu EC/X7GsiX2iLgsKRsVo6BYUtWLaO3tcEg3Haw6HErpGNpN+Qo5/457j/9NJ47vFJ5BV6jF Zih0TsFwFsTj96s0P3ridy9PvswQ+4X4TTtMIBU1Az8uymAugVXtzAZGVYwYiMUpkhXXFR KMF7SpdKIY7AYkrDS6G306y2GLFN0zS7KdXRrHVNzDJDYybJ5HU9F1+UQ0feEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711034728; a=rsa-sha256; cv=none; b=CveaApPThOd8OsUGo4ilq74eoRWxd08AK9Vu5f/amhwaEsx7yVEGEFJlTRa7vz2dk6pamW Pi1y6S9sdC+s1TcbMy62pX9Htx+1mo/x73o+fHFY2DzMd0L0a4dgGwoC5Fup3GDCJX3kva 1BEa5D14A+mhCv0Lm6ujbwy2TFTJ3v+iaGnCj9G3dqD3eyBve47wXFsSlUxx1MwyVLutFf 6fsPtmFbWJ7ZS6XAfWc4qkmJ/TaV8qCGFR3TC3vKx+CuZ4p6gqwgzRXB522OzSTHT9cm3Y fmhz2D9pVHxBDzEJx/7u/U96ywJ9gflo4M6BW8nUvYrrY5VDo83CMv9ydZDMKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034728; 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=EG9Hhd34uixVhmd2meRykRVbsbzTcTxfjAqPBGSEndw=; b=ETBGus2F+11iJNIBf1JIlLBQYsqkVVI0yPxnyybamrIcTyX4boqCJ/Ha5pJVRoEj6Wgah5 /Q4oTGWMQD/WxA4hODP+KUiZfDgYV/RscdiqbuCgSGe3UCe1wOX7AIcEf2cs5xDAWNMIQJ 8+ohaIV4TyHuI2N2ap59myPMMsRSijTMsXxm++L13HmpO4BrqOXLDS17KWOlayNUHD1caT TtkqLD/Xbkz3jJJqdOJtXWO/bk7PK8e1V0RSdmXCXytw86UdB9vSt1jeLWSFR2tbSkLIIe pHlTgB3ItfPlSe9LYQTbFHNs8nWMyPNAFuJ4dCvCvWUzZSlUkWDZuaPD52p4rw== 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 4V0q6030Zxzh2B; Thu, 21 Mar 2024 15:25: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 42LFPS9t055989; Thu, 21 Mar 2024 15:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LFPS1D055986; Thu, 21 Mar 2024 15:25:28 GMT (envelope-from git) Date: Thu, 21 Mar 2024 15:25:28 GMT Message-Id: <202403211525.42LFPS1D055986@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: 83a426d13a6a - main - KASSERT(9): add assertion message guidelines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 83a426d13a6a384e63e75d8252c03dd40af3817e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=83a426d13a6a384e63e75d8252c03dd40af3817e commit 83a426d13a6a384e63e75d8252c03dd40af3817e Author: Mitchell Horne AuthorDate: 2024-03-21 14:54:49 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 15:24:16 +0000 KASSERT(9): add assertion message guidelines Add some text describing how to create useful assertion messages. Improve and add to the EXAMPLES. See the discussion prompting this on -hackers: https://mail-archive.freebsd.org/cgi/mid.cgi?57o4rnnq-013s-3nsn-59n5-4ssn1pq81s94 Reviewed by: emaste Discussed with: imp, bz MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44434 --- share/man/man9/KASSERT.9 | 72 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9 index 1d28ce80c9fb..8d9dd98014a8 100644 --- a/share/man/man9/KASSERT.9 +++ b/share/man/man9/KASSERT.9 @@ -2,7 +2,7 @@ .\" .\" Copyright (c) 2000 Jonathan M. Bresler .\" All rights reserved. -.\" Copyright (c) 2023 The FreeBSD Foundation +.\" Copyright (c) 2023-2024 The FreeBSD Foundation .\" .\" Portions of this documentation were written by Mitchell Horne .\" under sponsorship from the FreeBSD Foundation. @@ -29,7 +29,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd March 16, 2023 +.Dd March 19, 2024 .Dt KASSERT 9 .Os .Sh NAME @@ -93,8 +93,37 @@ The macro (read as: "must-pass") is a convenience wrapper around .Fn KASSERT -that automatically generates a sensible assertion message including file and -line information. +that automatically generates a simple assertion message including file and line +information. +.Ss Assertion Guidelines +When adding new assertions, keep in mind their primary purpose: to aid in +identifying and debugging of complex error conditions. +.Pp +The panic messages resulting from assertion failures should be useful without +the resulting kernel dump; the message may be included in a bug report, and +should contain the relevant information needed to discern how the assertion was +violated. +This is especially important when the error condition is difficult or +impossible for the developer to reproduce locally. +.Pp +Therefore, assertions should adhere to the following guidelines: +.Bl -enum +.It +Whenever possible, the value of a runtime variable checked by an assertion +condition should appear in its message. +.It +Unrelated conditions must appear in separate assertions. +.It +Multiple related conditions should be distinguishable (e.g. by value), or split +into separate assertions. +.It +When in doubt, print more information, not less. +.El +.Pp +Combined, this gives greater clarity into the exact cause of an assertion +panic; see +.Sx EXAMPLES +below. .Sh EXAMPLES A hypothetical .Vt struct foo @@ -106,11 +135,19 @@ foo_dealloc(struct foo *fp) { KASSERT((fp->foo_flags & FOO_ACTIVE) == 0, - ("%s: fp %p is still active", __func__, fp)); + ("%s: fp %p is still active, flags=%x", __func__, fp, + fp->foo_flags)); ... } .Ed .Pp +This assertion provides the full flag set for the object, as well as the memory +pointer, which may be used by a debugger to examine the object in detail +.Po +for example with a 'show foo' command in +.Xr ddb 4 +.Pc . +.Pp The assertion .Bd -literal -offset indent MPASS(td == curthread); @@ -121,6 +158,31 @@ message: .Bd -literal -offset indent panic: Assertion td == curthread failed at foo.c:87 .Ed +.Pp +This is a simple condition, and the message provides enough information to +investigate the failure. +.Pp +The assertion +.Bd -literal -offset indent +MPASS(td == curthread && (sz >= SIZE_MIN && sz <= SIZE_MAX)); +.Ed +.Pp +is +.Em NOT +useful enough. +The message doesn't indicate which part of the assertion was violated, nor +does it report the value of +.Dv sz , +which may be critical to understanding +.Em why +the assertion failed. +.Pp +According to the guidelines above, this would be correctly expressed as: +.Bd -literal -offset indent +MPASS(td == curthread); +KASSERT(sz >= SIZE_MIN && sz <= SIZE_MAX, + ("invalid size argument: %u", sz)); +.Ed .Sh SEE ALSO .Xr panic 9 .Sh AUTHORS From nobody Thu Mar 21 15:25:29 2024 X-Original-To: dev-commits-src-all@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 4V0q615DfKz5DsQT; Thu, 21 Mar 2024 15:25:29 +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 4V0q614JM4z4k4Y; Thu, 21 Mar 2024 15:25:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034729; 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=sbr+SacA7cgb31EzWVRMJykoItIBbYwVqSEXApxIyqQ=; b=CuAGdoORiCtgp5gSafu0YI5OCl+AZaNHpMpK0nmbzx/lkUJag53DvZZPLhkiDdK+8fXfgL fl9g8pSXprT0lpue+6s+AACN0yZ2Mk3JkanopL7/6PZaz+W+Bk1OqWEMVwwCnMiNFRARHi kizfZERObEx+XILBDnEgGI9eRGmDvJlQ5odGe2z7zaH8eCe/2zEWDdHcvxDv+NEmUmVEMl fnemWAvGvsftBUN7YpYXO6ZjOcTooCWmx7iNsgPSoK+lcfPv0aX2t779sOGzY1xYWotJxi yJ24pVDUiOU+6iLPSmchrBUXXF+OvR3Ljd6f88opZzTvD/wv+Tlx2tSJTMHZxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711034729; a=rsa-sha256; cv=none; b=oRfD7uClCjfXQi6Dq6MrfUXSRrVWab2P3gUQ+QUurB9osYyGuLwhKI8RRWyOMZp56Ixvob VYLVe1zg33cUVDWFVi84R1rBQz+qLQi0gi89GJ0tc/n0xE1saBSOxWzmY6ATg1rZhmNqvS vptZg2CjdgDsbPmr5rej7xYVk8OhSiYBqvqAX4V6dHaRU5I0uWa0hiI4YiMWfmKeKKUk8+ bA4zWPO0bgOjDG3hBvCHQFAu8UsQ4ufZOJfQ2NghhgUqEKLwoXmEaNLrkjovZn49lVew8v x2MgQ8YfvWHXYWDB+zNLedOa7OFZbKw+V+sja9yNiTEfNu9oSxTTq/qhbIqdIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034729; 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=sbr+SacA7cgb31EzWVRMJykoItIBbYwVqSEXApxIyqQ=; b=AK1ev/zWn+h/fiic5wFZg4XWxtqksvt95f9oslEyja20+B3krZVO6lpeNV4CQJig+Ii6lK 9UZySE9rj0IvzKwtOVHtKe4C3DL8rEmD2N873fMQt1mM3GuCntXnUzBbUGj+Izfl0WlRIE 2gr/TjFwZyY0OBn0ZVSPIQUpvk/LYasHzam+hAxCrlV9XtBcMBJS0y+Sms67F6Gojts03o Os9bgN237E/QI7rkUoqTshzWBfH/XVapHX5Opgzo9easykUpvNMhB6a1ckonew8K8pCzmx tJP5P7Hm8AmasUyS68EVwdun11i4/d+PIwsFE0AbhG3scNUy4gDMExYpTINAFA== 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 4V0q613wV6zh2C; Thu, 21 Mar 2024 15:25:29 +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 42LFPT2M056042; Thu, 21 Mar 2024 15:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LFPTh5056039; Thu, 21 Mar 2024 15:25:29 GMT (envelope-from git) Date: Thu, 21 Mar 2024 15:25:29 GMT Message-Id: <202403211525.42LFPTh5056039@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: 5d956e11ed37 - main - KASSERT(9): describe history of MPASS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5d956e11ed3713ff769d51b71f7b4ee6ce0085fe Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5d956e11ed3713ff769d51b71f7b4ee6ce0085fe commit 5d956e11ed3713ff769d51b71f7b4ee6ce0085fe Author: Mitchell Horne AuthorDate: 2024-03-21 15:21:04 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 15:24:35 +0000 KASSERT(9): describe history of MPASS The macro originates from BSD/OS, with a different etymology than what is presented. Add a brief HISTORY section to capture this. Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44439 --- share/man/man9/KASSERT.9 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9 index 8d9dd98014a8..bab8efe5cfac 100644 --- a/share/man/man9/KASSERT.9 +++ b/share/man/man9/KASSERT.9 @@ -183,6 +183,15 @@ MPASS(td == curthread); KASSERT(sz >= SIZE_MIN && sz <= SIZE_MAX, ("invalid size argument: %u", sz)); .Ed +.Sh HISTORY +The +.Nm MPASS +macro first appeared in +.Bsx +and was imported into +.Fx 5.0 . +The name originates as an acronym of "multi-processor assert", but has evolved +to mean "must pass", or "must-pass assert". .Sh SEE ALSO .Xr panic 9 .Sh AUTHORS From nobody Thu Mar 21 15:25:30 2024 X-Original-To: dev-commits-src-all@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 4V0q626F2mz5DsNH; Thu, 21 Mar 2024 15:25: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 4V0q625FqSz4k4l; Thu, 21 Mar 2024 15:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034730; 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=k0/TWuEQwpBpHTesVnMRSGKIGEC25eIlrLTTGZ5O0aI=; b=nzfjBHHHnP/ke5D8VYM4IbLbjAiQamX40YqQe70W6ZGipzenuSu+Eqp0TNnbnGechP7gmU ItM+bA3UhxdnBCdnIOZ9X5iXIRSm0Famx58zFQQfmV1mpiPw5KXWVHZuFyg56+ggPp8wkq SeqoBd61snP+QgJdya2iohIZ5kA1XqW7NMJw3AUtkNQlc7uXqQGR+omKS4EqkXhOLmVvaS RrbHYDNJuG2rIHVGaX6WAAZXv+eTLYTC5c1BtjskRK6J7ZHEmPqnDOMQ4xkOW8kjlRklc/ 61QghtYjPT4wfXyzRQlT97ZEunE3m2jxtwF/BsQGTVpbqVeD3tYSmqXkJwF6WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711034730; a=rsa-sha256; cv=none; b=bfyXTCoarPq0/02p8DDyEy85OR0zsj+4/t1FylX/ewduMga+vAZpDy1oeOODphMMAYYK0W B8VaS67GRbSf8abufOQ9lRz0+ALfigDeW9Gak5WRANsNlUCTHSHNIJV3EwjbY0+aO2FcOi Ytcfj1CyAFMTZa3hTc3gac/JzqNcyYHmWNoU6L1U6Ws4o066MyZAcASycWIF3hlK4gvVYj AutC56sqsf1i71FOrHGQU6/lFYd/IHPlq6isf3cbcV1wtcg1AgKSPU7kfItpgx/ufXfB6g hd91z+zcWXZ5JMMrAHmLhHsI5faX1Y2coHIq/UHoeE8R0btFgSwFc3tIm10y+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711034730; 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=k0/TWuEQwpBpHTesVnMRSGKIGEC25eIlrLTTGZ5O0aI=; b=lbpDtH0u3aksQAjU2TYJP4ZhHsxNyhWJ/+1cGdkrbimZeoT7ABzrLJWZGUU0malilIiw8v Z6dZkpgiWpGXKSpaeIynUqv1GPBCUrKfQ6lkpNIEYLbKnyk1MorbkxRnWOZ9OWTvxB7KgM HgoNxLw4BnzIhLaVlfVYbLxqkrWoMGhSvJKxtazKN34FRawbsbOQo7AtOYXIfQy7E388Tb yPPJkGCuS+U4gryikfCczGKFE488L9w7HDmpoUykNM69pa0qXirvPc/+6+i3aT4+pOloW3 ZkV/t5YJ3z9kFGkcZEYCUn6FFydcQoAX0rrKOFnN1HmmsnKuYbhEw4sy0eOn7w== 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 4V0q624kYQzghD; Thu, 21 Mar 2024 15:25: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 42LFPUXZ056084; Thu, 21 Mar 2024 15:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LFPU3A056081; Thu, 21 Mar 2024 15:25:30 GMT (envelope-from git) Date: Thu, 21 Mar 2024 15:25:30 GMT Message-Id: <202403211525.42LFPU3A056081@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: 36de8bb22667 - main - kassert.h: update MPASS definition commentary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 36de8bb226671ef9fe373d8d95f77cdb76157738 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=36de8bb226671ef9fe373d8d95f77cdb76157738 commit 36de8bb226671ef9fe373d8d95f77cdb76157738 Author: Mitchell Horne AuthorDate: 2024-03-21 15:21:41 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 15:24:47 +0000 kassert.h: update MPASS definition commentary We now have a detailed man page describing both MPASS and KASSERT. Give a warning that careless use of MPASS can result in inadequate assertion messages, and point to the MPASS(9) page which describes this. While here add a comment above the KASSERT definitions pointing to the man page. Suggested by: bz Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44438 --- sys/sys/kassert.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index 25e2b025a11a..ab2313bcbd8b 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -142,6 +142,9 @@ void kassert_panic(const char *fmt, ...) __printflike(1, 2); # endif /* defined(WITNESS) || defined(INVARIANT_SUPPORT) */ #endif /* _STANDALONE */ +/* + * Kernel assertion; see KASSERT(9) for details. + */ #if (defined(_KERNEL) && defined(INVARIANTS)) || defined(_STANDALONE) #define KASSERT(exp,msg) do { \ if (__predict_false(!(exp))) \ @@ -154,8 +157,11 @@ void kassert_panic(const char *fmt, ...) __printflike(1, 2); #ifdef _KERNEL /* - * Helpful macros for quickly coming up with assertions with informative - * panic messages. + * Macros for generating panic messages based on the exact condition text. + * + * NOTE: Use these with care, as the resulting message might omit key + * information required to understand the assertion failure. Consult the + * MPASS(9) man page for guidance. */ #define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__) #define MPASS2(ex, what) MPASS4(ex, what, __FILE__, __LINE__) From nobody Thu Mar 21 15:34:18 2024 X-Original-To: dev-commits-src-all@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 4V0qJB6dS3z5Dt6d; Thu, 21 Mar 2024 15:34: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 4V0qJB68K1z4m94; Thu, 21 Mar 2024 15:34:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711035258; 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=4M77rVnk/Pvje1slBfb2prfAFE1ms+7Pd2W+12UAn6A=; b=fIwCfjV/SSv4qZa4RYXj54VFKCsL7zXLnTEyaljdBR8uVe4eyKzqvtIF/NdqWZHbzX9BH7 +0U3KmpkWNitxAMEsFtNNtOEmbORB+TaSvu3rblmyKDyEwDqXHJEh57+hANiyBGNjfDUr1 F205fAgKsdeYizw1zhFsWTxmX4yqPIpYGisBys0dEM6U2iDdALRAAOiwhf9ErWoj1tl2np G1tjljnFFUjoS2Z5GsnubuSGvpNzu/FKEO80S5IQHdrb/bNuJl8LL5tpYKs1a5SrC7J9sL hB9UF1OOQ0TkMisfzKzzaJHeN8pqTRJKtwfosJqIgUHg5+dtofZoGRy1sRAwRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711035258; a=rsa-sha256; cv=none; b=mzT2K1+Fot2I7mnJV/Dfd2TkTTMflm10tD5CHx/hYLN1G/WetVCY93Gx628slP/oefDPiY 2V6l6kyS3KhZnEcGVbIth0jhwSkRtkWCqJuMxceAK3zGRFDNn6dJ/SeJB0QuoENx+wfQe4 kJ9E44Ok0n8xNx/eEts6MpBLBIajJViVJg/S2BPkQhmvgplfNqY4ykQUwWpseF5JLv6En3 QkmLb3exB28oqSnnxHHqpFTHbsnhwmO5dctG+48/+TW0pmRxcNi86Qv3jnPbkhztKaOP4w Ut/CfzmU2/EhAQOvNywnUQy252XUizyj7OdzLN7CZEPqApixH9LYqb2/rItCHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711035258; 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=4M77rVnk/Pvje1slBfb2prfAFE1ms+7Pd2W+12UAn6A=; b=a+Beab8JnCipi+K07h07n3Zv95LOwMs5+e9BxGbmdxHSkx78tc/6x1cUqM4CnvnBgYJvfZ Rhmjh78gmJhiXLz751c7wBMZZP6xN+JdwAWWxFu+t5laChbloUfwenmPyQxpm15GfHfzZk fB/BNVHWQyMR36EqQDJm9SUV0z3DBYE4tA7c/pHjHG8kYKIjr0qNkC4UVUqbQEqDsupVve CuIUMX1sEwZLrq95q4zmhYJB6RbKLWnaPT6ycvUxUEjgwceLd85zlwlWt00ili3buQSBEZ 4UhhDnsctex9mK7vE0ALGnrMo8GR2Es1xr4ycHx4SCxnrHRMuDNU/tehfQ98Ag== 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 4V0qJB5lWRzgnD; Thu, 21 Mar 2024 15:34: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 42LFYIPP072405; Thu, 21 Mar 2024 15:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LFYIDp072402; Thu, 21 Mar 2024 15:34:18 GMT (envelope-from git) Date: Thu, 21 Mar 2024 15:34:18 GMT Message-Id: <202403211534.42LFYIDp072402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 173953182af0 - main - rtld-elf: add some debug print statements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 173953182af060dcab43990e179ee91e9f2d1e54 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=173953182af060dcab43990e179ee91e9f2d1e54 commit 173953182af060dcab43990e179ee91e9f2d1e54 Author: Stefan Eßer AuthorDate: 2024-03-21 15:31:49 +0000 Commit: Stefan Eßer CommitDate: 2024-03-21 15:31:49 +0000 rtld-elf: add some debug print statements The byte-order independent code has been reported to fail on powerpc64. Add some more debug statements to help identify the parametrs used and to verify the correct operation of the byte-swap macros used.. --- libexec/rtld-elf/rtld.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 4b6d19104343..fbf5b3e20a1f 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2109,6 +2109,11 @@ cleanup1: return (NULL); } is_le = /*le32toh(1) == 1 || */ hdr.magic == ELFHINTS_MAGIC; + dbg("host byte-order: %s-endian", le32toh(1) == 1 ? "little" : "big"); + dbg("hints file byte-order: %s-endian", is_le ? "little" : "big"); + dbg("verify swap macros: le32toh(0x12345678) == %#010x, " + "be32toh(0x12345678) == %#010x", + le32toh(0x12345678), be32toh(0x12345678)); magic = COND_SWAP(hdr.magic); version = COND_SWAP(hdr.version); strtab = COND_SWAP(hdr.strtab); From nobody Thu Mar 21 16:07:47 2024 X-Original-To: dev-commits-src-all@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 4V0r2w276Gz5Dxp3; Thu, 21 Mar 2024 16:07:52 +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 4V0r2w0xfHz4plN; Thu, 21 Mar 2024 16:07:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711037272; 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=B53MJSoCyvB/v+aS3XAVbTJ9MEYx9hXxUlvD3zhGdMM=; b=Aj5q6vIXmvPxQQbdBWSGIuyf0NCITTsZkChzrioJoZSN40bSOdesVKVxCUddQ8mLgJSRoA XNw96myDv3rGMugP+6xF9iyBJ8aur0YYWcSx9+nUtgTR0WfAAkyCLmb2D2xrG691XMZnf5 n9SIj8MCvQexXaR63IC64XsY6IdvjUnx34nwsqT8k7ectiSVqbx7WBAL3ACkSsD/Rf2zLy kgvwmieeIoyS9go+KXK4+2l3lY3M8HrZby0pyA3eYYdwsj2GfnUAYOdo4egUo3n4Syau2d uI0ex+xY6pvzpTvC2lgFwxJ1y238GhN9+MpK324Y6hEf3Ty0+cIngiYF/LYc+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711037272; a=rsa-sha256; cv=none; b=Q7eb7kpcWLHpTMcy+MJ3vCS6XZBOnwdT3K+QIv0UD7n3fngQ+RsC2Bq81pUDGMldDAnJ0/ 4zPZRmEVydmP+sbKSrTaPViZVUgU1/bRuhYUWr1Xgguzg/WNNinlusftP+eGMMcXAxO80Q crsUpEGnhDv85U/wlF6Au7qS/HKCr3BcALmR/wz45I/seB0f0Tn2cz6qmzp2tuMLIETUah i25QUZN/bPlsNLlD1sCLJrpC875/G6R05yqRq+xchQzweaRrKHVSXIZFOw6ptt9Lw/uNZT i2cHHjuqwAp8/zhyW2HPeba3gawU718JS7sgmru6Q+XCUWbUy3SUNLSTQoBZ8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711037272; 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=B53MJSoCyvB/v+aS3XAVbTJ9MEYx9hXxUlvD3zhGdMM=; b=Ggwxz+TWnBbxiz1pMVnKhhTS3z72c/Vl2vib2bOSjUsKis8DHO62GT0vSDwdjdkheo28Pu LhbTHFMXf6lXhTgOnOLBCEaUMXFTrQrgUEnRnZF2+ZAe293jvjQOqJb+f5o1WlHRzw/M9W XGfevec0EW/t+/h1pYeoPZnj/h20KHIxfYBhyctiLCSS0+mMurk04fmEMu4tUWQZcu8Pq/ UYMJcwb/dDJmdGt1kXIiXR75r/oYvma8UHvHYUhLNGdw3uXptD0wDhsZbZQBD0uofOuEUE slUC86YbJwVXB1J3i1n+fLIVVrjJ2CdNnDPvxE8XNz5Prl2EYU7JRuDRfO5TWQ== Received: from [128.232.109.28] (user-109-28.vpn.cl.cam.ac.uk [128.232.109.28]) (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 4V0r2t6DL3z14Rc; Thu, 21 Mar 2024 16:07:50 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 21 Mar 2024 09:07:47 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 6b3db5d7793f - main - libsysdecode: fix build after 3d0a736796a9 Content-Language: en-US To: Kyle Evans , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202403210316.42L3G8F8022017@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202403210316.42L3G8F8022017@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 3/20/24 8:16 PM, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6b3db5d7793f57fa0020a78d61aae7ec318557cc > > commit 6b3db5d7793f57fa0020a78d61aae7ec318557cc > Author: Kyle Evans > AuthorDate: 2024-03-21 03:14:49 +0000 > Commit: Kyle Evans > CommitDate: 2024-03-21 03:14:49 +0000 > > libsysdecode: fix build after 3d0a736796a9 > > TCP_USE_DDP is a kernel-only macro, so we must exclude it in > libsysdecode to avoid breaking the build. > > Fixes: 3d0a736796a9 ("tcp: Add a new kernel-only TCP_USE_DDP [...]") Oops, thanks for fixing. > --- > lib/libsysdecode/mktables | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables > index beb18e97f898..8a990e0408d5 100644 > --- a/lib/libsysdecode/mktables > +++ b/lib/libsysdecode/mktables > @@ -141,7 +141,7 @@ gen_table "sockopt" "SO_[A-Z_]+[[:space:]]+0x[0-9]+" "sys/ > gen_table "sockoptip" "(IP_[[:alnum:]_]+|MCAST_[[:alnum:]_]+_GROUP)[[:space:]]+" "netinet/in.h" "IP_DEFAULT|IP_MIN|IP_MAX|IP_PORTRANGE" > gen_table "sockoptipv6" "IPV6_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet6/in6.h" "IPV6_ADDR_|IPV6_TAG_DIRECT|IPV6_OPTIONS|IPV6_RECVOPTS|IPV6_RECVRETOPTS|IPV6_RECVDSTADDR|IPV6_RETOPTS|IPV6_2292|IPV6_RECVRTHDRDSTOPTS|IPV6_REACHCONF|IPV6_PKTOPTIONS" > gen_table "sockoptsctp" "SCTP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/sctp.h" > -gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN" > +gen_table "sockopttcp" "TCP_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/tcp.h" "TCP_MIN|TCP_MAX[^S]|TCP_MSS|TCP_[[:alnum:]_]+_MAX|TCP_FASTOPEN_MIN_COOKIE_LEN|TCP_FASTOPEN_PSK_LEN|TCP_USE_DDP" > gen_table "sockoptudp" "UDP_[[:alnum:]]+[[:space:]]+[0-9]+" "netinet/udp.h" "UDP_ENCAP_" > gen_table "sockoptudplite" "UDPLITE_[[:alnum:]_]+[[:space:]]+[0-9]+" "netinet/udplite.h" > gen_table "socktype" "SOCK_[A-Z]+[[:space:]]+[1-9]+[0-9]*" "sys/socket.h" -- John Baldwin From nobody Thu Mar 21 17:11:47 2024 X-Original-To: dev-commits-src-all@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 4V0sSj5KxDz5F5Pn; Thu, 21 Mar 2024 17:11: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 4V0sSh1gFlz3xsG; Thu, 21 Mar 2024 17:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711041108; 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=jLs1Y/sfwDIXmYhwgnFxi1YorcQ3wQL/MksUe/CcxOc=; b=N/3VH2p70S1+EmxepVva1Cs7eo2PpTMBcCHWIgKnrW6Z08VixUbelypI1KfESsejY1i0EA X5iipw4Z8pAiKfiwy1WJKfPiwcREDd62BdUvTkBUsR69qnwaRml4q25/2spWxXKlaAF6zl LoREhrkkx0ICWgBIuIRGQ30nXdTGQNx5G8p70AjInLWJSSHA9XSoVzZC7iSNoSZKL2+qxu DoslqR2NF/enciXs5Jlxc5GF2S6lRtvazwLbG4gQGJMp2C13C4dYSTRvn5rjrVLLN1CkYi udtp9YaouQw/V/BnTWfpXFlR4ulHjPngOrNf72mou78ovZacSeoYpFpkaYeN2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711041108; a=rsa-sha256; cv=none; b=sQWkoocEf0sdYbZtHs4O+z5JHZ6bh6gm5mYRo907hjp4QBoPgCF1UaUFlvJyyJQW1moPgL X5aoE2RkEt6TVU5Is4SC/UJ18AYUbwSIol05jzkPxI1anAXvP50dsUXJmQA2mfiWnOyN1U 4ZCHkSM6GtADVvHllQzrvx/v8bewD3xVS6zrBb/WyVwRGGuzIW1Su2+kU6diN84ewgpnuh lkdd7KCYdA7YSryXzLyePzcoUyOa8i49st88QyLVfQ2guQGgUKhUZz6wRT754r7vGV1FSn MI82vh9q3w9A7csOb249N0t+zjK9+hhaz+ilLHsRvz5bamG9NMDE2T0PUoBtpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711041108; 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=jLs1Y/sfwDIXmYhwgnFxi1YorcQ3wQL/MksUe/CcxOc=; b=FnvfPOhk5jyN1puYQgLNf64ThYgJPNweHKzHB7acSndniWAJx5LVINq0ryf/776VUMgMt+ eBntB0aExxwMBQADntrZUb2Mi1XhpWVG22JpTBeRiIrwh19wqz/h+6ZL8yyoCw9IbnZHJy P71IQLmQI4CNPkEGcIKmiRFEURMHBcbdIxsye+zCNZY/U1uCvLd9otfwX8EHgjOKBs3mJ7 KRTiUGizsQQ5OzsbhzsO36JRtOE191ayzevis2v1HocBLO9xd2P1w06Gy+2O8STrKduPLo jcepRfvMbeuqEtsvJqqGOXbWWkJDQ9lzsMP5xM2Ybb5sa4UgYpevULJAYf5Bdg== 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 4V0sSh0WX4zky8; Thu, 21 Mar 2024 17:11: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 42LHBlU5041564; Thu, 21 Mar 2024 17:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LHBlpr041561; Thu, 21 Mar 2024 17:11:47 GMT (envelope-from git) Date: Thu, 21 Mar 2024 17:11:47 GMT Message-Id: <202403211711.42LHBlpr041561@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: f0620ceeccf0 - main - Fix building of several libclang_rt libraries for powerpc64 and powerp64le List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f0620ceeccf070a69352105c5dbc23cff499a732 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f0620ceeccf070a69352105c5dbc23cff499a732 commit f0620ceeccf070a69352105c5dbc23cff499a732 Author: Dimitry Andric AuthorDate: 2024-03-21 13:53:36 +0000 Commit: Dimitry Andric CommitDate: 2024-03-21 17:05:25 +0000 Fix building of several libclang_rt libraries for powerpc64 and powerp64le I reorganized the libclang_rt Makefile in e77a1bb27574 to make it more readable and maintainable, but the check for 32-bit powerpc was wrong. This caused almost no libclang_rt libraries to be built for powerpc64 and powerpc64le. PR: 262706 Reported by: tuexen Fixes: e77a1bb27574 MFC after: 3 days --- lib/libclang_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 46f7fdf814be..984da3f34156 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" # nothing for 32-bit powerpc .elif ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} From nobody Thu Mar 21 18:24:20 2024 X-Original-To: dev-commits-src-all@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 4V0v4N3S93z5FD6V; Thu, 21 Mar 2024 18:24: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 4V0v4N30Mfz4D8Z; Thu, 21 Mar 2024 18:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711045460; 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=UiioKi6ciIAIUAgy+nOLlgrNrmj7qkSq0iXLoy7HYks=; b=TwiiBqSQz22AaDV2y99QSf8j/b4omKTiZ7hun8vvGu2Z7F+RtinV8+7NqM6f9OFwfm9j6V dqqnBrr/Bp8HiprbsyQ/jb1C6WsG4ng6+xlQYRplj7tmmAm/fcPy6T49VHAMhYZCSEPiRk OYPcpy+tbIJTAfrC+RG7rJqP+v8vwkmHbxlFxte916oyU09B8FRygwpmBICXauIk3aZqEV ZfikoizGvLJFVbsfNzcnj2FQTcTQH+FM1jRzTYWGxSdyPlK+8EYc4VKe8Bn3muryAcbY5Y llZamwpFege2Ur27FuwNSRTvpBr9EhhCN1aztle8dKjrrzk8ED08qRjCoriAIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711045460; a=rsa-sha256; cv=none; b=ud1XAzB+D3ZnPBDhGQbU4hB8AXblweIKgaFLyvYi1SGI+SwA0HWg3zavFqPVNBa+24VgEF gCZZGfWpGrVX10nrNdkxZmmFYNvNTUh06NESdMQe+oXqzE6AjUVRdv/UfTptZOZBEQEnJX m8KDFZUrjDKNMehLZuUPkkT1dazwT/P0N7zQqsXLUaaA0aKam44ytloZkBbZK+WaGPA769 oSrAiGB1j3svjPPnC8rJgR+FwMfLM2z2LM91hfHc3nfXfWSGMse1DgeyWyjB7VfsbdbZJe WqHUibSTo4Z4BgClIMRfpSAvZExdSl9yLEsSeFfnZClau2VV3PIFMXQuuOSf8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711045460; 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=UiioKi6ciIAIUAgy+nOLlgrNrmj7qkSq0iXLoy7HYks=; b=l3Uz0sipQ6asMgYnRgDKYtGTXGhP59XDiw0hXu9y+yNtN46XZzQiqfpk2XM8BV3s07Y5um VskBqpQUZmKQ6aOXGAxBkGHnHzazj6ZS7NuXA6CyDUWkcPdgfyP80UhS1TapJxAQzncVb0 x6zchkWW00JtSNTU6IiYHgC/fq04CPJQRa1k6yBWQsmgAi8sulHRbizekJG2EuEHWF8CUG 9bwbGsCG3BxL2vVPLvzs5uUT746L8OCOEEN+mdaXqvvJTRFnOcAbgA/4s26tBlU7goah7f TiP77kW/O2yAT7MCwAUtc/Dha0EA+K/rQp/JSMOC7VF8VuP3rmQXJa/AL/QZZg== 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 4V0v4N2ZpWzmPk; Thu, 21 Mar 2024 18:24: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 42LIOKrV060280; Thu, 21 Mar 2024 18:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LIOK4W060277; Thu, 21 Mar 2024 18:24:20 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:24:20 GMT Message-Id: <202403211824.42LIOK4W060277@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: 3f72f36cf2f9 - main - assert.3: Update manual page based on mandoc -Tlint List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3f72f36cf2f92e00a248f729d50803232ff4cef8 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3f72f36cf2f92e00a248f729d50803232ff4cef8 commit 3f72f36cf2f92e00a248f729d50803232ff4cef8 Author: Christopher Davidson AuthorDate: 2024-03-05 03:39:52 +0000 Commit: Mitchell Horne CommitDate: 2024-03-21 18:24:02 +0000 assert.3: Update manual page based on mandoc -Tlint Execute the mandoc -Tlint option on assert(3). This results in two areas of updates: Remove invalid Rs block Remove invalid Re block Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/1132 --- share/man/man3/assert.3 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/share/man/man3/assert.3 b/share/man/man3/assert.3 index 452903810958..f219aa1d6743 100644 --- a/share/man/man3/assert.3 +++ b/share/man/man3/assert.3 @@ -120,19 +120,15 @@ If none is provided, it only points at the constraint. .Xr abort2 2 , .Xr abort 3 .Sh STANDARDS -.Rs The .Fn assert macro conforms to .St -isoC-99 . -.Re .Pp -.Rs The .Fn static_assert macro conforms to .St -isoC-2011 . -.Re .Sh HISTORY An .Nm From nobody Thu Mar 21 18:56:36 2024 X-Original-To: dev-commits-src-all@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 4V0vnd12mYz5FH5c; Thu, 21 Mar 2024 18:56:37 +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 4V0vnc6cN1z4GNK; Thu, 21 Mar 2024 18:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711047396; 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=y0y2VgJhRcltJlqF/4j/mPnvoKxN85DB9TbIx+HuW2E=; b=qSgOjyOO5JOYal2uO1Xkw+Y4qUfkGh9gqWeKaWMiyLtZo3fG0dFJtw26Cs0qNBOdc9Gtmx dkghoxx10hP1X9an974qSNxGJNPjCkDf7RYbi4TmF3JuKueqpi0GWCFcGFeW/6ZBVmyihM nuaAsrEkkYjHaoQbUZTjUWNgkIA6UEqQ+qCfTgrgVWbWpk/PKMyODawfKCNS3tfl8ulH2M rGDR3yrwTtSbpJVhmG4ben5Y1SopQAdB5sHsEJ3cqfWR8q9XTrzS1B7qtq6/mOQzebCgI1 qNujb4AEUGtxHGHeUuGfxeFQBz9ApSxCA0KeTL1C6Yl6efZxkEFnMzI4yH2VNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711047396; a=rsa-sha256; cv=none; b=I2+zQIWSVdQoBESFAevYlBMzKSBpVwtmVXTP/8BgHNEPVh/+HDdkg/Z9wEvqu2ZBMzWCuM U4HXYfnm3pTIwkYZ4ad9WI4ZVtYwdy359ZdhquVuF0QhBn2TaQUTTH6ubZNDg6lSU2fe5M SQ9rsGPDwquUaNq5MxYDw0cHYG/6bznxEvZW+98T8qVgmZCPpleUTwuqt1LZSDVo1MpsKg MI2bNBZcnhJ09MNSyOglLN1NfzKRtQQYmPynPke/PPmVQuhserNymK9lGcUDm0P/ifs/M8 dC2HvfqpT+hxZju84qlAYx6tTO3KyoWMpYpMt3FOg0rUmr+bQ62RseUg9eTOMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711047396; 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=y0y2VgJhRcltJlqF/4j/mPnvoKxN85DB9TbIx+HuW2E=; b=DIpTFEd9V1DYObrRX6Ky4TinrmbTcJxnGf7/5RDjPw80xdd9g2xRoYMdw6bwIoyP+c070J Ehqv/4UfFN56i8GYUv9CM25+jwIj84uxQIikLJKh2smozV4iICDThZtnETGf21GmYaFSIl jDN5QUDeQz0QUSx3++xCYQZmgcvagJBLFTAuZWOpfEZ9hRdmaXAlvgkej1f+sedcP+tuZ3 IpLlzesM/MSEvkfHPr9Im8NnZZojAJGoK2BLpT78eUxnUBVFQ6Bfd5r2K8lph76hBiiPuH WnhdvU2BaZvhB6aDYVrKRtbRF3/OQDGP6dWocW2xMAqU2/21PsYmr9CvSceQVQ== 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 4V0vnc6CjTznXP; Thu, 21 Mar 2024 18:56:36 +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 42LIuaUC009975; Thu, 21 Mar 2024 18:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LIuawB009972; Thu, 21 Mar 2024 18:56:36 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:56:36 GMT Message-Id: <202403211856.42LIuawB009972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 139d114acc7b - main - libsysdecode use MKTABLES_INCLUDEDIR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 commit 139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 Author: Simon J. Gerraty AuthorDate: 2024-03-21 18:55:56 +0000 Commit: Simon J. Gerraty CommitDate: 2024-03-21 18:55:56 +0000 libsysdecode use MKTABLES_INCLUDEDIR We do not conflate SYSROOT with STAGE_ROOT/DESTDIR during DIRDEPS_BUILD Make sure mktables looks in the right place. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44415 --- lib/libsysdecode/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 504701ee99a2..ccff95af741d 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -127,8 +127,13 @@ CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} DEPENDOBJS+= tables.h tables_linux.h +.if ${MK_DIRDEPS_BUILD} == "yes" +MKTABLES_INCLUDEDIR= ${STAGE_INCLUDEDIR} +.else +MKTABLES_INCLUDEDIR= ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} +.endif tables.h: mktables - sh ${.CURDIR}/mktables ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} ${.TARGET} + sh ${.CURDIR}/mktables ${MKTABLES_INCLUDEDIR} ${.TARGET} tables_linux.h: mklinuxtables sh ${.CURDIR}/mklinuxtables ${SRCTOP}/sys ${.TARGET} From nobody Thu Mar 21 20:10:57 2024 X-Original-To: dev-commits-src-all@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 4V0xRQ22MWz5FPvK; Thu, 21 Mar 2024 20:10: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 4V0xRQ1lL5z4Nf7; Thu, 21 Mar 2024 20:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051858; 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=hmyF4Xtk6Ij+rl8UdsX0IXpx0UEngYdXgBr3d1q0dVE=; b=d7+RBa+ukkftxrzlMxUIHaKRxXrm3bAsNE+wuK8rIlUlVm43/Fqew04+goTw+EsUDgaefe EykbI4nWaecgJKUDD4cWNUilEVMqXUIdLiA81nVnN7sncW/Vyx/y45kKstWuapcSuKjZck pDuWHi+SHIKuAWZWTnx+D35xb4Pq8r6Tgl69X5kPSa+OVgEEidaqgjv3x68MyoNDz6OPbP gkd+G5oo67ca/y/H/94ey4zoLdYSw/nr2r+4gUsCGSfSeTogds6zleG7f6uF3aCVs8wl5m yOLEH1iSl6000DbDOdhZQhO5/Wrptk1ibV7ghgIgv5tQJp/UDS1M4ZDGQH7O6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711051858; a=rsa-sha256; cv=none; b=cYWWhjLgX51YXdPC+7QiiOllYQhVmMMY4lhi/Ak7o7KzwXI2DCbOva0vhqQNWTbGnqDVsv 9EBK7cDWn/4uqe3egURttWEy6Xhl0p5q8kFOSfFvx4hFMbfKk50FvXOFTDh1dNJjcQcBe8 FAX1L3vOgoDS+U1uUWjBtkE4ZaeNRX8n0VZ1YfavW97tyfHS5uj7YPVQrAfn3UliQxKn0F LOVa7z5P31BYeeZ2rzHO1nY1aMjfQeg63DEnzFm5JZcipQX9a8n+2XFk1MNqYLRadXU/8h J6cJz7G7M/S+IBCzA1WCOS/STjj/bpLmtfFvLmPRLz8s3cPVQW3BCugLst59Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051858; 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=hmyF4Xtk6Ij+rl8UdsX0IXpx0UEngYdXgBr3d1q0dVE=; b=hk/rRpA8fCDEVnrQi262vffPqFbhQ0+pJCZAndy7SEAYwOxmo2p3MZTVjOu24PwsY8/moC 5QiKMQpbGb+neGpwjnB4cBsCmMneVS0e4rgR90CLOGfJ0tHpMvFqr8ZMVuvI9StA2KHHx0 QW2wSynyc2bM/AASf5w5yPKfUA4gcjxs98sapTCtQO7/BYw853eh7nnV4geQS8Q5xgXk83 gV3Kcx9OmMtf4ZIW7gLtppWL4W8ebjVUoBMkcruBiRvvt8BycaYaWasuqRe+8xOJjcAlDt vv40l02jgR6ElYYUEMVGZpXfFVPvttyGJy4CK0QHR3b7ddKQ61KmAOwHkjLNMw== 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 4V0xRQ1L7hzqHy; Thu, 21 Mar 2024 20:10: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 42LKAwWY039079; Thu, 21 Mar 2024 20:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKAvFw039075; Thu, 21 Mar 2024 20:10:57 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:10:57 GMT Message-Id: <202403212010.42LKAvFw039075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f126890ac538 - main - Import device-tree files from Linux 6.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f126890ac5386406dadf7c4cfa9566cbb56537c5 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f126890ac5386406dadf7c4cfa9566cbb56537c5 commit f126890ac5386406dadf7c4cfa9566cbb56537c5 Merge: 139d114acc7b 309417d444d2 Author: Emmanuel Vadot AuthorDate: 2024-03-21 20:10:18 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-21 20:10:18 +0000 Import device-tree files from Linux 6.5 Sponsored by: Beckhoff Automation GmbH & Co. KG sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 9 +- .../Bindings/arm/arm,coresight-cti.yaml | 18 +- .../Bindings/arm/arm,coresight-dummy-sink.yaml | 73 + .../Bindings/arm/arm,coresight-dummy-source.yaml | 71 + .../Bindings/arm/arm,vexpress-juno.yaml | 10 +- .../device-tree/Bindings/arm/atmel-sysregs.txt | 94 - .../device-tree/Bindings/arm/bcm/brcm,bcm4708.yaml | 14 +- sys/contrib/device-tree/Bindings/arm/cpus.yaml | 19 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 14 + .../device-tree/Bindings/arm/keystone/ti,sci.yaml | 8 +- .../Bindings/arm/nuvoton/nuvoton,ma35d1.yaml | 30 + .../Bindings/arm/nuvoton/nuvoton,npcm.yaml | 36 + sys/contrib/device-tree/Bindings/arm/psci.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 30 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 24 + .../Bindings/arm/samsung/samsung-boards.yaml | 10 + .../Bindings/arm/socionext/synquacer.yaml | 28 + .../Bindings/arm/stm32/st,stm32-syscon.yaml | 7 +- .../device-tree/Bindings/arm/stm32/stm32.yaml | 12 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 6 + sys/contrib/device-tree/Bindings/arm/tegra.yaml | 14 + sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 26 + sys/contrib/device-tree/Bindings/arm/xen.txt | 2 +- sys/contrib/device-tree/Bindings/arm/xilinx.yaml | 8 +- .../device-tree/Bindings/ata/ceva,ahci-1v84.yaml | 2 +- .../Bindings/ata/rockchip,dwc-ahci.yaml | 124 + .../Bindings/ata/snps,dwc-ahci-common.yaml | 8 +- .../device-tree/Bindings/ata/snps,dwc-ahci.yaml | 13 +- .../Bindings/auxdisplay/holtek,ht16k33.yaml | 1 + sys/contrib/device-tree/Bindings/bus/ti-sysc.yaml | 2 +- .../clock/amlogic,a1-peripherals-clkc.yaml | 73 + .../Bindings/clock/amlogic,a1-pll-clkc.yaml | 59 + .../Bindings/clock/atmel,at91rm9200-pmc.yaml | 154 + .../Bindings/clock/atmel,at91sam9x5-sckc.yaml | 70 + .../Bindings/clock/brcm,bcm63268-timer-clocks.yaml | 2 +- .../device-tree/Bindings/clock/imx8m-clock.yaml | 3 + .../Bindings/clock/imx8mp-audiomix.yaml | 2 +- .../device-tree/Bindings/clock/ingenic,cgu.yaml | 4 +- .../Bindings/clock/mediatek,mtmips-sysc.yaml | 64 + .../Bindings/clock/nuvoton,ma35d1-clk.yaml | 63 + .../device-tree/Bindings/clock/qcom,a53pll.yaml | 1 + .../Bindings/clock/qcom,gcc-msm8953.yaml | 73 + .../device-tree/Bindings/clock/qcom,gcc-other.yaml | 1 - .../Bindings/clock/qcom,gcc-sc7180.yaml | 7 + .../Bindings/clock/qcom,gcc-sc7280.yaml | 7 + .../Bindings/clock/qcom,gcc-sm8250.yaml | 5 +- .../device-tree/Bindings/clock/qcom,gpucc.yaml | 3 + .../Bindings/clock/qcom,ipq9574-gcc.yaml | 1 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 32 +- .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 1 + .../Bindings/clock/qcom,sc8280xp-lpasscc.yaml | 60 + .../device-tree/Bindings/clock/qcom,sdx75-gcc.yaml | 65 + .../Bindings/clock/qcom,sm6375-gpucc.yaml | 15 + .../Bindings/clock/qcom,sm8350-videocc.yaml | 68 + .../Bindings/clock/qcom,sm8450-gpucc.yaml | 75 + .../Bindings/clock/qcom,sm8450-videocc.yaml | 79 + .../Bindings/clock/renesas,r9a06g032-sysctrl.yaml | 2 +- .../Bindings/clock/samsung,exynos-clock.yaml | 1 + .../Bindings/clock/ti,am62-audio-refclk.yaml | 43 + .../Bindings/clock/ti,am654-ehrpwm-tbclk.yaml | 5 +- .../Bindings/clock/xlnx,clocking-wizard.yaml | 2 +- .../Bindings/clock/xlnx,versal-clk.yaml | 4 +- .../Bindings/connector/usb-connector.yaml | 20 + .../device-tree/Bindings/cpu/idle-states.yaml | 2 +- .../Bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 1 + .../Bindings/crypto/amlogic,gxl-crypto.yaml | 4 +- .../Bindings/crypto/fsl,sec-v4.0-mon.yaml | 6 + .../device-tree/Bindings/crypto/fsl-dcp.yaml | 12 +- .../Bindings/crypto/intel,ixp4xx-crypto.yaml | 6 +- .../device-tree/Bindings/crypto/qcom-qce.yaml | 50 +- .../Bindings/crypto/starfive,jh7110-crypto.yaml | 70 + .../Bindings/crypto/xlnx,zynqmp-aes.yaml | 4 +- .../display/amlogic,meson-g12a-dw-mipi-dsi.yaml | 118 + .../Bindings/display/amlogic,meson-vpu.yaml | 5 + .../Bindings/display/bridge/analogix,dp.yaml | 1 + .../Bindings/display/bridge/fsl,ldb.yaml | 5 +- .../Bindings/display/bridge/nxp,tda998x.yaml | 1 + .../Bindings/display/bridge/samsung,mipi-dsim.yaml | 35 +- .../Bindings/display/bridge/toshiba,tc358762.yaml | 3 + .../Bindings/display/bridge/toshiba,tc358767.yaml | 14 +- .../Bindings/display/connector/hdmi-connector.yaml | 3 + .../device-tree/Bindings/display/fsl,lcdif.yaml | 7 +- .../Bindings/display/mediatek/mediatek,aal.yaml | 1 + .../Bindings/display/mediatek/mediatek,color.yaml | 1 + .../Bindings/display/mediatek/mediatek,dpi.yaml | 23 +- .../Bindings/display/mediatek/mediatek,dsi.yaml | 19 +- .../Bindings/display/mediatek/mediatek,gamma.yaml | 4 + .../Bindings/display/mediatek/mediatek,merge.yaml | 3 + .../Bindings/display/mediatek/mediatek,od.yaml | 3 + .../Bindings/display/mediatek/mediatek,ovl.yaml | 4 + .../Bindings/display/mediatek/mediatek,rdma.yaml | 4 + .../Bindings/display/mediatek/mediatek,split.yaml | 3 + .../Bindings/display/mediatek/mediatek,ufoe.yaml | 3 + .../Bindings/display/mediatek/mediatek,wdma.yaml | 3 + .../Bindings/display/msm/dp-controller.yaml | 1 + .../Bindings/display/msm/dsi-controller-main.yaml | 6 + .../Bindings/display/msm/dsi-phy-28nm.yaml | 3 +- .../device-tree/Bindings/display/msm/gmu.yaml | 53 +- .../device-tree/Bindings/display/msm/gpu.yaml | 61 +- .../Bindings/display/msm/qcom,mdp5.yaml | 1 + .../Bindings/display/msm/qcom,mdss.yaml | 1 + .../Bindings/display/msm/qcom,sc7180-dpu.yaml | 23 +- .../Bindings/display/msm/qcom,sm6350-mdss.yaml | 213 ++ .../Bindings/display/msm/qcom,sm6375-mdss.yaml | 215 ++ .../Bindings/display/msm/qcom,sm8350-mdss.yaml | 2 +- .../Bindings/display/panel/boe,tv101wum-nl6.yaml | 4 + .../Bindings/display/panel/novatek,nt36523.yaml | 16 +- .../Bindings/display/panel/panel-mipi-dbi-spi.yaml | 3 + .../Bindings/display/panel/panel-simple.yaml | 8 + .../display/panel/rocktech,jh057n00900.yaml | 2 + .../Bindings/display/panel/samsung,s6d7aa0.yaml | 70 + .../Bindings/display/panel/samsung,s6e8aa0.yaml | 2 +- .../Bindings/display/rockchip/rockchip-vop.yaml | 4 +- .../device-tree/Bindings/display/st,stm32-dsi.yaml | 2 - .../Bindings/display/tegra/nvidia,tegra20-vi.yaml | 59 + .../Bindings/display/tegra/nvidia,tegra20-vip.yaml | 41 + .../device-tree/Bindings/dma/stericsson,dma40.yaml | 36 +- .../device-tree/Bindings/dma/ti/k3-bcdma.yaml | 30 +- .../Bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 6 + .../Bindings/dvfs/performance-domain.yaml | 2 +- sys/contrib/device-tree/Bindings/eeprom/at25.yaml | 1 + .../device-tree/Bindings/example-schema.yaml | 6 +- .../Bindings/extcon/qcom,pm8941-misc.yaml | 14 +- .../device-tree/Bindings/extcon/wlf,arizona.yaml | 14 +- .../device-tree/Bindings/firmware/arm,scmi.yaml | 10 +- .../Bindings/firmware/brcm,kona-smc.yaml | 39 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 1 + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 2 +- .../Bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- .../Bindings/fpga/xlnx,versal-fpga.yaml | 2 +- .../Bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- .../Bindings/gpio/brcm,bcm63xx-gpio.yaml | 72 + .../device-tree/Bindings/gpio/gpio-delay.yaml | 79 + .../device-tree/Bindings/gpio/gpio-ep9301.yaml | 154 + .../device-tree/Bindings/gpio/gpio-mmio.yaml | 117 + .../device-tree/Bindings/gpio/gpio-pca9570.yaml | 4 + .../device-tree/Bindings/gpio/gpio-vf610.yaml | 7 + .../device-tree/Bindings/gpio/gpio-zynq.yaml | 2 +- .../device-tree/Bindings/gpio/st,stmpe-gpio.yaml | 53 + .../Bindings/gpio/x-powers,axp209-gpio.yaml | 1 + .../Bindings/gpio/xlnx,gpio-xilinx.yaml | 2 +- .../Bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml | 2 +- .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 2 +- .../device-tree/Bindings/gpu/arm,mali-midgard.yaml | 2 +- .../device-tree/Bindings/gpu/arm,mali-utgard.yaml | 1 + .../device-tree/Bindings/hwmon/adi,max31827.yaml | 54 + .../Bindings/hwmon/moortec,mr75203.yaml | 6 +- .../device-tree/Bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- .../Bindings/i3c/silvaco,i3c-master.yaml | 2 +- .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 5 + .../Bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + .../Bindings/iio/adc/qcom,spmi-vadc.yaml | 28 +- .../Bindings/iio/adc/rockchip-saradc.yaml | 1 + .../Bindings/iio/adc/ti,adc108s102.yaml | 2 +- .../Bindings/iio/addac/adi,ad74115.yaml | 3 - .../Bindings/iio/afe/voltage-divider.yaml | 2 +- .../Bindings/iio/imu/invensense,mpu6050.yaml | 3 + .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 1 + .../Bindings/iio/light/rohm,bu27008.yaml | 49 + .../device-tree/Bindings/iio/light/ti,opt4001.yaml | 68 + .../Bindings/iio/potentiometer/renesas,x9250.yaml | 78 + .../iio/pressure/honeywell,mprls0025pa.yaml | 104 + .../device-tree/Bindings/iio/st,st-sensors.yaml | 1 + .../Bindings/iio/temperature/melexis,mlx90614.yaml | 6 +- .../Bindings/iio/temperature/ti,tmp006.yaml | 42 + .../device-tree/Bindings/input/atmel,maxtouch.yaml | 7 + .../device-tree/Bindings/input/cypress,cyapa.yaml | 49 + .../device-tree/Bindings/input/goodix,gt7375p.yaml | 9 + .../Bindings/input/mediatek,pmic-keys.yaml | 2 +- .../device-tree/Bindings/input/pwm-vibrator.yaml | 2 + .../input/touchscreen/cypress,tt21000.yaml | 2 + .../Bindings/interconnect/fsl,imx8m-noc.yaml | 2 +- .../amlogic,meson-gpio-intc.yaml | 72 + .../interrupt-controller/loongson,eiointc.yaml | 59 + .../microchip,sama7g5-eic.yaml | 73 + .../interrupt-controller/ralink,rt2880-intc.yaml | 54 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 3 +- .../device-tree/Bindings/iommu/arm,smmu.yaml | 12 +- .../device-tree/Bindings/leds/awinic,aw200xx.yaml | 126 + .../Bindings/leds/backlight/kinetic,ktz8866.yaml | 30 +- .../Bindings/leds/backlight/lp855x-backlight.yaml | 149 + .../Bindings/leds/backlight/pwm-backlight.yaml | 1 - sys/contrib/device-tree/Bindings/leds/common.yaml | 2 - .../Bindings/leds/leds-class-multicolor.yaml | 2 +- .../device-tree/Bindings/leds/leds-lp55xx.yaml | 10 + .../device-tree/Bindings/leds/leds-mt6323.txt | 5 +- .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 30 +- .../device-tree/Bindings/leds/leds-sgm3140.yaml | 1 + .../Bindings/leds/qcom,spmi-flash-led.yaml | 2 + .../Bindings/leds/rohm,bd71828-leds.yaml | 2 +- .../Bindings/mailbox/brcm,bcm2835-mbox.yaml | 40 + .../Bindings/mailbox/nvidia,tegra186-hsp.yaml | 1 + .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + .../Bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 2 +- .../Bindings/media/i2c/maxim,max96712.yaml | 7 + .../Bindings/media/qcom,msm8916-camss.yaml | 2 +- .../Bindings/media/qcom,msm8996-camss.yaml | 2 +- .../Bindings/media/qcom,sdm660-camss.yaml | 2 +- .../Bindings/media/qcom,sdm845-camss.yaml | 2 +- .../Bindings/media/renesas,rzg2l-cru.yaml | 4 +- .../device-tree/Bindings/media/renesas,vin.yaml | 4 +- .../device-tree/Bindings/media/rockchip-rga.yaml | 4 +- .../device-tree/Bindings/media/rockchip-vpu.yaml | 1 + sys/contrib/device-tree/Bindings/media/s5p-mfc.txt | 78 - .../Bindings/media/samsung,s5p-mfc.yaml | 184 + .../Bindings/media/xilinx/xlnx,csi2rxss.yaml | 2 +- .../nuvoton,npcm-memory-controller.yaml | 50 + .../memory-controllers/nvidia,tegra20-emc.yaml | 2 +- .../memory-controllers/snps,dw-umctl2-ddrc.yaml | 3 +- .../Bindings/memory-controllers/ti,gpmc.yaml | 2 +- .../memory-controllers/xlnx,zynq-ddrc-a05.yaml | 3 +- .../device-tree/Bindings/mfd/adi,max77541.yaml | 68 + .../Bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 4 +- .../Bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 4 +- .../Bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 4 +- .../Bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 4 +- .../Bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 4 +- .../Bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 4 +- .../device-tree/Bindings/mfd/gateworks-gsc.yaml | 10 - .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 6 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 1 + .../device-tree/Bindings/mfd/richtek,rt5033.yaml | 138 + .../device-tree/Bindings/mfd/rockchip,rk806.yaml | 406 ++ .../device-tree/Bindings/mfd/samsung,s5m8767.yaml | 25 +- .../device-tree/Bindings/mfd/st,stpmic1.yaml | 2 +- .../Bindings/mfd/ti,j721e-system-controller.yaml | 2 +- .../device-tree/Bindings/mfd/ti,tps6594.yaml | 193 + .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 1 + sys/contrib/device-tree/Bindings/mips/ralink.yaml | 1 + .../device-tree/Bindings/misc/qcom,fastrpc.yaml | 6 +- .../device-tree/Bindings/misc/ti,j721e-esm.yaml | 53 + .../device-tree/Bindings/mmc/arm,pl18x.yaml | 7 +- .../Bindings/mmc/brcm,bcm2835-sdhost.yaml | 54 + .../device-tree/Bindings/mmc/brcm,kona-sdhci.yaml | 48 + .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 1 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 3 + .../Bindings/mtd/allwinner,sun4i-a10-nand.yaml | 5 +- .../Bindings/mtd/amlogic,meson-nand.yaml | 10 + .../device-tree/Bindings/mtd/brcm,brcmnand.yaml | 3 + .../device-tree/Bindings/mtd/denali,nand.yaml | 9 +- .../device-tree/Bindings/mtd/ingenic,nand.yaml | 4 + .../Bindings/mtd/intel,lgm-ebunand.yaml | 5 +- .../Bindings/mtd/marvell,nand-controller.yaml | 226 ++ .../device-tree/Bindings/mtd/mediatek,mtk-nfc.yaml | 3 +- .../device-tree/Bindings/mtd/mtd-physmap.yaml | 2 +- sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 2 +- .../device-tree/Bindings/mtd/nand-controller.yaml | 85 +- .../Bindings/mtd/partitions/partition.yaml | 1 + .../Bindings/mtd/partitions/partitions.yaml | 1 + .../device-tree/Bindings/mtd/qcom,nandc.yaml | 45 +- .../device-tree/Bindings/mtd/raw-nand-chip.yaml | 111 + .../Bindings/mtd/rockchip,nand-controller.yaml | 3 + .../Bindings/mtd/st,stm32-fmc2-nand.yaml | 3 + .../device-tree/Bindings/mtd/ti,am654-hbmc.yaml | 2 + .../Bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +- .../Bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +- sys/contrib/device-tree/Bindings/net/altr,tse.yaml | 4 +- .../Bindings/net/amlogic,meson-dwmac.yaml | 2 +- .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 5 +- .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 5 + .../device-tree/Bindings/net/brcm,bcmgenet.yaml | 2 +- .../device-tree/Bindings/net/cdns,macb.yaml | 11 + .../device-tree/Bindings/net/dsa/marvell.txt | 2 +- .../device-tree/Bindings/net/dsa/nxp,sja1105.yaml | 32 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 6 + .../device-tree/Bindings/net/intel,dwmac-plat.yaml | 2 +- .../device-tree/Bindings/net/maxlinear,gpy2xx.yaml | 11 +- .../device-tree/Bindings/net/mediatek,net.yaml | 7 +- .../device-tree/Bindings/net/mediatek-dwmac.yaml | 4 +- .../device-tree/Bindings/net/micrel,ks8851.yaml | 3 +- .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 2 +- .../Bindings/net/pse-pd/pse-controller.yaml | 2 +- .../device-tree/Bindings/net/qcom,ethqos.yaml | 12 +- .../device-tree/Bindings/net/rockchip-dwmac.yaml | 12 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 3 + .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 4 +- .../Bindings/net/toshiba,visconti-dwmac.yaml | 2 +- .../Bindings/net/wireless/brcm,bcm4329-fmac.yaml | 6 +- .../Bindings/net/wireless/qcom,ath10k.yaml | 4 + .../Bindings/net/xlnx,axi-ethernet.yaml | 183 + .../device-tree/Bindings/nvmem/brcm,nvram.yaml | 15 + .../device-tree/Bindings/nvmem/imx-ocotp.yaml | 26 +- .../Bindings/nvmem/layouts/fixed-cell.yaml | 31 + .../Bindings/nvmem/layouts/fixed-layout.yaml | 50 + .../Bindings/nvmem/layouts/nvmem-layout.yaml | 5 +- .../device-tree/Bindings/nvmem/mediatek,efuse.yaml | 1 + .../device-tree/Bindings/nvmem/mxs-ocotp.yaml | 8 +- sys/contrib/device-tree/Bindings/nvmem/nvmem.yaml | 61 +- .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 9 +- .../device-tree/Bindings/nvmem/qcom,spmi-sdam.yaml | 6 - sys/contrib/device-tree/Bindings/nvmem/rmem.yaml | 1 + .../device-tree/Bindings/nvmem/rockchip,otp.yaml | 122 + .../Bindings/nvmem/socionext,uniphier-efuse.yaml | 3 - .../Bindings/nvmem/sunplus,sp7021-ocotp.yaml | 6 - .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 2 + .../Bindings/pci/rockchip,rk3399-pcie-ep.yaml | 4 +- .../device-tree/Bindings/pci/rockchip-dw-pcie.yaml | 16 +- .../Bindings/pci/xilinx-versal-cpm.yaml | 2 +- .../Bindings/perf/amlogic,g12-ddr-pmu.yaml | 4 +- .../device-tree/Bindings/perf/fsl-imx-ddr.yaml | 3 +- .../Bindings/phy/brcm,brcmstb-usb-phy.yaml | 4 +- .../Bindings/phy/brcm,kona-usb2-phy.yaml | 36 + .../device-tree/Bindings/phy/cdns,salvo-phy.yaml | 6 + .../Bindings/phy/fsl,imx8mq-usb-phy.yaml | 47 + .../device-tree/Bindings/phy/fsl,mxs-usbphy.yaml | 128 + .../device-tree/Bindings/phy/intel,combo-phy.yaml | 2 +- .../device-tree/Bindings/phy/mediatek,dsi-phy.yaml | 6 +- .../Bindings/phy/mixel,mipi-dsi-phy.yaml | 9 - .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 34 +- .../device-tree/Bindings/phy/qcom,edp-phy.yaml | 3 + .../Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 +- .../Bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 18 +- .../Bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 27 - .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 3 +- .../Bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml | 55 + .../Bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 6 + .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 +- .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 65 +- .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 51 + .../device-tree/Bindings/phy/qcom,usb-hs-phy.yaml | 5 +- .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 1 + .../Bindings/pinctrl/atmel,at91-pio4-pinctrl.txt | 3 +- .../pinctrl/nvidia,tegra234-pinmux-aon.yaml | 78 + .../pinctrl/nvidia,tegra234-pinmux-common.yaml | 66 + .../Bindings/pinctrl/nvidia,tegra234-pinmux.yaml | 139 + .../Bindings/pinctrl/qcom,ipq5018-tlmm.yaml | 127 + .../Bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + .../Bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 2 +- .../Bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 12 +- .../Bindings/pinctrl/qcom,sdx65-tlmm.yaml | 2 +- .../Bindings/pinctrl/qcom,sdx75-tlmm.yaml | 137 + .../Bindings/pinctrl/qcom,sm7150-tlmm.yaml | 11 +- .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 4 +- .../Bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- .../Bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 3 +- .../power/reset/atmel,at91sam9260-shdwc.yaml | 82 + .../Bindings/power/reset/atmel,sama5d2-shdwc.yaml | 114 + .../power/reset/brcm,bcm21664-resetmgr.yaml | 31 + .../Bindings/power/reset/nvmem-reboot-mode.yaml | 52 + .../device-tree/Bindings/power/reset/qcom,pon.yaml | 20 +- .../Bindings/power/reset/restart-handler.yaml | 2 +- .../Bindings/power/reset/xlnx,zynqmp-power.yaml | 2 +- .../device-tree/Bindings/power/supply/bq256xx.yaml | 18 + .../power/supply/qcom,pmi8998-charger.yaml | 82 + .../power/supply/richtek,rt5033-battery.yaml | 2 +- .../power/supply/richtek,rt5033-charger.yaml | 65 + .../supply/x-powers,axp20x-usb-power-supply.yaml | 1 + .../Bindings/pwm/atmel,at91sam-pwm.yaml | 2 +- sys/contrib/device-tree/Bindings/pwm/imx-pwm.yaml | 4 + .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + .../Bindings/pwm/mediatek,pwm-disp.yaml | 4 +- sys/contrib/device-tree/Bindings/pwm/mxs-pwm.yaml | 2 +- .../device-tree/Bindings/pwm/pwm-bcm2835.yaml | 43 + sys/contrib/device-tree/Bindings/pwm/pwm.yaml | 2 +- .../device-tree/Bindings/pwm/renesas,pwm-rcar.yaml | 1 + .../Bindings/regulator/adi,max77541-regulator.yaml | 38 + .../Bindings/regulator/mt6358-regulator.txt | 34 +- .../device-tree/Bindings/regulator/pfuze100.yaml | 3 + .../Bindings/regulator/pwm-regulator.yaml | 1 + .../regulator/qcom,usb-vbus-regulator.yaml | 10 +- .../Bindings/regulator/renesas,raa215300.yaml | 85 + .../Bindings/regulator/ti,tps62870.yaml | 52 + .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- .../Bindings/remoteproc/st,stm32-rproc.yaml | 44 +- .../Bindings/remoteproc/ti,pru-consumer.yaml | 2 +- .../Bindings/reserved-memory/framebuffer.yaml | 2 +- .../Bindings/reset/nuvoton,ma35d1-reset.yaml | 45 + .../Bindings/reset/xlnx,zynqmp-reset.yaml | 52 + sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 55 +- .../device-tree/Bindings/riscv/extensions.yaml | 250 ++ sys/contrib/device-tree/Bindings/riscv/thead.yaml | 29 + .../device-tree/Bindings/rtc/isil,isl1208.yaml | 100 + .../device-tree/Bindings/rtc/loongson,rtc.yaml | 57 + sys/contrib/device-tree/Bindings/rtc/rtc.yaml | 2 +- .../device-tree/Bindings/rtc/trivial-rtc.yaml | 2 - .../device-tree/Bindings/rtc/xlnx,zynqmp-rtc.yaml | 2 +- .../Bindings/serial/atmel,at91-usart.yaml | 4 +- .../device-tree/Bindings/serial/cdns,uart.yaml | 2 +- .../Bindings/serial/nuvoton,ma35d1-serial.yaml | 48 + .../device-tree/Bindings/slimbus/slimbus.yaml | 2 +- .../Bindings/soc/bcm/brcm,bcm23550-cdc.yaml | 35 + .../Bindings/soc/mediatek/mediatek,pwrap.yaml | 1 + .../Bindings/soc/nuvoton/nuvoton,npcm-gcr.yaml | 50 + .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + .../device-tree/Bindings/soc/qcom/qcom,eud.yaml | 4 +- .../Bindings/soc/qcom/qcom,rpm-master-stats.yaml | 69 + .../Bindings/soc/qcom/qcom,rpmh-rsc.yaml | 2 + .../Bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + .../device-tree/Bindings/soc/qcom/qcom-stats.yaml | 2 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 15 +- .../Bindings/soc/samsung/exynos-pmu.yaml | 5 + .../device-tree/Bindings/sound/adi,max98388.yaml | 79 + .../device-tree/Bindings/sound/adi,ssm2518.yaml | 47 + .../device-tree/Bindings/sound/adi,ssm3515.yaml | 49 + .../Bindings/sound/audio-graph-card2.yaml | 20 +- .../device-tree/Bindings/sound/audio-graph.yaml | 6 +- .../device-tree/Bindings/sound/cirrus,cs35l45.yaml | 10 +- .../device-tree/Bindings/sound/cirrus,cs42l51.yaml | 11 + .../device-tree/Bindings/sound/dialog,da7219.yaml | 237 ++ .../device-tree/Bindings/sound/fsl-asoc-card.txt | 2 + .../Bindings/sound/google,chv3-codec.yaml | 31 + .../Bindings/sound/google,chv3-i2s.yaml | 44 + .../Bindings/sound/google,sc7180-trogdor.yaml | 5 +- .../device-tree/Bindings/sound/ingenic,aic.yaml | 1 + .../Bindings/sound/loongson,ls-audio-card.yaml | 70 + .../Bindings/sound/mediatek,mt8188-afe.yaml | 66 +- .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 27 +- .../Bindings/sound/microchip,sama7g5-pdmc.yaml | 8 +- .../Bindings/sound/nuvoton,nau8315.yaml | 44 + .../Bindings/sound/nuvoton,nau8540.yaml | 40 + .../Bindings/sound/nuvoton,nau8810.yaml | 45 + .../Bindings/sound/nuvoton,nau8824.yaml | 182 + .../Bindings/sound/nuvoton,nau8825.yaml | 239 ++ .../Bindings/sound/nvidia,tegra-audio-common.yaml | 4 +- .../device-tree/Bindings/sound/qcom,lpass-cpu.yaml | 2 +- .../device-tree/Bindings/sound/qcom,q6apm-dai.yaml | 4 +- .../Bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 4 +- .../Bindings/sound/qcom,q6dsp-lpass-ports.yaml | 4 +- .../device-tree/Bindings/sound/qcom,wsa8840.yaml | 66 + .../device-tree/Bindings/sound/realtek,rt1016.yaml | 40 + .../Bindings/sound/snps,designware-i2s.yaml | 3 +- .../device-tree/Bindings/sound/st,stm32-i2s.yaml | 11 + .../Bindings/sound/starfive,jh7110-tdm.yaml | 98 + .../device-tree/Bindings/sound/tas2562.yaml | 4 +- .../device-tree/Bindings/sound/tas2770.yaml | 4 +- .../device-tree/Bindings/sound/tas27xx.yaml | 4 +- .../device-tree/Bindings/sound/ti,tas2781.yaml | 74 + .../Bindings/sound/ti,tlv320aic32x4.yaml | 101 + .../device-tree/Bindings/sound/ti,tlv320aic3x.yaml | 1 + .../device-tree/Bindings/sound/wlf,wm8903.yaml | 4 +- .../Bindings/soundwire/qcom,soundwire.yaml | 39 +- .../Bindings/spi/allwinner,sun4i-a10-spi.yaml | 8 +- .../Bindings/spi/allwinner,sun6i-a31-spi.yaml | 18 +- .../Bindings/spi/atmel,at91rm9200-spi.yaml | 4 + .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 18 +- .../Bindings/spi/qcom,spi-qcom-qspi.yaml | 3 + .../Bindings/spi/renesas,rzv2m-csi.yaml | 70 + .../device-tree/Bindings/spi/samsung,spi.yaml | 2 - .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 2 + .../Bindings/spi/socionext,uniphier-spi.yaml | 3 - .../device-tree/Bindings/spi/spi-cadence.yaml | 2 +- .../device-tree/Bindings/spi/spi-controller.yaml | 2 +- .../device-tree/Bindings/spi/spi-xilinx.yaml | 2 +- .../device-tree/Bindings/spi/spi-zynqmp-qspi.yaml | 8 +- .../device-tree/Bindings/spi/xlnx,zynq-qspi.yaml | 2 +- .../Bindings/spmi/mtk,spmi-mtk-pmif.yaml | 13 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 2 + sys/contrib/device-tree/Bindings/sram/sram.yaml | 1 + .../Bindings/thermal/armada-thermal.txt | 1 + .../Bindings/thermal/brcm,bcm2835-thermal.yaml | 48 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 32 +- .../Bindings/timer/brcm,kona-timer.yaml | 52 + .../device-tree/Bindings/timer/cdns,ttc.yaml | 2 +- .../device-tree/Bindings/timer/fsl,imxgpt.yaml | 4 + .../Bindings/timer/loongson,ls1x-pwmtimer.yaml | 48 + .../Bindings/timer/ralink,rt2880-timer.yaml | 44 + .../device-tree/Bindings/timer/sifive,clint.yaml | 22 +- .../timestamp/hardware-timestamps-common.yaml | 2 +- .../device-tree/Bindings/trivial-devices.yaml | 2 + sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 25 + .../Bindings/ufs/samsung,exynos-ufs.yaml | 2 +- .../device-tree/Bindings/usb/ci-hdrc-usb2.yaml | 4 +- sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 1 + .../device-tree/Bindings/usb/dwc3-xilinx.yaml | 2 +- .../device-tree/Bindings/usb/fsl,imx8qm-cdns3.yaml | 103 + .../device-tree/Bindings/usb/generic-ehci.yaml | 1 + .../device-tree/Bindings/usb/generic-ohci.yaml | 17 +- .../device-tree/Bindings/usb/mediatek,mtu3.yaml | 2 +- .../Bindings/usb/microchip,usb5744.yaml | 107 + .../Bindings/usb/nvidia,tegra-xudc.yaml | 7 +- .../device-tree/Bindings/usb/onnn,nb7vpq904m.yaml | 141 + .../device-tree/Bindings/usb/qcom,dwc3.yaml | 24 +- .../device-tree/Bindings/usb/qcom,pmic-typec.yaml | 190 + .../device-tree/Bindings/usb/snps,dwc3.yaml | 6 +- .../Bindings/usb/starfive,jh7110-usb.yaml | 115 + .../device-tree/Bindings/usb/ti,am62-usb.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/usb251xb.yaml | 2 +- .../device-tree/Bindings/usb/xlnx,usb2.yaml | 2 +- .../device-tree/Bindings/vendor-prefixes.yaml | 12 + .../Bindings/watchdog/brcm,kona-wdt.yaml | 41 + .../Bindings/watchdog/cdns,wdt-r1p2.yaml | 62 + .../Bindings/watchdog/loongson,ls1x-wdt.yaml | 42 + .../device-tree/Bindings/watchdog/watchdog.yaml | 4 +- .../Bindings/watchdog/xlnx,versal-wwdt.yaml | 50 + .../Bindings/watchdog/xlnx,xps-timebase-wdt.yaml | 4 +- .../device-tree/include/dt-bindings/arm/qcom,ids.h | 11 + .../clock/amlogic,a1-peripherals-clkc.h | 115 + .../dt-bindings/clock/amlogic,a1-pll-clkc.h | 20 + .../include/dt-bindings/clock/nuvoton,ma35d1-clk.h | 253 ++ .../include/dt-bindings/clock/qcom,ipq9574-gcc.h | 4 + .../dt-bindings/clock/qcom,sc8280xp-lpasscc.h | 17 + .../include/dt-bindings/clock/qcom,sdx75-gcc.h | 193 + .../dt-bindings/clock/qcom,sm8350-videocc.h | 35 + .../include/dt-bindings/clock/qcom,sm8450-gpucc.h | 48 + .../dt-bindings/clock/qcom,sm8450-videocc.h | 38 + .../include/dt-bindings/clock/qcom,sm8550-gpucc.h | 48 + .../include/dt-bindings/clock/stm32mp13-clks.h | 6 +- .../include/dt-bindings/gpio/tegra234-gpio.h | 20 +- .../dt-bindings/interconnect/qcom,msm8996-cbf.h | 12 + .../include/dt-bindings/leds/leds-lp55xx.h | 10 + .../include/dt-bindings/memory/tegra234-mc.h | 5 + .../include/dt-bindings/mfd/stm32f7-rcc.h | 1 + .../include/dt-bindings/mux/ti-serdes.h | 62 + .../include/dt-bindings/pinctrl/stm32-pinfunc.h | 3 + .../include/dt-bindings/power/qcom-rpmpd.h | 38 +- .../include/dt-bindings/reset/mt8188-resets.h | 5 + .../dt-bindings/reset/nuvoton,ma35d1-reset.h | 108 + .../include/dt-bindings/reset/qcom,ipq9574-gcc.h | 1 + .../dt-bindings/reset/qcom,sm8350-videocc.h | 18 + .../include/dt-bindings/reset/qcom,sm8450-gpucc.h | 20 + .../include/dt-bindings/reset/stm32mp13-resets.h | 4 +- .../dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 8 + .../dt-bindings/thermal/tegra234-bpmp-thermal.h | 19 + .../src/arm/{ => actions}/owl-s500-cubieboard6.dts | 0 .../arm/{ => actions}/owl-s500-guitar-bb-rev-b.dts | 0 .../src/arm/{ => actions}/owl-s500-guitar.dtsi | 0 .../arm/{ => actions}/owl-s500-labrador-base-m.dts | 0 .../arm/{ => actions}/owl-s500-labrador-v2.dtsi | 0 .../src/arm/{ => actions}/owl-s500-roseapplepi.dts | 0 .../src/arm/{ => actions}/owl-s500-sparky.dts | 0 .../src/arm/{ => actions}/owl-s500.dtsi | 0 .../src/arm/{ => airoha}/en7523-evb.dts | 0 .../device-tree/src/arm/{ => airoha}/en7523.dtsi | 2 + .../src/arm/{ => allwinner}/axp152.dtsi | 0 .../src/arm/{ => allwinner}/axp209.dtsi | 7 + .../src/arm/{ => allwinner}/axp223.dtsi | 0 .../src/arm/{ => allwinner}/axp22x.dtsi | 0 .../src/arm/{ => allwinner}/axp809.dtsi | 0 .../src/arm/{ => allwinner}/axp81x.dtsi | 0 .../src/arm/{ => allwinner}/sun4i-a10-a1000.dts | 0 .../arm/{ => allwinner}/sun4i-a10-ba10-tvbox.dts | 0 .../{ => allwinner}/sun4i-a10-chuwi-v7-cw0825.dts | 0 .../arm/{ => allwinner}/sun4i-a10-cubieboard.dts | 0 .../{ => allwinner}/sun4i-a10-dserve-dsrv9703c.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-gemei-g9.dts | 0 .../arm/{ => allwinner}/sun4i-a10-hackberry.dts | 0 .../arm/{ => allwinner}/sun4i-a10-hyundai-a7hd.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-inet1.dts | 0 .../arm/{ => allwinner}/sun4i-a10-inet97fv2.dts | 0 .../arm/{ => allwinner}/sun4i-a10-inet9f-rev03.dts | 0 .../sun4i-a10-itead-iteaduino-plus.dts | 0 .../arm/{ => allwinner}/sun4i-a10-jesurun-q5.dts | 0 .../arm/{ => allwinner}/sun4i-a10-marsboard.dts | 0 .../arm/{ => allwinner}/sun4i-a10-mini-xplus.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-mk802.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-mk802ii.dts | 0 .../{ => allwinner}/sun4i-a10-olinuxino-lime.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-pcduino.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10-pcduino2.dts | 0 .../{ => allwinner}/sun4i-a10-pov-protab2-ips9.dts | 0 .../arm/{ => allwinner}/sun4i-a10-topwise-a721.dts | 0 .../src/arm/{ => allwinner}/sun4i-a10.dtsi | 0 .../arm/{ => allwinner}/sun5i-a10s-auxtek-t003.dts | 0 .../arm/{ => allwinner}/sun5i-a10s-auxtek-t004.dts | 0 .../src/arm/{ => allwinner}/sun5i-a10s-mk802.dts | 0 .../{ => allwinner}/sun5i-a10s-olinuxino-micro.dts | 0 .../{ => allwinner}/sun5i-a10s-r7-tv-dongle.dts | 0 .../src/arm/{ => allwinner}/sun5i-a10s-wobo-i5.dts | 0 .../src/arm/{ => allwinner}/sun5i-a10s.dtsi | 0 .../{ => allwinner}/sun5i-a13-difrnce-dit4350.dts | 0 .../sun5i-a13-empire-electronix-d709.dts | 0 .../sun5i-a13-empire-electronix-m712.dts | 0 .../src/arm/{ => allwinner}/sun5i-a13-hsg-h702.dts | 0 .../{ => allwinner}/sun5i-a13-inet-98v-rev2.dts | 0 .../arm/{ => allwinner}/sun5i-a13-licheepi-one.dts | 0 .../{ => allwinner}/sun5i-a13-olinuxino-micro.dts | 0 .../arm/{ => allwinner}/sun5i-a13-olinuxino.dts | 0 .../sun5i-a13-pocketbook-touch-lux-3.dts | 0 .../arm/{ => allwinner}/sun5i-a13-q8-tablet.dts | 0 .../src/arm/{ => allwinner}/sun5i-a13-utoo-p66.dts | 0 .../src/arm/{ => allwinner}/sun5i-a13.dtsi | 0 .../src/arm/{ => allwinner}/sun5i-gr8-chip-pro.dts | 0 .../src/arm/{ => allwinner}/sun5i-gr8-evb.dts | 0 .../src/arm/{ => allwinner}/sun5i-gr8.dtsi | 0 .../src/arm/{ => allwinner}/sun5i-r8-chip.dts | 6 + .../src/arm/{ => allwinner}/sun5i-r8.dtsi | 0 .../sun5i-reference-design-tablet.dtsi | 0 .../device-tree/src/arm/{ => allwinner}/sun5i.dtsi | 11 +- .../arm/{ => allwinner}/sun6i-a31-app4-evb1.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31-colombus.dts | 0 .../arm/{ => allwinner}/sun6i-a31-hummingbird.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31-i7.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31-m9.dts | 0 .../{ => allwinner}/sun6i-a31-mele-a1000g-quad.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31.dtsi | 0 .../sun6i-a31s-colorfly-e708-q1.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31s-cs908.dts | 0 .../arm/{ => allwinner}/sun6i-a31s-inet-q972.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31s-primo81.dts | 0 .../{ => allwinner}/sun6i-a31s-sina31s-core.dtsi | 0 .../src/arm/{ => allwinner}/sun6i-a31s-sina31s.dts | 0 .../{ => allwinner}/sun6i-a31s-sinovoip-bpi-m2.dts | 0 .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 0 .../src/arm/{ => allwinner}/sun6i-a31s.dtsi | 0 .../sun6i-reference-design-tablet.dtsi | 0 .../{ => allwinner}/sun7i-a20-bananapi-m1-plus.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20-bananapi.dts | 0 .../arm/{ => allwinner}/sun7i-a20-bananapro.dts | 0 .../arm/{ => allwinner}/sun7i-a20-cubieboard2.dts | 0 .../arm/{ => allwinner}/sun7i-a20-cubietruck.dts | 0 .../{ => allwinner}/sun7i-a20-haoyu-marsboard.dts | 0 .../arm/{ => allwinner}/sun7i-a20-hummingbird.dts | 0 .../arm/{ => allwinner}/sun7i-a20-i12-tvbox.dts | 0 .../arm/allwinner/sun7i-a20-icnova-a20-adb4006.dts | 137 + .../src/arm/allwinner/sun7i-a20-icnova-a20.dtsi | 62 + .../arm/{ => allwinner}/sun7i-a20-icnova-swac.dts | 0 .../arm/{ => allwinner}/sun7i-a20-itead-ibox.dts | 0 .../arm/{ => allwinner}/sun7i-a20-lamobo-r1.dts | 0 .../sun7i-a20-linutronix-testbox-v2.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20-m3.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20-mk808c.dts | 0 .../sun7i-a20-olimex-som-evb-emmc.dts | 0 .../{ => allwinner}/sun7i-a20-olimex-som-evb.dts | 0 .../sun7i-a20-olimex-som204-evb-emmc.dts | 0 .../sun7i-a20-olimex-som204-evb.dts | 0 .../sun7i-a20-olinuxino-lime-emmc.dts | 0 .../{ => allwinner}/sun7i-a20-olinuxino-lime.dts | 0 .../sun7i-a20-olinuxino-lime2-emmc.dts | 0 .../{ => allwinner}/sun7i-a20-olinuxino-lime2.dts | 0 .../sun7i-a20-olinuxino-micro-emmc.dts | 0 .../{ => allwinner}/sun7i-a20-olinuxino-micro.dts | 0 .../{ => allwinner}/sun7i-a20-orangepi-mini.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20-orangepi.dts | 0 .../{ => allwinner}/sun7i-a20-pcduino3-nano.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20-pcduino3.dts | 0 .../{ => allwinner}/sun7i-a20-wexler-tab7200.dts | 0 .../{ => allwinner}/sun7i-a20-wits-pro-a20-dkt.dts | 0 .../src/arm/{ => allwinner}/sun7i-a20.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-a23-a33.dtsi | 2 +- .../src/arm/{ => allwinner}/sun8i-a23-evb.dts | 0 .../src/arm/{ => allwinner}/sun8i-a23-gt90h-v4.dts | 0 .../src/arm/{ => allwinner}/sun8i-a23-inet86dz.dts | 0 .../{ => allwinner}/sun8i-a23-ippo-q8h-v1.2.dts | 0 .../arm/{ => allwinner}/sun8i-a23-ippo-q8h-v5.dts | 0 .../sun8i-a23-polaroid-mid2407pxe03.dts | 0 .../sun8i-a23-polaroid-mid2809pxe04.dts | 0 .../arm/{ => allwinner}/sun8i-a23-q8-tablet.dts | 0 .../src/arm/{ => allwinner}/sun8i-a23.dtsi | 0 .../arm/{ => allwinner}/sun8i-a33-et-q8-v1.6.dts | 0 .../arm/{ => allwinner}/sun8i-a33-ga10h-v1.1.dts | 0 .../{ => allwinner}/sun8i-a33-inet-d978-rev2.dts | 0 .../{ => allwinner}/sun8i-a33-ippo-q8h-v1.2.dts | 0 .../arm/{ => allwinner}/sun8i-a33-olinuxino.dts | 0 .../arm/{ => allwinner}/sun8i-a33-q8-tablet.dts | 0 .../{ => allwinner}/sun8i-a33-sinlinx-sina33.dts | 0 .../src/arm/{ => allwinner}/sun8i-a33.dtsi | 0 .../sun8i-a83t-allwinner-h8homlet-v2.dts | 0 .../arm/{ => allwinner}/sun8i-a83t-bananapi-m3.dts | 0 .../{ => allwinner}/sun8i-a83t-cubietruck-plus.dts | 0 .../arm/{ => allwinner}/sun8i-a83t-tbs-a711.dts | 0 .../src/arm/{ => allwinner}/sun8i-a83t.dtsi | 2 +- .../sun8i-h2-plus-bananapi-m2-zero.dts | 0 .../sun8i-h2-plus-libretech-all-h3-cc.dts | 0 .../{ => allwinner}/sun8i-h2-plus-orangepi-r1.dts | 0 .../sun8i-h2-plus-orangepi-zero.dts | 0 .../sun8i-h3-bananapi-m2-plus-v1.2.dts | 0 .../{ => allwinner}/sun8i-h3-bananapi-m2-plus.dts | 0 .../arm/{ => allwinner}/sun8i-h3-beelink-x2.dts | 0 .../sun8i-h3-emlid-neutis-n5h3-devboard.dts | 0 .../sun8i-h3-emlid-neutis-n5h3.dtsi | 2 +- .../sun8i-h3-libretech-all-h3-cc.dts | 0 .../{ => allwinner}/sun8i-h3-mapleboard-mp130.dts | 0 .../arm/{ => allwinner}/sun8i-h3-nanopi-duo2.dts | 0 .../{ => allwinner}/sun8i-h3-nanopi-m1-plus.dts | 0 .../src/arm/{ => allwinner}/sun8i-h3-nanopi-m1.dts | 0 .../{ => allwinner}/sun8i-h3-nanopi-neo-air.dts | 0 .../arm/{ => allwinner}/sun8i-h3-nanopi-neo.dts | 0 .../src/arm/{ => allwinner}/sun8i-h3-nanopi-r1.dts | 0 .../src/arm/{ => allwinner}/sun8i-h3-nanopi.dtsi | 0 .../arm/{ => allwinner}/sun8i-h3-orangepi-2.dts | 0 .../arm/{ => allwinner}/sun8i-h3-orangepi-lite.dts | 0 .../arm/{ => allwinner}/sun8i-h3-orangepi-one.dts | 0 .../{ => allwinner}/sun8i-h3-orangepi-pc-plus.dts | 0 .../arm/{ => allwinner}/sun8i-h3-orangepi-pc.dts | 0 .../arm/{ => allwinner}/sun8i-h3-orangepi-plus.dts | 0 .../{ => allwinner}/sun8i-h3-orangepi-plus2e.dts | 0 .../sun8i-h3-orangepi-zero-plus2.dts | 0 .../arm/{ => allwinner}/sun8i-h3-rervision-dvk.dts | 0 .../src/arm/{ => allwinner}/sun8i-h3-zeropi.dts | 0 .../src/arm/{ => allwinner}/sun8i-h3.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-q8-common.dtsi | 0 .../arm/{ => allwinner}/sun8i-r16-bananapi-m2m.dts | 0 .../sun8i-r16-nintendo-nes-classic.dts | 0 .../sun8i-r16-nintendo-super-nes-classic.dts | 0 .../src/arm/{ => allwinner}/sun8i-r16-parrot.dts | 0 .../sun8i-r40-bananapi-m2-ultra.dts | 0 .../src/arm/{ => allwinner}/sun8i-r40-cpu-opp.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-r40-feta40i.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-r40-oka40i-c.dts | 0 .../src/arm/{ => allwinner}/sun8i-r40.dtsi | 0 .../sun8i-reference-design-tablet.dtsi | 0 .../{ => allwinner}/sun8i-s3-elimo-impetus.dtsi | 0 .../arm/{ => allwinner}/sun8i-s3-elimo-initium.dts | 0 .../{ => allwinner}/sun8i-s3-lichee-zero-plus.dts | 0 .../src/arm/{ => allwinner}/sun8i-s3-pinecube.dts | 0 .../sun8i-t113s-mangopi-mq-r-t113.dts | 0 .../src/arm/{ => allwinner}/sun8i-t113s.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-t3-cqa3t-bv3.dts | 0 .../arm/{ => allwinner}/sun8i-v3-sl631-imx179.dts | 0 .../src/arm/{ => allwinner}/sun8i-v3-sl631.dtsi | 0 .../src/arm/{ => allwinner}/sun8i-v3.dtsi | 0 .../sun8i-v3s-licheepi-zero-dock.dts | 0 .../{ => allwinner}/sun8i-v3s-licheepi-zero.dts | 0 .../src/arm/{ => allwinner}/sun8i-v3s.dtsi | 2 +- .../sun8i-v40-bananapi-m2-berry.dts | 0 .../arm/{ => allwinner}/sun9i-a80-cubieboard4.dts | 0 .../src/arm/{ => allwinner}/sun9i-a80-optimus.dts | 0 .../src/arm/{ => allwinner}/sun9i-a80.dtsi | 0 .../suniv-f1c100s-licheepi-nano.dts | 0 .../src/arm/{ => allwinner}/suniv-f1c100s.dtsi | 0 .../{ => allwinner}/suniv-f1c200s-lctech-pi.dts | 0 .../suniv-f1c200s-popstick-v1.1.dts | 0 .../sunxi-bananapi-m2-plus-v1.2.dtsi | 0 .../{ => allwinner}/sunxi-bananapi-m2-plus.dtsi | 0 .../{ => allwinner}/sunxi-common-regulators.dtsi | 0 .../sunxi-d1s-t113-mangopi-mq-r.dtsi | 0 .../{ => allwinner}/sunxi-h3-h5-emlid-neutis.dtsi | 0 .../src/arm/{ => allwinner}/sunxi-h3-h5.dtsi | 0 .../{ => allwinner}/sunxi-itead-core-common.dtsi | 0 .../{ => allwinner}/sunxi-libretech-all-h3-cc.dtsi | 0 .../{ => allwinner}/sunxi-libretech-all-h3-it.dtsi | 0 .../sunxi-reference-design-tablet.dtsi | 0 .../{ => alphascale}/alphascale-asm9260-devkit.dts | 0 .../arm/{ => alphascale}/alphascale-asm9260.dtsi | 0 .../device-tree/src/arm/{ => amazon}/alpine-db.dts | 0 .../device-tree/src/arm/{ => amazon}/alpine.dtsi | 0 .../device-tree/src/arm/{ => amlogic}/meson.dtsi | 0 .../src/arm/{ => amlogic}/meson6-atv1200.dts | 0 .../device-tree/src/arm/{ => amlogic}/meson6.dtsi | 0 .../src/arm/{ => amlogic}/meson8-minix-neo-x8.dts | 0 .../device-tree/src/arm/{ => amlogic}/meson8.dtsi | 4 +- .../src/arm/{ => amlogic}/meson8b-ec100.dts | 0 .../src/arm/{ => amlogic}/meson8b-mxq.dts | 0 .../src/arm/{ => amlogic}/meson8b-odroidc1.dts | 0 .../device-tree/src/arm/{ => amlogic}/meson8b.dtsi | 4 +- .../src/arm/{ => amlogic}/meson8m2-mxiii-plus.dts | 0 .../src/arm/{ => amlogic}/meson8m2.dtsi | 0 .../arm-realview-eb-11mp-bbrevd-ctrevb.dts | 0 .../arm/{ => arm}/arm-realview-eb-11mp-bbrevd.dts | 0 .../arm/{ => arm}/arm-realview-eb-11mp-ctrevb.dts | 0 .../src/arm/{ => arm}/arm-realview-eb-11mp.dts | 0 .../arm/{ => arm}/arm-realview-eb-a9mp-bbrevd.dts | 0 .../src/arm/{ => arm}/arm-realview-eb-a9mp.dts | 0 .../src/arm/{ => arm}/arm-realview-eb-bbrevd.dts | 0 .../src/arm/{ => arm}/arm-realview-eb-bbrevd.dtsi | 0 .../src/arm/{ => arm}/arm-realview-eb-mp.dtsi | 0 .../src/arm/{ => arm}/arm-realview-eb.dts | 0 .../src/arm/{ => arm}/arm-realview-eb.dtsi | 0 .../src/arm/{ => arm}/arm-realview-pb1176.dts | 0 .../src/arm/{ => arm}/arm-realview-pb11mp.dts | 0 .../src/arm/{ => arm}/arm-realview-pba8.dts | 0 .../src/arm/{ => arm}/arm-realview-pbx-a9.dts | 0 .../src/arm/{ => arm}/arm-realview-pbx.dtsi | 0 .../device-tree/src/arm/{ => arm}/integrator.dtsi | 0 .../src/arm/{ => arm}/integratorap-im-pd1.dts | 0 .../device-tree/src/arm/{ => arm}/integratorap.dts | 2 +- .../device-tree/src/arm/{ => arm}/integratorcp.dts | 0 .../device-tree/src/arm/{ => arm}/mps2-an385.dts | 0 .../device-tree/src/arm/{ => arm}/mps2-an399.dts | 0 .../device-tree/src/arm/{ => arm}/mps2.dtsi | 2 +- .../src/arm/{ => arm}/versatile-ab-ib2.dts | 0 .../device-tree/src/arm/{ => arm}/versatile-ab.dts | 0 .../device-tree/src/arm/{ => arm}/versatile-pb.dts | 0 .../src/arm/{ => arm}/vexpress-v2m-rs1.dtsi | 0 .../src/arm/{ => arm}/vexpress-v2m.dtsi | 0 .../src/arm/{ => arm}/vexpress-v2p-ca15-tc1.dts | 0 .../src/arm/{ => arm}/vexpress-v2p-ca15_a7.dts | 0 .../src/arm/{ => arm}/vexpress-v2p-ca5s.dts | 0 .../src/arm/{ => arm}/vexpress-v2p-ca9.dts | 0 .../src/arm/aspeed-bmc-arm-centriq2400-rep.dts | 225 -- .../device-tree/src/arm/aspeed-bmc-opp-mihawk.dts | 1381 ------- .../src/arm/{ => aspeed}/aspeed-ast2500-evb.dts | 0 .../src/arm/{ => aspeed}/aspeed-ast2600-evb-a1.dts | 0 .../src/arm/{ => aspeed}/aspeed-ast2600-evb.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-amd-daytonax.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-amd-ethanolx.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-ampere-mtjade.dts | 0 .../{ => aspeed}/aspeed-bmc-ampere-mtmitchell.dts | 0 .../aspeed-bmc-arm-stardragon4800-rep2.dts | 0 .../{ => aspeed}/aspeed-bmc-asrock-e3c246d4i.dts | 0 .../{ => aspeed}/aspeed-bmc-asrock-romed8hm3.dts | 0 .../{ => aspeed}/aspeed-bmc-bytedance-g220a.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-delta-ahe50dc.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-bletchley.dts | 0 .../aspeed-bmc-facebook-cloudripper.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-facebook-cmm.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-elbert.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-facebook-fuji.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-galaxy100.dts | 0 .../aspeed-bmc-facebook-greatlakes.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-minipack.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-tiogapass.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-wedge100.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-wedge40.dts | 0 .../{ => aspeed}/aspeed-bmc-facebook-wedge400.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-facebook-yamp.dts | 0 .../aspeed-bmc-facebook-yosemitev2.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-ibm-bonnell.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-ibm-everest.dts | 0 .../{ => aspeed}/aspeed-bmc-ibm-rainier-1s4u.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-ibm-rainier-4u.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-ibm-rainier.dts | 0 .../{ => aspeed}/aspeed-bmc-inspur-fp5280g2.dts | 0 .../{ => aspeed}/aspeed-bmc-inspur-nf5280m6.dts | 0 .../{ => aspeed}/aspeed-bmc-inspur-on5263m5.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-intel-s2600wf.dts | 0 .../aspeed-bmc-inventec-transformers.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-lenovo-hr630.dts | 0 .../{ => aspeed}/aspeed-bmc-lenovo-hr855xg2.dts | 0 .../{ => aspeed}/aspeed-bmc-microsoft-olympus.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-opp-lanyang.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-mowgli.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-nicole.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-opp-palmetto.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-opp-romulus.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-swift.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-tacoma.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-vesnin.dts | 0 .../{ => aspeed}/aspeed-bmc-opp-witherspoon.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-opp-zaius.dts | 0 .../{ => aspeed}/aspeed-bmc-portwell-neptune.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-qcom-dc-scm-v1.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-quanta-q71l.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-quanta-s6q.dts | 0 .../{ => aspeed}/aspeed-bmc-supermicro-x11spi.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-tyan-s7106.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-tyan-s8036.dts | 0 .../{ => aspeed}/aspeed-bmc-ufispace-ncplite.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-vegman-n110.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-vegman-rx20.dts | 0 .../arm/{ => aspeed}/aspeed-bmc-vegman-sx20.dts | 0 .../src/arm/{ => aspeed}/aspeed-bmc-vegman.dtsi | 0 .../src/arm/{ => aspeed}/aspeed-g4.dtsi | 0 .../src/arm/{ => aspeed}/aspeed-g5.dtsi | 0 .../src/arm/{ => aspeed}/aspeed-g6-pinctrl.dtsi | 0 .../src/arm/{ => aspeed}/aspeed-g6.dtsi | 0 .../ast2400-facebook-netbmc-common.dtsi | 0 .../ast2500-facebook-netbmc-common.dtsi | 0 .../ast2600-facebook-netbmc-common.dtsi | 0 .../facebook-bmc-flash-layout-128.dtsi | 0 .../{ => aspeed}/facebook-bmc-flash-layout.dtsi | 0 .../src/arm/{ => aspeed}/ibm-power9-dual.dtsi | 0 .../arm/{ => aspeed}/openbmc-flash-layout-128.dtsi | 0 .../{ => aspeed}/openbmc-flash-layout-64-alt.dtsi | 0 .../arm/{ => aspeed}/openbmc-flash-layout-64.dtsi | 0 .../src/arm/{ => aspeed}/openbmc-flash-layout.dtsi | 0 sys/contrib/device-tree/src/arm/atlas6-evb.dts | 78 - sys/contrib/device-tree/src/arm/atlas6.dtsi | 800 ---- sys/contrib/device-tree/src/arm/atlas7-evb.dts | 127 - sys/contrib/device-tree/src/arm/atlas7.dtsi | 1955 ---------- .../src/arm/{ => axis}/artpec6-devboard.dts | 0 .../device-tree/src/arm/{ => axis}/artpec6.dtsi | 0 .../device-tree/src/arm/bcm21664-garnet.dts | 47 - .../src/arm/{ => broadcom}/bcm-cygnus-clock.dtsi | 0 .../src/arm/{ => broadcom}/bcm-cygnus.dtsi | 0 .../src/arm/{ => broadcom}/bcm-hr2.dtsi | 0 .../arm/{bcm5301x.dtsi => broadcom/bcm-ns.dtsi} | 239 +- .../src/arm/{ => broadcom}/bcm-nsp-ax.dtsi | 0 .../src/arm/{ => broadcom}/bcm-nsp.dtsi | 0 .../src/arm/{ => broadcom}/bcm11351.dtsi | 35 +- .../src/arm/broadcom/bcm21664-garnet.dts | 47 + .../src/arm/{ => broadcom}/bcm21664.dtsi | 39 +- .../src/arm/{ => broadcom}/bcm23550-sparrow.dts | 0 .../src/arm/{ => broadcom}/bcm23550.dtsi | 35 +- .../src/arm/{ => broadcom}/bcm2711-rpi-4-b.dts | 0 .../src/arm/{ => broadcom}/bcm2711-rpi-400.dts | 0 .../src/arm/{ => broadcom}/bcm2711-rpi-cm4-io.dts | 0 .../src/arm/{ => broadcom}/bcm2711-rpi-cm4.dtsi | 0 .../src/arm/{ => broadcom}/bcm2711-rpi.dtsi | 0 .../src/arm/{ => broadcom}/bcm2711.dtsi | 0 .../src/arm/{ => broadcom}/bcm28155-ap.dts | 12 +- .../src/arm/{ => broadcom}/bcm2835-common.dtsi | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-a-plus.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-a.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-b-plus.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-b-rev2.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-b.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-cm1-io1.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-cm1.dtsi | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-common.dtsi | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-zero-w.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi-zero.dts | 0 .../src/arm/{ => broadcom}/bcm2835-rpi.dtsi | 0 .../src/arm/{ => broadcom}/bcm2835.dtsi | 0 .../src/arm/{ => broadcom}/bcm2836-rpi-2-b.dts | 0 .../src/arm/{ => broadcom}/bcm2836-rpi.dtsi | 0 .../src/arm/{ => broadcom}/bcm2836.dtsi | 0 .../arm/{ => broadcom}/bcm2837-rpi-3-a-plus.dts | 0 .../arm/{ => broadcom}/bcm2837-rpi-3-b-plus.dts | 0 .../src/arm/{ => broadcom}/bcm2837-rpi-3-b.dts | 0 .../src/arm/{ => broadcom}/bcm2837-rpi-cm3-io3.dts | 0 .../src/arm/{ => broadcom}/bcm2837-rpi-cm3.dtsi | 0 .../arm/{ => broadcom}/bcm2837-rpi-zero-2-w.dts | 0 .../src/arm/{ => broadcom}/bcm2837.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-lan7515.dtsi | 0 .../{ => broadcom}/bcm283x-rpi-led-deprecated.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-smsc9512.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-smsc9514.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-usb-host.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-usb-otg.dtsi | 0 .../{ => broadcom}/bcm283x-rpi-usb-peripheral.dtsi | 0 .../arm/{ => broadcom}/bcm283x-rpi-wifi-bt.dtsi | 0 .../src/arm/{ => broadcom}/bcm283x.dtsi | 0 .../arm/{ => broadcom}/bcm4708-asus-rt-ac56u.dts | 0 .../arm/{ => broadcom}/bcm4708-asus-rt-ac68u.dts | 0 .../bcm4708-buffalo-wzr-1166dhp-common.dtsi | 11 +- .../{ => broadcom}/bcm4708-buffalo-wzr-1166dhp.dts | 0 .../bcm4708-buffalo-wzr-1166dhp2.dts | 0 .../{ => broadcom}/bcm4708-buffalo-wzr-1750dhp.dts | 4 +- .../{ => broadcom}/bcm4708-linksys-ea6300-v1.dts | 0 .../{ => broadcom}/bcm4708-linksys-ea6500-v2.dts | 0 .../arm/{ => broadcom}/bcm4708-luxul-xap-1510.dts | 19 +- .../arm/{ => broadcom}/bcm4708-luxul-xwc-1000.dts | 16 +- .../arm/{ => broadcom}/bcm4708-netgear-r6250.dts | 9 +- .../{ => broadcom}/bcm4708-netgear-r6300-v2.dts | 2 +- .../arm/{ => broadcom}/bcm4708-smartrg-sr400ac.dts | 7 - .../src/arm/{ => broadcom}/bcm4708.dtsi | 0 .../arm/{ => broadcom}/bcm47081-asus-rt-n18u.dts | 0 .../bcm47081-buffalo-wzr-600dhp2.dts | 11 +- .../{ => broadcom}/bcm47081-buffalo-wzr-900dhp.dts | 4 +- .../arm/{ => broadcom}/bcm47081-luxul-xap-1410.dts | 18 +- .../arm/{ => broadcom}/bcm47081-luxul-xwr-1200.dts | 20 +- .../bcm47081-tplink-archer-c5-v2.dts | 0 .../src/arm/{ => broadcom}/bcm47081.dtsi | 0 .../arm/{ => broadcom}/bcm4709-asus-rt-ac87u.dts | 0 .../{ => broadcom}/bcm4709-buffalo-wxr-1900dhp.dts | 0 .../arm/{ => broadcom}/bcm4709-linksys-ea9200.dts | 0 .../arm/{ => broadcom}/bcm4709-netgear-r7000.dts | 0 .../arm/{ => broadcom}/bcm4709-netgear-r8000.dts | 29 +- .../{ => broadcom}/bcm4709-tplink-archer-c9-v1.dts | 0 .../src/arm/{ => broadcom}/bcm4709.dtsi | 0 .../arm/{ => broadcom}/bcm47094-asus-rt-ac88u.dts | 17 +- .../arm/{ => broadcom}/bcm47094-dlink-dir-885l.dts | 12 - .../arm/{ => broadcom}/bcm47094-dlink-dir-890l.dts | 12 - .../{ => broadcom}/bcm47094-linksys-panamera.dts | 34 +- .../arm/{ => broadcom}/bcm47094-luxul-abr-4500.dts | 18 +- .../arm/{ => broadcom}/bcm47094-luxul-xap-1610.dts | 17 +- .../arm/{ => broadcom}/bcm47094-luxul-xbr-4500.dts | 18 +- .../arm/{ => broadcom}/bcm47094-luxul-xwc-2000.dts | 16 +- .../arm/{ => broadcom}/bcm47094-luxul-xwr-3100.dts | 20 +- .../{ => broadcom}/bcm47094-luxul-xwr-3150-v1.dts | 12 +- .../arm/{ => broadcom}/bcm47094-netgear-r8500.dts | 0 .../src/arm/{ => broadcom}/bcm47094-phicomm-k3.dts | 0 .../src/arm/{ => broadcom}/bcm47094.dtsi | 0 .../arm/{ => broadcom}/bcm47189-luxul-xap-1440.dts | 0 .../arm/{ => broadcom}/bcm47189-luxul-xap-810.dts | 0 .../src/arm/{ => broadcom}/bcm47189-tenda-ac9.dts | 0 .../src/arm/{ => broadcom}/bcm47622.dtsi | 1 + .../arm/{ => broadcom}/bcm53015-meraki-mr26.dts | 9 +- .../{ => broadcom}/bcm53016-dlink-dwl-8610ap.dts | 0 .../arm/{ => broadcom}/bcm53016-meraki-mr32.dts | 17 +- .../arm/{ => broadcom}/bcm5301x-nand-cs0-bch1.dtsi | 0 .../arm/{ => broadcom}/bcm5301x-nand-cs0-bch4.dtsi | 0 .../arm/{ => broadcom}/bcm5301x-nand-cs0-bch8.dtsi | 0 .../src/arm/{ => broadcom}/bcm5301x-nand-cs0.dtsi | 0 .../device-tree/src/arm/broadcom/bcm5301x.dtsi | 170 + .../{ => broadcom}/bcm53340-ubnt-unifi-switch8.dts | 0 .../src/arm/{ => broadcom}/bcm53573.dtsi | 0 .../src/arm/{ => broadcom}/bcm59056.dtsi | 0 .../src/arm/{ => broadcom}/bcm63138.dtsi | 0 .../src/arm/{ => broadcom}/bcm63148.dtsi | 1 + .../src/arm/{ => broadcom}/bcm63178.dtsi | 1 + .../src/arm/{ => broadcom}/bcm6756.dtsi | 1 + .../src/arm/{ => broadcom}/bcm6846.dtsi | 1 + .../src/arm/{ => broadcom}/bcm6855.dtsi | 1 + .../src/arm/{ => broadcom}/bcm6878.dtsi | 1 + .../arm/{ => broadcom}/bcm7445-bcm97445svmb.dts | 0 .../src/arm/{ => broadcom}/bcm7445.dtsi | 0 .../src/arm/{ => broadcom}/bcm911360_entphn.dts | 0 *** 3882 LINES SKIPPED *** From nobody Thu Mar 21 20:11:15 2024 X-Original-To: dev-commits-src-all@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 4V0xRl4J2tz5FPx2; Thu, 21 Mar 2024 20:11:15 +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 4V0xRl3LKfz4P7l; Thu, 21 Mar 2024 20:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051875; 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=gZuRxnj+tZX7LV2upkKLruBJics7ykaiwnm8OM5qIb0=; b=M2WBVq9D1vCaaQzOBAg8/XmDs69qJ6273CpjETkBmn/Pcz8xBkvP2vobfosrIb+lwWw09X R4by3vbuIYtgoC2T4GOYJlWcH4UATL2zcQpZzF2wSQ9WZPcBqyL2AxEqehfNy4bUXBZLSP lsczAmsic1j9bBdNp0Pvf8aStIsU2Pl1GoSrF6mjSMdCnV8yoCvFPa+slJEaT+cHjCNNXH cLbDvG4iaT8Bxmb0NOqMQP/YPBL8LVuWh8ht7l4EJvScj4dAUtoo2hTvR41QC+VpGbA+PI Z2VZMh4Ew0U5a2mZYmvPqauC/rqlqkqHDIdLZI+NAY1toJ6qfC8pOcGNl+M8kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711051875; a=rsa-sha256; cv=none; b=KChEnd7J1L88AZTbipokMhbxe+RhuVJzlU6kAP9GblFLKAtlgApTt74Aet3haCxdg5JgTm bbpcq0WTfVy1oc2/gchkkP6K+0emDe16hxGy10Z6X3OCz8FGB4NEXFnxcLyQd0TxlUbfXo OWWN1Bw7iuJvUmuAWVRYfvz4yc+/3G1xT2Ce2MdI/hgDaMJq5MaB/E9Q+qmNRqiJyiYwVa peYijACTXtlS0WfHFYiybAutt+8YcShcpSZof6jpk3ikKAEazdH705slG+4VF88yhY6V/w zjELIGN87LmBSk+Q4UAN1J7R93o/Gjnjto8in8aFaiWZnVpgdPFN92xycn0wTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711051875; 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=gZuRxnj+tZX7LV2upkKLruBJics7ykaiwnm8OM5qIb0=; b=owJpaTQA1PaUzU4/jHMhZDB75o2AVMfNFl9+7hr9AQNJaNQPBvYgyqjpCjNhzNsBOony7S cJ3JThgRessj+wJe3IzvUvU9BcJphGFfLk3Wg9SoPbJ/pFHG3BsccpLt+2eAvaYu2Uhzmu /9NHdDszRaylBNdU5ieyrwbuqX2obVwGQzw9UJlHVdQNkO0/m3vsRezwUHQsBWLzhx61al zErsh/oAyUzpnHxTWaNHSSzlcGUuSmGALreBcEBJxdpJyxTogdqXu4saa/aVazUbkt50fI e+YyIe/2t43+B+eb6LJYu1cQZO0f+00H+XD2RkvAmddfJSK3PlT210m78WhpGA== 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 4V0xRl2tFczqG9; Thu, 21 Mar 2024 20:11:15 +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 42LKBFaJ040107; Thu, 21 Mar 2024 20:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKBF6K040104; Thu, 21 Mar 2024 20:11:15 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:11:15 GMT Message-Id: <202403212011.42LKBF6K040104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4ea295aba2b6 - main - dts: Fix arm dts path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ea295aba2b6472f86d5f668371d9b4c89d2b462 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea295aba2b6472f86d5f668371d9b4c89d2b462 commit 4ea295aba2b6472f86d5f668371d9b4c89d2b462 Author: Emmanuel Vadot AuthorDate: 2024-03-21 20:06:12 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-21 20:11:02 +0000 dts: Fix arm dts path Linux 6.5 moved to a vendor-based subdirectory for arm DTS, change our Makefiles accordingly. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/modules/dtb/allwinner/Makefile | 40 +++++++++++++++++++------------------- sys/modules/dtb/imx6/Makefile | 28 +++++++++++++------------- sys/modules/dtb/nvidia/Makefile | 2 +- sys/modules/dtb/rockchip/Makefile | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/sys/modules/dtb/allwinner/Makefile b/sys/modules/dtb/allwinner/Makefile index f04be9ca0dc9..5320e5a7681f 100644 --- a/sys/modules/dtb/allwinner/Makefile +++ b/sys/modules/dtb/allwinner/Makefile @@ -2,26 +2,26 @@ .if ${MACHINE_ARCH} == "armv7" DTS= \ - sun4i-a10-cubieboard.dts \ - sun4i-a10-olinuxino-lime.dts \ - sun6i-a31s-sinovoip-bpi-m2.dts \ - sun5i-a13-olinuxino.dts \ - sun5i-r8-chip.dts \ - sun7i-a20-bananapi.dts \ - sun7i-a20-cubieboard2.dts \ - sun7i-a20-lamobo-r1.dts \ - sun7i-a20-olimex-som-evb.dts \ - sun7i-a20-pcduino3.dts \ - sun8i-a83t-bananapi-m3.dts \ - sun8i-h2-plus-orangepi-r1.dts \ - sun8i-h2-plus-orangepi-zero.dts \ - sun8i-h3-nanopi-m1.dts \ - sun8i-h3-nanopi-m1-plus.dts \ - sun8i-h3-nanopi-neo.dts \ - sun8i-h3-orangepi-one.dts \ - sun8i-h3-orangepi-pc.dts \ - sun8i-h3-orangepi-pc-plus.dts \ - sun8i-h3-orangepi-plus2e.dts + allwinner/sun4i-a10-cubieboard.dts \ + allwinner/sun4i-a10-olinuxino-lime.dts \ + allwinner/sun6i-a31s-sinovoip-bpi-m2.dts \ + allwinner/sun5i-a13-olinuxino.dts \ + allwinner/sun5i-r8-chip.dts \ + allwinner/sun7i-a20-bananapi.dts \ + allwinner/sun7i-a20-cubieboard2.dts \ + allwinner/sun7i-a20-lamobo-r1.dts \ + allwinner/sun7i-a20-olimex-som-evb.dts \ + allwinner/sun7i-a20-pcduino3.dts \ + allwinner/sun8i-a83t-bananapi-m3.dts \ + allwinner/sun8i-h2-plus-orangepi-r1.dts \ + allwinner/sun8i-h2-plus-orangepi-zero.dts \ + allwinner/sun8i-h3-nanopi-m1.dts \ + allwinner/sun8i-h3-nanopi-m1-plus.dts \ + allwinner/sun8i-h3-nanopi-neo.dts \ + allwinner/sun8i-h3-orangepi-one.dts \ + allwinner/sun8i-h3-orangepi-pc.dts \ + allwinner/sun8i-h3-orangepi-pc-plus.dts \ + allwinner/sun8i-h3-orangepi-plus2e.dts DTSO= sun8i-a83t-sid.dtso \ sun8i-h3-i2c0.dtso \ diff --git a/sys/modules/dtb/imx6/Makefile b/sys/modules/dtb/imx6/Makefile index 46daa29188bc..7d210e8109a6 100644 --- a/sys/modules/dtb/imx6/Makefile +++ b/sys/modules/dtb/imx6/Makefile @@ -1,18 +1,18 @@ # All the dts files for imx6 systems we support. DTS= \ - imx6dl-cubox-i.dts \ - imx6q-cubox-i.dts \ - imx6dl-hummingboard.dts \ - imx6q-hummingboard.dts \ - imx6dl-nitrogen6x.dts \ - imx6q-nitrogen6_max.dts \ - imx6q-nitrogen6x.dts \ - imx6qp-nitrogen6_max.dts \ - imx6sx-nitrogen6sx.dts \ - imx6dl-riotboard.dts \ - imx6dl-wandboard.dts \ - imx6dl-wandboard-revb1.dts \ - imx6q-wandboard.dts \ - imx6q-wandboard-revb1.dts \ + nxp/imx/imx6dl-cubox-i.dts \ + nxp/imx/imx6q-cubox-i.dts \ + nxp/imx/imx6dl-hummingboard.dts \ + nxp/imx/imx6q-hummingboard.dts \ + nxp/imx/imx6dl-nitrogen6x.dts \ + nxp/imx/imx6q-nitrogen6_max.dts \ + nxp/imx/imx6q-nitrogen6x.dts \ + nxp/imx/imx6qp-nitrogen6_max.dts \ + nxp/imx/imx6sx-nitrogen6sx.dts \ + nxp/imx/imx6dl-riotboard.dts \ + nxp/imx/imx6dl-wandboard.dts \ + nxp/imx/imx6dl-wandboard-revb1.dts \ + nxp/imx/imx6q-wandboard.dts \ + nxp/imx/imx6q-wandboard-revb1.dts \ .include diff --git a/sys/modules/dtb/nvidia/Makefile b/sys/modules/dtb/nvidia/Makefile index 1bda4d1085af..c032ee7c563c 100644 --- a/sys/modules/dtb/nvidia/Makefile +++ b/sys/modules/dtb/nvidia/Makefile @@ -1,7 +1,7 @@ # All the dts files for Nvidia ARM systems we support. .if ${MACHINE_ARCH} == "armv7" DTS= tegra124-jetson-tk1-fbsd.dts -DTS+= tegra124-jetson-tk1.dts +DTS+= nvidia/tegra124-jetson-tk1.dts .elif ${MACHINE_ARCH} == "aarch64" DTS= nvidia/tegra210-p2371-2180.dts DTS+= nvidia/tegra210-p3450-0000.dts diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index f8796ebb17af..70d8269f7b3f 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -2,8 +2,8 @@ .if ${MACHINE_ARCH} == "armv7" DTS= \ - rk3288-tinker.dts \ - rk3288-tinker-s.dts + rockchip/rk3288-tinker.dts \ + rockchip/rk3288-tinker-s.dts .elif ${MACHINE_ARCH} == "aarch64" DTS= \ rockchip/rk3399-khadas-edge-captain.dts \ From nobody Thu Mar 21 20:21:53 2024 X-Original-To: dev-commits-src-all@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 4V0xhC5ZCBz5FR17; Thu, 21 Mar 2024 20:22:03 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Received: from mail.gonegalt.net (mail.gonegalt.net [208.167.253.104]) (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 4V0xhC2s0Lz4SS0; Thu, 21 Mar 2024 20:22:03 +0000 (UTC) (envelope-from chmeee@has.gonegalt.net) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gonegalt.net; s=dkim; t=1711052514; 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=0Jz7Pv9f7WyTvAZ4DMTkaPjMZL5fXDlQM6Sacp2am9Q=; b=SmMz33FFkvqoqqjCcOBzpHoXOb0NP6t5MhZxAEEBvLaoUXUDafwRnUdO+Dqxc04himehDB 81mQrtwMTPZVSMRYNsO/qKkCJlYeB6nZD7Xkj7U3oPwybkFpZKxzdQQPDZlXhNw3nA61Eb TeTdWPQQHG9kgL1kfOWwgzvmGsLhBr0= Received: by localhost (OpenSMTPD) with ESMTP id 1e0b1754; Thu, 21 Mar 2024 16:21:54 -0400 (EDT) Received: from ralga.knownspace ([192.168.1.17]) by mail.gonegalt.net with ESMTPSA id E3prBuKW/GVtBAEA0J78UA (envelope-from ); Thu, 21 Mar 2024 16:21:54 -0400 Date: Thu, 21 Mar 2024 16:21:53 -0400 From: Justin Hibbits To: Dimitry Andric Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: f0620ceeccf0 - main - Fix building of several libclang_rt libraries for powerpc64 and powerp64le Message-ID: <20240321162153.0048ccba@ralga.knownspace> In-Reply-To: <202403211711.42LHBlpr041561@gitrepo.freebsd.org> References: <202403211711.42LHBlpr041561@gitrepo.freebsd.org> X-Mailer: Claws Mail 4.2.0 (GTK 3.24.39; powerpc64le-unknown-linux-gnu) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:20473, ipnet:208.167.224.0/19, country:US] X-Rspamd-Queue-Id: 4V0xhC2s0Lz4SS0 On Thu, 21 Mar 2024 17:11:47 GMT Dimitry Andric wrote: > The branch main has been updated by dim: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=f0620ceeccf070a69352105c5dbc23cff499a732 > > commit f0620ceeccf070a69352105c5dbc23cff499a732 > Author: Dimitry Andric > AuthorDate: 2024-03-21 13:53:36 +0000 > Commit: Dimitry Andric > CommitDate: 2024-03-21 17:05:25 +0000 > > Fix building of several libclang_rt libraries for powerpc64 and > powerp64le > I reorganized the libclang_rt Makefile in e77a1bb27574 to make it > more readable and maintainable, but the check for 32-bit powerpc was > wrong. This caused almost no libclang_rt libraries to be built for > powerpc64 and powerpc64le. > > PR: 262706 > Reported by: tuexen > Fixes: e77a1bb27574 > MFC after: 3 days > --- > lib/libclang_rt/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile > index 46f7fdf814be..984da3f34156 100644 > --- a/lib/libclang_rt/Makefile > +++ b/lib/libclang_rt/Makefile > @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} > SUBDIR+= ${SD_SAFESTACK} > SUBDIR+= ${SD_STATS} > SUBDIR+= ${SD_UBSAN} > -.elif ${MACHINE_CPUARCH} == "powerpc" > +.elif ${MACHINE_ARCH} == "powerpc" If you're excluding 32-bit powerpc you'll want to also exclude powerpcspe. Though, you could just omit both powerpc and powerpcspe from the list here, since there's no default error case. > # nothing for 32-bit powerpc > .elif ${MACHINE_ARCH} == "powerpc64" > SUBDIR+= ${SD_ASAN} - Justin From nobody Thu Mar 21 20:23:11 2024 X-Original-To: dev-commits-src-all@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 4V0xjX0zSdz5FRC9 for ; Thu, 21 Mar 2024 20:23: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 4V0xjX00w3z4SrQ; Thu, 21 Mar 2024 20:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711052592; 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=o+V8wacYogFNIdL/GC80YpCZZGBL4myZ+u2ljOO4xx8=; b=v4qT+t+U8zFNkjce3NgPyCKaQVxvEJL/SUPv9sJRTO5Vxge3KmdXgQlP3C+d3TTFMqznz1 xkFKac01JNbF9qtqxef80V81EC5qas2GbYuxLUbo15W/DCOEG4oUogZcF6U0c3FfwRxNAo zEcOUVDPhB44Mv7ChZSQiwznIBYQRKGOhB9cMs3SQrfn6sRnydh0pOXTAmOWy1IviXBswv OXIcJts1Tq1y43gEjw9GtEWK+8IkFAaL0EQek6nSHHb0KJVmri3dSizZ2MFgRpyeAtYFhU k4/YW9JuQkl9d69wFajplDm0j7bfPWNb7wCcaDCeRO43rDYAj40ZshySGqyHXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711052592; a=rsa-sha256; cv=none; b=YBLX08JSBHCV//e6A2pXPk7klnARiFbdAxzAeJbDn9Cv5wdL45won+rXWPnLXnMPXb7LNi NuxXo01E2NMLpW2fDXGMj396ANaTWMQg9cTDrwp47K2kdv4l1Nv1Z3+xBk7JMbbpIKGhg/ 8UMP/RUVtLBhM312A8mvDSJWhQTXqgt4OX4+ra1b6OI0vQVWEAdMqdmWuIUrMYUnRCIXNI I/xFf0lQ0ddQb84W42lleQa5OlAddM72RwfAgDEu6VX/AmuUp/ZK77NLdsvmVU9CyFPubl MpkFA5R+0VDik66vrCDJ4TQX2rdosd4LtdEOqOdmw4y43qGnnQ+4LfPG9Xb4QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711052592; 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=o+V8wacYogFNIdL/GC80YpCZZGBL4myZ+u2ljOO4xx8=; b=oYA0LIWKpwLKSxM7jDpjFX4XKTXeQx1S8HvaHJjhllSWWGITLyjNkfzz93f2SEpUQh/K3U 0gxH3KrEgVLLXBGnaPiELOzSDrs8qLNuBMrKe0XuGnAm8nkmzFIKTMBhd2O6EHYGNQy5i1 2Nz1pcw+3moJQKTWt5s4LoJWUx1k1/ZWfgkXLxxxndqi8TBTSVvNMrxMsn03Yd6JgW4+wk e942GMGJn3YtSw95AqP+roJXGrgQu0J+aMPpEZ44iFX8K486AheTTKScO0NNS4Jcmr7FPp BHgWqiOPGr+SgnExKZI5d8bLNg8gsv/iQimek/QbGzcMeBQJ1eCQ3neY7khZAA== 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 4V0xjW6k7LzqXq; Thu, 21 Mar 2024 20:23: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 42LKNBH8062294; Thu, 21 Mar 2024 20:23:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKNBwH062291; Thu, 21 Mar 2024 20:23:11 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:23:11 GMT Message-Id: <202403212023.42LKNBwH062291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8a1d32bea5ae - internal/admin - Release dsl from mentorship. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 8a1d32bea5ae1f177eec385ae0a22d06714a7a34 Auto-Submitted: auto-generated The branch internal/admin has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8a1d32bea5ae1f177eec385ae0a22d06714a7a34 commit 8a1d32bea5ae1f177eec385ae0a22d06714a7a34 Author: Bjoern A. Zeeb AuthorDate: 2024-03-21 20:11:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-03-21 20:11:02 +0000 Release dsl from mentorship. He's brought packets to so many people with dpaa2 and done his first commit without approval. It's been long overdue to get out of his way. Approved by: core (implicit) --- mentors | 1 - 1 file changed, 1 deletion(-) diff --git a/mentors b/mentors index cb1c4e7455e2..9349947e9ad3 100644 --- a/mentors +++ b/mentors @@ -14,7 +14,6 @@ bnovkov markj Co-mentor: jhb brd allanjude Co-mentor: bapt bryanv grehan def oshogbo -dsl bz gordon delphij Co-mentor: emaste jfree imp Co-mentor: markj oh manu From nobody Thu Mar 21 20:30:20 2024 X-Original-To: dev-commits-src-all@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 4V0xsp1SNJz5FS3h; Thu, 21 Mar 2024 20:30:22 +0000 (UTC) (envelope-from dim@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 4V0xsp0zT2z4Wxq; Thu, 21 Mar 2024 20:30:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711053022; 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=gBOEoC74bi2et6razlSNJLQyqlguEqUXOioShMuHTnY=; b=QufVA5Bx3iBF+GoV9u0DkMjF3FlWI3kjbKT6nFXy2hsp5hYus1hftkjeIF8bLm+VUbiHT8 XP7o9QzK/QEtmnJ85BMXATcf20PiknfzJxv98yJtTgvGHFLLHxp1NNncboc/fR5ryUq/s/ SHYQ+yFZVXe34N2p/y76rFUyknXGhP2P+n2MijuTMSc4tWl4Cgoqj4MQp6t5vPMTYnHv54 QP/+Yj3DV6S+N7KzfWFoWD5EpxaGGQa2zCJhvxNU4mKd1cm0uYOAfMbaan9dpmusRSzKXX fh2J30L7nzaGGSfajP1LP2W+/0VX77zSRcb8LC/9OD74OYMc4v36M9O3Cw979Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711053022; a=rsa-sha256; cv=none; b=Y24Q/H6YpU7wVcEXs5NpU8c9X38YHEP3TpH/03HjW6i8gN1Ptuqlg3aVgZ8+RkBtGFVTxn KMoV1javNSkLEqvVaLzTkzTc0HOo/+HGyV9ML42bXDHFM1U592b7idSEssbwMr5JNNGb6M d/r6gw/1E1wFNTcqRyBZWGEyoetwLk0F/TQe4A/8qScfcdAZDC45JS/I3hDExHX4AoAfrQ bR99xpBOdQSOlOgP9PTcvyi3J27j4PNRECb7A2obDeC5W9LOr62uYd1uCSMTCghOrHFnsM UJeel8Ne9TpIBYIzsYf8A6Pf+mlpi2kanGG65F3vk2d4ryntnBoGHFuA0f2d/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711053022; 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=gBOEoC74bi2et6razlSNJLQyqlguEqUXOioShMuHTnY=; b=g7xA2iK6krk4Dr2JXW+8FkQHEmt4gh0ZxZukFLAjdPpQi5PQ0WpBo0b6GLejx/KSBIGW4k /V5WnGSFj7QqcR5of/c71/3VZnPksA+1LS++RXqmFxOz2AetgcY2Z3mNhob2jryomjDMyY unPmq8XVsVWjIHX33Dce9P3pEBo96dkZvJ00UPOXU31jD7cVOqAMwiYQyilkDyngcfDShQ SPYsqagjUlaeT80Y35JWu2hQ6maZ66o7fq0BhobTgVq49PtNNntr2yP29fWe/kp2cXl1fa 0BZWzFCwetjwTmib3UUjjmsL1rQehKEo+Ff35nrfBvYrXdbRmfaIR2ZnqwSiHw== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (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 "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V0xsn6y0Xz16my; Thu, 21 Mar 2024 20:30:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id DA7C32A430; Thu, 21 Mar 2024 21:30:20 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.1\)) Subject: Re: git: f0620ceeccf0 - main - Fix building of several libclang_rt libraries for powerpc64 and powerp64le From: Dimitry Andric In-Reply-To: <20240321162153.0048ccba@ralga.knownspace> Date: Thu, 21 Mar 2024 21:30:20 +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: <628CFE63-DC26-48E9-8425-B4C3C760C653@FreeBSD.org> References: <202403211711.42LHBlpr041561@gitrepo.freebsd.org> <20240321162153.0048ccba@ralga.knownspace> To: Justin Hibbits X-Mailer: Apple Mail (2.3731.700.6.1.1) On 21 Mar 2024, at 21:21, Justin Hibbits = wrote: >=20 > On Thu, 21 Mar 2024 17:11:47 GMT > Dimitry Andric wrote: >=20 >> The branch main has been updated by dim: >>=20 >> URL: >> = https://cgit.FreeBSD.org/src/commit/?id=3Df0620ceeccf070a69352105c5dbc23cf= f499a732 >>=20 >> commit f0620ceeccf070a69352105c5dbc23cff499a732 >> Author: Dimitry Andric >> AuthorDate: 2024-03-21 13:53:36 +0000 >> Commit: Dimitry Andric >> CommitDate: 2024-03-21 17:05:25 +0000 >>=20 >> Fix building of several libclang_rt libraries for powerpc64 and >> powerp64le=20 >> I reorganized the libclang_rt Makefile in e77a1bb27574 to make it >> more readable and maintainable, but the check for 32-bit powerpc was >> wrong. This caused almost no libclang_rt libraries to be built for >> powerpc64 and powerpc64le. >>=20 >> PR: 262706 >> Reported by: tuexen >> Fixes: e77a1bb27574 >> MFC after: 3 days >> --- >> lib/libclang_rt/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >>=20 >> diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile >> index 46f7fdf814be..984da3f34156 100644 >> --- a/lib/libclang_rt/Makefile >> +++ b/lib/libclang_rt/Makefile >> @@ -67,7 +67,7 @@ SUBDIR+=3D ${SD_CFI} >> SUBDIR+=3D ${SD_SAFESTACK} >> SUBDIR+=3D ${SD_STATS} >> SUBDIR+=3D ${SD_UBSAN} >> -.elif ${MACHINE_CPUARCH} =3D=3D "powerpc" >> +.elif ${MACHINE_ARCH} =3D=3D "powerpc" >=20 > If you're excluding 32-bit powerpc you'll want to also exclude > powerpcspe. Though, you could just omit both powerpc and powerpcspe > from the list here, since there's no default error case. I wanted to keep the place open, for if at some point there would be = some sort of support for either of those architectures. But I guess the thing is better written as: ... .elif ${MACHINE_CPUARCH} =3D=3D "powerpc" . if ${MACHINE_ARCH} =3D=3D "powerpc64" # some subdirs . elif ${MACHINE_ARCH} =3D=3D "powerpc64le" # other subdirs . else # remark about nothing being available yet . endif .elif # other CPUARCH values -Dimitry From nobody Thu Mar 21 20:45:19 2024 X-Original-To: dev-commits-src-all@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 4V0yC36QMBz5FTSh; Thu, 21 Mar 2024 20:45: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 4V0yC35qFQz4Zh0; Thu, 21 Mar 2024 20:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711053919; 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=a3QF5kg/YxQoBs6qzMxbcSv9cCCbU6AHHbwre8tDfrs=; b=Xoj+Skpmb10EA0ZJlJeReXOikUbZsbw+3hfE3tC32K2A5yi7by0nn78NE/rtKlIboMxflK uYS2/ipQGF1YgJJYNvtD/zQIeI3uMx/khPTM6U9n1j80S1yNyA4lsUdpushiAdOKr0scJf PO/icBowjoTHzHp7mlA9sXb/tfniJLmh5vJqR/dIb2aOJjA9TlQjdvXrkvSeX29claCYdS U/dxqDN5EaXfWpGU6mS+qGjQXkKal9Ml5pshnZAlyn+zt1+paIxQ85klrHiF5D3Dn3qElp 6KRFOgcYH6Wl8hfy/h9YxSt9e7jApWvZw2Iwlcmp0R7vQdApmz8wR3sB41Zcbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711053919; a=rsa-sha256; cv=none; b=vVbkiwDhTCChcW7h4U1RHJeK3oZ7E1Sya0h6wVngmYJb0dp66+Yj+EtqsY7KANfOnX+CwI 10QU5AZwYuOIxNK3A86EVYZSXqcwcFcBCIpVcXJgjm00Dpl2bLzqYW47ubtJ6iOGzEcjxA uZLdXJ/BdwsqwPiPAmFzmX0UpGNDvjIxyEosNOXPWqaXDLNk26BFG1mryzD3AQuQanliFj ZxLOK4T5dCY6MlNN+2kbtM9YGyKR1Q8Uih6zlCNUuJqkTZm/vXuzmgvQgFm6F2oEXzNcmM PlzVenZVPwwm9s9ULs0GxxVVL1qk6iE9tDJzQK9zO8AQ3Mc9jBMpxQ8oywMqrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711053919; 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=a3QF5kg/YxQoBs6qzMxbcSv9cCCbU6AHHbwre8tDfrs=; b=m2Of2Wgw1Ay7cX/QVERT7CtBXlS4K7ELViGOdTbBlT3kGfA4fdGmx/BDOtVtna+EuyH1At IrPKJM8j1ieBmV84VZ+76ZE8z7pQY0e58kOMG1y6a1YCQZlX5POlgjeRTfbGIC1HnssG/r UuVR/IjIp/HG9G9XaxTiSMKPbsihg2WdyQqte2A66qr2wSHYMHDkVk+jH+fgsOSWZQP5I/ rD8LFwDLK83DU4F+avnh5WIiJkUJYUc0cKiPyJ96GxgF7Lqzrd/NLm3PYiEzjmv1j6d1wB emq7RDVpwz/nObKVMaMElOccO5lfE4Axv8zm6v50Nv32yX00nJDGj3V733h1Ew== 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 4V0yC35JFzzqrd; Thu, 21 Mar 2024 20:45: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 42LKjJMT097693; Thu, 21 Mar 2024 20:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LKjJp5097690; Thu, 21 Mar 2024 20:45:19 GMT (envelope-from git) Date: Thu, 21 Mar 2024 20:45:19 GMT Message-Id: <202403212045.42LKjJp5097690@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: 897a485c3446 - main - Slightly reorganize libclang_rt Makefile again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 897a485c34464a44b768f13127d94137229eb83d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=897a485c34464a44b768f13127d94137229eb83d commit 897a485c34464a44b768f13127d94137229eb83d Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-21 20:44:46 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS} From nobody Thu Mar 21 23:50:14 2024 X-Original-To: dev-commits-src-all@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 4V12JQ2cwHz5F5Sk; Thu, 21 Mar 2024 23:50:14 +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 4V12JQ25cTz4qv2; Thu, 21 Mar 2024 23:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711065014; 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=jNN28Vq3jn+O9kw0OOLt2ZDQ2kKIkCYcreNBWjJ3WrA=; b=DcSk/y8VcSLKK+0OT02DXdsuX/YEOzSVaIDvIbJJmPhYUgH+VwxZJ4DD2ugM49YsN9ZGei eQDQzYzq15T5u7XdUFAazU/Dhvf6DDIZRxG1xQBnV1/dR9AvwsBHpbCBs36YZsNVNee8O1 Q0eJ7POiHUIjuyT5VNPXi3Wu8nN6aidpCzdRDW0EiantC6XA0vvbr2jf2iKiVo4ZdkMhEr 34F2PsncxMKrUe49KgbaWiCc1kIsrysnQnJi+uscAlk+tDwGjXRcbA59NRS8lfKKulGlJu JBFp7deXXmBL5eOSFF3mQHx5FC7t91XP0JIK/h67KFAMpKokaT7Dy4fD/2SK4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711065014; a=rsa-sha256; cv=none; b=NpNSO4Zm9z9fXjpNFyJKiGfTbwsIJrcRMqKRPXluon+ly50SYKfYEcjcHPdImzapYvxt1C jagGwn8cYAwRz7BQCzGTyE89ptzVbYgx56ioo2UK7ESbJnnw2Vatd0pIkSpwsMELaXOwWN BBHPktZntW9XU9zChacHy/gCxNQMyOUvapsD+rp/DZODrIYY8fGSa4ypVwpawuzXD77aCx JoAHgOhS72Q4mQ3iPfW+XFbmQYlEaNJH7TsDTUAU7u4StaKRkLmrNXIZ87bUyYUGWG1Qpf uigEMOMLf9elvOQtUONhwnyrQXGhZZGB6KIGPj3dZatEclFV9l8xLMUW5v+ncA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711065014; 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=jNN28Vq3jn+O9kw0OOLt2ZDQ2kKIkCYcreNBWjJ3WrA=; b=o7YoISHefXGP0SgdXPGkOvxLpfaOjDk9Ncfr+mpLO+lttxCYe2CRP33ufY+5ZOUcOb5qk9 M5bIOMxnfxSnI0EbXqYMEKEN7IGH3W5rfZTZmufJywM6XozThVtwjHE08QEv/yYwiQtUG2 JVx3emxxIC8exd33iaZcnsloRRXVoRY6lTph01WKJ1/nVxEV8I7tkgacE7zfKlbB6LjNb7 TOxa39pn3bqdjRFlmnXntsOE60ik60fKM105scZamiA54uGSjCPFJJdcWKrTuO/BopMcDB i5d8nDujtvHCeyTQ1/IeuqDCUxe+RjD03J7P42MfhNBNJ+RCkFV4v9bSXI0Jog== 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 4V12JQ1hbrzwXg; Thu, 21 Mar 2024 23:50: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 42LNoEWn008039; Thu, 21 Mar 2024 23:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LNoEkG008031; Thu, 21 Mar 2024 23:50:14 GMT (envelope-from git) Date: Thu, 21 Mar 2024 23:50:14 GMT Message-Id: <202403212350.42LNoEkG008031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 1947a9383ec3 - main - msun/riscv: expose fe{disable,enable}except List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1947a9383ec3a048e334022365aa199a6ae55289 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1947a9383ec3a048e334022365aa199a6ae55289 commit 1947a9383ec3a048e334022365aa199a6ae55289 Author: Brooks Davis AuthorDate: 2024-03-21 23:45:53 +0000 Commit: Brooks Davis CommitDate: 2024-03-21 23:48:37 +0000 msun/riscv: expose fe{disable,enable}except This is required for GCC to build. PR: 272759 Reported by: dgilbert@eicat.ca Submitted by: jrtc27 Differential Revision: https://reviews.freebsd.org/D44333 --- lib/msun/riscv/Symbol.map | 10 ++++------ lib/msun/riscv/fenv.h | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/msun/riscv/Symbol.map b/lib/msun/riscv/Symbol.map index 2bc6215688bb..c3d72443cb2c 100644 --- a/lib/msun/riscv/Symbol.map +++ b/lib/msun/riscv/Symbol.map @@ -1,15 +1,13 @@ -/* - */ -FBSD_1.0 { -}; - FBSD_1.3 { fesetexceptflag; feraiseexcept; fegetenv; feholdexcept; feupdateenv; + fegetexcept; +}; + +FBSD_1.8 { feenableexcept; fedisableexcept; - fegetexcept; }; diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h index 1971e976645c..36abb7b00b7d 100644 --- a/lib/msun/riscv/fenv.h +++ b/lib/msun/riscv/fenv.h @@ -216,14 +216,12 @@ feupdateenv(const fenv_t *__envp) #if __BSD_VISIBLE -/* We currently provide no external definitions of the functions below. */ - #ifdef __riscv_float_abi_soft int feenableexcept(int __mask); int fedisableexcept(int __mask); int fegetexcept(void); #else -static inline int +__fenv_static inline int feenableexcept(int __mask __unused) { @@ -232,7 +230,7 @@ feenableexcept(int __mask __unused) return (0); } -static inline int +__fenv_static inline int fedisableexcept(int __mask __unused) { @@ -241,6 +239,7 @@ fedisableexcept(int __mask __unused) return (0); } +/* We currently provide no external definition of fegetexcept(). */ static inline int fegetexcept(void) { From nobody Thu Mar 21 23:50:15 2024 X-Original-To: dev-commits-src-all@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 4V12JR330Lz5F5Vj; Thu, 21 Mar 2024 23:50:15 +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 4V12JR2dH7z4r90; Thu, 21 Mar 2024 23:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711065015; 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=LvixxFduTqsY5TaCP7ftD0aDhEYR8gzzlp9sMMaL3KQ=; b=H3y5xdK0M4CxgBcDIhgPMnDBSrXS2l8wErPRSBmSd23RtBsi1UC1KJqqKo2N5Jj/4NN6yy K6GCwKtC73cyL9aTjK2rmPgl+tyShjWLOg75WtS+mZ+aN34FFFzz06tWwp4hPSg9rUKXYO RhM0vtRPWOumHtuUd2jIs9gmSx4w+hVE8sVt4neNp6S5fPoDilkB9BweIwfaIBo62mQ6+n PFNLlA2CYNB2fB7+2As+pF2DdXWr0Lf8pQgi1vn46ei2hTlgm/a8LzoDKh0YcUAQ9LqBiM m+FaiCqAReXAg0ws22m7h7HLY2sl1q2veU4pfRuTK64kmVYEpwjcPcpcdrybhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711065015; a=rsa-sha256; cv=none; b=DpFfe41WAnB6ViAarlhXmc9hxdjhSPfYoaNNOcUuTaejYojDIRGg+7EfcgHxWebDxD7sz/ qeB0v3BGdvnx6pEc6NwCgkJDrSwRUjpcEtl3eS9ZQ4catzmDEntpLbD2XdC36A65cyAK+k VI31dgaQ7EWof6qZlnvnut3iQvDT8frMMlrzJ1ep9p026mBjzdcyWcg/r8phMa2B52rSbI 0+7pd5H2U/ooaGSjfduzPK7Ddq50R/avkCafUL04HoAJ3YT3xkk1BWNAnK+rla6naajiK3 git49DDDBBg5mLeacTBLM6ImQwXjIcTxF34grfDPbSMi2MJBMJ7q6ubqOQM+wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711065015; 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=LvixxFduTqsY5TaCP7ftD0aDhEYR8gzzlp9sMMaL3KQ=; b=nkY9Znngip0hDWVSFmBw8g2W0C3+nfqLhiNYwf2iVBoMatBn+G34cE60Q5tpDomW5czatP 1s1rTBALhJIurWbISedcYOhQqASjdgrVtpagyeRqBu945VhWZJVotpCRGviVk2AlT60Pki Dtdv3bjQYi+krPPk2cXzydsCj36O35TfroIoRFd3OCVbRBn+aQ433jiRH0G5SqalIEZMSA 5oxTpSjzHhT02XGH4kqXUajYa7xEamzsWZdntDz8SgIauubRx1ERuJwoFFC5MfvqAwICek o+grrj3J2Yk+waONTGa1KBTHVgnJ9DzEfGcK7/ieiuoXCA6In2IeCo7sQPrAtQ== 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 4V12JR2DWhzwnw; Thu, 21 Mar 2024 23:50:15 +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 42LNoFe5008730; Thu, 21 Mar 2024 23:50:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LNoFYj008722; Thu, 21 Mar 2024 23:50:15 GMT (envelope-from git) Date: Thu, 21 Mar 2024 23:50:15 GMT Message-Id: <202403212350.42LNoFYj008722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 312a05c39e5f - main - riscv: remove more riscv64sf support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 312a05c39e5fd79b37ee6f922462232797f56a2a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=312a05c39e5fd79b37ee6f922462232797f56a2a commit 312a05c39e5fd79b37ee6f922462232797f56a2a Author: Brooks Davis AuthorDate: 2024-03-21 23:46:28 +0000 Commit: Brooks Davis CommitDate: 2024-03-21 23:48:37 +0000 riscv: remove more riscv64sf support Remove a few more bits of riscv64sf support in libc and libm. Reduce floating point ABI checks to requiring double hard float. Reviewed by: imp, jhb Fixes: 1ca12bd927d7 Remove the riscv64sf architecture. Differential Revision: https://reviews.freebsd.org/D44334 --- lib/libc/riscv/gen/flt_rounds.c | 10 ---------- lib/msun/riscv/Symbol.map | 1 - lib/msun/riscv/fenv.c | 8 -------- lib/msun/riscv/fenv.h | 30 ++---------------------------- 4 files changed, 2 insertions(+), 47 deletions(-) diff --git a/lib/libc/riscv/gen/flt_rounds.c b/lib/libc/riscv/gen/flt_rounds.c index 5d3771ea6cd3..bccd7d8baa44 100644 --- a/lib/libc/riscv/gen/flt_rounds.c +++ b/lib/libc/riscv/gen/flt_rounds.c @@ -37,22 +37,12 @@ #include #include -#ifdef __riscv_float_abi_soft -#include "softfloat-for-gcc.h" -#include "milieu.h" -#include "softfloat.h" -#endif - int __flt_rounds(void) { uint64_t mode; -#ifdef __riscv_float_abi_soft - mode = __softfloat_float_rounding_mode; -#else __asm __volatile("csrr %0, fcsr" : "=r" (mode)); -#endif switch (mode & _ROUND_MASK) { case FE_TOWARDZERO: diff --git a/lib/msun/riscv/Symbol.map b/lib/msun/riscv/Symbol.map index c3d72443cb2c..65157d0de9c1 100644 --- a/lib/msun/riscv/Symbol.map +++ b/lib/msun/riscv/Symbol.map @@ -4,7 +4,6 @@ FBSD_1.3 { fegetenv; feholdexcept; feupdateenv; - fegetexcept; }; FBSD_1.8 { diff --git a/lib/msun/riscv/fenv.c b/lib/msun/riscv/fenv.c index 9d7ae3d3fdaf..a4dde02a6ddc 100644 --- a/lib/msun/riscv/fenv.c +++ b/lib/msun/riscv/fenv.c @@ -37,14 +37,6 @@ */ const fenv_t __fe_dfl_env = 0; -#ifdef __riscv_float_abi_soft -#define __set_env(env, flags, mask, rnd) env = ((flags) | (rnd) << 5) -#define __env_flags(env) ((env) & FE_ALL_EXCEPT) -#define __env_mask(env) (0) /* No exception traps. */ -#define __env_round(env) (((env) >> 5) & _ROUND_MASK) -#include "fenv-softfloat.h" -#endif - extern inline int feclearexcept(int __excepts); extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts); extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts); diff --git a/lib/msun/riscv/fenv.h b/lib/msun/riscv/fenv.h index 36abb7b00b7d..cc50f0659248 100644 --- a/lib/msun/riscv/fenv.h +++ b/lib/msun/riscv/fenv.h @@ -71,32 +71,13 @@ __BEGIN_DECLS extern const fenv_t __fe_dfl_env; #define FE_DFL_ENV (&__fe_dfl_env) -#if !defined(__riscv_float_abi_soft) && !defined(__riscv_float_abi_double) -#if defined(__riscv_float_abi_single) -#error single precision floating point ABI not supported -#else -#error compiler did not set soft/hard float macros -#endif +#ifndef __riscv_float_abi_double +#error only double hard float ABI supported #endif -#ifndef __riscv_float_abi_soft #define __rfs(__fcsr) __asm __volatile("csrr %0, fcsr" : "=r" (__fcsr)) #define __wfs(__fcsr) __asm __volatile("csrw fcsr, %0" :: "r" (__fcsr)) -#endif -#ifdef __riscv_float_abi_soft -int feclearexcept(int __excepts); -int fegetexceptflag(fexcept_t *__flagp, int __excepts); -int fesetexceptflag(const fexcept_t *__flagp, int __excepts); -int feraiseexcept(int __excepts); -int fetestexcept(int __excepts); -int fegetround(void); -int fesetround(int __round); -int fegetenv(fenv_t *__envp); -int feholdexcept(fenv_t *__envp); -int fesetenv(const fenv_t *__envp); -int feupdateenv(const fenv_t *__envp); -#else __fenv_static inline int feclearexcept(int __excepts) { @@ -212,15 +193,9 @@ feupdateenv(const fenv_t *__envp) return (0); } -#endif /* !__riscv_float_abi_soft */ #if __BSD_VISIBLE -#ifdef __riscv_float_abi_soft -int feenableexcept(int __mask); -int fedisableexcept(int __mask); -int fegetexcept(void); -#else __fenv_static inline int feenableexcept(int __mask __unused) { @@ -248,7 +223,6 @@ fegetexcept(void) return (0); } -#endif /* !__riscv_float_abi_soft */ #endif /* __BSD_VISIBLE */ From nobody Fri Mar 22 03:56:19 2024 X-Original-To: dev-commits-src-all@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 4V17mM244Hz5Fb1y; Fri, 22 Mar 2024 03:56: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 4V17mM1httz41R3; Fri, 22 Mar 2024 03:56:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711079779; 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=UKx55LseTG/xsPZXSAiJ0UbpQJxdfiWm1CNP0Lo/H6Q=; b=Efu7xBnY/ESoe8qh2F09GnI6+QkvuVc3Lbe7kOzHMYaxK7JWEIVtWhjCY3kJDZgvMBlXf3 KwWYKZ6VkzgXko8NzLPETmCPDSywGCJqrW3+MPbPNwGrcXqsPOU4+gr90Gqmvw70/se8iA sOYqDfefzRCqcuKssCpWReOuAtypVguErGVYLmzT6eFUx0dE0/i2WoIZCv3fGBpKKvlHT6 XdCU9awn2vRsBvUi6hS+7FXTtBOPKmgoxEJRWunhMLIw8r8ZZA8YLHnES2g/iukFSNnOR8 VvgovzmC72c3VxGaKsl9TykKjHWddeSvKIgWx+YMyFxCM4dJF1yFBTgxqMxtLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711079779; a=rsa-sha256; cv=none; b=bq+SEkFGffpSWPfdgteElx+IJROJ75TiLceQv4NUYBjseFNyDtAWMA+H7ZxWeJQehfsPzA TarlvH92gxrMQYFhGka0asRJoinG/SO10vnEufn+VJYXdun9YvbmkHoPTnosuSddW3z3MV 2B4ChNJ7YbLYEfN7N5AYJjC4e8FYNzf7Tt6aoW9FANhxg2kjAbmVJSjXoZ1r3CS/A6G1+f dHmjX04nrFPmo/6elLd4UdXaxTI+cYyJgbB8nC68UXXaRxj+xBUu4WepmNEUUR2AVA70Qk QgpIAfUHakUv13vacoEMOugTZBIUvP/XS6CY5JQ5jD+MdVoAX+zLCwyCu3UkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711079779; 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=UKx55LseTG/xsPZXSAiJ0UbpQJxdfiWm1CNP0Lo/H6Q=; b=vHNb+HaF7Xvu6TrmtkclQWhX7kMlnQ0DcDu3lrRxK1I/PL2tpPnCQsVql9PtYeK+1gCcaN d8z7ir8wMErC1KQ5vKD86nti7DdxfZ/aQQgN2zh2LhVrtsPDpThk2o8HLAiS1bf2XJ9fls 1C+D7cah6DCzNSvv0qDhlaMj2gSSicqPorimlTfOCh9u43f0/9gH8JLxKbeNj43sk9dbO9 acRSyUO8R5KCu6JvgUcvdC+K+m+GOqQcC3dKcJVCIdV4xjD9NQRnKo6HmepQxRomoJDlNJ eEVyVtrXpoON7sLuPyjN4MZFUsnpxzJExNK/JqUoNYNh6b5jgPXNBFiN02wv3Q== 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 4V17mM1Hwhz13Xy; Fri, 22 Mar 2024 03:56: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 42M3uJRn021419; Fri, 22 Mar 2024 03:56:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M3uJh3021416; Fri, 22 Mar 2024 03:56:19 GMT (envelope-from git) Date: Fri, 22 Mar 2024 03:56:19 GMT Message-Id: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: c21bc6f3c242 - main - ddb: Add CTF-based pretty printing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c21bc6f3c2425de74141bfee07b609bf65b5a6b3 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=c21bc6f3c2425de74141bfee07b609bf65b5a6b3 commit c21bc6f3c2425de74141bfee07b609bf65b5a6b3 Author: Bojan Novković AuthorDate: 2024-03-22 03:01:34 +0000 Commit: Bojan Novković CommitDate: 2024-03-22 03:03:33 +0000 ddb: Add CTF-based pretty printing Add basic CTF support and a CTF-powered pretty-printer to ddb. The db_ctf.* files expose a basic interface for fetching type data for ELF symbols, interacting with the CTF string table, and translating type identifiers to type data. The db_pprint.c file uses those interfaces to implement a pretty-printer for all kernel ELF symbols. The pretty-printer works with symbol names and arbitrary addresses: pprint struct thread 0xffffffff8194ad90 Pretty-printing currently only works after the root filesystem gets mounted because the CTF info is not available during early boot. Differential Revision: https://reviews.freebsd.org/D37899 Approved by: markj (mentor) --- share/man/man4/ddb.4 | 26 +++ sys/conf/files | 2 + sys/ddb/db_command.c | 1 + sys/ddb/db_ctf.c | 326 +++++++++++++++++++++++++++++++++++ sys/ddb/db_ctf.h | 64 +++++++ sys/ddb/db_pprint.c | 450 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/ddb/ddb.h | 1 + sys/kern/kern_ctf.c | 40 +++++ sys/kern/kern_linker.c | 68 +++++++- sys/kern/link_elf.c | 37 ++++ sys/kern/link_elf_obj.c | 14 ++ sys/kern/linker_if.m | 23 +++ sys/sys/linker.h | 3 + 13 files changed, 1054 insertions(+), 1 deletion(-) diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index 3648c9ca58cb..f3443cbac127 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -289,6 +289,32 @@ eax = xxxxxx ecx = yyyyyy .Ed .Pp +.It Ic pprint Ns Oo Li / Ns Cm d depth Oc Oo Ar name Oc +Pretty-print symbol specified by +.Ar name +using CTF debugging data. Works for all symbols exported by the kernel and loaded kernel modules. +.Pp +If the +.Cm d +modifier has been specified, contents of structs nested up to +.Ar depth +levels deep will also be included in the output. +.Ed +.Pp +.It Ic pprint struct Ns Oo Li / Ns Cm d depth Ic Oc Oo Ar name Oc Ns Op Ns Ar addr +Print memory at +.Ar addr +as struct +.Ar name Ns . +Works for all structs defined by the kernel and loaded kernel modules. +.Pp +If the +.Cm d +modifier has been specified, contents of structs nested up to +.Ar depth +levels deep will also be included in the output. +.Ed +.Pp .It Xo .Ic write Ns Op Li / Ns Cm bhl .Ar addr expr1 Op Ar expr2 ... diff --git a/sys/conf/files b/sys/conf/files index c902bcfdbd52..021829408c0f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -718,12 +718,14 @@ ddb/db_access.c optional ddb ddb/db_break.c optional ddb ddb/db_capture.c optional ddb ddb/db_command.c optional ddb +ddb/db_ctf.c optional ddb ddb/db_examine.c optional ddb ddb/db_expr.c optional ddb ddb/db_input.c optional ddb ddb/db_lex.c optional ddb ddb/db_main.c optional ddb ddb/db_output.c optional ddb +ddb/db_pprint.c optional ddb ddb/db_print.c optional ddb ddb/db_ps.c optional ddb ddb/db_run.c optional ddb diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 9d79e3b2a6d3..0c88d496f6b8 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -163,6 +163,7 @@ static struct db_command db_cmds[] = { DB_CMD("capture", db_capture_cmd, CS_OWN|DB_CMD_MEMSAFE), DB_CMD("textdump", db_textdump_cmd, CS_OWN|DB_CMD_MEMSAFE), DB_CMD("findstack", db_findstack_cmd, 0), + DB_CMD("pprint", db_pprint_cmd, CS_OWN), }; struct db_command_table db_cmd_table = LIST_HEAD_INITIALIZER(db_cmd_table); diff --git a/sys/ddb/db_ctf.c b/sys/ddb/db_ctf.c new file mode 100644 index 000000000000..03145064885c --- /dev/null +++ b/sys/ddb/db_ctf.c @@ -0,0 +1,326 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Bojan Novković + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +static const ctf_header_t * +db_ctf_fetch_cth(linker_ctf_t *lc) +{ + return (const ctf_header_t *)lc->ctftab; +} + +/* + * Tries to look up the ELF symbol -> CTF type identifier mapping by scanning + * the CTF object section. + */ +static uint32_t +sym_to_objtoff(linker_ctf_t *lc, const Elf_Sym *sym, const Elf_Sym *symtab, + const Elf_Sym *symtab_end) +{ + const ctf_header_t *hp = db_ctf_fetch_cth(lc); + uint32_t objtoff = hp->cth_objtoff; + const size_t idwidth = 4; + + /* Ignore non-object symbols */ + if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT) { + return (DB_CTF_INVALID_OFF); + } + /* Sanity check */ + if (!(sym >= symtab && sym <= symtab_end)) { + return (DB_CTF_INVALID_OFF); + } + + for (const Elf_Sym *symp = symtab; symp < symtab_end; symp++) { + /* Make sure we do not go beyond the objtoff section */ + if (objtoff >= hp->cth_funcoff) { + objtoff = DB_CTF_INVALID_OFF; + break; + } + if (symp->st_name == 0 || symp->st_shndx == SHN_UNDEF) { + continue; + } + if (symp->st_shndx == SHN_ABS && symp->st_value == 0) { + continue; + } + + /* Skip non-object symbols */ + if (ELF_ST_TYPE(symp->st_info) != STT_OBJECT) { + continue; + } + if (symp == sym) { + break; + } + objtoff += idwidth; + } + + return (objtoff); +} + +/* + * Returns the size of CTF type 't'. + */ +static u_int +db_ctf_type_size(struct ctf_type_v3 *t) +{ + u_int vlen, kind, ssize; + u_int type_struct_size, kind_size; + + vlen = CTF_V3_INFO_VLEN(t->ctt_info); + kind = CTF_V3_INFO_KIND(t->ctt_info); + ssize = ((t->ctt_size == CTF_V3_LSIZE_SENT) ? CTF_TYPE_LSIZE(t) : + t->ctt_size); + type_struct_size = ((t->ctt_size == CTF_V3_LSIZE_SENT) ? + sizeof(struct ctf_type_v3) : + sizeof(struct ctf_stype_v3)); + + switch (kind) { + case CTF_K_INTEGER: + case CTF_K_FLOAT: + kind_size = sizeof(uint32_t); + break; + case CTF_K_ARRAY: + kind_size = sizeof(struct ctf_array_v3); + break; + case CTF_K_UNION: + case CTF_K_STRUCT: + kind_size = vlen * + ((ssize < CTF_V3_LSTRUCT_THRESH) ? + sizeof(struct ctf_member_v3) : + sizeof(struct ctf_lmember_v3)); + break; + case CTF_K_ENUM: + kind_size = vlen * sizeof(struct ctf_enum); + break; + case CTF_K_FUNCTION: + kind_size = vlen * sizeof(uint32_t); + break; + case CTF_K_UNKNOWN: + case CTF_K_FORWARD: + case CTF_K_POINTER: + case CTF_K_TYPEDEF: + case CTF_K_VOLATILE: + case CTF_K_CONST: + case CTF_K_RESTRICT: + kind_size = 0; + break; + default: + db_printf("Error: invalid CTF type kind encountered\n"); + return (-1); + } + + return (type_struct_size + kind_size); +} + +/* + * Looks up type name 'name' in the CTF string table and returns the + * corresponding CTF type struct, if any. + */ +struct ctf_type_v3 * +db_ctf_typename_to_type(linker_ctf_t *lc, const char *name) +{ + const ctf_header_t *hp = db_ctf_fetch_cth(lc); + char *start, *cur, *end; + uint32_t stroff = hp->cth_stroff; + uint32_t typeoff = hp->cth_typeoff; + uint32_t name_stroff; + const uint8_t *ctfstart = (const uint8_t *)hp + sizeof(ctf_header_t); + + u_int skiplen; + + /* Scan ctf strtab for typename. */ + start = cur = __DECONST(char *, hp) + sizeof(ctf_header_t) + + hp->cth_stroff; + end = cur + hp->cth_strlen; + while (cur < end) { + if (strcmp(cur, name) == 0) + break; + cur += strlen(cur) + 1; + } + if (cur >= end) + return (NULL); + name_stroff = (uint32_t)(cur - start); + + /* Scan for type containing the found stroff. */ + while (typeoff < stroff) { + struct ctf_type_v3 *t = + (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + + typeoff); + /* We found the type struct */ + if (t->ctt_name == name_stroff) { + break; + } + if ((skiplen = db_ctf_type_size(t)) == -1) { + return (NULL); + } + typeoff += skiplen; + } + if (typeoff < stroff) { + return (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + + typeoff); + } else { /* A type struct was not found */ + return (NULL); + } +} + +/* + * Wrapper used by the kernel linker CTF routines. + * Currently used to implement lookup of CTF types accross all loaded kernel + * modules. + */ +bool +db_ctf_lookup_typename(linker_ctf_t *lc, const char *typename) +{ + return (db_ctf_typename_to_type(lc, typename) != NULL); +} + +/* + * Returns the type corresponding to the 'typeid' parameter from the CTF type + * section. + */ +struct ctf_type_v3 * +db_ctf_typeid_to_type(db_ctf_sym_data_t sd, uint32_t typeid) +{ + const ctf_header_t *hp = db_ctf_fetch_cth(&sd->lc); + const uint8_t *ctfstart = (const uint8_t *)hp + sizeof(ctf_header_t); + uint32_t typeoff = hp->cth_typeoff; + uint32_t stroff = hp->cth_stroff; + /* CTF typeids start at 0x1 */ + size_t cur_typeid = 1; + u_int skiplen; + + /* Find corresponding type */ + while (typeoff < stroff) { + struct ctf_type_v3 *t = + (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + + typeoff); + + /* We found the type struct */ + if (cur_typeid == typeid) { + break; + } + cur_typeid++; + if ((skiplen = db_ctf_type_size(t)) == -1) { + return (NULL); + } + typeoff += skiplen; + } + if (typeoff < stroff) { + return (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + + typeoff); + } else { /* A type struct was not found */ + return (NULL); + } +} + +const char * +db_ctf_stroff_to_str(db_ctf_sym_data_t sd, uint32_t off) +{ + const ctf_header_t *hp = db_ctf_fetch_cth(&sd->lc); + uint32_t stroff = hp->cth_stroff + off; + const char *ret; + + if (stroff >= (hp->cth_stroff + hp->cth_strlen)) { + return ("invalid"); + } + ret = ((const char *)hp + sizeof(ctf_header_t)) + stroff; + if (*ret == '\0') { + return (NULL); + } + + return (ret); +} + +/* + * Tries to find the type of the symbol specified in 'sd->sym'. + */ +struct ctf_type_v3 * +db_ctf_sym_to_type(db_ctf_sym_data_t sd) +{ + uint32_t objtoff, typeid; + const Elf_Sym *symtab, *symtab_end; + + if (sd->sym == NULL) { + return (NULL); + } + symtab = sd->lc.symtab; + symtab_end = symtab + sd->lc.nsym; + + objtoff = sym_to_objtoff(&sd->lc, sd->sym, symtab, symtab_end); + /* Sanity check - should not happen */ + if (objtoff == DB_CTF_INVALID_OFF) { + db_printf("Could not find CTF object offset.\n"); + return (NULL); + } + + typeid = *( + const uint32_t *)(sd->lc.ctftab + sizeof(ctf_header_t) + objtoff); + + return (db_ctf_typeid_to_type(sd, typeid)); +} + +/* + * Scans the kernel file and all loaded module for symbol 'name'. + */ +int +db_ctf_find_symbol(const char *name, db_ctf_sym_data_t sd) +{ + int error; + c_linker_sym_t lsym = NULL; + + error = linker_ctf_lookup_sym_ddb(name, &lsym, &sd->lc); + if (error != 0) { + db_printf( + "failed to look up symbol and CTF info for %s: error %d\n", + name, error); + return (error); + } + sd->sym = __DECONST(Elf_Sym *, lsym); + + return (0); +} + +/* + * Scans the kernel file and all loaded module for type specified by 'typename'. + */ +struct ctf_type_v3 * +db_ctf_find_typename(db_ctf_sym_data_t sd, const char *typename) +{ + if (linker_ctf_lookup_typename_ddb(&sd->lc, typename) != 0) { + return (NULL); + } + return (db_ctf_typename_to_type(&sd->lc, typename)); +} diff --git a/sys/ddb/db_ctf.h b/sys/ddb/db_ctf.h new file mode 100644 index 000000000000..6da5f76b6cf6 --- /dev/null +++ b/sys/ddb/db_ctf.h @@ -0,0 +1,64 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Bojan Novković + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _DDB_DB_CTF_H_ +#define _DDB_DB_CTF_H_ + +#include +#include +#include + +#include +#include + +#define DB_CTF_INVALID_OFF 0xffffffff + +struct db_ctf_sym_data { + linker_ctf_t lc; + Elf_Sym *sym; +}; + +typedef struct db_ctf_sym_data *db_ctf_sym_data_t; + +/* + * Routines for finding symbols and CTF info accross all loaded linker files. + */ +int db_ctf_find_symbol(const char *name, db_ctf_sym_data_t sd); +struct ctf_type_v3 *db_ctf_find_typename(db_ctf_sym_data_t sd, + const char *typename); +bool db_ctf_lookup_typename(linker_ctf_t *lc, const char *typename); + +/* + * Routines for working with CTF data. + */ +struct ctf_type_v3 *db_ctf_sym_to_type(db_ctf_sym_data_t sd); +const char *db_ctf_stroff_to_str(db_ctf_sym_data_t sd, uint32_t off); +struct ctf_type_v3 *db_ctf_typename_to_type(linker_ctf_t *lc, const char *name); +struct ctf_type_v3 *db_ctf_typeid_to_type(db_ctf_sym_data_t sd, + uint32_t typeid); + +#endif /* !_DDB_DB_CTF_H_ */ diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c new file mode 100644 index 000000000000..dc7582864957 --- /dev/null +++ b/sys/ddb/db_pprint.c @@ -0,0 +1,450 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Bojan Novković + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include + +#define DB_PPRINT_DEFAULT_DEPTH 1 + +static void db_pprint_type(db_addr_t addr, struct ctf_type_v3 *type, + u_int depth); + +static u_int max_depth = DB_PPRINT_DEFAULT_DEPTH; +static struct db_ctf_sym_data sym_data; + +/* + * Pretty-prints a CTF_INT type. + */ +static inline void +db_pprint_int(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + uint32_t data; + size_t type_struct_size; + + type_struct_size = (type->ctt_size == CTF_V3_LSIZE_SENT) ? + sizeof(struct ctf_type_v3) : + sizeof(struct ctf_stype_v3); + + data = db_get_value((db_expr_t)type + type_struct_size, + sizeof(uint32_t), 0); + u_int bits = CTF_INT_BITS(data); + boolean_t sign = !!(CTF_INT_ENCODING(data) & CTF_INT_SIGNED); + + if (db_pager_quit) { + return; + } + if (bits > 64) { + db_printf("Invalid size '%d' found for integer type\n", bits); + return; + } + db_printf("0x%lx", + db_get_value(addr, (bits / 8) ? (bits / 8) : 1, sign)); +} + +/* + * Pretty-prints a struct. Nested structs are pretty-printed up 'depth' nested + * levels. + */ +static inline void +db_pprint_struct(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + size_t type_struct_size; + size_t struct_size; + struct ctf_type_v3 *mtype; + const char *mname; + db_addr_t maddr; + u_int vlen; + + type_struct_size = (type->ctt_size == CTF_V3_LSIZE_SENT) ? + sizeof(struct ctf_type_v3) : + sizeof(struct ctf_stype_v3); + struct_size = ((type->ctt_size == CTF_V3_LSIZE_SENT) ? + CTF_TYPE_LSIZE(type) : + type->ctt_size); + vlen = CTF_V3_INFO_VLEN(type->ctt_info); + + if (db_pager_quit) { + return; + } + if (depth > max_depth) { + db_printf("{ ... }"); + return; + } + db_printf("{\n"); + + if (struct_size < CTF_V3_LSTRUCT_THRESH) { + struct ctf_member_v3 *mp, *endp; + + mp = (struct ctf_member_v3 *)((db_addr_t)type + + type_struct_size); + endp = mp + vlen; + for (; mp < endp; mp++) { + if (db_pager_quit) { + return; + } + mtype = db_ctf_typeid_to_type(&sym_data, mp->ctm_type); + maddr = addr + mp->ctm_offset; + mname = db_ctf_stroff_to_str(&sym_data, mp->ctm_name); + db_indent = depth; + if (mname != NULL) { + db_iprintf("%s = ", mname); + } else { + db_iprintf(""); + } + + db_pprint_type(maddr, mtype, depth + 1); + db_printf(",\n"); + } + } else { + struct ctf_lmember_v3 *mp, *endp; + + mp = (struct ctf_lmember_v3 *)((db_addr_t)type + + type_struct_size); + endp = mp + vlen; + for (; mp < endp; mp++) { + if (db_pager_quit) { + return; + } + mtype = db_ctf_typeid_to_type(&sym_data, mp->ctlm_type); + maddr = addr + CTF_LMEM_OFFSET(mp); + mname = db_ctf_stroff_to_str(&sym_data, mp->ctlm_name); + db_indent = depth; + if (mname != NULL) { + db_iprintf("%s = ", mname); + } else { + db_iprintf(""); + } + + db_pprint_type(maddr, mtype, depth + 1); + db_printf(","); + } + } + db_indent = depth - 1; + db_iprintf("}"); +} + +/* + * Pretty-prints an array. Each array member is printed out in a separate line + * indented with 'depth' spaces. + */ +static inline void +db_pprint_arr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + struct ctf_type_v3 *elem_type; + struct ctf_array_v3 *arr; + db_addr_t elem_addr, end; + size_t type_struct_size; + size_t elem_size; + + type_struct_size = (type->ctt_size == CTF_V3_LSIZE_SENT) ? + sizeof(struct ctf_type_v3) : + sizeof(struct ctf_stype_v3); + arr = (struct ctf_array_v3 *)((db_addr_t)type + type_struct_size); + elem_type = db_ctf_typeid_to_type(&sym_data, arr->cta_contents); + elem_size = ((elem_type->ctt_size == CTF_V3_LSIZE_SENT) ? + CTF_TYPE_LSIZE(elem_type) : + elem_type->ctt_size); + elem_addr = addr; + end = addr + (arr->cta_nelems * elem_size); + + db_indent = depth; + db_printf("[\n"); + /* Loop through and print individual elements. */ + for (; elem_addr < end; elem_addr += elem_size) { + if (db_pager_quit) { + return; + } + db_iprintf(""); + db_pprint_type(elem_addr, elem_type, depth); + if ((elem_addr + elem_size) < end) { + db_printf(",\n"); + } + } + db_printf("\n"); + db_indent = depth - 1; + db_iprintf("]"); +} + +/* + * Pretty-prints an enum value. Also prints out symbolic name of value, if any. + */ +static inline void +db_pprint_enum(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + struct ctf_enum *ep, *endp; + size_t type_struct_size; + const char *valname; + db_expr_t val; + u_int vlen; + + type_struct_size = (type->ctt_size == CTF_V3_LSIZE_SENT) ? + sizeof(struct ctf_type_v3) : + sizeof(struct ctf_stype_v3); + vlen = CTF_V3_INFO_VLEN(type->ctt_info); + val = db_get_value(addr, sizeof(int), 0); + + if (db_pager_quit) { + return; + } + ep = (struct ctf_enum *)((db_addr_t)type + type_struct_size); + endp = ep + vlen; + for (; ep < endp; ep++) { + if (val == ep->cte_value) { + valname = db_ctf_stroff_to_str(&sym_data, ep->cte_name); + if (valname != NULL) + db_printf("%s (0x%lx)", valname, val); + else + db_printf("(0x%lx)", val); + break; + } + } +} + +/* + * Pretty-prints a pointer. If the 'depth' parameter is less than the + * 'max_depth' global var, the pointer is "dereference", i.e. the contents of + * the memory it points to are also printed. The value of the pointer is printed + * otherwise. + */ +static inline void +db_pprint_ptr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + struct ctf_type_v3 *ref_type; + const char *qual = ""; + const char *name; + db_addr_t val; + u_int kind; + + ref_type = db_ctf_typeid_to_type(&sym_data, type->ctt_type); + kind = CTF_V3_INFO_KIND(ref_type->ctt_info); + switch (kind) { + case CTF_K_STRUCT: + qual = "struct "; + break; + case CTF_K_VOLATILE: + qual = "volatile "; + break; + case CTF_K_CONST: + qual = "const "; + break; + default: + break; + } + + val = db_get_value(addr, sizeof(db_addr_t), false); + if (depth < max_depth) { + /* Print contents of memory pointed to by this pointer. */ + db_pprint_type(addr, ref_type, depth + 1); + } else { + name = db_ctf_stroff_to_str(&sym_data, ref_type->ctt_name); + db_indent = depth; + if (name != NULL) + db_printf("(%s%s *) 0x%lx", qual, name, val); + else + db_printf("0x%lx", val); + } +} + +/* + * Pretty-print dispatching function. + */ +static void +db_pprint_type(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) +{ + + if (db_pager_quit) { + return; + } + if (type == NULL) { + db_printf("unknown type"); + return; + } + + switch (CTF_V3_INFO_KIND(type->ctt_info)) { + case CTF_K_INTEGER: + db_pprint_int(addr, type, depth); + break; + case CTF_K_UNION: + case CTF_K_STRUCT: + db_pprint_struct(addr, type, depth); + break; + case CTF_K_FUNCTION: + case CTF_K_FLOAT: + db_indent = depth; + db_iprintf("0x%lx", addr); + break; + case CTF_K_POINTER: + db_pprint_ptr(addr, type, depth); + break; + case CTF_K_TYPEDEF: + case CTF_K_VOLATILE: + case CTF_K_RESTRICT: + case CTF_K_CONST: { + struct ctf_type_v3 *ref_type = db_ctf_typeid_to_type(&sym_data, + type->ctt_type); + db_pprint_type(addr, ref_type, depth); + break; + } + case CTF_K_ENUM: + db_pprint_enum(addr, type, depth); + break; + case CTF_K_ARRAY: + db_pprint_arr(addr, type, depth); + break; + case CTF_K_UNKNOWN: + case CTF_K_FORWARD: + default: + break; + } +} + +/* + * Symbol pretty-printing command. + * Syntax: pprint [/d depth] + */ +static void +db_pprint_symbol_cmd(const char *name) +{ + db_addr_t addr; + int db_indent_old; + const char *type_name = NULL; + struct ctf_type_v3 *type = NULL; + + if (db_pager_quit) { + return; + } + /* Clear symbol and CTF info */ + memset(&sym_data, 0, sizeof(struct db_ctf_sym_data)); + if (db_ctf_find_symbol(name, &sym_data) != 0) { + db_error("Symbol not found\n"); + } + if (ELF_ST_TYPE(sym_data.sym->st_info) != STT_OBJECT) { + db_error("Symbol is not a variable\n"); + } + addr = sym_data.sym->st_value; + type = db_ctf_sym_to_type(&sym_data); + if (type == NULL) { + db_error("Can't find CTF type info\n"); + } + type_name = db_ctf_stroff_to_str(&sym_data, type->ctt_name); + if (type_name != NULL) + db_printf("%s ", type_name); + db_printf("%s = ", name); + + db_indent_old = db_indent; + db_pprint_type(addr, type, 0); + db_indent = db_indent_old; +} + +/* + * Command for pretty-printing arbitrary addresses. + * Syntax: pprint [/d depth] struct + */ +static void +db_pprint_struct_cmd(db_expr_t addr, const char *struct_name) +{ + int db_indent_old; + struct ctf_type_v3 *type = NULL; + + type = db_ctf_find_typename(&sym_data, struct_name); + if (type == NULL) { + db_error("Can't find CTF type info\n"); + return; + } + + db_printf("struct %s ", struct_name); + db_printf("%p = ", (void *)addr); + + db_indent_old = db_indent; + db_pprint_type(addr, type, 0); + db_indent = db_indent_old; +} + +/* + * Pretty print an address or a symbol. + */ +void +db_pprint_cmd(db_expr_t addr, bool have_addr, db_expr_t count, char *modif) +{ + int t = 0; + const char *name; + + /* Set default depth */ + max_depth = DB_PPRINT_DEFAULT_DEPTH; + /* Parse print modifiers */ + t = db_read_token(); + if (t == tSLASH) { + t = db_read_token(); + if (t != tIDENT) { + db_error("Invalid flag passed\n"); + } + /* Parse desired depth level */ + if (strcmp(db_tok_string, "d") == 0) { + t = db_read_token(); + if (t != tNUMBER) { + db_error("Invalid depth provided\n"); + } + max_depth = db_tok_number; + } else { + db_error("Invalid flag passed\n"); + } + /* Fetch next token */ + t = db_read_token(); + } + /* Parse subcomannd */ + if (t == tIDENT) { + if (strcmp(db_tok_string, "struct") == 0) { + t = db_read_token(); + + if (t != tIDENT) { + db_error("Invalid struct type name provided\n"); + } + name = db_tok_string; + + if (db_expression(&addr) == 0) { + db_error("Address not provided\n"); + } + db_pprint_struct_cmd(addr, name); + } else { + name = db_tok_string; + db_pprint_symbol_cmd(name); + } + } else { + db_error("Invalid subcommand\n"); + } + db_skip_to_eol(); +} diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index 1f388efcb389..bb92fef63e94 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -297,6 +297,7 @@ db_cmdfcn_t db_trace_until_matching_cmd; db_cmdfcn_t db_unscript_cmd; db_cmdfcn_t db_watchpoint_cmd; db_cmdfcn_t db_write_cmd; +db_cmdfcn_t db_pprint_cmd; /* * Interface between DDB and the DDB output capture facility. diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index 748622653eb3..8a2106a15308 100644 --- a/sys/kern/kern_ctf.c *** 331 LINES SKIPPED *** From nobody Fri Mar 22 04:20:47 2024 X-Original-To: dev-commits-src-all@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 4V18Jb2M4kz5Fdbq; Fri, 22 Mar 2024 04:20:47 +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 4V18Jb1Ntgz440Z; Fri, 22 Mar 2024 04:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711081247; 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=Y73oZniRjNt8yGt4q3bmZshwNyqg3FOqkEYB/8DGZu8=; b=EjwCassqFSpYyJafU+1ycrqYVNS1vQnswstz95bsqJDFXlUNzl/n59DmnlJzLgSxOqF+V8 iCe6xnhcCO7zu3ZqGYMKLhHx1BNOhl6RonOOe1l92rYWsyhOiNI4jZMVtiqBuYNKqK/P7h bRYSbZ1NwwwxDJ6I6IPUZxoMFGp/XI8QR3NrWyYFxd8qvIRXUubM5w++ES+41rO9rb2XWm eNqPfyJEM/1SZiChG40THm+tc2ij0Ncurkt7iyvFeWICofdb3al1RBnuVj4qbwV9z5bHmx LXTud27ELQX9baU82M0T28BE5FVe2IE0fRfHd04+6VwQOOvDfaNNMvhGGNTVtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711081247; a=rsa-sha256; cv=none; b=rm6nf4ZEO1ubI0o+jd6Ynz4j5vfuo8GAlTt7snJY2sgFuYA9CM4Os22Fvl/XAjT3Uh5PdA Tu89KavX9j6TFpynaiMpiuXZ71hlB46s9H1YSbY7Tjt6UGkeHDZH0Sy6OeIWPrilUHSO2b 8R7eaEbc/DHmHXa9Gb+MHP64Wv5250p1HW6ixxs86wEedjoDrGAIFVUfUreNlCVVf3onzG NL/KeNr9S5Ofx/D/ZwEENqFO3t+8Ya27HJWxmUZZBLpDUAscGRpGpCmSvKKIFVTgzfNASX SlG3755IIE/BcFtyQPnYcqJ/AURsBxIq2iV+4YToEMDpuDlUdDQ6d/hE8z6/wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711081247; 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=Y73oZniRjNt8yGt4q3bmZshwNyqg3FOqkEYB/8DGZu8=; b=JzAumAUAM+2rfynp485DzXpRLBPoTE/troJeqf3Xw1LRTvdLz3cdzjKk08r2nm1uI80/6a Hon1mH+9PhMwHPBDwwS9hnfeTeO9hy0T7Khk4DttO49lQBthMTY1BzkiFKqGxLWgrckm8w 5g1rgNxSM+3x56taKLcLAxep4ZfRH5ycjVlwIrYiX2aDK/pyyXVogtHIX6b7p8sqsr3SKC ZkoFgQ91fspS/leTqCOP6cU2+NbqG/b5U+IB9pdk5oNRFfXOKaAjnSFm9azttH6Z8SZDxO cL6V6WolXBuQH3nltcLwjg8dsVjL9JU3zM49LP/JrhT2mw3Mh0myXI4skTVl7w== 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 4V18Jb113kz14JZ; Fri, 22 Mar 2024 04:20:47 +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 42M4KlS4066898; Fri, 22 Mar 2024 04:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M4KlbF066895; Fri, 22 Mar 2024 04:20:47 GMT (envelope-from git) Date: Fri, 22 Mar 2024 04:20:47 GMT Message-Id: <202403220420.42M4KlbF066895@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: 26173a919ced - main - arm64/vmm: Exclude more sanitizer compiler flags from certain files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 26173a919ced6179aa758db44fffc3bcac532be6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26173a919ced6179aa758db44fffc3bcac532be6 commit 26173a919ced6179aa758db44fffc3bcac532be6 Author: Mark Johnston AuthorDate: 2024-03-22 04:19:11 +0000 Commit: Mark Johnston CommitDate: 2024-03-22 04:20:34 +0000 arm64/vmm: Exclude more sanitizer compiler flags from certain files Reported by: rscheff Fixes: 47e073941f4e ("Import the kernel parts of bhyve/arm64") --- sys/conf/files.arm64 | 4 ++-- sys/modules/vmm/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index ef00857b61c0..679d442f672b 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -124,10 +124,10 @@ arm64/vmm/vmm_arm64.c optional vmm arm64/vmm/vmm_reset.c optional vmm arm64/vmm/vmm_call.S optional vmm arm64/vmm/vmm_hyp_exception.S optional vmm \ - compile-with "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie" \ + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie" \ no-obj arm64/vmm/vmm_hyp.c optional vmm \ - compile-with "${NORMAL_C:N-fsanitize*:N-mbranch-protection*} -fpie" \ + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} -fpie" \ no-obj vmm_hyp_blob.elf.full optional vmm \ dependency "vmm_hyp.o vmm_hyp_exception.o" \ diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 075e594c4da1..1ef9e264ee97 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -41,11 +41,11 @@ CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin vmm_hyp_exception.o: vmm_hyp_exception.S ${CC} -c -x assembler-with-cpp -DLOCORE \ - ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \ + ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \ ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp.o: vmm_hyp.c - ${CC} -c ${CFLAGS:N-fsanitize*:N-mbranch-protection*} \ + ${CC} -c ${CFLAGS:N-fsanitize*:N-fno-sanitize*:N-mbranch-protection*} \ ${.IMPSRC} -o ${.TARGET} -fpie vmm_hyp_blob.elf.full: vmm_hyp_exception.o vmm_hyp.o From nobody Fri Mar 22 06:14:30 2024 X-Original-To: dev-commits-src-all@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 4V1Bqp4K4Fz5Fqlw; Fri, 22 Mar 2024 06:14: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 4V1Bqp3pVsz4DBK; Fri, 22 Mar 2024 06:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711088070; 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=07LoONq/m2cg5gSNFMB9YshdVJJ2CQk5KaqKaTUbM1Y=; b=OUd0MCYUufeMdqqPpXMsOip7cRa3LMu5DhDnWpNpdgTDsrY5sZZfw1TJsjIMxUM4JYB99e UxWly5/IX9OF1hsQu47K/FDh/qOtOp7X6CcoysL7aPlY/vg7tGVTNr79li6KoiCNoP8G3n hPsTKw/v8dlEwFmEYk/CeYj11TiFBOwt4owXdJAeTKjs0ZMJ6GG7n6g7glO1lOj0Lga/zJ ZiSeAqS2ShJdxFYQt2TPrth1YMsMOsIGkpj1ByrxwVeU0kSMbrTRskMIwPv/ZQ2Hea3/40 dv+iBz4hXzlhM33w2Dtw5FQuTlDkMAVNnPlndm1dczbeq+ei7dvk02cRIpDe6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711088070; a=rsa-sha256; cv=none; b=xA3RdI0z2zhhX4CqHKAaHOpM8r3qmSoEOkgE+btMMKHlNqKsNXdUqm1V7lcjU/b4hXATeJ T5w6q1H29evxwzubZ+CqT81aAFj9z+DBFkSZ+RmsNTPmkWVbzpyOD6LumO65iiK3zCMF14 HK8+j4N2sNcJCiaOVbifezAkffiDhw6vD/PVz1eMbv9/90BYyeIMnOYXZxr1vaRF8nE+wV o39KQoTyZxpaVnAuW+wUxIKUE1aOZo7QJyrTzEzGwrB0xu5onW14MQe3PmGn1IBmuy865Z 0fOsQyc593NIm4xGxco3Ar8rIe3Yp/TlMI+mFjUvbJIAfYuUN1RbeUYQXQ1Jow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711088070; 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=07LoONq/m2cg5gSNFMB9YshdVJJ2CQk5KaqKaTUbM1Y=; b=atbfoxtBxcTJRmXzpmfEMNyiQkOTNXfS/YuowzGJbcpgZXbUzWLap9vSWoPLg2IMQu+VSH FwfxvLIcsiXzx3aiSEU4cdZShcfxCqPeo480UG/rf+y3k/i9ETng1qTP3KnOmuRbaz36ug TJQ5mFiz5MeuvlKEbMiw9jHiSojyP8ryINOzYwJjdpejDJFhMoDivEkZivHC8ASvLacOBL AntR3nOhrinb5yEear8iJ09paV312vxWN58VEPEwiCC3dAnD7lAsYfjAZdrOD2WGfJ0lv1 HH9/MF6C/eKTHCkTTWQPogrZ6qI2aKXEaD/50Jtb06oe9sW66Wz6/p9ckiEN5Q== 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 4V1Bqp3Pk0z16rF; Fri, 22 Mar 2024 06:14: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 42M6EUwV057669; Fri, 22 Mar 2024 06:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M6EU2l057666; Fri, 22 Mar 2024 06:14:30 GMT (envelope-from git) Date: Fri, 22 Mar 2024 06:14:30 GMT Message-Id: <202403220614.42M6EU2l057666@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: d722901fa3a2 - main - ddb: Fix format string errors in db_pprint.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d722901fa3a258d879ce894242a926961a964107 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d722901fa3a258d879ce894242a926961a964107 commit d722901fa3a258d879ce894242a926961a964107 Author: Mark Johnston AuthorDate: 2024-03-22 06:11:03 +0000 Commit: Mark Johnston CommitDate: 2024-03-22 06:11:03 +0000 ddb: Fix format string errors in db_pprint.c For some reason, db_expr_t is defined as "long" on 64-bit platforms and "int" on others. When printing values of this type, simply cast them to long to suppress compilation errors on 32-bit systems. Reviewed by: bnovkov Fixes: c21bc6f3c242 ("ddb: Add CTF-based pretty printing") --- sys/ddb/db_pprint.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index dc7582864957..aae3d698e8ec 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -72,7 +72,7 @@ db_pprint_int(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) return; } db_printf("0x%lx", - db_get_value(addr, (bits / 8) ? (bits / 8) : 1, sign)); + (long)db_get_value(addr, (bits / 8) ? (bits / 8) : 1, sign)); } /* @@ -226,9 +226,9 @@ db_pprint_enum(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) if (val == ep->cte_value) { valname = db_ctf_stroff_to_str(&sym_data, ep->cte_name); if (valname != NULL) - db_printf("%s (0x%lx)", valname, val); + db_printf("%s (0x%lx)", valname, (long)val); else - db_printf("(0x%lx)", val); + db_printf("(0x%lx)", (long)val); break; } } @@ -273,9 +273,9 @@ db_pprint_ptr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) name = db_ctf_stroff_to_str(&sym_data, ref_type->ctt_name); db_indent = depth; if (name != NULL) - db_printf("(%s%s *) 0x%lx", qual, name, val); + db_printf("(%s%s *) 0x%lx", qual, name, (long)val); else - db_printf("0x%lx", val); + db_printf("0x%lx", (long)val); } } @@ -305,7 +305,7 @@ db_pprint_type(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) case CTF_K_FUNCTION: case CTF_K_FLOAT: db_indent = depth; - db_iprintf("0x%lx", addr); + db_iprintf("0x%lx", (long)addr); break; case CTF_K_POINTER: db_pprint_ptr(addr, type, depth); From nobody Fri Mar 22 06:50:58 2024 X-Original-To: dev-commits-src-all@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 4V1Cdv3btkz5Ftxq; Fri, 22 Mar 2024 06:50: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 4V1Cdt6cdCz4G5P; Fri, 22 Mar 2024 06:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711090258; 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=P6BJ0E4rBwvBxz6ZLUmAJlDKwC85eQbYPBNeRhcBYsI=; b=jNpaIzm9qB0YmURPhBcMLaS/YJ40stV9nZxenPiUlq53G/DTdZcXQt+HqfdFGIjQUjJRPL vmtiyp2/vNrw6bV6b5sNjVBCqvNrYJ18eiKRcP51tWU+h9u3pxKgj6GxKeP6BbKDZjX3fz qPOh0crD55HKP+jGRdleNczvPu0lzbfAu05un4QheTF4nGJ/CzxRlX96tdv/gWX5Wh+eyu kYYiCpwWuSglt1kZFyXqOUJ4AqkHBit/9sRaUhN+5goR58nFnSCoEaNsFGorY6ZifPpR3i G3W2SevtTmeFuEygz3VyeKsoOMKo7uKXYhZictopZV3UrtGo2iQcJuACWxfMwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711090258; a=rsa-sha256; cv=none; b=Zju3k30bzoMbzBBxlEcen+I8TTib13pi82MpBdmrmK5XoST5M95yKcVG6e0KnwW548QaK/ 1Wq76t9sKcLgrBKon+FAVLZghn3m++45fSbzGr2vBNOgTSUMORFMVXNOwmYOSQv+jwSFEc ZwUnbwcLu203d3qTLx0vQ1asb0PUtX+JMmgPeyWwXbtG+mI8gwK7UXQvBEsgstVHeAqFFZ W3X1+iu2Z0mn/rGODcVXU7mCgfJ2BpP0SlFUKi8d/0Q4Rp9XHBnbbTyRz/Zw2rcRk+cdrd W10wZK2Us0XgL2GyZ7BR3aibyCzo9aQeKek/HxKM7tAZWMe79p2YYPz3JPuPow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711090258; 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=P6BJ0E4rBwvBxz6ZLUmAJlDKwC85eQbYPBNeRhcBYsI=; b=e/9KIbXXJ0x4gnE1oLOYoSswPoQLnI6u8x6DBYUVpqjtKbM14GPY6VlZzXr37hldkPdaZi K/xpRZl/lkxKjXyOuUXZ6d+yXigw2ravMlDzah28a+p49of7sD3RCJMWRZUD7GAKM2mF7A Su3KvO0CaL+c3XHmnMklhNTe4/4D3PnVjkjJO/LWULsRmnIVpZ6AsDm9p8eHTBqz8qWem5 oAAK5NpaCpA6+LzDi0OAfH3sv2qHwcChLICKvVjRGae8fVsJNB65dR3hGUgY0Zw3Gpei55 X1sNx+7sMmftvDzFey8KYewVYWklg6gBq9MCBNV1HmdbGgC97qqAbyssmJz4SQ== 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 4V1Cdt6DmZz17xM; Fri, 22 Mar 2024 06:50: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 42M6owO6019790; Fri, 22 Mar 2024 06:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M6ow5x019787; Fri, 22 Mar 2024 06:50:58 GMT (envelope-from git) Date: Fri, 22 Mar 2024 06:50:58 GMT Message-Id: <202403220650.42M6ow5x019787@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 594c5fa10919 - main - arm/nvidia: Fix DTS build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 594c5fa10919c25e7398348731d7da55149a5e5c Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=594c5fa10919c25e7398348731d7da55149a5e5c commit 594c5fa10919c25e7398348731d7da55149a5e5c Author: Emmanuel Vadot AuthorDate: 2024-03-22 06:49:54 +0000 Commit: Emmanuel Vadot CommitDate: 2024-03-22 06:49:54 +0000 arm/nvidia: Fix DTS build We need to include the DTS with the full path now that it changed. Fixes: f126890ac538 ("Import device-tree files from Linux 6.5") Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dts/arm/tegra124-jetson-tk1-fbsd.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts b/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts index 276feadc42b2..0a5d325f0537 100644 --- a/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts +++ b/sys/dts/arm/tegra124-jetson-tk1-fbsd.dts @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include "tegra124-jetson-tk1.dts" +#include "nvidia/tegra124-jetson-tk1.dts" / { chosen { From nobody Fri Mar 22 07:38:45 2024 X-Original-To: dev-commits-src-all@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 4V1Dj42nP9z5G0ZD; Fri, 22 Mar 2024 07:38:48 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4V1Dj422bNz4MQB; Fri, 22 Mar 2024 07:38:48 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711093128; 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=IiWB3+tyCZY5Ke5gHkCFX5fitTF2RgwN+WRJvUPREAI=; b=sxmyWppkPGZhz1laGTlJwXQu9fXE56u21bhmHvSpu3jVH0qc5r1QPywEAXmfC1hy/qH0Om 0gKc+s3vxG66omBMbgd/qw2IN9O6nxJ/mBfuRsDodRBmWOLsLPlhkzV5LKgnROhfYhjVUl 3/iiVwVxT8XidI47AYqxHS0NXCUhkf0PcYsJUUC/snLdaZKRv+hNPf/GWF+FLR8UupvlKu 1kmtIfgZHEQlv9ds7ExpnpHj6oR88WRR6bK/2/Ms61iGjmAX5mykW6Ymxi4KHkkAD12ll7 rV+nhQ9fHbUCe1JXRweNmgJD5DMPnjvxUOme/dfa7qY8sYTOcUuMIf5+R68F1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711093128; a=rsa-sha256; cv=none; b=hrSqbaHYQZyZMvMU5OtUJi82zUxx+MvPFGqPAM2z/dU0tsPERwQBw0Lfzd6Kct1L2QmNNi BUBpdNPOleoW2t6erDFxS945ERWprzYiJDk7Gez4Y5k77KqmZTAqGzdZvha89iSQbPH2ts mXQFY4y9q0IBQTio1UuW5IvEn4g8gGAtmdbJkW+XaGNPWun27jmdYsfwAT+RVHGy6U1Zwe lu4lm/MZKnWilwPqEluA0CB6HkMkgAMW65kGt6t8T+ECyIEKPOSoDMZm6wzUK9fnVadrYc QjKyhqeBHKpzBSCf/I+wLGnWKKa79MwmnqzowlbylkxqCG1vGRO0/Ydi1dqF/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711093128; 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=IiWB3+tyCZY5Ke5gHkCFX5fitTF2RgwN+WRJvUPREAI=; b=HWWOG5+30jJ6nFSZQwdbPp+ZKKoyptg9W0tBBc6mSaxsUNfTxTH6DjyvyW8f53bNPbbf1H 6A/RzPDqq4HmDEISWGB/XecnKlsvgdFwvyu7zhUt7kH+hQ8ADw7hVu91iT2s6CI6bVaUfQ JX6CT6NMYb6Ea4lzfBqo5JiL8JViYhCzP77y0d15/PG1ZjzirDoiVrieM1v8g5DNt0fxoW cAcpqot2nELvBLOFssL6qCQcK4wYwineXB8tDLQSf4rQBQyjG8G2XgJ5BxW1D+lI5v/G9M 716yWlUiXEfRxj+ZBv8J9JaS4JnEj/L3+OYRqeOIcG51cZ3YJUGQtABtIvXd2w== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V1Dj40xRsz1NQh; Fri, 22 Mar 2024 07:38:48 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id B442E19A45; Fri, 22 Mar 2024 08:38:45 +0100 (CET) Date: Fri, 22 Mar 2024 08:38:45 +0100 From: Baptiste Daroussin To: Bojan =?utf-8?B?Tm92a292acSH?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c21bc6f3c242 - main - ddb: Add CTF-based pretty printing Message-ID: References: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> On Fri 22 Mar 03:56, Bojan Novković wrote: > The branch main has been updated by bnovkov: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c21bc6f3c2425de74141bfee07b609bf65b5a6b3 > > commit c21bc6f3c2425de74141bfee07b609bf65b5a6b3 > Author: Bojan Novković > AuthorDate: 2024-03-22 03:01:34 +0000 > Commit: Bojan Novković > CommitDate: 2024-03-22 03:03:33 +0000 > > ddb: Add CTF-based pretty printing > > Add basic CTF support and a CTF-powered pretty-printer to ddb. > > The db_ctf.* files expose a basic interface for fetching type > data for ELF symbols, interacting with the CTF string table, > and translating type identifiers to type data. > > The db_pprint.c file uses those interfaces to implement > a pretty-printer for all kernel ELF symbols. > The pretty-printer works with symbol names and arbitrary addresses: > pprint struct thread 0xffffffff8194ad90 > > Pretty-printing currently only works after the root filesystem > gets mounted because the CTF info is not available during > early boot. > > Differential Revision: https://reviews.freebsd.org/D37899 > Approved by: markj (mentor) This breaks building kernel MINIMAL ld: error: undefined symbol: db_ctf_lookup_typename Best regards, Bapt From nobody Fri Mar 22 08:37:26 2024 X-Original-To: dev-commits-src-all@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 4V1G0k2D25z5G5Y0; Fri, 22 Mar 2024 08: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 4V1G0k1j62z4RGj; Fri, 22 Mar 2024 08: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=1711096646; 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=2q76kkTBqTmQ8JL+SNJ7gNfKUqc01IyNtIbDSDhyFSA=; b=pBhTD1o2qU60Ygcw0AdCBu2YOAQgIlQfZ/1u74teSZ6CrI4oSYNEWMk28BkdqQWZiFZdIi ckpBh8b/p23Debcf5Y2zlMOeW1jf7DGaXf30UhwGyisBoasErAZVYLioySSIOTQSMiycgd YR68bEvx1Ng0r7Lve732U1qMLD1vwcNeT+gpIN1B06oOjVdq8WfZvthuqq0s/Yseilzf1s HqeE4Ip8YJxXFYzT6A94jt6HVOz+6vBfF2c3XjH8zxE3co6ESP7d59XOgdHvBqULeZ+IeH y+cuMlz7zgiy3oRydJLwQHg8h50kuEwPIFG3GbuO32aPiVROkBpUHlFdH7YBGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711096646; a=rsa-sha256; cv=none; b=EenhPMMlCMduINPxvZfqjYesA3n+KNhlxn8WZNu6bujI1bj6uWaIYZyXP8WpqNkgEPsWda XLdCckC2VKh+k+n4dixQRI2Hh9uZc2o7fctmGTjIKvQMuFCtuPRcNJSDZoyOwdsVUgu3qS EjdelAmyz2dHHRZo1SCmhI7OFc2MMM1wESMIyC9jGlKbqZM0BEfWk1bX4WPHq2vmvYdqC9 d5WX3mtSJA2X8m5hdvZXAPD2N/6JXigfkX+iM9POkvQB8LezlDrHETFn+BGzpmJcL2o6mj AR1mh0uHA0vM/ObgaxRRpoAeNPBKSDvJszUJUQEfhUkUtq0QMNTe4ZnLITu6aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711096646; 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=2q76kkTBqTmQ8JL+SNJ7gNfKUqc01IyNtIbDSDhyFSA=; b=pqvzRX3edlK8tKXDYLC/N3zAGabjo5uBMoc4Y1G52fbv29VxHCEa116/FnCVpilHODZgAJ h9GlTZ+H3Y5H6FXCSU8j14f94bZXinOLiZhZ1WwBKJZk7XTxtz2wxiDb4ftOjH+Eh9DxG5 zEfat+yscVnt68LnCK10k0af1sPTclD9+4x+3JTfIcyPA0OL1nYqe8jSUjFDLT080ZYRLP GxetibAO4DZJ06m9s6wzVQU2thOLx1s3Hv/kB2OerIXxi5HTsO7w5HuRsy6Cgv5kjHiJXG R3lYTKtwX2tgZgf8XXOzmKyqbyaxMvYOoB2BaHcVI1avrI0nXozw+eCMCIJM7g== 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 4V1G0k1BGyz1Bwv; Fri, 22 Mar 2024 08: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 42M8bQmP094208; Fri, 22 Mar 2024 08: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 42M8bQK3094205; Fri, 22 Mar 2024 08:37:26 GMT (envelope-from git) Date: Fri, 22 Mar 2024 08:37:26 GMT Message-Id: <202403220837.42M8bQK3094205@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: e08b44339b65 - main - if_ovpn tests: test large packets in IPv6 tunnel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e08b44339b65a6aa7df4a58d0b1f471ba16da410 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e08b44339b65a6aa7df4a58d0b1f471ba16da410 commit e08b44339b65a6aa7df4a58d0b1f471ba16da410 Author: Kristof Provost AuthorDate: 2024-03-21 07:38:45 +0000 Commit: Kristof Provost CommitDate: 2024-03-22 08:00:05 +0000 if_ovpn tests: test large packets in IPv6 tunnel There's a report of MTU issues over IPv6 DCO tunnels. Extend the 4in6 test to send a series of pings with different sizes, as well as transfer a large file. No issues were found, but we may as well extend the test case. PR: 276838 --- tests/sys/net/if_ovpn/if_ovpn.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index bbaffa0bce73..0ec2563cf355 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -308,10 +308,28 @@ atf_test_case "4in6" "cleanup" keepalive 100 600 " + dd if=/dev/random of=test.img bs=1024 count=1024 + cat test.img | jexec a nc -N -l 1234 & + # Give the tunnel time to come up sleep 10 atf_check -s exit:0 -o ignore jexec b ping -c 3 198.51.100.1 + + # MTU sweep + for i in `seq 1000 1500` + do + atf_check -s exit:0 -o ignore jexec b \ + ping -c 1 -s $i 198.51.100.1 + done + + rcvmd5=$(jexec b nc -N -w 3 198.51.100.1 1234 | md5) + md5=$(md5 test.img) + + if [ $md5 != $rcvmd5 ]; + then + atf_fail "Transmit corruption!" + fi } 4in6_cleanup() From nobody Fri Mar 22 08:37:27 2024 X-Original-To: dev-commits-src-all@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 4V1G0l4NxBz5G5dR; Fri, 22 Mar 2024 08:37: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 4V1G0l2GLDz4R06; Fri, 22 Mar 2024 08:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711096647; 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=zQyjc2l78a3XF0cOWnWKqYyeWLcZUIGyjC82EaNhOrw=; b=x6uP+40VRukR9Y7W/SGR9Ue8swqUyrvBAcSdc4KHR06Rjz5ov8K3z5ghqphEtnaoFSpk3e I3Od2T8rmhYwKZNr1rayk01vQP7Wptwd4YluxHkx6qKyX1mBada1havgucJi778ncyT5D0 envoR+A+2nqzoPaF5ZCCKpKKE1EFn9e6kndlNuhVAmah7W4LriggvC82IiyZQLKjl59DMo QkSoj+e1VpXR8dBpywFi3mngO/GDGR1BQ8Mtj1ByexQKV1C9n61wDtOmp09rMsAtF7Dpim zbAxOGKkcqT3ztYJM1hKpMEIIp7AFiXSI4XnRalofKO8UqFQYBfNHrkjZXFL2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711096647; a=rsa-sha256; cv=none; b=QSOpWVVxzoaNpZMORUglGf7e7HoBGjEypGOjyXdXmRLTtfucKChCfKxftc407ULnlTLVrw ++FVXNFHbyH+5Sj6/Z4Y5ZLG58L2GDTR1cZwIog/1K9NzuHRfDqM2g2WUdTWLNwrmd7Iqn pI4IvQXzKuW/yBNU3RAZCKSFMSCC2k1X1iRq8LFukJZ00qPMV8ooZNNcDF8eeBXOe6YWGQ n3ACkYGEslYjFHWebbaYIP79ZIrH/veONvGWeibXUEVhinhwks5XTFWyYA2ik9TmLDAxFj J1XfzAZVG4KVAQNhJLPw1NtiAyyiUDLN7AeXrIuxs17f14HxY0DpLdIA+sJlfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711096647; 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=zQyjc2l78a3XF0cOWnWKqYyeWLcZUIGyjC82EaNhOrw=; b=r7lUZdSifg/dNF23kDOnDNbTe92SKqf2kzePE0Kw3syS+NqZ5O4a2bwGzBKwD1teZ3Fq3h gezMTRN28viOt9IMZsqsokkxXQzYhMxr3ayKUay6cqeuausVq+d6D9yQ4lKp48SVPEUXuz tX4COiMH1lM+DfHJhP8ZHIS8ZN1GrCSgTeA+iJOFKnr0WYgkcclK3g5IP4kblsXsAE9sgJ 97rH3Kw/J8sZcapy/NXaVNHOCejGrvIbr21v0V4hYB3ObGiPHBe4P4gGs3bVFbrlqAj5cu o1Lx9d3sBYBG9BQja3nsw4LnRv9OLfn0A/ZBUINWPmUZuDitClQqpme2W3h7xA== 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 4V1G0l1swSz1Bww; Fri, 22 Mar 2024 08:37: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 42M8bRlI094250; Fri, 22 Mar 2024 08:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M8bRMI094247; Fri, 22 Mar 2024 08:37:27 GMT (envelope-from git) Date: Fri, 22 Mar 2024 08:37:27 GMT Message-Id: <202403220837.42M8bRMI094247@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: 88f557a2a9c3 - main - libpfctl: fix incorrect labels copy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 88f557a2a9c31aaa954841b06d38eec84a1702fc Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=88f557a2a9c31aaa954841b06d38eec84a1702fc commit 88f557a2a9c31aaa954841b06d38eec84a1702fc Author: Kristof Provost AuthorDate: 2024-03-22 03:21:50 +0000 Commit: Kristof Provost CommitDate: 2024-03-22 08:00:05 +0000 libpfctl: fix incorrect labels copy We copied the entire parsed_labels struct, including the counter to a field that was only big enough for the labels (so not the counter). PR: 277875 MFC after: 1 week --- lib/libpfctl/libpfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e732c8eef854..076cfd3400e6 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1297,7 +1297,7 @@ snl_attr_get_nested_pf_rule_labels(struct snl_state *ss, struct nlattr *nla, if (! error) return (error); - memcpy(target, parsed_labels.labels, sizeof(parsed_labels)); + memcpy(target, parsed_labels.labels, sizeof(parsed_labels.labels)); return (true); } From nobody Fri Mar 22 09:14:10 2024 X-Original-To: dev-commits-src-all@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 4V1Gq64DkVz5G94S; Fri, 22 Mar 2024 09:14: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 4V1Gq63mGcz4XBG; Fri, 22 Mar 2024 09:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098850; 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=9P/EtchLKWkuCQq8N7xpC6PHZX2gCPAWXMQwFt7qnMI=; b=tgVVDw8YfyoTtRoHdKYxaf5KZZ8PzwvxHkkb/gGATwXE9eYVyiQU6GPp9TLnwO+/NVwjN6 eYnxE9ijmqy3EWIf7OLOok/2V+rWb+Ghjg0bfMWzJ5P81CKjqUPsHDnfz7pe9SKclRUJE4 VyG+BrQBcbqqno4qHWOvPC1yDHsfvOOtKgwP413OnlBK26f81LJ/HoO28AHYac960ZZTWb 5PFgS/jmh6NW3xs7GiO+eq0tjxQdeySIvlhSTlg/ZB1Zo5L5BrTUf1BugeapxOuwLnH5A7 pCYECTzhmYqCGnNhoLLngNMk+GxEIsS5QX1aJdpcLrmCAWa9jdHquhLsNFlfuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098850; a=rsa-sha256; cv=none; b=vZA04e2i+0WaV8QX7Rdvc9ZQbY5n9+f40L3d2yBvpyHYVX++JjwBMnZteOc8MGzweuF8+x oQI7hHCcl3c68xMUWEdHh7lzh0a0/XfW/lDiuxo+C5shm5CH2ftS/uReB9HNsHxVIJIgKx 6qUnB3hyFp5Yh2mZi86w1AB4xy8/0MGeFd9+2N1RydwLByILtEubSyWEDJBArT1CvLU+bq uERARQjLrKTQwMtLVnEQ6vbSquD5ULi57jqxym7ISIvoiDqwXy0zF6FZEtsGyf919iHyd5 T6bxGQM2Aa5+IznckvKosjl1330LftkQQeLJn4OgaKjHAQGMLz1i1HE+Y/Y/gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098850; 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=9P/EtchLKWkuCQq8N7xpC6PHZX2gCPAWXMQwFt7qnMI=; b=joQBem9zZUIDLLkWwM81srKPikCkKcPt4bFOwb/GUAj9nXrDapaL1JS/WI/qSgmmYNRBiw zSjFEcl8nH0cuzR6/+lGKp6aqvhddhXkbcUDUD70bi7fdTUr7weAf3Tct87jJ4P0wtwNty YQp33/35n2Ul6B9qSSWv47Gy0xndQxEXGA8/a/Z+X8/mBGzuCF92mntSr3H08CqEIB3UpP DOUqEIo6u2hsWEAEr9/FGzcuUSfrfvhTv9XI6fbz94kiJZYmCiw9V6G2UKdS3wchBJxe6Y ++urPndNe5jFZN3bZJn6LaAaBK9zKNch4N1U8tRDIV6IA7b8aKEK+6cas0Hezw== 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 4V1Gq63MR1z1CY9; Fri, 22 Mar 2024 09:14: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 42M9EA3o061400; Fri, 22 Mar 2024 09:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9EA4m061397; Fri, 22 Mar 2024 09:14:10 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:10 GMT Message-Id: <202403220914.42M9EA4m061397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 98a973168369 - stable/14 - bectl: Use geopt() and drop mention of -?. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 98a9731683696b615b5a94a483aa73a9b418791d Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=98a9731683696b615b5a94a483aa73a9b418791d commit 98a9731683696b615b5a94a483aa73a9b418791d Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 (cherry picked from commit e819534f15308c92afd19166254604995766ce32) --- sbin/bectl/bectl.8 | 9 ++++----- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 19cd867df56b..b511d5a637b6 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -23,7 +23,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -117,10 +117,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 05ed8d6be5bd..7632540aa7ad 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -65,7 +65,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -546,27 +546,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -574,9 +578,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:14:11 2024 X-Original-To: dev-commits-src-all@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 4V1Gq75GnVz5G8gD; Fri, 22 Mar 2024 09:14: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 4V1Gq74kj2z4X7t; Fri, 22 Mar 2024 09:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098851; 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=ody84Jt7z6YAtVl1RKZCbCQOfPRRbHFewezjILrP9I8=; b=urg5un4RDEe16YIVzaS/dTMyEn6H1DoW9m7qWpN7UnuwwsBCsZpF6FceFs9C6ok58W5dzQ W0UuqLSAlqO9j0yApqmzlhCPMZh+r1qevOKJCRmXISJbR8XJTsdQQrw3mRyvixKdpXQzc8 v1WFLNnsIA9XafFfpgfYMYUlyp/Nc+b5scClE6VpZnClYzUHDR/uNZjNnZKKP5QyG7irkA 36L/n/qXzREst9w550hpTzIBLdd7v+69E9HZ1hAVeEcACcklaqLe3OiCOhPuy+tkWxO/Dw WoWt1GXdV43aYRcBhec/A16fG1IdKFU/YyAOWDB+1nWs09EUEMEBQNkLHQoDWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098851; a=rsa-sha256; cv=none; b=YqsAvP/RXMuvcu7ovbJPG0gsEVBD2fMZl55TDHaNlCgwWB/dm+/xKcvodSIzbh2mUKfk/0 anRKh46yuOOYtzdYgZpXIpt0nmnV5kx59VDWZX6rbOIqJwNXyKmBpmAOCnFnX2WiLLaY8W HWL1m+v44Tb7Rps5+M/jmS7a86pGOhzx0ofusS7CoFc3oCvwLwTm6S1zMa62Jl3383B/sW MjhcmMsMa7asNXhGPGKnvf6SmGvQ3d5qf6XBcawHt2X+8i21wpsuwDlLpOhx8ngxQNiV3I L6gELUNXhxMTwN1kaw1nF7YNa/81n7r+L1P3JZlFl7j1AMbbNro1/Tski2s7iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098851; 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=ody84Jt7z6YAtVl1RKZCbCQOfPRRbHFewezjILrP9I8=; b=Z+Mm1iEpiVCiFXq34box42ujH9zkf5lufrUsPJVTn3mDFN3TZZIRRzKmP9gP6jriP0OtOB tNzk7CBOGPhR+I10K5OyQWphlMMUgz31AQ2hhl4F8u0nazNFDzCe/Yccsm+wf1hZdICkM8 1b3oIXvT83Hx8in0jWG2Fk4Zt7pLQ6af6Gro9Qn6Eaifrq7tHWYN6E4MC4rWHRBNABhF8A 3talYig9ZB2w3t6bQxGOJKxxSf0Rpifc5jzrB8X7QQzbXOnTJKAsdgUkUafztfsOySk+OP qfYuzKpxGJAt/8BuIvSMnDPNpbnBlKraG+KUtla8Yh/NXHNAKZBScNHjbC6kBw== 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 4V1Gq74KVSz1CQg; Fri, 22 Mar 2024 09:14: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 42M9EBmx061442; Fri, 22 Mar 2024 09:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9EBto061439; Fri, 22 Mar 2024 09:14:11 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:11 GMT Message-Id: <202403220914.42M9EBto061439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d5d2452bf536 - stable/14 - bectl: Simplify command aliases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d5d2452bf53639ee4ce0570c61e863c03483048b Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d2452bf53639ee4ce0570c61e863c03483048b commit d5d2452bf53639ee4ce0570c61e863c03483048b Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 (cherry picked from commit a46217ce7d161ce563374899df4d94b6d000138f) --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 7632540aa7ad..63c3bb369b56 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -115,7 +115,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -571,13 +573,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:14:12 2024 X-Original-To: dev-commits-src-all@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 4V1Gq91Pt0z5G94Y; Fri, 22 Mar 2024 09: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 4V1Gq85kpdz4X1Z; Fri, 22 Mar 2024 09:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098852; 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=i7SVNbylh8DJcHHB/Df0k7EsgrNCCMxRmPQWeU1n5IE=; b=IMAnsyBz0ntx4LGCg7tz0JFph1jV3v/ZIt4TtetXfvtVT3/g0nwsQQwNnTr4r7Kq+3XdEB nsfBPZhGZAMe0klzi5427GeziFdJhLNLNiJP+qGoaAPauvcUBPwXri90WT3gTDGQ/jV1dI H4v40k97bXZ8cqD+EsKki2ormcetfVKodn4XZzJSwJn2gaq/BhmMbNqXBETCudVKfQxNbi z+qE/PRBvq8/GODipZh0+HY73MsHKxoCE29f1ex73IRJNG85q8GqyEbsbd/0GBi+0AUYd2 EWNYg/2KFtEtm9KbOQR8zwYHtovHI1dmYuQ/PonjGzOXh1yErJkkNCPQKXhMMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098852; a=rsa-sha256; cv=none; b=ES15Ec+VAuUMiOU5TvYh1Icrq77XeB2/PRPKuiuvw+lOuEYqpHYMCsHCpIrKJiANVA5enZ u1INJ+9QR4+tUUT2KptbMZABHzKjinlZutNkrgc/Bi2EVTwvIGxHUVkf0UNu9z3G4Lk4nm IyJuWgULnoeWRV2lIezbkWsm2jRLlbWw0VXj8sZPXGMFO6+4j2JQg8+iY55hNiVCP8RJTr GwMuv9ID1CtqxQrHy+p3FpWTKG2Y2VyW6Mbb+VDct/uFemkqoftHviB+Y0dJ0sgqzSO7n2 ms3GF0D7s9Qp+hvHU56gMdTbZRe//PM0hFwtJg6L1im2SQDUUOMYdR1nBLaEOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098852; 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=i7SVNbylh8DJcHHB/Df0k7EsgrNCCMxRmPQWeU1n5IE=; b=FlBsQylcgOJk2FiBK2Hxq+5aAGMU6b8BQLLTry2RXuUsnELIedCWXKOe4z5sHJrB07YQNZ gZCqriRZj4JNbX21wf6Amzt0Xxk68C3hL2o0keAhHeB15B4xrLA1ocvQWVCuETJjSvZtf9 kC1x/T+nWeipF5pz9tUcx0HJgFFRtS2MJlJ3BQNcJr+a4XcUjRw57K0kD8xrrDXPEHNrKP GyuDkNCDXkGV9mAHgXsRetqtn73IKCJGu6GUWxPGb505TgAmB6veqHbZv9vrn618dxcb11 VaTJaodfQtYg/9iyJjJlsc71HG3UY48sQzLmv8id48tY+4nmxJrIrRZSAMSopw== 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 4V1Gq85LPsz1CDj; Fri, 22 Mar 2024 09: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 42M9ECZG061487; Fri, 22 Mar 2024 09: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 42M9ECea061484; Fri, 22 Mar 2024 09:14:12 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:14:12 GMT Message-Id: <202403220914.42M9ECea061484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f25f14a9396c - stable/14 - libbe: Fix some markup issues. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: f25f14a9396ce1378d1ed77e3f137f0c1177d537 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f25f14a9396ce1378d1ed77e3f137f0c1177d537 commit f25f14a9396ce1378d1ed77e3f137f0c1177d537 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:03 +0000 libbe: Fix some markup issues. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44407 (cherry picked from commit ad99fea9045dd3daaeca3d2dd60fffecd2311826) --- lib/libbe/libbe.3 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..644b1d71ccd3 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd March 18, 2024 .Dt LIBBE 3 .Os .Sh NAME @@ -178,14 +178,22 @@ If a BE root is supplied, .Nm will only operate out of that pool and BE root. An error may occur if: -.Bl -column -.It /boot and / are not on the same filesystem and device, -.It libzfs fails to initialize, -.It The system has not been properly booted with a ZFS boot +.Bl -bullet +.It +.Pa /boot +and +.Pa / +are not on the same filesystem and device, +.It +libzfs fails to initialize, +.It +The system has not been properly booted with a ZFS boot environment, -.It Nm +.It +.Nm fails to open the zpool the active boot environment resides on, or -.It Nm +.It +.Nm fails to locate the boot environment that is currently mounted. .El .Pp @@ -226,9 +234,8 @@ function creates a snapshot of .Fa be_name named .Fa snap_name . -A +A value of .Dv NULL -.Fa snap_name may be used, indicating that .Fn be_snaphot should derive the snapshot name from the current date and time. @@ -520,7 +527,7 @@ The function will free the property list. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: -.Bl -dash -offset indent -compact +.Bl -bullet -offset indent -compact .It BE_ERR_SUCCESS .It From nobody Fri Mar 22 09:15:02 2024 X-Original-To: dev-commits-src-all@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 4V1Gr62Ts4z5G8jl; Fri, 22 Mar 2024 09:15: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 4V1Gr61xfKz4XsY; Fri, 22 Mar 2024 09:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098902; 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=hHXV0dLfbJ/DPR/6zZef6I/6dOTLV45DfhChs4DKRZo=; b=cWZOtBBmRZxT5K3sMLbl44j7kY7HbauEbneV7COQtpzdqddhRlSVdTUN0xYNx2m+BwEdlX 0S9CCxJ3NunBWstzOnedZRsjvXnNlw4KEEKXvvmO7WWah6Kt7JRJdozvUu+O4BQJA5CjVY wai63MHY9ctq71wnUuk0831EP+aSGKHx2/cAS7W3DU+t4CIEVn8JLGFCx6tTjfB+YqVIH1 KwNw4ncKq4fP7GCAOINkFxhjckp45aFzZWNZv8zfT9b6QAwWgNFbOS0PVi/0DVMx9eqoO4 3y9Tz7BRPm8zR90YP9/gBgF1tLy5J4+LArIHNhzTPxRSBg4oo5b1Y5Rcmv84Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098902; a=rsa-sha256; cv=none; b=c3oU97NIMb8hCGK92JVGVdUVnZZJb/9U0iOuB6F13uOF2rQgKvmBYj16Znj5nLZPtZ0xmW N9MGUufyJA4P4683gBUBdq9sBXIsAgb52HbX/PtD5Tc0m/19D5KJd+2DMf7KQtGB9Vkr9M Vx6cVFPrVzFnocB7km6UjZ8FrTSeRpzDpyCWcF30Y9jhD/OMurX65AHCDz5k5h8aMVMT5P 9TRb9F6AzpBv8uEFjEQXAgfnWm3enxWAfC2J53GqAmyHFnm5XWV2JXqIxLjIisDLWvhzZ8 gnXSHPjUCRIttGMur/TUc79jiHwWY1gIQU0h3RupbCqFZvQz0zvV/IFrvXBxkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098902; 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=hHXV0dLfbJ/DPR/6zZef6I/6dOTLV45DfhChs4DKRZo=; b=MFulN97TRQtlQL/GaxnWUwaM2Z1tq/UWR9VpcdDALn5MwUCYIzkBvok67SXnHU3IoYXPyR 6Piq5+RjhXhOw6YrUQidhdJ8FSEoHdxG4ZPB25WkCCJh5/p74NYM8BVrHB3dvlabO9legz aw1k8U+0i3qi+7HXrJnwGQXZ8IRvTfxK7hsBtziM7nNhTj6fNrp4OqUHUFzIQaFkfJ7rYl EF266TgueHqs4HJMUXorFT43lLndEB0iC6CQB2ytwXS3nEy9vsNnjZHOMEJrzprA01/GR+ PO/y1pMzG2a99UpIYknA4gHhkVkrAW/KsoeK71z4ReSloNHwrnE+dVLQPWPlgg== 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 4V1Gr61YBjz1CrR; Fri, 22 Mar 2024 09:15: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 42M9F2Td061830; Fri, 22 Mar 2024 09:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F2ad061827; Fri, 22 Mar 2024 09:15:02 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:02 GMT Message-Id: <202403220915.42M9F2ad061827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c4de745c330f - stable/13 - bectl: document the -r flag to bectl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c4de745c330f44c94c6b7e56336b266b1af69c17 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c4de745c330f44c94c6b7e56336b266b1af69c17 commit c4de745c330f44c94c6b7e56336b266b1af69c17 Author: Kyle Evans AuthorDate: 2023-04-20 04:55:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: document the -r flag to bectl Independent of all of the commands, bectl itself takes an `-r` flag that specifies the BE root to use. This was originally added to facilitate testing, but it was later discovered to be incredibly useful in other scenarios; e.g., trying to recover some boot environments in rescue media. The "BE root" described here is the parent dataset that holds boot environments, but I've no idea if that's an accepted definition for that dataset. Reviewed by: gallatin, imp, Pau Amma MFC after: 1 week Differential Review: https://reviews.freebsd.org/D39710 (cherry picked from commit 4163bae03051839c739c0133605b4ef494ee8f6a) --- sbin/bectl/bectl.8 | 39 +++++++++++++++++++++++++++++++++++---- sbin/bectl/bectl.c | 30 +++++++++++++++--------------- 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index cb06ad9bcaed..2b2dd02bc8ef 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd March 31, 2022 +.Dd April 26, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -23,54 +23,67 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm +.Op Fl r Ar beroot .Cm activate .Op Fl t | Fl T .Ar beName .Nm +.Op Fl r Ar beroot .Cm check .Nm +.Op Fl r Ar beroot .Cm create .Op Fl r .Op Fl e Brq Ar nonActiveBe | Ar beName Ns Cm @ Ns Ar snapshot .Ar newBeName .Nm +.Op Fl r Ar beroot .Cm create .Op Fl r .Ar beName@snapshot .Nm +.Op Fl r Ar beroot .Cm destroy .Op Fl \&Fo .Ar beName Ns Op Cm @ Ns Ar snapshot .Nm +.Op Fl r Ar beroot .Cm export .Ar sourceBe .Nm +.Op Fl r Ar beroot .Cm import .Ar targetBe .Nm +.Op Fl r Ar beroot .Cm jail .Op Fl bU .Oo Bro Fl o Ar key Ns Cm = Ns Ar value | Fl u Ar key Brc Oc Ns ... .Ar beName .Op Ar utility Op Ar argument ... .Nm +.Op Fl r Ar beroot .Cm list .Op Fl aDHs .Op Fl c Ar property .Op Fl C Ar property .Oo Bro Fl c Ar property | Fl C Ar property Brc Oc .Nm +.Op Fl r Ar beroot .Cm mount .Ar beName .Op Ar mountpoint .Nm +.Op Fl r Ar beroot .Cm rename .Ar origBeName .Ar newBeName .Nm +.Op Fl r Ar beroot .Brq Cm ujail | unjail .Brq Ar jailId | jailName | beName .Nm +.Op Fl r Ar beroot .Brq Cm umount | unmount .Op Fl f .Ar beName @@ -87,6 +100,23 @@ Boot environments allow the system to be upgraded, while preserving the old system environment in a separate ZFS dataset. .Pp +.Nm +itself accepts an +.Fl r +flag specified before the command to indicate the +.Ar beroot +that should be used as the boot environment root, or the dataset whose children +are all boot environments. +Normally this information is derived from the bootfs property of the pool that +is mounted at +.Pa / , +but it is useful when the system has not been booted into a ZFS root or a +different pool should be operated on. +For instance, booting into the recovery media and manually importing a pool from +one of the system's resident disks will require the +.Fl r +flag to work. +.Pp The following commands are supported by .Nm : .Bl -tag -width activate @@ -139,11 +169,13 @@ flag is specified, the new environment will be cloned from the given .Ar nonActiveBe or .Ar beName Ns Cm @ Ns Ar snapshot . -Otherwise, the new environment will be created from the currently booted environment. +Otherwise, the new environment will be created from the currently booted +environment. .Pp If .Nm -is creating from another boot environment, a snapshot of that boot environment will be created to clone from. +is creating from another boot environment, a snapshot of that boot environment +will be created to clone from. .It Xo .Cm create .Op Fl r @@ -274,7 +306,6 @@ is used on next boot once .Pq Em \&T ; or combination of .Pq Em \&NRT . -.Pp .Bl -tag -width indent .It Fl a Display all datasets. diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index a2b300a4bb44..f2ea8b241b14 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -67,23 +67,23 @@ usage(bool explicit) fprintf(fp, "%s", "Usage:\tbectl {-h | -? | subcommand [args...]}\n" #if SOON - "\tbectl add (path)*\n" + "\tbectl [-r beroot] add (path)*\n" #endif - "\tbectl activate [-t] beName\n" - "\tbectl activate [-T]\n" - "\tbectl check\n" - "\tbectl create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" - "\tbectl create [-r] beName@snapshot\n" - "\tbectl destroy [-Fo] {beName | beName@snapshot}\n" - "\tbectl export sourceBe\n" - "\tbectl import targetBe\n" - "\tbectl jail [-bU] [{-o key=value | -u key}]... beName\n" + "\tbectl [-r beroot] activate [-t] beName\n" + "\tbectl [-r beroot] activate [-T]\n" + "\tbectl [-r beroot] check\n" + "\tbectl [-r beroot] create [-r] [-e {nonActiveBe | beName@snapshot}] beName\n" + "\tbectl [-r beroot] create [-r] beName@snapshot\n" + "\tbectl [-r beroot] destroy [-Fo] {beName | beName@snapshot}\n" + "\tbectl [-r beroot] export sourceBe\n" + "\tbectl [-r beroot] import targetBe\n" + "\tbectl [-r beroot] jail [-bU] [{-o key=value | -u key}]... beName\n" "\t [utility [argument ...]]\n" - "\tbectl list [-aDHs] [{-c property | -C property}]\n" - "\tbectl mount beName [mountpoint]\n" - "\tbectl rename origBeName newBeName\n" - "\tbectl {ujail | unjail} {jailID | jailName | beName}\n" - "\tbectl {umount | unmount} [-f] beName\n"); + "\tbectl [-r beroot] list [-aDHs] [{-c property | -C property}]\n" + "\tbectl [-r beroot] mount beName [mountpoint]\n" + "\tbectl [-r beroot] rename origBeName newBeName\n" + "\tbectl [-r beroot] {ujail | unjail} {jailID | jailName | beName}\n" + "\tbectl [-r beroot] {umount | unmount} [-f] beName\n"); return (explicit ? 0 : EX_USAGE); } From nobody Fri Mar 22 09:15:03 2024 X-Original-To: dev-commits-src-all@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 4V1Gr73SF6z5G9Cv; Fri, 22 Mar 2024 09:15: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 4V1Gr72x1hz4Xvq; Fri, 22 Mar 2024 09:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098903; 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=f5g/3F4m+kyriV31egIqwxFoo+B78Cs9FrInJLNKaTo=; b=x+muIrASmcZU4a18+x6lz+bV14jboQskYoGMYuQivtjJSQZBVjoGjSIPFUyaR8aUYmAfvO AyTFFqACJsQ7t5byhknywmJkmVabqgH/mk0y/kDZWskrweqN82Ed44HK6uPO1XdYovbVP6 6/SZo/HQu4EYuBURJZo40ZkbnkLlUOFdMWLyMPCmrDGOz0RwlHLYf9fvh3bqMhCCHsuKfA Nqj/O6dlCu5uAYcZsj7lxyms+hcbgSYPgWt/Jw2xT1UWL7fS0Ws2wwgUcs1zhZjUIlEJdO 1uJJqzhkQz+LQpmf+VZbaXL8bhp4qXYoleMKoee65pxsTYBtWkZUWfc0I+ghvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098903; a=rsa-sha256; cv=none; b=CooTTImHQd19dmQemvUd6j3GkxVrNGa1KwUlhHgkpucIWOAg5HVJ2fxoIblQVqybVehw8T FBGnwSkWV6ch2OCKbRukq11piFv+K2m4HaQtCP4Ltwn5Oji8HmESjnx2B+5dtpGbky71jI wtI0tAXHkoyAPI7OjeFWIf/pa/l0Cy6Q8ofkItofdx957cNNQnP0WB7ZeOLmd5yrlxXujD rHFZeOarX5STCEyx8QsragYG3abWuRh8JeaMULSKgH73HmTpCGh5qUlC7Zuz0elDeC2fWA 24ctPNOtiaFtJ0a7lI0oeHEkcbLD8GCoM7e6oKLppwXTcw1XuzjGWDlK1GyF5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098903; 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=f5g/3F4m+kyriV31egIqwxFoo+B78Cs9FrInJLNKaTo=; b=c4B4nRSTxURWYhCX5GMbTyoxFoy66IXx78EgOO6E2InHu8Kf2NWDd19vlTRGgWtoUbOdjt 7DZ9kugfSfOKI81ZiksMPxXsSHuZWRWFrxJZ/lAD14P18enXO9CO5P9VYo9fAHxIe4WXfe oe+po0k89W/a4DfXQ/NP4ZPVYd+V8947eJsT7H3I+DPDHL+3P7ubXNX5rVoFTvBUNr2i4E clGW1sXcSpWdYdJNAwl4qQqSIM60rLL29kL01otldTA6aWmnVXXwJ1pzow3k5UqzUsQtiP nA1cibsM3YgebREDYKz2YbC9xhxpnUoiVX5j4hzF/P3yPC2qUlmo3kCy1kytHw== 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 4V1Gr72XZzz1CrS; Fri, 22 Mar 2024 09:15: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 42M9F3lK061869; Fri, 22 Mar 2024 09:15:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F3Hs061866; Fri, 22 Mar 2024 09:15:03 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:03 GMT Message-Id: <202403220915.42M9F3Hs061866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 20d97b6cbd74 - stable/13 - bectl(8): clarifications, expansion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 20d97b6cbd7487eb930190e7a8d2d09f0f38a20e Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=20d97b6cbd7487eb930190e7a8d2d09f0f38a20e commit 20d97b6cbd7487eb930190e7a8d2d09f0f38a20e Author: Graham Perrin AuthorDate: 2023-06-28 02:05:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl(8): clarifications, expansion Reviewed-by: imp Pull-request: https://github.com/freebsd/freebsd-src/pull/728 (cherry picked from commit 6927176113ee775983952edb3c201fed6be318d3) --- sbin/bectl/bectl.8 | 68 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 2b2dd02bc8ef..45c676a7876c 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd April 26, 2023 +.Dd June 28, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -23,6 +23,8 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm +.Op Fl h\&? +.Nm .Op Fl r Ar beroot .Cm activate .Op Fl t | Fl T @@ -87,18 +89,14 @@ .Brq Cm umount | unmount .Op Fl f .Ar beName -.Pp -.Nm -.Op Fl h\&? .Sh DESCRIPTION The .Nm command is used to setup and interact with ZFS boot environments, which are bootable clones of datasets. .Pp -Boot environments -allow the system to be upgraded, while preserving the old system environment in -a separate ZFS dataset. +A boot environment allows the system to be upgraded, while preserving the +pre-upgrade system environment. .Pp .Nm itself accepts an @@ -117,10 +115,13 @@ one of the system's resident disks will require the .Fl r flag to work. .Pp -The following commands are supported by -.Nm : +.Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo +.Fl h | +.Fl \&? +Print usage information. +.It Xo .Cm activate .Op Fl t | Fl T .Ar beName @@ -192,7 +193,7 @@ See .Sx Boot Environment Structures for a discussion on different layouts. .Pp -No new boot environment is created with this command. +No new boot environment is created with this subcommand. .It Xo .Cm destroy .Op Fl \&Fo @@ -319,18 +320,20 @@ arbitrary white space. .It Fl s Display all snapshots as well. .It Fl c Ar property -Sort boot environments by given property name. +Sort boot environments by the given ZFS dataset property. The following properties are supported: .Pp .Bl -tag -width 4n -offset indent -compact -.It name (default output) +.It name (the default) .It creation .It origin .It used -.It usedds -.It usedsnap -.It usedrefreserv +.It usedbydataset +.It usedbyrefreservation +.It usedbysnapshots .El +.Pp +Short forms usedds, usedrefreserv and usedsnap are also supported. .It Fl C Ar property Same as the .Fl c @@ -345,10 +348,28 @@ or .Fl a option is used. .It Cm mount Ar beName Op Ar mountpoint -Temporarily mount the boot environment. -Mount at the specified +Mount the given boot environment. +.Pp +If a nonexistent .Ar mountpoint -if provided. +is given: +.Nm +will make the directory, including intermediate directories as required. +.Pp +If no +.Ar mountpoint +is given: +.Nm +will make a directory such as +.Pa be_mount.c6Sf +in +.Pa /tmp . +Randomness in the last four characters of the directory name will prevent +mount point conflicts. +Unmount of an environment, followed by mount of the same environment +without giving a +.Ar mountpoint , +will result in a different randomly-named mountpoint. .It Cm rename Ar origBeName newBeName Rename the given .Ar origBeName @@ -372,14 +393,10 @@ Unmount the given boot environment, if it is mounted. Specifying .Fl f will force the unmount if busy. +.Pp +Unmount will not remove the mount point. .El .Pp -.Nm -prints usage information if -.Fl h -or -.Fl \&? -is specified. .Ss Boot Environment Structures The traditional .Fx @@ -452,7 +469,7 @@ In this example, is excluded from the boot environment. .Pp .Nm -commands that have their own +subcommands that have their own .Fl r operate on this second, .Dq deep @@ -471,6 +488,7 @@ flags. \" .El .Sh SEE ALSO .Xr libbe 3 , +.Xr zfsprops 7 , .Xr beinstall.sh 8 , .Xr jail 8 , .Xr zfs 8 , From nobody Fri Mar 22 09:15:04 2024 X-Original-To: dev-commits-src-all@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 4V1Gr85mC1z5G99S; Fri, 22 Mar 2024 09:15: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 4V1Gr8409Qz4Xq7; Fri, 22 Mar 2024 09:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098904; 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=b6UxWMGMwwCPdE1KgLSY9PFIHnNY5Rk9hranvbtsaQg=; b=sYYLk8RlEhxB7Gv2JrFvf0/IRd6g9wCVE0C8Bf7PoVaLAM69kvKDGHWFiPQ2i0JuC3mso/ OrV7e3eHUs2msaagpzmYJ7D4qK4MdtBRn+Tl1KNYvHN3fpKg9/hp1dFg3tke0iIMMyIvLK IkvSul9vk13tGvHNSVVGKV7nFc21wyFCgrMpbhaxvKDZGs0m1WCGDh783PvNJLkTO6okQQ Hvq8fj7qHLxj94hAjrmo/XgaR7bY56pzSFQyig5EViqvoWCMAfOPFwTfi46TW5JlS8/+2E I/A74fBzzzSslZcF6MwyP9mTaXLNcFJtchC6/zM9YP+dm8PmMigbKGDT+3mWfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098904; a=rsa-sha256; cv=none; b=KMb8GUQ4XHTQZeVdF3kFkF3Mc18eX2lcUnP0QHJ6dT9k6o40i0SnZd/z+cg7mrCO6F23mu /jMxWcPKfLAL16T9ET+tAUx/YPU7EnaIWk7UY+EGTiVomw0motc671N3Wgh9+gFW7w2FmO rWG/EQz2i2nZNRPZXep3N+t9WOtUG7gwtH6n9Wr8p+ijNybEAEnUx00A2Jl+ix75O2VoC9 y4SuQOQr2krRJOCp44DtzFDsicvmkVWTIELf38WhOdbBQzvZAX8dKoX+DvoQ1cBdf0vUIG F71h9VWjd69ve2oUVv+1VCuA+iNtLG6XQ5iHWGDDfcirfA20PvJeUFgbM4Athg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098904; 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=b6UxWMGMwwCPdE1KgLSY9PFIHnNY5Rk9hranvbtsaQg=; b=X0McciGeQf8QDTeJr1Db4p/lVeiejbXqL+jfLXJCc1Kt707QOzB7tpos59j/wFiQGZ3OlN PgIMeSC/sXSugwU/eKXb79jDqAqMb7JQ+kJjr3/XytPGiUaRkjc8HmTZwofmXvL31atTzh b97JB1HYt5xHV0nDuo33s4FbCIV/PMn6gtpebzuncscD0JaD08BfG9MzZbT9NGSWgYjZiJ kJCAmuJhapU72p/B5tJjBOdUclUYp2Pdr/AxEQ6IpSf9DsdOBD6UN0B6DFaUb9zE+ZQ6AZ QzIKt9IlRLghuGS+fG0fmMdrXqhp/jUyKBX3MZohgEDaR/ohyKXPgtGu7e5Pqg== 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 4V1Gr83YhDz1CGN; Fri, 22 Mar 2024 09:15: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 42M9F4vq061923; Fri, 22 Mar 2024 09:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F49F061920; Fri, 22 Mar 2024 09:15:04 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:04 GMT Message-Id: <202403220915.42M9F49F061920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 897a6f8b90c1 - stable/13 - bectl: fix some `mandoc -Tlint` complaints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 commit 897a6f8b90c1810fc0e13a8e1cf419c00c61c1b5 Author: Kyle Evans AuthorDate: 2023-10-05 02:26:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: fix some `mandoc -Tlint` complaints The EXAMPLES mis-comments caused an obnoxious amount of blank space above SEE ALSO when rendered by mandoc to a terminal. The missing termination of .Xo meant the description of -h ran together with the subcommand synopsis. The other changes were generally ignored tags due to context that simply don't need to be there. Provoked by: grahamperrin (cherry picked from commit 9b03a5de73d41f98b9b3c8e250a58f62f3e48d61) --- sbin/bectl/bectl.8 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 45c676a7876c..42561a967bfd 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -15,7 +15,7 @@ .\" .\" @(#)be.1 .\" -.Dd June 28, 2023 +.Dd October 5, 2023 .Dt BECTL 8 .Os .Sh NAME @@ -114,12 +114,12 @@ For instance, booting into the recovery media and manually importing a pool from one of the system's resident disks will require the .Fl r flag to work. -.Pp .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo .Fl h | .Fl \&? +.Xc Print usage information. .It Xo .Cm activate @@ -396,7 +396,6 @@ will force the unmount if busy. .Pp Unmount will not remove the mount point. .El -.Pp .Ss Boot Environment Structures The traditional .Fx @@ -481,11 +480,11 @@ A future version of may default to handling both styles and deprecate the various .Fl r flags. -\" .Sh EXAMPLES -\" .Bl -bullet -\" .It -\" To fill in with jail upgrade example when behavior is firm. -\" .El +.\" .Sh EXAMPLES +.\" .Bl -bullet +.\" .It +.\" To fill in with jail upgrade example when behavior is firm. +.\" .El .Sh SEE ALSO .Xr libbe 3 , .Xr zfsprops 7 , From nobody Fri Mar 22 09:15:05 2024 X-Original-To: dev-commits-src-all@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 4V1GrB1Xrcz5G90H; Fri, 22 Mar 2024 09:15: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 4V1Gr950vzz4XlJ; Fri, 22 Mar 2024 09:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098905; 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=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=UzhnPGSelTJj4Yt8vWIxYigIEStfLDpRurwIjbaC6TVsXAJnvHQPAnxPA79jYh9A1y6xY4 Niq93X0EEWYgiFL6glMuB3rxGJHLn3+N8s3nL2WGgBi018s9LEntYykv1Ua6IhfBsWOdgx oS0SNq1/mTOj82jZ2LMKqI7gEF4KOgMdw0CeHvr1wW3Fjyf0nbbAmZCxDNu71rJYVFX9oJ HJ1wyBVPOJqihX4+2kwNOSCumsm41wgv0zGwWhsOPaCH4PsPl87OlgmJ63Id8tw38XV2MZ vSBqKVjEIt0syzGIWSzBO1xZ+rJUgggg0fiX5jb9hwU7lweN5sLcg3RPUG8DTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098905; a=rsa-sha256; cv=none; b=FvxXNf5j2MPORXD1ddB/A7iDUhXAEPZXbIfqz0mzSo40oHVesBa4yJ6P4RWq7jC0DWknum OKB3lQJycPvzpqt16xk9j4b9mTxEBLjnGrvgWXEpbUTmdpYqeIkFh7Yicx4W3QupzAE6sM yBcyFYVOiMZ1jBOgbb0VxNFj5x6PSZvPj7AaQBEcT9nYIM8cPrethTxAbi7K72sn1wGHiY zPhF+OToirKrLZtLWSInW0N22+vdCXGaf+UG4UorvTDgOYe4oz/ZzD84tOj9WRw7v0WJSS Q5XPRGzRHvKNKK8ag+2o7LPXYvdsskQ9ss3npHwxytNU25nFmoZMp39WjsTEiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098905; 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=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=qz56i7s5JC9/vKuDGTlZRBqps4Rwpr73d7nKNvKF3F4BPv3NYR8tRDwQJxLZjyGr7SoPu0 h96v7/S2zbKGQDSyWuNfQLMIyXaEKuOMXtZWJljbFTHh+rpdi1Z9B6aVPhXgC19m9H2aWw BYos9FV223jIaua3f6WGUGea90JI17/jXevL7dJs12VbWxGdYB3rpx/hbhpEtRokSerSUL 9wmy6yOCiYlV9blE+PW0BAm87ev8m8l4OkidyyEDaqeZMhqAsSlD23Ol01ZWgshK074CRA SFBnwsVaOywjFMwRqM7q+7qxRVlUEYXxxk3PIoX6+GZbDIRJ6oBigQJwOzVJJQ== 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 4V1Gr94bv7z1C00; Fri, 22 Mar 2024 09:15: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 42M9F5aP061978; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F5f9061976; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:05 GMT Message-Id: <202403220915.42M9F5f9061976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 95d66df41b83 - stable/13 - bectl: Use geopt() and drop mention of -?. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 95d66df41b832724a6a5e58f4a07cc89639cb660 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95d66df41b832724a6a5e58f4a07cc89639cb660 commit 95d66df41b832724a6a5e58f4a07cc89639cb660 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 (cherry picked from commit e819534f15308c92afd19166254604995766ce32) --- sbin/bectl/bectl.8 | 11 ++++------- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 42561a967bfd..e0e2827fb34f 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -13,9 +13,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.\" @(#)be.1 -.\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -23,7 +21,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -117,10 +115,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index f2ea8b241b14..89d107431661 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -65,7 +65,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -545,27 +545,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -573,9 +577,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:15:06 2024 X-Original-To: dev-commits-src-all@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 4V1GrC0WLdz5G90J; Fri, 22 Mar 2024 09:15: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 4V1GrB639Kz4Y0Y; Fri, 22 Mar 2024 09:15:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098906; 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=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=floSzNd/kAqR92MEdi7QewNPsKKlYaBqnb1bH5sN1VYJjnLhEGempKLVOl4DJ5C6WlauvR jRQ03WxYbuDyTQhiJ2ahnuOfI79PRdJX0hsqkkxcs8hIPmy6epVmp6REoYfs1nJl5NQUaT f+c9L9J0+ddjoBYGNMzySj1/1l5KTt4iG4kiAu7m85DwwkEA96Z/oM6xTP7PBcz437lRb/ vMhl04p6Mri64VDStJWuEVZHoX5vxGdYaivhDtaIrXpfkvNxjyleVe09DpBL25Zl/jff+r eShHVqSiFOZkshxXxDTbFclbllcDdCWovGrwZK8rYR59VgP8ICMm4/jYxAnfgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098906; a=rsa-sha256; cv=none; b=YoDOAb1mc9gRM8WoTy4eA9sWodnhhYh5imjg3AEdfCNDBj7RVUfp00p+BcZvfn3jqANrVo kmLnhd8SAWvW0F6yAIGDLq6XWps0DRSfNXZb37nAe3WU0aJJnBPDcdDcCEj7fyArHR/wLS PjUsGps3jBaoCpp5ZaukeRhWYB/SNpjsLUgj0tAHQT72cpoLC72YyR+bCdf4m2v8iM48w+ nQyRVOQnlDxx6XWxxP3iB2RelliN+ZNYOoG9sDtfyYDMhg5XrzEIGQYxlOqo/xI0IB7nep lqiAL4lw2r/1t5DB3tqsy5Y+XOoKUeINNA5/ENX33eDkPJQjExZKtif5t6RRyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098906; 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=q1UGLy24Xq//AH13ojO75s+fvc8Y9ooORe0ULR/4FnM=; b=DCWpwqO8n/Udq6P3vRgF7+KzPCdNHAgAR5r+MeiX9RMaYNfbknBtKwNdazvqwVnG7wR6or DhYe+PO4FPHbiOhYC/o0CuE1Tf4oE/zXsAmNWxttVud/UHyI2WCZeTYCBOjDqV5F+OXGJ5 KfeDX/jaDpIrXCMFW/mIiUGO6LG1v4B1Mg6RjwULaJ8vnZMg7ceYJ2GA/h5Z3H7vxxnusd KugSZecrDhoi4+VTuuVTUbON3yz/IBKWbiAWEwKps1zQl+6FEmVTItcR3efmxm8OkLZGtS XSaFnfCISGVT8krJy3NX2qzsAy16OxBdMN7h2gaoCrM6FNMHvhl5ilPPd2Rp1w== 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 4V1GrB5c3Bz1CGP; Fri, 22 Mar 2024 09:15: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 42M9F6jw062020; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F6x9062017; Fri, 22 Mar 2024 09:15:06 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:06 GMT Message-Id: <202403220915.42M9F6x9062017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 36afe5ef45bf - stable/13 - bectl: Simplify command aliases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 36afe5ef45bf6fd588e07471cc72f9a74490683f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=36afe5ef45bf6fd588e07471cc72f9a74490683f commit 36afe5ef45bf6fd588e07471cc72f9a74490683f Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Simplify command aliases. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44406 (cherry picked from commit a46217ce7d161ce563374899df4d94b6d000138f) --- sbin/bectl/bectl.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 89d107431661..4a2d62348cbe 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -115,7 +115,9 @@ static struct command_map_entry command_map[] = { "mount", bectl_cmd_mount, false }, { "rename", bectl_cmd_rename, false }, { "unjail", bectl_cmd_unjail, false }, + { "ujail", bectl_cmd_unjail, false }, { "unmount", bectl_cmd_unmount, false }, + { "umount", bectl_cmd_unmount, false }, { "check", bectl_cmd_check, true }, }; @@ -570,13 +572,6 @@ main(int argc, char *argv[]) optreset = 1; optind = 1; - /* Handle command aliases */ - if (strcmp(command, "umount") == 0) - command = "unmount"; - - if (strcmp(command, "ujail") == 0) - command = "unjail"; - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false)); From nobody Fri Mar 22 09:15:07 2024 X-Original-To: dev-commits-src-all@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 4V1GrD1RNdz5G8tY; Fri, 22 Mar 2024 09:15: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 4V1GrC6mPTz4Xtb; Fri, 22 Mar 2024 09:15:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098907; 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=Fd3d2O2zcZ9pb65cJLUsi6Jq55erUg2eFoQPurY/0G8=; b=Fu8mSG99a5snHuy391VbBCFMPQFrDCGPRdnkpWQNUt3PBrX5pV4Ke3RDwLjlCvzbxRxwSd 0bqkQT76v0+0T4pPlriv5WLTwd84gTOAF5VQtBPKCPtdNUxihRxoBCyle0/IdjMwXrQPOt 8bqM0wAgGwJt9JL9U+/OB7IM9oeKlyGaNxAJ/bzk8FwMtyvq5t9neqKH08SwA/9Pm2NePD /VxD3vN6wO8FOWnB7tDtPCzE7iL62gBmkfDwBX1d3R023iKgW9wfviV3Os2ZFMXeoEzELA P3gpVpttek06whCjv3YwLvXe8tnCIW3yoQZeYkvMlk9W27qThF4pOyVH65a18A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098907; a=rsa-sha256; cv=none; b=BHHpOlAxoNDD5lUKYzCOi1Om+kwOxSY6A7sCCI915FCmiykuL2pmCtlG9AiYGXdMpzR9XO 9OP04ug6GY+ALM/1g/u3dD7CodwuP/ZUMXpC1DaD59818gDprX7rHdLFgZK6EAqKOmfpci 1iMna9sOP+p4goNudcgop2X72DPkrWxEq6l26efJaMnjTQVujzJ6jjMKNtQUodouy53c7L 6PsR+maTmNdWW3X23GU0kscRKswn9xX07Km8oOl2B3uCqrjjYPE5z6VD2Rg1SraAm7O3ig WlRNa7LQM5KMmNK8Wd4MwIvgzdnIcijr0msrQzdW2E5R0/x8zg4GF+oaHK7New== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098907; 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=Fd3d2O2zcZ9pb65cJLUsi6Jq55erUg2eFoQPurY/0G8=; b=dT8Fsg/XuZHQECPcVpvw6DR4AD3N6J0ArZpMQEn9pkopbphRsfUSLeM62un3bqNvsgN6HA /4alQ0Z7D9AbpHC/AM7C803hxne34Z9tq/1Y4tmZw2taLqR5jIvpwdS2GfKO/R1Gd0Y5Dy Q+4NoQz9YACITA3HDT9aQxb28yh58jmVST81oWUC6ie0WgxdgrTjDJWUDRN4ne8tJxmlWD ZcPKBcOm11bW01eyG/GbpS3d/oeLHdtg55aTOkwvaALWmaCkNAwQeMbEN/kUYk2FG0VcEX XDutkrrFvTmF7H1bNUfocPNCrzQNGQaxP9E50QpDru75O+ioO8cvDqZsCV7BWw== 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 4V1GrC6N9Wz1Ch9; Fri, 22 Mar 2024 09:15: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 42M9F7xM062065; Fri, 22 Mar 2024 09:15:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F7CS062062; Fri, 22 Mar 2024 09:15:07 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:07 GMT Message-Id: <202403220915.42M9F7CS062062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: fb12765e7052 - stable/13 - libbe: Fix some markup issues. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fb12765e70528666cc20151888a7274e411ce35c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=fb12765e70528666cc20151888a7274e411ce35c commit fb12765e70528666cc20151888a7274e411ce35c Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:35 +0000 libbe: Fix some markup issues. MFC after: 3 days Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44407 (cherry picked from commit ad99fea9045dd3daaeca3d2dd60fffecd2311826) --- lib/libbe/libbe.3 | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index de2c29c65268..644b1d71ccd3 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 18, 2020 +.Dd March 18, 2024 .Dt LIBBE 3 .Os .Sh NAME @@ -178,14 +178,22 @@ If a BE root is supplied, .Nm will only operate out of that pool and BE root. An error may occur if: -.Bl -column -.It /boot and / are not on the same filesystem and device, -.It libzfs fails to initialize, -.It The system has not been properly booted with a ZFS boot +.Bl -bullet +.It +.Pa /boot +and +.Pa / +are not on the same filesystem and device, +.It +libzfs fails to initialize, +.It +The system has not been properly booted with a ZFS boot environment, -.It Nm +.It +.Nm fails to open the zpool the active boot environment resides on, or -.It Nm +.It +.Nm fails to locate the boot environment that is currently mounted. .El .Pp @@ -226,9 +234,8 @@ function creates a snapshot of .Fa be_name named .Fa snap_name . -A +A value of .Dv NULL -.Fa snap_name may be used, indicating that .Fn be_snaphot should derive the snapshot name from the current date and time. @@ -520,7 +527,7 @@ The function will free the property list. .Sh DIAGNOSTICS Upon error, one of the following values will be returned: -.Bl -dash -offset indent -compact +.Bl -bullet -offset indent -compact .It BE_ERR_SUCCESS .It From nobody Fri Mar 22 10:18:43 2024 X-Original-To: dev-commits-src-all@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 4V1JFb5tjGz5DXJg; Fri, 22 Mar 2024 10:18:43 +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 4V1JFb5MPGz4ghw; Fri, 22 Mar 2024 10:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711102723; 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=1cTnAsPdBydcpzlmVQ8t9rBImi9S1Gwj2T5329ItIR4=; b=taoQaVVFznbI0vB9AAul4yrf/Dms2rd54X8PqJYXBvM54utyE3XqpF4TFbtbjEeJpg5FWc Ss0mccmHpW2WaTWzMYDLCzY5sW/vqz1j2fCoOSUCz/Mi9d+JmAfv2zjLSoe8m8uxfYxdxf 4KL4Y4aq/8PM3xvBxNMEyZ8j0vJ0XPvJzChQUNlCusttj5I/zwgcENbiFzE+WrpYTYJyYi pw6pMGN3l9fNlX/9+8+JM0LiJjGBezlSEIk4gYHC9alyyW0cqlCUJfBR+eDrDwfjhsWn6n V9kBp0+1c1hGn2inM2DChiUc31K6cJn38B/fQs9vIVtOooWkSBTmGQHZnZ4Wmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711102723; a=rsa-sha256; cv=none; b=CVAXOnBWwr5PY03ZJo2VjNl+7fBHb16I82a9+zt++/EsswDIE/2cnQwbW5CZ4o5AHRpm8S HDhRep75T1U+PuHF5a9EdkBlaDcs+qQhLDGe6aCY9mGd5C60liP2FyvuLkWBzvsyTTLVNV 8gFVngpH0VXRqqxjBRKXRCZ2Sy7Cotmj22hS14d7u4Y5tbrnA02iRLLooHC132y35mEAsH WPni88H49zNHwIagrQwd4elCrng96Shihc3g2bQm/H/dLhv40DYzRuendE8y6a7VpB1dkV ArhZmKm7l5YcKt7a/qr659OUZKvPNDHcA+Vyjd02e1dqXMw7TyEkd6B6hd7yLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711102723; 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=1cTnAsPdBydcpzlmVQ8t9rBImi9S1Gwj2T5329ItIR4=; b=lhzRvfNSak0kMQ1YuLP0RAzH8vdbN7TR3GqOowVS3Ty2zOsZblG1+yZKuYM4DHubd0mHrE /YJbSz6UbKWwVFJFe2cT0HJnATNo9pHfc/DvruZdmaRcWHfYa1h3pHzCxyrjiAcQwbRHz7 R3GoiJwJetMCLBi74QNToWnhCFcYHP3dmOIYPsQIlo6NTsSdPY/HnF/FBMwi0or6vZuTaV wd5a774btcqrzLiJJ/WBczcEuA6EHzKdOvvYy94aEGZdJ7LuwcNUYhZBbgo5l19kXTBg/R kwH/pX/h2Xq3IJfGNGpZh5WbcrP6yLEpeGYLrsJmxTg63CKxXpz2s3mGsewOAQ== 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 4V1JFb4rNHz1DY6; Fri, 22 Mar 2024 10:18:43 +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 42MAIhCn064290; Fri, 22 Mar 2024 10:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MAIhfr064287; Fri, 22 Mar 2024 10:18:43 GMT (envelope-from git) Date: Fri, 22 Mar 2024 10:18:43 GMT Message-Id: <202403221018.42MAIhfr064287@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: af700f430fd8 - main - tcp: no data on SYN segments unless doing TFO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: af700f430fd86ba3eae63e587985a12436db8f69 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=af700f430fd86ba3eae63e587985a12436db8f69 commit af700f430fd86ba3eae63e587985a12436db8f69 Author: Michael Tuexen AuthorDate: 2024-03-22 10:12:56 +0000 Commit: Michael Tuexen CommitDate: 2024-03-22 10:12:56 +0000 tcp: no data on SYN segments unless doing TFO Ensure that there is no data on SYN segments unless doing TFO. This check is already in RACK and BBR. Reported by: glebius Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D44384 --- sys/netinet/tcp_output.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 6f7bf6f8b029..2bbc9414197c 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -470,6 +470,12 @@ after_sack_rexmit: (tp->t_tfo_client_cookie_len == 0)) || (flags & TH_RST))) len = 0; + + /* Without fast-open there should never be data sent on a SYN. */ + if ((flags & TH_SYN) && !(tp->t_flags & TF_FASTOPEN)) { + len = 0; + } + if (len <= 0) { /* * If FIN has been sent but not acked, From nobody Fri Mar 22 10:40:31 2024 X-Original-To: dev-commits-src-all@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 4V1Jkl6TMMz5DZlD; Fri, 22 Mar 2024 10:40: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 4V1Jkl4dj5z4k7c; Fri, 22 Mar 2024 10:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711104031; 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=0Za1Yg2JgcriwnvGdLJMpC62asFhJM+MCgS5YVZmflk=; b=M9QSVr3oxXjOn+7Mjq/ZQ9+qR5DMjxMvE15HPwPdLuTmZizPbHGGqKGFkpaVIV7YJKtMRm 6ffQ5TG3/X0nkO63cneDXZI4ViBDBvDvOW6VdyUJzSKkl3glfoNEz5DVQXURQc3nWuy9o+ IEz7AB1TT6lR05S644s/pzNnn9lFNwEoXNdFeL21Zsm25+g1c/peiS4GfTPmZuEVS11DV3 Mi4oKGjIgJX91ruD3a20VxU5C7nNbtOpfSYzP7xgU58sgqVYiU45R8fJw4hLY8CHXNq0gK WYKhGONm91dmiuv6IxQAg3WjEor/kkg00qXSAEZG7jG6t7ENfeU/mkQ1Mif6Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711104031; a=rsa-sha256; cv=none; b=Ui/EHKG7z7ldSZZzwPN3mX4TTFtGpefRg3N6RaICgtCp94z7f7UtlCtZjmUuK3rJ6N5kEl eW0CEE6L0fXersOAUrD0N/aczCUP/DgqjOrK24bq98ik23GD435IHqD8PLiGYb8U98w7fd 3QaGdjgGMKHobJPpADWbtHszpKGZrqK6PJJGm61A3icwirE+JLSBDivw4ReNxpOHDHNu43 vNx2HtALOQbsynxgHN+QRd/XlP35LmD/Gzsoc2svqsH201Pigmk6uPlA20El2Du7Raolj6 UifyPJ4DqdQbDUoziQmu9a9vA7069QQwm5w+b7ewEW9o/1cSuffCQ0DJt+3HDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711104031; 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=0Za1Yg2JgcriwnvGdLJMpC62asFhJM+MCgS5YVZmflk=; b=ooy7URefpBHGdDlSBPwTb3DWRoTHfiCExPB98UEpzeF4SjlkpeQQLMRck0IdhIQOcy63w3 pgfVfFn5Kv4pvvIvU2tt6HZvyjtoHtEeCjdsaN3vR1DtaCsJOm0kRCc5Y2Bx9msPismV0G t9AGzdEHziqnoa6POfAVW4deJVZUyZ19+JQQEf0PxP6najEkoglGTE09+WtJV2ZA6zs69E gMTC1UfnGQ7qh2Te7j0puxMAtPAj7Bn5Mgq4H+/TPsYptzjtNRkKrLBOcqOonBNvQmLjmp legU5EsuhqZLNxhkTFygDxnD/ECZHY6jvGXc9lF8eSads80wpScO1WwmkWYRnQ== 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 4V1Jkl4FYjz1FF0; Fri, 22 Mar 2024 10:40: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 42MAeVmd007681; Fri, 22 Mar 2024 10:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MAeVC4007678; Fri, 22 Mar 2024 10:40:31 GMT (envelope-from git) Date: Fri, 22 Mar 2024 10:40:31 GMT Message-Id: <202403221040.42MAeVC4007678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 56b40c285b59 - main - build: add -Wswitch to clang for more consistency with gcc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56b40c285b5994d64e7e8fba821c57f86e91502c Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=56b40c285b5994d64e7e8fba821c57f86e91502c commit 56b40c285b5994d64e7e8fba821c57f86e91502c Author: Richard Scheffenegger AuthorDate: 2024-03-21 21:47:39 +0000 Commit: Richard Scheffenegger CommitDate: 2024-03-22 00:39:01 +0000 build: add -Wswitch to clang for more consistency with gcc gcc12 and gcc13 appear to include Wswitch with Wall, while clang doesn't. For switch() statements on enum, this forces the use of at least a default: clause, in adherance with style(9). Reviewed By: emaste Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D44092 --- sys/conf/kern.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 53781927dee8..5cd3a43f01b8 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -6,7 +6,7 @@ CWARNFLAGS?= -Wall -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -Wmissing-include-dirs -fdiagnostics-show-option \ - -Wno-unknown-pragmas \ + -Wno-unknown-pragmas -Wswitch \ ${CWARNEXTRA} # # The following flags are next up for working on: From nobody Fri Mar 22 13:11:33 2024 X-Original-To: dev-commits-src-all@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 4V1N516mbWz5Dtmg; Fri, 22 Mar 2024 13:11: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 4V1N516GDgz42ZN; Fri, 22 Mar 2024 13:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711113093; 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=mA7ZqIqfkAXckwDLnvfZhUUBi41ypu47cNQHJP0kayg=; b=CbiKFjebHhc6jfN3C6W9XhO6/OD0V9L+0dbt0sZAzskAAGfJNDfKxsre/YcKUx9++mGtaE kG8qt+PhEig+UiEqVtz8wP82XLuD7rMIaDgVgtUxUlODf9SzKrcB7+AicAzEHslnGnuubE Dn2OwuzRpvgCUgjjMNWLGGY9TI4nbotnnp2VgnFwes0MlNHZQc8G8XqmXmKNd1Mv5/4Kgn xuspL+ypH9ksAw2LJRhebmPkpSFJfxq+lFKdsmysF9sc3jDu4BSh8eVtzgk/YzXYHj8knS RnwyuWF2tnLYV8gR1fO/6298s94xL4tQTzqf3P3cOh/KCzm5IBP0wvqiyujJ0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711113093; a=rsa-sha256; cv=none; b=Tj0XhpCom06Y2arOtI05vziB61o5HJcKXTNy4YArmotwhIoN6lG/RcZxqEU7hDMONnvszy fOiqOXod+ckBdGqyt4YRtDPSS7HjCrMvHMB03gdkSP9hbHbG0k5aVsnpCwT93dMxdCTnC3 kFJvTODPe6bIcxGZ5HB4YE3YLw3pZ1x3Es5Y2iIYh5uzeqMABBjnQ0nYs0ORhzMmvF8iFM SzllB4S3km7IY/Zi4MHV7VCXmqnBNd943kqGRQn7rMDiI4py5vqnKcTASf7I68gNZQNpaf KDNVj6WCNnoD82S8hDs+P7sSu9Xv2vcG3x4MkCKMI2xoKtOg/26vWftUFVF99w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711113093; 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=mA7ZqIqfkAXckwDLnvfZhUUBi41ypu47cNQHJP0kayg=; b=FvcXxhm18/wDC33OQsvBaHRp4Ie0+X0ZKO3M+iAGqEZi8K7GAuHJYGbOxocsCHgu2PUhMT yRAuZ17F8Q8BC2izAX/NHfILjNUBNqzKUvnrvDu3m+ldzkvF+0p1/elKoNcp2ADpPJsJNK uPcDo6keqJPah5gh1exB9p2m5OvYi07Mo24PoVjplXXunUEYxEHNEhgO0LxQ4zV7rBTMFQ Yeoc1ovfHptICGvjAi1/UOKkK9/M+Y/giHURPnpEtgPaR8FLPPrVXonbbA7jCclVGkbnV7 T45lxApCZ8zzx2Tm1eDdojLEiM3b2d886IAvWbeAUysiKUxDe4S7Xent1GN+Ow== 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 4V1N515s6kz1KVS; Fri, 22 Mar 2024 13:11: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 42MDBXJt064226; Fri, 22 Mar 2024 13:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDBX7J064223; Fri, 22 Mar 2024 13:11:33 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:11:33 GMT Message-Id: <202403221311.42MDBX7J064223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 67e6b8354a7b - stable/14 - CONTRIBUTING.md: add author identity info List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 67e6b8354a7baa4604b75377b7e765cef3c9c6c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=67e6b8354a7baa4604b75377b7e765cef3c9c6c4 commit 67e6b8354a7baa4604b75377b7e765cef3c9c6c4 Author: Ed Maste AuthorDate: 2023-09-19 14:12:03 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:11:15 +0000 CONTRIBUTING.md: add author identity info We do not want @users.noreply.github.com addresses. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41918 (cherry picked from commit febba4622b605bfda0f44ae3c943ccdaa914cdeb) --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 90c2a4bfab39..62a11d8498c3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -75,6 +75,13 @@ submission does not meet the limited scope for pull requests accepted here. Sometimes it is easier to review a GitHub pull request than to do the review in Phabricator, so that's also allowed. +### Author Name and Email + +We require that contributions are associated with a unique identity. +The author email address should not be `@users.noreply.github.com`. +Do note that your name and email address will become a permanent and immutable +part of the public Git history of the FreeBSD source tree. + ## Style Avoid adding trailing newlines and whitespace. These slow down the integration From nobody Fri Mar 22 13:32:21 2024 X-Original-To: dev-commits-src-all@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 4V1NY16NRMz5DwbQ; Fri, 22 Mar 2024 13:32: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 4V1NY14mVjz43gy; Fri, 22 Mar 2024 13:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114341; 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=kDSOPS73Kz9FmtfbC8t4gPsQJZAtHGD9snjLYmAaUP4=; b=VOr2CYzDIwdMWPuKSziAYzgcilB0kuZjF9/HkKavJglSLIf6luIIAhfw0ord2HCPfZsZ+P /yS3TKSKmRtxoSwFil51XpbIkWPivJCYoBLzhnJAFXNjEVqSxj/vW3c0oLHdjmb7ME/M0T rIf5zZPz1YPsssHKDMiP27qO7ZHRg0BlSifJHJ2c9311kw/8S/EY3AIZFjPqnroXe8931G y/qUIdNkR6qaKAApkf5ISqChEFIQ+LEpgbRAoPWu4iLqwjs77SKfJ+QnyN4UV682azy8mD ZdPa5kHLtjH/O8Ii3iyKfR43f3R7G3boYo0MwCwbm6Rf5GZYMZ7lqGJi5N26YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114341; a=rsa-sha256; cv=none; b=d/ncKz3LLdO9OTsVU7z7EKmIssTHIqFXk41cqaLWFlvDaHYx7Wc7cIetkWwS+PU0FSFok1 r/08rfJcziL4efm9OEbBf81kj/EvYgDhq0eAX1IvcO5OZnFGg2HncXjKkc87LW0Ci14GXd R1MYwVpJ5VvrMt6ybzpgEY8WnDSA5nl8p+WIxq2NyyLHGrmUqDjR/X+W2nfLc23v/aMTWM 85rufRbOI0tWr9aKotef1l/mX6RTSEkE16c+i0FAyI6Bj9DvneiAjTPAVkTxgpJNPGvKYH Y2WZHQxcJnnMtdhqcyz0a9PLO4EdLTYgnyAH63bTVxug2S29XC0Boo9lT4iSZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114341; 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=kDSOPS73Kz9FmtfbC8t4gPsQJZAtHGD9snjLYmAaUP4=; b=iAJwywzDMd4L5MR0GTuXSs99lkUeB/8+1sMco9tCZCNs87vLo3ROWOm9vWvhChW90zkiKd kQaPt4OiPLAFJxWnok8HonkXl4jqBH+JqyyqL5AE0IQEC//7DFJWYIEmzrR8HM+HiyXO19 K8gOVn0+rH0wdKGFDxgDjQPxbY2skcbPh/64jdqRDpT11rO2+Lbj40zh7rmvQMkNKrverC 9yC8i+A1pWWRixEjb96HtY9SlrTUWxeFTkgJJv8gDf6taG5EIOK+IRuaGe3gfAtX9Ol5Zn uHsPgk9xl1bcJJCucDX/XNpe5I9Lc57u+2XhB6K9lAueY5gjeO0MCyql3pp4Pg== 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 4V1NY14MwZz1Klk; Fri, 22 Mar 2024 13:32: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 42MDWLbL002170; Fri, 22 Mar 2024 13:32:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWLT6002167; Fri, 22 Mar 2024 13:32:21 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:21 GMT Message-Id: <202403221332.42MDWLT6002167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0416bffd5183 - stable/14 - CONTRIBUTING.md: fix typo from commmit to commit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0416bffd5183372a42feecee54d87d100210803e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0416bffd5183372a42feecee54d87d100210803e commit 0416bffd5183372a42feecee54d87d100210803e Author: rilysh AuthorDate: 2023-12-28 07:34:32 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 CONTRIBUTING.md: fix typo from commmit to commit Signed-off-by: rilysh Pull-request: https://github.com/freebsd/freebsd-src/pull/960 (cherry picked from commit 5f71f9636efa25f6de1a832202bae7c78ad013aa) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62a11d8498c3..b59deb68bd17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ A pull request will be considered if: * The commits follow FreeBSD's style guide. See [Style](#Style). * Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors * The commits do not introduce trailing white space. -* If the commmit fixes a bug, please add 'PR: \' to the commit message. +* If the commit fixes a bug, please add 'PR: \' to the commit message. * If there's a code review in Phabricator, please include a link as a 'Differential Revision: ' line. When updating your pull request, please rebase with a forced push rather than a From nobody Fri Mar 22 13:32:23 2024 X-Original-To: dev-commits-src-all@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 4V1NY41fgcz5DwXx; Fri, 22 Mar 2024 13:32: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 4V1NY3713xz43kr; Fri, 22 Mar 2024 13:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114344; 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=10PlZsPNngrnnXuBvrsgeC48eE51WqWpo8/yGH3ieCg=; b=NZKe74rga5SHz3jYcuBJ1ITIJ/R0YVUAF+NyK4aWoPuYfY/1M9MM5Q6P+9nPbWBnMTVy2f gGttVpkL88esa6O8DCPMRiFG4Bxv9WnVu1IVrE6C4warOTPdvS02PT3fAXP/TOYMT16bY0 qK+iojNmPw/mI03XcfvlPG1ElkpOGKJFBN/1S7Cn/DDlbLZ+bs7+4/nz1kN8229z+AycLf sRlh7RL1uS1pMXbjF6ItEZ5saKOc9+o7//FqyL9WWzzPy1zqWMKY/kZC7RzHuIKf9p0Ekp psn6YtH0eF2lkhJUkgkz1P/s1svM4wRMzWh1soHbYGljZvKKQ0NQg2uYhFHLzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114344; a=rsa-sha256; cv=none; b=lRmliKHW0MN+XsEfBEBb3yfKwAwzy45vRNpsJz6PDTumJaWUss477+FNnFqcJnM8UUqgsJ PRYoM3qJc885CaC11JPSe25sS4opDB2lEHFTLvzoReH436IrxYv2CLwfJ4YLpJ0MQWk4RT h09EGByYMwM45Kzq4aD7I1EJuLKbjVbC94LP9PVkdBpdxLkdoLcdSMMwSjr0GBp+ludVLJ 7jj5b0xSkcL9/z3BMJm03d25LvpmHtNfBRA6gTCAJeaVXLbQUwweOBBW2o7CIIynV5WP6R yZm2Wondq9u9vgaxX4SOcjUaGAz7k/AmwUxKLN41LyT1wiy4wpT0ATTpR91PbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114344; 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=10PlZsPNngrnnXuBvrsgeC48eE51WqWpo8/yGH3ieCg=; b=mWzHj1MwAEPtQCNB4baqeUk0Qw0lMzlHckDNmLvUb3D6gfQveHxoKp6mJ1FsAsGvEAXSYM cMeypQCI0H+eWvKEsJRZjsU6HZkgzW2Wj5V3yybIbb7YIsuFixJlGOqsaNoYVMF7nKPfsx ufq9Ll8rczjBG0JHzOVxQ0Ouz3Sr2TGfqRp2W9KHiwqWr39/DqhUMUOrVTy5zQ0cw+/l+B dwuO8I0wFlFrjCJNdEZd+q3aTSQlezyUQ2CdkyZ+UEJE/MxG9d019b/tROSeA0seHXtE92 N/PGw9PvVcnE/trTSLY0MeyNlJRB3uinUkT+0RkWSDxjdl7nxKHFyx0FoSDN2w== 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 4V1NY36dGgz1Kxc; Fri, 22 Mar 2024 13:32: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 42MDWNJr002261; Fri, 22 Mar 2024 13:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWNed002258; Fri, 22 Mar 2024 13:32:23 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:23 GMT Message-Id: <202403221332.42MDWNed002258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1bc20e8af16c - stable/14 - mount: document atime option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1bc20e8af16c104b80903d6750e1ec5cfddae310 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc20e8af16c104b80903d6750e1ec5cfddae310 commit 1bc20e8af16c104b80903d6750e1ec5cfddae310 Author: Ed Maste AuthorDate: 2024-01-24 16:26:23 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 mount: document atime option atime is enabled by default, but may be specified explicitly so that any future change in the default would not have an effect on a given mount. Reviewed by: olce, rgrimes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43580 (cherry picked from commit 54d31cfb278982ff8c2af97a13e40b1a3ebd838e) --- sbin/mount/mount.8 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8 index 91e697bdc3b8..680f28766af8 100644 --- a/sbin/mount/mount.8 +++ b/sbin/mount/mount.8 @@ -25,9 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" -.Dd October 4, 2023 +.Dd January 24, 2024 .Dt MOUNT 8 .Os .Sh NAME @@ -157,6 +155,9 @@ For this reason, the .Cm async flag should be used sparingly, and only when some data recovery mechanism is present. +.It Cm atime +Update the file access time when reading from a file. +This is the default. .It Cm automounted This flag indicates that the file system was mounted by .Xr automountd 8 . From nobody Fri Mar 22 13:32:26 2024 X-Original-To: dev-commits-src-all@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 4V1NY63gw7z5Dx0D; Fri, 22 Mar 2024 13:32: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 4V1NY61bRQz443c; Fri, 22 Mar 2024 13:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114346; 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=FbVRY+RhlWhBETd3TXbXen+hW969AW4MCO1kWumtVuI=; b=VKOw7KfkxW2ShSi6AxNiKAEd4nITYj0X3D2OWJwA0lCWgadp3Hh9LIPhEGw7RkI9a0b1Z/ 0JC6Ia4lsnvy9mdOFnslnliyE3o/ewVenZQqFin5Ucq7mXkvvH+aPkTy42Ndw1wiHUgjYM tBi8hJU2Zfy0HyYHRzZplc3eWDu2y2JJvugV5CNTaiuNcDEmFf6LwM5qloPQ99mS4Ke8aU bsa25cK6fxA67LUxKrC7JZUVWLrgXEoQrcKBPfdRsAB5h/JQy08X/rfAPRIXnusu+U+CWE yiFQvWlP1maH75l2UQyIIbam9q7UQIKRNy8IPlcbN+OHLQCrD4NpCkypuJMUVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114346; a=rsa-sha256; cv=none; b=ZiBBiEky3nnJj5mEn4xDAAW2QppGUbUHNli3BSKcbC7+64QVtbWcmorCFEY2wxBodvclck 9wF0tMuOicvsbcAOyvwQ92lPDoI+ESfpT6gqbLMGL7OHWg2mqvz1ExiDyUFjjlqy14XdYn GHc3S5dltzZKwxe2U5UqETcIUfN2Sh2HnlvLY4Ce5Ils24xuPim3nyxnbAzzDNJXR5wA+I QOmdE3rnYu/DYk0ITJgmQYxaHxBNJ/6I1kYq098F+MtU7gYTF6MORiaIUBw2NFdhvcUSgN 2XUmHSM6OShQ/5k2jcYBqaANtT9F7to+DMjplK9mHbCWZMduZ80BsFQjGt4AWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114346; 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=FbVRY+RhlWhBETd3TXbXen+hW969AW4MCO1kWumtVuI=; b=cAFQeSXvLGJYmssIDyetWOAZq8sCZJ7bKh0IdK1U4v2R1jFRO4cUOgXrexxcaRdtL9Symr vEc6QFu5UKde9vnJ/sg8RxSa+9SV8ssp0+uP8NiiM28g/cKe9z2cIGsW9zGWZu26Z+sF3r YtPL/uCPL7Ux8H4L+Tl12XaK9Yci7VwOvNHNJ6mdhZB60FkIVGr/gNnrUN1G48inbVYxlv L9wlK3GtAgKXHoi2piR7mSTLrEcA/n25ikArXe1+6AdBEQJwpunbfFCE879HC7RD0SPkrg B7w/RZ/zdfzVhhsDgEEJhO41CJTIMdV61/HeUzH7141qwVvc0G7zN0mAmTf+OQ== 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 4V1NY619xkz1Kxd; Fri, 22 Mar 2024 13:32: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 42MDWQss002355; Fri, 22 Mar 2024 13:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWQEA002352; Fri, 22 Mar 2024 13:32:26 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:26 GMT Message-Id: <202403221332.42MDWQEA002352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 466e0dc5ce78 - stable/14 - random(9): bump removal to FreeBSD 15.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 466e0dc5ce78da69c14dd993d12ef21a62deca5b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=466e0dc5ce78da69c14dd993d12ef21a62deca5b commit 466e0dc5ce78da69c14dd993d12ef21a62deca5b Author: Ed Maste AuthorDate: 2024-03-18 20:02:08 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 random(9): bump removal to FreeBSD 15.0 It has not yet been removed, and still has some in-tree consumers. PR: 277655 Sponsored by: The FreeBSD Foundation (cherry picked from commit f50322c1dcfe369ad73e1123541d18fc431384f6) --- share/man/man9/random.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/random.9 b/share/man/man9/random.9 index c0d58482416c..7fc721564897 100644 --- a/share/man/man9/random.9 +++ b/share/man/man9/random.9 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" " -.Dd March 22, 2021 +.Dd March 18, 2024 .Dt RANDOM 9 .Os .Sh NAME @@ -133,7 +133,7 @@ The deprecated .Fn random function will return a 31-bit value. It is obsolete and scheduled to be removed in -.Fx 14.0 . +.Fx 15.0 . Consider .Xr prng 9 instead and see From nobody Fri Mar 22 13:32:22 2024 X-Original-To: dev-commits-src-all@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 4V1NY341GNz5Dwn4; Fri, 22 Mar 2024 13:32: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 4V1NY263cmz43km; Fri, 22 Mar 2024 13:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114342; 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=fAVtAYgNEn0oM/Ul3F24oXDubp8lyPtF/aS0fla+RiY=; b=DsOfQwF67Jh+Jd9oTcWTEAsgMJ2qyRc37zp1j8tr8Cv+kCpDibUzQvFHXGw6xlbvAVzGyq dpMgvE6mFNErvb86/+ZpNEI8pms9KkE52gHMJAI3gtxKKjVma06qyv+PPd0k753QDmCtTZ XKM0RJ6LozDOSzwgMwdVzBgD9ustnI6Z90ErsAnBlmvNu8ItFgLnNePRfQn9iAGjgIUhu4 tOeAovyfJAE0t0t09Z3bESKP9O+nYTcTuRhCAnEE+y8e6HRpwQIgIxctzqdRkUMVzqWlpy 0Tt4x+JEwGh9c/8XMZNLRaQpJOKzf55S1WbjfPO9XGJMsjmMNmV2beHqU9JxgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114342; a=rsa-sha256; cv=none; b=L1Wgg5OiYJ+z53q5Qt7dmJhDloEw18/V3FsxpyZw8DC9ogeL1BP96hGHyJKYhz4JqQVXVg kd7K55UTzqWKPzo3pzrtNaQzVS+YSsJt6dKhBXebU1rAvNAB5Yccu3vGDMLBTMMFl8/Jc5 k7tPSPwaSAlfp8SKy6qdhsR0i2XLsnjnLJvgduPb3gaoAd08SSm5GfGjxFcWSALT/39Hff cYNB87XNAUq1j14rCGHBV5/cI5hbtfEec5jSvlh5f07upGd2pF6AnB25rImH8/IXzocKsf Z2QrKsJ7hnPy7wBULZeCFJoUwtWTGS/Nob884r7khYUUZFW1RCWwRyMq5hNgLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114342; 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=fAVtAYgNEn0oM/Ul3F24oXDubp8lyPtF/aS0fla+RiY=; b=WmHGVZgIoEi+vAMBSrofrYs7O3HzU4RgZ+g+MQFkyRexWa5bMM3IEt0EXhEOgkEJRnIs+M SpQ+tlRIiqp8VcL+q/5JEc2J553QLHh+240Tz2OzmPcujEuBAYV3oCLyxX9/BtpWEU6hno bfZxGeBzMwoWf32bd2eIXCTmABKMDUY00l/utz/PvPG1XzmUPgZ7ZBmjvSNVKR8T1SIbmW vslYSXtMgkqU+Uv0pZuCYZIbVnw7pvi+y7T5BhADYfFiu4c68T7bKkTKbBIAPdK/yJ+gKU J3Llu/FY+UME1oDPMy0d1BS+qKlljRQe1602i/Tl/m55HDNd3DHn/ZWF3m5k9w== 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 4V1NY25gvZz1KxZ; Fri, 22 Mar 2024 13:32: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 42MDWMjF002222; Fri, 22 Mar 2024 13:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWMIA002219; Fri, 22 Mar 2024 13:32:22 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:22 GMT Message-Id: <202403221332.42MDWMIA002219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3c75c142c0c - stable/14 - open: make non-POSIX errno value more apparent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 commit c3c75c142c0cb9fe9bf166e3416195bc59ad0e12 Author: Ed Maste AuthorDate: 2024-01-26 15:19:04 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:30 +0000 open: make non-POSIX errno value more apparent In the errno list, add an explicit note and reference to the note in the STANDARDS section. When O_NOFOLLOW is specified and the target is a symbolic link FreeBSD sets errno to a value different than that specified by POSIX. Commit 295159dfa3ed added a note to this effect, but I missed it when reading through the list of errno values. PR: 214633 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43618 (cherry picked from commit ea6a6b63e1fd304e790c8ed7627caf5e3ba52bc7) --- lib/libc/sys/open.2 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index 67a059db10da..383dd58b2a31 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -487,6 +487,10 @@ The system file table is full. .It Bq Er EMLINK .Dv O_NOFOLLOW was specified and the target is a symbolic link. +.Tn POSIX +specifies a different error for this case; see the note in +.Sx STANDARDS +below. .It Bq Er ENXIO The named file is a character special or block special file, and the device associated with this special file @@ -649,6 +653,7 @@ is set, and the process is in capability mode. .Sh STANDARDS These functions are specified by .St -p1003.1-2008 . +.Pp .Fx sets .Va errno From nobody Fri Mar 22 13:32:24 2024 X-Original-To: dev-commits-src-all@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 4V1NY53ZQZz5Dx0C; Fri, 22 Mar 2024 13:32: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 4V1NY50tt1z441F; Fri, 22 Mar 2024 13:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114345; 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=pYJYLoQAAVqFH1C/9D/Px8437wZkyA0JHCbav1yEvA8=; b=I2eJb7j6uWRu4k4i1KXxWxYLPaAJHkfGKpDq83LMKYEgAa3QLgZ1SQS9HtmEFWSjEvl4OM 6DbWjzV6ctIn1a4u31wrbOuRWvtTEL2ZSyYgnzCvL45QofWuj+1sXuNCDoOt4gWMEv2Q/8 oR6AT5Z0b/gqV3v6+wbyP3dlBuMOUNx+FSS/FYEvQdagU75F+cZYz8T/5mP6GsR3qVl5O3 hXMHSorKM1ceuRHvwbbjEmH6rqgq20mMwT37MIo1ma6vlz9C0dLEMeRnOXz0U59nZPdCDk lUSFP5uKqir8hgm+FIts2R4cgPDyq3aOAiiL6ONDAlbGzNw4+G+fZ6vaRSkA/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114345; a=rsa-sha256; cv=none; b=aujyUKOTvo7HqooRWtd/rirSit2TOT+tiFu5zHLft5d/fdQLOqT8XW5acKW5aZyzozq4Av Gvt7pTvr83FUyOpxIr0I93RG5dSaSVRoZzaHhTbY4eB7kvKOg2MjwLTMrGUdSGUEXoeEo3 97EwfIIcX2AEh27Ur5Wqng6zGr4fYYaiuCSDw4NNEGOkPdps73JUlSxFZrTY7lv7osoGLe bDosFR91O2UcpphG1VB4Aa6jTu0fGMiQ6LGkajzTfzpoijJO40OTDvzqsGuqUETu6XIeG1 y0GJTduwL7yUsmHts4tCgzN7SWrL8HtGr/EFk6UwBICA6c8oHBQ3HXaChLYs7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114345; 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=pYJYLoQAAVqFH1C/9D/Px8437wZkyA0JHCbav1yEvA8=; b=YPpwnPSWTeB9uY8TgGyC2o7uiYQigx1rSJWvMO+d1NOHm7MDwDPs5+kGmrHBkKOZ/Ulih/ vAqZIhJG4ptVpFPJDHH1kXaLmY1PS8Ch6SNoImWXdd3RVevm/MkkVvfj1VOpVIp7oR17qK mqeNDIaJu4EGjqbD0CVF9vHWqTnLe7ciiofBW5F7Qf1/frgBf0R0L+4Cp2bNIFtTC+7nxU wEtbIlX/JR/3HDamv/XTeN7WSf9H6rwyqx3cJ/ca1p2VKHsiJGkYoGMKmPmVzFkORgIxhw ZLPZIJwN6UGCRfKyl/o0IT+UX+buAwP0GE3JiJInwYG554Mqgxd8o/JOqGgSEQ== 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 4V1NY50VTKz1LTN; Fri, 22 Mar 2024 13:32: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 42MDWO7D002307; Fri, 22 Mar 2024 13:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWOVK002304; Fri, 22 Mar 2024 13:32:24 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:24 GMT Message-Id: <202403221332.42MDWOVK002304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ed70dd5bf560 - stable/14 - iwm.4: add iwlwifi cross-reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed70dd5bf5604f3e70a5d0823f27903246e5f791 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed70dd5bf5604f3e70a5d0823f27903246e5f791 commit ed70dd5bf5604f3e70a5d0823f27903246e5f791 Author: Ed Maste AuthorDate: 2024-02-20 16:43:00 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 iwm.4: add iwlwifi cross-reference iwlwifi(4) supports a superset of the devices supported by iwm(4). The latter may be retired in the future (if there is no reason to prefer it for the set of devices supported by both). Sponsored by: The FreeBSD Foundation (cherry picked from commit 9dd5023e955dac6bf1d4372d1b611a85f8b6f508) --- share/man/man4/iwm.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4 index f0ad81b4f696..b810f7016e54 100644 --- a/share/man/man4/iwm.4 +++ b/share/man/man4/iwm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 4, 2023 +.Dd February 20, 2024 .Dt IWM 4 .Os .Sh NAME @@ -167,6 +167,7 @@ failed. This should not happen. .El .Sh SEE ALSO +.Xr iwlwifi 4 , .Xr iwmfw 4 , .Xr pci 4 , .Xr wlan 4 , From nobody Fri Mar 22 13:32:29 2024 X-Original-To: dev-commits-src-all@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 4V1NY96XhQz5DwWF; Fri, 22 Mar 2024 13:32:29 +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 4V1NY951Vzz43l4; Fri, 22 Mar 2024 13:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114349; 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=Tm46OBH434LejjYRxjUsJkpjPjLk2c+BVc4zYGopwB8=; b=kNjuaiwuvgaCA7TRWGQIVQSpp4K3ZMdQEsdSjTqOWG73BfyxnCbMI/hLSzSeujWaWZrvZC fSwO8ytQX/ZXdoAA9pDfXm0phvlP9VtqyqKZKCPOetkkExfRdP7djPaL1cTff4TKu6TeX8 zzCxTTGimgpm0rMkKwfNmYqn/Lq28PmMLaN4gJUEXrrENZwG3agHhUWPrNvLVRMcwtH29U vXjOqfFCw6gz13wRuWY1Ca/n/wX1GPLDAH22RZ3Wa5NaNLiYB3N9Bxqg9lzmbgj/ynJ0yt ZwGKndQ2wxiKJ02HzixFVSfmb9aZzH6QzbCM1bf0EgnL0VhHIjMFx63IYf4FTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114349; a=rsa-sha256; cv=none; b=sjuQpW9ebUB1NARE1h8m+Or6rCG1GZRblQp42AEGsaLfRqc2FRWCLLAC9zD6Yz65vhE4Uw QWCtHpMtv7KRdscQxTn0FbnVQPmwVFlfatWjDD3A65MVGqekh1WFIApxtK2L2/YF0O6Kih 9XDUil7NAtcuuRP0xDtPzrrhuVZL48vd+UGxRJVShJEBQqZQsDZT2wyAjWNPGxF0qs0qeq epxBMjw1wqkr2RmKW0bZjUtJ3xk4iGR90bCHRagG0Udu7bu73gMqqeS2dZEWfTRv/bsyY0 sUo+mTubkT4VzESwXvAYQNpI7Yi4HfFRuzPIsIXBkH4+kVCS8kJjMLrMdU/oGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114349; 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=Tm46OBH434LejjYRxjUsJkpjPjLk2c+BVc4zYGopwB8=; b=Ch3yd0/yuntqcwk/a2K1RFTMQ8/VXBKhbHSvKc7/Li/e3n2Vmcp5m3KFKFsV0Eq1Qej4Vg Ej1/rsD/UhMD8q8pHuOJrtohpXKTR5l07O4p4lXSu30bV4aoQkzqtSezwA67n6+Qnxqup1 30Fn8msXcAZa/jg1FTuq+rJLXxF68HlPk9JP43KDW14lW8+gQLaXjKmDord5QXjZP7/rI9 v61S3GWWYjDtNpSZeaTAvUxCyZk64th8uazNfooz8mYOuk22PEqfGyQZZ2wU7144hSr+fL p8KhnAsHLMNK9reggfeuayUqte0zE+RcOnM+4RjhRUilnU0p/Nypol0eszm4xA== 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 4V1NY94LSzz1Kxg; Fri, 22 Mar 2024 13:32:29 +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 42MDWTYh002493; Fri, 22 Mar 2024 13:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWT3f002490; Fri, 22 Mar 2024 13:32:29 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:29 GMT Message-Id: <202403221332.42MDWT3f002490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b5ae8f217122 - stable/14 - ccdconfig: remove obsolete references to BSD disklabels List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5ae8f217122258764e4c187dbfee712dbe6893e Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ae8f217122258764e4c187dbfee712dbe6893e commit b5ae8f217122258764e4c187dbfee712dbe6893e Author: Ed Maste AuthorDate: 2024-01-24 15:05:09 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 ccdconfig: remove obsolete references to BSD disklabels ccd(4) previoulsy had knowledge of BSD disklabels, and relied on their use on the underlying disks, but this hasn't been the case since 2003 (commit 0f76d6d822f4). Remove disklabel references from the man page. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43574 (cherry picked from commit a3ed434a69c903fa58ef001c11c9466166d67c92) --- sbin/ccdconfig/ccdconfig.8 | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 2c7460f291f6..4014a36b0771 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ .\" -.Dd March 17, 2022 +.Dd January 24, 2024 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -122,13 +122,6 @@ argument is optional. ccd0 16 none /dev/da2s1 /dev/da3s1 .Ed .Pp -The component devices need to name partitions of type -.Li FS_BSDFFS -(or -.Dq 4.2BSD -as shown by -.Xr disklabel 8 ) . -.Pp If you want to use the .Tn Linux .Xr md 4 @@ -187,30 +180,6 @@ When you create a new ccd disk you generally want to and .Xr disklabel 8 it before doing anything else. -Once you create the initial label you can -edit it, adding additional partitions. -The label itself takes up the first -16 sectors of the ccd disk. -If all you are doing is creating file systems -with newfs, you do not have to worry about this as newfs will skip the -label area. -However, if you intend to -.Xr dd 1 -to or from a ccd partition it is usually a good idea to construct the -partition such that it does not overlap the label area. -For example, if -you have A ccd disk with 10000 sectors you might create a 'd' partition -with offset 16 and size 9984. -.Bd -literal -# disklabel ccd0 > /tmp/disklabel.ccd0 -# disklabel -R ccd0 /tmp/disklabel.ccd0 -# disklabel -e ccd0 -.Ed -.Pp -The disklabeling of a ccd disk is usually a one-time affair. -If you reboot the machine and reconfigure the ccd disk, -the disklabel you -had created before will still be there and not require reinitialization. Beware that changing any ccd parameters: interleave, flags, or the device list making up the ccd disk, will usually destroy any prior data on that ccd disk. @@ -246,12 +215,3 @@ The .Nm utility first appeared in .Nx 1.1 . -.Sh BUGS -The initial disklabel returned by -.Xr ccd 4 -specifies only 3 partitions. -One needs to change the number of partitions to 8 using -.Dq Nm disklabel Fl e -to get the usual -.Bx -expectations. From nobody Fri Mar 22 13:32:27 2024 X-Original-To: dev-commits-src-all@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 4V1NY74SgHz5DwWD; Fri, 22 Mar 2024 13:32: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 4V1NY72Xklz43l0; Fri, 22 Mar 2024 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114347; 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=Q/hfjy3YU6Cv2K1A0SP8eOKr4NvuEkBtfRenTmh4yMc=; b=VKuJ8V/FA02wliWDdA1gZa+frJlyoj6NHkg0DepPOBRaeIQm3xsooAVZVbPon0IYrIMIHQ JYXEZL3BnVPp9H7G9t8AulNwkpgJTTMSSnp8J9K4d4biMGPUPrrL1Us7vH7G3rRiU3ELAh /0pzLnv5CiS5gGlCqBo+UAulfVKpYRLGgGmLu85NUd1XjUbBJDg6rmnjsTJ341p7Layo/Q nqNtTjZ4IAhp4A9rz0stWjq5vwKctW6xlXd0xI0OUoLugpkHppSLhgsoktMwA5TDYhKj++ A4HizeSmITolrZANb6ESLZxMGGY5Yr5eZCOc7Ll7nT03LYzTqjez5FNOzYLrKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114347; a=rsa-sha256; cv=none; b=R3Mxx/NcZnJ+xMVH59ZmeddkPgDStj8axVoRFUQM1tgwtrAaGbeZV8t6PnbMsrXQOJFOzP kZecB7HH3j8n3HEJD23XBFxstaT9LAbmAC8aDZjYS70uZ/iFQlGWE+QtRA4YFFqb3QUfJY MdXyobaLfBtIi1zQR68x188gm4ZkkUXSJzIA00UU0cEbzP15DBIyM5pbUXvnVEkMgiRU+Z IhyGRJuz75B3YaJhor6PAe6bThIdl2ow/8E67bdXx2U+yMbQ5YCmbnoK2AdoTFY1Jbxx6J ddcXfO3hUntqFwwO6vs4Dk6aw2zUHWjvcgnZhFEaYyQUeFhmpB+V56DlTAkrCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114347; 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=Q/hfjy3YU6Cv2K1A0SP8eOKr4NvuEkBtfRenTmh4yMc=; b=v9/8XwwKoSZbwGaRXvzN7gtqPZtesymT29Lea5ysej44ss3NaUUCB+nIqzq6eHS4l5sKAi MkDrYYjXiPXpnGLEeOjPewl3ySdpSftQU0D7/7mOVK8dM+sWHBvLhy8nqkmH0GGwQpPgdE 9h+y1LOmG7ppFsKtV1X73w1Lajrt4kJKaR2j8wInZsv3fwyJQIbb5Etwl2fEzUC4qqroDr eTirTEak85oxPkd0ip1UrcEPcKCATPIV4fIb+uT+yU9PbwO4YysAxl5Va4qHsrEVtbJ3qC s7zRF9XYCg1NQMqOHyZo8RwBwMHnsO2RTApzV6hfI0pKU1pFUYKlUdLcOsj9fQ== 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 4V1NY729Gkz1LKc; Fri, 22 Mar 2024 13:32: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 42MDWRN0002399; Fri, 22 Mar 2024 13:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWRrD002396; Fri, 22 Mar 2024 13:32:27 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:27 GMT Message-Id: <202403221332.42MDWRrD002396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 144abdaa2bdd - stable/14 - wlan(4) - remove an(4) reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 144abdaa2bdd6effc6621a0a5a076272486b377d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=144abdaa2bdd6effc6621a0a5a076272486b377d commit 144abdaa2bdd6effc6621a0a5a076272486b377d Author: Christopher Davidson AuthorDate: 2024-02-14 04:27:13 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 wlan(4) - remove an(4) reference Fixes: 663b174b5b53 ("an: Remove driver") Pull request: https://github.com/freebsd/freebsd-src/pull/1120 (cherry picked from commit bbd29c4394de2750b6137c46bf4e577805a4120a) --- share/man/man4/wlan.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4 index 233b29bb89bd..4cd1bfbdc9d5 100644 --- a/share/man/man4/wlan.4 +++ b/share/man/man4/wlan.4 @@ -166,7 +166,6 @@ not ratified and subject to change. Be aware that this specification is incompatible with earlier drafts. Stations implementing earlier drafts (e.g., Linux) may be incompatible. .Sh SEE ALSO -.Xr an 4 , .Xr ath 4 , .Xr bwi 4 , .Xr bwn 4 , From nobody Fri Mar 22 13:32:28 2024 X-Original-To: dev-commits-src-all@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 4V1NY869zXz5DwbZ; Fri, 22 Mar 2024 13:32: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 4V1NY83fB4z443f; Fri, 22 Mar 2024 13:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114348; 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=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=Pcie57oZKDP1cf91UrquMZ8O1dql0j4CqkZwNNb2C97INiYvrFTy3UQQWIVS4mou+1m7K3 NNKnNeQHnWrV3fY9J0NcB2QOn5m7O526pVGHECbgFscZebt8oGT1MA0IzYJ1TnQ9CBqImm 5IWc0XumYaOk514Mkl8J/0mhYPVyw0WoVE136gqjGfW5uoEui7UHQ1zB7o5VB87kpG7XkO bppigW+5N2nFfjFMR8wEG9LBP9O6TSHao6rPr3uNL1Se13MVFHs9IpM2A3C6iki0g71Twq Z5JjPiM2KGsTEaBrmA5LJmldTFHOPpw8+Q7nLWfHsRFuAUSBjH95PeWRCqrZKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114348; a=rsa-sha256; cv=none; b=jaf7CIw0+pGTSrIORH5D1+FM420+2vb6HBcy3tDmT2ifjECbLoUoAKftqvDm/hTHpbnSc5 EK3qrgh9r53Q5bMJOv5XjB2+vRZj/Our26uwz5yqHiEiQnQqwPX5ZqRkeaEWKOwgEpCsHT TMv1SPv8C276lsjMtgjFa7vdZdKm23/bJfzB7YxGPqUQodGQRG+74MSAHMfNUm+g9ChQzk q4sQcusnoRsQ/U/W797JzVetyTio4b+7PURM8k4izWQlOdbu3H7aMGueYg92voUQzbB1oj YwszJcNqOtDDO1u1zJMzGVe9l2nQgzQZ2ia9SWNj/PL2n8n+fQC/7TtJ0IQB+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114348; 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=yO5S3RgZp/E+lPns4NRsPZS84e6WUgVp2TYhLEDpyLY=; b=X+FhINuQPSaudNGEFeqkGy6JZ9NQMcIH00GND8iDGQHDxSFIf67PL6GUy0Cg4yFNsdxtQ0 j2eQjqqUStuwIeVPc3O1MijZJg5l5/BDa52e044IWqUlG3MPd9aBD3JMHKp9amGp+ipziY gzc558pjelsiheLgJyP+v+G0Pa3gyRoEWK4ERwYz/NnS7sTd4Jhbry7HiZBsD4a6oGtpCg O3N2suUGvpYFOgmyM5dpNNreqQ9yX83RBp15khkmQdceMuZQ9ZLwcVQLUBu0iNmNdwqj4R 6RVQOpKAZQ7FYj5aMPLJeBH3PP4hFGlxt9O6v8pWVj/t1I1QCbuoyX5J4z2wkg== 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 4V1NY83DR3z1LH2; Fri, 22 Mar 2024 13:32: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 42MDWSSf002445; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDWS1m002442; Fri, 22 Mar 2024 13:32:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:32:28 GMT Message-Id: <202403221332.42MDWS1m002442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 269bc49fba66 - stable/14 - style.lua.9: remove mention of $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 269bc49fba660d212a7ac50e2ae5923cbc675e14 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=269bc49fba660d212a7ac50e2ae5923cbc675e14 commit 269bc49fba660d212a7ac50e2ae5923cbc675e14 Author: Ed Maste AuthorDate: 2024-02-12 15:36:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:31 +0000 style.lua.9: remove mention of $FreeBSD$ Also restore a comment line in an example which previously started with -- $FreeBSD$ but was removed in 6ef644f5889a. The example shows the of a module require statement block following the license header. (cherry picked from commit f1bd7311fbd576a387042c0d81945b701c7459a3) --- share/man/man9/style.lua.9 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index 0417efc83c45..991a6f96b01b 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -44,14 +44,13 @@ is silent on an issue. The copyright header should be a series of single-line comments. Use the single-line comment style for every line in a multi-line comment. .Pp -After any copyright header, there is a blank line, and the -.Li $\&FreeBSD$ -comment for non-C/C++ source files. +After any copyright header there is a blank line. .Pp The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal +-- License block config = require("config"); menu = require("menu"); From nobody Fri Mar 22 13:33:07 2024 X-Original-To: dev-commits-src-all@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 4V1NYw1khWz5DxB5; Fri, 22 Mar 2024 13:33: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 4V1NYv6ZX1z45QM; Fri, 22 Mar 2024 13:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114387; 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=ZUeVuKr/9y7kMEFWkUY8ksR684rSVUECSwCarYYzHlA=; b=w30rFQDO1EfxtqKgUfxltgVgOk+wErJ7JxlpqOuBmIoIjj+M97S57Gq3Bzt74hDEBw+i3Z /hiMKYT7yTnKyDrQKPf857T4GLKrNajks3IdhLIowKHNc1e0ZPmoRFJ1gmRioau0t0HUMf q/gRRVHAPLQmUZf/CPlXvamvSOU3D8JJTXE2ZxL+3/rxIqVQx2ChPXN8TYgDqXGBgpBXkx CXjSQa2y8zIKMC6ivBn+Le93Od6uV50cS2irUzXuskE6dDZpG6zfeeuuNexdJvyQXfBChb PrsGWagvfvF71+Aj0wtLG0fwYKOgkTnp9JymKVLd0+kNSm911USaGmvuonkq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114387; a=rsa-sha256; cv=none; b=gY2VSAwDtZdZwtQ13HN/LTBsQpGfFmtkaiWFWwzjzmzhWSWaIOpbWNh368TkVzruL8nex6 fDDyTVz57ka+miQw/OO1fB6cr6cjlniP+ri0Uaq9/6pVS6ry5PkdRPSG5fzi10RYicdVPH vk0ilc8+/BU0DKiTdCgm83G1EJz6+yTFUthKllbnjdDxNNj7E0hEHZVvII/+UzihxQss8y GwJ++Mh+BRZRWIrBxinnyjPpf0HxFpNx6rDwwISx7U0V/xhrbYL4uBOPOjxUE5VAxEGqt0 EM2Bh/4QEE5e/b9W6YUO5T3TnZ2B6DsZBqrxQdpkOBY2wcCQC40K/eKkSlb93g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114387; 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=ZUeVuKr/9y7kMEFWkUY8ksR684rSVUECSwCarYYzHlA=; b=OWkVX8xU8nrDR4eIXV+SkC9yjvaU2xbIWqUfiz+ogWZEYYkNjJeaI64JJBrKfiu6koh2wD /8OUKUn9SnDoiarF2DJhWyiepwqLyvvEzCgQonBUAsX9tYmWqpGBtulKczbeZ7JOFCprEv KHYGAU5uzuwm96cUiW8UlvzyqAXRWUl1bZ68FV2kmU0vYCAIm2KdIa0CVjHMSBW/i4wFB3 gOQpiHw0WwgWboQdJulKtOwfIyz2MTkQWtRn0F0GlDRQe1CkGJI1xni/lOMs3MPkQpnQAf ssHuGXxfUooKrFvgaS9X7kkQEVAq14pv8m09oQ0+aplMDYOo4+HmnIOI0r80hw== 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 4V1NYv69ckz1KWm; Fri, 22 Mar 2024 13:33: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 42MDX7KG002826; Fri, 22 Mar 2024 13:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDX7vB002823; Fri, 22 Mar 2024 13:33:07 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:07 GMT Message-Id: <202403221333.42MDX7vB002823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5f527dbe41b8 - stable/14 - cat: add CAP_SEEK capability List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f527dbe41b804d3fc6a789c5def25b25a44a3a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f527dbe41b804d3fc6a789c5def25b25a44a3a0 commit 5f527dbe41b804d3fc6a789c5def25b25a44a3a0 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:20:47 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 cat: add CAP_SEEK capability The copy_file_range might require that. Reviewed by: emaste, theraven, kib, markj Differential Revision: https://reviews.freebsd.org/D41967 (cherry picked from commit 64c6327738fc24bb34b9f40ff1c223ab460ef637) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 1468faf494a3..c69bbc4911cb 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -155,7 +155,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL), + cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:33:08 2024 X-Original-To: dev-commits-src-all@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 4V1NYx2mwSz5DxGy; Fri, 22 Mar 2024 13:33: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 4V1NYx0TYJz45d6; Fri, 22 Mar 2024 13:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114389; 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=uDKZzKBBq9VSbs3T7I8NeLvttrs/iHQ33CVQjTqA/6w=; b=rmW2EKWMPUKhVEOU9titRD2c6k7rfu1+lMi5iSG0Kbgi6isZNNVyDeWYk+wHDs1V3PkZWu v9fJyIvOz8HDsutgbRg6KWcBzfUU22LbKEtmQccFrINMXbGl/eVQfyBMkWsasGROHXtJYz Zd0y9F1QDJVICk10Scmf5ttSyL+imqbTaS3p9nfaZlp/4nMvzooje+Cc4p8ulUxCsHiv+b RsKh88ZG6ZxnygAUErfjvqgdR+DieuCRyYAcuJo9y7eEB7RcEYGe7HWu1Wow3KqtA48oTc JseqrhAuO1GjtQqdImGXdw/VqHrQTH3ABsB84vEstrC9+i4Yogxp16B9I5c2hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114389; a=rsa-sha256; cv=none; b=HQQt05pd0RjGLLfdBnZJapBpygBPB5+vkcUuFCRd2ZhefmCmIVW5Vyzd/o/V1CLzxoGTsW NTARZvVQ0wj/UE8IeotYpwGgnCaOv9O1O0hIIT7LeNIl5tMYXey1jN1wuh2wsWDhln2JDn TQCXRvllLGv+T5z4DuqmX077iCnl4I+/BPbcrFjM9FrRreHYA6TGpjozrWN9bLjFp/hENi CDH4sUXBVT9j7bSnuUBxjCQ0qNNycORnm8Sa/ykI8OinyxbQ4Bi45SRMp8aQ9A+pSZG+s3 FzUh2jIPyAJy4uIkRpaK10wkTvW7azvJVyfvibkivCrKfQB1oauvgpjN2+fiJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114389; 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=uDKZzKBBq9VSbs3T7I8NeLvttrs/iHQ33CVQjTqA/6w=; b=Dffnr7Mnob3tcM+Sc7nvUq4JXsXf0FzlZ8vvIDVnG+1O1/CckXMxEyLkpqIXnHJALN9GPc zhlA6U73Wn5anqmMHIoJQ6wFjzRqMRWsaZV3rI7zk9YK8Me6rQX/KQogU/kRMTFJIcb5kl nZ78rhKd5r81wI8zOQ1513T4UphnT9hFQoI3193vYBEIswdoD/z7lpCeQFrOlrf2Y07zvA 68GaVl45eDejuPM8bENz67riLlMaaPH9mJAT/CK3CrAEEKMbYxto2sLrQ08zfpG2tkjZ7t lQ4K6m3xKOEExeWeJOc3LMd8BbN3f7g4U9/O2fhXLD/E+n4hSvJe6R2B6zFPZA== 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 4V1NYx02gKz1Kxj; Fri, 22 Mar 2024 13:33: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 42MDX8aG002867; Fri, 22 Mar 2024 13:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDX8dr002864; Fri, 22 Mar 2024 13:33:08 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:08 GMT Message-Id: <202403221333.42MDX8dr002864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dbf34bbb1888 - stable/14 - cat: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbf34bbb188876551dcfec32fbbed2ba8ba24f12 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf34bbb188876551dcfec32fbbed2ba8ba24f12 commit dbf34bbb188876551dcfec32fbbed2ba8ba24f12 Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 cat: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Reported by: asomers, markj (cherry picked from commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c69bbc4911cb..81ec5feec240 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -155,7 +155,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:33:10 2024 X-Original-To: dev-commits-src-all@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 4V1NYy2NVJz5DxN4; Fri, 22 Mar 2024 13:33: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 4V1NYy1STsz45dH; Fri, 22 Mar 2024 13:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114390; 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=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=biFbzvEZsjrofy1d9UFG5kOVR/QF9/SAOrFw38vJZkXsyjW2rC0lVAdRTnDk0urjMm2osq 0kOzanXZdRCPgaWtFGgXnvg3gzWexLI7Qw4Uyj1CrcD7Tz0/M8TARDdGZRJEECBx1hCADy 2Uam2c/fGq7OtN/K21UL+uvDpYq7UWXDOos9fUc0hQnccWgYR9AimKF4QN4sXWqpWJMRKA pE59JGu+Rz9S843qT7+1gBtlTseRIaYyd3S0SZqh4W80Up+gos7vWAI7nEytVUxfdD/IK+ fXS1tXugdBFzoPlzUi/zpuxLTjAQ7fRCvc1wef4nxGbbGzOaPKqmHMrIViufRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114390; a=rsa-sha256; cv=none; b=i48b2AvAdkKLd2yzm7nr6dhailDHxDVG+r6Z+Zks27fcS0rLZlGzwcdp0HYv4d6lzjMk0e eKkfWbJclUTqfuQXMKB+auFXIVHs3X1LlAjZVmYkUy4TmSIuhzT3Qnlt0viEb0NoYC/FVh 0XZTQVixC+L3Ov8aRo/McEVmE73yitSkQ0valcnqsLgN9t1nkX6MlbLGQkpO5JCEUix2DI ebRoHRfQk1N1L6ljXTXQedleMfenaTpHSxDIEcY5eDxjfJdCu0ivD6x+VvTBcdTLXJwgLD q44dihsKiPvfVpirfSOwuUhQd/7/7TtzHxgDeSRPpHikRkzLnLNL/wYhh9asxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114390; 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=pqAR5CDPabWmDqXX8gxIj+N+i8Yc1nBa0Ef1X0YFZec=; b=AQqBy08tEwhTBrmQOcB6yhtBYfRoC8RyO5wMYJNsC0vbyW9K/wV0WaZvUU2H/bv+AMs8q2 ZKLITPM1wsDToIXey12bx7YN/9/UGnQNUzOuIGlHw9zlve7dHlm3Z7Ga5eRZPNZJkPGN3f xD+BWbFERIYgmh96t3LF3k4ZWpUg4gQ44UJpdQ1MpM0JFf5FCZyL83bJBPDPn3Qi6QiXm7 815ZBvkjQ9ZigS41dAz0cRpO0ZeJ10qPJ2o8b5J7FlUAxkSlkrF9ymRx4JPP9c2xeCf6ld gHHbHNnlDCN4tADpYqPPI+jPM2vG8UyZ62y2iNiOsZlfng9gWEAothqfWR7jGA== 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 4V1NYy12PGz1Kxk; Fri, 22 Mar 2024 13:33: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 42MDXAKN002916; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXACM002913; Fri, 22 Mar 2024 13:33:10 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:10 GMT Message-Id: <202403221333.42MDXACM002913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: be83aa2a01b3 - stable/14 - libcasper: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=be83aa2a01b35f9e7aa94a3d45a851305fa22c83 commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 libcasper: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5) --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 4df43f183735..dce499c8b7c3 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -292,7 +292,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -339,7 +339,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -386,7 +386,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -467,7 +467,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -517,7 +517,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -567,7 +567,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -673,7 +673,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -721,7 +721,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH); From nobody Fri Mar 22 13:33:11 2024 X-Original-To: dev-commits-src-all@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 4V1NYz35Wbz5DxPj; Fri, 22 Mar 2024 13:33: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 4V1NYz2FWlz45T9; Fri, 22 Mar 2024 13:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; 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=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=E6K6DASlZ3H+WQuk6UM3iJyYtjlxZNTVZyVCsfwT4GscTlXZv0ig9pvxMXRuPvHdiqQMIr cO+GAQOpLaWL66V/HCxLr5PzciTmATYzCKinN1FOF/EmlD1RyeTAZ0tUCoVK3jAhiUzZ2v N9nm+NYtJ+/QzB5OjPL3mRYzGIW4z5e5DQDfL/4cM9iHlgcSR014iApYETFMSDoe7n4bC8 8ufCEJPS9xUIw/xdGOmnnts+PE7BqJtu1lb/urdhmGCZn5oTMphUyWAUwl3OqU+y0rHI0V gH+TBN8LZd0/Wt/cnt0LOEydYZGFzLWXEYzl/hv1mxz94MvgBp/4ONZICBo/Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114391; a=rsa-sha256; cv=none; b=bV536/cZaRLWZwNVo6eAovZp+zzqRbrqF86nRMM8VxJLa7XA0jY2B9hymzUMb9bLetZ48v 1GJ0xCjJsi8GXjcYHDlldJLTPpc772qCh2Fvl5CKKNz7xgBVGEjoE7qaMQ7yDw21fjYRAB Ry7VTnVG5e23sxV8UzZy+TVAVxlOWpvqc0wlCjU6KbLogdDOX5lYmH142aDe2c5LORl3G+ k29Oc9A69CK8sX/ylg+/6zuYuYiKtM8UHI12U92XnykuyklMUjE6VsfvTaLZDvbJizszxg a2m8qXXCur0iSczNgoJYZAo9GsamOEC36aq7mGQLp8pczDUjfu3J6Kay052trQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114391; 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=xtoXUf5oeHGx3nPBaLKg7fImZze+6YMjJdgZV+UXJsA=; b=NX1Vr6SqUsqqu/PGbqxk3TH4DBHWy92WTFj0MMxuPfpKSM42hUtP4BZomfL7CK+7CAlCIa U0WOn+EpZ72R/fsPRDAM6cFg+Uip85wKDHvxfoqqdLp5pNQJ8mHeMQranpsmEE+GWn0LvE 3iAua8fGJEvRadCbSDj9sWky8qg4huMbxh+uh3Jpjk0+HZ6uiBjxsMpb+imVsTjE2zNo3I y6zbj521Fal6+WiYxVR5/nM3RQX3I0uCVX7TbLzqXxljUgINI71u6yHmnj2YqPJ6+LTCw1 EZgpWKSkX66akVQSrj07U0iNoFsQivsT80diuxQFOntotk6FPTuvrnWbI4P1Lw== 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 4V1NYz1sktz1L8f; Fri, 22 Mar 2024 13:33: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 42MDXBEh002965; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXBj1002962; Fri, 22 Mar 2024 13:33:11 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:11 GMT Message-Id: <202403221333.42MDXBj1002962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ea3910c452cf - stable/14 - path_test: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ea3910c452cf44342e0b65d6283aebeb77a10863 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea3910c452cf44342e0b65d6283aebeb77a10863 commit ea3910c452cf44342e0b65d6283aebeb77a10863 Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 path_test: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: e5e1d9c7b781 ("path_test: Add a test case for...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d) --- tests/sys/file/path_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); From nobody Fri Mar 22 13:33:12 2024 X-Original-To: dev-commits-src-all@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 4V1NZ059yzz5DxBB; Fri, 22 Mar 2024 13:33: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 4V1NZ03Dvsz45sZ; Fri, 22 Mar 2024 13:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114392; 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=92dCcWaynlHwyri/wWxPjKOjpYDHB+0bzIBnfMsUFCI=; b=COepw8+QHZndA/78Yd6cQQ3a0+cztUuPHD5f9MeHRIEcPWdlFaC9eDzxvYR9EzsKSWIRZe QlSpwFi8eIO/XJemDavjS8BtYE17zcO0qmw9RRNAvbe086lBoQlXqbD/+/8G8PQq2MdJOR KmXgJGrg7Jkh3RXiUhgUJ44eGwPDbsbAg1e2wuk4slXOoprk68UWzIDTH/ssjP+s2rP/ep THtjXfNUxXOtw0bvcQUIfweIGabmFD+mUhOA044kZcLp/nT5y+MQDrpdcgOL5F9bheIidc v9aJAX4qeFNUM9/liByr+C3xL1o3STCypFyLW3SXqHUTlx/VxRSA1ilcEljkSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114392; a=rsa-sha256; cv=none; b=BgauXaVhJuKLbDc3EGS2iXB/3B9hBYkN8utFIqqk8cr2449CRLjwKcXGW/M5m0ubZILy3g intSfOIsHhzrXncGe6JMbnXpUojsTG6K3+abfovoRrK79f2D3m/V3HJXOZ+sXq2ZqXPcjn ZzqIhXlQ0rKukt66HRg1NA9cN3rvmxoEclqC7jD4f8bjVNneL5V85KCmv0WHvxLJMquMyI wpw1rok+3f3MJ+4U7ryD7Ckf81aw0WDCcDs/Cq5k5zlGfZvd8BkaqpoBtCLFRRxKLZIkdX bWT3ErkevFC0fSshcY6lQV75SM32b02m5oTml21Iw2BB9tsDC6o8YuKMzMcd4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114392; 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=92dCcWaynlHwyri/wWxPjKOjpYDHB+0bzIBnfMsUFCI=; b=QenN2QYamU2y+H01x07R0q2gZcT4ToBTY5CzfQz5EoIiFp/Si41iB6fe1g93OUGiEizdmi PqCtvSEymQfkdLX+3sm+Ci1jhQ2DQ+JqA4Vq/YfWkVViIqjr44eSA5ULDTnS3zlB3N5lPP EN5G7ikgKXJUdNJ07BG8iCxl5OSzo1GRfB7XiRrBnCeTjrVeU0v+M8FiDJUKmIhnDvwmqy gq1GEc4xvHsMB6T7ED4SsvGUQsAhNrNjaNbk9/Vy7HC6XeOcQszgHzCiEsk8n9J+YjQuRE Txue+1SkTvWD+EaVhLP03TnUsxr7XyvNydsqlCIM7GKUajrgeR4S6deoXB+6wg== 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 4V1NZ02r8nz1LTQ; Fri, 22 Mar 2024 13:33: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 42MDXCam003025; Fri, 22 Mar 2024 13:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDXCXk003022; Fri, 22 Mar 2024 13:33:12 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:33:12 GMT Message-Id: <202403221333.42MDXCXk003022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2031b368f895 - stable/14 - rights.4: Remove sentence implying that rights are a mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2031b368f8956acbc2ef3b3715af9dc66670d120 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2031b368f8956acbc2ef3b3715af9dc66670d120 commit 2031b368f8956acbc2ef3b3715af9dc66670d120 Author: Ed Maste AuthorDate: 2024-02-15 14:55:39 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 rights.4: Remove sentence implying that rights are a mask Capability rights passed to cap_rights_* are (now) not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). Remove sentence that implied rights are masks. We already have the sentence "The complete list of capability rights is provided below" so listing the rights without an introductory sentence seems fine. PR: 277057 (cherry picked from commit 2c5ff9118c1ed8483a9477db3595b1d154615e2c) --- share/man/man4/rights.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index b9fb5e15cf4f..770f9ea5c979 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -68,7 +68,6 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS -The following rights may be specified in a rights mask: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Fri Mar 22 13:36:25 2024 X-Original-To: dev-commits-src-all@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 4V1Ndk0khzz5DxTB; Fri, 22 Mar 2024 13:36: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 4V1Ndk00zSz47Yn; Fri, 22 Mar 2024 13:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114586; 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=CW28/5LZfAs2PTshGjymICj+aNhDCMU1MXKCOQdaEfU=; b=NtDgJTMt/XJH3+KAWx5d+eXnKWg9hxRJXcXG3Lj8/U+IsiR46760DIaHIQGtDIUSli6+UC No3VxkkrSUhE+vYXru0SnBKzekSki1SDH/p4SkO0xPkKUalG7fuu4hhRTQT/4lcGgCGH99 n1AQuchqp9+3QtAT/9Ii4mknBs3xZWGqBq8F+Vej5zldL5W1iXDaNIBTxMS10ROw2o3YgK ZtfDseGbqLjkarxYybzlNOS9VpYUvZ0WgeMYs8/s9w0hWM9ynsi0n0HkAocQdFdh30R1jG Zchrn9Ccva/f4L7dwvtquKZwoUo0s2xX2Ivb9pHUVAAlPYkGzHx/xTe4uB5MiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114586; a=rsa-sha256; cv=none; b=H0pIIhf6i2PFKcO1SjHvSm5x26J7MVMh2IfGAu770sT3V3J/PDha1fxH29a24RIqgFWkFl SWZWIBzkF2FymbfYFirJIGJDHYKSUKmTfcbXPHDbw9yxpxEOhwQ7RUbrfikaYHTBHgL+u5 M3A0YFen7ED0VUrP1wBs0cMQ+5LNafLDW1yMmXUX76IJNfhZRrv4cnl8OSGankoVYvG9S7 H7J9j83BqFsbfxhTVnFd7Py56QX/Gy9xsZdQpUzUj85JCJFRMH+hEVehyL59YigOhavFlr 7VZRjMNV0QFI1m4LdzpeNGa4rk/Gq8W0jksrXMQVklnG7wFPMBZjNcO+8VPi6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114586; 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=CW28/5LZfAs2PTshGjymICj+aNhDCMU1MXKCOQdaEfU=; b=SkZPa3bzlKkjN4XptlxPEY6dNFFgyAyWAifnt2rw5bMM6/9gR4RMIzdjRYCqBM6OjTrbxo gvERYsQWYWW9nG8YrLQ0fjjjCAKrOYgum7okTae7BhmiFS+O8wRJweGMPiEGsJfdiuYvDT RZUvQmlsQxGsGHfbt/ebYrmWnpsyCtGOAo1Inbnubjm2PhAccfmY5/PfHNIJazGM+laWVj B06NEKvQFhDTvWQcU6ko0zpnpTcnmDeik+1d1y+/SNjORNLy2oF6ekWaZ5yCC9//VSjLHs e9Gz1OCtZa0QXlMuYq4nRbguaafEFV0RUpwtChkhc7tRe8NmnR0DAqOsMKPCZg== 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 4V1Ndj6k0bz1L8p; Fri, 22 Mar 2024 13:36: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 42MDaPbP003754; Fri, 22 Mar 2024 13:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaP8d003751; Fri, 22 Mar 2024 13:36:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:25 GMT Message-Id: <202403221336.42MDaP8d003751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1abd98ecf9e3 - stable/13 - cat: add CAP_SEEK capability List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1abd98ecf9e31b96ee72cca1431e53361233cc96 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1abd98ecf9e31b96ee72cca1431e53361233cc96 commit 1abd98ecf9e31b96ee72cca1431e53361233cc96 Author: Mariusz Zaborski AuthorDate: 2023-09-28 13:20:47 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:43 +0000 cat: add CAP_SEEK capability The copy_file_range might require that. Reviewed by: emaste, theraven, kib, markj Differential Revision: https://reviews.freebsd.org/D41967 (cherry picked from commit 64c6327738fc24bb34b9f40ff1c223ab460ef637) (cherry picked from commit 5f527dbe41b804d3fc6a789c5def25b25a44a3a0) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index c13d3ef221f8..0f36bce2098d 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -154,7 +154,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL), + cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:36:26 2024 X-Original-To: dev-commits-src-all@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 4V1Ndl1bW3z5DxBk; Fri, 22 Mar 2024 13:36: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 4V1Ndl0yB2z47Yp; Fri, 22 Mar 2024 13:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114587; 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=CawcsNQZom70g8ENH6yROjfuxAMIpfEoHC36stWtSk0=; b=p8TVbqmRgyzkhNk029KpmVt9lqRtEhOq7UrFBO82Jqj7a2ZTnVUlF7jLKl7r/N6st2bb5s ZqeEtNDlYyE/wRpIBbIMkB8H3UDCR9X3advDHjA2woR55LoI88e8NodoG/59GG4EP9ooTk bxVe689wjeYNk9EUPxbSCMTDmmiwIXFm5ZCsH/uXjANt9i+rosmQRHB4AeSEcjlQbGJx1w CDPW/dyAKtb1ctZxqfuVQ0cSDPNsLjjSbt/N0bK1eC+qqXf2OfbUNNuscbAuXQ9U6kiB1m Fko5Kts4JSKqs+OceGT0B/yGZo6KO0XGvOZbCWl+eME83Ug/he9DaiNPfCwY1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114587; a=rsa-sha256; cv=none; b=v21LuZV7U4FVxs1vmNsoNolFIRAV+E9G6u5md5JyhUs1fCLorYzGveRQOaXAto9HPhiTGu bpWXjTx0SCJuDwdxDgkNN90oaADX8QVKoKPVKbWD2UWQucaZUAEZyT9+1Xnqux7hXu3Ckl VVbJTKDwuTCB2kgU9PihvEy37pJZqcWAyAD7SGGjsDYKWW1fbcyW/OsN2c98VZmNYWvcnl xwxDTtSDYG8AGqxbKZ+qFnvS+fC076vn5isNLc4tLZNEpGhyvx2RKrGNrvWCeyzAn2upUS reCFOMisif1pCVeSd6MabnRE3+IkaU1BbFSiHm9/65zphqeHk87tO6EOqjH/7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114587; 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=CawcsNQZom70g8ENH6yROjfuxAMIpfEoHC36stWtSk0=; b=VBDvSinSrXzITrvRwNL8Z+Q4Tzk3xKnps2MoE/E/E0MHaAagPlnPPj2q784jZ3r4LSFewb JjrF6BnPW0zc2dOpkhAFeYiZuzrdK9ZUR4NAmDU/5e4oXGgO8+Mz9BRo9cTCYuTw1Pf9ks 2Z8bJzO7KmvWLfc4aPjfjYq7E4jTs1FNZF0NE+U4ZloSnXV+orTLFTxX2dx/1bzhBmTzHU gxlAe9xaHOLDz7am0CUlg+twkSWxD8U/pMxchF1DFsbLw3basciRSWvb2B50RMn2DSiDpa ps9Nn40npLFkVhjCNsw6nApRtTxnhrIGerOypzsxRu6wplxF881e08V1MHchxQ== 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 4V1Ndl0Y8Tz1L8q; Fri, 22 Mar 2024 13:36: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 42MDaQtl003793; Fri, 22 Mar 2024 13:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaQbr003790; Fri, 22 Mar 2024 13:36:26 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:26 GMT Message-Id: <202403221336.42MDaQbr003790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8a17cc127bb0 - stable/13 - cat: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a17cc127bb0a404d8f641926ad4a3cc42c482da Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8a17cc127bb0a404d8f641926ad4a3cc42c482da commit 8a17cc127bb0a404d8f641926ad4a3cc42c482da Author: Ed Maste AuthorDate: 2024-02-15 00:03:40 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 cat: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Reported by: asomers, markj (cherry picked from commit 05f530f4d2bb15fda3d258b3bd92d4515d9ef39f) (cherry picked from commit dbf34bbb188876551dcfec32fbbed2ba8ba24f12) --- bin/cat/cat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cat/cat.c b/bin/cat/cat.c index 0f36bce2098d..dc6e6417dc49 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -154,7 +154,7 @@ init_casper(int argc, char *argv[]) err(EXIT_FAILURE, "unable to create Casper"); fa = fileargs_cinit(casper, argc, argv, O_RDONLY, 0, - cap_rights_init(&rights, CAP_READ | CAP_FSTAT | CAP_FCNTL | CAP_SEEK), + cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_FCNTL, CAP_SEEK), FA_OPEN | FA_REALPATH); if (fa == NULL) err(EXIT_FAILURE, "unable to create fileargs"); From nobody Fri Mar 22 13:36:28 2024 X-Original-To: dev-commits-src-all@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 4V1Ndm5j2dz5DxHS; Fri, 22 Mar 2024 13:36: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 4V1Ndm1yThz47RR; Fri, 22 Mar 2024 13:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114588; 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=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=TByvZlULaJDB3uRs2bMP/kp9MAzGDR4p+gKitV7UqaSMjWQWZhWFDQXy+RUE4wZtd3mlws kXkdWODi9Mxu31ZW/4opf66lsBU7tnYNAxQUdO6HkCX2jXxBQ/EXbsXn4sZFovWyJiLTVv Qk1XLu2Vaj2vnry2fDI6R47C0WnNTgZoU8kxF/BgdIKRSqQlci3C6LJel2K6vCDpxIXDch Nf1vgSiTLjjCOp5sV6bd9mJR9wslXaKDnt2Hy5N15IAKLPoxu8khXbpVi/xlbbJlPHSijO J64EP169uxfaOfHda6Pf23TX7F3fRsXUgwO8BUd1JHIPB4bCEjchovwWee825g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114588; a=rsa-sha256; cv=none; b=jKGRYAtkowvfXGO2u0gvq4srMq0jgkRjUftk1LLCtkUkP7kriHbJ9cp8cGArNtxrlA5+GL OiWKYMqy8dSydg0txejju3bgK0rGOLDIvfr0KbYdydu8vAav8WgomiUgO7P4B6whcoX40R E9uD+SbKQjVM28dzba4q9vCBdSfo8P1nplY8ozAOGXBRpSoGSsq98OZm9k43AhmCUK1Rfo xkPmT7fn6sM3I7vKfO3+ch6QHMvaDvwUuYn7zkrQK06kxm3ZYtKuDRmSdpr5RVFBUCcF9m COzy7b9P8hHuJiDMUau1PSnevnIvNNyYzp5yDtYJ27fhTE6FlfonbBtLPRE9Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114588; 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=Y6Se6q2MzNNoG2kHBbdlSSf4D6ejUvQ8akMRY35I+Z0=; b=Aw22HP53talFFm804AdAPuuNJca/lXeAwgnZyKBj/HJIFeBCYT+dH1n4qgu10pqMbVAiX5 G1oo1IRPBD5gjNu8UUVEBvD3GKRwAGvpmkzoPBPj/Ae5hGiVAu5FOFC/5gvqJgfwxau3w7 8tVyF2I3MRO58iEy54Z8KEsnsGVnY38JNvrl+rxFmqXGM8WhPfjRXq3dH0E8Fae+EzTT4u YCd4GglyuRIq6pSbbaQ6+XeKiy0KbxQPBnv+ZgDf111klab38VyrxCLkGr5QQGSytBaR4E PjaR6wrF4wfPUNSX7uWBQFJOFDiXh4tmNukibakZDP807B+OpUu1iaJc443CLw== 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 4V1Ndm1XZKz1LTZ; Fri, 22 Mar 2024 13:36: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 42MDaSQE003841; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaSKV003839; Fri, 22 Mar 2024 13:36:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:28 GMT Message-Id: <202403221336.42MDaSKV003839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: ec44cc4e2882 - stable/13 - libcasper: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec44cc4e28824b83b2b53b4afd39663345823613 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ec44cc4e28824b83b2b53b4afd39663345823613 commit ec44cc4e28824b83b2b53b4afd39663345823613 Author: Ed Maste AuthorDate: 2024-02-15 00:42:48 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 libcasper: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: faaf43b2a750 ("fileargs: add tests") Sponsored by: The FreeBSD Foundation (cherry picked from commit 3733d82c4deb49035a39e18744085d1e3e9b8dc5) (cherry picked from commit be83aa2a01b35f9e7aa94a3d45a851305fa22c83) --- .../services/cap_fileargs/tests/fileargs_test.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c index 0b4857f6ed07..a9f2dd90e1af 100644 --- a/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c +++ b/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c @@ -281,7 +281,7 @@ ATF_TC_BODY(fileargs__open_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -326,7 +326,7 @@ ATF_TC_BODY(fileargs__open_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -371,7 +371,7 @@ ATF_TC_BODY(fileargs__open_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL, CAP_READ); cap_rights_init(&norights, CAP_FCHMOD); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 666, &rights, FA_OPEN); @@ -448,7 +448,7 @@ ATF_TC_BODY(fileargs__fopen_read, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN); @@ -496,7 +496,7 @@ ATF_TC_BODY(fileargs__fopen_write, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_WRITE, CAP_FCNTL); cap_rights_init(&norights, CAP_READ); fa = fileargs_init(MAX_FILES, files, O_WRONLY, 0, &rights, FA_OPEN); @@ -544,7 +544,7 @@ ATF_TC_BODY(fileargs__fopen_create, tc) prepare_files(MAX_FILES, false); - cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FCNTL); fa = fileargs_init(MAX_FILES, files, O_RDWR | O_CREAT, 0, &rights, FA_OPEN); ATF_REQUIRE(fa != NULL); @@ -646,7 +646,7 @@ ATF_TC_BODY(fileargs__open_lstat, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_LSTAT); @@ -692,7 +692,7 @@ ATF_TC_BODY(fileargs__open_realpath, tc) prepare_files(MAX_FILES, true); - cap_rights_init(&rights, CAP_READ | CAP_FCNTL); + cap_rights_init(&rights, CAP_READ, CAP_FCNTL); cap_rights_init(&norights, CAP_WRITE); fa = fileargs_init(MAX_FILES, files, O_RDONLY, 0, &rights, FA_OPEN | FA_REALPATH); From nobody Fri Mar 22 13:36:29 2024 X-Original-To: dev-commits-src-all@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 4V1Ndn54QSz5DxQL; Fri, 22 Mar 2024 13:36:29 +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 4V1Ndn2s9hz47cC; Fri, 22 Mar 2024 13:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114589; 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=24RU8GtDxRxKOPaQ1RKtzTNHuOTLaDk3puwHVYvGeL0=; b=nvVHgOvkp2ILlv7UezVxfouMn4LUWk6whT2bvmnnRy4EJmZx8OEq5F55TF6NrhD/pAXl2+ Vg/IYD8LIpYPgA1DPe50p+l9RxQupX8s/Q7nQyqpf/itEdqLV3rx3XzoWQJluhCBnnAPO1 XxStnQtB0x6hcaEJVFQ2aPg1BtK222TXcz7FNDnuH8346Q3jNLvrumYvl1k+wMhkKW3HhE 5lhMVqUAuODg1ximdhj/vDnd7WrRSbyqKWr9EpqV5BWh6665ZeRtIE1kAQ9qaTaXnYZ0fA NbE0NgsGzxsmUQCv7FJpXV/OklLhLxbj9KUNHPkBiHsNNbtBMsnzvSaupQGXmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114589; a=rsa-sha256; cv=none; b=RTUVbrab3/CMl/4yqe+WsN3SIso9febBJ7tv2GzUmdmRLaRoKGlbznqLetNO4ZOU9MMHPn xRUBK3pJ4LFERGdtPoZmO9QkMyfzL9LkoNKDxTji0ruPhLCjWUvA2gDM2M20NxyHeq++Bd N9o62s7ozIqrSqTSMQBRVXSdvu2YlmCSBb8c6gQdlsbtBzc1w1ZgL6FwREUkyeq0au/CEX vgv4ER13BWsgRDxNEZQ2BPE1yaSCoZpXc53TbIuuVdKLUOckEYqA42U8ofz/3gFRVJ1jLh cCwBXZlo3L8ehb2QawdpuUYE5AF11VU09eRmq0bTInQeZ4Sr/72X1FUnyaNIWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114589; 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=24RU8GtDxRxKOPaQ1RKtzTNHuOTLaDk3puwHVYvGeL0=; b=e51wlepLlK3eg7bZNKEfW8miE9u0lUCRKUc/cspK5Gb8X6jQriCKKUACWY2tOPnOgrNcmC sS13v62esI+shglY6aYwYEvLWw56/P/oXCzstjaG1yHpEJnmuxpmZvLD+04JPsRRbDzdLW M0Z2RJ2/cRsaTeJ0TyCABDluZKwKjPqHaElc5oq5c/LDIR7+DduZDY5jh0Ocma5PY/YOFD 6qqtkvgWJRdfA/9eCiPqEh/20fNdE6ps4KowN1NS3nna538jYjoFZJStELOyg6TfGXF8rI E1lFCAkyf4i4VguWTwr1NLr8Y2NqX4l1qHeEen6E6LPpUkly+rLnZ4Ob/qKDpw== 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 4V1Ndn2MJHz1LTb; Fri, 22 Mar 2024 13:36:29 +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 42MDaTiT003880; Fri, 22 Mar 2024 13:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaTt8003877; Fri, 22 Mar 2024 13:36:29 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:29 GMT Message-Id: <202403221336.42MDaTt8003877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e8d01b2efaa3 - stable/13 - path_test: fix cap_rights_init usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8d01b2efaa358b5ff8991b7defefbf970f871ff Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d01b2efaa358b5ff8991b7defefbf970f871ff commit e8d01b2efaa358b5ff8991b7defefbf970f871ff Author: Ed Maste AuthorDate: 2024-02-15 00:45:42 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 path_test: fix cap_rights_init usage Capability rights passed to cap_rights_* are not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). PR: 277057 Fixes: e5e1d9c7b781 ("path_test: Add a test case for...") Sponsored by: The FreeBSD Foundation (cherry picked from commit 8d1348f55aed6873f34f54bc3b275b73ef0ff66d) (cherry picked from commit ea3910c452cf44342e0b65d6283aebeb77a10863) --- tests/sys/file/path_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/sys/file/path_test.c b/tests/sys/file/path_test.c index bd98d7a6955a..911c7c7075f0 100644 --- a/tests/sys/file/path_test.c +++ b/tests/sys/file/path_test.c @@ -235,7 +235,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_READ and CAP_LOOKUP should be sufficient to open a directory. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP); ATF_REQUIRE(cap_rights_limit(pathdfd, &rights) == 0); dfd = openat(pathdfd, "", O_DIRECTORY | O_EMPTY_PATH); ATF_REQUIRE(dfd >= 0); @@ -256,7 +256,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) ATF_REQUIRE(fd >= 0); CHECKED_CLOSE(fd); - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH | O_APPEND); ATF_REQUIRE(fd >= 0); @@ -265,7 +265,7 @@ ATF_TC_BODY(path_capsicum_empty, tc) /* * CAP_SEEK is needed to open a file for writing without O_APPEND. */ - cap_rights_init(&rights, CAP_READ | CAP_LOOKUP | CAP_WRITE); + cap_rights_init(&rights, CAP_READ, CAP_LOOKUP, CAP_WRITE); ATF_REQUIRE(cap_rights_limit(pathfd, &rights) == 0); fd = openat(pathfd, "", O_RDWR | O_EMPTY_PATH); ATF_REQUIRE_ERRNO(ENOTCAPABLE, fd == -1); From nobody Fri Mar 22 13:36:30 2024 X-Original-To: dev-commits-src-all@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 4V1Ndp5Ztsz5DxFR; Fri, 22 Mar 2024 13:36: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 4V1Ndp3mvmz47l8; Fri, 22 Mar 2024 13:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114590; 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=Sq19/hBo+LeDiK8IKed72l9ZOMNiSpkr3WCzg77fUiE=; b=T1gQxAB13J4yM7IAW20z/gU0xw7MD4B/PQrtTH0tSPz+Ucj5GppQfOZp3sl62oQ814g9So WGfhsRnr7i5g195NAq1lhNsHv03ioS670UNcRYpVJqd+f0Q+5EWHsKUMJ7OX4RWKJ088cn jZ0Urlp+zqX8pT4JGdJNtsJKC1Sqzu2YZhhU9Machs9Egq2VneIdnpaT65aCcDTrpFEKtV ECaYbRPbPiMDgGGVE2MtH7gK0uqevIuz+SejKujTMU866v93L+eTi7Lqrw0E2nrBscpf2v iQTYNMcw+u02IjezWD3K/CxdIaqxwLMYepZYH+A5Vnk9rhNiIxpeizkbJ1p0NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114590; a=rsa-sha256; cv=none; b=vQUq71+bv3WyRpPcjEIiq7MOPzUaQ0F5OYWYrPEbv1yiZeNOWACx8eMrLZZkmLHok1kY3Q OfSISWOLRh589k38KT4Fdam67dX/EDMNpAuOLY95FgBeRJPNV/CHYAuodH3BfOT9iqD3x7 xRBoiPvHBdnMjVNJwk8fTvaKLHws/B5MoNcOh6pkoSeNvz8jKPGvPavlf3jK9kNPp7Ua+r M9LgqCFa89t2DjSODKW4dRYkBAq2U1bBFvHCjaFP8UY9kcfVDOJilHPTyA9nTz/hAsJ4Ix Wg8RQl0rHcyP7d42BRWGBgVmyXqzmDICawlWfo7HhZd7hVYjke5zrn2BQx+X2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114590; 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=Sq19/hBo+LeDiK8IKed72l9ZOMNiSpkr3WCzg77fUiE=; b=OcvuhAT0zX06l3gu5jFmlfqKkQ53W7m0dLY5F2ciaBY0PsDg2JDgKUEqUqoEVDhjybD7op AzeNyy2a3wpwBOcog9LjR+GKxK14mAiGujl79nwBixk0G5DEXZDJxk0CKMQ+tuvuR3q8tm /sz9XUOX2lLAly6rlJORApMQcPzJl3rO+ZpoDPxQC5Lc1i79VyiHem7rO6a77iQrRJnRSL C9ZoIvdfqAfclx5ZwxYFbrYvBIsCUjKkZ8s7MMTdfnalGmq8MaXakQm0WlRdHlIkWj//PX DH7m64alqmQAaiSFz61w8AVQ70NKlcQhyDvMdliS0zEqGSlNdasLFRQkcDueCQ== 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 4V1Ndp3MS2z1LF3; Fri, 22 Mar 2024 13:36: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 42MDaUqJ003934; Fri, 22 Mar 2024 13:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDaUUx003931; Fri, 22 Mar 2024 13:36:30 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:36:30 GMT Message-Id: <202403221336.42MDaUUx003931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a2ef45a0656f - stable/13 - rights.4: Remove sentence implying that rights are a mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a2ef45a0656f9f3c4364a3779c042991918c42c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a2ef45a0656f9f3c4364a3779c042991918c42c5 commit a2ef45a0656f9f3c4364a3779c042991918c42c5 Author: Ed Maste AuthorDate: 2024-02-15 14:55:39 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:35:44 +0000 rights.4: Remove sentence implying that rights are a mask Capability rights passed to cap_rights_* are (now) not simple bitmaks and cannot be ORed together in general (although it will work for certain subsets of rights). Remove sentence that implied rights are masks. We already have the sentence "The complete list of capability rights is provided below" so listing the rights without an introductory sentence seems fine. PR: 277057 (cherry picked from commit 2c5ff9118c1ed8483a9477db3595b1d154615e2c) (cherry picked from commit 2031b368f8956acbc2ef3b3715af9dc66670d120) --- share/man/man4/rights.4 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index b9fb5e15cf4f..770f9ea5c979 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -68,7 +68,6 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS -The following rights may be specified in a rights mask: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Fri Mar 22 13:38:05 2024 X-Original-To: dev-commits-src-all@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 4V1Ngf08KJz5Dxpy; Fri, 22 Mar 2024 13:38: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 4V1Ngd6lQYz49mx; Fri, 22 Mar 2024 13:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114685; 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=TS4QxIMLA4GPNWDho77qKgHtc6Z45afNo7m1/bTFOKA=; b=qQqNxNXS5Zva9OLQCVwka/x2MnJhn240N7+C88vPnCxKdZxFKf4uTsmcSpgU7mJrV+5Mar No4hlOUNcLbeErnuk9+CEPcvgj37VapnQ/I+/+JTSOX4XFlb3OLCQPaaswmKunXzCDEms9 98fdayBjAS1243EBQ+Ejy4+d+MuqRAEL5S/gCccMm9PTnOw4s9wfhczIwLXWgAvOFYcbuj AA2E1Nt0h6bu2IUDDtaTlvcV7U3wLLXvcuyyR3xTPrY7uY7MfJ/MNjHKMRg7KoypXKx84k 5t3zcpPzIRKSGUXXPnXki5K1SqZrFZHHACQwEC2PYVEeHBFCSSr8f/rz1VNieA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711114685; a=rsa-sha256; cv=none; b=drjRKxWRMvlLrvkPTmKWFCGWx1hzos3WBN9uoEnW0quVDQfqZsKrMoTW821oAvwAID1om8 sabfM20QzjYkhoQMPgxv4XRBlmrcekD56cOzVEotgjkovVxkwOw1dHh2iIk/5JcOyB728T NmiSiwaMtfOpL7jQnzh/PhK7TORZNLuKJLhiSNSKot4DAk6S2RS7rIap54Li7sGcMZkXtx QdrmaGgWeA/hfAFMP43/sfBEpT3HGaUIvSq6aib1aYbKipNNSIsFIu+mPT9N4VHG5ukicw +3Rz2+at8KhnpdySq8JnlATQ81IRqx6QhDbaSF3olVo2NIwjU5DqVuGAZr/1wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711114685; 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=TS4QxIMLA4GPNWDho77qKgHtc6Z45afNo7m1/bTFOKA=; b=AbEObN49dbDupRDYb+A63tJjYDZe5Tli46FugFpED4LgL+UOJvrShzAVzyIP+guh7Qi6+p OnxPvcZNddFMS8QGV6+bTk7PaEUYdL6k4/s16aywwJ5z34n///wKWxAtLRF+kNH8Z+7phc Do4DttOpcgwC2Dpy853gZbwtSQfBWJfcbVNQwowtXDoX8OB4n4GK151IkCjNMPdkEEfqjs V/vsEp3wEMHc/9z+Z0Ufh588NFNUO9RgT06HIQuj7GN9NFooDyv184w61uqPUrKn9rdJMr hitAlvEMewLcSFtOAXajlIH6drWkWPikkdAZ6GpQpDqtZ3wFvpD2HrqKOVs0eA== 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 4V1Ngd6Kqrz1L8x; Fri, 22 Mar 2024 13:38: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 42MDc5pe004336; Fri, 22 Mar 2024 13:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDc5qA004333; Fri, 22 Mar 2024 13:38:05 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:38:05 GMT Message-Id: <202403221338.42MDc5qA004333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 35457886cd3a - stable/14 - release: remove binutils package data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 35457886cd3a0431ba2333189a003016c3ad5e67 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=35457886cd3a0431ba2333189a003016c3ad5e67 commit 35457886cd3a0431ba2333189a003016c3ad5e67 Author: Ed Maste AuthorDate: 2024-03-17 12:09:31 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:32 +0000 release: remove binutils package data GDB was the final GNU binutils component included in the base system, but was removed in 2020. Nothing provides a pkgbase binutils package any longer. Fixes: 1c0ea326aa6d ("Retire obsolete GDB 6.1.1") Sponsored by: The FreeBSD Foundation (cherry picked from commit 1e4cd5ed54d73dcb8e9af92990e7bf005b9a5710) --- release/packages/binutils.ucl | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/release/packages/binutils.ucl b/release/packages/binutils.ucl deleted file mode 100644 index ff2710862e03..000000000000 --- a/release/packages/binutils.ucl +++ /dev/null @@ -1,17 +0,0 @@ -# -# - -name = "%PKG_NAME_PREFIX%-%PKGNAME%" -origin = "base" -version = "%VERSION%" -comment = "%COMMENT%" -categories = [ base ] -maintainer = "%PKG_MAINTAINER%" -www = "%PKG_WWW%" -prefix = "/" -licenselogic = "single" -licenses = [ GPLv2 ] -desc = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 95a7c6f18a6a - stable/14 - LinuxKPI: Queue skbuffs at tail in __skb_queue_tail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95a7c6f18a6a28cf866384ff60b587ec30be1cd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95a7c6f18a6a28cf866384ff60b587ec30be1cd1 commit 95a7c6f18a6a28cf866384ff60b587ec30be1cd1 Author: Tom Coldrick AuthorDate: 2024-03-02 19:22:55 +0000 Commit: Ed Maste CommitDate: 2024-03-22 13:30:33 +0000 LinuxKPI: Queue skbuffs at tail in __skb_queue_tail Correct skb_queue_tail to queue the buffer at the tail of the skbuff. The skbuff is a circular doubly-linked list, and we call with a pointer to the head of the list. Thus queueing before the head gives us a queueing at the tail. As a motivating factor, the current behaviour (queueing at the head) was causing frequent kernel panics from my RTL8822BE wireless card, which uses the rtw88 driver. Interrupts can cause buffers to be added to the rtwdev c2h_queue while the queue is being drained in rtw_c2h_work. Queueing at the head would leave the nascent entry in the linked list pointing to the old, now freed, memory for the buffer being processed. When rtw_c2h_work is next called, we try reading this and so panic. Reviewed by: emaste, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44192 (cherry picked from commit d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index f8ce212e7853..02190a29e241 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -567,7 +567,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { SKB_TRACE2(q, new); - __skb_queue_after(q, (struct sk_buff *)q, new); + __skb_queue_before(q, (struct sk_buff *)q, new); } static inline void From nobody Fri Mar 22 13:55:25 2024 X-Original-To: dev-commits-src-all@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 4V1P3d5c6vz5F0M6; Fri, 22 Mar 2024 13:55: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 4V1P3d54wvz4Dsp; Fri, 22 Mar 2024 13:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711115725; 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=Ym//LYTrehtPW+6jlCutnXN5JAs4uz+tZOQcaWP9eT4=; b=ZC1nslHnmZpAu4kLtL0m/uoKPhfjPrcGUIiWXX7KvSrrvW/SNblt/BHa0lR0EV082QnFsD 4M3dOKsDCmV6U7VzBME+IJliGSR/Nr5s6HBKtmWxXFF1qrFIIbl5OIHu5iCeyGz9mPLnDE j9gaj7aePuMQcronImnYiTsiPr2E2wFrjJQA7pSpkSe03+TB8415aNQ8g9LkAr+ZFSOlgQ Z6rZ8H4SJU2YAqZAi8LA5tO35Hwa4+G0S863C599Lai65A68uMKiL/YFbv+xi8lDriRlh1 WqUWWZS9E51UMkmufNIsjr0mahGKDQ32VlSLlfBs/GMYLABRg537nCnqEPilDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711115725; a=rsa-sha256; cv=none; b=yHR1NLup0WI9wZjHBWm1cFyI8Sxm5wJB183mv3QKt2P1nuw6vo2ili0EMFHEAwceOsqtsY QeEB5bTmucw/i8H+U+k+KHFELmojBbWuAYgvXQgk4pfv5INN/zRy1ZiqsKg/vda+6zb8FU YjMqQMcoX0LHL1jYCXj+QRDb4Dfdxuur18tYeeHt63C+h2Ndi+/4tbW8DTaIKantVOKahU QAbnOShGp93gmZy88pCkeHveD9raB/UhDd6t+jE+0p7++ft6UmDUWilmmpDzTZM6LM5Bn/ X0IQkAwrW5Wf6ZIwijbyicSGA64NrlTClOnYdd50MHvV1F6U4oeiFJY4M4/VGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711115725; 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=Ym//LYTrehtPW+6jlCutnXN5JAs4uz+tZOQcaWP9eT4=; b=eRdVfK93GL3/v6UmLpWP6071gkfDhlNOjsF6MkT+PjCZIVt8GUN10c7T8KTLT/G2HaaHef i1egIU1FxQzQd/G8PFJzLVuu+wXlRqEE9wA4JHSVAiQIRWwvCEaoL7+R0E05PqOrPr4qCB Se+rvbYvkXIQ4/w9H3YmqO7BMhW90ZaOxHXBxmsDrTqILcNdaktEyOY1KCiPfV+uOSBjvD dgny5GJPnzlHBeH45EteDFo4A0RupSIroTmYOYf3cNzLsHJwv+H/pV5l7B2jBxcmBZRaK7 oNYmyC/0YgQhpNJzHFe8heO2uXQdEFNS0rmYc7sc62EJvWxkFxdkzgAkmX8iCg== 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 4V1P3d4gQJz1LwT; Fri, 22 Mar 2024 13:55: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 42MDtPx1037737; Fri, 22 Mar 2024 13:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MDtPF3037735; Fri, 22 Mar 2024 13:55:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 13:55:25 GMT Message-Id: <202403221355.42MDtPF3037735@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: da2d6e2815d7 - main - rtld: fix check for endianess of elf hints file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: da2d6e2815d7694e3ccbd561508074c547b02dd6 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=da2d6e2815d7694e3ccbd561508074c547b02dd6 commit da2d6e2815d7694e3ccbd561508074c547b02dd6 Author: Michael Tuexen AuthorDate: 2024-03-22 13:50:25 +0000 Commit: Michael Tuexen CommitDate: 2024-03-22 13:50:25 +0000 rtld: fix check for endianess of elf hints file Don't check if the elf hints file is in host byte order, but check if it is in little endian by looking at the magic number. This fixes rtld on big endian platforms. Reviewed by: se, kib (prior version of the patch) Fixes: 7b77d37a561b ("rtld-elf: support either byte-order of hints") MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44472 --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index fbf5b3e20a1f..3071eacbc995 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2081,7 +2081,7 @@ gethints(bool nostdlib) uint32_t strtab; /* Offset of string table in file */ uint32_t dirlist; /* Offset of directory list in string table */ uint32_t dirlistlen; /* strlen(dirlist) */ - bool is_le; + bool is_le; /* Does the hints file use little endian */ bool skip; /* First call, read the hints file */ @@ -2108,7 +2108,7 @@ cleanup1: hdr.dirlistlen = 0; return (NULL); } - is_le = /*le32toh(1) == 1 || */ hdr.magic == ELFHINTS_MAGIC; + is_le = /*htole32(1) == 1 || */ hdr.magic == htole32(ELFHINTS_MAGIC); dbg("host byte-order: %s-endian", le32toh(1) == 1 ? "little" : "big"); dbg("hints file byte-order: %s-endian", is_le ? "little" : "big"); dbg("verify swap macros: le32toh(0x12345678) == %#010x, " From nobody Fri Mar 22 14:00:28 2024 X-Original-To: dev-commits-src-all@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 4V1P9T1DsNz5F10N; Fri, 22 Mar 2024 14:00:29 +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 4V1P9T0RTPz4FTb; Fri, 22 Mar 2024 14:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116029; 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=FjwFzXZxPP/0Znsis/EG3zCWsrFN6xp5Eh9qfzgKv6g=; b=dA2Oo9BJ3YpPCGtd6GsrEg8uILhdt4ArKFrq5FLRHuaqjtE/HmvljKcblWPDYfF6rEf110 KuLWV2cSfaMS9ZmEuqIw/B6iuE8geCNoISif0at5PsHdgn1oBKRAP/baC4Q11d+V92VdMi Dcj1KoYQxv5knJ5MTiS7KsZqWr2PHamUeKvCthJ2Hn5E47umC+VHE/gXnn3o+Gwvt3NVHc lD+oa15tHG1Lo3eHiAl0ijWIL+ptIwDBLZyGm6vTjo+uvZSawI2V59ClWYZLbMks8deQ+T l7r5xf87lb+30mkjw8PsA5cmYN1oEyZ2fTh1FM6n+cmtWG7Vs2cqWmAlk5FEwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711116029; a=rsa-sha256; cv=none; b=cB4paAxuTfk3vXJ2X8jWCvZ56ZvgPdFhp1CDifI5DKrLNuPIqMd89lJLiEjwpBXKw0F3NW nq+x3yVVPXSdvxmR2Znuhhj+tlXml86XMJUy06MkNPJi9Qs56C5nMmVgan0a0MU7f7of19 Yad8Mr7Ee2Y7tAP/Z8uHD6/wnad9tqX1rOawWcC9Jh4SJcmT92OsAKqxpW989zAioTmXHe NJKlcMo4UzHQAth9nhFVwj19CULW1Y3woubhPaydRoxE02Zg2+fWQs9I2yJcOvgfOhAF4L 5MX9OQS4ElPxrE5qoLFLmdOTlVDw6JRgQG5P+TXWe91ZIuwjoiWsYhTSdiWM1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116029; 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=FjwFzXZxPP/0Znsis/EG3zCWsrFN6xp5Eh9qfzgKv6g=; b=ap0Aq1B62bTPTWglnDrEvYgYg87AUbj7liQAB34POg4FhKcl+15AosAznXof0Pwa5kFqhq 5jh2kES6204zD60PxhbqmeSrurKb6CR4P369PeTrhxvNBiV9Q8/jqaRPEsmBs3ZbE64uTC Hx3NgM5fcf0YlOfGHXj1hbC4+xhQzKWalEsO20GgF8jceiXKnOBh0IbHbZ1p9cjLaP16OI 1Xg9xoySnuke/FUvxI7vZwXGHcNa6HOuDsPRJjomtQFgdG5RF76tcs6iGLJVwsGE/HBG+W MJfClb9zgrB0a/pVd2PFFTOmrBSauaJlsX7uUBx5Ki+fqaTaPqlxvDrfQPl6Jg== 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 4V1P9T02x9z1LhC; Fri, 22 Mar 2024 14:00:29 +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 42ME0Sdw048232; Fri, 22 Mar 2024 14:00:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ME0Sm3048229; Fri, 22 Mar 2024 14:00:28 GMT (envelope-from git) Date: Fri, 22 Mar 2024 14:00:28 GMT Message-Id: <202403221400.42ME0Sm3048229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 163286a86176 - stable/13 - LinuxKPI: Queue skbuffs at tail in __skb_queue_tail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 163286a861761d54ad0943de70d87cb544200f45 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=163286a861761d54ad0943de70d87cb544200f45 commit 163286a861761d54ad0943de70d87cb544200f45 Author: Tom Coldrick AuthorDate: 2024-03-02 19:22:55 +0000 Commit: Ed Maste CommitDate: 2024-03-22 14:00:02 +0000 LinuxKPI: Queue skbuffs at tail in __skb_queue_tail Correct skb_queue_tail to queue the buffer at the tail of the skbuff. The skbuff is a circular doubly-linked list, and we call with a pointer to the head of the list. Thus queueing before the head gives us a queueing at the tail. As a motivating factor, the current behaviour (queueing at the head) was causing frequent kernel panics from my RTL8822BE wireless card, which uses the rtw88 driver. Interrupts can cause buffers to be added to the rtwdev c2h_queue while the queue is being drained in rtw_c2h_work. Queueing at the head would leave the nascent entry in the linked list pointing to the old, now freed, memory for the buffer being processed. When rtw_c2h_work is next called, we try reading this and so panic. Reviewed by: emaste, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44192 (cherry picked from commit d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9) (cherry picked from commit 95a7c6f18a6a28cf866384ff60b587ec30be1cd1) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index f8ce212e7853..02190a29e241 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -567,7 +567,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { SKB_TRACE2(q, new); - __skb_queue_after(q, (struct sk_buff *)q, new); + __skb_queue_before(q, (struct sk_buff *)q, new); } static inline void From nobody Fri Mar 22 14:03:02 2024 X-Original-To: dev-commits-src-all@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 4V1PDQ3nPXz5F1SC; Fri, 22 Mar 2024 14:03: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 4V1PDQ1l4Jz4G7J; Fri, 22 Mar 2024 14:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116182; 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=qBxAnJ66RekP8aYfmhdB4/YDBWbOAvxrkFjsfnFZTts=; b=YR/1Xa5yg/xoWk9hoCcxvQ4jVv82S3IgkbqRZMUXgyLPC5w8QVlxGHh3Io1hkHqp/kBxwX zhK6ebYZXkmSuDv3JCQnHB/Kpu3dNslcGDZai746Smf2KXx7xHLbAPsU+ZU515VuldiLp8 gD70aqj6CWuQ+4rZ7zx+Cj7gBB1ZoytTJh423TLyLTD8a8CqmBm4DACisWryJbgE/qThb3 Q5jiaUanL2dYzIXB8h7JrIvslv1LNGBKZ8ZnzQgivDsAjnEVm9XlVqzuUh+4wxnE2wvNet XF0ODnO8Pj6418J2YMQOQsHY6cIZHDtP4x9/O5JWdsgd4pqi5JxFvjfu/EV+vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711116182; a=rsa-sha256; cv=none; b=aLNsj6yq9naVZ9CuDXvlRtlrB1KbdsO+sGL7geel/fwnH5HMzKS+3YoCJznfvTlX+vuCCc XhUYAEXkrV97h82p48jLuwA0QmEwumapPHz60h8DDt1XMHVThQ152IExwijQkXabjM+mb1 yN2im5uxsqMdbCEJBKhQp5gjVokJEn3HH7hxe0CHAQFdgStjo6oG3lqeiGrrZE/p0eMGiI 6w6m1qwhvxXW9oy7Ha8QisqlFZMCelyPZEg/5Acpg7atdUqIPKzdrTW4teH7qBUIyHpjsC LeJZpNOWl0QHe63HLba9PDCJJ6QPL/SohCjAPyT2Z9h6AFsVJ/8EDsr7ZWR/vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711116182; 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=qBxAnJ66RekP8aYfmhdB4/YDBWbOAvxrkFjsfnFZTts=; b=Ptj2dSHm4/m/iT9tY0ABKUCtk6+6jyG9XdU1fNZF/JIjUE5k0I1LHGWY7N/kLfvQzn/xmC RuRIGtUwUxChsx6ZiGmL5pzrPbh3ayKa7KpblNVTwvT6TMq5nEuGK5/KIiwzDfzbPgsgns AFlydZ3i/ZXaUeEL5o9+orusjwXTOQde0EIJYONZ7/jGJ3JLkuwDHqgh/Qy30yQ/SEr5AK el8V4p3kcuYHlOEd9V8rsvlcPP1QpQsn0Ne/5NXUqLDP49lEgaSK+hEQN6ULsH3tdypKpr PbgD3cXyh0HscVxdOgzWZ/uu7/F3uQgNwdAKuxCStVlQFwAPF5uNFb69+MGDpA== 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 4V1PDQ1MPXz1LlQ; Fri, 22 Mar 2024 14:03: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 42ME32ru055333; Fri, 22 Mar 2024 14:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ME321g055330; Fri, 22 Mar 2024 14:03:02 GMT (envelope-from git) Date: Fri, 22 Mar 2024 14:03:02 GMT Message-Id: <202403221403.42ME321g055330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 537bdafbc25d - main - rights.4: add note about rights not being simple bitmasks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 537bdafbc25d39b4bb3dce124691913f86c08288 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=537bdafbc25d39b4bb3dce124691913f86c08288 commit 537bdafbc25d39b4bb3dce124691913f86c08288 Author: Ed Maste AuthorDate: 2024-03-22 13:47:57 +0000 Commit: Ed Maste CommitDate: 2024-03-22 14:02:31 +0000 rights.4: add note about rights not being simple bitmasks PR: 277057 Reviewed by: oshogbo, asomers Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44473 --- share/man/man4/rights.4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4 index 770f9ea5c979..2d44a1060006 100644 --- a/share/man/man4/rights.4 +++ b/share/man/man4/rights.4 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 28, 2019 +.Dd March 22, 2024 .Dt RIGHTS 4 .Os .Sh NAME @@ -68,6 +68,12 @@ The .Xr cap_rights_init 3 family of functions should be used to manage the structure. .Sh RIGHTS +Note that rights are not simple bitmasks (and cannot be bitwise-ORed together). +See +.Xr cap_rights_init 3 +for details. +.Pp +The following rights are available: .Bl -tag -width CAP_RENAMEAT_SOURCE .It Dv CAP_ACCEPT Permit From nobody Fri Mar 22 15:17:28 2024 X-Original-To: dev-commits-src-all@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 4V1Qty60Hwz5F8W4; Fri, 22 Mar 2024 15:18:02 +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 4V1Qty2nv6z4Nhf; Fri, 22 Mar 2024 15:18:02 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [IPv6:2001:1640:5::8:52]) (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 D1EA6240446; Fri, 22 Mar 2024 16:17:58 +0100 (CET) Received: from hub1.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 hub1.goneo.de (Postfix) with ESMTPS id 07A49240591; Fri, 22 Mar 2024 16:17:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1711120677; 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=wtKibkxwELUjN6XNXKiKybfles/dnisfawT73bckqVM=; b=IrlnDbsFnjq7bIFtFF0nmOpWu6eTZFzm8zHzSv5lRl8cVB8Z/Ndw7diC7BjMfvLFVpSRQ9 TD6UHUYYt59TWeLBcPaewG/LeQGPGQUa6YxgUU4z362TCJaNfRrlWCobv0V/xjA3s4AiyS EhJnvoaDbtUovEAdON96LCepEdaCJfeYg+DJ1e5kN/KpjydXCu0zRbscRw1ndLD8pQVOfz ZZmSHj1M2HwR00VHvclQQ89omHDqk56BVg3C05oMKap6nJGH+zRsAOaZXwTwgSG7BaM+S7 rWlHNKIVvD+h9AfHK645cymGk65Yu5Fg7HLTHjZcFws1NjbqMEJIYlpHYlDEPQ== Received: from thor.intern.walstatt.dynvpn.de (dynamic-089-014-073-145.89.14.pool.telefonica.de [89.14.73.145]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 9E0742404DE; Fri, 22 Mar 2024 16:17:56 +0100 (CET) Date: Fri, 22 Mar 2024 16:17:28 +0100 From: FreeBSD User To: Bojan =?UTF-8?B?Tm92a292acSH?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c21bc6f3c242 - main - ddb: Add CTF-based pretty printing Message-ID: <20240322161755.56389691@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> References: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-UID: 58b5b5 X-Rspamd-UID: 48fde3 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4V1Qty2nv6z4Nhf Am Fri, 22 Mar 2024 03:56:19 GMT Bojan Novkovi=C4=87 schrieb: This commit breaks buildkernel of GENERIC and custom configs, when either options KDB or options DDB or both are commented out: [...] --- kernel --- linking kernel ld: error: undefined symbol: db_ctf_lookup_typename >>> referenced by link_elf_obj.c >>> link_elf_obj.o:(link_elf_ctf_lookup_typename) >>> referenced by link_elf.c >>> link_elf.o:(link_elf_ctf_lookup_typename) *** [kernel] Error code 1 make[2]: stopped in /usr/obj/usr/src/amd64.amd64/sys/THOR make[2]: 1 error make[2]: stopped in /usr/obj/usr/src/amd64.amd64/sys/THOR 605.46 real 2122.47 user 197.81 sys make[1]: stopped in /usr/src make: stopped in /usr/src > The branch main has been updated by bnovkov: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc21bc6f3c2425de74141bfee07= b609bf65b5a6b3 >=20 > commit c21bc6f3c2425de74141bfee07b609bf65b5a6b3 > Author: Bojan Novkovi=C4=87 > AuthorDate: 2024-03-22 03:01:34 +0000 > Commit: Bojan Novkovi=C4=87 > CommitDate: 2024-03-22 03:03:33 +0000 >=20 > ddb: Add CTF-based pretty printing > =20 > Add basic CTF support and a CTF-powered pretty-printer to ddb. > =20 > The db_ctf.* files expose a basic interface for fetching type > data for ELF symbols, interacting with the CTF string table, > and translating type identifiers to type data. > =20 > The db_pprint.c file uses those interfaces to implement > a pretty-printer for all kernel ELF symbols. > The pretty-printer works with symbol names and arbitrary addresses: > pprint struct thread 0xffffffff8194ad90 > =20 > Pretty-printing currently only works after the root filesystem > gets mounted because the CTF info is not available during > early boot. > =20 > Differential Revision: https://reviews.freebsd.org/D37899 > Approved by: markj (mentor) > --- > share/man/man4/ddb.4 | 26 +++ > sys/conf/files | 2 + > sys/ddb/db_command.c | 1 + > sys/ddb/db_ctf.c | 326 +++++++++++++++++++++++++++++++++++ > sys/ddb/db_ctf.h | 64 +++++++ > sys/ddb/db_pprint.c | 450 ++++++++++++++++++++++++++++++++++++++++++= ++++++ > sys/ddb/ddb.h | 1 + > sys/kern/kern_ctf.c | 40 +++++ > sys/kern/kern_linker.c | 68 +++++++- > sys/kern/link_elf.c | 37 ++++ > sys/kern/link_elf_obj.c | 14 ++ > sys/kern/linker_if.m | 23 +++ > sys/sys/linker.h | 3 + > 13 files changed, 1054 insertions(+), 1 deletion(-) >=20 > diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 > index 3648c9ca58cb..f3443cbac127 100644 > --- a/share/man/man4/ddb.4 > +++ b/share/man/man4/ddb.4 > @@ -289,6 +289,32 @@ eax =3D xxxxxx > ecx =3D yyyyyy > .Ed > .Pp > +.It Ic pprint Ns Oo Li / Ns Cm d depth Oc Oo Ar name Oc > +Pretty-print symbol specified by > +.Ar name > +using CTF debugging data. Works for all symbols exported by the kernel a= nd loaded kernel > modules. +.Pp > +If the > +.Cm d > +modifier has been specified, contents of structs nested up to > +.Ar depth > +levels deep will also be included in the output. > +.Ed > +.Pp > +.It Ic pprint struct Ns Oo Li / Ns Cm d depth Ic Oc Oo Ar name Oc Ns Op = Ns Ar addr > +Print memory at > +.Ar addr > +as struct > +.Ar name Ns . > +Works for all structs defined by the kernel and loaded kernel modules. > +.Pp > +If the > +.Cm d > +modifier has been specified, contents of structs nested up to > +.Ar depth > +levels deep will also be included in the output. > +.Ed > +.Pp > .It Xo > .Ic write Ns Op Li / Ns Cm bhl > .Ar addr expr1 Op Ar expr2 ... > diff --git a/sys/conf/files b/sys/conf/files > index c902bcfdbd52..021829408c0f 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -718,12 +718,14 @@ ddb/db_access.c optional ddb > ddb/db_break.c optional ddb > ddb/db_capture.c optional ddb > ddb/db_command.c optional ddb > +ddb/db_ctf.c optional ddb > ddb/db_examine.c optional ddb > ddb/db_expr.c optional ddb > ddb/db_input.c optional ddb > ddb/db_lex.c optional ddb > ddb/db_main.c optional ddb > ddb/db_output.c optional ddb > +ddb/db_pprint.c optional ddb > ddb/db_print.c optional ddb > ddb/db_ps.c optional ddb > ddb/db_run.c optional ddb > diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c > index 9d79e3b2a6d3..0c88d496f6b8 100644 > --- a/sys/ddb/db_command.c > +++ b/sys/ddb/db_command.c > @@ -163,6 +163,7 @@ static struct db_command db_cmds[] =3D { > DB_CMD("capture", db_capture_cmd, CS_OWN|DB_CMD_MEMSAFE), > DB_CMD("textdump", db_textdump_cmd, CS_OWN|DB_CMD_MEMSAFE), > DB_CMD("findstack", db_findstack_cmd, 0), > + DB_CMD("pprint", db_pprint_cmd, CS_OWN), > }; > struct db_command_table db_cmd_table =3D LIST_HEAD_INITIALIZER(db_cmd_ta= ble); > =20 > diff --git a/sys/ddb/db_ctf.c b/sys/ddb/db_ctf.c > new file mode 100644 > index 000000000000..03145064885c > --- /dev/null > +++ b/sys/ddb/db_ctf.c > @@ -0,0 +1,326 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2023 Bojan Novkovi=C4=87 > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distributio= n. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PU= RPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIAB= LE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUE= NTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOO= DS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S= TRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY= WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +static const ctf_header_t * > +db_ctf_fetch_cth(linker_ctf_t *lc) > +{ > + return (const ctf_header_t *)lc->ctftab; > +} > + > +/* > + * Tries to look up the ELF symbol -> CTF type identifier mapping by sca= nning > + * the CTF object section. > + */ > +static uint32_t > +sym_to_objtoff(linker_ctf_t *lc, const Elf_Sym *sym, const Elf_Sym *symt= ab, > + const Elf_Sym *symtab_end) > +{ > + const ctf_header_t *hp =3D db_ctf_fetch_cth(lc); > + uint32_t objtoff =3D hp->cth_objtoff; > + const size_t idwidth =3D 4; > + > + /* Ignore non-object symbols */ > + if (ELF_ST_TYPE(sym->st_info) !=3D STT_OBJECT) { > + return (DB_CTF_INVALID_OFF); > + } > + /* Sanity check */ > + if (!(sym >=3D symtab && sym <=3D symtab_end)) { > + return (DB_CTF_INVALID_OFF); > + } > + > + for (const Elf_Sym *symp =3D symtab; symp < symtab_end; symp++) { > + /* Make sure we do not go beyond the objtoff section */ > + if (objtoff >=3D hp->cth_funcoff) { > + objtoff =3D DB_CTF_INVALID_OFF; > + break; > + } > + if (symp->st_name =3D=3D 0 || symp->st_shndx =3D=3D SHN_UNDEF) { > + continue; > + } > + if (symp->st_shndx =3D=3D SHN_ABS && symp->st_value =3D=3D 0) { > + continue; > + } > + > + /* Skip non-object symbols */ > + if (ELF_ST_TYPE(symp->st_info) !=3D STT_OBJECT) { > + continue; > + } > + if (symp =3D=3D sym) { > + break; > + } > + objtoff +=3D idwidth; > + } > + > + return (objtoff); > +} > + > +/* > + * Returns the size of CTF type 't'. > + */ > +static u_int > +db_ctf_type_size(struct ctf_type_v3 *t) > +{ > + u_int vlen, kind, ssize; > + u_int type_struct_size, kind_size; > + > + vlen =3D CTF_V3_INFO_VLEN(t->ctt_info); > + kind =3D CTF_V3_INFO_KIND(t->ctt_info); > + ssize =3D ((t->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? CTF_TYPE_LSIZE(t) : > + t->ctt_size); > + type_struct_size =3D ((t->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + sizeof(struct ctf_type_v3) : > + sizeof(struct ctf_stype_v3)); > + > + switch (kind) { > + case CTF_K_INTEGER: > + case CTF_K_FLOAT: > + kind_size =3D sizeof(uint32_t); > + break; > + case CTF_K_ARRAY: > + kind_size =3D sizeof(struct ctf_array_v3); > + break; > + case CTF_K_UNION: > + case CTF_K_STRUCT: > + kind_size =3D vlen * > + ((ssize < CTF_V3_LSTRUCT_THRESH) ? > + sizeof(struct ctf_member_v3) : > + sizeof(struct ctf_lmember_v3)); > + break; > + case CTF_K_ENUM: > + kind_size =3D vlen * sizeof(struct ctf_enum); > + break; > + case CTF_K_FUNCTION: > + kind_size =3D vlen * sizeof(uint32_t); > + break; > + case CTF_K_UNKNOWN: > + case CTF_K_FORWARD: > + case CTF_K_POINTER: > + case CTF_K_TYPEDEF: > + case CTF_K_VOLATILE: > + case CTF_K_CONST: > + case CTF_K_RESTRICT: > + kind_size =3D 0; > + break; > + default: > + db_printf("Error: invalid CTF type kind encountered\n"); > + return (-1); > + } > + > + return (type_struct_size + kind_size); > +} > + > +/* > + * Looks up type name 'name' in the CTF string table and returns the > + * corresponding CTF type struct, if any. > + */ > +struct ctf_type_v3 * > +db_ctf_typename_to_type(linker_ctf_t *lc, const char *name) > +{ > + const ctf_header_t *hp =3D db_ctf_fetch_cth(lc); > + char *start, *cur, *end; > + uint32_t stroff =3D hp->cth_stroff; > + uint32_t typeoff =3D hp->cth_typeoff; > + uint32_t name_stroff; > + const uint8_t *ctfstart =3D (const uint8_t *)hp + sizeof(ctf_header_t); > + > + u_int skiplen; > + > + /* Scan ctf strtab for typename. */ > + start =3D cur =3D __DECONST(char *, hp) + sizeof(ctf_header_t) + > + hp->cth_stroff; > + end =3D cur + hp->cth_strlen; > + while (cur < end) { > + if (strcmp(cur, name) =3D=3D 0) > + break; > + cur +=3D strlen(cur) + 1; > + } > + if (cur >=3D end) > + return (NULL); > + name_stroff =3D (uint32_t)(cur - start); > + > + /* Scan for type containing the found stroff. */ > + while (typeoff < stroff) { > + struct ctf_type_v3 *t =3D > + (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + > + typeoff); > + /* We found the type struct */ > + if (t->ctt_name =3D=3D name_stroff) { > + break; > + } > + if ((skiplen =3D db_ctf_type_size(t)) =3D=3D -1) { > + return (NULL); > + } > + typeoff +=3D skiplen; > + } > + if (typeoff < stroff) { > + return (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + > + typeoff); > + } else { /* A type struct was not found */ > + return (NULL); > + } > +} > + > +/* > + * Wrapper used by the kernel linker CTF routines. > + * Currently used to implement lookup of CTF types accross all loaded ke= rnel > + * modules. > + */ > +bool > +db_ctf_lookup_typename(linker_ctf_t *lc, const char *typename) > +{ > + return (db_ctf_typename_to_type(lc, typename) !=3D NULL); > +} > + > +/* > + * Returns the type corresponding to the 'typeid' parameter from the CTF= type > + * section. > + */ > +struct ctf_type_v3 * > +db_ctf_typeid_to_type(db_ctf_sym_data_t sd, uint32_t typeid) > +{ > + const ctf_header_t *hp =3D db_ctf_fetch_cth(&sd->lc); > + const uint8_t *ctfstart =3D (const uint8_t *)hp + sizeof(ctf_header_t); > + uint32_t typeoff =3D hp->cth_typeoff; > + uint32_t stroff =3D hp->cth_stroff; > + /* CTF typeids start at 0x1 */ > + size_t cur_typeid =3D 1; > + u_int skiplen; > + > + /* Find corresponding type */ > + while (typeoff < stroff) { > + struct ctf_type_v3 *t =3D > + (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + > + typeoff); > + > + /* We found the type struct */ > + if (cur_typeid =3D=3D typeid) { > + break; > + } > + cur_typeid++; > + if ((skiplen =3D db_ctf_type_size(t)) =3D=3D -1) { > + return (NULL); > + } > + typeoff +=3D skiplen; > + } > + if (typeoff < stroff) { > + return (struct ctf_type_v3 *)(__DECONST(uint8_t *, ctfstart) + > + typeoff); > + } else { /* A type struct was not found */ > + return (NULL); > + } > +} > + > +const char * > +db_ctf_stroff_to_str(db_ctf_sym_data_t sd, uint32_t off) > +{ > + const ctf_header_t *hp =3D db_ctf_fetch_cth(&sd->lc); > + uint32_t stroff =3D hp->cth_stroff + off; > + const char *ret; > + > + if (stroff >=3D (hp->cth_stroff + hp->cth_strlen)) { > + return ("invalid"); > + } > + ret =3D ((const char *)hp + sizeof(ctf_header_t)) + stroff; > + if (*ret =3D=3D '\0') { > + return (NULL); > + } > + > + return (ret); > +} > + > +/* > + * Tries to find the type of the symbol specified in 'sd->sym'. > + */ > +struct ctf_type_v3 * > +db_ctf_sym_to_type(db_ctf_sym_data_t sd) > +{ > + uint32_t objtoff, typeid; > + const Elf_Sym *symtab, *symtab_end; > + > + if (sd->sym =3D=3D NULL) { > + return (NULL); > + } > + symtab =3D sd->lc.symtab; > + symtab_end =3D symtab + sd->lc.nsym; > + > + objtoff =3D sym_to_objtoff(&sd->lc, sd->sym, symtab, symtab_end); > + /* Sanity check - should not happen */ > + if (objtoff =3D=3D DB_CTF_INVALID_OFF) { > + db_printf("Could not find CTF object offset.\n"); > + return (NULL); > + } > + > + typeid =3D *( > + const uint32_t *)(sd->lc.ctftab + sizeof(ctf_header_t) + objtoff); > + > + return (db_ctf_typeid_to_type(sd, typeid)); > +} > + > +/* > + * Scans the kernel file and all loaded module for symbol 'name'. > + */ > +int > +db_ctf_find_symbol(const char *name, db_ctf_sym_data_t sd) > +{ > + int error; > + c_linker_sym_t lsym =3D NULL; > + > + error =3D linker_ctf_lookup_sym_ddb(name, &lsym, &sd->lc); > + if (error !=3D 0) { > + db_printf( > + "failed to look up symbol and CTF info for %s: error %d\n", > + name, error); > + return (error); > + } > + sd->sym =3D __DECONST(Elf_Sym *, lsym); > + > + return (0); > +} > + > +/* > + * Scans the kernel file and all loaded module for type specified by 'ty= pename'. > + */ > +struct ctf_type_v3 * > +db_ctf_find_typename(db_ctf_sym_data_t sd, const char *typename) > +{ > + if (linker_ctf_lookup_typename_ddb(&sd->lc, typename) !=3D 0) { > + return (NULL); > + } > + return (db_ctf_typename_to_type(&sd->lc, typename)); > +} > diff --git a/sys/ddb/db_ctf.h b/sys/ddb/db_ctf.h > new file mode 100644 > index 000000000000..6da5f76b6cf6 > --- /dev/null > +++ b/sys/ddb/db_ctf.h > @@ -0,0 +1,64 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2023 Bojan Novkovi=C4=87 > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distributio= n. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PU= RPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIAB= LE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUE= NTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOO= DS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S= TRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY= WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#ifndef _DDB_DB_CTF_H_ > +#define _DDB_DB_CTF_H_ > + > +#include > +#include > +#include > + > +#include > +#include > + > +#define DB_CTF_INVALID_OFF 0xffffffff > + > +struct db_ctf_sym_data { > + linker_ctf_t lc; > + Elf_Sym *sym; > +}; > + > +typedef struct db_ctf_sym_data *db_ctf_sym_data_t; > + > +/* > + * Routines for finding symbols and CTF info accross all loaded linker f= iles. > + */ > +int db_ctf_find_symbol(const char *name, db_ctf_sym_data_t sd); > +struct ctf_type_v3 *db_ctf_find_typename(db_ctf_sym_data_t sd, > + const char *typename); > +bool db_ctf_lookup_typename(linker_ctf_t *lc, const char *typename); > + > +/* > + * Routines for working with CTF data. > + */ > +struct ctf_type_v3 *db_ctf_sym_to_type(db_ctf_sym_data_t sd); > +const char *db_ctf_stroff_to_str(db_ctf_sym_data_t sd, uint32_t off); > +struct ctf_type_v3 *db_ctf_typename_to_type(linker_ctf_t *lc, const char= *name); > +struct ctf_type_v3 *db_ctf_typeid_to_type(db_ctf_sym_data_t sd, > + uint32_t typeid); > + > +#endif /* !_DDB_DB_CTF_H_ */ > diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c > new file mode 100644 > index 000000000000..dc7582864957 > --- /dev/null > +++ b/sys/ddb/db_pprint.c > @@ -0,0 +1,450 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > + * > + * Copyright (c) 2022 Bojan Novkovi=C4=87 > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distributio= n. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PU= RPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIAB= LE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUE= NTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOO= DS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S= TRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY= WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#include > +#include > +#include > +#include > + > +#include > + > +#include > +#include > +#include > +#include > +#include > + > +#define DB_PPRINT_DEFAULT_DEPTH 1 > + > +static void db_pprint_type(db_addr_t addr, struct ctf_type_v3 *type, > + u_int depth); > + > +static u_int max_depth =3D DB_PPRINT_DEFAULT_DEPTH; > +static struct db_ctf_sym_data sym_data; > + > +/* > + * Pretty-prints a CTF_INT type. > + */ > +static inline void > +db_pprint_int(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + uint32_t data; > + size_t type_struct_size; > + > + type_struct_size =3D (type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + sizeof(struct ctf_type_v3) : > + sizeof(struct ctf_stype_v3); > + > + data =3D db_get_value((db_expr_t)type + type_struct_size, > + sizeof(uint32_t), 0); > + u_int bits =3D CTF_INT_BITS(data); > + boolean_t sign =3D !!(CTF_INT_ENCODING(data) & CTF_INT_SIGNED); > + > + if (db_pager_quit) { > + return; > + } > + if (bits > 64) { > + db_printf("Invalid size '%d' found for integer type\n", bits); > + return; > + } > + db_printf("0x%lx", > + db_get_value(addr, (bits / 8) ? (bits / 8) : 1, sign)); > +} > + > +/* > + * Pretty-prints a struct. Nested structs are pretty-printed up 'depth' = nested > + * levels. > + */ > +static inline void > +db_pprint_struct(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + size_t type_struct_size; > + size_t struct_size; > + struct ctf_type_v3 *mtype; > + const char *mname; > + db_addr_t maddr; > + u_int vlen; > + > + type_struct_size =3D (type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + sizeof(struct ctf_type_v3) : > + sizeof(struct ctf_stype_v3); > + struct_size =3D ((type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + CTF_TYPE_LSIZE(type) : > + type->ctt_size); > + vlen =3D CTF_V3_INFO_VLEN(type->ctt_info); > + > + if (db_pager_quit) { > + return; > + } > + if (depth > max_depth) { > + db_printf("{ ... }"); > + return; > + } > + db_printf("{\n"); > + > + if (struct_size < CTF_V3_LSTRUCT_THRESH) { > + struct ctf_member_v3 *mp, *endp; > + > + mp =3D (struct ctf_member_v3 *)((db_addr_t)type + > + type_struct_size); > + endp =3D mp + vlen; > + for (; mp < endp; mp++) { > + if (db_pager_quit) { > + return; > + } > + mtype =3D db_ctf_typeid_to_type(&sym_data, mp->ctm_type); > + maddr =3D addr + mp->ctm_offset; > + mname =3D db_ctf_stroff_to_str(&sym_data, mp->ctm_name); > + db_indent =3D depth; > + if (mname !=3D NULL) { > + db_iprintf("%s =3D ", mname); > + } else { > + db_iprintf(""); > + } > + > + db_pprint_type(maddr, mtype, depth + 1); > + db_printf(",\n"); > + } > + } else { > + struct ctf_lmember_v3 *mp, *endp; > + > + mp =3D (struct ctf_lmember_v3 *)((db_addr_t)type + > + type_struct_size); > + endp =3D mp + vlen; > + for (; mp < endp; mp++) { > + if (db_pager_quit) { > + return; > + } > + mtype =3D db_ctf_typeid_to_type(&sym_data, mp->ctlm_type); > + maddr =3D addr + CTF_LMEM_OFFSET(mp); > + mname =3D db_ctf_stroff_to_str(&sym_data, mp->ctlm_name); > + db_indent =3D depth; > + if (mname !=3D NULL) { > + db_iprintf("%s =3D ", mname); > + } else { > + db_iprintf(""); > + } > + > + db_pprint_type(maddr, mtype, depth + 1); > + db_printf(","); > + } > + } > + db_indent =3D depth - 1; > + db_iprintf("}"); > +} > + > +/* > + * Pretty-prints an array. Each array member is printed out in a separat= e line > + * indented with 'depth' spaces. > + */ > +static inline void > +db_pprint_arr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + struct ctf_type_v3 *elem_type; > + struct ctf_array_v3 *arr; > + db_addr_t elem_addr, end; > + size_t type_struct_size; > + size_t elem_size; > + > + type_struct_size =3D (type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + sizeof(struct ctf_type_v3) : > + sizeof(struct ctf_stype_v3); > + arr =3D (struct ctf_array_v3 *)((db_addr_t)type + type_struct_size); > + elem_type =3D db_ctf_typeid_to_type(&sym_data, arr->cta_contents); > + elem_size =3D ((elem_type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + CTF_TYPE_LSIZE(elem_type) : > + elem_type->ctt_size); > + elem_addr =3D addr; > + end =3D addr + (arr->cta_nelems * elem_size); > + > + db_indent =3D depth; > + db_printf("[\n"); > + /* Loop through and print individual elements. */ > + for (; elem_addr < end; elem_addr +=3D elem_size) { > + if (db_pager_quit) { > + return; > + } > + db_iprintf(""); > + db_pprint_type(elem_addr, elem_type, depth); > + if ((elem_addr + elem_size) < end) { > + db_printf(",\n"); > + } > + } > + db_printf("\n"); > + db_indent =3D depth - 1; > + db_iprintf("]"); > +} > + > +/* > + * Pretty-prints an enum value. Also prints out symbolic name of value, = if any. > + */ > +static inline void > +db_pprint_enum(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + struct ctf_enum *ep, *endp; > + size_t type_struct_size; > + const char *valname; > + db_expr_t val; > + u_int vlen; > + > + type_struct_size =3D (type->ctt_size =3D=3D CTF_V3_LSIZE_SENT) ? > + sizeof(struct ctf_type_v3) : > + sizeof(struct ctf_stype_v3); > + vlen =3D CTF_V3_INFO_VLEN(type->ctt_info); > + val =3D db_get_value(addr, sizeof(int), 0); > + > + if (db_pager_quit) { > + return; > + } > + ep =3D (struct ctf_enum *)((db_addr_t)type + type_struct_size); > + endp =3D ep + vlen; > + for (; ep < endp; ep++) { > + if (val =3D=3D ep->cte_value) { > + valname =3D db_ctf_stroff_to_str(&sym_data, ep->cte_name); > + if (valname !=3D NULL) > + db_printf("%s (0x%lx)", valname, val); > + else > + db_printf("(0x%lx)", val); > + break; > + } > + } > +} > + > +/* > + * Pretty-prints a pointer. If the 'depth' parameter is less than the > + * 'max_depth' global var, the pointer is "dereference", i.e. the conten= ts of > + * the memory it points to are also printed. The value of the pointer is= printed > + * otherwise. > + */ > +static inline void > +db_pprint_ptr(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + struct ctf_type_v3 *ref_type; > + const char *qual =3D ""; > + const char *name; > + db_addr_t val; > + u_int kind; > + > + ref_type =3D db_ctf_typeid_to_type(&sym_data, type->ctt_type); > + kind =3D CTF_V3_INFO_KIND(ref_type->ctt_info); > + switch (kind) { > + case CTF_K_STRUCT: > + qual =3D "struct "; > + break; > + case CTF_K_VOLATILE: > + qual =3D "volatile "; > + break; > + case CTF_K_CONST: > + qual =3D "const "; > + break; > + default: > + break; > + } > + > + val =3D db_get_value(addr, sizeof(db_addr_t), false); > + if (depth < max_depth) { > + /* Print contents of memory pointed to by this pointer. */ > + db_pprint_type(addr, ref_type, depth + 1); > + } else { > + name =3D db_ctf_stroff_to_str(&sym_data, ref_type->ctt_name); > + db_indent =3D depth; > + if (name !=3D NULL) > + db_printf("(%s%s *) 0x%lx", qual, name, val); > + else > + db_printf("0x%lx", val); > + } > +} > + > +/* > + * Pretty-print dispatching function. > + */ > +static void > +db_pprint_type(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) > +{ > + > + if (db_pager_quit) { > + return; > + } > + if (type =3D=3D NULL) { > + db_printf("unknown type"); > + return; > + } > + > + switch (CTF_V3_INFO_KIND(type->ctt_info)) { > + case CTF_K_INTEGER: > + db_pprint_int(addr, type, depth); > + break; > + case CTF_K_UNION: > + case CTF_K_STRUCT: > + db_pprint_struct(addr, type, depth); > + break; > + case CTF_K_FUNCTION: > + case CTF_K_FLOAT: > + db_indent =3D depth; > + db_iprintf("0x%lx", addr); > + break; > + case CTF_K_POINTER: > + db_pprint_ptr(addr, type, depth); > + break; > + case CTF_K_TYPEDEF: > + case CTF_K_VOLATILE: > + case CTF_K_RESTRICT: > + case CTF_K_CONST: { > + struct ctf_type_v3 *ref_type =3D db_ctf_typeid_to_type(&sym_data, > + type->ctt_type); > + db_pprint_type(addr, ref_type, depth); > + break; > + } > + case CTF_K_ENUM: > + db_pprint_enum(addr, type, depth); > + break; > + case CTF_K_ARRAY: > + db_pprint_arr(addr, type, depth); > + break; > + case CTF_K_UNKNOWN: > + case CTF_K_FORWARD: > + default: > + break; > + } > +} > + > +/* > + * Symbol pretty-printing command. > + * Syntax: pprint [/d depth] > + */ > +static void > +db_pprint_symbol_cmd(const char *name) > +{ > + db_addr_t addr; > + int db_indent_old; > + const char *type_name =3D NULL; > + struct ctf_type_v3 *type =3D NULL; > + > + if (db_pager_quit) { > + return; > + } > + /* Clear symbol and CTF info */ > + memset(&sym_data, 0, sizeof(struct db_ctf_sym_data)); > + if (db_ctf_find_symbol(name, &sym_data) !=3D 0) { > + db_error("Symbol not found\n"); > + } > + if (ELF_ST_TYPE(sym_data.sym->st_info) !=3D STT_OBJECT) { > + db_error("Symbol is not a variable\n"); > + } > + addr =3D sym_data.sym->st_value; > + type =3D db_ctf_sym_to_type(&sym_data); > + if (type =3D=3D NULL) { > + db_error("Can't find CTF type info\n"); > + } > + type_name =3D db_ctf_stroff_to_str(&sym_data, type->ctt_name); > + if (type_name !=3D NULL) > + db_printf("%s ", type_name); > + db_printf("%s =3D ", name); > + > + db_indent_old =3D db_indent; > + db_pprint_type(addr, type, 0); > + db_indent =3D db_indent_old; > +} > + > +/* > + * Command for pretty-printing arbitrary addresses. > + * Syntax: pprint [/d depth] struct > + */ > +static void > +db_pprint_struct_cmd(db_expr_t addr, const char *struct_name) > +{ > + int db_indent_old; > + struct ctf_type_v3 *type =3D NULL; > + > + type =3D db_ctf_find_typename(&sym_data, struct_name); > + if (type =3D=3D NULL) { > + db_error("Can't find CTF type info\n"); > + return; > + } > + > + db_printf("struct %s ", struct_name); > + db_printf("%p =3D ", (void *)addr); > + > + db_indent_old =3D db_indent; > + db_pprint_type(addr, type, 0); > + db_indent =3D db_indent_old; > +} > + > +/* > + * Pretty print an address or a symbol. > + */ > +void > +db_pprint_cmd(db_expr_t addr, bool have_addr, db_expr_t count, char *mod= if) > +{ > + int t =3D 0; > + const char *name; > + > + /* Set default depth */ > + max_depth =3D DB_PPRINT_DEFAULT_DEPTH; > + /* Parse print modifiers */ > + t =3D db_read_token(); > + if (t =3D=3D tSLASH) { > + t =3D db_read_token(); > + if (t !=3D tIDENT) { > + db_error("Invalid flag passed\n"); > + } > + /* Parse desired depth level */ > + if (strcmp(db_tok_string, "d") =3D=3D 0) { > + t =3D db_read_token(); > + if (t !=3D tNUMBER) { > + db_error("Invalid depth provided\n"); > + } > + max_depth =3D db_tok_number; > + } else { > + db_error("Invalid flag passed\n"); > + } > + /* Fetch next token */ > + t =3D db_read_token(); > + } > + /* Parse subcomannd */ > + if (t =3D=3D tIDENT) { > + if (strcmp(db_tok_string, "struct") =3D=3D 0) { > + t =3D db_read_token(); > + > + if (t !=3D tIDENT) { > + db_error("Invalid struct type name provided\n"); > + } > + name =3D db_tok_string; > + > + if (db_expression(&addr) =3D=3D 0) { > + db_error("Address not provided\n"); > + } > + db_pprint_struct_cmd(addr, name); > + } else { > + name =3D db_tok_string; > + db_pprint_symbol_cmd(name); > + } > + } else { > + db_error("Invalid subcommand\n"); > + } > + db_skip_to_eol(); > +} > diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h > index 1f388efcb389..bb92fef63e94 100644 > --- a/sys/ddb/ddb.h > +++ b/sys/ddb/ddb.h > @@ -297,6 +297,7 @@ db_cmdfcn_t db_trace_until_matching_cmd; > db_cmdfcn_t db_unscript_cmd; > db_cmdfcn_t db_watchpoint_cmd; > db_cmdfcn_t db_write_cmd; > +db_cmdfcn_t db_pprint_cmd; > =20 > /* > * Interface between DDB and the DDB output capture facility. > diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c > index 748622653eb3..8a2106a15308 100644 > --- a/sys/kern/kern_ctf.c > *** 331 LINES SKIPPED *** >=20 --=20 O. Hartmann From nobody Fri Mar 22 16:11:16 2024 X-Original-To: dev-commits-src-all@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 4V1S4p2DCcz5FFmg; Fri, 22 Mar 2024 16:11:38 +0000 (UTC) (envelope-from gallatin@fastmail.com) Received: from fout8-smtp.messagingengine.com (fout8-smtp.messagingengine.com [103.168.172.151]) (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 4V1S4p0b6Pz4WFP; Fri, 22 Mar 2024 16:11:38 +0000 (UTC) (envelope-from gallatin@fastmail.com) Authentication-Results: mx1.freebsd.org; none Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfout.nyi.internal (Postfix) with ESMTP id 99E3D1380084; Fri, 22 Mar 2024 12:11:36 -0400 (EDT) Received: from imap53 ([10.202.2.103]) by compute5.internal (MEProxy); Fri, 22 Mar 2024 12:11:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1711123896; x=1711210296; bh=7B9sdLDnwM dT0E3tnuJj7qD49A/VA3vh03OB+OaGZyg=; b=P/vgbm1qpFVjtRhS0AuCmTyTzC Am/3Y1T2Vm2Lqu6s90tOL2ofXI/8bR2pro/lod/tTsQzKSe86lY7Tcu+mfQRPaPu 3+mAc6W2P9iSi8TYZN8XyAfUbN3BZE1BlwIH/CXixauyjlOt8ZBOfxp+Q5mPstrq 14MLRth1ciTvoTy+y3otaBkIGoT9dmDTV3kHlzoEbNZ2sgagxA0WHkL37CLDsTb/ lEjhfnwNy6x5nL19RwIt27JsFTzWOe1ktFIWlUQfRv7urvk6n2HiLTggcxqw16On 3+DxK7w1Py/F1leplAAjQv1R9OcND0nJ2RpmQ9KnQUB0x3oVvK5+7pBl1vKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711123896; x=1711210296; bh=7B9sdLDnwMdT0E3tnuJj7qD49A/V A3vh03OB+OaGZyg=; b=h6HPsGiBciRD4uktnFq2mjntmg2f6QCQ5OV+vDiNT5UK q8RA4mgWSzP2iQr/RqGQwCrLN8IuG2OWIsijOSJ1WH6MrOAQ7YayscHzd/JRk9zm KjfRY/lboo9TnI3WOdTmY9/PD4kMpUia4uXFPDM4KyloyAO34G3/4++uC7saNQEF 1qWokYWEs+4Da1PWo2Om0wH3TKIg7mEvpOlWzdUUIkY3og5S/blrHLaTrwMW4Sp1 vIgTjiseDXarxsdQB93m9Z48ngxWzLg3NhzR66OMNCRjuVx/+2uDYxbYPvakQb9W AtJOTnCaRtXQNhdfjrrglIRj4bYhUBDOgi+uY9PewQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddtvddgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesrgdtreerreertdenucfhrhhomhepfdffrhgv ficuifgrlhhlrghtihhnfdcuoehgrghllhgrthhinhesfhgrshhtmhgrihhlrdgtohhmqe enucggtffrrghtthgvrhhnpeeiudeiffeludduudfhieettdevvdegjefgjefhiedugfff hffgheeuuedutdfffeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehgrghllhgrthhinhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i2f014658:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 777F9364006F; Fri, 22 Mar 2024 12:11:36 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-332-gdeb4194079-fm-20240319.002-gdeb41940 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Message-Id: <63185964-e018-4360-9c5c-f81b288af874@app.fastmail.com> In-Reply-To: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> References: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> Date: Fri, 22 Mar 2024 12:11:16 -0400 From: "Drew Gallatin" To: =?UTF-8?Q?Bojan_Novkovi=C4=87?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c21bc6f3c242 - main - ddb: Add CTF-based pretty printing Content-Type: multipart/alternative; boundary=364f1309f6c34d918a040e0373beb130 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:209242, ipnet:103.168.172.0/24, country:US] X-Rspamd-Queue-Id: 4V1S4p0b6Pz4WFP --364f1309f6c34d918a040e0373beb130 Content-Type: text/plain Thank you for this. Pretty-printing from ddb is something I've wished for for the last 30 years or so. Bravo! Drew --364f1309f6c34d918a040e0373beb130 Content-Type: text/html
Thank you for this.  Pretty-printing from ddb is something I've wished for for the last 30 years or so.  Bravo!

Drew
--364f1309f6c34d918a040e0373beb130-- From nobody Fri Mar 22 16:30:14 2024 X-Original-To: dev-commits-src-all@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 4V1SVG4Kd4z5FHQg; Fri, 22 Mar 2024 16:30:14 +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 4V1SVG3c3rz4Z7X; Fri, 22 Mar 2024 16:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711125014; 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=ZKddgwzJQ4rm52+MBTF0qZ5qQIzh9VY9ejgfSk9I95o=; b=WpOczyNBHwByvkRuCvboUGURpuaqBqh1NCqyGuFnkSpj/f7lWTjYyakHT59KICH06JPOdt Un3WuT23DRCIH5A++tZy4LCjPfrLt7Ev+yqTvGCIdVZun+f7keRdeLd2uuXqq3CaRFDY5C QSYxPoiBQVDBsZukvfquLIUmpnlC+/BH3irMo0XqR7klL/ehNRqyO/DRD0cpZ4hebY1IK/ PgV/m825SJuT4YgHxQ3vzfstRSAKkVQ8KbkFMPIePORxm+tNd9drkVfj42feEwthkO7T2q jrxo40LdCSc6K3hcFK1cMYp7KzlvVDuYhVy80B3OuIyChsDB5QruLz0cV+FEhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711125014; a=rsa-sha256; cv=none; b=td7se25ZkRbW+SsQiS/ZvEUyTqPp7ncONbH5jpgHO9jWQqE0oAIIYF73TjOCRkK9py/c6z KLswM4ZrOZnOU/BiFfsEcYREeaNZpmN8pm5tJZ9pKD1FV1Ma84WBZTf9Z/93WwHJO8P89x 0n6UgUhUY4nVd+z0I2vBxi7HQIvDG8ZMtcm4gMWUHKRPjavH4dpvdM7UPalKpWmY4JZJYb yPVQLGvIkFPFBPy1oYku2XMQR1DtJt0ijuu6ZMPEEXujBFAdKYQQLVWfgobh2XUTmQtqPG YNlZ2vxVFY42aT82N0RxF79RO0RjKssubAmDW005BoH394Ja/yjqmXP6ynS+eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711125014; 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=ZKddgwzJQ4rm52+MBTF0qZ5qQIzh9VY9ejgfSk9I95o=; b=q7XEwOY3cbg2jdfEvm0Er4l9UYWDShjC2KYHEw9IwHRgp7XErueJhv4YTu1YyzFqRaOEDB TaWP4R9UE/PlyBJnd+vU2Hq1U7UBMgADWbyNRYhfu7lT3F8qOUdkab2AMFr5Q5A5+DVgHn bmTIdZcDgHhPyUEDqS5c02rspY8b4a5p6em1OIe469Q2mhqJzZTgBjsSGThs77tZngSJ37 cDfn82QQcZxsvYpmYwKSBQdtpFU6nAaIyOlRoVu/nuBKRqdBddrRrCzQevN9dFuCjl/ymr TRr7DMTJKQOy89GPtfoLrSDH/q8aEwSssxMqQwhZqlmoyMWK9sA4heihH6ysMg== 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 4V1SVG3C6Jz1Q66; Fri, 22 Mar 2024 16:30: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 42MGUEEj099465; Fri, 22 Mar 2024 16:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MGUEPq099456; Fri, 22 Mar 2024 16:30:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 16:30:14 GMT Message-Id: <202403221630.42MGUEPq099456@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: dc7ae2bc6fad - main - kern_ctf.c: fix linking with nooptions DDB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 commit dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 Author: Mitchell Horne AuthorDate: 2024-03-22 16:26:00 +0000 Commit: Mitchell Horne CommitDate: 2024-03-22 16:26:00 +0000 kern_ctf.c: fix linking with nooptions DDB !DDB builds don't include the db_ctf_lookup_typename() symbol, so this is a stop-gap to fix linking of the MINIMAL kernel config. Reported by: bapt Fixes: c21bc6f3c242 ("ddb: Add CTF-based pretty printing") --- sys/kern/kern_ctf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index 8a2106a15308..b525c274f9e0 100644 --- a/sys/kern/kern_ctf.c +++ b/sys/kern/kern_ctf.c @@ -326,5 +326,9 @@ link_elf_ctf_lookup_typename(linker_file_t lf, linker_ctf_t *lc, if (link_elf_ctf_get_ddb(lf, lc)) return (ENOENT); +#ifdef DDB return (db_ctf_lookup_typename(lc, typename) ? 0 : ENOENT); +#else + return (ENOENT); +#endif } From nobody Fri Mar 22 16:31:41 2024 X-Original-To: dev-commits-src-all@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 4V1SWy2MbQz5FJ4h; Fri, 22 Mar 2024 16:31:42 +0000 (UTC) (envelope-from mhorne@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 4V1SWy1w5nz4Zj9; Fri, 22 Mar 2024 16:31:42 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711125102; 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:autocrypt:autocrypt; bh=Yz1z6FxFrRLRPOCygseqHnCGrIY2t81BarLIlkGCOL8=; b=Yi2lcapyevXFB9MK1YrifGurzvxR6EOMRTxXaGpDq24I6umRhE4dUt5uYm8WKa5CGEeXR7 WjoX/iDfKHqNI+Dq7NTJ25bT+tchCDx7xKy5ptVGnNC+kwyWVgDxIaebgKlFXYV3kVASfa yDzlCOu/9bkv2sOLrg/rx87rjCh5SN1wDMQCKd84Dfa8Bbw/Kx7rv7TZvh9vFa5pm1pc2U dKMGxg0hs6K0fF3zifkOECexXoaWBVJZqRyQVIMa3hXuicokOPDlXbecDOkKV0fGZyY3IR mqj0ywOcPGyidcTA8m0LWxdM1IlMJjsrlvI+JiO9rHTSKhNUjEr9U4jposW7ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711125102; a=rsa-sha256; cv=none; b=k1koYxp+IgrzZz1nQ09fEXW1FNDvy8kYSKfmF9KglDVFuVRUYywpeOKWu92YuvUdiAQmZJ S0tbzNt3tiAZTIXkcJrZWCnSSrSwq8FNkEvijbkg16PkJIXMsQERbSKlSvSzd2YrPBq0sh 4wI3AzxTMN+fMJe0ilLjnZ7ZJoZWtJrbWjxG4qznFGfLdfW7stutedHAWM2GRnDOkdr9s6 s9QrVc42S0nyykslBGL8XkVTXcbCYpsHWTA2LvgNtLlU8cHq99iHdTaxDBjuwuBjWNEIRe p3YtbGuCo17727vhs2FpQvKxS4Kyx6CY2EIO6B5nZCP/w5gKDqWoY3cLdDp55w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711125102; 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:autocrypt:autocrypt; bh=Yz1z6FxFrRLRPOCygseqHnCGrIY2t81BarLIlkGCOL8=; b=jjJ77mOe2GlxVIVafjhVPYcdAi4OKbP+ZdaoKdOA3XEy9jg4SuXK0kY9XCJu/BdINIkww6 FHz8kGypm/Jt/YOavWSh+9Q11epjyNpytPKx7HWZyxIk6XLR2VJJoMT7Loh+71mOeRwNYH /nSfWZvlldTcKyd+yHox0L9KWXWKzPY3pt0Atwfl6mJV1mPT4BHKfmb8fAFuGMKqZ9cKT7 uWn+JxvuD5fkPCgs+EDHc8pDYLOKf2qmCKuFD2P+n4dS02cAm01GBpIQWJElCGei45Rhz2 Tj+BTyCp6RKXX0OtpxD0POzmw6Pa0AyICJCUoIUtX4ROtiYpFz6tpEOgHyCOOQ== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (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: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V1SWx6YwZz1Wr9; Fri, 22 Mar 2024 16:31:41 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <555d3b44-8193-473e-ba68-5b37aff43a37@freebsd.org> Date: Fri, 22 Mar 2024 13:31:41 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: c21bc6f3c242 - main - ddb: Add CTF-based pretty printing Content-Language: en-CA To: Baptiste Daroussin , =?UTF-8?Q?Bojan_Novkovi=C4=87?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202403220356.42M3uJh3021416@gitrepo.freebsd.org> From: Mitchell Horne Autocrypt: addr=mhorne@freebsd.org; keydata= xsBNBFyS2dQBCADdiXBG8hBVLmYbxu7aSzbwLwUf3HkGFz3rooS1kwyy+SfmjZ4UKNnl9WMx WKrJ7OAZpiNH6bLQ5nsqfx09OnpWL8c/QuPbhNdUywQoqqYpRI0K8GEn//nS9Gs0KTYwVpWb XlrzP+jf3Uh/9L5mcQmStLIH4zaaqMYHW+pMuPrvBmLIHTvLj2QjOkxslrcUdord9uvxe5Ht LU8RuTpQpHOKz705Z9/v7twFdi2HtKzpLwO6SzVyu351di1J+GihsVpcT5josQV5cHbIP3Un x+kmtKBEEc/jl/zBglF7ruWUtwgbryID+2ZPEaO1Mj+RResX4LFVMusq3uUpWRb5WJXxABEB AAHNI01pdGNoZWxsIEhvcm5lIDxtaG9ybmVARnJlZUJTRC5vcmc+wsCUBBMBCgA+AhsDBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDpUFCQtC z0EACgkQi/gnTOdUid8IsQf+N8IptrrCgifT5Z0/WUVFfnHThFOKf4zBjaGswsIM8+VKsKnF 15jCWHODUHP6s+dcQ4nQi81PHPsnMfBSkGPvN/X3ess2/1KUVkH+6tAJbqXDjXhD8HT+i0NM QEFIXlLnotpgIKW3yOHjKv3ZvKw9LCvUjyNY9vOJmLk/6AbbkFh+INo65nXtQWb/hM5FVEHW S+zUoU8AqZRJoVAQfj9wmIfg/HdsxeDGKL0zkv5AwKpccvb8VJNGJbCVMgoy5uQYcUeXxcie cg0VlbFLshNQTfyhVQ85vyuHahARrUWs/k8KiYODoBnW1ChtyF8yM6VZTzSYx7pINqPq2YZy i/Htd87ATQRcktnUAQgA3zt4M4ecoQqfxpjliNLujt9klDqvmkJvWmzMuMXdzlPgGRJ0doio 9YIeEdkOt6xN0pPTK/ReCZ8WqFQ8zo23u1pwGuo0CnR58XF19wyxyUuKu/PHbt+56mC8tNHm AXsMyXQmlDqWvn/WzLY7euNRtNS4QQIwtxfM5EC4GGa5KQwxn0kM7dkUSOE/cxr+/kNbHHzb gagZR4cnNUqtPPr3dYXcibCTzgz96Lyt3/qMLXX9RTBRzu+O6E+byxWOe8ar/ZlwY2b4wTQG mhgNttkSxKtxMpZnd8+DGV/bI1P5Ct/K2GeCwNyupQGON5ymn6o7jTch+qmFX0ItkBWO4zn4 9QARAQABwsB8BBgBCgAmAhsMFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDtwFCQtCz4gA CgkQi/gnTOdUid/i5gf/aQ75pJR4TJFM2vVVr6PDIwTdl0b5EchB4w4s4g/zE84XNbMOQanb BginLYEhAacLQVAvM3XdvUEhwrhaMQdjdSEB1krResL3/mbxrtKwdHSMbHA3IS3XdvxFWTB7 P5JjUSPsW6hqgoidbn4w3OxaNHhs45H2b0Nx5QiKcSyepmCZuB52gCEHnEnrdaz8TFQMXOLq 94WbTmZeIjChW3FB61m1gTf0UEFjoZAfTAUB+pbwoCa4AykIeZnDC19vjsruVU9Gy5rLglwd bjsZNfXIJGOZNEvdF8FOBwM7DlXx7SYvTJcUNoNJjOKtQ0bYGVgGqYOB/y2mTjVuKeU0eOkN Uw== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 3/22/24 04:38, Baptiste Daroussin wrote: > On Fri 22 Mar 03:56, Bojan Novković wrote: >> The branch main has been updated by bnovkov: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c21bc6f3c2425de74141bfee07b609bf65b5a6b3 >> >> commit c21bc6f3c2425de74141bfee07b609bf65b5a6b3 >> Author: Bojan Novković >> AuthorDate: 2024-03-22 03:01:34 +0000 >> Commit: Bojan Novković >> CommitDate: 2024-03-22 03:03:33 +0000 >> >> ddb: Add CTF-based pretty printing >> >> Add basic CTF support and a CTF-powered pretty-printer to ddb. >> >> The db_ctf.* files expose a basic interface for fetching type >> data for ELF symbols, interacting with the CTF string table, >> and translating type identifiers to type data. >> >> The db_pprint.c file uses those interfaces to implement >> a pretty-printer for all kernel ELF symbols. >> The pretty-printer works with symbol names and arbitrary addresses: >> pprint struct thread 0xffffffff8194ad90 >> >> Pretty-printing currently only works after the root filesystem >> gets mounted because the CTF info is not available during >> early boot. >> >> Differential Revision: https://reviews.freebsd.org/D37899 >> Approved by: markj (mentor) > > This breaks building kernel MINIMAL > > ld: error: undefined symbol: db_ctf_lookup_typename > > Best regards, > Bapt This should be addressed by dc7ae2bc6fadd. Bojan, please have a look to ensure that it was done correctly. Cheers, Mitchell From nobody Fri Mar 22 16:52:43 2024 X-Original-To: dev-commits-src-all@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 4V1T0F6HHzz5FL8T; Fri, 22 Mar 2024 16:52:45 +0000 (UTC) (envelope-from bapt@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 4V1T0F5pqLz4f1p; Fri, 22 Mar 2024 16:52:45 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711126365; 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=fE1ZzRDgRBVoUuVbVMNoco9aa83fW1alLsSXvauNNoo=; b=sg8rCrl/f2nioZ+FCD/N2He/mA5eG6qg8RHUFdp0dC6a8k3Vv59ZFtam/R+0dvbjRV4u9/ k3Vp0Pr5JC/JiNtXc4qdaVz0EJPTAdXQ5ch1SDnAkfQYWyAtqkSEuN4QpJJ5J1Avuc4NX8 WeMyhErY/gFoJHzqrx2mk4XsnJI38w53SmsaD1SzY+PcpEJWCWOyacC6pGdPzYF7hdOY+V srqTr6jSJBWLAle+O1wepNfWlA9y99MLaFN0kczVyXVqZt1OEKh0dg9xSrIbBQp0r67B/s z9yEyjpNYURMoaKRfxQDTeDcHeOLPDRpLGLyjN4rNmV9xzVkjWtjDTYGQ3WPjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711126365; a=rsa-sha256; cv=none; b=j8KboHaNEGVP24BsM9x0gCr5NAXXJieYhN6CklUuNM/Edqf+ZSMkL5LDU1E51jzku9kzen q1+x+yFu/364Dumgx88R9v7VWRyZhk8ytXL9AYUMg2RkDeMpSj5Ty5Cv+HhoEU9O3QWrAi 4dZYpR0eXLvDMMDksA9LktGV6q7XlkJickpyyTn3l7ePFdQk0Bq1D4KWughioU2hih2fDx l3uuggBjXfXY8HFLcv6saKoV1ezw+DpxoW6dm75CzO6tiKUK7dF6ZfKxFAhxMX14aZHHrQ YHwg0YgMSHZPd5KeGobN5JOHA62awbYS4Hs8CRTcI2XVyX6LjQ7+LE7gc3mZhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711126365; 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=fE1ZzRDgRBVoUuVbVMNoco9aa83fW1alLsSXvauNNoo=; b=I12afx+cXBALaXT4+MsDFQ18KsdVzWJgIsBTKcC+DNOLoIdaDDWVJ8XLkLWbMcYbUbGDJf TswNkf0bjd4+qnb8eFsgZIg+Yhepx7HQ5Q6eAwDC93kHVu/lbUO0dNQOTKBHQrIu0AFaUb v3hDYdzKzZXcOg8mcT0iJKMa9bo8tFH9GSrcrUi6PVWwwD8+6LV0vIMGL6nQkT14S3BwtF oFV4K1XmFwIhDc7+419QKnjgvztExQc0XHQ7deTigeeavdBgniHoqCaEeJx8adjfT4bc8B fk4JHkM6bYhRd7D/kfkV5/7rt+mzH1RO9THB5UlSjl+Q8MO+0/Htw10JQAxPeA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V1T0F4sBcz1YfJ; Fri, 22 Mar 2024 16:52:45 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id C3C36221D4; Fri, 22 Mar 2024 17:52:43 +0100 (CET) Date: Fri, 22 Mar 2024 17:52:43 +0100 From: Baptiste Daroussin To: Mitchell Horne Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: dc7ae2bc6fad - main - kern_ctf.c: fix linking with nooptions DDB Message-ID: References: <202403221630.42MGUEPq099456@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202403221630.42MGUEPq099456@gitrepo.freebsd.org> On Fri 22 Mar 16:30, Mitchell Horne wrote: > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 > > commit dc7ae2bc6fadd67cef0e1c65d79aa82818ac9793 > Author: Mitchell Horne > AuthorDate: 2024-03-22 16:26:00 +0000 > Commit: Mitchell Horne > CommitDate: 2024-03-22 16:26:00 +0000 > > kern_ctf.c: fix linking with nooptions DDB > > !DDB builds don't include the db_ctf_lookup_typename() symbol, so this > is a stop-gap to fix linking of the MINIMAL kernel config. > > Reported by: bapt > Fixes: c21bc6f3c242 ("ddb: Add CTF-based pretty printing") > --- > sys/kern/kern_ctf.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c > index 8a2106a15308..b525c274f9e0 100644 > --- a/sys/kern/kern_ctf.c > +++ b/sys/kern/kern_ctf.c > @@ -326,5 +326,9 @@ link_elf_ctf_lookup_typename(linker_file_t lf, linker_ctf_t *lc, > if (link_elf_ctf_get_ddb(lf, lc)) > return (ENOENT); > > +#ifdef DDB > return (db_ctf_lookup_typename(lc, typename) ? 0 : ENOENT); > +#else > + return (ENOENT); > +#endif > } I can confirm that pkgbase builders are now happy thanks a lot! Bapt From nobody Fri Mar 22 17:03:33 2024 X-Original-To: dev-commits-src-all@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 4V1TDj75WPz5FLxT; Fri, 22 Mar 2024 17:03: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 4V1TDj6Wqhz4fxj; Fri, 22 Mar 2024 17:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711127013; 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=QdL7mYPcY8YKRrZb1oX61Gq4m/KedFvqPe4/rwBr3qY=; b=OpWv7pGEcJr3nxfTOF4oM7b6iDZEmyOItfa9SnJ2F9lZWUs0KaBzFzXgdWHKkxH5a7FYUg M6T4L9SOBWMJ1KJ9moGoEYBOn1Ad2HbHvJb57rIQJZlCPlWnIYTFECxoe9clObLDOcLxf/ 7i03kAFTCgxtaUtm7+buZNV/1T28bkKfk4nfCO6CpFw+FURsrFW3Vqd5+qViP2ZaREHily vjL6cI8O9mZx0+rK2vqv+3Aq5wrbH+QFkTHBs1YC4SnibZNNzwvrTO1jwHAlgvNPRlIIML pCY826hmvKTmu9RTY1+XeWitbnJkNtlSezLQ9bL+/l273X5YRsbwgKgTn/txqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711127013; a=rsa-sha256; cv=none; b=iMA4TelnIb+ldFaB79akaL9nM8LFUUWTqaQdDXgyRqb7HoWx9kAVjlTNmEDoV55B+JczkT 6hK4XXjNxeD+Dvc1CYyojCOKh4mR899LfbYZ5NqD1fMAqrNPvuhzY5R30grewtB5XXYvrB AP+A7NVu6iyKVoyBuQ9qz5Ayp/pQLE0Yli66c7MKlko6vnKBWTrT7uYPM7TdJD2/lIarRM 6tuBul5xYAeNxB06b79YeVT0BqAUrJoIwTvkO20fMi9wKjcN+hQIwnJZGUrszySJzJbAIR lk7njc9HpLJtUVaClcx7LNJ3hOG0UrYRTdJYIQkEvyOJJ1rLJyM1NfUU3gs6ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711127013; 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=QdL7mYPcY8YKRrZb1oX61Gq4m/KedFvqPe4/rwBr3qY=; b=TSUdW1IIJLyhJWlTDVXplaS/YckecQXeiGM72Sqm9U5HEZy0S5moPdpm8N85OfGaOKZ2g5 0pLgyT+bhxvyGbNvsRXuI2GxP6znm2cp+zyzNyJXK3WpQOabW1x/RCcUJEGlnr+Y4jM3ra L2y95KCKRxb4Et44QLdMoy85ikP+kDnSwovDXOq3PVtJRM+zgFsBOWYQV4bhOQlnJy+cUy Hoss5AvnHsHW+nNnS6wB30fsJvC0kxF65bAr/lwKhwiz5mboYiZesxOXsOKvSRuVdwaHbv k/gjmmB1novANRfJKTa5Mli9U2+w3MuUpvOb20L9NdpXoXrmn4Qpv8ulMpS6dA== 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 4V1TDj67CCz1RRt; Fri, 22 Mar 2024 17:03: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 42MH3XO3060098; Fri, 22 Mar 2024 17:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MH3XPm060095; Fri, 22 Mar 2024 17:03:33 GMT (envelope-from git) Date: Fri, 22 Mar 2024 17:03:33 GMT Message-Id: <202403221703.42MH3XPm060095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a977444652a5 - main - cloudinit: fix creation of cloudinit ready VMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a977444652a59332c53b652b912c38a1d1802b58 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a977444652a59332c53b652b912c38a1d1802b58 commit a977444652a59332c53b652b912c38a1d1802b58 Author: Baptiste Daroussin AuthorDate: 2024-03-22 16:58:48 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-22 17:03:27 +0000 cloudinit: fix creation of cloudinit ready VMs The framework do not support multiple format images, so this last minute addition of qcow2 format was clearly not a good idea. while here fix a typo Reported by: cperciva --- release/Makefile.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 2b252aa18c3a..a52e3b9bac81 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -30,9 +30,9 @@ AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST?= ufs BASIC-CI_DESC= Image for CI -BASIC-CLOUDINIT_FORMAT= raw qcow2 +BASIC-CLOUDINIT_FORMAT= raw BASIC-CLOUDINIT_FSLIST?= ufs zfs -BASIC_CLOUDINIT_DESC?= Images for VM with cloudinit disk config support +BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support EC2_FORMAT= raw EC2_FSLIST?= ufs zfs EC2_FLAVOURS?= BASE CLOUD-INIT From nobody Fri Mar 22 18:40:14 2024 X-Original-To: dev-commits-src-all@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 4V1WNG5jXqz5F3sl; Fri, 22 Mar 2024 18:40:14 +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 4V1WNG3cXLz4rll; Fri, 22 Mar 2024 18:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132814; 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=oWNIYnnbUZxwZlnz/kclxKTIxf0SCz1fg6LEA7eUrr8=; b=QG+M/JtPEMRtFzQfu5SOIe1nR203HIBGD4nAn50XuFjH+F30PlHm/6qdh4rxyIZ7g1k/T2 C865jsUZGc/BSZjwMU0YSjJ8avY1CEXGI5RQVbafJl/BgYTUcYRz+Xf4qARw1R9ZoFo2HT VD2SiFJF3EKp2wBYr9Wi3kePNO+SbUR1aIPEu7PX3PhgTj4Wg7rVr7XSHBVzd0+wu1I/rC S5M02D1dKLHq4TwXaq+TERk2Jh/MatB4NTZSx7dDDar07rk0/Tj13C1vzTiES+hOhZqRm/ 1Bj2dZeQhD1efVlZrQz9mdZZzyHjcnd6PNcBIgxLXsQRFh29evDI3ZRBMBDSnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132814; a=rsa-sha256; cv=none; b=AQUdXuQ9vyW3kLt+frdlccIB8fhdg0J+nnjTduLmzizMClzwQrqLsV7hYz//x8oAA0E/ta RaktsCY6b1pKBFTHWsX10sIUUaBJzWXJaO1CmKj0S4iJPi07ppvYG4hJfdNzVjnPpF+HNA E/qkO9WQDP70AREa82/erAkwt/SyUyCkLQDjhx3Pjsf7OJOe1a0ddjd4RonCCxa87m62A8 OAzNgtyKDCohPFEer5WjFUgGW4ut4fBaK+3ndy8IoUQtFoR0OgGUNeRFqLdaXaOgDbRHkh nAufShH4rltuSb8prUxSXPXcG44vxuItOJJi371o/cFRpY/jo84KJYHUxtLH/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132814; 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=oWNIYnnbUZxwZlnz/kclxKTIxf0SCz1fg6LEA7eUrr8=; b=riSWgTAjbOl/BQjr8Z5HhWSeIFCEzk0ZPNuS/NgRR4OVbHGNLKCP3TKgB+Qvcj6fgSV71T fyQ1Iv6YTV+TYTmexYEDtbN+43L8gvVTiVgcyj538Md+A98T04bdlQqDX1xEqKxHF9JIKC S1lcRSg1PoXscKr1y2AFF/rjr2sRCzh5wwGyYr31s7BLM0mrzHGeEUvNYRKPHV7O9q0Svz 7vUGM425rzK6dpWJnCnJehztw6JEtofbvXbcFnF/y3SMEkWRkj32bEhLR+lFiG75PxYH2R uMgDFCcvJ+IC96ceAJpwaQLsygMZ+xWcXnsrY6QaogEJEhw5QqvwnXCEc2Nmaw== 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 4V1WNG3DvFzFpt; Fri, 22 Mar 2024 18:40: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 42MIeEhN019819; Fri, 22 Mar 2024 18:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIeEKr019810; Fri, 22 Mar 2024 18:40:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:40:14 GMT Message-Id: <202403221840.42MIeEKr019810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 806e51f81dba - stable/13 - if_wg: use proper barriers around pkt->p_state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f commit 806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f Author: Kyle Evans AuthorDate: 2024-03-15 01:19:18 +0000 Commit: Kyle Evans CommitDate: 2024-03-22 15:21:42 +0000 if_wg: use proper barriers around pkt->p_state Without appropriate load-synchronization to pair with store barriers in wg_encrypt() and wg_decrypt(), the compiler and hardware are often allowed to reorder these loads in wg_deliver_out() and wg_deliver_in() such that we end up with a garbage or intermediate mbuf that we try to pass on. The issue is particularly prevalent with the weaker memory models of !x86 platforms. Switch from the big-hammer wmb() to more explicit acq/rel atomics to both make it obvious what we're syncing up with, and to avoid somewhat hefty fences on platforms that don't necessarily need this. With this patch, my dual-iperf3 reproducer is dramatically more stable than it is without on aarch64. PR: 264115 Reviewed by: andrew, zlei (cherry picked from commit 3705d679a6344c957cae7a1b6372a8bfb8c44f0e) --- sys/dev/wg/if_wg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 89b5e52b7b2b..6638524301b8 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1519,8 +1519,7 @@ wg_encrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_send); noise_remote_put(remote); } @@ -1592,8 +1591,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_recv); noise_remote_put(remote); } @@ -1649,7 +1647,7 @@ wg_deliver_out(struct wg_peer *peer) wg_peer_get_endpoint(peer, &endpoint); while ((pkt = wg_queue_dequeue_serial(&peer->p_encrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; @@ -1691,7 +1689,7 @@ wg_deliver_in(struct wg_peer *peer) struct epoch_tracker et; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; From nobody Fri Mar 22 18:40:17 2024 X-Original-To: dev-commits-src-all@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 4V1WNK3LJBz5F4BD; Fri, 22 Mar 2024 18:40: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 4V1WNK2TVRz4rvD; Fri, 22 Mar 2024 18:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132817; 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=RLkmp0rQv8aIxdp9Dn+bEyfb5v+z9h52PLnxG7AAsA0=; b=MeCeuOJPHlL2XTHZRPlP86cIWTjuQzAgnHwkZnOXx+Qra7tY3/PezvB4F7wYfTEtBdf4Ot 2Stx0D/GAWT5RiFKTvK4U2p/CrI2IUwoo+NAyEJWLqD1T+C3C3uA3J6y9GIPk+mn+Tqdmn LVEDUaTm73lnaviXY9cOSdBu+Auqcbanx/aAnjHyEbigrBfNLv2UR27X3rqPubfGmyX4Ra x919+NyXFRRvjIkFXme5zXzDG8ck8sfmx52ZjzH3DnvR/Gk/wNo1COcoC2z+1cSOIecx63 +BcRIMBujibhaGo4HeyaBizb6LixK/JBGZb1Zmcw6do1LcrCUaI07bHSJJkdLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132817; a=rsa-sha256; cv=none; b=YXO7NvcJAe3gUcB4NllotX54gbxuAQHnMBv9UNRg52gIKeWFXj1tPrM37YyK5f5ZmCDl+6 pr1yOxcSpAzavb6qLhas2LTpDC2ujoNlyL6pTz5hS3RGoegSxtwWpeTLAYSoZzDEtdghlr uD9YY22Jm9ojf9BNi8831lxdHR4WnFnCqh4aYR+V62MXT/1XZzUtZzYkW7y8Kwbzxs7lYW dFHJ9BA6YicePicOMrHOBM21b2dBXXhumJtUk20FQkBV7ntMpLsSyhAWX9sJTVUINcqu71 f/0AMzgou2ItGhkTkJ9PSdxRKho88w5rUNZg1SgObkhQ8UnPbfmIhHNyabAfeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132817; 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=RLkmp0rQv8aIxdp9Dn+bEyfb5v+z9h52PLnxG7AAsA0=; b=uU2xgjH8Eoo98VY/iGRWNSqTYudgkkD9eq2I6PhIPzdFdPWPUV2zAMdBpgQuRJ//JKj27d HtPbrH99lzYmj0YLxtE19G7yeFxH4vuBVeliWRgLQ5K7ZmMr9sTUUCYIBbrQ9hytLMNvAu vOR1bzLjBOXhVOh0UBCL2W6k+LIQQ+FlUqu/C+BJBUXo7mM45rr9e2E/k1ii8HshJtbXsR nKw0YqsPOkct77L8Fl5Fl/IRKGAahSNrlTtZoZ5JPx77AqEctplKD+zE9FgxdGyWzy+gUp gjxF91fz0ziF1SF53DZ27eYGCy3UrFfRdEcDQrCIhmFORVTjpbWAUkvKvYokhg== 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 4V1WNK22G6zFnM; Fri, 22 Mar 2024 18:40: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 42MIeHlx021561; Fri, 22 Mar 2024 18:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIeHce021553; Fri, 22 Mar 2024 18:40:17 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:40:17 GMT Message-Id: <202403221840.42MIeHce021553@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 590e02d3c088 - stable/14 - if_wg: use proper barriers around pkt->p_state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 590e02d3c088b220c19d53ce40a5aecc6fa099e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=590e02d3c088b220c19d53ce40a5aecc6fa099e4 commit 590e02d3c088b220c19d53ce40a5aecc6fa099e4 Author: Kyle Evans AuthorDate: 2024-03-15 01:19:18 +0000 Commit: Kyle Evans CommitDate: 2024-03-22 15:21:39 +0000 if_wg: use proper barriers around pkt->p_state Without appropriate load-synchronization to pair with store barriers in wg_encrypt() and wg_decrypt(), the compiler and hardware are often allowed to reorder these loads in wg_deliver_out() and wg_deliver_in() such that we end up with a garbage or intermediate mbuf that we try to pass on. The issue is particularly prevalent with the weaker memory models of !x86 platforms. Switch from the big-hammer wmb() to more explicit acq/rel atomics to both make it obvious what we're syncing up with, and to avoid somewhat hefty fences on platforms that don't necessarily need this. With this patch, my dual-iperf3 reproducer is dramatically more stable than it is without on aarch64. PR: 264115 Reviewed by: andrew, zlei (cherry picked from commit 3705d679a6344c957cae7a1b6372a8bfb8c44f0e) --- sys/dev/wg/if_wg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index c324b5fb048b..25fa53c2e672 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1515,8 +1515,7 @@ wg_encrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_send); noise_remote_put(remote); } @@ -1588,8 +1587,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_recv); noise_remote_put(remote); } @@ -1645,7 +1643,7 @@ wg_deliver_out(struct wg_peer *peer) wg_peer_get_endpoint(peer, &endpoint); while ((pkt = wg_queue_dequeue_serial(&peer->p_encrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; @@ -1687,7 +1685,7 @@ wg_deliver_in(struct wg_peer *peer) struct epoch_tracker et; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; From nobody Fri Mar 22 18:43:13 2024 X-Original-To: dev-commits-src-all@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 4V1WRj6vwFz5F4gH; Fri, 22 Mar 2024 18:43: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 4V1WRj65nfz4snF; Fri, 22 Mar 2024 18:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132993; 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=POI/p/ja7DDIPakQ/G6a7FP3D8Td/2enYlA3jxkJq78=; b=GXIQdlWgYzeKOYntN65NVod90JgQw92Zf1MOP3WOsZh3kISyJAtPGlg7yTHW6hUajvuAHJ e3QLZ6+rWSedrgCSS4CNkR5nyvao3xu5SiFsWl18Qa0efPVmG1k9r4UIKJ9XecT0UgIY/v yukfZHHw9jvBfpXaKQbZGGy9orTPYpG7ybV7cC8a2orEZfCD6WNUWgdh3HyLOdtzTA+u8I fNYARGAeN3dsY8WyMbcwz8s5XH76F71vSIQd+BYL7MT9rgPTlIzNjlYCU3e/+JfKbupzvV kN4NdwXTx395kApmFvTR2rskrCpCQxhyT1XVPohSDub1I+hfNZslkbZGFWw3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132993; a=rsa-sha256; cv=none; b=kuEg9vspbZi3wa8B67o8bcPGlD4iFAKBm6HsKtz3kJUOOWtad/jBmHP1O/J9kgke76lGTT pe1u4/HylMNWgZXu6ZM5VogyXALZQ2VXnA3OyWLRDfaqDHyeUWV4/ALD50c4zWUDFUEUGN UZ1mp4Hh5+9Cz3dhGwcoPeUQtIT1pFy9OptkprHYTbkD8s1KdO6Cm03WE8iFqZf8E2PUXh OitXo1FQeQFMEXjxeDLfNcEQsfN6FfjjJLp8AGoI6WF3aR50y8XsiWzHNln+9cuYtMMjqE NlUQVEM55huhm8D890JW1Iy2u7ofld+fc/EhX3pUutRADnzDoup1odtX6ZpkeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132993; 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=POI/p/ja7DDIPakQ/G6a7FP3D8Td/2enYlA3jxkJq78=; b=E/MgFbZgRaaniDx1x559vDj9FzBe2Lk4R5XaN6dlbK+q8Mdk3DHlJvf2qiV+eth79sfQlz Lx9NxSQqcLvw0TNOAPHsaSeZBX/IFa7Jnkbp3Bd35Esv9nloGeK769FviGGi9mk3N2K+a9 CY9PstRXi+/bIuruDHfgMuk6JkDHqX2sEDSNcPRJeJmzeASzwNVd19JlmECLUiacm4E+3I gkgQ+80pvejTGwhmNdw4ryjtaiHludkmZ8Y5tS8O12V6ZziM98LKPOBMeApuGPXegXtOHr gAa2AETAPVAojAXuT0rShEw9qRHiawWc/HpYHj1ZGLN1gf4kUP3qwOp+fjUIKQ== 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 4V1WRj5g6WzG8t; Fri, 22 Mar 2024 18:43: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 42MIhDox029279; Fri, 22 Mar 2024 18:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIhDrv029276; Fri, 22 Mar 2024 18:43:13 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:43:13 GMT Message-Id: <202403221843.42MIhDrv029276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a323dd42bcac - stable/14 - bsdlabel: limit to 8 partitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d commit a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d Author: Ed Maste AuthorDate: 2024-01-23 02:05:58 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:42:59 +0000 bsdlabel: limit to 8 partitions bsdlabel is intended to support up to 20 partitions, but the disklabel struct has a d_partitions array with only BSD_NPARTS_MIN (8) entries. Previously, an attempt to operate on a bsdlabel with more than eight partitions resulted in a buffer overflow. As a stopgap limit bsdlabel to 8 partitions until this is fixed properly. PR: 276517 (cherry picked from commit 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2) --- sbin/bsdlabel/bsdlabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 766def59ffe9..56190bbf6858 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -63,7 +63,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; #include #define DKTYPENAMES #define FSTYPENAMES -#define MAXPARTITIONS 20 +#define MAXPARTITIONS 8 /* XXX should be 20, but see PR276517 */ #include #include From nobody Fri Mar 22 18:43:14 2024 X-Original-To: dev-commits-src-all@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 4V1WRl14FLz5F4gK; Fri, 22 Mar 2024 18:43:15 +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 4V1WRl0HbVz4sF0; Fri, 22 Mar 2024 18:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132995; 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=Rm9YPEMLFUuygOzbxBYedEH2ZUt5t+TxGk25XF19ByU=; b=hi9y2kI6CgYpPNjHEzKBy+Xqos8Rq6R5vRKrp/OiW9VC7zswSvjMdJgJg5vxfvuLdWD1R5 EE/pmdYN/4XGGFZ3VGkmCVYH/XiBKvHuNURz7GjdoIZPpvH+2PTNGCagjkNW5WZPwici0F R8+kwtk/f9w1oBzo+Ysm0AV+TCSWtpbdE9tqpA3BpxvvS0BjPT4MBTgOXdZoPxX2eS3Mqa S7RVrAm3bb9hLFYqI3rvMdzI8/Y1WbaHGf32Z4gDNxbFsdbvHJ7UPBgVz8xVO0iZCkiBdK w+gBFsZ1M0I05/1t4uXod9uckJvT+6zMhy/OMrO6lgnEdEMlOYhQRujcZMnu3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711132995; a=rsa-sha256; cv=none; b=bxmyZHLblvdpZHXHXRSGilW1Qv8ZOZDs6L19+uEuNuamzlJTLcjpsV4Effkbad5sOh4fRZ f3HED4GMZMCJE9N1af+qt3kYGghGVhVweZIpTceyo1UxjCyR1cyqOYgB54d/sv+XKjlpdd ff6wY4iv61EIDVKYFRrowLiPZzT4JbsEDqdD4A2AUlQ6mTjTnGngfkJOFC8bLYqIjuicy7 zVjpUAQAlOeyan+ZkGY6ui+cqPexDF1658dRAHr1Q3xjLyw6m/72zCzSJaUmrQPq70leXZ Lg19mJUqmnijIIOLU2+dChVtrT9GP0MF2X2tK7zgRyI31xlQthPW4JsqSSkLmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711132995; 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=Rm9YPEMLFUuygOzbxBYedEH2ZUt5t+TxGk25XF19ByU=; b=mteSWowGjAocBPJxbnmoKK7eWqV3LAoo77Ud9Q7soE/NBvb4/OjrMbVG4GyjJ6GtFVCdeS 8u4HMfS16EEZRQHi7TeuKORsLEwTI7KgoHSXHldgjawufto2JfmyIt9+SDmp2asfSY8MH0 RhpUn/xJaK5ObCgYZNalUcWgsK340BM2z3eRQm6prqcNgpLNCYd8LHIIHLtgP7EAnv8ksx bfKWJppgqlN9pgjB0wvvgp5VvTz1RfdK8jwxTE1CqpWlPWuvGxbz9LcPexUNCsZfkh8VwS lh3Xzwmrlh2KBurAFMJcmAaKt6w4z4r+4Pl0ED5W/FKrpHYHEcVeOS8mNs9hZg== 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 4V1WRk70kxzFsX; Fri, 22 Mar 2024 18:43: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 42MIhEvV029339; Fri, 22 Mar 2024 18:43:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIhEKt029336; Fri, 22 Mar 2024 18:43:14 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:43:14 GMT Message-Id: <202403221843.42MIhEKt029336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8e402178193f - stable/14 - makefs: warn that ffs sectorsize other than 512 may not work List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8e402178193f7b273a956b864d8d8b288ce62ee7 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8e402178193f7b273a956b864d8d8b288ce62ee7 commit 8e402178193f7b273a956b864d8d8b288ce62ee7 Author: Ed Maste AuthorDate: 2024-01-25 01:47:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:42:59 +0000 makefs: warn that ffs sectorsize other than 512 may not work newfs always sets sectorsize to DEV_BSIZE (512) and derives some other values based on the number of 512-byte sectors per real sector. Similar logic is required in makefs. Until that happens, emit a warning that the image may be incorrect. PR: 276571 (cherry picked from commit 176b9e0d724b4c1a24d2c46a1256381784f04edc) --- usr.sbin/makefs/ffs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 597379cc1a4c..97c1d6ccefda 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -340,6 +340,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* set FFS defaults */ if (fsopts->sectorsize == -1) fsopts->sectorsize = DFL_SECSIZE; + if (fsopts->sectorsize != DFL_SECSIZE) + warnx("sectorsize %d may produce nonfunctional image", + fsopts->sectorsize); if (ffs_opts->fsize == -1) ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize); if (ffs_opts->bsize == -1) From nobody Fri Mar 22 18:45:25 2024 X-Original-To: dev-commits-src-all@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 4V1WVF1hKsz5F4dH; Fri, 22 Mar 2024 18:45: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 4V1WVF0sTFz4tMs; Fri, 22 Mar 2024 18:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133125; 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=2HFImihndat1Cn6QTkhlcg/aL+zuA4O35uyRJOTLRaI=; b=pvNbEctlqUs3KvNndKVfuimlZnnHNY7Q5RSK7oHydX7az3Oyin1Y6lygWvPCJRa3WjIs8S 5iHKmJd52FnDgQLjqhx0pN0nQI/gB+yk0W63qMn3iSlzRIWaEl81O7jCMgq52NRgh1+dev bWGJmk8ZSePTKtA4MwArVP5AhEg32GTFgqh+LAyMj/7C5rJoV83e5fxhtC2+E+vW8daMcY Rs7RcPPtMrmN1aGYi2H5rFLBe+lF7SFTgCvx3//vTKmrNCqbBNZHdbCY9+4UBvfykB4NbK d4qP/yXt1Wy9thB0YUBh4kHVZbarC+8eoThStUm2uruKPd0P2NxwiRa26kWdjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711133125; a=rsa-sha256; cv=none; b=ooqQ3YKX97kgT95gPaZ9ONx9nZCXkW8vKp6BdgYg/W+Bqh06MeVaXnRK8w/LgyvOsGyA2f yd7ZnhIKeO7HUvpbdd6dy5dEjnh+TcXnRWRuCsWJtm/vohXGONRNk5IxsuIwyyyUjKtHOU srQ90i1SF5TfUNAXTwWXQuv0izgHyEbzZuykSEpjZbMEnybxXrVNFrNBHzDNrsBOvFIqC6 XlF6xIjn3+stO5YtsoC5rRnANvjTo6/8ldNKlGq0rFqbyVksaytATUWNJ8BevMZjKwu+Oi 8DBLqeoL1LRT3xvzgBdirjbH8QjpHygDYC/LENEurI09906TzRkJmRPrKi1c4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133125; 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=2HFImihndat1Cn6QTkhlcg/aL+zuA4O35uyRJOTLRaI=; b=xV99o84Zdo0B/4P/HCsNH7U6vE15aMOV05vuS7RpXNImUn2lKQvFSi8gCvgAoOcBDsBPv3 J5qJUquP6/ciVLvRC96iPwBQirZ33TSH3LP3Y1A76VQr3WU055MPjD9imlEq3s+i/gt8qA zV1AXavU+0N3YlGGaLQMQnhmVDLqiErNrc8dT9qyB+tkoiqlaUb7+yIK57oEpHH6G9ucbG 3jtMkiNgPB/0Wz4vNebvF4whNRY8YRBC31dyotxpPj4cfsjUzAcOgmHinkIVI8j/tVkxa1 PUr1n2PD7QntgGt4cP0HDzwAFkMtVieVzzOHQdl4Ov5Zs0A8R8Q6ilDRGFL5Ow== 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 4V1WVF0TmyzFyb; Fri, 22 Mar 2024 18:45: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 42MIjPgH029960; Fri, 22 Mar 2024 18:45:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIjPaB029957; Fri, 22 Mar 2024 18:45:25 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:45:25 GMT Message-Id: <202403221845.42MIjPaB029957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a59eba2caacf - stable/13 - bsdlabel: limit to 8 partitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a59eba2caacf82f741e8bbc334b2382c615744df Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a59eba2caacf82f741e8bbc334b2382c615744df commit a59eba2caacf82f741e8bbc334b2382c615744df Author: Ed Maste AuthorDate: 2024-01-23 02:05:58 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:45:13 +0000 bsdlabel: limit to 8 partitions bsdlabel is intended to support up to 20 partitions, but the disklabel struct has a d_partitions array with only BSD_NPARTS_MIN (8) entries. Previously, an attempt to operate on a bsdlabel with more than eight partitions resulted in a buffer overflow. As a stopgap limit bsdlabel to 8 partitions until this is fixed properly. PR: 276517 (cherry picked from commit 3f4f82c0d7791bddf2d6f2c29d9f2f8c48c712e2) (cherry picked from commit a323dd42bcacdcd6b710fb90ba6691c6ce60cd3d) --- sbin/bsdlabel/bsdlabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 7c7a5bbd6219..5f45039caecb 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -63,7 +63,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; #include #define DKTYPENAMES #define FSTYPENAMES -#define MAXPARTITIONS 20 +#define MAXPARTITIONS 8 /* XXX should be 20, but see PR276517 */ #include #include From nobody Fri Mar 22 18:51:29 2024 X-Original-To: dev-commits-src-all@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 4V1WdG0jDqz5F5J6; Fri, 22 Mar 2024 18:51: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 4V1WdF74c9z4tYW; Fri, 22 Mar 2024 18:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133490; 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=K66QSyxpfTR5bqX0OcyjqsOrQqYNy7eKCDVe9hj93Ng=; b=E1crIs4j8q34dVVLwWlpRVcUne+wSlcjPd1mM0hSrNYjJNvSSDraJM/PgM48BBOidkaV1E RRvUHA+iLK9YoLagPFuffWEeMXwNs3yFOQyxsxRzzQZDoyK2cO3vDozSyrwONzGSl2gKEJ Mi1LJ4mK5A30k6HdTizjjOLr2hkeKd5VdTRThCzM0oOeKe7ANqUsQ5Jes284pePiuubbx5 WlyP+5XxatEC9CEjJtMinWycgn5LqB4LGpX6t9/sU88AVzjRg65ZnUQWgg6B3HOidYnRjU XyWPVxT/Ad29moe7BWdx8HwFK2hJaLAl1Mg1Eo9dO0H4k++79I6QnSudBTKZpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711133490; a=rsa-sha256; cv=none; b=bfWwrbY5z/zIGHlnwByQ2nRjocwGjXVRtN8Hfp3DQUOmrZ5SrgQ59CQvrxWM/vdCLAE8GX R5Is3cp1YXTTZ5bRoFruBg87O9cBN8fxvm+R5ynwtIVmhtzrVLJ0rzGahS3sSW+RFGqUlr GnpBw3+93MWQQ7wJAiRGdu+NM89jbfxtJKWG8u4A3wqAQMqwvNIQdg49HK5xh/2VOc/isc 3/4pL0iJ47nFrlX35Hn39Vw5/XgXq9CjQR8+sibA6wzcMyqeqljSbwsi7/w9tUFZO2OMtE y9v9a7EF2fygDRIqCo/VFZhtZ4uDRVy8JeuSn8xw6h8zjl4INsZbaBSd1ub4YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711133490; 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=K66QSyxpfTR5bqX0OcyjqsOrQqYNy7eKCDVe9hj93Ng=; b=ismV7DyBrYH0krxiyUT/7/WpQEZIhymALwWnNGC0hC8090qsPmlNFF46Rd1GwqL8fDYoO2 ezMLpvd2mhqshLTlnqT860I4bIxXGPxpOv3pn7PorHeFgqHXkPyMrbEqpJ9PujJOMuffv6 RJzKv0y4zhVDitkP+Lw6NNixC4u5Ve2e6OnXtWaaMzfdgFaSehRuAentkjgTRdoPGdz4kI lifOhQArhJ3SBjzK4yMCz3AdxqBrrPpCUivRAuS7oSrXIrGFm9p/vBQEgWFbohRjsDSvM+ 0UPxmgikPPyvr5c4ytWBmww7bSddQGa5z4To/n6ZW5VkjEUM7fppFhr6BIVyzA== 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 4V1WdF6gdNzFrM; Fri, 22 Mar 2024 18:51:29 +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 42MIpTVB044847; Fri, 22 Mar 2024 18:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MIpT0q044844; Fri, 22 Mar 2024 18:51:29 GMT (envelope-from git) Date: Fri, 22 Mar 2024 18:51:29 GMT Message-Id: <202403221851.42MIpT0q044844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8669e516f0e6 - main - ccdconfig: reference gpart rather than fdisk and disklabel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8669e516f0e6f48a5017db9e5f4768275f1deaa8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8669e516f0e6f48a5017db9e5f4768275f1deaa8 commit 8669e516f0e6f48a5017db9e5f4768275f1deaa8 Author: Ed Maste AuthorDate: 2024-01-23 18:23:44 +0000 Commit: Ed Maste CommitDate: 2024-03-22 18:51:15 +0000 ccdconfig: reference gpart rather than fdisk and disklabel fdisk and disklabel are legacy tools for legacy disk partitioning schemes. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43564 --- sbin/ccdconfig/ccdconfig.8 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index ec9bbd6d0ff4..085d83cab7a2 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -27,7 +27,7 @@ .\" .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ .\" -.Dd January 24, 2024 +.Dd March 22, 2024 .Dt CCDCONFIG 8 .Os .Sh NAME @@ -176,9 +176,8 @@ ccdconfig -c /dev/ccd0 32 linux /dev/ada0s1 /dev/ada0s2 .Ed .Pp When you create a new ccd disk you generally want to -.Xr fdisk 8 -and -.Xr disklabel 8 +partition it using +.Xr gpart 8 it before doing anything else. Beware that changing any ccd parameters: interleave, flags, or the device list making up the ccd disk, will usually destroy any prior @@ -206,8 +205,7 @@ and .Sh SEE ALSO .Xr dd 1 , .Xr ccd 4 , -.Xr disklabel 8 , -.Xr fdisk 8 , +.Xr gpart 8 , .Xr gvinum 8 , .Xr rc 8 .Sh HISTORY From nobody Fri Mar 22 19:03:57 2024 X-Original-To: dev-commits-src-all@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 4V1Wvd2mKsz5F6lQ; Fri, 22 Mar 2024 19:03: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 4V1Wvd2DdSz3xRF; Fri, 22 Mar 2024 19:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711134237; 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=R08ZrKeDjt6zwzCusguKf+2DtIgHFR501IY7TV3xui0=; b=vgglr9d2Iz1xTAh4+tbxkiuj7/MZtpc1fK+jCTxRIOEWad7HBVkjTar39mK7nqajp91xlh dx7YmE4JjW0l40F0FPsN53wlywmv4n7pP8E15KzPKwAWbw3i2lQUCVIGEuNvP26eLmvtjh o2lDbZsne979/Dv4vIGFq897h6Ca2AnwOrQw+aR4Dlfih/81lYL7eSryKQdIYcnGvcP50G jJZmhSuE2WLCKx7ySBjTSqLxk9c1cemn/sZrenUyLylWj/tzgxjZw4b5djWB2uM++Y3Aip FZlRjD5rCd8MTCe8drNN3dpVJ7LmKZNCxCyU5AH/RIzEgwGxxSjYIXlGVtZAJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711134237; a=rsa-sha256; cv=none; b=b4edIzKHwBxrwx6WS7U20b3ievknMyCyT5zU2dA6OdCxzDKfjpO71L7Q4snr2EzhQcyMsc y+L76TSbcd+tg0mQ+DCznH0Rua3EcCd5Jhjag57ONZTzAlSxeGcZFMuY4iQUvxdi5u7Gsk UMhFbvXde4aX9Dk7LUcX3iWEkhn9Vwq/b0HbJWmp/TWyX1GpCsCXOJYK4YYX07FhFpXJof 4WjUS/Pxh7f4d5iPjQH1YY1EWrvEJYWZK00lWlDkhJv8m75QUuAjWhgIJqHnS0t4IiKnrZ fKE7+yiQFmglVBGa2Z1GDwc6U3TFJBU88x4b/Tna/16kbSO/6VkekwRzOVfpfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711134237; 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=R08ZrKeDjt6zwzCusguKf+2DtIgHFR501IY7TV3xui0=; b=vlbKk6lorL7fRbo5qECR8DhrxU7Op8eG8zETYWhwF75s7DVYOS8TIkXDumjJJ0LORNOmaF ITTwx6T3r05fTYVhjQuL2ntd2uB6fmbgariXqB6/z+0uaAWKpc+J92GzKJVO/0qCz+YjJZ cDUR4UieLpI9QHaAp18huxL4ioa5FGWrpBLeo5s0ee3leiaxu6v9scnFPjVBUJzQmPISYZ bLalMGmdH9Iu1rJRH4ytbNcFBwSBUoYZCHgMHyzAQ0cJDEXwCEvM9v2aRtRGgWDT2IuUvF yqoneB4+VPk/s/t/ljccowFkZJKUd1qbpd9+aylI8riOaw6+xaIlxTQU8i8gFg== 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 4V1Wvd1r2XzGSj; Fri, 22 Mar 2024 19:03: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 42MJ3v1j064428; Fri, 22 Mar 2024 19:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MJ3vGI064425; Fri, 22 Mar 2024 19:03:57 GMT (envelope-from git) Date: Fri, 22 Mar 2024 19:03:57 GMT Message-Id: <202403221903.42MJ3vGI064425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0459337491cd - stable/13 - makefs: warn that ffs sectorsize other than 512 may not work List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0459337491cdfdd752507c0d2722999a6a9781ef Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0459337491cdfdd752507c0d2722999a6a9781ef commit 0459337491cdfdd752507c0d2722999a6a9781ef Author: Ed Maste AuthorDate: 2024-01-25 01:47:36 +0000 Commit: Ed Maste CommitDate: 2024-03-22 19:03:48 +0000 makefs: warn that ffs sectorsize other than 512 may not work newfs always sets sectorsize to DEV_BSIZE (512) and derives some other values based on the number of 512-byte sectors per real sector. Similar logic is required in makefs. Until that happens, emit a warning that the image may be incorrect. PR: 276571 (cherry picked from commit 176b9e0d724b4c1a24d2c46a1256381784f04edc) (cherry picked from commit 8e402178193f7b273a956b864d8d8b288ce62ee7) --- usr.sbin/makefs/ffs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 7504d6653180..cc83f2f2d3d2 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -340,6 +340,9 @@ ffs_validate(const char *dir, fsnode *root, fsinfo_t *fsopts) /* set FFS defaults */ if (fsopts->sectorsize == -1) fsopts->sectorsize = DFL_SECSIZE; + if (fsopts->sectorsize != DFL_SECSIZE) + warnx("sectorsize %d may produce nonfunctional image", + fsopts->sectorsize); if (ffs_opts->fsize == -1) ffs_opts->fsize = MAX(DFL_FRAGSIZE, fsopts->sectorsize); if (ffs_opts->bsize == -1) From nobody Fri Mar 22 20:58:00 2024 X-Original-To: dev-commits-src-all@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 4V1ZRD2bJDz5FLbR; Fri, 22 Mar 2024 20:58: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 4V1ZRD1krBz4FTH; Fri, 22 Mar 2024 20:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711141080; 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+CbIJeSqBo/UrvfHHm8DNELR5p39uwy+lmwfu29fzM=; b=ySfoYI/KI6gxR4xQnjMTo4netT1vE9/yoHvNO/yjU2WI3KAMLaAl5kU/TMC0ZT3MqpuIVt r/b9LwXXvQLZmZJMmFOUpFLQs0JQ1Q4DGiX24gaKxNZS32CaXfFXuwglOg9kDSEwtHps4s t57q/Z7VM1zb/R7sf20R4F6NCI1+OXHxcc6VDMDm/sm2rERkTMWx7HMibsMlLVuH0u6xu5 IbHjYy9bUpya+Prw8j9MKFm7Mcf4pgKE+Kz97Doc0LVDGXmr5F3HeRlquafpMQ3rp3V65t mGx73Ve3PEFROzV1JIvFOVU3dDT97dR1Gjy5z0OtwBcqcUA9MloVdrdlFexUsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711141080; a=rsa-sha256; cv=none; b=jRvcouT8j3ds0Rij6ZfaxIaaRxY6bRcMq7SLysNKPzSuW4l7dcDORqLtbNzHMpVrTQ1kYa HQCNIMHSuF8wmWV7zI4bfgU1rJut3B4Do3YmYmmHfUhnJlJPkcfcCnH8sxJXWp94y1+XF2 EcmWByoKLC8DXAagVXk7I1N4m1zPnyKECGdbi0KmxOrLwW1dCBPwfwOF0ReWmdkfjbf4ba OeDpU8bP7dvcg0WPXUVZ/INpPY6SQr1C4bklQB40YWpb1QZqPpeceUB4OXsOalzlItdj+k XlNikxFEstkcUMmvY7fCWFgDo/eIXHVsgKBCg7XM5UodEWnpffL+sr8RCujqKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711141080; 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+CbIJeSqBo/UrvfHHm8DNELR5p39uwy+lmwfu29fzM=; b=eil6z8CmtgJDInVWjgpqf0xw7gOtHB2AKPQlwsCwjULqw3x+7C5OeYwHsbkkBqqGyKzEpE ZOsjPX1WvzUae6sKdL5z313IIIFE6aGYNcrstyt4YXPmAZeSS1SgAjv3iNEcIxwopBrm93 34QZuL8uoUUMVu5tldnR2QlQa1R2cKgR5+CWbXf5i1ju4IhLPc4FXCVxLqgPYsuut9n7ns E2K/BY6AVKk44dW7Pg8CG0jMC+2o++dt3GD3pWltxDa439pyf/Zaq8dY14LJxGhIIRAhRe ZnGmYTm/VFVvTg09znO5WoCjJ32meSFuCpGStSGLKry+mmvW7BH9aN+c7U1mjA== 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 4V1ZRD18vFzJv1; Fri, 22 Mar 2024 20:58: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 42MKw0EC052332; Fri, 22 Mar 2024 20:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MKw0BU052329; Fri, 22 Mar 2024 20:58:00 GMT (envelope-from git) Date: Fri, 22 Mar 2024 20:58:00 GMT Message-Id: <202403222058.42MKw0BU052329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: c44bf7d2e9d2 - main - rtld: reduce debug messages after fix on big-endian hosts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c44bf7d2e9d2292867f2e23f291266af26762354 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=c44bf7d2e9d2292867f2e23f291266af26762354 commit c44bf7d2e9d2292867f2e23f291266af26762354 Author: Stefan Eßer AuthorDate: 2024-03-22 20:54:11 +0000 Commit: Stefan Eßer CommitDate: 2024-03-22 20:54:11 +0000 rtld: reduce debug messages after fix on big-endian hosts Remove a debug message that had been added to support the debugging of a mis-detection of the hint files endianness on powerpc64. MFC after: 3 days --- libexec/rtld-elf/rtld.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 3071eacbc995..ad0e426f2f0e 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2108,12 +2108,10 @@ cleanup1: hdr.dirlistlen = 0; return (NULL); } - is_le = /*htole32(1) == 1 || */ hdr.magic == htole32(ELFHINTS_MAGIC); dbg("host byte-order: %s-endian", le32toh(1) == 1 ? "little" : "big"); - dbg("hints file byte-order: %s-endian", is_le ? "little" : "big"); - dbg("verify swap macros: le32toh(0x12345678) == %#010x, " - "be32toh(0x12345678) == %#010x", - le32toh(0x12345678), be32toh(0x12345678)); + dbg("hints file byte-order: %s-endian", + hdr.magic == htole32(ELFHINTS_MAGIC) ? "little" : "big"); + is_le = /*htole32(1) == 1 || */ hdr.magic == htole32(ELFHINTS_MAGIC); magic = COND_SWAP(hdr.magic); version = COND_SWAP(hdr.version); strtab = COND_SWAP(hdr.strtab); From nobody Fri Mar 22 21:37:04 2024 X-Original-To: dev-commits-src-all@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 4V1bJJ3Bz0z5FQqW; Fri, 22 Mar 2024 21:37: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 4V1bJJ2dg4z4Hty; Fri, 22 Mar 2024 21:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711143424; 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=CG7Lujz1z6m4OjNzI7Q3C5rKxcQxQ80Tl1Ahik5sDP8=; b=dbwcKaoJ+GHB3IPpGstEZvdWYSi9Rg2ye3ersjCPj/CHzFAD9+GxFo/gXUrk7lS6ryxyBC A4JjIjKcIb4+BeXoL09rAigkFs+2+cTkuYyR7akzsFymWZX4vHScZfsln7DAftlPnSFTRV SmkjVMXxYT8oY5TtYczuN94VCXPzuTM8WIzlZANBBZ+SftU9siEkGZrhXbQ9NPaBsRuHb4 jjMWYZKNEuT7qYrXm0kh1VETu76x5S6kGcDg6WwD8iIy6gDHHMF7VE1XH+adf9tpE8aDdv RvUo32cehgFNnwMdxF4cTE4omB8oyKzqFvrVQAiHwSpKd8PEihTRMzMoOwKi8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711143424; a=rsa-sha256; cv=none; b=YoM66ohkViJ7/SP/L4v0ohpt0rO4g0i8bn+3cH2Eu4BNYOjz5oaOA4TbCwIKXaAVmZ14sf 9r5Bg5TxoCQ9QtU8I3IfdP+ikaAMt4EfcPPMwf00fiOTa4VCL/z3qSF6SsCFT04sKafXeL rIIiOdNx5mNp3lRpM3w0M1c2nyLKUyMikKLV1a8lb+niSUxSs/zPbulRgGx0S4XH5N+WqN 0IdZS5b42AehRR4zvkClw7LSMyoyXMNRufvLEl7gZzpwsCs+Md6HjFq7OXdiK2xG2yynTJ wFmQV1RRdoQ/qvzLmvv0UmWISNLt3eBoMqK/Zja1bzo0uZd15dDt8XY1UUJt3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711143424; 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=CG7Lujz1z6m4OjNzI7Q3C5rKxcQxQ80Tl1Ahik5sDP8=; b=qNfX3mikz2sOe7LfxHYeaBfphn6eF58oVi1KbgzfbUmdo6wMH9tb+5+zufldRJEmagWs0M gJyxPrhlYTjARtPku2nGardHxTie6fyjSZWBYjdimf5TnLThj61j4zG2r9LpLbSXY81Yen tvtTqIVf8urvl4g6cJDtBSz3C8lSXXfDkYrn5uLPYCoa+Ss79kz0VGokKOj0sIDOrJKAB4 pewziCk50cnDpCqIbDA2p6NsufNyvT1wyHMDRmaVhiXpmJ+AWvJqeDomgTiKG4JvANhAQz f0gwzt/lmGdLQoE/5ZwXbGVZPZwVPtKESZxynWLW1kIp2x3RUlzXVjzVfuwCbQ== 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 4V1bJJ26pszKR6; Fri, 22 Mar 2024 21:37: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 42MLb41o019871; Fri, 22 Mar 2024 21:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MLb4So019868; Fri, 22 Mar 2024 21:37:04 GMT (envelope-from git) Date: Fri, 22 Mar 2024 21:37:04 GMT Message-Id: <202403222137.42MLb4So019868@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: a77605a8d9d1 - main - man9: mlink for counter_ratecheck(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a77605a8d9d1820924459030b02672541b1c43c8 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a77605a8d9d1820924459030b02672541b1c43c8 commit a77605a8d9d1820924459030b02672541b1c43c8 Author: Gleb Smirnoff AuthorDate: 2024-03-22 21:36:54 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-22 21:36:54 +0000 man9: mlink for counter_ratecheck(9) --- share/man/man9/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index d6732a4e15f7..87fb2f0906c9 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -898,6 +898,7 @@ MLINKS+=counter.9 counter_u64_alloc.9 \ counter.9 counter_u64_add.9 \ counter.9 counter_enter.9 \ counter.9 counter_exit.9 \ + counter.9 counter_ratecheck.9 \ counter.9 counter_u64_add_protected.9 \ counter.9 counter_u64_fetch.9 \ counter.9 counter_u64_zero.9 \ From nobody Sat Mar 23 00:25:32 2024 X-Original-To: dev-commits-src-all@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 4V1g2h517bz5Fl4C; Sat, 23 Mar 2024 00:25: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 4V1g2h4GR3z4YlC; Sat, 23 Mar 2024 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153532; 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=28xryVPAdn8EOn+2IPPEEsPxv4IMjKy6ufiDnESZ8Zg=; b=aboN6lIo8z+EJf3O0pC1RIRMxLjwT5I7qz+IsD9oKHASbJjOdQTQEBmUlH3F4a/5I6oSzz 0ZKvP2FAgLXdIgUWZnfOjcYPsy1NawNgAf9zy/RukIG9l36dB6SlREbYatOSmlj3w2ts+D xFx/0Y78wf7Kd758cTqG2PehfOU+A1xOm4VkJsEn4daCoDcJGi2DcHjKKfyUw1mFmcXMH0 8WtYfXsXlZtd2o4PjMRsD2H1NUUmgzFPn8HbfNhJA/Gz/nyKIOJjyHbQ821/rcPoES4qK5 DFXNuJjMMVPwnK5bWVXObiu7jbUJ/E7OKPd8G0g0EuM7M9fOJ2hr4qDNaywvyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153532; a=rsa-sha256; cv=none; b=hsGVZ3VDNK7sXy6ukrwzFfzSmpRtnYAjBp3bsi5TxdKkpbUn+4/j9wgFklrw7HGGPXVzGa YPmm1G3n2UJn37u+5L32FeB1bofLvSMxUMdTI/mLWWov/m4Q2xYlP/z2N0a2IzmXipHMI5 5iNSR/kK+FnAzBKFJQQ8E0p/brs9pJq8FbJFSx37mp/tAHU6sZ9sD1++bsqBPBZt/AFJTK PXaHPeZXwvjFpzFuhh2udIzs69f87LJGcykH9cjoTLAdf2GUgBhdIn5dbMYBwmV0m8DDyi Q/iU1pWEaHF2r9mnAHsNoSBEfNpAf/EfR75eB+zmWNxhGY7qIny6OBgeaEkEYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153532; 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=28xryVPAdn8EOn+2IPPEEsPxv4IMjKy6ufiDnESZ8Zg=; b=QioQtGiEC53n+iX7Su15V6QPo70wErw/XIKfGEpJtcU6huenPeB1pGqPwRNVdXMnQ3FxjW /PqtZ+AatcnBsQ0bSitvqDGFiJrIz3AIoybGtwJmOGeYWjJDwaa8WiHhWQ+MqVfg+6wtxO p+j5glKDPuTgX6UNgR1tH8lX7izHXVic+yazFTGkZKfQJQ14VT3p+jJa8wwuodzHiqYoKx +hNrRYzutUf69wpz1OWBL3nr2wf46qkk+8rhP+zLBxpFY+nft7Uk9cugBZvucoIJFddFWS uOJBdjST9lXDLdMZz0kmOUIq8hmT/OBGeLp/IN/9xBAZq9KiaCfJ2LLxGIRBWA== 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 4V1g2h3Wm2zQPR; Sat, 23 Mar 2024 00:25: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 42N0PWWu005629; Sat, 23 Mar 2024 00:25:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PWBp005626; Sat, 23 Mar 2024 00:25:32 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:32 GMT Message-Id: <202403230025.42N0PWBp005626@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: 1931b75e004f - main - nvme: Export constants for min and max queue sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1931b75e004f25cf1d2db809bfd9baba40c04521 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1931b75e004f25cf1d2db809bfd9baba40c04521 commit 1931b75e004f25cf1d2db809bfd9baba40c04521 Author: John Baldwin AuthorDate: 2024-03-23 00:21:20 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:23:02 +0000 nvme: Export constants for min and max queue sizes These are useful for NVMe over Fabrics. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44441 --- sys/dev/nvme/nvme.h | 7 +++++++ sys/dev/nvme/nvme_private.h | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 9013e79b8882..fd27e9b318e7 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -63,6 +63,13 @@ /* Many items are expressed in terms of power of two times MPS */ #define NVME_MPS_SHIFT 12 +/* Limits on queue sizes: See 4.1.3 Queue Size in NVMe 1.4b. */ +#define NVME_MIN_ADMIN_ENTRIES 2 +#define NVME_MAX_ADMIN_ENTRIES 4096 + +#define NVME_MIN_IO_ENTRIES 2 +#define NVME_MAX_IO_ENTRIES 65536 + /* Register field definitions */ #define NVME_CAP_LO_REG_MQES_SHIFT (0) #define NVME_CAP_LO_REG_MQES_MASK (0xFFFF) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 1b6ea03c909a..69141add4e48 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -57,9 +57,6 @@ MALLOC_DECLARE(M_NVME); #define NVME_ADMIN_TRACKERS (16) #define NVME_ADMIN_ENTRIES (128) -/* min and max are defined in admin queue attributes section of spec */ -#define NVME_MIN_ADMIN_ENTRIES (2) -#define NVME_MAX_ADMIN_ENTRIES (4096) /* * NVME_IO_ENTRIES defines the size of an I/O qpair's submission and completion @@ -74,11 +71,6 @@ MALLOC_DECLARE(M_NVME); #define NVME_MIN_IO_TRACKERS (4) #define NVME_MAX_IO_TRACKERS (1024) -/* - * NVME_MAX_IO_ENTRIES is not defined, since it is specified in CC.MQES - * for each controller. - */ - #define NVME_INT_COAL_TIME (0) /* disabled */ #define NVME_INT_COAL_THRESHOLD (0) /* 0-based */ From nobody Sat Mar 23 00:25:33 2024 X-Original-To: dev-commits-src-all@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 4V1g2j6PXBz5Fl4G; Sat, 23 Mar 2024 00:25: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 4V1g2j4hcZz4Yql; Sat, 23 Mar 2024 00:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153533; 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=Lp/T5drNXtuvYyx87kbmaCi0i5pPQrUbJWvMhJFqA/s=; b=bPaQEecP8WsFGKZhX3t9XX0kHftTMyTy9UBmm0itiPDkcOJsfl88HHV5A+LYGeLnuYdJWV DdsDvrAsnqRAYJRA9ZrhqP7k7Qd6smBpF5O9iMHnl/aAlBW6QHrukKhdqZtPMJesHsASw1 gzPmWouSwgOwYCaNnpOjk+elGkF9RPK9QTv0SItcHHN+M+peOqSD/9SLHGs2eG7ULXAYZU UokRB/jtrty8qa8qDByM7rhMsTW2M3meMhaiHQ/Iiayj1BBlxNl2osH+eMmMbkdP/MVUT6 IBU+IiffKyRmhTGYXElBX0xrnPkjhM2jIoBu5IwAR9jcz4CY+Xsu8Vq1yH9M1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153533; a=rsa-sha256; cv=none; b=t8HjZZz2Yyvmg/0/geIvwYCfuYuwhuRFDJy3Cl7Wsl/BWHLNliF/I2U3Ll0jLR3V5JLFuY Q4frvDy3Rkuzs0GV9hT2fPMIEbUgMp1znVPk64+ZbBUy4d9BoySArvdpkaQR42psHfFLu7 lxhVRkYUBK1XZRcT9QrRMPIMuNYcUhVseahnYeAvCZGlHrqxWDMg6ufD4ZJ5X3R63h+Wt0 zl0uCGWnsPCVQmiIb6yPQoJsiJkUg7U156wUSBcwwhE6r/m9lJyvNPRpcHPDCckiDGqarG Tdu2Ub8rKxG3nlNHbxFb/zZSb9MSWFoW4OE/b+HsfRV6F8tIeXgV61/zl33JlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153533; 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=Lp/T5drNXtuvYyx87kbmaCi0i5pPQrUbJWvMhJFqA/s=; b=JUL1IBsDaCVKaSPpBikAsepvC6PK96dA/XMzjJv1wIhxL6hmt1QVY97tVYm5Q2E2HzIUdC Rlzyd9Taj74FXFDI4v7Q7rouA4w74eve15VOdAV61Iao9mO+H4onWWakYyK/0G3pO/StP8 CkWwDgaD5v2utN1M6AgiBoJjd+rqe5VOvnic9YYVfNROfq1y1XLQKMCo5rNfURNHewq3cz 7a+JMmucmIf97pdaYauV6zTm4VlDsAFF4p2kq/giX5PmwNAFfRcXOQCUyCR6kvQUM7qTzy 6xF+BGXO9kKjGmqGMpZLpBfGul4usx+J8nXnWg0BrC6fD7m21cvQOTkXJHXkEQ== 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 4V1g2j4JjbzQYL; Sat, 23 Mar 2024 00:25: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 42N0PXBV005689; Sat, 23 Mar 2024 00:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PXxJ005686; Sat, 23 Mar 2024 00:25:33 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:33 GMT Message-Id: <202403230025.42N0PXxJ005686@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: f21a54d19080 - main - nvme: Add SGL structure and constants for use in NVMe commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f21a54d19080510bce279183f4bf07d5315bd179 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f21a54d19080510bce279183f4bf07d5315bd179 commit f21a54d19080510bce279183f4bf07d5315bd179 Author: John Baldwin AuthorDate: 2024-03-23 00:23:09 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:23:09 +0000 nvme: Add SGL structure and constants for use in NVMe commands Fabrics capsules use an SGL structure instead of prp1/2 addresses to describe the data buffer used for a command. The SGL structure is added to a union with the existing prp1/2 fields. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44442 --- sys/dev/nvme/nvme.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index fd27e9b318e7..5d3e60ece329 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -433,6 +433,25 @@ #define NVME_CTRLR_DATA_VWC_ALL_NO (2) #define NVME_CTRLR_DATA_VWC_ALL_YES (3) +/** SGL Support */ +/* NVM command set SGL support */ +#define NVME_CTRLR_DATA_SGLS_NVM_COMMAND_SET_SHIFT (0) +#define NVME_CTRLR_DATA_SGLS_NVM_COMMAND_SET_MASK (0x3) +#define NVME_CTRLR_DATA_SGLS_KEYED_DATA_BLOCK_SHIFT (2) +#define NVME_CTRLR_DATA_SGLS_KEYED_DATA_BLOCK_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_BIT_BUCKET_SHIFT (16) +#define NVME_CTRLR_DATA_SGLS_BIT_BUCKET_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_CONTIG_MPTR_SHIFT (17) +#define NVME_CTRLR_DATA_SGLS_CONTIG_MPTR_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_OVERSIZED_SHIFT (18) +#define NVME_CTRLR_DATA_SGLS_OVERSIZED_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_MPTR_SGL_SHIFT (19) +#define NVME_CTRLR_DATA_SGLS_MPTR_SGL_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_ADDRESS_AS_OFFSET_SHIFT (20) +#define NVME_CTRLR_DATA_SGLS_ADDRESS_AS_OFFSET_MASK (0x1) +#define NVME_CTRLR_DATA_SGLS_TRANSPORT_DATA_BLOCK_SHIFT (21) +#define NVME_CTRLR_DATA_SGLS_TRANSPORT_DATA_BLOCK_MASK (0x1) + /** namespace features */ /* thin provisioning */ #define NVME_NS_DATA_NSFEAT_THIN_PROV_SHIFT (0) @@ -675,6 +694,38 @@ struct nvme_registers { _Static_assert(sizeof(struct nvme_registers) == 0x1008, "bad size for nvme_registers"); +#define NVME_SGL_SUBTYPE_SHIFT (0) +#define NVME_SGL_SUBTYPE_MASK (0xF) +#define NVME_SGL_TYPE_SHIFT (4) +#define NVME_SGL_TYPE_MASK (0xF) + +#define NVME_SGL_TYPE(type, subtype) \ + ((subtype) << NVME_SGL_SUBTYPE_SHIFT | (type) << NVME_SGL_TYPE_SHIFT) + +enum nvme_sgl_type { + NVME_SGL_TYPE_DATA_BLOCK = 0x0, + NVME_SGL_TYPE_BIT_BUCKET = 0x1, + NVME_SGL_TYPE_SEGMENT = 0x2, + NVME_SGL_TYPE_LAST_SEGMENT = 0x3, + NVME_SGL_TYPE_KEYED_DATA_BLOCK = 0x4, + NVME_SGL_TYPE_TRANSPORT_DATA_BLOCK = 0x5, +}; + +enum nvme_sgl_subtype { + NVME_SGL_SUBTYPE_ADDRESS = 0x0, + NVME_SGL_SUBTYPE_OFFSET = 0x1, + NVME_SGL_SUBTYPE_TRANSPORT = 0xa, +}; + +struct nvme_sgl_descriptor { + uint64_t address; + uint32_t length; + uint8_t reserved[3]; + uint8_t type; +}; + +_Static_assert(sizeof(struct nvme_sgl_descriptor) == 16, "bad size for nvme_sgl_descriptor"); + struct nvme_command { /* dword 0 */ uint8_t opc; /* opcode */ @@ -691,11 +742,14 @@ struct nvme_command { /* dword 4-5 */ uint64_t mptr; /* metadata pointer */ - /* dword 6-7 */ - uint64_t prp1; /* prp entry 1 */ - - /* dword 8-9 */ - uint64_t prp2; /* prp entry 2 */ + /* dword 6-9 */ + union { + struct { + uint64_t prp1; /* prp entry 1 */ + uint64_t prp2; /* prp entry 2 */ + }; + struct nvme_sgl_descriptor sgl; + }; /* dword 10-15 */ uint32_t cdw10; /* command-specific */ From nobody Sat Mar 23 00:25:34 2024 X-Original-To: dev-commits-src-all@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 4V1g2k6606z5Fkdy; Sat, 23 Mar 2024 00:25: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 4V1g2k5LWwz4YfG; Sat, 23 Mar 2024 00:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153534; 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=xZZPOL1uoSKlHtsgnuivjWuVZcn1ufkJuNxgaFl1pME=; b=ZQW7FOLf3XrL0eoHBWxEe9ouejLmoMcjIRYeRYqqI3HwDG4DfauWLdngSg3KoOiRgoYNjH qI8GWijhNZp5PeWTa7JmVR+Qb8tT7u5TFRUM0t+v32zknzQ6ocn9sfxtplps8HfpyFytTB D+tdCUJgiDA9377HPEzJl4LpQGqMnb+JG6TNEBJS3An4b+y9Bc3uDN3E1q0BEu1TCTpjNF PmvUQSwYO2pxuCMAHr+mA3CrkwUaPpQljsdMJ5XXKhQZ4y64QznaAcC8P+/+qqiXASKY94 ppo/Fk1AQGrSac4NV8WK39V2r1CgQcdq0+u6Wws18fBtF9MBeIe2Fu9s9O4mLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153534; a=rsa-sha256; cv=none; b=NDm7B4MMVvphwMUHwIeNpvC2CRiVOhwPr5x3ycBymT/k7gHNnROcYoq9uQg1Od8zFw2P+H I+Y+2ODgS+sNojXO9FIPVi/1masgp0SuOBRePJSIUEl1f0tdmhxZNdMsTp096/9aqdrSyb GUALlEzW4YCxHLOfcnsyv7dtWmakqw3aXIl2XghZ1D4G+U65Nmt4bCI9otmGDl4ExF6jUf XceJYkpPpl/y+dKUBmN8zUW44AXXYBPbPMvyMsvJ1EVC8TH2Ic8M9t2AT6Ehv2omLBZcLp tu0hNlwddyrwgC0PEMEqv4bYXMODDwG0YIZyuMzcslguD20VSynOXpDeEQnZig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153534; 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=xZZPOL1uoSKlHtsgnuivjWuVZcn1ufkJuNxgaFl1pME=; b=G0YyCnn/VnrEJ/HIkBvj3q0M71rD1gRBmij4oz4PoNivRKaF92UvJ+pEoYeT/fTlRaLu0Y s3XwSTsVmBA67sABijOyG/nxP0p3m/55DCYUqlvSjmhoyWjClqPZDm+pXbDF6arZm96eza 4EbTLvwO9r7LSGU8c1Po67hvtlWmd6b/6bRDYvaXyNHzsE/S/HIZ6+A0FYk2kqSyPDafw7 dx0cgKhOs+OAU+ngh9yZKp+M76POke0jcskMnLj56y/sYGHAl5frh9glg+pDJHqYr6kkOc 8bVJFh+TN8D1ScbsUR48KFNSjoA0jlcjLQIGVySEqqlIZ4JdzBMyDDkwB2D20w== 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 4V1g2k4z20zQtg; Sat, 23 Mar 2024 00:25: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 42N0PYpl005750; Sat, 23 Mar 2024 00:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PYSu005747; Sat, 23 Mar 2024 00:25:34 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:34 GMT Message-Id: <202403230025.42N0PYSu005747@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: b8cb8dd3625d - main - nvme: Add constants for the PSDT field in cdw0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b8cb8dd3625d7396ea98152d89e1e64b16e77bc6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b8cb8dd3625d7396ea98152d89e1e64b16e77bc6 commit b8cb8dd3625d7396ea98152d89e1e64b16e77bc6 Author: John Baldwin AuthorDate: 2024-03-23 00:23:24 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:23:24 +0000 nvme: Add constants for the PSDT field in cdw0 This is not used in nvme(4) but is used in NVMe over Fabrics transports which use SGLs to describe buffers instead of PRPs. While here, adjust the shift value for the FUSE field to be relative to the 'fuse' member of 'struct nvme_command'. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44443 --- sys/dev/nvme/nvme.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 5d3e60ece329..6eb9ef69b33b 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -211,9 +211,18 @@ /* Command field definitions */ -#define NVME_CMD_FUSE_SHIFT (8) +#define NVME_CMD_FUSE_SHIFT (0) #define NVME_CMD_FUSE_MASK (0x3) +enum nvme_psdt { + NVME_PSDT_PRP = 0x0, + NVME_PSDT_SGL = 0x1, + NVME_PSDT_SGL_MPTR = 0x2 +}; +#define NVME_CMD_PSDT_SHIFT (6) +#define NVME_CMD_PSDT_MASK (0x3) + + #define NVME_STATUS_P_SHIFT (0) #define NVME_STATUS_P_MASK (0x1) #define NVME_STATUS_SC_SHIFT (1) From nobody Sat Mar 23 00:25:35 2024 X-Original-To: dev-commits-src-all@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 4V1g2m2pqhz5Fl0C; Sat, 23 Mar 2024 00:25:36 +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 4V1g2l6Pgtz4YSn; Sat, 23 Mar 2024 00:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153535; 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=EaVZHqrBK8KZ69YAE1/CgEfO44SRgdlNy479Z5LaGSY=; b=DOFcavKxTgBFhrd5PaGfxFU8HOEU11uFiPCYU8WCBKE32Gao38A0CuuN5nCc66443GUscw IcgPxw29KtdUL1AGpsB59Q3MktfyRtZpdrCTPgHhuWjyK/xGSXk/k8T1Z2EiGYiP7xk0J1 zzwtOhqaJM6ggVe2AOQmp5CxBc40bxD8tUX+xAkoONswevPD+W+Jzja7bCL7UhRNcifMfE RZZdcEceelcAOduEma0twaNUWAl5FFvLR1iz2LJTmTJlRHKmcco8wRXntYrQq+DRuzXOn/ 023w61xp7A6EldPVaASXGUxDIbWoyZToJ04iaPtEWNT+M8B8RFI5fqVrT37hgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153535; a=rsa-sha256; cv=none; b=Nm/bA41Jj0hMTgEebbuyb97DdRyVfCMaHCtGVeqq+jE1SRvfzM9BJy0jQ6QIODPYELHAJx Y1ZA4MY48nWBTUDe17dQLKUk8egA4iLrRtTI2+JVEN8ps3mPGjIk1M58lBf98Ugdd6Sh7J ShqassMWHX6DUlwyREaNqvCWGvhhhL20VKI4kULRQL9qeJZUhzMZYbx0qpWa2IW361axfq Lz+bckvdf5S8P7jThYO6cdBOIOpCU5OW0w1fluHWZvS5VFRIrxVs8ZLbUsJz+kx2IyTw33 +G2fWGH4vhYOdO7CZD6jMQ5ElqSpK9vZUnf73xULlzdRnenXoqlCpB/hEKyxTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153535; 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=EaVZHqrBK8KZ69YAE1/CgEfO44SRgdlNy479Z5LaGSY=; b=AfO5JgFs/K/GwY0hglmjP+EE23iGR+vyuUjZV9MbKdSiaLHh3t4C4lUQlV5V0O3o+S2k3r 6xhSp+Sgl1wTii9fq9M1F8ovs5rNN0f6uXc25NwblT/gqJ1EZRCdeZzk0ID4h9cEF6fQf2 lsTvYPHrLS+HAGYs8xT6VfBvj1hWBb82WP6JGWQ40lFxvYpgiPwMPBvcByySb2/aLnQ2WX xyeKSzclz8U/QQnER5zslLFsarOX8erVMHh5aEa0vkzECMXxAcoK0FE7cauh7A1FNmSUyy SYip1AhVwvgRvJujThU8Zml7CFwx3ZZBTLCMRE992VhjdlRQGgLrOiAVY1rMkw== 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 4V1g2l627bzQgc; Sat, 23 Mar 2024 00:25: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 42N0PZWs005822; Sat, 23 Mar 2024 00:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PZmp005819; Sat, 23 Mar 2024 00:25:35 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:35 GMT Message-Id: <202403230025.42N0PZmp005819@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: cbda1886ab1c - main - nvme: Add constants for the extended data for Get Log Page command flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: cbda1886ab1cd3ec2847b7da5136d3bb68d56101 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cbda1886ab1cd3ec2847b7da5136d3bb68d56101 commit cbda1886ab1cd3ec2847b7da5136d3bb68d56101 Author: John Baldwin AuthorDate: 2024-03-23 00:23:46 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:23:46 +0000 nvme: Add constants for the extended data for Get Log Page command flag nvme(4) doesn't check this flag, but Fabrics implementations may need to set this flag in the log page attributes cdata field. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44444 --- sys/dev/nvme/nvme.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 6eb9ef69b33b..7059421f9fd7 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -358,6 +358,9 @@ enum nvme_psdt { /* per namespace smart/health log page */ #define NVME_CTRLR_DATA_LPA_NS_SMART_SHIFT (0) #define NVME_CTRLR_DATA_LPA_NS_SMART_MASK (0x1) +/* extended data for Get Log Page command */ +#define NVME_CTRLR_DATA_LPA_EXT_DATA_SHIFT (2) +#define NVME_CTRLR_DATA_LPA_EXT_DATA_MASK (0x1) /** AVSCC - admin vendor specific command configuration */ /* admin vendor specific commands use spec format */ From nobody Sat Mar 23 00:25:36 2024 X-Original-To: dev-commits-src-all@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 4V1g2n2mWbz5Fl6P; Sat, 23 Mar 2024 00:25:37 +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 4V1g2n0jtDz4Yqy; Sat, 23 Mar 2024 00:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153537; 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=5kAe0tOrJwjiwP5fQI/whrLjxXEQYt7Kq6BXrFQDmiE=; b=VEtrEDuK3lAx3f8UP/RdczdtDxPStet1F/SuXgo22UMHZK/9jscl7H1O3jnDE/9SaVyGI5 76h3HjapP/ouVUdhQhQAzkfcYjOop5O9W+elcOc9e4FedQCmKcYX2S2z3ddTTxdjABTYvP 9NjQ8ieTTey+sJEs6S/n60b72IQ8e8kBrrHquy8+YyZG3biYO+HDclGqe0FS76f/p/Q0d4 ezAicLMGurG9A5z31TZpqFK9Gj+radASF58jenAF8N4VKTJ+0hUM0w0Bjuy7AaODnYjGnn mfGLE11GryzsSHGBACGsknPQyjRdq5xgtuOxXfq+E6uxySXeFxY9uZkPhG0b8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153537; a=rsa-sha256; cv=none; b=hHrNjuzzTMziP1GDGT/Y75aACh8z7wubpsERsM8kkRpd9LJycZn0nvh0JFaLMlheIjUP5I hwyI/XkLZnQV1syLsiDCktUdAGv77ZB2tQ/kKaxB/hBT0mFkdEpKDioecMSkQIqa09JMhv WheLng3bxIWSKwZIC9RMld3+Mb3QCqdHWzVdQqkRGSY/imytvX2LDijlEdUsVAhyeEUJfQ 1HxuUDkNdKToaNMxV6me0IdIPcasl/9C0NskkiiM4ts9C7tfaCKFf6yBwDCweZ3gJLVv8s kbnOwAuaODI0GJbykQxRtFz/o71dqy8uCUDf/PCyu/ICdkxcqS4sBogx633kyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153537; 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=5kAe0tOrJwjiwP5fQI/whrLjxXEQYt7Kq6BXrFQDmiE=; b=QHZKJ7sfW4ontBpvwxPpwSk0f0Xlha0jDreC/QDAvwVc4DspnA16s4oTMzbRKXtZQcksYA 3jla075E3TTFKZpnlGgt2EU2IX29p0XM62bOttP+beWEcy6GwKsd+k+RApd9ufqDIiSQmj kbM79dlF/K1Ua6hq//8uFfkuEtA/qrSOA4rBLT3GyfoJpv7l782im5b+rDFqE61cwgTpZn xAOuLJzjX8uoQ4+8kqvE4eEhKO8N3hEl1VbpeumqgrjVEAZenTiXZvaxz+2/b+BzsvhGso Fb9gVE6fyU31DMX4315Ef5DLOsso0vuvPduf5qaR/YAD86Fs5kwn8RB1Tm6Oig== 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 4V1g2n01MHzQRm; Sat, 23 Mar 2024 00:25: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 42N0PaNa005879; Sat, 23 Mar 2024 00:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PaxO005876; Sat, 23 Mar 2024 00:25:36 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:36 GMT Message-Id: <202403230025.42N0PaxO005876@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: b354bb04cb51 - main - nvme: Add constants for fields in AER completion dword 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b354bb04cb51f373e997cb8911c32dc93243c1d7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b354bb04cb51f373e997cb8911c32dc93243c1d7 commit b354bb04cb51f373e997cb8911c32dc93243c1d7 Author: John Baldwin AuthorDate: 2024-03-23 00:24:06 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:24:06 +0000 nvme: Add constants for fields in AER completion dword 0 Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44445 --- sys/dev/nvme/nvme.h | 8 ++++++++ sys/dev/nvme/nvme_ctrlr.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 7059421f9fd7..ef262a864121 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -643,6 +643,14 @@ enum nvme_critical_warning_state { #define NVME_FEAT_SET_FID_SHIFT (0) #define NVME_FEAT_SET_FID_MASK (0xff) +/* Async Events */ +#define NVME_ASYNC_EVENT_TYPE_SHIFT (0) +#define NVME_ASYNC_EVENT_TYPE_MASK (0x7) +#define NVME_ASYNC_EVENT_INFO_SHIFT (8) +#define NVME_ASYNC_EVENT_INFO_MASK (0xff) +#define NVME_ASYNC_EVENT_LOG_PAGE_ID_SHIFT (16) +#define NVME_ASYNC_EVENT_LOG_PAGE_ID_MASK (0xff) + /* Helper macro to combine *_MASK and *_SHIFT defines */ #define NVMEM(name) (name##_MASK << name##_SHIFT) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 7334c7169efb..e41f32635346 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -783,10 +783,11 @@ nvme_ctrlr_async_event_cb(void *arg, const struct nvme_completion *cpl) } /* Associated log page is in bits 23:16 of completion entry dw0. */ - aer->log_page_id = (cpl->cdw0 & 0xFF0000) >> 16; + aer->log_page_id = NVMEV(NVME_ASYNC_EVENT_LOG_PAGE_ID, cpl->cdw0); nvme_printf(aer->ctrlr, "async event occurred (type 0x%x, info 0x%02x," - " page 0x%02x)\n", (cpl->cdw0 & 0x07), (cpl->cdw0 & 0xFF00) >> 8, + " page 0x%02x)\n", NVMEV(NVME_ASYNC_EVENT_TYPE, cpl->cdw0), + NVMEV(NVME_ASYNC_EVENT_INFO, cpl->cdw0), aer->log_page_id); if (is_log_page_id_valid(aer->log_page_id)) { From nobody Sat Mar 23 00:25:38 2024 X-Original-To: dev-commits-src-all@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 4V1g2p62HNz5Fl0J; Sat, 23 Mar 2024 00:25: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 4V1g2p1Rb4z4YTC; Sat, 23 Mar 2024 00:25:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153538; 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=eoauEh+QbmaNlydxjg/BAjoyqvaFqeqMM2iJsaRNDuI=; b=qyr0pLDtP7NzqArwQwCC7ESgnatVozy3W0E2SR/Oxd+El7hqbSsma35AkFD18nJ8jObF0Q YiPc+JEkNinOHAKQ5SN9nfRVYqFxTz6GREsLNQIfAyEQOr3iXRHph2143zZ2xIv+v4nrJE RHMwCl1Lur1zzQq1YOU8DK5cRuR5TpZfgaoTuN1rXCicZUijDWosTcZjOI7LQPChFaDCt2 uz0ycQyu5UIGc8GnKChTrvU+jc0mbwbwZJhCrhBhEXOiQbmVzsK1C6W6Q1CqDFMAK9eZgE hGtqnqb95XGZRqxWXhdjEWakrTHYdj3zVxsdKBggbUkh5wX2gtZ9GiEN68Bmqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153538; a=rsa-sha256; cv=none; b=aqRt2iwcIae3GD4F/fLsgAvsgiiWzyBoYVdv7e03WotYIoyP9tRVkk5xJ6qY9A6Od1kie+ XBYvP5kcIERRukG0FzlA+IWRoxXWnX4z8lj8Le9kQAv73UPFQCnVqefQ8fFKwnN0/4eoKq 65KIU73yGHbbW8jgd8ejwRgL5Oka57HIP8hafuv3MW0Y1w6so/FX3QT2YcU8GUIVmZxCeQ wHvrlYyePcQVAwkK84JtYEbkZhXIV8sZMhj2Jpb1PK0YAqGbvYnEgWxZoY2dg1uXFaUzZE ZYSVHUPhYMgKKlulo73ryZWLZvtlxqJDy6TlLTwm9R96bxc7SFEcZsYAo30LGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153538; 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=eoauEh+QbmaNlydxjg/BAjoyqvaFqeqMM2iJsaRNDuI=; b=M01RzTJZ5IWAqpypn1nCNr8fHsd0RwfDDHal2zhP/P05iqa3Y0626uuhvCTQ+U/xqJ6jIm OBMStejFWYBOy1pGPXm6XIC8d+Ns5F+ae8eqSDsT6RIQM+0FAvxZamdYcDDNz8xLgeSeLQ EkjpHlRkxw0lLQSq7O1/3P+WAxpL3LpF7bET0lf20gsMHMF6eyg5WWhzPh+l8l09P+wW0t uS+89nG91hQ0p1z+6XxKO/tx4ySDAP2NUm4vVyQSdDo3VViNp3lf2F3qdpx64KU1OI7ud3 YSgYXemZIfZfvEowp6sDbKpxhR3EJyqhFeUvBh/cpptW6AUOfNWk6RgbKKQC9Q== 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 4V1g2p0kKlzQth; Sat, 23 Mar 2024 00:25: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 42N0PcBG005937; Sat, 23 Mar 2024 00:25:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PcQH005934; Sat, 23 Mar 2024 00:25:38 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:38 GMT Message-Id: <202403230025.42N0PcQH005934@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: 88ecf154c7c5 - main - nvme: Add constants and types for the discovery log page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 88ecf154c7c5a2e413a81ae1b0511b0295265b99 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=88ecf154c7c5a2e413a81ae1b0511b0295265b99 commit 88ecf154c7c5a2e413a81ae1b0511b0295265b99 Author: John Baldwin AuthorDate: 2024-03-23 00:24:18 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:24:18 +0000 nvme: Add constants and types for the discovery log page This is used in NVMe over Fabrics to enumerate a list of available controllers. Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44446 --- sys/dev/nvme/nvme.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index ef262a864121..fcc96a26eeb1 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1459,6 +1459,7 @@ enum nvme_log_page { NVME_LOG_PERSISTENT_EVENT_LOG = 0x0d, NVME_LOG_LBA_STATUS_INFORMATION = 0x0e, NVME_LOG_ENDURANCE_GROUP_EVENT_AGGREGATE = 0x0f, + NVME_LOG_DISCOVERY = 0x70, /* 0x06-0x7F - reserved */ /* 0x80-0xBF - I/O command set specific */ NVME_LOG_RES_NOTIFICATION = 0x80, @@ -1591,6 +1592,48 @@ struct nvme_device_self_test_page { _Static_assert(sizeof(struct nvme_device_self_test_page) == 564, "bad size for nvme_device_self_test_page"); +struct nvme_discovery_log_entry { + uint8_t trtype; + uint8_t adrfam; + uint8_t subtype; + uint8_t treq; + uint16_t portid; + uint16_t cntlid; + uint16_t aqsz; + uint8_t reserved1[22]; + uint8_t trsvcid[32]; + uint8_t reserved2[192]; + uint8_t subnqn[256]; + uint8_t traddr[256]; + union { + struct { + uint8_t rdma_qptype; + uint8_t rdma_prtype; + uint8_t rdma_cms; + uint8_t reserved[5]; + uint16_t rdma_pkey; + } rdma; + struct { + uint8_t sectype; + } tcp; + uint8_t reserved[256]; + } tsas; +} __packed __aligned(4); + +_Static_assert(sizeof(struct nvme_discovery_log_entry) == 1024, + "bad size for nvme_discovery_log_entry"); + +struct nvme_discovery_log { + uint64_t genctr; + uint64_t numrec; + uint16_t recfmt; + uint8_t reserved[1006]; + struct nvme_discovery_log_entry entries[]; +} __packed __aligned(4); + +_Static_assert(sizeof(struct nvme_discovery_log) == 1024, + "bad size for nvme_discovery_log"); + struct nvme_res_notification_page { uint64_t log_page_count; uint8_t log_page_type; @@ -2215,4 +2258,27 @@ nvme_device_self_test_swapbytes(struct nvme_device_self_test_page *s __unused) } #endif } + +static inline void +nvme_discovery_log_entry_swapbytes(struct nvme_discovery_log_entry *s __unused) +{ +#if _BYTE_ORDER != _LITTLE_ENDIAN + s->portid = le16toh(s->portid); + s->cntlid = le16toh(s->cntlid); + s->aqsz = le16toh(s->aqsz); + if (s->trtype == 0x01 /* RDMA */) { + s->tsas.rdma.rdma_pkey = le16toh(s->tsas.rdma.rdma_pkey); + } +#endif +} + +static inline void +nvme_discovery_log_swapbytes(struct nvme_discovery_log *s __unused) +{ +#if _BYTE_ORDER != _LITTLE_ENDIAN + s->genctr = le64toh(s->genctr); + s->numrec = le64toh(s->numrec); + s->recfmt = le16toh(s->recfmt); +#endif +} #endif /* __NVME_H__ */ From nobody Sat Mar 23 00:25:39 2024 X-Original-To: dev-commits-src-all@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 4V1g2q4nl9z5Fl8w; Sat, 23 Mar 2024 00:25: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 4V1g2q2DL1z4Ylr; Sat, 23 Mar 2024 00:25:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153539; 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=LkqUUCfK2KKz72okTM/pwp0lojnYMYlJAjoBLZDORug=; b=RsZHz4NabFgLVYgatvbK0XkP/lKRERZyyPTL4K5CzdeSgEcqoLhwlOb4W/f03TA27EVASj 7tHXxDc7FnLsGbylX5u6T5XQVAaqjaaEgjerCHOqjHcg7qTGZwEgrBOSHiqfXfp48oXanD SPCD36+h9gJgd/0y5zM4+MgrsgHY0WnbrouyWLC4BmriR9QDMP00w7+1majb+p69nQDR5W OSzNMpFQWExuCKyn4MeFGC7mLYDpFOve952yNjomOcqXpNyR8svRcaCxD4a1dcyUp1r5aW UmVa1/5bpUOVDHtY0lEqG/3yEzREguAbxDu5TaeiATvcqxeKLRkcaXzbfg/x/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153539; a=rsa-sha256; cv=none; b=Ws6oguVGyFq2aJFD8n3PwZ27GDj/ZSndajP16r7sRr7udPEE9zqy+oVVtfyX+OuIViklyf 53XoFINDsj0ytGLjC2ec6V+yM0OD0Nod/gD77WJcgj/PrfaQ17AM3OuL39siZheIfy7HZv 8N7gt0LDtFRKhaKaM4x5c/8znWKpWo00nkf7tKtc7XOGxfQpLtIvakSPx/DBLkumr+iekl Vojix3c1vX5/UN3/5g21goJNHJOJ6fk8S1zO7iD6Gij+tcfqRn8a/tIUyH5rZNPnsnor3r uQzUnAHnbGDWDaSYcGbgVSwopmZLRnOsTPPkDYwOohHNpVpHXGy9jLd6pLERbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153539; 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=LkqUUCfK2KKz72okTM/pwp0lojnYMYlJAjoBLZDORug=; b=XshMgNfYqc9EwSJbJXkGetPdobUfllwMFDzOCiuy6W5RMSrUMrGOLlee/y61nnXVgTMGRB YD2RTV/DETJMPqcPGJPelBVJ73/+LfUJJivS+mYgQEABkGhNPYzxfkzUlFe9pdSCGuxoWp LULxKu2715pXKaqbk8uEcsiYtte7AAJJklBZ+9dQ8S0dgbF32x7ZV+xMkRLV7Ww2XttsFe UlPCO+d+9FmwxgHdCXBcBEx72g4I3f0fpPoUbBA6/a/skB+SiIL/W8zWDiezDnXFxQd6zd oRY+crE+wOKg+qBJmvhzBSiuL15/+w84jWImNttXAuxotOrQM8IBqV+AeHtaHQ== 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 4V1g2q1r34zQgd; Sat, 23 Mar 2024 00:25:39 +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 42N0Pddf005996; Sat, 23 Mar 2024 00:25:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0Pdsc005993; Sat, 23 Mar 2024 00:25:39 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:39 GMT Message-Id: <202403230025.42N0Pdsc005993@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: 7fa8adb8c5cd - main - nvme: Add constants for the Controller Attributes field in cdata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 7fa8adb8c5cd46979b76770794ac1b6584e8baa7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa8adb8c5cd46979b76770794ac1b6584e8baa7 commit 7fa8adb8c5cd46979b76770794ac1b6584e8baa7 Author: John Baldwin AuthorDate: 2024-03-23 00:24:31 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:24:31 +0000 nvme: Add constants for the Controller Attributes field in cdata Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44447 --- sys/dev/nvme/nvme.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index fcc96a26eeb1..8e99cb7b5356 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -311,6 +311,38 @@ enum nvme_psdt { #define NVME_CTRLR_DATA_OAES_LOG_PAGE_CHANGE_SHIFT (31) #define NVME_CTRLR_DATA_OAES_LOG_PAGE_CHANGE_MASK (0x1) +/** CTRATT - Controller Attributes */ +/* supports 128-bit Host Identifier */ +#define NVME_CTRLR_DATA_CTRATT_128BIT_HOSTID_SHIFT (0) +#define NVME_CTRLR_DATA_CTRATT_128BIT_HOSTID_MASK (0x1) +/* supports Non-Operational Power State Permissive Mode */ +#define NVME_CTRLR_DATA_CTRATT_NONOP_POWER_STATE_SHIFT (1) +#define NVME_CTRLR_DATA_CTRATT_NONOP_POWER_STATE_MASK (0x1) +/* supports NVM Sets */ +#define NVME_CTRLR_DATA_CTRATT_NVM_SETS_SHIFT (2) +#define NVME_CTRLR_DATA_CTRATT_NVM_SETS_MASK (0x1) +/* supports Read Recovery Levels */ +#define NVME_CTRLR_DATA_CTRATT_READ_RECOVERY_LVLS_SHIFT (3) +#define NVME_CTRLR_DATA_CTRATT_READ_RECOVERY_LVLS_MASK (0x1) +/* supports Endurance Groups */ +#define NVME_CTRLR_DATA_CTRATT_ENDURANCE_GROUPS_SHIFT (4) +#define NVME_CTRLR_DATA_CTRATT_ENDURANCE_GROUPS_MASK (0x1) +/* supports Predictable Latency Mode */ +#define NVME_CTRLR_DATA_CTRATT_PREDICTABLE_LATENCY_SHIFT (5) +#define NVME_CTRLR_DATA_CTRATT_PREDICTABLE_LATENCY_MASK (0x1) +/* supports Traffic Based Keep Alive Support */ +#define NVME_CTRLR_DATA_CTRATT_TBKAS_SHIFT (6) +#define NVME_CTRLR_DATA_CTRATT_TBKAS_MASK (0x1) +/* supports Namespace Granularity */ +#define NVME_CTRLR_DATA_CTRATT_NAMESPACE_GRANULARITY_SHIFT (7) +#define NVME_CTRLR_DATA_CTRATT_NAMESPACE_GRANULARITY_MASK (0x1) +/* supports SQ Associations */ +#define NVME_CTRLR_DATA_CTRATT_SQ_ASSOCIATIONS_SHIFT (8) +#define NVME_CTRLR_DATA_CTRATT_SQ_ASSOCIATIONS_MASK (0x1) +/* supports UUID List */ +#define NVME_CTRLR_DATA_CTRATT_UUID_LIST_SHIFT (9) +#define NVME_CTRLR_DATA_CTRATT_UUID_LIST_MASK (0x1) + /** OACS - optional admin command support */ /* supports security send/receive commands */ #define NVME_CTRLR_DATA_OACS_SECURITY_SHIFT (0) From nobody Sat Mar 23 00:25:40 2024 X-Original-To: dev-commits-src-all@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 4V1g2r5D3lz5Fl8x; Sat, 23 Mar 2024 00:25:40 +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 4V1g2r3dq9z4Yrh; Sat, 23 Mar 2024 00:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153540; 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=JUAmeU6OAJKcG+A9OTNQbiEePY8grBOSPfDpGfbvE0M=; b=KSJq1BYNr8dFf+HWNwN+HhViyR7PhG1ASvN2z4rYr7VNuu1hx6Q+ktxCf808/FfifUUMlv ki0IgoV1nLOWkX0Nu744mPFivNw+BBA+vcZZvOOeZZ7k77k/cO+/pa9vhpW9kKfcC6tclI byj/Bv57Ep2cKK6wbN8NsBgV5YhSB2VkS399PjaMOwebViIev75fPQjgPkIB8nrSUpw8Ch CQoBsrhTMWT3xai9e0hY9IaLZ1zp+r+dNK2DBc+H+lztc7Lt8WEJ4/uFkWjtGwvD0UdinP rdErQP1led26bUm58PCE0ouYxm8FlJmG28djpduS7GdhZuMMVaw7rysFzX7r2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153540; a=rsa-sha256; cv=none; b=xdna2czhV6khpC+F0WRJqDLWDhJN8yy/6uweTD6VIqc350zgKU0NnjJZmQA4zF3UgiWj/Z hIxggnMdJ4qQu5o7jRAKLaw6Z85UjJL95aYW6I0I8tgDhUSA9THX8zMZyFis+aq/SEjDgV k8NqWX9UC1u8/g0g/1oVKrberJb4A7Ru7UdmS1gc96HfXeznwzTBTASuo0odzyWykYzdL7 CxZLGk84Vecy46pgIKRV2zkl5eQ9CtPyeTzB/tGdO6/xpExCDWdJL5UgyMputSIGOSvc26 vGcccNvU73Gn93gwlXa5lkVtRfAhCR8e/yx1DFdH9gqLJBRJAggfQva1xSlIKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153540; 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=JUAmeU6OAJKcG+A9OTNQbiEePY8grBOSPfDpGfbvE0M=; b=IO78q4k5FDlP7W9UcgPvSNWtI5EmZkM+2lL5S5rHYIC1bn0szxoHnMEJULfP8jthZKAETs qW1HTJ2CbDMgBP3Da9UHHy5v4Hq7h55gnnWKyib3Ct7hI7KZZUQgf1en9KdnaklRPe+biT ejlThkfKLiCsDducrCiRPB7KtTlPtm4wJNT7cvVkuEQDRCC3ctJy59e1n+msmzGjOzbzQi be9qoZ6uyHlzxv42mlR0q3i+0KkyE9aiqSgNcWj88AOn2aRV3afe2X+h3Pthn9R6VMwYoc 9H1Ey5T/1bIOgoC+TejCLdMgfmd0lDjP+tglyy+OfJSD7NgEHAlAeHN0aDcmdA== 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 4V1g2r3G2VzQgf; Sat, 23 Mar 2024 00:25:40 +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 42N0PeEa006064; Sat, 23 Mar 2024 00:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0PeX8006061; Sat, 23 Mar 2024 00:25:40 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:40 GMT Message-Id: <202403230025.42N0PeX8006061@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: 21d3a84db481 - main - nvme: Add NVMe over Fabrics fields to nvme_controller_data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 21d3a84db481e84cf240f6802b1a4110854eaec5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21d3a84db481e84cf240f6802b1a4110854eaec5 commit 21d3a84db481e84cf240f6802b1a4110854eaec5 Author: John Baldwin AuthorDate: 2024-03-23 00:24:52 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:24:52 +0000 nvme: Add NVMe over Fabrics fields to nvme_controller_data Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44448 --- sys/dev/nvme/nvme.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 8e99cb7b5356..46956d5f54cf 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1350,7 +1350,13 @@ struct nvme_controller_data { uint8_t reserved8[768]; /* bytes 1792-2047: NVMe over Fabrics specification */ - uint8_t reserved9[256]; + uint32_t ioccsz; + uint32_t iorcsz; + uint16_t icdoff; + uint8_t fcatt; + uint8_t msdbd; + uint16_t ofcs; + uint8_t reserved9[242]; /* bytes 2048-3071: power state descriptors */ struct nvme_power_state power_state[32]; @@ -2067,6 +2073,10 @@ void nvme_controller_data_swapbytes(struct nvme_controller_data *s __unused) s->acwu = le16toh(s->acwu); s->sgls = le32toh(s->sgls); s->mnan = le32toh(s->mnan); + s->ioccsz = le32toh(s->ioccsz); + s->iorcsz = le32toh(s->iorcsz); + s->icdoff = le16toh(s->icdoff); + s->ofcs = le16toh(s->ofcs); for (i = 0; i < 32; i++) nvme_power_state_swapbytes(&s->power_state[i]); #endif From nobody Sat Mar 23 00:25:41 2024 X-Original-To: dev-commits-src-all@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 4V1g2t0snpz5Fl1q; Sat, 23 Mar 2024 00:25: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 4V1g2s4z8vz4YpP; Sat, 23 Mar 2024 00:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153541; 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=LYcqKdXl8KAxh9yyJZVL7wDaU+feQ0pH29lbIYve9NI=; b=yKVASZOWnUsIKcZajJl9yD2hSuDyoXfIjrWyb/tk5YR1uk8wrJ1obXJPI1sQgPNTMm1FLA 34PBctlYkqvDGau7MP96BX8t+J4Lwq0U/UZ2b0osj4Zz8avXmE9c+yF+txhYvdaCjLCO8q iov5Z4BajAxkIpCtv4c0fwEFXQYYGxTkcF0TxmtLeiUmtsBn5WMwgietoJp6khyRdJAh5v 0jKXIjMgwkxbUkrbuwJ1nEJT7MhD5blk9Lbu9ZaACPvS9SurnaUM0c8rZrrpHM6rXljXJs QLMPYK9TJFtBUgIRWsC0AGYceylixt6tDQtbqAB2HqVu13PN8Q+1Wu/KP+HNnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711153541; a=rsa-sha256; cv=none; b=JOl8XKfdc7FPYTgVePlyXqrYcgUChR7GXe6/sV9FLCPOP6qDtnIazq3k28IqqhAwyaOTT4 XzWCTxqea1cTDv5I0x9b9C0OfHn6ILhNWr2xIS6NnygZtZo7U10/9YFz/gHn8uKwiLixTR /qyOcqWeSrILTJsvLQk86Kb0uCYhzougYrcb8+LHD5fsjl40r9TzKiRkcTc/aTQlGepUYp pzpyaQCnwXqWW4GTHNH2hGJiXIVU3mU4bTz80NyK0t37yhIG3DXNQt+qtgFeiAaB+frcJk sSpg/WZmmmNhb8NTjlTD0ho+NrCl9PDISIpy9XTEsVRhvflOUhuG3kZK1TqfIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711153541; 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=LYcqKdXl8KAxh9yyJZVL7wDaU+feQ0pH29lbIYve9NI=; b=L9VMMLdsSROQrNBphhLfInj7hU9zZtiufdOQB+2XX0HT9gbMSBBsM8onODirp2cdjz/L65 KbEPxQxnjZ3+NLnIjiWn0hx65GTHE9YMEk0R8PF8oaPQFycmhgtpjbizNIipAz5dD6ILR/ FKVk+zdsvNXVkbXrQqkx3pv0sZb7Rimu/cHRVhdBTiTn3/69DdwP/nBdY2SWf5mSuoPmsF bv4CeudRAoN6PqFnUkXK0X7idzNQHpU6eUdm0oElUqx32KBofGq/FCft++bhxgRA2nJiEh KcWP4Hcd5X3igm24fs1A9hi9OqilQVOEJXLXCncMGwk93ih0lsJWQPZ3FE1UYQ== 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 4V1g2s4GwdzQRn; Sat, 23 Mar 2024 00:25:41 +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 42N0PfFM006112; Sat, 23 Mar 2024 00:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N0Pf3X006109; Sat, 23 Mar 2024 00:25:41 GMT (envelope-from git) Date: Sat, 23 Mar 2024 00:25:41 GMT Message-Id: <202403230025.42N0Pf3X006109@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: acbc176c3dfd - main - nvmecontrol: Display additional Fabrics-related fields for cdata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: acbc176c3dfdfebd047507dc7d843f8cc10984a8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=acbc176c3dfdfebd047507dc7d843f8cc10984a8 commit acbc176c3dfdfebd047507dc7d843f8cc10984a8 Author: John Baldwin AuthorDate: 2024-03-23 00:25:07 +0000 Commit: John Baldwin CommitDate: 2024-03-23 00:25:07 +0000 nvmecontrol: Display additional Fabrics-related fields for cdata Some of these fields are specific to Fabrics controllers (such as the size of capsules) while other fields are shared with PCI-e controllers, but are more relevant for Fabrics controllers (such as KeepAlive timer properties). Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44449 --- sbin/nvmecontrol/identify_ext.c | 51 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index e4126da2d685..95ca4b5187d4 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -138,6 +138,36 @@ nvme_print_controller(struct nvme_controller_data *cdata) printf("Version: %d.%d.%d\n", (cdata->ver >> 16) & 0xffff, (cdata->ver >> 8) & 0xff, cdata->ver & 0xff); + printf("Traffic Based Keep Alive: %sSupported\n", + NVMEV(NVME_CTRLR_DATA_CTRATT_TBKAS, cdata->ctratt) ? "" : "Not "); + printf("Controller Type: "); + switch (cdata->cntrltype) { + case 0: + printf("Not Reported\n"); + break; + case 1: + printf("I/O Controller\n"); + break; + case 2: + printf("Discovery Controller\n"); + break; + case 3: + printf("Administrative Controller\n"); + break; + default: + printf("%d (Reserved)\n", cdata->cntrltype); + break; + } + printf("Keep Alive Timer "); + if (cdata->kas == 0) + printf("Not Supported\n"); + else + printf("%u ms granularity\n", cdata->kas * 100); + printf("Maximum Outstanding Commands "); + if (cdata->maxcmd == 0) + printf("Not Specified\n"); + else + printf("%u\n", cdata->maxcmd); printf("\n"); printf("Admin Command Set Attributes\n"); @@ -248,4 +278,25 @@ nvme_print_controller(struct nvme_controller_data *cdata) if (cdata->ver >= 0x010201) printf("\nNVM Subsystem Name: %.256s\n", cdata->subnqn); + + if (cdata->ioccsz != 0) { + printf("\n"); + printf("Fabrics Attributes\n"); + printf("==================\n"); + printf("I/O Command Capsule Size: %d bytes\n", + cdata->ioccsz * 16); + printf("I/O Response Capsule Size: %d bytes\n", + cdata->iorcsz * 16); + printf("In Capsule Data Offset: %d bytes\n", + cdata->icdoff * 16); + printf("Controller Model: %s\n", + (cdata->fcatt & 1) == 0 ? "Dynamic" : "Static"); + printf("Max SGL Descriptors: "); + if (cdata->msdbd == 0) + printf("Unlimited\n"); + else + printf("%d\n", cdata->msdbd); + printf("Disconnect of I/O Queues: %sSupported\n", + (cdata->ofcs & 1) == 1 ? "" : "Not "); + } } From nobody Sat Mar 23 02:50:52 2024 X-Original-To: dev-commits-src-all@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 4V1kGP0DnFz5G111; Sat, 23 Mar 2024 02:50: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 4V1kGN6PcDz4tJg; Sat, 23 Mar 2024 02:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711162252; 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=EKRwwmY+aYax1CajYLnO2BHA8nlM9VPpKgYY6UA5Ipc=; b=NHDQ/jp/WhDDxWZa9tkN77C1Xn83Z8xFSyXIeWqrKKJvxgm7xPeYdjMXMBI2+Z8v9zBzkU 4vcaiBgnNVgiTLQ2bVv74zvwRPUPzz2AHIv5WA3jkDpWRH4uxc/38yj6oUexGdP0wU83xY N54/fa7Gj4fkgBuxdzJSoNM3aPl1rZEXfywSl09UIigDh70DUMv6ahBWRxzBa9snKjre/9 O77py9hFJHZ55tm53DeQiTWTfRepFxZ9aY1V+TNKguvyVVgQPLa6yndeCS/aKwVXC3OxVF +i3tgs6Db4yTKfE39/vVjZ3LvSs9y5FQk5gJUQc23F5PRQBX0d5Jy7bpJpoDOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711162252; a=rsa-sha256; cv=none; b=S94WlS5wf3wKEGTuK+tjhDNU2sdeC+7CCMoNe/JLO/5oy0icYxgp/R3skIlh6wWYq05Gt3 bTelIek8HPYshMTRwmueBd3a1I9D1RERriWG7cUh91i8rQz2Y1I6N1XUrpzV4LpOYIhvES 4+vow7T648kt1kNxL6n2sB+3YeGP+yia/zJ/Gs3SuFEQTXvbi3etWdmgwWImFskrHUy5ZV qLj+DGhfI44b1AVoElx43GwYjw3JcUaRSfe19RieUSwXbqEjMHx+pUl4vHWsQlmMya0dbW i42W7kmYhepDQy5F4TnnXojZM5LgpQysB6MNBih8CNudD0FTVwn2SuC1D5LTvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711162252; 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=EKRwwmY+aYax1CajYLnO2BHA8nlM9VPpKgYY6UA5Ipc=; b=q8oRF3fZcMX6FA58NMyxw4gK0UvHiGsY6D/gYDii08+tNkREvomojSIhN0HagHVGAFFCMw Yl6JhiwJ9J7d9/jMzFIgM1npqYprGjUtq9KATocLe9XgMkbZC/mO9Y2u6M2rH0OuB3w8N2 gHBIfHHmc9LEld4IV8hE4JyRmyZTJ9tWr+bC09Ftd6qul1ts9unFCGqJQ4EPTkEsp6NRC6 ZEW3u71uujXpjSTcaiZd70LaDvq4PON8Wc+OIwx2e9sLQ94fyuLzAc24GKDi5mHZYYs68W m4SmyCG/J8WCroDfaQ2zmNFqc4PjxbqzV4DWimpGCj27UN8ADOZvFHxS9+bCsA== 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 4V1kGN61BxzVnD; Sat, 23 Mar 2024 02:50: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 42N2oqhf051915; Sat, 23 Mar 2024 02:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N2oqDJ051898; Sat, 23 Mar 2024 02:50:52 GMT (envelope-from git) Date: Sat, 23 Mar 2024 02:50:52 GMT Message-Id: <202403230250.42N2oqDJ051898@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: fbbb50f57093 - main - tests/netgraph: mark all tests as required_user="root" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: fbbb50f57093307d972a22ef001670dc92dc8f22 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fbbb50f57093307d972a22ef001670dc92dc8f22 commit fbbb50f57093307d972a22ef001670dc92dc8f22 Author: Gleb Smirnoff AuthorDate: 2024-03-23 02:50:33 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 02:50:33 +0000 tests/netgraph: mark all tests as required_user="root" Any netgraph operation requires root priveleges. Some tests in the directory already mark themselves with 'atf_tc_set_md_var(conf, "require.user", "root");' which creates a lot of pasted code. Some tests don't mark self. For this particular directory a blanket metadata setting in the Makefile is acceptable, imho. --- tests/sys/netgraph/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile index 8bf91c68ad6b..36f9943a7312 100644 --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -8,7 +8,7 @@ TAP_TESTS_SH+= ng_macfilter_test # Serialize tests since some share netgraph node names. TEST_METADATA+= is_exclusive=true -TEST_METADATA.ng_macfilter_test+= required_user="root" +TEST_METADATA+= required_user="root" TEST_METADATA.ng_macfilter_test+= required_programs="perl" ATF_TESTS_C+= basic \ From nobody Sat Mar 23 05:45:39 2024 X-Original-To: dev-commits-src-all@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 4V1p8400d1z5DYvS; Sat, 23 Mar 2024 05:45:40 +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 4V1p836X93z4CVr; Sat, 23 Mar 2024 05:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172739; 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=CIS6DsDEfQqRbeW06maMf1CKqcYdeEra4uE8Ixo6cPs=; b=hkIJ7FGABsPvE4uL7xcB+IvVtAog1WMIho9u8puPBgCByDtGPMQ7jVzjBctomh4qH6Aneo S7vQkR9OQHZV/7lj5bA8RpMsajKeFoyz4M2ytuWiD+xUlwVwej+kE4Nr/BbY9UPRN1ceKR dBEerVOfG3sDIRo+Z8Qa5b3CEye4E+NJYwryaF94IkSHHZ7mrizv10VXgi3ZVE8nZSx6vN Xyp9eHGrvJ5QHMLRkpIwuD9L9B8rWIaKRrrDyRDMSiOo8w7KTgeun42xz662jH2D6zFHQd wCmiccXwbqoUFZfHxj+gzM5iUyD1+TDKHm2U+5CUZBCAFIuHfQud9XJ8uf2jMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172739; a=rsa-sha256; cv=none; b=YJOEG4pUZJaNpdpC3usGfWISkK2U4Q3OKmEjCSLu2xZwIIBNWBs6ihYzYb7biCG+KAVqgI 1nH6HZEZHCeid7lNz9Xoqbeb3Rv8K8e5JI8Rs8O5Uuh2oUj5IDcY4WCy6Aow1TtluCIKT+ 29jMzcfOcFPJb2O2qtDXX9clWhdMAmNcH0Ed2WLy/eSgLnadHi9Td/4KSx2OuHJYRe41wh gHo5FFhoQM4Y+3sDTUGd8VyOKbdVzGOO8ZxkoZH0Kyi/BXY2VLGdjyuO4d1MLVLiOenOnB n3cyQClzfV+FUKZfCOZBZyAO1hBDvSD7zWxH+WaGsCpzOhry+rzL/BYeNOS5WA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172739; 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=CIS6DsDEfQqRbeW06maMf1CKqcYdeEra4uE8Ixo6cPs=; b=yTIwK+Uo+392CGahkTpPG6hFUWTr1xMicfPJOuUQhm4JUzah9fppXN3hdoqM6fq5n9qDtU QPNq2yd3c2OMZSN382NyrPyk9BVzzVItMgxUPnlAHUyOT/fm9obuDJypIrXX4PeYJbD72L pTcMwBeAP9SIjT4/CDJxSKeGjQkkmdZb58U9f1u0vG75SrR4sl/9xlhai8e1AuAb5wU3ek To/9RSWi3+oTUYkg28hZb5viPpgYdSEFyqOUrZhhhU2HHXJNNEto2lpHc4A9cOnIttR8ck FZ/mUUefTDXR3bC7WrNMZTly8cj13zntcRDTImA2w1Xf3fy/Wxcm3/f5mWZCBw== 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 4V1p835rNyzcGb; Sat, 23 Mar 2024 05:45:39 +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 42N5jdwS046816; Sat, 23 Mar 2024 05:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5jdfw046813; Sat, 23 Mar 2024 05:45:39 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:39 GMT Message-Id: <202403230545.42N5jdfw046813@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: 8d3d9ca8bd3d - main - tests/netinet: add UDP socket I/O tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 8d3d9ca8bd3db284f6ae671f1e816ba2822f0988 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=8d3d9ca8bd3db284f6ae671f1e816ba2822f0988 commit 8d3d9ca8bd3db284f6ae671f1e816ba2822f0988 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 tests/netinet: add UDP socket I/O tests Start a file that would collect tests for I/O functionality of a UDP socket, targeted on how a socket interacts with userland rather than with wire side of the protocol. First version tests that MSG_TRUNC and MSG_PEEK are working correctly. --- tests/sys/netinet/Makefile | 3 +- tests/sys/netinet/udp_io.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index b86457c2d723..fb3281028aff 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -12,7 +12,8 @@ ATF_TESTS_C= ip_reass_test \ socket_afinet \ tcp_connect_port_test \ tcp_implied_connect \ - tcp_md5_getsockopt + tcp_md5_getsockopt \ + udp_io ATF_TESTS_SH= arp \ carp \ diff --git a/tests/sys/netinet/udp_io.c b/tests/sys/netinet/udp_io.c new file mode 100644 index 000000000000..6e0c4d9fe6d0 --- /dev/null +++ b/tests/sys/netinet/udp_io.c @@ -0,0 +1,139 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Gleb Smirnoff + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include + +#include + +/* + * Create a pair of UDP sockets. The first one is bound to a local + * address and the second one is connected to it. + */ +static void +udp_socketpair(int *s) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + }; + socklen_t slen = sizeof(sin); + int b, c; + + ATF_REQUIRE((b = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + ATF_REQUIRE((c = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + ATF_REQUIRE(bind(b, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE(getsockname(b, (struct sockaddr *)&sin, &slen) == 0); + ATF_REQUIRE(connect(c, (struct sockaddr *)&sin, sizeof(sin)) == 0); + + s[0] = b; + s[1] = c; +} + +/* + * Check MSG_TRUNC. + */ +ATF_TC_WITHOUT_HEAD(trunc); +ATF_TC_BODY(trunc, tc) +{ + char sbuf[] = "Hello, peer!", rbuf[sizeof(sbuf)]; + struct iovec iov = { + .iov_base = sbuf, + .iov_len = sizeof(sbuf), + }; + struct msghdr msg = { + .msg_iov = &iov, + .msg_iovlen = 1, + }; + int s[2]; + u_int n; + + udp_socketpair(s); + + ATF_REQUIRE(sendmsg(s[1], &msg, 0) == sizeof(sbuf)); + n = (arc4random() % (sizeof(sbuf) - 1)) + 1; + iov.iov_base = rbuf; + iov.iov_len = n; + ATF_REQUIRE(recvmsg(s[0], &msg, 0) == n); + ATF_REQUIRE(msg.msg_flags == MSG_TRUNC); + ATF_REQUIRE(strncmp(sbuf, rbuf, n) == 0); + iov.iov_len = sizeof(rbuf); + ATF_REQUIRE(recvmsg(s[0], &msg, MSG_DONTWAIT) == -1); + ATF_REQUIRE(errno == EAGAIN); + + close(s[0]); + close(s[1]); +} + +/* + * Check MSG_PEEK. + */ +ATF_TC_WITHOUT_HEAD(peek); +ATF_TC_BODY(peek, tc) +{ + char sbuf[] = "Hello, peer!", rbuf[sizeof(sbuf)]; + struct iovec iov = { + .iov_base = sbuf, + .iov_len = sizeof(sbuf), + }; + struct msghdr msg = { + .msg_iov = &iov, + .msg_iovlen = 1, + }; + int s[2]; + u_int n; + + udp_socketpair(s); + + ATF_REQUIRE(sendmsg(s[1], &msg, 0) == sizeof(sbuf)); + iov.iov_base = rbuf; + for (int i = 0; i < 10; i++) { + n = (arc4random() % sizeof(sbuf)) + 1; + iov.iov_len = n; + ATF_REQUIRE(recvmsg(s[0], &msg, MSG_PEEK) == n); + if (n < sizeof(sbuf)) + ATF_REQUIRE(msg.msg_flags == (MSG_PEEK | MSG_TRUNC)); + else + ATF_REQUIRE(msg.msg_flags == MSG_PEEK); + ATF_REQUIRE(strncmp(sbuf, rbuf, n) == 0); + } + + close(s[0]); + close(s[1]); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, trunc); + ATF_TP_ADD_TC(tp, peek); + + return (atf_no_error()); +} From nobody Sat Mar 23 05:45:40 2024 X-Original-To: dev-commits-src-all@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 4V1p850kkGz5DZ4W; Sat, 23 Mar 2024 05:45:41 +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 4V1p846mfFz4Cgp; Sat, 23 Mar 2024 05:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172740; 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=zOrW2tVc09bwZhcM58KWmIZhUbt07A5rgqKF+2qe6Nw=; b=PJ4A7xoLxUMwEa3cT7fbr8P1YPaZtLmnQ32YjzDf7v41qDB/DKfdTf3C7XJ5WU5TbKx525 8uOoywI+kDZMx1RwgIJjXg7HyIWM3C8pYmEIOtdZ1cEDyTqgpsZLs4CiG3JXn+eivorcIb rC/ekKcaoi1558qu+uxRB8jOvPbrCK6tmsTMPlDgyf4yACE2PQTXXDUCZOIPJIAkKfSyFr sv3rnwd4vV3o9QHQenOZ18DO6WxYb39SMFRtBH8c+o+AW4+pzoGpwGHnVTwuPKwhnV8C88 GP72l8bAT3vyFecHsrej5wp2+z/QmGXW/oZtkgd/1mUe5DgAfwO92n578+HssA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172740; a=rsa-sha256; cv=none; b=yS2weF4gF9W4r+3YvtYxo+QXc+5PbZOUU1Fo29qG19n4EMI773jR5qJOpbkTtlZg5Q65nY L/am4mZqwkVKYdeJFXFLNV5NAQxBKlGOXXHOeg6YrYztczFAYCLw6jYxnZSOVwpli7KCpy 6DZIQbKtjd/IRyIG+4gJYSjDzS4CBxH4KVm26UEVvbxInXY0WF3lCJb9aNPdCIzsRHBo72 c9C/LMgynzEKl+2A2PuaPoDPoRGz2fAS64Hwiuw7qszfBfzC1FacnPoQIdVIBBIwlSt+bg PvYUzYXbXECg2dQqPyL1PByxXpTDZ/kHV69OxwMXO7AQiRjQgjyFn8OoF3q1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172740; 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=zOrW2tVc09bwZhcM58KWmIZhUbt07A5rgqKF+2qe6Nw=; b=J9QT4yF2088xiZiChBrFClSJS07vNDu7ox4W21mh79dMabZM7eYnrMVfl6CHuReCzHjdW5 ddJjvoNFKwNwwI+f0exx2IKwwzwzispBvKIAJ31/faXQv/qkcvo435xgplZ1NPu7DEfC7C 7gr83WMBc/m9eRzW0tdz7ZghTWCJHvknAb7CulSqduOKuIAcWOH+FHfkU4IFqU0AW9LpCT GN1Z8uv6j5wi+1haQ8+zVdOxkMyOlLlmpQyi3H/oXS0e2kuDGM+YQ67gSqO3t0zGRQvHow InN7z+6e4acgr37ZZulI2pZQAEmS/QisFRej3Gj5hOrtwF1f/RBGoa2FR0xJ/A== 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 4V1p846N6Dzc0r; Sat, 23 Mar 2024 05:45:40 +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 42N5je31046860; Sat, 23 Mar 2024 05:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5jeGE046857; Sat, 23 Mar 2024 05:45:40 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:40 GMT Message-Id: <202403230545.42N5jeGE046857@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: a8edc9f1e316 - main - tests/netgraph: start ng_ksocket(4) tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a8edc9f1e316e4893b0b6aac282c542102cf3b99 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a8edc9f1e316e4893b0b6aac282c542102cf3b99 commit a8edc9f1e316e4893b0b6aac282c542102cf3b99 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 tests/netgraph: start ng_ksocket(4) tests The ng_ksocket(4) functionality is very fragile as it interfaces with kernel socket code in unusual way. It definitely needs a test suite. Start one with a test that tests UDP over IPv4. --- tests/sys/netgraph/Makefile | 1 + tests/sys/netgraph/ksocket.c | 115 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile index 36f9943a7312..2240570ff46a 100644 --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -14,6 +14,7 @@ TEST_METADATA.ng_macfilter_test+= required_programs="perl" ATF_TESTS_C+= basic \ bridge \ hub \ + ksocket \ socket \ vlan_rotate \ diff --git a/tests/sys/netgraph/ksocket.c b/tests/sys/netgraph/ksocket.c new file mode 100644 index 000000000000..e97b9b3f0691 --- /dev/null +++ b/tests/sys/netgraph/ksocket.c @@ -0,0 +1,115 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Gleb Smirnoff + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#include + +#include + +static void +hellocheck(int wr, int rd) +{ + char sbuf[] = "Hello, peer!", rbuf[sizeof(sbuf)]; + + ATF_REQUIRE(send(wr, sbuf, sizeof(sbuf), 0) == sizeof(sbuf)); + ATF_REQUIRE(recv(rd, rbuf, sizeof(rbuf), 0) == sizeof(sbuf)); + ATF_REQUIRE(strcmp(sbuf, rbuf) == 0); +} + +#define OURHOOK "ks" + +ATF_TC_WITHOUT_HEAD(udp_connect); +ATF_TC_BODY(udp_connect, tc) +{ + struct sockaddr sa = { + .sa_family = AF_INET, + }; + socklen_t slen = sizeof(sa); + int ds, cs, us; + + ATF_REQUIRE((us = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + ATF_REQUIRE(bind(us, &sa, sizeof(sa)) == 0); + ATF_REQUIRE(getsockname(us, &sa, &slen) == 0); + + struct ngm_mkpeer mkp = { + .type = NG_KSOCKET_NODE_TYPE, + .ourhook = OURHOOK, + .peerhook = "inet/dgram/udp", + }; + ATF_REQUIRE(NgMkSockNode(NULL, &cs, &ds) == 0); + ATF_REQUIRE(NgSendMsg(cs, ".", NGM_GENERIC_COOKIE, NGM_MKPEER, &mkp, + sizeof(mkp)) >= 0); + ATF_REQUIRE(NgSendMsg(cs, ".:" OURHOOK, NGM_KSOCKET_COOKIE, + NGM_KSOCKET_CONNECT, &sa, sizeof(sa)) >= 0); + + hellocheck(ds, us); +} + +ATF_TC_WITHOUT_HEAD(udp_bind); +ATF_TC_BODY(udp_bind, tc) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + }; + struct ng_mesg *rep; + int ds, cs, us; + + struct ngm_mkpeer mkp = { + .type = NG_KSOCKET_NODE_TYPE, + .ourhook = OURHOOK, + .peerhook = "inet/dgram/udp", + }; + ATF_REQUIRE(NgMkSockNode(NULL, &cs, &ds) == 0); + ATF_REQUIRE(NgSendMsg(cs, ".", NGM_GENERIC_COOKIE, NGM_MKPEER, &mkp, + sizeof(mkp)) >= 0); + ATF_REQUIRE(NgSendMsg(cs, ".:" OURHOOK, NGM_KSOCKET_COOKIE, + NGM_KSOCKET_BIND, &sin, sizeof(sin)) >= 0); + ATF_REQUIRE(NgSendMsg(cs, ".:" OURHOOK, NGM_KSOCKET_COOKIE, + NGM_KSOCKET_GETNAME, NULL, 0) >= 0); + ATF_REQUIRE(NgAllocRecvMsg(cs, &rep, NULL) == sizeof(struct ng_mesg) + + sizeof(struct sockaddr_in)); + + ATF_REQUIRE((us = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + ATF_REQUIRE(connect(us, (struct sockaddr *)rep->data, + sizeof(struct sockaddr_in)) == 0); + + hellocheck(us, ds); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, udp_connect); + ATF_TP_ADD_TC(tp, udp_bind); + + return (atf_no_error()); +} From nobody Sat Mar 23 05:45:41 2024 X-Original-To: dev-commits-src-all@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 4V1p861Yknz5DZ6w; Sat, 23 Mar 2024 05:45: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 4V1p860hCCz4C9d; Sat, 23 Mar 2024 05:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172742; 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=XGtjrtEe0XhJPHWFTchC6VkvEuq8KlW+incGdGkztak=; b=fz9AbBnD4acPdzglY4P/J1oNmDbGYgi5vTFLdktU0duRg03TF2pjPmSJznF+TsxD8nJm7p l4Qn+lKrQIs+XTokY3T7cT68DtUS9flC4eisAGZJEF/IN6RuEzdR2/vfO90c+rH4jRJsuQ /ey9lznoBpFjXN/eSSdEXfxrGSYTF0FOtwW/eDui8eVyUhkMmEIwt5YEYuFjVJqYeCirIJ AuYiNaoYog+VQSBieLI3rstlU/uo/Kt4APXRLyTfM8jcu9xO6YIKHZvUNFvY/mTHCKd18J N2dnv6gb1uE++e51SeTFQGM1rTUvwd2wlUBNKscNBwrqbNKrB1MZdHSZYc6bDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172742; a=rsa-sha256; cv=none; b=mrTp57RFTbGyYUo4bM9IZb2KJURerRXmFQ2dFir9UGAVtPF4q6o96lb8qUQVv8l/ZoiNv0 LIb2GO5Dknvr7BrMtXrIQ/Lu7yeHh10/BAF1MxlncOP3EC5VikkDMKmtNeNLBIb1wCFLhO w3VqUjkB3ENCKDN5ZAkMAPkwJi+brS9sbMb95jpVsxocFm+3gBckynQQRL/45zJx22n6TN JQQuit+AUfk2FyjNDmlGtd5jqIzyjra8Y/ylEQXpaUfGILPwllRRbEZfOVDrMbBjcUu9V+ eVBmCpYljeC0SjhuC/o6lS6Zn69CmcWx92sNg5lHbWUuDZR4NRmaepnpgSKiOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172742; 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=XGtjrtEe0XhJPHWFTchC6VkvEuq8KlW+incGdGkztak=; b=KplsKHwslLYzupFlRvged7akY7M7YFHK+id1OprrWqekTjG+BehTDogKCcTNvMg1ZpLztU NS+C6uYikd8QrHi0UYcjWVeDky54krIE7N/qp2Hud2Ytd+mJfdzfJksU292GFQVOecyzXC pyRlOClmkpCycN91UhzrH4SKsfqRulo0DGgf8uTwSqIqpvyBKrMYJQDNjEI6+98ohI7nN/ fXCRHk+TNh++V5hhyCco2fd3zlfbxBVTfcjt0YXIkEkAHa85O6bk7KsE1yeycXLhdiC3qc tknKR0+/YwI9UBa773Ueu/Ra/r0f9vrUwtSW5gxZ3CMVJ4FG4bKjd3VcQ03Idw== 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 4V1p860HWNzcGc; Sat, 23 Mar 2024 05:45: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 42N5jfj0046916; Sat, 23 Mar 2024 05:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5jf6K046913; Sat, 23 Mar 2024 05:45:41 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:41 GMT Message-Id: <202403230545.42N5jf6K046913@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: 1a3d1be4965a - main - ng_ksocket: use new macros to lock socket buffers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 1a3d1be4965afddded0b2582b9c4969c1e6a4129 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1a3d1be4965afddded0b2582b9c4969c1e6a4129 commit 1a3d1be4965afddded0b2582b9c4969c1e6a4129 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 ng_ksocket: use new macros to lock socket buffers --- sys/netgraph/ng_ksocket.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 388fe9557db3..3e4427f9e387 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -608,12 +608,12 @@ ng_ksocket_connect(hook_p hook) struct socket *const so = priv->so; /* Add our hook for incoming data and other events */ - SOCKBUF_LOCK(&priv->so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(priv->so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_rcv); - SOCKBUF_LOCK(&priv->so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(priv->so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&priv->so->so_snd); + SOCK_SENDBUF_UNLOCK(so); SOCK_LOCK(priv->so); priv->so->so_state |= SS_NBIO; SOCK_UNLOCK(priv->so); @@ -1231,12 +1231,12 @@ ng_ksocket_accept(priv_p priv) */ LIST_INSERT_HEAD(&priv->embryos, priv2, siblings); - SOCKBUF_LOCK(&so->so_rcv); + SOCK_RECVBUF_LOCK(so); soupcall_set(so, SO_RCV, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_rcv); - SOCKBUF_LOCK(&so->so_snd); + SOCK_RECVBUF_UNLOCK(so); + SOCK_SENDBUF_LOCK(so); soupcall_set(so, SO_SND, ng_ksocket_incoming, node); - SOCKBUF_UNLOCK(&so->so_snd); + SOCK_SENDBUF_UNLOCK(so); /* Fill in the response data and send it or return it to the caller */ resp_data = (struct ng_ksocket_accept *)resp->data; From nobody Sat Mar 23 05:45:43 2024 X-Original-To: dev-commits-src-all@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 4V1p874zWVz5DZ9R; Sat, 23 Mar 2024 05:45:43 +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 4V1p871xv3z4CW5; Sat, 23 Mar 2024 05:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172743; 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=207t5eiFcVwdESvVEuuOjQsnQjQnO5/uaQA4SeOLktg=; b=PF3A/Ihz51U0dslXCk7VgYKZDShLrWqH/ysdFS3/8GKVvLhl33hnBFVtRB+4IHWhD9jFu9 rCgt4+/ygorOizTyVHC4mLyzujOv5XX0wb1BB2WeJkBvqJiz+K6+dlFSjCVKaN0uwdlOOn TSKlUPnw+rkYObrIwSiwj4ZTrcbFFJnd8ppGXIsPCcgNLbgXlTd8yfq63N0LqqTM3GfJxH KbjObJIi7EvmcBxbfEYvR1oaHrrGnHk++byyluPRNTmyqdY6jb3wH1UjOu0xYUsmZ4U8Ej Y3C+Dv9BhGGZYnQsU941vcGbxG2v1X8Kqf+o+T7ZUVvK31QCG0uX/o9PqhV4xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172743; a=rsa-sha256; cv=none; b=JKGXut7/MH5qD/iPU56Any4kZeQZtYmnoCOlI08+2ak5JFbB22Aelw0V7RC1Yx7ZNGWUkX btgzFk3Ybsa7g57G0VaTrnyUJzZhsF3jYTAIycl5kiGDf7ml9ytpbizSf3/fWAmEKHQQV0 wnfkRRTkItJC/fv1HLCzvmqxiIMNx+fCgC1LZ4algWNNwpR46VxUFRSZmwgTL9tejlJWbC IVD0/xkwARp98r0sryABIMaA9kJH8/WzMqAPoo/vZM5+iOo4WAI0hH8/0vNBcwub8mniBv TXU3qI6dDpXHjVJJ8RvStSj66N/ZDXD8rShgZqUyOxjs8kPQ5hNuiZpc1K3uuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172743; 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=207t5eiFcVwdESvVEuuOjQsnQjQnO5/uaQA4SeOLktg=; b=d9iij503O0Un0HIA+65KajRkfYIqo4y2QUGtI4OSDsT7sVL/zhqTz8iQpi4AiS5qG8/o5y K7IJ3S2ewCI5mh/HGT5Bf5Tml0q0F3h8OI9fT6l6Flg/Fh1xtSE6ulXII+bsCG02/6WbQ6 ysb0TdLYHHd5FBz1R/vwHFfmFnP31lPKFIGLMsgDrAI2vhSyNqaa/4fyuRlXrm+XjNEkI+ UJ/TMKfoAy8ajQNw+ffARxmuXY3dKdUbcpHUBB0PEOEJRilb0eWyoWatB6EQ0xWs/3DXUO m4ha6vMOJ8WGbdMjxnBy3WZU4phiiF2ERpL2mt6k9mFpptgWfP0TlvBD0E9iqg== 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 4V1p871Ljyzc7M; Sat, 23 Mar 2024 05:45:43 +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 42N5jhuI046970; Sat, 23 Mar 2024 05:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5jhKX046967; Sat, 23 Mar 2024 05:45:43 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:43 GMT Message-Id: <202403230545.42N5jhKX046967@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: 26389b308d97 - main - soreceive_dgram: assert that a datagram has control or data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 26389b308d97f90a1c196a85666142965bf0737c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=26389b308d97f90a1c196a85666142965bf0737c commit 26389b308d97f90a1c196a85666142965bf0737c Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 soreceive_dgram: assert that a datagram has control or data --- sys/kern/uipc_socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 9a29df8b0340..b70864cbf2a4 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2872,10 +2872,7 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, M_NOWAIT); m = m_free(m); } - if (m == NULL) { - /* XXXRW: Can this happen? */ - return (0); - } + KASSERT(m, ("%s: no data or control after soname", __func__)); /* * Packet to copyout() is now in 'm' and it is disconnected from the From nobody Sat Mar 23 05:45:44 2024 X-Original-To: dev-commits-src-all@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 4V1p884cX1z5DYvY; Sat, 23 Mar 2024 05:45:44 +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 4V1p882q24z4CWM; Sat, 23 Mar 2024 05:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172744; 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=j7ecNT7Hpe0UVQMUPnSMSwSqXuXr9E8zpS8ESZchxwI=; b=oW3ug5G5UzRU1Pcdc1InC3NSCUewpdnknfX+es41oQT4MpPg7L+TS705Gfry3YEeKY2KMl tO2LfokFYTvMTYvXSeWxny2EX2UatX9TUDfaNkDBpDDgBnDIGEpioB35Ysx8a2KkIWHiZJ Jhyobt+n3nq+VCXBNlA3k9Y59Tq1HG5kMMKjA/N8VzoTyVX4ra7KO0kC8XRV3qXwrkwSt6 wp6P7YuUPKk/5iZmhVG3tmCf7SKIx4P7TCmy7JmG7VsnUF4ueQLp7b/X6tIbQvZ1a/9eHQ 20vo+1sMaoNpT28K/PMtveiSBC5s2C4DsuiNRDEgcLS4n1pQRChRKwp633c/LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711172744; a=rsa-sha256; cv=none; b=ZOGcIpbn8/s8dv/GHVGRgIybygC8USQRxoyS7E6enXEth4drowR/8U/XbuE3E67G43GT3n mRfni6lx5W28j+jQTICgO++CKZ8oiOaRvX6XPC0zYKNIHS3s6kkmpFhP/pI9WEf8KTpP84 TTZzfc1Ap+pYcKN4P2oWn1iovdbRagzlvhpkludIM9eVPUKvDxuk9Al3wbY1UcpRzXCchb N2izsCq9v17lEP2mHpTHv5kR/z8yZmBvrSOgcO9IrxBp/ftQUhPhaHrTgzJWsFXLDHNLlX 8S7KJsSU+3KFEP+Wa8eOFb2sESgInIlIsdL/9tF2TZvkM1e7KZeZA0h1R21P5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711172744; 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=j7ecNT7Hpe0UVQMUPnSMSwSqXuXr9E8zpS8ESZchxwI=; b=qQAaZtJLF5Apdt3wRO7ubxM6FdRmt4Q61H3kF3yEL4h4wFPxJrIoNrp54aFB5MciZD/y/H OgA1ElALzs++mrijb4RQsRlyr4d/VT//69gOAKfL518OwlQsz33CsNC49m2o3pbRos8PTv 3RyDIXWYtVEeFEDM/tWm4XCkFft137FApnGXyUdNd33JMyR5ts0frGyR9YdDK9xUNRxa80 W0CAJOQaAuS8xll6yQsg7UEUOTTv+oRohxeSr1ZKMcxTcSk4OltvSYF9y3Eb8xzKZZgTLP 3RwEcuhlcAZzvQ7Hsk5RRVG4AnMU2vufTD16lZ39kfbv+l67hSWs18t0txF4Bw== 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 4V1p882QjTzc0s; Sat, 23 Mar 2024 05:45:44 +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 42N5jiAI047027; Sat, 23 Mar 2024 05:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N5ji7i047024; Sat, 23 Mar 2024 05:45:44 GMT (envelope-from git) Date: Sat, 23 Mar 2024 05:45:44 GMT Message-Id: <202403230545.42N5ji7i047024@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: 15bfd7cf2789 - main - soreceive_dgram: use M_WAITOK when we don't hold any locks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 15bfd7cf27898b5d34e9fa08c10f9cc69da05977 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=15bfd7cf27898b5d34e9fa08c10f9cc69da05977 commit 15bfd7cf27898b5d34e9fa08c10f9cc69da05977 Author: Gleb Smirnoff AuthorDate: 2024-03-23 05:44:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 05:44:16 +0000 soreceive_dgram: use M_WAITOK when we don't hold any locks --- sys/kern/uipc_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index b70864cbf2a4..196461f645ce 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2869,7 +2869,7 @@ soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, ("m->m_type == %d", m->m_type)); if (psa != NULL) *psa = sodupsockaddr(mtod(m, struct sockaddr *), - M_NOWAIT); + M_WAITOK); m = m_free(m); } KASSERT(m, ("%s: no data or control after soname", __func__)); From nobody Sat Mar 23 06:59:15 2024 X-Original-To: dev-commits-src-all@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 4V1qn020pMz5Djfv; Sat, 23 Mar 2024 06:59: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 4V1qmz6JMqz4KMd; Sat, 23 Mar 2024 06:59:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711177155; 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=S0xZSxcETWCXeSgqz29PwRJyXWz1UdFGUT44PdT8a7U=; b=DQY73XmDmHN+1kTmwQf8FYvEpzqMR0KRWvTfUhZZ3IKcZjY1lZOC2pPDcNe/cr9x0/LUMD Pvyt6og4PXyVCgvF/I2qRPoMTrlSxUS5MB2vbmDLuH9IXCEHBkzs0GKbEe5+aVfgwvPV+l 0ScS3X9HlUcPJt7Sg1Y0FHEpQxpBf+GxJyUbqSQnYT5YGKqyTCGbYaq2oib5y5MGsuEKmR ZaTL7yWryDosWOXWC7be/JjOK2F+J2wV+jB4MJT0sh7+ueJOG6YZZPQy+PiQi67ZGM8Bs/ 0m6FBPzyn/6gaQW9PR/bRFWS/nAQlg3Nl0b20oYq0nAt8m/2QE2I1YdscM24Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711177155; a=rsa-sha256; cv=none; b=dasUTbC0l52N56xxYD1P3/GqDpZ2ZbENFiB5QNgRbsLZY0a3X0VHNYNQ4qxLeUk1WLWjGC AeFuoEXZLikokCfwrbSvGIzWb8NyEwiL7iPfCwi8p8DMYzXLfk7SFp7jQGoUHBDRYvL8hP 4JQEm1xdiz9mSWivyNl3GeUuB2CngODYZ1vPa7uklhiUDI4JvKU0/Kpi8vjtlOnk/TxMHh DCTxLeBEaT66bX88uWxPq4a9Dfg2ptU6c716cUFN032oinmQjtY1q2TTsODFkgu+Qp9edk ggBwivx+uPErN0TP9jfbo1wtqssA/kCZ5Dydhfl5WmQfvytN/0MQ5tGM1qFygQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711177155; 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=S0xZSxcETWCXeSgqz29PwRJyXWz1UdFGUT44PdT8a7U=; b=ZjToPmoC+BtTwVl+eyHgFPULRXUskJXGWjzpg/ap/9V9vCai97cxcTqMWUMAVXNy0183ut 2e2icf4H7nloVEaGIOpl8PS5TvP7BBPrIz+LvhoU91VzygqaYS2RwxfxkVl1RvmuiQQ0/k /HETAiritmh+OUciZLF7O7otvmgH1rxZZes8AmoR3EVpdwvxe284XF+1ourluX4r1m93Hu s9MN3ASymqq/ZFYGCRge7SS/Her4eyBS1uUbgG5f1yzvbNaRnj1BBoCqGwT5bLQKfrhMMp G88LqcLTdKlihlzuR9S5Vv39wBxKCsCrUSp4jll4PNbA1mrCzw3qhXl/DfdMyA== 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 4V1qmz5X5gzdJ3; Sat, 23 Mar 2024 06:59:15 +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 42N6xFI6065481; Sat, 23 Mar 2024 06:59:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N6xFRS065478; Sat, 23 Mar 2024 06:59:15 GMT (envelope-from git) Date: Sat, 23 Mar 2024 06:59:15 GMT Message-Id: <202403230659.42N6xFRS065478@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: d3efbe0132b2 - main - cdevpriv(9): add iterator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: d3efbe0132b24e8660df836905cda7662f85a154 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d3efbe0132b24e8660df836905cda7662f85a154 commit d3efbe0132b24e8660df836905cda7662f85a154 Author: Konstantin Belousov AuthorDate: 2024-03-22 02:58:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-23 06:59:00 +0000 cdevpriv(9): add iterator Reviewed by: christos Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44469 --- sys/fs/devfs/devfs_vnops.c | 20 ++++++++++++++++++++ sys/sys/conf.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 3b8a624fe620..a35f6dbf9520 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -177,6 +177,26 @@ devfs_set_cdevpriv(void *priv, d_priv_dtor_t *priv_dtr) return (error); } +int +devfs_foreach_cdevpriv(struct cdev *dev, int (*cb)(void *data, void *arg), + void *arg) +{ + struct cdev_priv *cdp; + struct cdev_privdata *p; + int error; + + cdp = cdev2priv(dev); + error = 0; + mtx_lock(&cdevpriv_mtx); + LIST_FOREACH(p, &cdp->cdp_fdpriv, cdpd_list) { + error = cb(p->cdpd_data, arg); + if (error != 0) + break; + } + mtx_unlock(&cdevpriv_mtx); + return (error); +} + void devfs_destroy_cdevpriv(struct cdev_privdata *p) { diff --git a/sys/sys/conf.h b/sys/sys/conf.h index d7a33ed10afa..f34fd43cfe24 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -319,6 +319,8 @@ typedef void d_priv_dtor_t(void *data); int devfs_get_cdevpriv(void **datap); int devfs_set_cdevpriv(void *priv, d_priv_dtor_t *dtr); void devfs_clear_cdevpriv(void); +int devfs_foreach_cdevpriv(struct cdev *dev, + int (*cb)(void *data, void *arg), void *arg); ino_t devfs_alloc_cdp_inode(void); void devfs_free_cdp_inode(ino_t ino); From nobody Sat Mar 23 06:59:16 2024 X-Original-To: dev-commits-src-all@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 4V1qn107LQz5Djnk; Sat, 23 Mar 2024 06:59: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 4V1qn06YnPz4KSJ; Sat, 23 Mar 2024 06:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711177156; 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=Y1TtqChr/Q1oU6FfG/ueHUfV9w81VTP5GMs88NZL4Uk=; b=WdrqStHZslQk3/ZNrlWHca1aL3CQjMt5MURqo8DPoURDuPEgQr7SLDvbLJ3SS5e3dEz9cX hoVLxyS8OSAHlOpc5eCs+dx8/khIjssw2i4xjDUCHSzND5Os1lDFU84gnQsJHCRkFxViwH 0dhFEKgmBtUlMqcJciS3XlnnS1PLbVDP6UhZL6c7oi8FHYxXHVP7pWIG1KOUdFv/7ZyxD/ Mu7wOjkvEok3HOjKE/zc5CyXIZSyqct7rEXfgEoIRojtx1iC7K6IU5f2qgH35KMCGpmRJX gmZoYthMgRRGwcofGJcbgeZQIu9vF7EOiTOYbbMscHVRugjBPULJMfiN6bL5jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711177156; a=rsa-sha256; cv=none; b=c8pff4tcjatPCkdUu6jWCIgUkHEVxeZTmqfrMWGgeWuXYjxfQDP9MWBikzbp+RcMudkpat 9OtUWEokrt9fZDYRGTbr6wyWHHizsIAb0YTy8TZxgAoJkPv1OFpS4qnivCq8qySO7I7Lws EK3vyuvIwr+3NBEFX6RdjPfsSNQc9qgKIR0ZxWodQzLuVmeK/gk6DR7gH3W/eWqrlihQ2p fGwODVWfmWUDPlOb9Uh185oSwLIW2zqmgkZVAxuVkOrly1CuHjRjPbWzSe83olphmjNxmR qingZo88EMrvxjKU8+hmEumQTxdqVs0jop9aROygccoT8H3YUy36r0bMvWMkQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711177156; 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=Y1TtqChr/Q1oU6FfG/ueHUfV9w81VTP5GMs88NZL4Uk=; b=cnoXD3XI0xmw4H1Aq0hCWZntLCUpPG5ITWeMIbOQd9qdDxfJ1gPeye3DO5bGiMyMZ/JNx5 ypHcpwckuzki+1nk8TbZMLc9rXTF2afJMC2t7FViFiu8MZmAOWn5EEexB0JrhJdBmUYk/K SB1Lq10w4OA8op/ngQRJpKchDfuHzhz5XOYJJcFDmi5OHV63TN4wCm8ryzlZPPKhgJTne7 rxGemrkol2F8wRpa+HDx3W9Bm0sPml+TNjbTG9IozQFnrxwS2P8HoNSrpBczgK+Gh5E3UM IhTsQEEqcGly/3MGwyFKWqCduZwwQYy/gnvdQcWxkH/QllqZgQppZ6a95yJspg== 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 4V1qn05jxYzdJ4; Sat, 23 Mar 2024 06:59: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 42N6xGcv065517; Sat, 23 Mar 2024 06:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N6xGZb065514; Sat, 23 Mar 2024 06:59:16 GMT (envelope-from git) Date: Sat, 23 Mar 2024 06:59:16 GMT Message-Id: <202403230659.42N6xGZb065514@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: 88f2c58d1a85 - main - cdevpriv(9): document devfs_foreach_cdevpriv() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 88f2c58d1a857f0ccedd49da3dc29d8d193b4fdd Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=88f2c58d1a857f0ccedd49da3dc29d8d193b4fdd commit 88f2c58d1a857f0ccedd49da3dc29d8d193b4fdd Author: Konstantin Belousov AuthorDate: 2024-03-23 06:48:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-23 06:59:00 +0000 cdevpriv(9): document devfs_foreach_cdevpriv() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- share/man/man9/Makefile | 1 + share/man/man9/devfs_set_cdevpriv.9 | 41 +++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 87fb2f0906c9..597b487bb8ae 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -998,6 +998,7 @@ MLINKS+=dev_refthread.9 devvn_refthread.9 \ dev_refthread.9 dev_relthread.9 MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \ devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 + devfs_set_cdevpriv.9 devfs_foreach_cdevpriv.9 MLINKS+=device_add_child.9 device_add_child_ordered.9 MLINKS+=device_enable.9 device_disable.9 \ device_enable.9 device_is_enabled.9 diff --git a/share/man/man9/devfs_set_cdevpriv.9 b/share/man/man9/devfs_set_cdevpriv.9 index 945d31a58d0a..3258ca082e5f 100644 --- a/share/man/man9/devfs_set_cdevpriv.9 +++ b/share/man/man9/devfs_set_cdevpriv.9 @@ -22,13 +22,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 2, 2015 +.Dd March 23, 2024 .Dt DEVFS_CDEVPRIV 9 .Os .Sh NAME .Nm devfs_set_cdevpriv , .Nm devfs_get_cdevpriv , -.Nm devfs_clear_cdevpriv +.Nm devfs_clear_cdevpriv , +.Nm devfs_foreach_cdevpriv .Nd manage per-open filedescriptor data for devices .Sh SYNOPSIS .In sys/param.h @@ -42,6 +43,12 @@ typedef void d_priv_dtor_t(void *data); .Fn devfs_set_cdevpriv "void *priv" "d_priv_dtor_t *dtr" .Ft void .Fn devfs_clear_cdevpriv "void" +.Ft int +.Fo devfs_foreach_cdevpriv +.Fa "struct cdev *dev" +.Fa "int (*cb)(void *data, void *arg)" +.Fa "void *arg" +.Fc .Sh DESCRIPTION The .Fn devfs_xxx_cdevpriv @@ -111,6 +118,36 @@ filedescriptor, or .Fn devfs_clear_cdevpriv was called. .El +.Pp +The function +.Fn devfs_foreach_cdevpriv +sequentially calls the function +.Fa cb +for each +.Nm cdevpriv +structure, currently associated with the +.Fa cdev +device. +The iterated +.Nm cdevpriv +data pointer and the user-supplied context +.Fa arg +are passed to the function +.Fa cb . +If +.Fa cb +returns non-zero value, the iteration stops on that element. +The +.Fn devfs_foreach_cdevpriv +returns the return value from the last call to +.Fa cb , +or zero if no +.Nm cdevpriv +data is currently associated with the device. +.Pp +Current implementation of the iterator makes it impossible to use +any blockable locking inside the callback +.Fa cb . .Sh SEE ALSO .Xr close 2 , .Xr open 2 , From nobody Sat Mar 23 07:18:24 2024 X-Original-To: dev-commits-src-all@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 4V1rC50mlfz5DlHv; Sat, 23 Mar 2024 07:18: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 4V1rC4703Fz4M5w; Sat, 23 Mar 2024 07:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711178305; 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=R3voZ14o0VOxfVEwZCXBhVe8l0nmOwA64Sg0G6njKkQ=; b=C3nDn+xpOWn7kCHYicUs5aoTTJ+3KPQmZin+YdtYxafG0SkGHs/mw9DUSI/pI/UnbuxMvf kQksNnYbUk347a5rVFhSAQzAeXcDcf5RKmRHAkbtkSjwDWPLubb3Xo+gzGRKWwYVy6v0HX NhruClHUxvdUTiWWDCky4cBPBngKBlcfZrkU4CeLnfiFMaYFFrg3B5QTYErNlpn5DihoHi QOvamsfRHpdqrgxXVem4MM4OSFEEl9Ntj1afuowqKI17T9jJBFY+uW7QHmzknvnW/G0P17 8bbno9jCwTydM16NMXuTFkcc30LHBJmFnL3g4iZD27yUCT+Wo6JZO6hPE3Vwog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711178305; a=rsa-sha256; cv=none; b=U/ttfMsSO6OYSZ6jAv7P0mH53nwWadFfFxSmulxRpkpDnslmqwl1INn5oM8uInJCggy956 tc+F4dhQWMKzR9AsA5pyhAKMW4Yc6PWowN/SwcPIWpzNjOTmaVU1TVQmpQ9mt+DJd+lvsb exHCdGTv718fy5Pyf6gtQ9G6rCPmD8pXnUoiQnPN7DvLkRMfIHw7FuFvXFNA6Q3Cd2W6T6 L3W3TdhWu8a6PJUZM3hreTZkju0q0pY5vNhpFX6L7jPm6NpAZoKmVX7tlYYOlJCb5ARApC bAO6exiacp5txub9laGKDk4+YV5aPL56ivZE22SHzWykDSXvmnSK9YNJR+VYQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711178305; 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=R3voZ14o0VOxfVEwZCXBhVe8l0nmOwA64Sg0G6njKkQ=; b=hLJ2zqOUmVNF1Gr59+HCvbz6S90t8zjXWxsjT2fc3iL9jlKonG9Hfq6WK4FHzS9l7v3t1T 7hviinn1BFaaSGIe0yxiKgt3aw0dvPX49913FgAv70KtLlSCKHvo+WpYNX5u+p3pglMJxN 4R7IcvKRGXZV30duasKdRpt2AHl/4IJveeACJjKZHzt7b8YbAUPZ54hbFjahbhsPxhdrif DFSWAhWXNHdZpOlE/5XudsY+GYQvQfiDSV44dd0K30qnmgS3OZVPfUZw+On9JRu/rY/S51 RDv9foYrFkp1fLjpyHUVpmxWlypqWLLZZIeTRLzUYAO82sJ2+ithOBFQ+dDhVA== 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 4V1rC46Zwmzf9M; Sat, 23 Mar 2024 07:18: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 42N7IOsU099215; Sat, 23 Mar 2024 07:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N7IOks099212; Sat, 23 Mar 2024 07:18:24 GMT (envelope-from git) Date: Sat, 23 Mar 2024 07:18:24 GMT Message-Id: <202403230718.42N7IOks099212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Antoine Brodin Subject: git: a200093c2163 - main - share/man/man9/Makefile: fix buildworld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: antoine X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a200093c216346bdafce5866fad3db4bccc1f802 Auto-Submitted: auto-generated The branch main has been updated by antoine: URL: https://cgit.FreeBSD.org/src/commit/?id=a200093c216346bdafce5866fad3db4bccc1f802 commit a200093c216346bdafce5866fad3db4bccc1f802 Author: Antoine Brodin AuthorDate: 2024-03-23 07:17:59 +0000 Commit: Antoine Brodin CommitDate: 2024-03-23 07:17:59 +0000 share/man/man9/Makefile: fix buildworld --- share/man/man9/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 597b487bb8ae..0d7cbf1b9854 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -997,7 +997,7 @@ MLINKS+=dev_clone.9 drain_dev_clone_events.9 MLINKS+=dev_refthread.9 devvn_refthread.9 \ dev_refthread.9 dev_relthread.9 MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \ - devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 + devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \ devfs_set_cdevpriv.9 devfs_foreach_cdevpriv.9 MLINKS+=device_add_child.9 device_add_child_ordered.9 MLINKS+=device_enable.9 device_disable.9 \ From nobody Sat Mar 23 07:44:04 2024 X-Original-To: dev-commits-src-all@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 4V1rmj2hl3z5Dp1Q; Sat, 23 Mar 2024 07:44: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 4V1rmj0sXSz4Pvr; Sat, 23 Mar 2024 07:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711179845; 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=f6MXel4Id8vsABh9HxuUkchE1n1GLFUVYRY8mPI69+M=; b=aD8LDES/CRsX4p1UbiBDA+7ng8u7sqlyYIxn67eXZU60aAEw5vivyNMXGnm80OEu5KU5bW oyP6HY2WL/RMZi3ZAWmLvjYUTp2wPAT3YCOUfzawxqsmTwlOAyezYDWEkAmfGp3TT6T+zl wwuwsr6cZTVIqvI79Ddn8+XVFqP1c3QBIAJCnLtFoYtne8sTtNJI75lWRAoCO5HvMsgyDM zM9eOkJR/KAgSEV0h/deMxlRaoGLfc0nasWkEqyk7s/pWgz41uSWai7vdWL3uTYBQ8W4xg S0+d+jRLibJ4oFZgeY/keVkC6sYpANCOiPvk0KZnMs1vtwekLW/NJymawhWGkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711179845; a=rsa-sha256; cv=none; b=NYFkuNxmJb7mU5aXzeKjEb9dXJDCFZrzSchiYtzEaWKAUxDHNZNj1XejrBokyHXgMGhcVb F/LZWFZ8h6dPPSF8Nx+PVTxddcotBt4g2C62JMG/G3Qk9TWYc7wlgN4gtzyJuv9JDq25W1 YmQmZRorWIIP5f5ZyEk03XA56pJAxr2JqJb5WKYWczgS1N2MSAHhOeaWX6ciCpNhM9pM9E NO6J+bPlFZxtekpb6CFEyy5AudsNr0HkkqbY42Uc4eN7WPYqVqfBgP4YK/Rbbz0sVGM21R 5+tR1qGwLJsANFmdxC4jYNmXrcRVZxuwpC/Bt3/Ry1V3DHOApKhqXusw36IREw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711179845; 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=f6MXel4Id8vsABh9HxuUkchE1n1GLFUVYRY8mPI69+M=; b=axlpa9bhvo7XaIBAhRZIus0OeRAF2xRcmxDuoHhUGrXpXuZThb3+KLhx/0HBHantXlxkTy XqrzV89XOZSHVS5fLSvxYJAvcV8tfvO32ATq4Y/RJIG4b6w3pMOhVcakUYhvG/NBmMN+8g tFT1BGcZrPWXPRP2C7rpzMHtjz28ONM78Sle0baGhK/iGzcqAlxcXtp82u5OpMAQt560DQ 4t7tkPlrAlfZqM/8CoBfjKREjHFKtAYKCJoL5zcErsoAo85tBA1pnofCe4llJwQUUnYHFm cbexLMH2xB1OalKfgmuHkYu8qoy3BsTo0hi3AAjWEbHwAB4w9Ntff8rtkNwjzw== 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 4V1rmj0S7pzfrj; Sat, 23 Mar 2024 07:44: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 42N7i4gC050199; Sat, 23 Mar 2024 07:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42N7i4aB050196; Sat, 23 Mar 2024 07:44:04 GMT (envelope-from git) Date: Sat, 23 Mar 2024 07:44:04 GMT Message-Id: <202403230744.42N7i4aB050196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 577a721d05aa - main - xdr(3): Fix a few typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 577a721d05aa20f38a615ad1cd5089a51c8571c1 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=577a721d05aa20f38a615ad1cd5089a51c8571c1 commit 577a721d05aa20f38a615ad1cd5089a51c8571c1 Author: Gordon Bergling AuthorDate: 2024-03-23 07:43:41 +0000 Commit: Gordon Bergling CommitDate: 2024-03-23 07:43:41 +0000 xdr(3): Fix a few typos in source code comments - s/reoutines/routines/ - s/paraemters/parameters/ Obtained from: NetBSD MFC after: 3 days --- lib/libc/xdr/xdr_rec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index 66e11318ea41..f1167fdeaa65 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -222,7 +222,7 @@ xdrrec_create(XDR *xdrs, u_int sendsize, u_int recvsize, void *tcp_handle, /* - * The reoutines defined below are the xdr ops which will go into the + * The routines defined below are the xdr ops which will go into the * xdr handle filled in by xdrrec_create. */ @@ -484,7 +484,7 @@ xdrrec_eof(XDR *xdrs) /* * The client must tell the package when an end-of-record has occurred. - * The second paraemters tells whether the record should be flushed to the + * The second parameters tells whether the record should be flushed to the * (output) tcp stream. (This let's the package support batched or * pipelined procedure calls.) TRUE => immediate flush to tcp connection. */ From nobody Sat Mar 23 08:49:14 2024 X-Original-To: dev-commits-src-all@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 4V1tD84PLJz5DwN3; Sat, 23 Mar 2024 08:49:28 +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 4V1tD80bdLz4Vjc; Sat, 23 Mar 2024 08:49:27 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 42N8nEeP026765; Sat, 23 Mar 2024 10:49:17 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 42N8nEeP026765 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 42N8nETo026764; Sat, 23 Mar 2024 10:49:14 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 23 Mar 2024 10:49:14 +0200 From: Konstantin Belousov To: Antoine Brodin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a200093c2163 - main - share/man/man9/Makefile: fix buildworld Message-ID: References: <202403230718.42N7IOks099212@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202403230718.42N7IOks099212@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, 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-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4V1tD80bdLz4Vjc On Sat, Mar 23, 2024 at 07:18:24AM +0000, Antoine Brodin wrote: > The branch main has been updated by antoine: > > URL: https://cgit.FreeBSD.org/src/commit/?id=a200093c216346bdafce5866fad3db4bccc1f802 > > commit a200093c216346bdafce5866fad3db4bccc1f802 > Author: Antoine Brodin > AuthorDate: 2024-03-23 07:17:59 +0000 > Commit: Antoine Brodin > CommitDate: 2024-03-23 07:17:59 +0000 > > share/man/man9/Makefile: fix buildworld > --- > share/man/man9/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile > index 597b487bb8ae..0d7cbf1b9854 100644 > --- a/share/man/man9/Makefile > +++ b/share/man/man9/Makefile > @@ -997,7 +997,7 @@ MLINKS+=dev_clone.9 drain_dev_clone_events.9 > MLINKS+=dev_refthread.9 devvn_refthread.9 \ > dev_refthread.9 dev_relthread.9 > MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \ > - devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 > + devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \ > devfs_set_cdevpriv.9 devfs_foreach_cdevpriv.9 > MLINKS+=device_add_child.9 device_add_child_ordered.9 > MLINKS+=device_enable.9 device_disable.9 \ Thank you. From nobody Sat Mar 23 08:58:02 2024 X-Original-To: dev-commits-src-all@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 4V1tQC2HQYz5DxBp; Sat, 23 Mar 2024 08:58:11 +0000 (UTC) (envelope-from bapt@nours.eu) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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 4V1tQC0JcQz4XRm; Sat, 23 Mar 2024 08:58:11 +0000 (UTC) (envelope-from bapt@nours.eu) Authentication-Results: mx1.freebsd.org; none Received: from [IPv6:::1] (2a02-8428-078f-2200-0012-1442-c487-c274.rev.sfr.net [IPv6:2a02:8428:78f:2200:12:1442:c487:c274]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 300BE22E02; Sat, 23 Mar 2024 09:58:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nours.eu; s=20190522; t=1711184282; 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=X4Yl9lD/8BmgHtwI3YfvH/g1pzZxToPETA+i48Y2Rjg=; b=C0ctlGePTrsOi8UrXbAMoiFNm+FCjZRT5yUMXW2XhWsMIHHi5v8BGv4cXuZ1eRNVCYWXhm qAplavPG4caOg0NCWRrknlXXskT9ei+OYljYQsjsuluZ2T7XKDoQVDgfaNajsJacr0QNrU ecHpUK5vAUMacDAwDs/g1cZVdnWioaQKbWKE4jZB7hB8Goi/Vz2O1wxxNgFYu2S01OVwE0 B6wy27hR3w87jxDrYp0Y94OyPpeY+uOGFpQmkrKy5KXXSa8bY1ig7iu+6JkKTyZUJIN/Dr O6pNJksQ9jOVcf7GHydVADci5iD9phUKNx7UDzPLcI7dgQFpEMMLRr5JipzHAQ== Date: Sat, 23 Mar 2024 09:58:02 +0100 From: Baptiste Daroussin To: dev-commits-src-all@freebsd.org, Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?US-ASCII?Q?Re=3A_git=3A_8d3d9ca8bd3d_-_main_-_test?= =?US-ASCII?Q?s/netinet=3A_add_UDP_socket__I/O_tests?= User-Agent: K-9 Mail for Android In-Reply-To: <202403230545.42N5jdfw046813@gitrepo.freebsd.org> References: <202403230545.42N5jdfw046813@gitrepo.freebsd.org> Message-ID: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:176.31.0.0/16, country:FR] X-Rspamd-Queue-Id: 4V1tQC0JcQz4XRm Le 23 mars 2024 06:45:39 GMT+01:00, Gleb Smirnoff a= =C3=A9crit=C2=A0: >The branch main has been updated by glebius: > >URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3D8d3d9ca8bd3db284f6ae67= 1f1e816ba2822f0988 > >commit 8d3d9ca8bd3db284f6ae671f1e816ba2822f0988 >Author: Gleb Smirnoff >AuthorDate: 2024-03-23 05:44:16 +0000 >Commit: Gleb Smirnoff >CommitDate: 2024-03-23 05:44:16 +0000 > > tests/netinet: add UDP socket I/O tests > =20 > Start a file that would collect tests for I/O functionality of a UDP > socket, targeted on how a socket interacts with userland rather than = with > wire side of the protocol=2E > =20 > First version tests that MSG_TRUNC and MSG_PEEK are working correctly= =2E >--- This breaks 32bits /home/bapt/worktrees/main/tests/sys/netinet/udp_io=2Ec:121:45: error: comp= arison of integers of different signs: 'ssize_t' (aka 'int') and 'u_int' (a= ka 'unsigned int') [-Werror,-Wsign-compare] 121 | = ATF_REQUIRE(recvmsg(s[0], &msg, MSG_PEEK) =3D=3D n); = | ~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~~~~~~~~~~~~~~^~~~~ /home/bapt/obj/home= /bapt/worktrees/main/i386=2Ei386/tmp/usr/include/atf-c/macros=2Eh:144:15: n= ote: expanded from macro 'ATF_REQUIRE' 144 = | if (!(expression)) \ | ^~~~~~= ~~~~ Bapt From nobody Sat Mar 23 12:07:18 2024 X-Original-To: dev-commits-src-all@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 4V1ycQ3qnZz5FJ7T; Sat, 23 Mar 2024 12:07: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 4V1ycQ2x5wz4pny; Sat, 23 Mar 2024 12:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195638; 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=yjxoCE5yRWfJPm4Y5ivaVb6GYHskSp0YVASelRNQERU=; b=GtlSpPs7/qWEv8SS9E/58RFPjw/EC7AoIoXHV7lmcD69DqK1UWY1eHOrZfnn8A8GT5np+T YQGiRlkRh4g9lMiKesHnRaWHufKu0Lr1MhKSydP+QgWOLaAGcZUFTX3oAEK66RLh9a305A 8JeGP71uRrQxOHoKTJz6L1Q+fDRkmk9qP60DZ5ecq86oU19ELjUR78q3H89mxtmMHCJ890 ab4OwQOiIC4YQDB1Ibh42QdgQ/P9/IacifiiBBsFQJeJgXe9CW0ruHnPc/3czxk1ofmVtt 9QJ7FO2ysBfJMekB+nofHUQ1WDj4ZgoOGJQ9yfm8sYNnWA4PpMAQihTbxqmI5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711195638; a=rsa-sha256; cv=none; b=ieiNWlwjQBuAwiMN/0PgoWfh2KhVwZl1jOMTsLjROwaRl0EvbaxLXuAXTOsfwC+87+G5hl ceA8k7JhgJHcNVnR041fU0yXHPRHsZGw1Ikmmj+vZe/TIlD2YDohq8/FtD3eA4IElxFDy3 NYJ4EZSClFq/LDyK7dNIdkC++zScdJyjChTLns3UDrSiCUgJmPBjJGAGo1ylLrp50cdxDi eckCcIUbcIkD7YEERGChKrNGzymzP54K+8CfycWcos4R394MnD5Y+3e/+IQ/PrfEKteIhD wH8+1dky9WgEOolcrCsN5jU+9Vw8kMzzMkyFBCqDuX2K8iWFtK5oDCALNSyZYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195638; 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=yjxoCE5yRWfJPm4Y5ivaVb6GYHskSp0YVASelRNQERU=; b=NZBABBV3sIjdSol8cj0sG1TW1DGD33ZPdiruZmf96d4oFwQk7uNEKRLFc15jXwPpQQHCvX EMBPkGHamFOtJi9LoECLrC/PihM/6OIg8itRfExXwLX0wpdYJJgOTUnfu0qKOIW2w4GT9o Ai+snDEBUqQmrZDP+K/GwKWkqPVU4PWtWgQRI0gB0YQumkD1iNfxo7kw+1k4hDgB850u9h uv/5GkLl5yGnGKigPRGHmAZhymTR9AZbofl9UB3PFo3bf3I02oIw6VTXMjaR9Ijh0R+zfx lWILdw0tYgbDHO7OASdSCWB0J7x1HA6wGrLoHOqLhczEQK0raiNyXzE2XsTaGQ== 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 4V1ycQ2XHmznpW; Sat, 23 Mar 2024 12:07: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 42NC7Iee093262; Sat, 23 Mar 2024 12:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NC7Ijw093259; Sat, 23 Mar 2024 12:07:18 GMT (envelope-from git) Date: Sat, 23 Mar 2024 12:07:18 GMT Message-Id: <202403231207.42NC7Ijw093259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 69da6e087983 - stable/14 - Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 69da6e0879831f1ccc5c60135ed43fcea10a933b Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=69da6e0879831f1ccc5c60135ed43fcea10a933b commit 69da6e0879831f1ccc5c60135ed43fcea10a933b Author: Dimitry Andric AuthorDate: 2024-03-20 22:39:06 +0000 Commit: Dimitry Andric CommitDate: 2024-03-23 12:01:38 +0000 Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): [Clang] Fix ResolveConstructorOverload to not select a conversion function if we are going use copy elision ResolveConstructorOverload needs to check properly if we are going to use copy elision we can't use a conversion function. This fixes: https://github.com/llvm/llvm-project/issues/39319 https://github.com/llvm/llvm-project/issues/60182 https://github.com/llvm/llvm-project/issues/62157 https://github.com/llvm/llvm-project/issues/64885 https://github.com/llvm/llvm-project/issues/65568 Differential Revision: https://reviews.llvm.org/D148474 This should fix 'Assertion failed: (isa(Val) && "cast() argument of incompatible type!")' errors when building devel/boost-libs, specifically libs/url/src/segments_view.cpp. Bump __FreeBSD_version so this fix can easily be detected from devel/boost-all/compiled.mk. PR: 273335 (cherry picked from commit bcd401b5a39c6186bb1fe450286299f2a481244c) --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 51 +++++++++++----------- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 ++ sys/sys/param.h | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 32c9215184eb..1e9078cda26a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4092,16 +4092,13 @@ static bool hasCopyOrMoveCtorParam(ASTContext &Ctx, return Ctx.hasSameUnqualifiedType(ParmT, ClassT); } -static OverloadingResult -ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, - MultiExprArg Args, - OverloadCandidateSet &CandidateSet, - QualType DestType, - DeclContext::lookup_result Ctors, - OverloadCandidateSet::iterator &Best, - bool CopyInitializing, bool AllowExplicit, - bool OnlyListConstructors, bool IsListInit, - bool SecondStepOfCopyInit = false) { +static OverloadingResult ResolveConstructorOverload( + Sema &S, SourceLocation DeclLoc, MultiExprArg Args, + OverloadCandidateSet &CandidateSet, QualType DestType, + DeclContext::lookup_result Ctors, OverloadCandidateSet::iterator &Best, + bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, + bool IsListInit, bool RequireActualConstructor, + bool SecondStepOfCopyInit = false) { CandidateSet.clear(OverloadCandidateSet::CSK_InitByConstructor); CandidateSet.setDestAS(DestType.getQualifiers().getAddressSpace()); @@ -4164,7 +4161,7 @@ ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, // Note: SecondStepOfCopyInit is only ever true in this case when // evaluating whether to produce a C++98 compatibility warning. if (S.getLangOpts().CPlusPlus17 && Args.size() == 1 && - !SecondStepOfCopyInit) { + !RequireActualConstructor && !SecondStepOfCopyInit) { Expr *Initializer = Args[0]; auto *SourceRD = Initializer->getType()->getAsCXXRecordDecl(); if (SourceRD && S.isCompleteType(DeclLoc, Initializer->getType())) { @@ -4232,6 +4229,12 @@ static void TryConstructorInitialization(Sema &S, return; } + bool RequireActualConstructor = + !(Entity.getKind() != InitializedEntity::EK_Base && + Entity.getKind() != InitializedEntity::EK_Delegating && + Entity.getKind() != + InitializedEntity::EK_LambdaToBlockConversionBlockElement); + // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4241,11 +4244,7 @@ static void TryConstructorInitialization(Sema &S, // class or delegating to another constructor from a mem-initializer. // ObjC++: Lambda captured by the block in the lambda to block conversion // should avoid copy elision. - if (S.getLangOpts().CPlusPlus17 && - Entity.getKind() != InitializedEntity::EK_Base && - Entity.getKind() != InitializedEntity::EK_Delegating && - Entity.getKind() != - InitializedEntity::EK_LambdaToBlockConversionBlockElement && + if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { // Convert qualifications if necessary. @@ -4293,11 +4292,10 @@ static void TryConstructorInitialization(Sema &S, // If the initializer list has no elements and T has a default constructor, // the first phase is omitted. if (!(UnwrappedArgs.empty() && S.LookupDefaultConstructor(DestRecordDecl))) - Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/true, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, + CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); } // C++11 [over.match.list]p1: @@ -4307,11 +4305,10 @@ static void TryConstructorInitialization(Sema &S, // elements of the initializer list. if (Result == OR_No_Viable_Function) { AsInitializerList = false; - Result = ResolveConstructorOverload(S, Kind.getLocation(), UnwrappedArgs, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/false, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), UnwrappedArgs, CandidateSet, DestType, Ctors, + Best, CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/false, IsListInit, RequireActualConstructor); } if (Result) { Sequence.SetOverloadFailure( @@ -6776,6 +6773,7 @@ static ExprResult CopyObject(Sema &S, S, Loc, CurInitExpr, CandidateSet, T, Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true)) { case OR_Success: break; @@ -6921,6 +6919,7 @@ static void CheckCXX98CompatAccessibleCopy(Sema &S, S, Loc, CurInitExpr, CandidateSet, CurInitExpr->getType(), Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true); PartialDiagnostic Diag = S.PDiag(diag::warn_cxx98_compat_temp_copy) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp index 394006a57747..7bf228851de2 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -790,6 +790,10 @@ void Sema::PrintInstantiationStack() { Diags.Report(Active->PointOfInstantiation, diag::note_template_nsdmi_here) << FD << Active->InstantiationRange; + } else if (ClassTemplateDecl *CTD = dyn_cast(D)) { + Diags.Report(Active->PointOfInstantiation, + diag::note_template_class_instantiation_here) + << CTD << Active->InstantiationRange; } else { Diags.Report(Active->PointOfInstantiation, diag::note_template_type_alias_instantiation_here) diff --git a/sys/sys/param.h b/sys/sys/param.h index 26ad5c9dbee4..b1ee17301504 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400509 +#define __FreeBSD_version 1400510 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Mar 23 12:07:52 2024 X-Original-To: dev-commits-src-all@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 4V1yd501lDz5FJ5f; Sat, 23 Mar 2024 12:07: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 4V1yd46gQLz4qGx; Sat, 23 Mar 2024 12:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195672; 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=cNWo6BcIE7kIwM2eb1f9g1iW/Mk5LvRTI1NiJThRccU=; b=tHX+igyD+FqVhHlJlpQMMvJeY0y4lt7xRcpEUBR3tZUVTsd2kQH4Mh664yLy9eqYCxniAV BU5BR19nRyRuMtZJIl+xU9Uxgkb0+efDYUPbY8RyTNUT1cOp3g58O/iXSoG1Nn0/RxHhut +0oPg0tDOoIIb746XZUp+rjEehBY06SEXv9NnMfPcODORU/r9ihPjF5GBRF8+nQOaeixpa zb7zGfhqHZCG4Drofi3KVmpDqUgckXEMny2wI2mfse+bCMbtiG715nIrpttM9yKR7H9LIV UwW9Z+8OYT/eI+2leYa6KZK3v+2Qn14NsUIlJUMuxfLuRdh17iSCY0AjL8LytQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711195672; a=rsa-sha256; cv=none; b=sEcGY7PxWxXYdiNSPnUsd/7SN3SaavVHwmCqDgFNstwuiT95/jcEnI4togivC95VMc7+NJ NHbjz3jbgHIMUlTjElOyzfHpgIEGLWZ5aWDF3Ftexly2Pi0lV2a31iqMLh21WFkdFTfYR5 Is4UAs1tPXsG3ZrRv2dDz3r28MTX5ULF7uslsmTdt1tv6tDARPvgDUHbbuqPXfMTEvGxs9 8mwk8ddJOpqoECMRXXc8uf6i4oWA3BJi6dKcypCKBHQApYn84XqxBspHKJTNTux/ac3YDd h1Feg1h9J86PxbkY6amyjLzrbMv8cC2MW9VnHT/DSiZdNvqefVQB88rhTP8D8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711195672; 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=cNWo6BcIE7kIwM2eb1f9g1iW/Mk5LvRTI1NiJThRccU=; b=k9oh2fyf3fNCBgpXwAiB36UrUtlFZMPygB6cH3GtuksuyfNSA+o3goVSqFIJxYsE32Jbzh mqH3ukCY0F0IaO2AWla3BtMo1ZLKkdHy00Di48iJnj/qKnXR+pfPTZoj/LMToR62lrMM0y VPJHvZCrjCOFUm75lsULyWJ+S5yyID8Dl5ppH+8pBVqCPuRLcQdyHGbjmV0vAzIgi+b4qd W5mkxoGfQGxRqtLkHKTYWfNxc280gsMgBneLaUGjwWEm9+LCrIDlRWH7oPVWKjl8tWwJDC stzXW85D6zzOTG+E4ObolQVfrrBpcfWFInKlES2XQAw0eQ2IwSGKMeJoD6fQZA== 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 4V1yd46GnxznZD; Sat, 23 Mar 2024 12:07: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 42NC7qPA093477; Sat, 23 Mar 2024 12:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NC7qhe093474; Sat, 23 Mar 2024 12:07:52 GMT (envelope-from git) Date: Sat, 23 Mar 2024 12:07:52 GMT Message-Id: <202403231207.42NC7qhe093474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 07839ae99c06 - stable/13 - Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 07839ae99c06fcbebd5da6ead49c160c32046542 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=07839ae99c06fcbebd5da6ead49c160c32046542 commit 07839ae99c06fcbebd5da6ead49c160c32046542 Author: Dimitry Andric AuthorDate: 2024-03-20 22:39:06 +0000 Commit: Dimitry Andric CommitDate: 2024-03-23 12:02:23 +0000 Merge commit bbb8a0df7367 from llvm-project (by Shafik Yaghmour): [Clang] Fix ResolveConstructorOverload to not select a conversion function if we are going use copy elision ResolveConstructorOverload needs to check properly if we are going to use copy elision we can't use a conversion function. This fixes: https://github.com/llvm/llvm-project/issues/39319 https://github.com/llvm/llvm-project/issues/60182 https://github.com/llvm/llvm-project/issues/62157 https://github.com/llvm/llvm-project/issues/64885 https://github.com/llvm/llvm-project/issues/65568 Differential Revision: https://reviews.llvm.org/D148474 This should fix 'Assertion failed: (isa(Val) && "cast() argument of incompatible type!")' errors when building devel/boost-libs, specifically libs/url/src/segments_view.cpp. Bump __FreeBSD_version so this fix can easily be detected from devel/boost-all/compiled.mk. PR: 273335 (cherry picked from commit bcd401b5a39c6186bb1fe450286299f2a481244c) --- contrib/llvm-project/clang/lib/Sema/SemaInit.cpp | 51 +++++++++++----------- .../clang/lib/Sema/SemaTemplateInstantiate.cpp | 4 ++ sys/sys/param.h | 2 +- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp index 32c9215184eb..1e9078cda26a 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaInit.cpp @@ -4092,16 +4092,13 @@ static bool hasCopyOrMoveCtorParam(ASTContext &Ctx, return Ctx.hasSameUnqualifiedType(ParmT, ClassT); } -static OverloadingResult -ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, - MultiExprArg Args, - OverloadCandidateSet &CandidateSet, - QualType DestType, - DeclContext::lookup_result Ctors, - OverloadCandidateSet::iterator &Best, - bool CopyInitializing, bool AllowExplicit, - bool OnlyListConstructors, bool IsListInit, - bool SecondStepOfCopyInit = false) { +static OverloadingResult ResolveConstructorOverload( + Sema &S, SourceLocation DeclLoc, MultiExprArg Args, + OverloadCandidateSet &CandidateSet, QualType DestType, + DeclContext::lookup_result Ctors, OverloadCandidateSet::iterator &Best, + bool CopyInitializing, bool AllowExplicit, bool OnlyListConstructors, + bool IsListInit, bool RequireActualConstructor, + bool SecondStepOfCopyInit = false) { CandidateSet.clear(OverloadCandidateSet::CSK_InitByConstructor); CandidateSet.setDestAS(DestType.getQualifiers().getAddressSpace()); @@ -4164,7 +4161,7 @@ ResolveConstructorOverload(Sema &S, SourceLocation DeclLoc, // Note: SecondStepOfCopyInit is only ever true in this case when // evaluating whether to produce a C++98 compatibility warning. if (S.getLangOpts().CPlusPlus17 && Args.size() == 1 && - !SecondStepOfCopyInit) { + !RequireActualConstructor && !SecondStepOfCopyInit) { Expr *Initializer = Args[0]; auto *SourceRD = Initializer->getType()->getAsCXXRecordDecl(); if (SourceRD && S.isCompleteType(DeclLoc, Initializer->getType())) { @@ -4232,6 +4229,12 @@ static void TryConstructorInitialization(Sema &S, return; } + bool RequireActualConstructor = + !(Entity.getKind() != InitializedEntity::EK_Base && + Entity.getKind() != InitializedEntity::EK_Delegating && + Entity.getKind() != + InitializedEntity::EK_LambdaToBlockConversionBlockElement); + // C++17 [dcl.init]p17: // - If the initializer expression is a prvalue and the cv-unqualified // version of the source type is the same class as the class of the @@ -4241,11 +4244,7 @@ static void TryConstructorInitialization(Sema &S, // class or delegating to another constructor from a mem-initializer. // ObjC++: Lambda captured by the block in the lambda to block conversion // should avoid copy elision. - if (S.getLangOpts().CPlusPlus17 && - Entity.getKind() != InitializedEntity::EK_Base && - Entity.getKind() != InitializedEntity::EK_Delegating && - Entity.getKind() != - InitializedEntity::EK_LambdaToBlockConversionBlockElement && + if (S.getLangOpts().CPlusPlus17 && !RequireActualConstructor && UnwrappedArgs.size() == 1 && UnwrappedArgs[0]->isPRValue() && S.Context.hasSameUnqualifiedType(UnwrappedArgs[0]->getType(), DestType)) { // Convert qualifications if necessary. @@ -4293,11 +4292,10 @@ static void TryConstructorInitialization(Sema &S, // If the initializer list has no elements and T has a default constructor, // the first phase is omitted. if (!(UnwrappedArgs.empty() && S.LookupDefaultConstructor(DestRecordDecl))) - Result = ResolveConstructorOverload(S, Kind.getLocation(), Args, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/true, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), Args, CandidateSet, DestType, Ctors, Best, + CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/true, IsListInit, RequireActualConstructor); } // C++11 [over.match.list]p1: @@ -4307,11 +4305,10 @@ static void TryConstructorInitialization(Sema &S, // elements of the initializer list. if (Result == OR_No_Viable_Function) { AsInitializerList = false; - Result = ResolveConstructorOverload(S, Kind.getLocation(), UnwrappedArgs, - CandidateSet, DestType, Ctors, Best, - CopyInitialization, AllowExplicit, - /*OnlyListConstructors=*/false, - IsListInit); + Result = ResolveConstructorOverload( + S, Kind.getLocation(), UnwrappedArgs, CandidateSet, DestType, Ctors, + Best, CopyInitialization, AllowExplicit, + /*OnlyListConstructors=*/false, IsListInit, RequireActualConstructor); } if (Result) { Sequence.SetOverloadFailure( @@ -6776,6 +6773,7 @@ static ExprResult CopyObject(Sema &S, S, Loc, CurInitExpr, CandidateSet, T, Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true)) { case OR_Success: break; @@ -6921,6 +6919,7 @@ static void CheckCXX98CompatAccessibleCopy(Sema &S, S, Loc, CurInitExpr, CandidateSet, CurInitExpr->getType(), Ctors, Best, /*CopyInitializing=*/false, /*AllowExplicit=*/true, /*OnlyListConstructors=*/false, /*IsListInit=*/false, + /*RequireActualConstructor=*/false, /*SecondStepOfCopyInit=*/true); PartialDiagnostic Diag = S.PDiag(diag::warn_cxx98_compat_temp_copy) diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp index 394006a57747..7bf228851de2 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -790,6 +790,10 @@ void Sema::PrintInstantiationStack() { Diags.Report(Active->PointOfInstantiation, diag::note_template_nsdmi_here) << FD << Active->InstantiationRange; + } else if (ClassTemplateDecl *CTD = dyn_cast(D)) { + Diags.Report(Active->PointOfInstantiation, + diag::note_template_class_instantiation_here) + << CTD << Active->InstantiationRange; } else { Diags.Report(Active->PointOfInstantiation, diag::note_template_type_alias_instantiation_here) diff --git a/sys/sys/param.h b/sys/sys/param.h index 77088d010ea6..3065513a8f24 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1303501 /* Master, propagated to newvers */ +#define __FreeBSD_version 1303502 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Mar 23 16:26:40 2024 X-Original-To: dev-commits-src-all@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 4V24Mj1Fbfz5FLq3; Sat, 23 Mar 2024 16:26:41 +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 4V24Mj0h0Hz4nV4; Sat, 23 Mar 2024 16:26:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711211201; 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=NH21y73uw7QrJ9vDu/fHr3lQ3BnfA/rFUA+g7+r5Md8=; b=AYcCN22nI0Srg6/NLML6WKpIR/weN54j6hT3xMtU1WbiRoO9o65O7h7XBlOnUUyQCad8iH sLwTNpdwhaxrf3s1b/h/3a9MQBA0M2gTe1JEkyDl5AUaSd1Qi1IVHrIps/3LgHRKHN1IMu FQvaikthevN4mfDtYyGOp4XUZHMOZinZFJ95tctwQBiIX955MGR0fusHXY+bmMpefR4fIy dXAfhSAAUSU9zc9byCabF4fdIb51rJ823p77LtJkBbQDyuq89Dg1guviLwBfkFYjW3IDN5 riAWNnhtrSqy4eTe8plFSe47ea58RdSiNsmugdm8DdcGvQ4HesFoCfw08R6Jgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711211201; a=rsa-sha256; cv=none; b=vkH/1ySRBzXNRM0n7erscpz795U/cDy/hB+eRs640mEDUC5Me8NkKh7epgBmgckVGdRMKv GqOJ0glCda+SfwX9pFMvINwT2bMmiJzSZvTOT2hwPGpQ/ERv77HGg5BM1SuHRVASTo8SL+ +BeqgAMnKLbnk0jepsrJ4DJoOzkFPsivbxtHcu9byf/+6nPM+hGIdXxb9RDzjPzhfCH4+E w093xWRJR3joalrkKyeZ9h+15zpseAHflI45p1gVUZmg+0O8t/3+DxzKEDMcn7UhbazGc+ OFI77d8nZjp7cSsKsodjCwcqJLwg+5WbAffEsLKFCDmP/McHJerUOK9bXuay0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711211201; 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=NH21y73uw7QrJ9vDu/fHr3lQ3BnfA/rFUA+g7+r5Md8=; b=OsuVRW9TWc9e1P3ES+wlfLOfDMsc1en82WifHSzbTIty4dXhKQLOZiIobDt2S0TVSrYxaJ mYx6tP5vvq4pt6TAtyxSjP650tBVqbG9JwV3DVShoAxFe1+k/4n1vaHOMK8MlPrGSrF/+Y WWFtvqHJbKTA257ZldUtFF13e3HBwYLi0brLBzr/TVQbynT9CN8f1MUaGTckh3gfyW8Hq6 yRB7WIRDMWsFxLy9Nu5GiXOXlJ+g/rOLl14t+4Wxn+n/QvYU5egb/SzxCa6QQS4M/kFeIK GoDExHOaOClWoJXdD+XXSa0uDGkj4/yOQTEnuur6Eu3M0dZP2MwwTw97FFangQ== 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 4V24Mj0FX4zwY2; Sat, 23 Mar 2024 16:26:41 +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 42NGQeCv056049; Sat, 23 Mar 2024 16:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NGQe0M056046; Sat, 23 Mar 2024 16:26:40 GMT (envelope-from git) Date: Sat, 23 Mar 2024 16:26:40 GMT Message-Id: <202403231626.42NGQe0M056046@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: 3f3d19d80288 - main - tests/netinet: fix UDP I/O test build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 3f3d19d80288f4b10384d1c84eb2a4c93f9faf9b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3f3d19d80288f4b10384d1c84eb2a4c93f9faf9b commit 3f3d19d80288f4b10384d1c84eb2a4c93f9faf9b Author: Gleb Smirnoff AuthorDate: 2024-03-23 16:21:13 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-23 16:21:13 +0000 tests/netinet: fix UDP I/O test build Fixes: 8d3d9ca8bd3db284f6ae671f1e816ba2822f0988 --- tests/sys/netinet/udp_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/udp_io.c b/tests/sys/netinet/udp_io.c index 6e0c4d9fe6d0..27cd02735ed4 100644 --- a/tests/sys/netinet/udp_io.c +++ b/tests/sys/netinet/udp_io.c @@ -82,7 +82,7 @@ ATF_TC_BODY(trunc, tc) n = (arc4random() % (sizeof(sbuf) - 1)) + 1; iov.iov_base = rbuf; iov.iov_len = n; - ATF_REQUIRE(recvmsg(s[0], &msg, 0) == n); + ATF_REQUIRE(recvmsg(s[0], &msg, 0) == (ssize_t)n); ATF_REQUIRE(msg.msg_flags == MSG_TRUNC); ATF_REQUIRE(strncmp(sbuf, rbuf, n) == 0); iov.iov_len = sizeof(rbuf); @@ -118,7 +118,7 @@ ATF_TC_BODY(peek, tc) for (int i = 0; i < 10; i++) { n = (arc4random() % sizeof(sbuf)) + 1; iov.iov_len = n; - ATF_REQUIRE(recvmsg(s[0], &msg, MSG_PEEK) == n); + ATF_REQUIRE(recvmsg(s[0], &msg, MSG_PEEK) == (ssize_t)n); if (n < sizeof(sbuf)) ATF_REQUIRE(msg.msg_flags == (MSG_PEEK | MSG_TRUNC)); else From nobody Sat Mar 23 16:58:48 2024 X-Original-To: dev-commits-src-all@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 4V254n0Vclz5FQSd; Sat, 23 Mar 2024 16:58: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 4V254m5c3Vz4s0l; Sat, 23 Mar 2024 16:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711213128; 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=Fi54E2LTs5HGejMjaKjFxk1KHAIpD0WShJMiZZQdsk0=; b=vRNzkPXXomahkjbSSeMlMhei0slvOgk89awmmNlxEdbW9zrQX3D+vQTCP5EBhrB/OqHyVF gjfU13ofOSFpHGJRREHDObHR0MBok/HpiMQsbR7H8a8BiBm9fQiPSwnBK8W9VbO5csCfwZ uGl5i9DovX5/SisX2p4W+OmfI1Gm001e12NL2wg6iY26is3XLaarfZu+SORFlcd3xCDYpX hkR3ef5NSQ1Glmm0h0Z3a3EZVFgP7C7OkY0uCOBAxEv9JWmXiIa4FzfQuqLgo44ZxxISj9 n01VhlE3+fUh1i3oNv+0OeI7obA+rMWflpqNQkMSrOz6oXVWDlcTwURpjT0FXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711213128; a=rsa-sha256; cv=none; b=kukCINu9wkB+TTwZ9M1oVbKzj5Mj38/jmLIVEw3AMLnTUCdiGczFznd7x89zwebcmJ59yh cPE+s0Yibg9Po1pJRfsBVTPnS/Wu0GpH9JP9SmvvZO750Rqpz46+ODLuxOQL114uIRF/9S mFgF6Pyp8zU0S3DFgQMBq8CxfUqI0kRyHHXojwlMkUSV18iciIpmSPk7f5h7nf/BqywOt3 +KDNTx5bssSCmdO2w2vJbi+FtAo3VbTmHTP127mNVUWm5xipYKthJ+B3bAZ5aSwRiF+dhL RILm9yE/90Y6n3PVcDqR82tBXuWre5mRqnHNf7NXGMfiln1niOJMOJi6bYWiHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711213128; 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=Fi54E2LTs5HGejMjaKjFxk1KHAIpD0WShJMiZZQdsk0=; b=L4odMORnoeKnLdVH8KkjuKHwh/uDbWHdRZVzbpNz33rTO4NWnlB89hU7ALERQi0w6MKAQn oOppugni5lKVPEPhQLcqQXrFQTJq+hRRQv1kUOlbrBzrv6gm2WxEmPNlMiPXcPB6/SVq4S R1kWUnYz3DpTSE9OPy/cRgl7gCWR9M/Ywde/PZMw/jZi2thwvD0UtaZlUw/gVUrSNEMY32 hZZruzoIjCugfLzAlhjSaMyYrGJ9OXeXmtp9XzFfPGck9calFOWzZkXDpHx1APUvg76apO PAVMO7H2v4ErJIQiN/v4qsZgVGem/I1iEVCODUi1cJH3uJ2vj6INHOoGO1yZDw== 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 4V254m5CR9zxDr; Sat, 23 Mar 2024 16:58: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 42NGwmSF006703; Sat, 23 Mar 2024 16:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NGwmO1006700; Sat, 23 Mar 2024 16:58:48 GMT (envelope-from git) Date: Sat, 23 Mar 2024 16:58:48 GMT Message-Id: <202403231658.42NGwmO1006700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 2c3466172ac6 - main - intr_event.9: Remove double word List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c3466172ac655dbc030aac7c6d7bf58d76efc0e Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2c3466172ac655dbc030aac7c6d7bf58d76efc0e commit 2c3466172ac655dbc030aac7c6d7bf58d76efc0e Author: Gordon Bergling AuthorDate: 2024-03-23 16:57:37 +0000 Commit: Gordon Bergling CommitDate: 2024-03-23 16:57:37 +0000 intr_event.9: Remove double word - s/of of/of/ MFC after: 3 days --- share/man/man9/intr_event.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/intr_event.9 b/share/man/man9/intr_event.9 index 2ad92c96bdc7..d1964ce289a5 100644 --- a/share/man/man9/intr_event.9 +++ b/share/man/man9/intr_event.9 @@ -230,7 +230,7 @@ argument specifies the priority of this handler, corresponding to the values defined in .In sys/priority.h . It determines the order this handler is called relative to the other handlers -for this event, as well as the scheduling priority of of the backing kernel +for this event, as well as the scheduling priority of the backing kernel thread. .Fa flags argument can be used to specify properties of this handler as defined in From nobody Sat Mar 23 17:02:12 2024 X-Original-To: dev-commits-src-all@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 4V258h68wYz5FQsX; Sat, 23 Mar 2024 17:02: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 4V258h5F2Sz4t4j; Sat, 23 Mar 2024 17:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711213332; 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=i0SneSifXK2z8rmAgxz8SkuEd/UY+cUx5k8YGgIviWU=; b=uzJGH1d35/08kGo+0t+Zl6VsrOM/3KccEumpSMpwsKCFH1XKd2N53LlvQmG437Uy4jztgk rP/oUeZJOQkjILOjVLe0E4vC9B+vJRXem8zl/4SotCYpbosHmxJFP0MfNc1iDbziwNG9/n 5b1NBepZrH88uHxiFnwKYlrJVrNXRWtBcIJz63iiX+5kGWS4p268uV1XlQM99ab61gKosN Lv6p7KA/b5cONSaLf+LTuOUuQiuwbBMtxBwi4xqllM/i6m5gKZiJtoJBOCWpXfRZA937sg s84CLl894zkFNbnjzzgpGZbVnJJeTPmABwTV1izjpFSWCHTmeZEf4NEYLhOPuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711213332; a=rsa-sha256; cv=none; b=IBxGdvMXgU/0rtx7Qt9gya8bo/lP0lwwMesHsJ8oBINNCip1quQcP/566DvELNZZs9C7X9 Y7PsNC4/9SWvOzrbOT5cbXagratG7lB6o3TcMv7RAm6lEKPyn5wsGC+T5Rqlq83iU06D7O FYfAqCKkokyXLZah9drVS2OezcnnRd3kI8Z1bDTExqB1KUB8cou7ktO7DOjbdlAljrsiPe GNPU2Ts4+vr2hVp5DJRO8ymHjNFktTMCEIQyvkXYViCF6wPBhevPwi/Fe9HItrtsFgptUS q7/m3UBac2DqUHCa5xBuerKX4Z5+0M3pdx8ubaOAPQVLbpiLq0ZSKcigWwU5Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711213332; 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=i0SneSifXK2z8rmAgxz8SkuEd/UY+cUx5k8YGgIviWU=; b=mkI6BNsodZreHx6/8PnqLy9d8vflvKOs5ODYKTRbzNgdMTwbMD/aMaN2bkZNOdbSSZY1As T5AJSU6pLMyBouKLZ9J8cHJqBa9VPAxFesa7qknWZ23aO0q/+l75x1bgAE4MZGiRUjZa/F 2EMuB6i7C5WVuu4OExUu0/Y1K1uS+GdnTYwFstqv7hCWaEIF4twMbpJl9Lp7aLvV4lZefe dsfjbbgLE7+tF6qhfclMBWTZMX9TncCnCFhfapIV4MF9cArLCiekvE0aMruwBGjn3R+Qqm O3JjqRmF9Uih98xJhvI0Q/u4UkK7pfJfP38zBVzusJdGFdODjHzv47ZldBAJsg== 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 4V258h4rB4zxLT; Sat, 23 Mar 2024 17:02: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 42NH2C0w020886; Sat, 23 Mar 2024 17:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NH2C46020883; Sat, 23 Mar 2024 17:02:12 GMT (envelope-from git) Date: Sat, 23 Mar 2024 17:02:12 GMT Message-Id: <202403231702.42NH2C46020883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 619e6f1f9288 - main - cxgbe.4: Remove double word List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 619e6f1f9288ffb6844a6bdf371c9549873cdab7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=619e6f1f9288ffb6844a6bdf371c9549873cdab7 commit 619e6f1f9288ffb6844a6bdf371c9549873cdab7 Author: Gordon Bergling AuthorDate: 2024-03-23 17:00:57 +0000 Commit: Gordon Bergling CommitDate: 2024-03-23 17:01:47 +0000 cxgbe.4: Remove double word - s/of of/of/ MFC after: 3 days --- share/man/man4/cxgbe.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4 index 3b5a2d8b4d3c..bfba202d1fec 100644 --- a/share/man/man4/cxgbe.4 +++ b/share/man/man4/cxgbe.4 @@ -261,7 +261,7 @@ The default is 1. Number of padding bytes inserted before the beginning of an Ethernet frame in the receive buffer. The default value is 0. -A value of of 2 would ensure that the Ethernet payload (usually the IP header) +A value of 2 would ensure that the Ethernet payload (usually the IP header) is at a 4 byte aligned address. 0-7 are all valid values. .It Va hw.cxgbe.fl_pad From nobody Sun Mar 24 00:40:13 2024 X-Original-To: dev-commits-src-all@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 4V2HKB0n2jz5GDFX; Sun, 24 Mar 2024 00:40:14 +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 4V2HKB0Gkhz4fcB; Sun, 24 Mar 2024 00:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240814; 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=EntQBJCOGFflLYrY5YGbsLD+jmomhSgfJTBSIQK6yuI=; b=JMc+Xn+1iKQejtl7X1nwGw4LpxHp0VK1hgEo8u+DotUxKwTLIl/bAM7kFgpWXD3NRbpgy2 jf6TKtq5h0xWhyFiSJCk++RAqqexduQr3bxkqf6+a8qJ/qoWBFVysytDumx1Ty/Z2ib5ab vJVuJT2mxlSwSuEAx3CTcq0rvanVJIZbzfCPgneBKcA0t2hT+tmFEEr1FtAOZf6gMeUmDL 1YhP6QNmKSanheOp5U1tGKn1JEtnWWPR5qctHDBtZC1nDzMoPNOHl3XMtfOI5S5lqmBqtt w+t/Huryez4m5T+FlVqf/9EYldnJTsu+6rVIOPAY0zjuUdap7cvVNNMr8vHocg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240814; a=rsa-sha256; cv=none; b=PHVJtOsT0hxO1eklAi9LXFxZ3WzDhXhQkiMa49j9T9GMNFspkCu9ofUayMYjoxLJdy/qEY BiEalPCxRp1oKoNhrsVQNV9IPJGY49x44Lp3IevpfnKxbXX8ghcsRnYn/6YLrB2pHVy/kc j9K3H+bC3NOgJYsACFJP6XuwCeU3mkVa1ZYXUB6CwrXkTuc9aKMK4zAsz6Hr6ixog3t+dT whlzO06cyWtldEAtbzEuDs3LqbmsX0W17URyT1ceySoV57v2gXP+KnVWTJWmSRY+wUUMyo 7uniJCKZg4HulTtiyz6ssA3eqLrPRVUCmUwDXwEUW65Mc+7pa2aSNXMDcJjHVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240814; 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=EntQBJCOGFflLYrY5YGbsLD+jmomhSgfJTBSIQK6yuI=; b=FWTwQhbUzwymq1SyaagP9KVdNf3KYyA1A2iSuuK+jOWWqvldsI7WUnQhg+5qMX/VqlF6Le S1bStvLVUMlSbMJ3dVuSLxznCK4dwqLbGGHb7iEdeC0wUVv8EOk+ukTlzFOOcfqbKclZX7 ntIzy0lOJ9rq6n+SktslCpPoCfFUvQ5HyZK2ROesPS0I0NB5MpNQD2FdQCy1jStyOkeA0B sZGn0ymATZ7bH4UCZ/y+d1+FTb+KSlahuPIpYYyajOgmBSzowLjTSy8ygCc2xD0Khxtz3+ IongTpIqMepe3XPXqP4+hZveBw7r73Cbhk8d5PiPyFBKF0aJfReZmZ5EY5mkuA== 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 4V2HK96skQz19jH; Sun, 24 Mar 2024 00:40: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 42O0eD0C090304; Sun, 24 Mar 2024 00:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0eDGE090292; Sun, 24 Mar 2024 00:40:13 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:40:13 GMT Message-Id: <202403240040.42O0eDGE090292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 880f35eb5d48 - stable/14 - Fix building of several libclang_rt libraries for powerpc64 and powerp64le List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 880f35eb5d489ae6b8d09da82f577381f24157d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=880f35eb5d489ae6b8d09da82f577381f24157d2 commit 880f35eb5d489ae6b8d09da82f577381f24157d2 Author: Dimitry Andric AuthorDate: 2024-03-21 13:53:36 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:36:18 +0000 Fix building of several libclang_rt libraries for powerpc64 and powerp64le I reorganized the libclang_rt Makefile in e77a1bb27574 to make it more readable and maintainable, but the check for 32-bit powerpc was wrong. This caused almost no libclang_rt libraries to be built for powerpc64 and powerpc64le. PR: 262706 Reported by: tuexen Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit f0620ceeccf070a69352105c5dbc23cff499a732) --- lib/libclang_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 46f7fdf814be..984da3f34156 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" # nothing for 32-bit powerpc .elif ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} From nobody Sun Mar 24 00:40:14 2024 X-Original-To: dev-commits-src-all@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 4V2HKC1Sn9z5GD4S; Sun, 24 Mar 2024 00:40:15 +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 4V2HKC0lW9z4fCq; Sun, 24 Mar 2024 00:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240815; 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=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=c44kKmq2piX6xRJg7ztPvI6M2LxQKW2o/V+2fqTFllsH+W1HEL6X5Ca2Uj6Dz+9SwJVgte 9pgJ8mKny73IraaSQbXrch/SOEE4JoDJSP4k+UAf5EaJLtjxMTAIsBnNV07F2X4Mq5Mj8s RxNvWBd5JRMxLYSdM/q1h0aLzIDaXUfa1FuzZiaGxhEyQi9h4DLCgYKoKVY/L+3HxjEusP m2/CO2y90w3Cqmoy0VK/XlGiUycVDp1GfGs8o8h2RNXyy0jZNaUDe3ISb3h/6ZG35l5EVu aZp65O4feANo0bkINzj9nnZydNaXj6fVXo7JtalW2toLukfkMFp7TcKRYUlTPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240815; a=rsa-sha256; cv=none; b=cgBd/DZXkTkFDEH2CaSXg9Pzy7JMbCxpO3PHTVFnpMaqlIzOLTVW/un6ur36cmYb8AODlH 6HsP985lB1Ny+VJyMkBhrARoj1fc6dZMU9ujAKo+dKB6QZWFa6jKkZ8e8d4eirhtuK5edS mi1uufY/cp7I2Tcajt8wZdouBziuqzYEQq9Ozm2r69DEWSSZGuyoyuBRpPQVDk5bnoTyB8 g3sXArCluTayoE16EA8z63Al5jHa1k3haEvieZAA1tBxkrmDuXOgYNTyruGUKnl+7YzGps EdZWLlRi4aMLpRT+UqnPh0dzw/g74wtCzkhR/08DWWv6XZ573MW54r/OAYOwpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240815; 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=dnMi3TS/5njDKa/+vfwJjrfBrND/gSic41YGUFe9N4A=; b=lZ3IawJFrWnEAHoDrWqzpZZXBh//5wvYopiw6DtGWQ1zx+VDStWliUjz/Kz7y/iMyf7q9Z rPD0PeuUiuvMg8n7VuBWw2Q+aDvu8bJX8u6nH2d2fneRiZK45lpfAZ0mJQ7/q2SFrBzq9C 6rd7ADs/Z6antf4RSQSo2LgarytT486YqwJN0YpqOMuusYk7CbsllRwwyx0qNjtFwL5wAs ytSWXl5lQ9o+aIpzsfECumc1P6jAI6tO14uzbcjkOHqAjgycOeN6GZHNdnfrcsj5oxhFne nKzdoqN23PnlBt+/RYFADxiomfne0G1MbcktdtGpIfqY+Ux0+mayBXCCIBmPeA== 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 4V2HKC0MpWz19TR; Sun, 24 Mar 2024 00:40:15 +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 42O0eEex090986; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0eEjB090975; Sun, 24 Mar 2024 00:40:14 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:40:14 GMT Message-Id: <202403240040.42O0eEjB090975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 35a61f4a25ac - stable/14 - Slightly reorganize libclang_rt Makefile again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=35a61f4a25ac5301b83d2c4835081d60de5b8b1e commit 35a61f4a25ac5301b83d2c4835081d60de5b8b1e Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:36:26 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d) --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS} From nobody Sun Mar 24 00:43:18 2024 X-Original-To: dev-commits-src-all@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 4V2HNl130wz5GDM4; Sun, 24 Mar 2024 00:43: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 4V2HNl0L8Vz4gbk; Sun, 24 Mar 2024 00:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240999; 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=AOL7EtS6AroXv/3ybGQiG3oo/daNP5upHu1t4kdyg5k=; b=l85hvW9SaHlxvkm5e3m1syJUQD8E388qlPrkY8dGcsohMRN+rqtsI13v+v9uRkh6lEkUwq SC9YKvFQXo29KLAR27a9bBfqhzl6KtYjkBZB133lZPqH4gpoWpt8+FzLKhaRAaRkuFgHdu y3l6xSRh8t+l8Uz7cYqpuZuhPefm1B4653ykE769g6D8I6RvolPhbc51MPWJdUUjEAXNQD I8gMHf7Bk0Fn8oE6Ldm6puhsNTQSyUIEvr3Z5Ve3H3S6hqHjZG9dED78mtkBszNPIKtHne IMVjotALRa/+NqH+sFJpUJsDa9sOhuetNHYy53SwFIW88nzfqOm9x+QeEESTcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711240999; a=rsa-sha256; cv=none; b=P7bT+Mf1Jbq3tYegXonbTOj3ESWg6jIC1y9PBzvy5FJsWgmsm0FAbZE+2hF2zGvJsLho2u PMPWa9HT/O7Qswvx2M28ov0H+MLdpo5aWyTu2Azn6SxerailQBMn9CG+yZ9g9Zj0EoWOXW nNfns+sqF5tCHf+pBEmMrGzj/d4REX3ZdgB9zgwZlscYcXKs1SlW/MN6TX84urN9Xl84lf EJH8TAiGUCKHMfKjeV21DcXO1zxbo3olfBVLsH1V0vG4fYLM/90mnXijWdUv0eM+flrujq 1F6CjSmA1OGnpZl0v05StobX0B8fX8RfpnD432lhLyILKlzg8MqRgPUjmllBgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711240999; 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=AOL7EtS6AroXv/3ybGQiG3oo/daNP5upHu1t4kdyg5k=; b=QJf/0TNjTlJMOneJNPIfZW0Drtj5XWyvNA24ILFazuWc1KVeQH6raPAfjafNXvKt3jS7wE WS32GxOZ3BZTdp2JQRoUYRhKcHcLc+68aTKB9VL7c4X4IcpBPAHFnbLWK1LR8iTlZLiExf vmFFA7aVzebGaH5QWGIN5p6hfMX3N24h/iSxIANUhPztNocEHEc7FrKfRk8PMkjcGaR6sI MUwGncUd2LC3DqAkndJ9A6tO4PRPSzGfrBqfHJ2H0oB499ftgUEBcr2lQPylXsdwzy42qm eIjtt3hGWwy0fY4mfYXxvpRqnMZCZAi8reygG0U6Ee+C0TLvxDIiXHTv123LAQ== 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 4V2HNk72hjz19jl; Sun, 24 Mar 2024 00:43: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 42O0hIMH000240; Sun, 24 Mar 2024 00:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0hIIh000237; Sun, 24 Mar 2024 00:43:18 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:43:18 GMT Message-Id: <202403240043.42O0hIIh000237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 72d9e1e0ca66 - stable/13 - Fix building of several libclang_rt libraries for powerpc64 and powerp64le List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 72d9e1e0ca66ca39ca157731a65be32c63916252 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=72d9e1e0ca66ca39ca157731a65be32c63916252 commit 72d9e1e0ca66ca39ca157731a65be32c63916252 Author: Dimitry Andric AuthorDate: 2024-03-21 13:53:36 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:37:23 +0000 Fix building of several libclang_rt libraries for powerpc64 and powerp64le I reorganized the libclang_rt Makefile in e77a1bb27574 to make it more readable and maintainable, but the check for 32-bit powerpc was wrong. This caused almost no libclang_rt libraries to be built for powerpc64 and powerpc64le. PR: 262706 Reported by: tuexen Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit f0620ceeccf070a69352105c5dbc23cff499a732) --- lib/libclang_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 46f7fdf814be..984da3f34156 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -67,7 +67,7 @@ SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_CPUARCH} == "powerpc" +.elif ${MACHINE_ARCH} == "powerpc" # nothing for 32-bit powerpc .elif ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} From nobody Sun Mar 24 00:43:20 2024 X-Original-To: dev-commits-src-all@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 4V2HNm1WyLz5GDM5; Sun, 24 Mar 2024 00:43: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 4V2HNm10M7z4gYt; Sun, 24 Mar 2024 00:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711241000; 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=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=H1FXEdnqHz3l1a1SX1WdmN57mNGaJ/mOokx1lBuj7p88W0jAiSW6gc0JOBnMnYT2137ktJ NR6plTqHnXyFmZ5v4ortkjVpryBTHGEeybw36Xi/b46EGwpdVXB+5c7xV25rhnzyDTKLcS OgU7diyuGopaU0fRkaVw38hnLt6QU9TGG9Yspsu3R1WE8h+VkRAH7s+x57coKSer8bXSKz YkU7yMEFzhy3y6d8dCx29FMbY4sipMbzTRxrDnDtPoTE11ycZtEBssglyLaDubmssNP0TW vkyKiqJGGLJgb2EW+H+U+V1e+jP2rUKF2lKEP2M4LVGVzYU6FZbRBtIHVLb69g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711241000; a=rsa-sha256; cv=none; b=cE2+J9bkMDA792S5CgwXC2C37J9n0JAK6biBM1A5PgGiEYN9Vhd2RBpQv0CYCrRt7VhhMx IWwRXpo/nfnDcowlaVKEEOxKzVl+M6YFP/xb1DlC4DOZC+XiLmrUd4SiABvmXy6sQkbUoA QmaoBwKKq5j6Wps2KBUACz8+SEuL6cG3VYRdIWx/qvJa9I2EuUhjvyUpF3ICvHA1S9aWA6 DhTm7gRODKvnaUMn0Q2Gxp216fjoGMc2gl1r1a4eUMkZHOly1fv5VFMl+BVBMyhHP+p0BB OjnvoIA+GTKq5mjN2MfwUIAc88D7UL9FYViR5ND5l2f43jZhb/P538Ohyqs1rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711241000; 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=3KpOGSpsmZsa9WSXEEoJ2l3kvD/UIF+ZhhEg9cCFI80=; b=gPOEH4V+5m6AYjUg+wQNKb+CVHW+cZX4xJ60CEQhIlAZ204GIEKTwkgdzKrqaLeK0bXuQJ cADDBmIvzgE2SlPdOburET8ZdLlhMJt/FoZePpgcf/ee9OT79UU2GrJG07SQKHn/1g4lx6 18sdsvY6BsEj5pD88N/1ohOPl0mCbFsG+G6t7tI0fL5qb7xzvjOChnsdtqtQe2tGpNTC0H p1TXLEcDPYfw06EQ40CRCbHextTPQGR4C0IxwmNOPh9Ps0PdxI71XWjRX5CpY7zaSJLogU tM+syAqpxAl+sVgwVd/O7/QQh2VbZQtz3Y+eNhT437/3jqqnBIcPpk0zaO7j6Q== 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 4V2HNm0cSHz19C1; Sun, 24 Mar 2024 00:43: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 42O0hK58000285; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O0hKgD000282; Sun, 24 Mar 2024 00:43:20 GMT (envelope-from git) Date: Sun, 24 Mar 2024 00:43:20 GMT Message-Id: <202403240043.42O0hKgD000282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5c588a23c96b - stable/13 - Slightly reorganize libclang_rt Makefile again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c588a23c96b88327f87bb8ef6c795c442d56c2a Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5c588a23c96b88327f87bb8ef6c795c442d56c2a commit 5c588a23c96b88327f87bb8ef6c795c442d56c2a Author: Dimitry Andric AuthorDate: 2024-03-21 20:44:46 +0000 Commit: Dimitry Andric CommitDate: 2024-03-24 00:37:29 +0000 Slightly reorganize libclang_rt Makefile again Make a separate .elif section for MACHINE_ARCH==powerpc, and subdivide the MACHINE_CPUARCH values under it. If at some point more sanitizer libraries become available for powerpc CPU architectures, they can be added before the "nothing for other powerpc yet" case. Similar for the MACHINE_ARCH==arm case. PR: 262706 Fixes: e77a1bb27574 MFC after: 3 days (cherry picked from commit 897a485c34464a44b768f13127d94137229eb83d) --- lib/libclang_rt/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 984da3f34156..79ccd288a845 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -60,28 +60,30 @@ SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} .elif ${MACHINE_CPUARCH} == "arm" -# nothing for 32-bit arm +# nothing for 32-bit arm yet .elif ${MACHINE_CPUARCH} == "i386" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_CFI} SUBDIR+= ${SD_SAFESTACK} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc" -# nothing for 32-bit powerpc -.elif ${MACHINE_ARCH} == "powerpc64" +.elif ${MACHINE_CPUARCH} == "powerpc" +. if ${MACHINE_ARCH} == "powerpc64" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} -.elif ${MACHINE_ARCH} == "powerpc64le" +. elif ${MACHINE_ARCH} == "powerpc64le" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_MSAN} SUBDIR+= ${SD_STATS} SUBDIR+= ${SD_TSAN} SUBDIR+= ${SD_UBSAN} SUBDIR+= ${SD_XRAY} +. else +# nothing for other powerpc yet +. endif .elif ${MACHINE_CPUARCH} == "riscv" SUBDIR+= ${SD_ASAN} SUBDIR+= ${SD_STATS} From nobody Sun Mar 24 02:12:28 2024 X-Original-To: dev-commits-src-all@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 4V2KMc71hWz5DgBj; Sun, 24 Mar 2024 02:12: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 4V2KMc6YWrz4mmv; Sun, 24 Mar 2024 02:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246348; 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=MDBlNaVWsBh85lFKnBcAdaRRzl+FCFaXxZulNOCWguE=; b=U/uJL3SJFVPW2VP5PspY8GzJZreMOFtAokrTJrD5Djc9g8pJZimjJpoveDo3EgaAjjlx6f mn75pl6lz9kD0ejVyxz8owh5y/fffRb/LUBz5T14HOfZLsVGUgM5ib3n6N1lw7ct3v3000 bHJJXYsFJIQaH5DUR3g1Y4D2/zoBJYhT7fjQ44vwcl7YzVMnUxjTr/3G6hkD8yN7w31J4L 2SyEM/48R1TYICj3wwRa+JqgSEezDoBgjDB1BhBymFrAZMOJj//8gTk6QNW8FJx+nf0VWg WLypSknJ5p6Gy/R23s8GORhezInGodNs+/tDKGNrfCWtLORkN+lHk/benbE93w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711246348; a=rsa-sha256; cv=none; b=dosDR53qDJLsEWCs8LBC1H0stb95Zo3y4qXrpHXj4S2z1LH1TrNsFdUkdpiaYxWEdSOhcY UXSNEHgnZO2R3nyfg96GCqtXPwYImyEpKHaIOEUk/dYsiSR6WycaajH2secc979DsBGx0x lWDLl9bhvGO/PYcFeZvXeqKN+5Fplih/DqJzDXgILB89R5cmeZDUhgq0lGhKhqkcqJ2eRQ iJkK1/zpLRUraCRWgu064P4MBvaPkL6hvf6YIZgZbb2cQ8XuXRTMBy+iS5MBYYuvmYWfRx nyABOAZBXSCBjiEib2ZUoATf+vzaI7HwuV/fvrGC5a1dm6RmYs7rwvAzZn6vCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246348; 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=MDBlNaVWsBh85lFKnBcAdaRRzl+FCFaXxZulNOCWguE=; b=nfvMuraxJ7bnETA5HDjr7Ir7jK1NBw17yd2yNXQqVICurkuPTUHPd/p/SWXZNzIz6e3i8T OukzdqS2UoCujJNdikLkt5IN+tCOYOT1oclOmeF/Yc+KjP8ste5zcB2kS7rVOmc823e7Fl JOpYT0NrTaFvWGz+77YDcosgAi+/O2SCeGkeDUQmx045tJvDhTGDpIlx/9j3VQFcUK7yDL juPJzt/aXdrg40Wcy1lSrS/a/iFMdUkIdY6oHcQXV07LfwAnUvrE53D/srI0wTUnwNrLOs cX7ssKRvZExmAyH+WA7qXue6ov/0PV7bTD9aqKBkTBt1Q/Uss9enl4rFeuhopA== 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 4V2KMc6950zDb4; Sun, 24 Mar 2024 02:12: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 42O2CSxA052538; Sun, 24 Mar 2024 02:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O2CSY8052536; Sun, 24 Mar 2024 02:12:28 GMT (envelope-from git) Date: Sun, 24 Mar 2024 02:12:28 GMT Message-Id: <202403240212.42O2CSY8052536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: eee6217b40df - main - unionfs: implement VOP_UNP_* and remove special VSOCK vnode handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eee6217b40df5877674df1d9aec7d5bd04202876 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=eee6217b40df5877674df1d9aec7d5bd04202876 commit eee6217b40df5877674df1d9aec7d5bd04202876 Author: Jason A. Harmening AuthorDate: 2024-02-03 17:17:58 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:10:53 +0000 unionfs: implement VOP_UNP_* and remove special VSOCK vnode handling unionfs has a bunch of clunky special-case code to avoid creating unionfs wrapper vnodes for AF_UNIX sockets. This was added in 2008 to address PR 118346, but in the intervening years the VOP_UNP_* operations have been added to provide a clean interface to allow sockets to work in the presence of stacked filesystems. PR: 275871 Reviewed by: kib (prior version), olce Tested by: Karlo Miličević MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44288 --- sys/fs/unionfs/union_vnops.c | 173 +++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 89 deletions(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 2fffe7d900bd..3e8853baeb4d 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -298,27 +298,8 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) error = lerror; if (error != 0) goto unionfs_lookup_cleanup; - /* - * get socket vnode. - */ - if (uvp != NULLVP && uvp->v_type == VSOCK) { - vp = uvp; - vref(vp); - if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(vp, cnp->cn_lkflags | LK_RETRY); - } - else if (lvp != NULLVP && lvp->v_type == VSOCK) { - vp = lvp; - vref(vp); - if (cnp->cn_lkflags & LK_TYPE_MASK) - vn_lock(vp, cnp->cn_lkflags | LK_RETRY); - } - /* - * get unionfs vnode. - */ - else - error = unionfs_nodeget(dvp->v_mount, uvp, lvp, - dvp, &vp, cnp); + error = unionfs_nodeget(dvp->v_mount, uvp, lvp, + dvp, &vp, cnp); if (error != 0) { UNIONFSDEBUG( "unionfs_lookup: Unable to create unionfs vnode."); @@ -331,7 +312,7 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) *(ap->a_vpp) = vp; - if ((cnflags & MAKEENTRY) && vp->v_type != VSOCK) + if (cnflags & MAKEENTRY) cache_enter(dvp, vp, cnp); unionfs_lookup_cleanup: @@ -379,9 +360,7 @@ unionfs_create(struct vop_create_args *ap) lkflags)) && error == 0) { error = ENOENT; } - if (error == 0 && vp->v_type == VSOCK) - *(ap->a_vpp) = vp; - else if (error == 0) { + if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); @@ -462,9 +441,7 @@ unionfs_mknod(struct vop_mknod_args *ap) lkflags)) && error == 0) { error = ENOENT; } - if (error == 0 && vp->v_type == VSOCK) - *(ap->a_vpp) = vp; - else if (error == 0) { + if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); @@ -1057,9 +1034,7 @@ unionfs_remove(struct vop_remove_args *ap) struct vnode *udvp; struct vnode *uvp; struct vnode *lvp; - struct vnode *vp; struct componentname *cnp; - struct componentname cn; struct thread *td; int error; int pathlen; @@ -1067,71 +1042,34 @@ unionfs_remove(struct vop_remove_args *ap) UNIONFS_INTERNAL_DEBUG("unionfs_remove: enter\n"); KASSERT_UNIONFS_VNODE(ap->a_dvp); + KASSERT_UNIONFS_VNODE(ap->a_vp); error = 0; dunp = VTOUNIONFS(ap->a_dvp); udvp = dunp->un_uppervp; cnp = ap->a_cnp; td = curthread; - unp = NULL; - - if (ap->a_vp->v_op != &unionfs_vnodeops) { - if (ap->a_vp->v_type != VSOCK) - return (EINVAL); - ump = NULL; - vp = uvp = lvp = NULLVP; - /* search vnode */ - VOP_UNLOCK(ap->a_vp); - error = unionfs_relookup(udvp, &vp, cnp, &cn, td, - cnp->cn_nameptr, cnp->cn_namelen, DELETE); - if (error != 0 && error != ENOENT) { - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); - return (error); - } - if (error == 0 && vp == ap->a_vp) { - /* target vnode in upper */ - uvp = vp; - vrele(vp); - } else { - /* target vnode in lower */ - if (vp != NULLVP) { - if (udvp == vp) - vrele(vp); - else - vput(vp); - } - vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); - lvp = ap->a_vp; - } - path = cnp->cn_nameptr; - pathlen = cnp->cn_namelen; - } else { - ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount); - unp = VTOUNIONFS(ap->a_vp); - uvp = unp->un_uppervp; - lvp = unp->un_lowervp; - path = unp->un_path; - pathlen = unp->un_pathlen; - } + ump = MOUNTTOUNIONFSMOUNT(ap->a_vp->v_mount); + unp = VTOUNIONFS(ap->a_vp); + uvp = unp->un_uppervp; + lvp = unp->un_lowervp; + path = unp->un_path; + pathlen = unp->un_pathlen; if (udvp == NULLVP) return (EROFS); if (uvp != NULLVP) { - /* - * XXX: if the vnode type is VSOCK, it will create whiteout - * after remove. - */ int udvp_lkflags, uvp_lkflags; if (ump == NULL || ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP) cnp->cn_flags |= DOWHITEOUT; unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, - ((unp == NULL) ? NULL : uvp), &uvp_lkflags); + uvp, &uvp_lkflags); error = VOP_REMOVE(udvp, uvp, cnp); unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, - ((unp == NULL) ? NULL : ap->a_vp), uvp, uvp_lkflags); + ap->a_vp, uvp, uvp_lkflags); } else if (lvp != NULLVP) error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, path, pathlen); @@ -1169,22 +1107,18 @@ unionfs_link(struct vop_link_args *ap) if (udvp == NULLVP) return (EROFS); - if (ap->a_vp->v_op != &unionfs_vnodeops) - uvp = ap->a_vp; - else { - unp = VTOUNIONFS(ap->a_vp); + unp = VTOUNIONFS(ap->a_vp); - if (unp->un_uppervp == NULLVP) { - if (ap->a_vp->v_type != VREG) - return (EOPNOTSUPP); + if (unp->un_uppervp == NULLVP) { + if (ap->a_vp->v_type != VREG) + return (EOPNOTSUPP); - error = unionfs_copyfile(unp, 1, cnp->cn_cred, td); - if (error != 0) - return (error); - needrelookup = 1; - } - uvp = unp->un_uppervp; + error = unionfs_copyfile(unp, 1, cnp->cn_cred, td); + if (error != 0) + return (error); + needrelookup = 1; } + uvp = unp->un_uppervp; if (needrelookup != 0) error = unionfs_relookup_for_create(ap->a_tdvp, cnp, td); @@ -2833,6 +2767,64 @@ unionfs_unset_text(struct vop_unset_text_args *ap) return (0); } +static int +unionfs_unp_bind(struct vop_unp_bind_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + ASSERT_VOP_LOCKED(ap->a_vp, __func__); + unp = VTOUNIONFS(ap->a_vp); + tvp = unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp; + VOP_UNP_BIND(tvp, ap->a_unpcb); + return (0); +} + +static int +unionfs_unp_connect(struct vop_unp_connect_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + ASSERT_VOP_LOCKED(ap->a_vp, __func__); + unp = VTOUNIONFS(ap->a_vp); + tvp = unp->un_uppervp != NULL ? unp->un_uppervp : unp->un_lowervp; + VOP_UNP_CONNECT(tvp, ap->a_unpcb); + return (0); +} + +static int +unionfs_unp_detach(struct vop_unp_detach_args *ap) +{ + struct vnode *tvp; + struct unionfs_node *unp; + + tvp = NULL; + /* + * VOP_UNP_DETACH() is not guaranteed to be called with the unionfs + * vnode locked, so we take the interlock to prevent a concurrent + * unmount from freeing the unionfs private data. + */ + VI_LOCK(ap->a_vp); + unp = VTOUNIONFS(ap->a_vp); + if (unp != NULL) { + tvp = unp->un_uppervp != NULL ? + unp->un_uppervp : unp->un_lowervp; + /* + * Hold the target vnode to prevent a concurrent unionfs + * unmount from causing it to be recycled once the interlock + * is dropped. + */ + vholdnz(tvp); + } + VI_UNLOCK(ap->a_vp); + if (tvp != NULL) { + VOP_UNP_DETACH(tvp); + vdrop(tvp); + } + return (0); +} + struct vop_vector unionfs_vnodeops = { .vop_default = &default_vnodeops, @@ -2886,5 +2878,8 @@ struct vop_vector unionfs_vnodeops = { .vop_vput_pair = unionfs_vput_pair, .vop_set_text = unionfs_set_text, .vop_unset_text = unionfs_unset_text, + .vop_unp_bind = unionfs_unp_bind, + .vop_unp_connect = unionfs_unp_connect, + .vop_unp_detach = unionfs_unp_detach, }; VFS_VOP_VECTOR_REGISTER(unionfs_vnodeops); From nobody Sun Mar 24 02:22:23 2024 X-Original-To: dev-commits-src-all@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 4V2Kb368tjz5DhFC; Sun, 24 Mar 2024 02:22: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 4V2Kb35xjpz4np0; Sun, 24 Mar 2024 02:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246943; 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=W+QZexvHmj69GBfw5sWYhqzqMxtyQtpe7qluT4VUgz4=; b=tP9Eh3APMS5iTuvSyfR1eFuCZwb9cUVSR9hXLuV15/VMnMl27Uypfahg5nHYJ5LL0diuKk hJXrUIdnyl1Ag358Eig5CaRfQlq3Os6OtDIwVf9Nks5OWbw6ow/Qrt5fsIG82SY/B2Lsn0 fnLksUh4lW9Dk5ZP+GHnH7vYoIIl6nWOZWF0Z2XkDGlJBGugeXtlUSfj++XJ7S2BlMPAPg AoCWFWUexmM7nWi0RGE7Dj6vcGKq88HzuOpJSC5nc5TRTarWowhZ19MbR2R6LpcxD84aMM mVMNr/scS8d+89rA/rZQ3zNjUkr8/sjWyvikaWS+ydaCT1bkDBllZoLllX6CZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711246943; a=rsa-sha256; cv=none; b=CeLtsAeIS9/Nv3osmN0a7DplNAx+ZeJWoQfg+K88i9x0ip1JfSfUecunBCgg0ddYqVPQgQ P4HhHj33bbaM0sjAbN/wxIwicGkyMOLgA1ZQ351l3OTnS7Rv2FqcMH6sfxgPAmu/qKjfyv sfQQMYIigCXl4QD9j4K/IbDTjzSEeXAKuBBuxjmxSWLnOCXAVjg6md/Jj4Wlndyqspvpm7 kJfz8LmnmkFSjL7ljetFvoONy55Br/TM0ZjM1b/VkAuvarBlV3tejJ8fiJjqj0k15h3aS7 ZLRid05PkGWj7po3KPOrocMfMjDOcJCEEoma0QpSpoaGN6qX58wV62LuVidwyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246943; 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=W+QZexvHmj69GBfw5sWYhqzqMxtyQtpe7qluT4VUgz4=; b=LXNkH4zv0Ek6XQbn1UAtEArbJTnDFB97hL8uRq25JusEL095Mk+sXh2ogvIaJzMz+d0neK s18ZqE7jabzGMFDycH8Dbzndi3Vqpoz0Na9jPtLUSH+H7fDY98qCpGvzFuY4r7Wpp2tHgt U0zPY61jdoEIGf6OT4Gug7/14cvL/5slmN5O3yomgsTjj7M8jn9yN4yQwh2LXKeyOrOXzp TXDCTr0lmfNYGDKivjlR156KTDQ+D5lsqY4xCkKapLD+2knSKQa2Lk6lmFAQErxqs5Z7sX W3rpGBuxK0oKb7k90M4R+tYfU38K06iICzeq0MA5RRApXJcwRENsULDu453K0g== 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 4V2Kb35Xsqz1CvM; Sun, 24 Mar 2024 02:22: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 42O2MNk9069122; Sun, 24 Mar 2024 02:22:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O2MN4v069119; Sun, 24 Mar 2024 02:22:23 GMT (envelope-from git) Date: Sun, 24 Mar 2024 02:22:23 GMT Message-Id: <202403240222.42O2MN4v069119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 66f60770fd7d - stable/14 - unbound: Vendor import 1.19.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66f60770fd7d39518fef679533c3034e1e4f6baa Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=66f60770fd7d39518fef679533c3034e1e4f6baa commit 66f60770fd7d39518fef679533c3034e1e4f6baa Author: Cy Schubert AuthorDate: 2024-03-17 00:13:09 +0000 Commit: Cy Schubert CommitDate: 2024-03-24 02:22:03 +0000 unbound: Vendor import 1.19.3 Release notes at https://www.nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released/ Merge commit '5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc' into main (cherry picked from commit b7c0c8c18e0f12bc22e251fbcabad719b364a38a) --- contrib/unbound/acx_nlnetlabs.m4 | 121 +- contrib/unbound/configure | 350 +- contrib/unbound/configure.ac | 28 +- contrib/unbound/daemon/remote.c | 10 +- contrib/unbound/daemon/worker.c | 28 +- contrib/unbound/dnstap/dnstap.c | 32 +- contrib/unbound/dnstap/dnstap.h | 4 + contrib/unbound/dnstap/dnstap.m4 | 107 +- contrib/unbound/dnstap/dnstap.proto | 82 +- contrib/unbound/doc/Changelog | 140 +- contrib/unbound/doc/README | 11 +- contrib/unbound/doc/example.conf.in | 25 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 24 +- contrib/unbound/iterator/iter_fwd.c | 1 - contrib/unbound/iterator/iter_hints.c | 5 +- contrib/unbound/iterator/iter_scrub.c | 3 +- contrib/unbound/iterator/iterator.c | 8 +- contrib/unbound/services/authzone.c | 2 +- contrib/unbound/services/cache/dns.c | 12 +- contrib/unbound/services/localzone.c | 6 +- contrib/unbound/services/mesh.c | 10 +- contrib/unbound/services/outside_network.c | 46 +- .../cachedb_no_store.tdir/cachedb_no_store.post | 2 +- .../cachedb_no_store.tdir/cachedb_no_store.test | 14 +- .../unbound/testdata/iter_cname_minimise_nx.rpl | 1 - contrib/unbound/testdata/iter_dname_ttl.rpl | 310 + .../testdata/root_zonemd.tdir/root_zonemd.test | 32 +- contrib/unbound/testdata/rrset_use_cached.rpl | 151 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 2 +- .../testdata/serve_expired_0ttl_nxdomain.rpl | 2 +- .../testdata/serve_expired_0ttl_servfail.rpl | 2 +- .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ++ contrib/unbound/util/config_file.c | 3 + contrib/unbound/util/config_file.h | 2 + contrib/unbound/util/configlexer.c | 7627 +++++++++++++++++++ contrib/unbound/util/configlexer.lex | 1 + contrib/unbound/util/configparser.c | 7713 ++++++++++++++++++++ contrib/unbound/util/configparser.h | 781 ++ contrib/unbound/util/configparser.y | 13 +- contrib/unbound/util/data/msgencode.c | 3 + contrib/unbound/util/data/msgreply.c | 53 +- contrib/unbound/util/data/msgreply.h | 6 +- contrib/unbound/util/data/packed_rrset.c | 5 +- contrib/unbound/util/iana_ports.inc | 1 - contrib/unbound/util/netevent.c | 12 +- contrib/unbound/validator/autotrust.c | 8 +- contrib/unbound/validator/val_sigcrypt.c | 2 +- contrib/unbound/validator/val_utils.c | 55 +- contrib/unbound/validator/validator.c | 2 + lib/libunbound/config.h | 6 +- 58 files changed, 18038 insertions(+), 287 deletions(-) diff --git a/contrib/unbound/acx_nlnetlabs.m4 b/contrib/unbound/acx_nlnetlabs.m4 index f27615bd8bce..6a01dc5a4769 100644 --- a/contrib/unbound/acx_nlnetlabs.m4 +++ b/contrib/unbound/acx_nlnetlabs.m4 @@ -2,7 +2,10 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 46 +# Version 48 +# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check. +# and check for getaddrinfo with only header. +# 2024-01-15 fix to add crypt32 to -lcrypto link check when checking for gdi32. # 2023-05-04 fix to remove unused whitespace. # 2023-01-26 fix -Wstrict-prototypes. # 2022-09-01 fix checking if nonblocking sockets work on OpenBSD. @@ -707,7 +710,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir_lib" ACX_RUNTIME_PATH_ADD([$ssldir_lib]) fi - + AC_MSG_CHECKING([for EVP_sha256 in -lcrypto]) LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" @@ -732,40 +735,73 @@ AC_DEFUN([ACX_SSL_CHECKS], [ ]])],[ AC_DEFINE([HAVE_EVP_SHA256], 1, [If you have EVP_sha256]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - AC_MSG_CHECKING([if -lcrypto needs -ldl]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + AC_MSG_CHECKING([if -lcrypto needs -ldl]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) + ]) ]) - ]) + ]) ]) ]) fi @@ -779,7 +815,7 @@ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT]) dnl Check for SSL, where SSL is mandatory dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found -dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. +dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. dnl Checks main header files of SSL. dnl AC_DEFUN([ACX_WITH_SSL], @@ -872,7 +908,7 @@ dnl see if on windows if test "$ac_cv_header_windows_h" = "yes"; then AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" @@ -880,6 +916,24 @@ if test "$ac_cv_header_windows_h" = "yes"; then fi ], dnl no quick getaddrinfo, try mingw32 and winsock2 library. +dnl perhaps getaddrinfo needs only the include +AC_LINK_IFELSE( +[AC_LANG_PROGRAM( +[ +#ifdef HAVE_WS2TCPIP_H +#include +#endif +], +[ + (void)getaddrinfo(NULL, NULL, NULL, NULL); +] +)], +[ +ac_cv_func_getaddrinfo="yes" +AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) +USE_WINSOCK="1" +], + ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( @@ -904,6 +958,7 @@ ac_cv_func_getaddrinfo="no" LIBS="$ORIGLIBS" ]) ) +) AC_MSG_RESULT($ac_cv_func_getaddrinfo) if test $ac_cv_func_getaddrinfo = yes; then diff --git a/contrib/unbound/configure b/contrib/unbound/configure index c87c669c8435..6aa1aeb80676 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.1. +# Generated by GNU Autoconf 2.69 for unbound 1.19.3. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.1' -PACKAGE_STRING='unbound 1.19.1' +PACKAGE_VERSION='1.19.3' +PACKAGE_STRING='unbound 1.19.3' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -655,6 +655,8 @@ DNSTAP_SOCKET_TESTBIN DNSTAP_SOCKET_PATH opt_dnstap_socket_path ENABLE_DNSTAP +PROTOBUFC_LIBS +PROTOBUFC_CFLAGS PROTOC_C UBSYMS EXTRALINK @@ -926,7 +928,9 @@ SYSTEMD_CFLAGS SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS -PYTHON_VERSION' +PYTHON_VERSION +PROTOBUFC_CFLAGS +PROTOBUFC_LIBS' # Initialize some variables set by options. @@ -1477,7 +1481,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.1:";; + short | recursive ) echo "Configuration of unbound 1.19.3:";; esac cat <<\_ACEOF @@ -1718,6 +1722,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + PROTOBUFC_CFLAGS + C compiler flags for PROTOBUFC, overriding pkg-config + PROTOBUFC_LIBS + linker flags for PROTOBUFC, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1785,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.1 +unbound configure 1.19.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2502,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.1, which was +It was created by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2854,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2942,6 +2950,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14416,7 +14426,7 @@ CC=$lt_save_CC # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then @@ -18104,19 +18114,86 @@ else $as_echo "no" >&6; } LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 $as_echo_n "checking if -lcrypto needs -ldl... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18127,28 +18204,28 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 $as_echo_n "checking if -lcrypto needs -ldl -pthread... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18159,14 +18236,22 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ @@ -19847,7 +19932,7 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" @@ -19892,7 +19977,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19951,7 +20040,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19998,13 +20091,40 @@ if test "$ac_cv_header_windows_h" = "yes"; then $as_echo "#define USE_WINSOCK 1" >>confdefs.h USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" fi fi +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + +int +main () +{ + + (void)getaddrinfo(NULL, NULL, NULL, NULL); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +ac_cv_func_getaddrinfo="yes" + +$as_echo "#define USE_WINSOCK 1" >>confdefs.h + +USE_WINSOCK="1" + else ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -20047,6 +20167,10 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5 $as_echo "$ac_cv_func_getaddrinfo" >&6; } if test $ac_cv_func_getaddrinfo = yes; then @@ -20166,7 +20290,11 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -21199,7 +21327,7 @@ fi # check for dnstap if requested - # Check whether --enable-dnstap was given. + # Check whether --enable-dnstap was given. if test "${enable_dnstap+set}" = set; then : enableval=$enable_dnstap; opt_dnstap=$enableval else @@ -21216,8 +21344,8 @@ else fi - if test "x$opt_dnstap" != "xno"; then - # Extract the first word of "protoc-c", so it can be a program name with args. + if test "x$opt_dnstap" != "xno"; then + # Extract the first word of "protoc-c", so it can be a program name with args. set dummy protoc-c; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -21257,36 +21385,132 @@ $as_echo "no" >&6; } fi - if test -z "$PROTOC_C"; then - as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 - fi + if test -z "$PROTOC_C"; then + as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 + fi # Check whether --with-protobuf-c was given. if test "${with_protobuf_c+set}" = set; then : withval=$with_protobuf_c; - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f $withval/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I$withval/include/google" - else - CFLAGS="$CFLAGS -I$withval/include" - fi - LDFLAGS="$LDFLAGS -L$withval/lib" + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f $withval/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I$withval/include/google" + else + CFLAGS="$CFLAGS -I$withval/include" + fi + LDFLAGS="$LDFLAGS -L$withval/lib" else - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f /usr/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/include/google" - else - if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/local/include/google" - LDFLAGS="$LDFLAGS -L/usr/local/lib" - fi - fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROTOBUFC" >&5 +$as_echo_n "checking for PROTOBUFC... " >&6; } + +if test -n "$PROTOBUFC_CFLAGS"; then + pkg_cv_PROTOBUFC_CFLAGS="$PROTOBUFC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PROTOBUFC_LIBS"; then + pkg_cv_PROTOBUFC_LIBS="$PROTOBUFC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c" 2>&1` + else + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROTOBUFC_PKG_ERRORS" >&5 + + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + + +else + PROTOBUFC_CFLAGS=$pkg_cv_PROTOBUFC_CFLAGS + PROTOBUFC_LIBS=$pkg_cv_PROTOBUFC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS" + LIBS="$LIBS $PROTOBUFC_LIBS" + +fi + + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 $as_echo_n "checking for library containing protobuf_c_message_pack... " >&6; } if ${ac_cv_search_protobuf_c_message_pack+:} false; then : $as_echo_n "(cached) " >&6 @@ -21368,13 +21592,13 @@ _ACEOF DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo" - else + else ENABLE_DNSTAP=0 - fi + fi # check for dnscrypt if requested @@ -21895,7 +22119,7 @@ _ACEOF -version=1.19.1 +version=1.19.3 date=`date +'%b %e, %Y'` @@ -22414,7 +22638,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.1, which was +This file was extended by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22480,7 +22704,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.1 +unbound config.status 1.19.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 70fc7e7fdf49..e0dedbef9add 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[3]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -110,6 +110,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -407,7 +409,7 @@ AC_CHECK_TOOL(STRIP, strip) ACX_LIBTOOL_C_ONLY # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then PKG_PROG_PKG_CONFIG fi @@ -1526,13 +1528,17 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1549,7 +1555,11 @@ if test x_$enable_fully_static = x_yes; then LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1569,7 +1579,11 @@ if test "$USE_WINSOCK" = 1; then #include ]) AC_CHECK_TOOL(WINDRES, windres) - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" AC_SUBST(WINAPPS) WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 3eb711ce6428..5d79eafd23be 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -553,7 +553,7 @@ ssl_print_text(RES* res, const char* text) static int ssl_print_vmsg(RES* ssl, const char* format, va_list args) { - char msg[1024]; + char msg[65535]; vsnprintf(msg, sizeof(msg), format, args); return ssl_print_text(ssl, msg); } @@ -3181,10 +3181,10 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd, do_flush_bogus(ssl, worker); } else if(cmdcmp(p, "flush_negative", 14)) { do_flush_negative(ssl, worker); - } else if(cmdcmp(p, "rpz_enable", 10)) { - do_rpz_enable(ssl, worker, skipwhite(p+10)); - } else if(cmdcmp(p, "rpz_disable", 11)) { - do_rpz_disable(ssl, worker, skipwhite(p+11)); + } else if(cmdcmp(p, "rpz_enable", 10)) { + do_rpz_enable(ssl, worker, skipwhite(p+10)); + } else if(cmdcmp(p, "rpz_disable", 11)) { + do_rpz_disable(ssl, worker, skipwhite(p+11)); } else { (void)ssl_printf(ssl, "error unknown command '%s'\n", p); } diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index 8ae05eb67e66..176abf57d56e 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -1151,7 +1151,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE && LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1); - sldns_buffer_skip(c->buffer, LDNS_HEADER_SIZE); /* skip header */ + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */ /* check additional section is present and that we respond with EDEs */ if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1 @@ -1163,6 +1163,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, LDNS_QR_SET(sldns_buffer_begin(c->buffer)); LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), LDNS_RCODE_REFUSED); + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); *** 18928 LINES SKIPPED *** From nobody Sun Mar 24 02:22:59 2024 X-Original-To: dev-commits-src-all@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 4V2Kbm1hV0z5DhkK; Sun, 24 Mar 2024 02:23: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 4V2Kbm06Y8z4pFT; Sun, 24 Mar 2024 02:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246980; 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=mRJ/9lzXpcVlhf2qa/7lUYU6Gax5wC5mpdDd/7gAXyA=; b=RmBMx3C5G7c18A3sZDRRjYmlHCPLurypbnxWuCA/Z1T7hTir3AqG6fot705b/KB2n2ga9h rK2wx86sv3J+GkIuS6nr0MsmK2LYk4+5V/5VGHMcIYsDWjAc6ojN3ulyU5gZnzOWxEs0/X z/PYbq2pWLjQvWUWfLIyJqxWpm7n1gvmu73RtBoYeNBFV1JmAjLP8Ib+Zj3y6BPXxYzjy2 THnbOw4lSefbeZRDSfSVQQAkmEuOZFbmkGLuIe6zi7JzMM+Dgx5UNev7q+EpQVpuikK7pE 3BjBkzarSkTTIMoz3XecO4o9RwFo6Ju6u08fYfugcMjGCPRLZRO/0v6r0hDqsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711246980; a=rsa-sha256; cv=none; b=Xh9NRtrOuoEgAdvzyMAosymqBqonGQcJ5T85hveIt2I/6Un7Bf1wIfi9RQnSX9fJ4wVWkp wtYOeEIJckhOd2KwzYHXssYWMu86nQRYX8esjR4t89X7dHTgbAn0rW331giDhJP72ecF/U EsDt33X1Mw1+8Wy4UV6P+p7M/DA5rt8YEvYSVBBnoPG3p+oVY1zJVlXWtEvkkXUKwyR0FD jd2JTlchpuF7cJ92qeCLkkSzxycH+pR1VWRfjJSDgGbVzDRoqO5O/9/SqTZw8yJIGaGI52 QLdMyywa5SdA1sNhwvfoFxLctx+obiCLxwpwglZkAUorGJafZxBxlJ6KuCQXaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711246980; 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=mRJ/9lzXpcVlhf2qa/7lUYU6Gax5wC5mpdDd/7gAXyA=; b=RxJC/cP8VTHG1iI5rDMABStadK+3NjsDrP2h6MQbazVvDtFn1dfZaDdWpeQY9mPE8YP6J4 v4Qjj3HzI28sYDlXheWvijiIexvfBMC6XcQEDfLTVjNYGOxAbbYyWRZD90RWeMCYha7oUU noSOgw+dFqjePl7NaD0EC5Mukb9I+GGR/lR5HBOKc7lD1bKAOk5+P4IQQWSGoZadorOiFK f9kF9yqqKm3o+AVSb4BT2+tAD3zOevcISM1Bla2a7JVq3zInUGWvuz7AhZEEytfbglh4l0 PPGt/ouwK5lxVc+i/97R5mepwnDD2VfTX2YFAATAZxRNbopsqt4VHZOD5DOCJg== 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 4V2Kbl6njszF2s; Sun, 24 Mar 2024 02:22: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 42O2Mxut069316; Sun, 24 Mar 2024 02:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O2MxJe069310; Sun, 24 Mar 2024 02:22:59 GMT (envelope-from git) Date: Sun, 24 Mar 2024 02:22:59 GMT Message-Id: <202403240222.42O2MxJe069310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e59ac68e257b - stable/13 - unbound: Vendor import 1.19.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e59ac68e257b3602a9671037d777490717c37dd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e59ac68e257b3602a9671037d777490717c37dd9 commit e59ac68e257b3602a9671037d777490717c37dd9 Author: Cy Schubert AuthorDate: 2024-03-17 00:13:09 +0000 Commit: Cy Schubert CommitDate: 2024-03-24 02:22:47 +0000 unbound: Vendor import 1.19.3 Release notes at https://www.nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released/ Merge commit '5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc' into main (cherry picked from commit b7c0c8c18e0f12bc22e251fbcabad719b364a38a) --- contrib/unbound/acx_nlnetlabs.m4 | 121 +- contrib/unbound/configure | 350 +- contrib/unbound/configure.ac | 28 +- contrib/unbound/daemon/remote.c | 10 +- contrib/unbound/daemon/worker.c | 28 +- contrib/unbound/dnstap/dnstap.c | 32 +- contrib/unbound/dnstap/dnstap.h | 4 + contrib/unbound/dnstap/dnstap.m4 | 107 +- contrib/unbound/dnstap/dnstap.proto | 82 +- contrib/unbound/doc/Changelog | 140 +- contrib/unbound/doc/README | 11 +- contrib/unbound/doc/example.conf.in | 25 +- contrib/unbound/doc/libunbound.3.in | 4 +- contrib/unbound/doc/unbound-anchor.8.in | 2 +- contrib/unbound/doc/unbound-checkconf.8.in | 2 +- contrib/unbound/doc/unbound-control.8.in | 2 +- contrib/unbound/doc/unbound-host.1.in | 2 +- contrib/unbound/doc/unbound.8.in | 4 +- contrib/unbound/doc/unbound.conf.5.in | 24 +- contrib/unbound/iterator/iter_fwd.c | 1 - contrib/unbound/iterator/iter_hints.c | 5 +- contrib/unbound/iterator/iter_scrub.c | 3 +- contrib/unbound/iterator/iterator.c | 8 +- contrib/unbound/services/authzone.c | 2 +- contrib/unbound/services/cache/dns.c | 12 +- contrib/unbound/services/localzone.c | 6 +- contrib/unbound/services/mesh.c | 10 +- contrib/unbound/services/outside_network.c | 46 +- .../cachedb_no_store.tdir/cachedb_no_store.post | 2 +- .../cachedb_no_store.tdir/cachedb_no_store.test | 14 +- .../unbound/testdata/iter_cname_minimise_nx.rpl | 1 - contrib/unbound/testdata/iter_dname_ttl.rpl | 310 + .../testdata/root_zonemd.tdir/root_zonemd.test | 32 +- contrib/unbound/testdata/rrset_use_cached.rpl | 151 + .../unbound/testdata/serve_expired_0ttl_nodata.rpl | 2 +- .../testdata/serve_expired_0ttl_nxdomain.rpl | 2 +- .../testdata/serve_expired_0ttl_servfail.rpl | 2 +- .../testdata/serve_expired_cached_servfail.rpl | 2 +- .../serve_expired_cached_servfail_refresh.rpl | 2 +- .../unbound/testdata/subnet_scopezero_noedns.crpl | 441 ++ contrib/unbound/util/config_file.c | 3 + contrib/unbound/util/config_file.h | 2 + contrib/unbound/util/configlexer.c | 7627 +++++++++++++++++++ contrib/unbound/util/configlexer.lex | 1 + contrib/unbound/util/configparser.c | 7713 ++++++++++++++++++++ contrib/unbound/util/configparser.h | 781 ++ contrib/unbound/util/configparser.y | 13 +- contrib/unbound/util/data/msgencode.c | 3 + contrib/unbound/util/data/msgreply.c | 53 +- contrib/unbound/util/data/msgreply.h | 6 +- contrib/unbound/util/data/packed_rrset.c | 5 +- contrib/unbound/util/iana_ports.inc | 1 - contrib/unbound/util/netevent.c | 12 +- contrib/unbound/validator/autotrust.c | 8 +- contrib/unbound/validator/val_sigcrypt.c | 2 +- contrib/unbound/validator/val_utils.c | 55 +- contrib/unbound/validator/validator.c | 2 + usr.sbin/unbound/config.h | 6 +- 58 files changed, 18038 insertions(+), 287 deletions(-) diff --git a/contrib/unbound/acx_nlnetlabs.m4 b/contrib/unbound/acx_nlnetlabs.m4 index f27615bd8bce..6a01dc5a4769 100644 --- a/contrib/unbound/acx_nlnetlabs.m4 +++ b/contrib/unbound/acx_nlnetlabs.m4 @@ -2,7 +2,10 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 46 +# Version 48 +# 2024-01-16 fix to add -l:libssp.a to -lcrypto link check. +# and check for getaddrinfo with only header. +# 2024-01-15 fix to add crypt32 to -lcrypto link check when checking for gdi32. # 2023-05-04 fix to remove unused whitespace. # 2023-01-26 fix -Wstrict-prototypes. # 2022-09-01 fix checking if nonblocking sockets work on OpenBSD. @@ -707,7 +710,7 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LDFLAGS="$LIBSSL_LDFLAGS -L$ssldir_lib" ACX_RUNTIME_PATH_ADD([$ssldir_lib]) fi - + AC_MSG_CHECKING([for EVP_sha256 in -lcrypto]) LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" @@ -732,40 +735,73 @@ AC_DEFUN([ACX_SSL_CHECKS], [ ]])],[ AC_DEFINE([HAVE_EVP_SHA256], 1, [If you have EVP_sha256]) - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - AC_MSG_CHECKING([if -lcrypto needs -ldl]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ - int EVP_sha256(void); - (void)EVP_sha256(); - ]])],[ - AC_DEFINE([HAVE_EVP_SHA256], 1, - [If you have EVP_sha256]) - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + AC_MSG_CHECKING([if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + AC_MSG_CHECKING([if -lcrypto needs -ldl]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ + int EVP_sha256(void); + (void)EVP_sha256(); + ]])],[ + AC_DEFINE([HAVE_EVP_SHA256], 1, + [If you have EVP_sha256]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) + ]) ]) - ]) + ]) ]) ]) fi @@ -779,7 +815,7 @@ AC_CHECK_HEADERS([openssl/rand.h],,, [AC_INCLUDES_DEFAULT]) dnl Check for SSL, where SSL is mandatory dnl Adds --with-ssl option, searches for openssl and defines HAVE_SSL if found -dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. +dnl Setup of CPPFLAGS, CFLAGS. Adds -lcrypto to LIBS. dnl Checks main header files of SSL. dnl AC_DEFUN([ACX_WITH_SSL], @@ -872,7 +908,7 @@ dnl see if on windows if test "$ac_cv_header_windows_h" = "yes"; then AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" @@ -880,6 +916,24 @@ if test "$ac_cv_header_windows_h" = "yes"; then fi ], dnl no quick getaddrinfo, try mingw32 and winsock2 library. +dnl perhaps getaddrinfo needs only the include +AC_LINK_IFELSE( +[AC_LANG_PROGRAM( +[ +#ifdef HAVE_WS2TCPIP_H +#include +#endif +], +[ + (void)getaddrinfo(NULL, NULL, NULL, NULL); +] +)], +[ +ac_cv_func_getaddrinfo="yes" +AC_DEFINE(USE_WINSOCK, 1, [Whether the windows socket API is used]) +USE_WINSOCK="1" +], + ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_LINK_IFELSE( @@ -904,6 +958,7 @@ ac_cv_func_getaddrinfo="no" LIBS="$ORIGLIBS" ]) ) +) AC_MSG_RESULT($ac_cv_func_getaddrinfo) if test $ac_cv_func_getaddrinfo = yes; then diff --git a/contrib/unbound/configure b/contrib/unbound/configure index c87c669c8435..6aa1aeb80676 100755 --- a/contrib/unbound/configure +++ b/contrib/unbound/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.19.1. +# Generated by GNU Autoconf 2.69 for unbound 1.19.3. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.19.1' -PACKAGE_STRING='unbound 1.19.1' +PACKAGE_VERSION='1.19.3' +PACKAGE_STRING='unbound 1.19.3' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues' PACKAGE_URL='' @@ -655,6 +655,8 @@ DNSTAP_SOCKET_TESTBIN DNSTAP_SOCKET_PATH opt_dnstap_socket_path ENABLE_DNSTAP +PROTOBUFC_LIBS +PROTOBUFC_CFLAGS PROTOC_C UBSYMS EXTRALINK @@ -926,7 +928,9 @@ SYSTEMD_CFLAGS SYSTEMD_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS -PYTHON_VERSION' +PYTHON_VERSION +PROTOBUFC_CFLAGS +PROTOBUFC_LIBS' # Initialize some variables set by options. @@ -1477,7 +1481,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.19.1 to adapt to many kinds of systems. +\`configure' configures unbound 1.19.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1543,7 +1547,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.19.1:";; + short | recursive ) echo "Configuration of unbound 1.19.3:";; esac cat <<\_ACEOF @@ -1718,6 +1722,10 @@ Some influential environment variables: The installed Python version to use, for example '2.3'. This string will be appended to the Python interpreter canonical name. + PROTOBUFC_CFLAGS + C compiler flags for PROTOBUFC, overriding pkg-config + PROTOBUFC_LIBS + linker flags for PROTOBUFC, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1785,7 +1793,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.19.1 +unbound configure 1.19.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2494,7 +2502,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.19.1, which was +It was created by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2846,11 +2854,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=19 -UNBOUND_VERSION_MICRO=1 +UNBOUND_VERSION_MICRO=3 LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2942,6 +2950,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -14416,7 +14426,7 @@ CC=$lt_save_CC # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then @@ -18104,19 +18114,86 @@ else $as_echo "no" >&6; } LIBS="$BAKLIBS" LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a" >&5 +$as_echo_n "checking if -lcrypto needs -lgdi32 -lws2_32 -lcrypt32 -l:libssp.a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int EVP_sha256(void); + (void)EVP_sha256(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + + LIBS="$LIBS -ldl" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl" >&5 $as_echo_n "checking if -lcrypto needs -ldl... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18127,28 +18204,28 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - LIBS="$BAKLIBS" - LIBSSL_LIBS="$BAKSSLLIBS" - LIBS="$LIBS -ldl -pthread" - LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 $as_echo_n "checking if -lcrypto needs -ldl -pthread... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - int EVP_sha256(void); - (void)EVP_sha256(); + int EVP_sha256(void); + (void)EVP_sha256(); ; return 0; @@ -18159,14 +18236,22 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_EVP_SHA256 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ @@ -19847,7 +19932,7 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" @@ -19892,7 +19977,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19951,7 +20040,11 @@ if test "x$ac_cv_lib_z_compress" = xyes; then : LIBS="$LIBS -lz" fi - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -19998,13 +20091,40 @@ if test "$ac_cv_header_windows_h" = "yes"; then $as_echo "#define USE_WINSOCK 1" >>confdefs.h USE_WINSOCK="1" - if echo $LIBS | grep 'lws2_32' >/dev/null; then + if echo "$LIBS" | grep 'lws2_32' >/dev/null; then : else LIBS="$LIBS -lws2_32" fi fi +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef HAVE_WS2TCPIP_H +#include +#endif + +int +main () +{ + + (void)getaddrinfo(NULL, NULL, NULL, NULL); + + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + +ac_cv_func_getaddrinfo="yes" + +$as_echo "#define USE_WINSOCK 1" >>confdefs.h + +USE_WINSOCK="1" + else ORIGLIBS="$LIBS" LIBS="$LIBS -lws2_32" @@ -20047,6 +20167,10 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5 $as_echo "$ac_cv_func_getaddrinfo" >&6; } if test $ac_cv_func_getaddrinfo = yes; then @@ -20166,7 +20290,11 @@ else WINDRES="$ac_cv_prog_WINDRES" fi - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" @@ -21199,7 +21327,7 @@ fi # check for dnstap if requested - # Check whether --enable-dnstap was given. + # Check whether --enable-dnstap was given. if test "${enable_dnstap+set}" = set; then : enableval=$enable_dnstap; opt_dnstap=$enableval else @@ -21216,8 +21344,8 @@ else fi - if test "x$opt_dnstap" != "xno"; then - # Extract the first word of "protoc-c", so it can be a program name with args. + if test "x$opt_dnstap" != "xno"; then + # Extract the first word of "protoc-c", so it can be a program name with args. set dummy protoc-c; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -21257,36 +21385,132 @@ $as_echo "no" >&6; } fi - if test -z "$PROTOC_C"; then - as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 - fi + if test -z "$PROTOC_C"; then + as_fn_error $? "The protoc-c program was not found. Please install protobuf-c!" "$LINENO" 5 + fi # Check whether --with-protobuf-c was given. if test "${with_protobuf_c+set}" = set; then : withval=$with_protobuf_c; - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f $withval/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I$withval/include/google" - else - CFLAGS="$CFLAGS -I$withval/include" - fi - LDFLAGS="$LDFLAGS -L$withval/lib" + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f $withval/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I$withval/include/google" + else + CFLAGS="$CFLAGS -I$withval/include" + fi + LDFLAGS="$LDFLAGS -L$withval/lib" else - # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 - if test -f /usr/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/include/google" - else - if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then - CFLAGS="$CFLAGS -I/usr/local/include/google" - LDFLAGS="$LDFLAGS -L/usr/local/lib" - fi - fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROTOBUFC" >&5 +$as_echo_n "checking for PROTOBUFC... " >&6; } + +if test -n "$PROTOBUFC_CFLAGS"; then + pkg_cv_PROTOBUFC_CFLAGS="$PROTOBUFC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_CFLAGS=`$PKG_CONFIG --cflags "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$PROTOBUFC_LIBS"; then + pkg_cv_PROTOBUFC_LIBS="$PROTOBUFC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libprotobuf-c\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libprotobuf-c") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_PROTOBUFC_LIBS=`$PKG_CONFIG --libs "libprotobuf-c" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libprotobuf-c" 2>&1` + else + PROTOBUFC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libprotobuf-c" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$PROTOBUFC_PKG_ERRORS" >&5 + + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + + # pkg-config failed; try falling back to known values + # workaround for protobuf-c includes at old dir before protobuf-c-1.0.0 + if test -f /usr/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/include/google" + else + if test -f /usr/local/include/google/protobuf-c/protobuf-c.h; then + CFLAGS="$CFLAGS -I/usr/local/include/google" + LDFLAGS="$LDFLAGS -L/usr/local/lib" + else + as_fn_error $? "The protobuf-c package was not found with pkg-config. Please install protobuf-c!" "$LINENO" 5 + fi + fi + + +else + PROTOBUFC_CFLAGS=$pkg_cv_PROTOBUFC_CFLAGS + PROTOBUFC_LIBS=$pkg_cv_PROTOBUFC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CFLAGS="$CFLAGS $PROTOBUFC_CFLAGS" + LIBS="$LIBS $PROTOBUFC_LIBS" + +fi + + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing protobuf_c_message_pack" >&5 $as_echo_n "checking for library containing protobuf_c_message_pack... " >&6; } if ${ac_cv_search_protobuf_c_message_pack+:} false; then : $as_echo_n "(cached) " >&6 @@ -21368,13 +21592,13 @@ _ACEOF DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo" - else + else ENABLE_DNSTAP=0 - fi + fi # check for dnscrypt if requested @@ -21895,7 +22119,7 @@ _ACEOF -version=1.19.1 +version=1.19.3 date=`date +'%b %e, %Y'` @@ -22414,7 +22638,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unbound $as_me 1.19.1, which was +This file was extended by unbound $as_me 1.19.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22480,7 +22704,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unbound config.status 1.19.1 +unbound config.status 1.19.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/contrib/unbound/configure.ac b/contrib/unbound/configure.ac index 70fc7e7fdf49..e0dedbef9add 100644 --- a/contrib/unbound/configure.ac +++ b/contrib/unbound/configure.ac @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4) # must be numbers. ac_defun because of later processing m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[19]) -m4_define([VERSION_MICRO],[1]) +m4_define([VERSION_MICRO],[3]) AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound]) AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR]) AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR]) AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO]) LIBUNBOUND_CURRENT=9 -LIBUNBOUND_REVISION=24 +LIBUNBOUND_REVISION=26 LIBUNBOUND_AGE=1 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -110,6 +110,8 @@ LIBUNBOUND_AGE=1 # 1.18.0 had 9:22:1 # 1.19.0 had 9:23:1 # 1.19.1 had 9:24:1 +# 1.19.2 had 9:25:1 +# 1.19.3 had 9:26:1 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -407,7 +409,7 @@ AC_CHECK_TOOL(STRIP, strip) ACX_LIBTOOL_C_ONLY # pkg-config is only needed for these options, do not require it otherwise -if test "$enable_systemd" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then +if test "$enable_systemd" = "yes" -o "$enable_dnstap" = "yes" -o "$with_pyunbound" = "yes" -o "$with_pythonmod" = "yes"; then PKG_PROG_PKG_CONFIG fi @@ -1526,13 +1528,17 @@ if test x_$enable_static_exe = x_yes; then if test "$on_mingw" = yes; then staticexe="-all-static" # for static compile, include gdi32 and zlib here. - if echo $LIBS | grep 'lgdi32' >/dev/null; then + if echo "$LIBS" | grep 'lgdi32' >/dev/null; then : else LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1549,7 +1555,11 @@ if test x_$enable_fully_static = x_yes; then LIBS="$LIBS -lgdi32" fi AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ]) - LIBS="$LIBS -l:libssp.a" + if echo "$LIBS" | grep -e "libssp.a" -e "lssp" >/dev/null; then + : + else + LIBS="$LIBS -l:libssp.a" + fi fi fi @@ -1569,7 +1579,11 @@ if test "$USE_WINSOCK" = 1; then #include ]) AC_CHECK_TOOL(WINDRES, windres) - LIBS="$LIBS -liphlpapi -lcrypt32" + if echo "$LIBS" | grep crypt32 >/dev/null; then + LIBS="$LIBS -liphlpapi" + else + LIBS="$LIBS -liphlpapi -lcrypt32" + fi WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe" AC_SUBST(WINAPPS) WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c" diff --git a/contrib/unbound/daemon/remote.c b/contrib/unbound/daemon/remote.c index 3eb711ce6428..5d79eafd23be 100644 --- a/contrib/unbound/daemon/remote.c +++ b/contrib/unbound/daemon/remote.c @@ -553,7 +553,7 @@ ssl_print_text(RES* res, const char* text) static int ssl_print_vmsg(RES* ssl, const char* format, va_list args) { - char msg[1024]; + char msg[65535]; vsnprintf(msg, sizeof(msg), format, args); return ssl_print_text(ssl, msg); } @@ -3181,10 +3181,10 @@ execute_cmd(struct daemon_remote* rc, RES* ssl, char* cmd, do_flush_bogus(ssl, worker); } else if(cmdcmp(p, "flush_negative", 14)) { do_flush_negative(ssl, worker); - } else if(cmdcmp(p, "rpz_enable", 10)) { - do_rpz_enable(ssl, worker, skipwhite(p+10)); - } else if(cmdcmp(p, "rpz_disable", 11)) { - do_rpz_disable(ssl, worker, skipwhite(p+11)); + } else if(cmdcmp(p, "rpz_enable", 10)) { + do_rpz_enable(ssl, worker, skipwhite(p+10)); + } else if(cmdcmp(p, "rpz_disable", 11)) { + do_rpz_disable(ssl, worker, skipwhite(p+11)); } else { (void)ssl_printf(ssl, "error unknown command '%s'\n", p); } diff --git a/contrib/unbound/daemon/worker.c b/contrib/unbound/daemon/worker.c index 8ae05eb67e66..176abf57d56e 100644 --- a/contrib/unbound/daemon/worker.c +++ b/contrib/unbound/daemon/worker.c @@ -1151,7 +1151,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, log_assert(sldns_buffer_limit(c->buffer) >= LDNS_HEADER_SIZE && LDNS_QDCOUNT(sldns_buffer_begin(c->buffer)) == 1); - sldns_buffer_skip(c->buffer, LDNS_HEADER_SIZE); /* skip header */ + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); /* skip header */ /* check additional section is present and that we respond with EDEs */ if(LDNS_ARCOUNT(sldns_buffer_begin(c->buffer)) != 1 @@ -1163,6 +1163,7 @@ deny_refuse(struct comm_point* c, enum acl_access acl, LDNS_QR_SET(sldns_buffer_begin(c->buffer)); LDNS_RCODE_SET(sldns_buffer_begin(c->buffer), LDNS_RCODE_REFUSED); + sldns_buffer_set_position(c->buffer, LDNS_HEADER_SIZE); *** 18928 LINES SKIPPED *** From nobody Sun Mar 24 03:04:40 2024 X-Original-To: dev-commits-src-all@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 4V2LWr5rh5z5DmkX; Sun, 24 Mar 2024 03:04:40 +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 4V2LWr5DQPz4t1R; Sun, 24 Mar 2024 03:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249480; 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=pR6LThwsMzx4Q0Q8u1HR80upGVPMEx5sPD91sqFg2tY=; b=k3BBT7YwKhHxIh17Y+njIqEAx+3KSUmqMUcnBQVpiOXmrzTvwVxkm0M9KAWgAqS/HzYAQy E8bADInSuu05fdLHUBQxHaeLD2QZVYEcxaPXkKy3SQG3LZQNw7s9EuETG45bDEJFTPfdmq vZSnoLQ8VyaBQXEBo1H9O8Vt1EFl1OawH1tyrV6s6PEdTtnc9ojZ302/ViREIAjtD/hvjn gRXRDEThFGjwe9k60uNecbqG8CoHtoDYmqbfTsk0euR16ZvoCRkPUAjiG+nFWOTwo8fBP2 iR9N2BhyndiqQd+XIMnBaYJ9MUqFHexcYimhGB8zcIrLZCj2ha6gOzsCcS4CBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249480; a=rsa-sha256; cv=none; b=GWBDc6o+40xMrm976du1Xa2cB+btDeBX0MU4Fq7tOPlLwtnUWUi7x9FP72+i0DwchX+NSo mqGxCYYdnKMmTRvhZ7jpTgjzkEcd0ZkiQ8MKslSuQ+hf1KO4OLXw0O9oL0oMNTydc5V9uG X+TZOxxtuwribWDM6pw3gHpUbKdciJq4F0U3deQzbhltMndW9lOhHCel3j8/VHddlFYsls qZ9n5pta6yWP0jLQn/0buBOXVw65/4zcG7gpNXsDaiDc4QCbBoKo4yv5W5tlbAhHKfEv2M 9YPyJ8VFWW9xX1O4zQRn+lfDRH4s9PE8g0sjqsPNCfnqeQW4kUgN+HtTlgf7Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249480; 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=pR6LThwsMzx4Q0Q8u1HR80upGVPMEx5sPD91sqFg2tY=; b=hqE8l/14F0cwMtJ2+5IVrXVNoffeA/Uld5VXB36gswe1gFrVEoZG242iwwtqJNKTUz96qV IoPuswh6xV6riSREu5V+PvicpO9qhA1kfVFp0k6dY/fdWQ0TEE4DMV7mKJOq8/WycZpjNU HWe+YTgjVysHPfCrdJAFSv2oj8J1LuCVx3ppNgSWintVDfYP3X8SnWoEDpD8BYHweH7BVx 1/d90puW82wgta+zaeIk99XNGOZ1XCHJKDoB0pZr8ecuNk48Og+B9iqqfxFVypcxg8rePi v6a2U/9wVaEqK3r0Efy5CVvF+jkMBgvrJ/hBXHRO4bUCt4zEn7zPEHvJXY9Bng== 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 4V2LWr4qTlzFq1; Sun, 24 Mar 2024 03:04:40 +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 42O34e45038492; Sun, 24 Mar 2024 03:04:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34eAK038489; Sun, 24 Mar 2024 03:04:40 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:40 GMT Message-Id: <202403240304.42O34eAK038489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: b09b120818a8 - stable/14 - vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b09b120818a81b83a3e3201b4c301335d0c48fac Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=b09b120818a81b83a3e3201b4c301335d0c48fac commit b09b120818a81b83a3e3201b4c301335d0c48fac Author: Jason A. Harmening AuthorDate: 2024-02-23 17:31:08 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:37 +0000 vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL It's a bit strange to require the caller to pass contrived lock flags if the corresponding vnode is NULL, simply to appease the assertion that exactly one of LK_SHARED or LK_EXCLUSIVE must be set. On the other hand, we still want to catch cases in which completely bogus or corrupt flags are passed even if the corresponding vnode is NULL. Therefore, specifically allow empty flags for lkflags1/lkflags2 iff the respective vp1/vp2 param is NULL. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44046 (cherry picked from commit fa26f46dc29f5ee1ac8e7b10fc12aa1f93cce702) --- sys/kern/vfs_vnops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 62339387d7d0..a16e137755b1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -4103,9 +4103,11 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error, locked1; - MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)) || + (vp1 == NULL && lkflags1 == 0)); MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); - MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)) || + (vp2 == NULL && lkflags2 == 0)); MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) From nobody Sun Mar 24 03:04:41 2024 X-Original-To: dev-commits-src-all@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 4V2LWs6FVnz5DmX7; Sun, 24 Mar 2024 03:04:41 +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 4V2LWs5zqMz4tDN; Sun, 24 Mar 2024 03:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249481; 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=efjxvOF6MmowthPie+Hoijca+kIdqz7Qfk4VpbbZINc=; b=nurZvyTHYERLd1BCmQDA3dbJh9V4VI24X6YjJLAP0SOolYIPVVXglVFfCi4eKmEUAhEr52 JD/tAU8KQWFRY/nYTSetQs/trc/v08MP+HX+qkue2JjuvbTqjq5+DMWd7VvpeSPJ0h2+Ok LyLqqv0qJtvMy7irm8cdmlQF10QymZPVyO9sPtqFObbXMRTjBZ2JxUZAf/VkAPtQ0/Q6XT SSUqnCc0lZXBsnFjRWQ0jlGbCPY1utD+7daz1YKVrzqiYsqAcK9L/LZ6ObB0q5XCV22Iqy 5OFI+nwixlLbvjiaU5LfVwMmkQ4ofrARr20CF123jYBnEAhpT8CsMZqfRbTfCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249481; a=rsa-sha256; cv=none; b=RUX2g7uCtNsXGAr3dwDuLs3hEMMVDdQ8s4Al0v0/ZwHyG7j5QeNov87N9iH68EPTTC/fkB pyDAFonCkuSK3Dl9lWhxzt8lAsaU7UqCBwoXyaB3Kzg4iuntxMPqAbRPR5zyx2kQJNBP28 2OK7OfvFVFkcgyOu+BArSRhqQiJol4M/dgs0wjbIMic6c9pMkI8U2TJ9BRcK0CCdBlY2DA wEsuCq257i3bnTiLGPgK8c/K9sT5vGpQLTsEsq8rLZtUN/F4n+a+86BE5EhQAVEbUfS2dV rUyUeGf63hrz+ue2QtGP9vh7UJ/24wFmIqD/fszc3EU5Wnos/LLSkPE/4luPXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249481; 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=efjxvOF6MmowthPie+Hoijca+kIdqz7Qfk4VpbbZINc=; b=bPXb5/vKcRKCBwfJEHrjGu7K8/blIKCkpbBOKEMwqQtdcT9rcXRn/hYQSDAs/AyCtadwyb p33f9/gzMIV5SBf6IPhfek/4Uo5594v+EQ5A59HVst00RCbdutzkBsx51m4vNpLox7XzaI j5ZYEvJNG9UM/k/TznnNsgieRLNAB6loOBpFI0sKyFekF6cmszF1/JISFwTsOr17UKxDUv bxmmD/TqhlH9nAosDtPZL19hsPKnBpCnmPO12ogwS8wl5Oe007KwXUGuqvbBS9Xjt/tHUa uatcrrd0lHv6wihTj03E+PjkMOdC/xT7XBMyhgSjbrFvFg9sO4Q3zxif9+4Mmg== 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 4V2LWs5bWPzFhG; Sun, 24 Mar 2024 03:04:41 +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 42O34f0G038547; Sun, 24 Mar 2024 03:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34fkq038544; Sun, 24 Mar 2024 03:04:41 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:41 GMT Message-Id: <202403240304.42O34fkq038544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 6d118b958612 - stable/14 - unionfs: accommodate underlying FS calls that may re-lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6d118b95861220fdbbe82e933429091f7c0501eb Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=6d118b95861220fdbbe82e933429091f7c0501eb commit 6d118b95861220fdbbe82e933429091f7c0501eb Author: Jason A. Harmening AuthorDate: 2024-01-02 21:22:24 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:37 +0000 unionfs: accommodate underlying FS calls that may re-lock Since non-doomed unionfs vnodes always share their primary lock with either the lower or upper vnode, any forwarded call to the base FS which transiently drops that upper or lower vnode lock may result in the unionfs vnode becoming completely unlocked during that transient window. The unionfs vnode may then become doomed by a concurrent forced unmount, which can lead to either or both of the following: --Complete loss of the unionfs lock: in the process of being doomed, the unionfs vnode switches back to the default vnode lock, so even if the base FS VOP reacquires the upper/lower vnode lock, that no longer translates into the unionfs vnode being relocked. This will then violate that caller's locking assumptions as well as various assertions that are enabled with DEBUG_VFS_LOCKS. --Complete less of reference on the upper/lower vnode: the caller normally holds a reference on the unionfs vnode, while the unionfs vnode in turn holds references on the upper/lower vnodes. But in the course of being doomed, the unionfs vnode will drop the latter set of references, which can effectively lead to the base FS VOP executing with no references at all on its vnode, violating the assumption that vnodes can't be recycled during these calls and (if lucky) violating various assertions in the base FS. Fix this by adding two new functions, unionfs_forward_vop_start_pair() and unionfs_forward_vop_finish_pair(), which are intended to bookend any forwarded VOP which may transiently unlock the relevant vnode(s). These functions are currently only applied to VOPs that modify file state (and require vnode reference and lock state to be identical at call entry and exit), as the common reason for transiently dropping locks is to update filesystem metadata. Reviewed by: olce Tested by: pho Differential Revision: https://reviews.freebsd.org/D44076 (cherry picked from commit 6c8ded001540fd969ebc2eabd45a0066ebcc662b) --- sys/fs/unionfs/union.h | 22 +++++- sys/fs/unionfs/union_subr.c | 179 ++++++++++++++++++++++++++++++++++++++++--- sys/fs/unionfs/union_vnops.c | 148 +++++++++++++++++++++++------------ 3 files changed, 289 insertions(+), 60 deletions(-) diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 6c7db47ff209..57a281e55ede 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -146,8 +146,8 @@ int unionfs_create_uppervattr(struct unionfs_mount *, struct vnode *, struct vattr *, struct ucred *, struct thread *); int unionfs_mkshadowdir(struct unionfs_mount *, struct vnode *, struct unionfs_node *, struct componentname *, struct thread *); -int unionfs_mkwhiteout(struct vnode *, struct componentname *, - struct thread *, char *, int); +int unionfs_mkwhiteout(struct vnode *, struct vnode *, + struct componentname *, struct thread *, char *, int); int unionfs_relookup(struct vnode *, struct vnode **, struct componentname *, struct componentname *, struct thread *, char *, int, u_long); @@ -157,6 +157,24 @@ int unionfs_relookup_for_delete(struct vnode *, struct componentname *, struct thread *); int unionfs_relookup_for_rename(struct vnode *, struct componentname *, struct thread *); +void unionfs_forward_vop_start_pair(struct vnode *, int *, + struct vnode *, int *); +bool unionfs_forward_vop_finish_pair(struct vnode *, struct vnode *, int, + struct vnode *, struct vnode *, int); + +static inline void +unionfs_forward_vop_start(struct vnode *basevp, int *lkflags) +{ + unionfs_forward_vop_start_pair(basevp, lkflags, NULL, NULL); +} + +static inline bool +unionfs_forward_vop_finish(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + return (unionfs_forward_vop_finish_pair(unionvp, basevp, lkflags, + NULL, NULL, 0)); +} #define UNIONFSVPTOLOWERVP(vp) (VTOUNIONFS(vp)->un_lowervp) #define UNIONFSVPTOUPPERVP(vp) (VTOUNIONFS(vp)->un_uppervp) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 469ba0775e7c..ae2d417758f0 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -938,14 +938,21 @@ unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *udvp, *pathend = pathterm; if (!error) { - unionfs_node_update(unp, uvp, td); - /* * XXX The bug which cannot set uid/gid was corrected. * Ignore errors. */ va.va_type = VNON; VOP_SETATTR(uvp, &va, nd.ni_cnd.cn_cred); + + /* + * VOP_SETATTR() may transiently drop uvp's lock, so it's + * important to call it before unionfs_node_update() transfers + * the unionfs vnode's lock from lvp to uvp; otherwise the + * unionfs vnode itself would be transiently unlocked and + * potentially doomed. + */ + unionfs_node_update(unp, uvp, td); } vn_finished_write(mp); @@ -957,28 +964,180 @@ unionfs_mkshadowdir_abort: return (error); } +static inline void +unionfs_forward_vop_ref(struct vnode *basevp, int *lkflags) +{ + ASSERT_VOP_LOCKED(basevp, __func__); + *lkflags = VOP_ISLOCKED(basevp); + vref(basevp); +} + +/* + * Prepare unionfs to issue a forwarded VOP to either the upper or lower + * FS. This should be used for any VOP which may drop the vnode lock; + * it is not required otherwise. + * The unionfs vnode shares its lock with the base-layer vnode(s); if the + * base FS must transiently drop its vnode lock, the unionfs vnode may + * effectively become unlocked. During that window, a concurrent forced + * unmount may doom the unionfs vnode, which leads to two significant + * issues: + * 1) Completion of, and return from, the unionfs VOP with the unionfs + * vnode completely unlocked. When the unionfs vnode becomes doomed + * it stops sharing its lock with the base vnode, so even if the + * forwarded VOP reacquires the base vnode lock the unionfs vnode + * lock will no longer be held. This can lead to violation of the + * caller's sychronization requirements as well as various failed + * locking assertions when DEBUG_VFS_LOCKS is enabled. + * 2) Loss of reference on the base vnode. The caller is expected to + * hold a v_usecount reference on the unionfs vnode, while the + * unionfs vnode holds a reference on the base-layer vnode(s). But + * these references are released when the unionfs vnode becomes + * doomed, violating the base layer's expectation that its caller + * must hold a reference to prevent vnode recycling. + * + * basevp1 and basevp2 represent two base-layer vnodes which are + * expected to be locked when this function is called. basevp2 + * may be NULL, but if not NULL basevp1 and basevp2 should represent + * a parent directory and a filed linked to it, respectively. + * lkflags1 and lkflags2 are output parameters that will store the + * current lock status of basevp1 and basevp2, respectively. They + * are intended to be passed as the lkflags1 and lkflags2 parameters + * in the subsequent call to unionfs_forward_vop_finish_pair(). + * lkflags2 may be NULL iff basevp2 is NULL. + */ +void +unionfs_forward_vop_start_pair(struct vnode *basevp1, int *lkflags1, + struct vnode *basevp2, int *lkflags2) +{ + /* + * Take an additional reference on the base-layer vnodes to + * avoid loss of reference if the unionfs vnodes are doomed. + */ + unionfs_forward_vop_ref(basevp1, lkflags1); + if (basevp2 != NULL) + unionfs_forward_vop_ref(basevp2, lkflags2); +} + +static inline bool +unionfs_forward_vop_rele(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + bool unionvp_doomed; + + if (__predict_false(VTOUNIONFS(unionvp) == NULL)) { + if ((lkflags & LK_EXCLUSIVE) != 0) + ASSERT_VOP_ELOCKED(basevp, __func__); + else + ASSERT_VOP_LOCKED(basevp, __func__); + unionvp_doomed = true; + } else { + vrele(basevp); + unionvp_doomed = false; + } + + return (unionvp_doomed); +} + + +/* + * Indicate completion of a forwarded VOP previously prepared by + * unionfs_forward_vop_start_pair(). + * basevp1 and basevp2 must be the same values passed to the prior + * call to unionfs_forward_vop_start_pair(). unionvp1 and unionvp2 + * must be the unionfs vnodes that were initially above basevp1 and + * basevp2, respectively. + * basevp1 and basevp2 (if not NULL) must be locked when this function + * is called, while unionvp1 and/or unionvp2 may be unlocked if either + * unionfs vnode has become doomed. + * lkflags1 and lkflag2 represent the locking flags that should be + * used to re-lock unionvp1 and unionvp2, respectively, if either + * vnode has become doomed. + * + * Returns true if any unionfs vnode was found to be doomed, false + * otherwise. + */ +bool +unionfs_forward_vop_finish_pair( + struct vnode *unionvp1, struct vnode *basevp1, int lkflags1, + struct vnode *unionvp2, struct vnode *basevp2, int lkflags2) +{ + bool vp1_doomed, vp2_doomed; + + /* + * If either vnode is found to have been doomed, set + * a flag indicating that it needs to be re-locked. + * Otherwise, simply drop the base-vnode reference that + * was taken in unionfs_forward_vop_start(). + */ + vp1_doomed = unionfs_forward_vop_rele(unionvp1, basevp1, lkflags1); + + if (unionvp2 != NULL) + vp2_doomed = unionfs_forward_vop_rele(unionvp2, basevp2, lkflags2); + else + vp2_doomed = false; + + /* + * If any of the unionfs vnodes need to be re-locked, that + * means the unionfs vnode's lock is now de-coupled from the + * corresponding base vnode. We therefore need to drop the + * base vnode lock (since nothing else will after this point), + * and also release the reference taken in + * unionfs_forward_vop_start_pair(). + */ + if (__predict_false(vp1_doomed && vp2_doomed)) + VOP_VPUT_PAIR(basevp1, &basevp2, true); + else if (__predict_false(vp1_doomed)) { + /* + * If basevp1 needs to be unlocked, then we may not + * be able to safely unlock it with basevp2 still locked, + * for the same reason that an ordinary VFS call would + * need to use VOP_VPUT_PAIR() here. We might be able + * to use VOP_VPUT_PAIR(..., false) here, but then we + * would need to deal with the possibility of basevp2 + * changing out from under us, which could result in + * either the unionfs vnode becoming doomed or its + * upper/lower vp no longer matching basevp2. Either + * scenario would require at least re-locking the unionfs + * vnode anyway. + */ + if (unionvp2 != NULL) { + VOP_UNLOCK(unionvp2); + vp2_doomed = true; + } + vput(basevp1); + } else if (__predict_false(vp2_doomed)) + vput(basevp2); + + if (__predict_false(vp1_doomed || vp2_doomed)) + vn_lock_pair(unionvp1, !vp1_doomed, lkflags1, + unionvp2, !vp2_doomed, lkflags2); + + return (vp1_doomed || vp2_doomed); +} + /* * Create a new whiteout. * - * dvp should be locked on entry and will be locked on return. + * udvp and dvp should be locked on entry and will be locked on return. */ int -unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, - struct thread *td, char *path, int pathlen) +unionfs_mkwhiteout(struct vnode *dvp, struct vnode *udvp, + struct componentname *cnp, struct thread *td, char *path, int pathlen) { struct vnode *wvp; struct nameidata nd; struct mount *mp; int error; + int lkflags; wvp = NULLVP; NDPREINIT(&nd); - if ((error = unionfs_relookup(dvp, &wvp, cnp, &nd.ni_cnd, td, path, + if ((error = unionfs_relookup(udvp, &wvp, cnp, &nd.ni_cnd, td, path, pathlen, CREATE))) { return (error); } if (wvp != NULLVP) { - if (dvp == wvp) + if (udvp == wvp) vrele(wvp); else vput(wvp); @@ -986,9 +1145,11 @@ unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, return (EEXIST); } - if ((error = vn_start_write(dvp, &mp, V_WAIT | V_PCATCH))) + if ((error = vn_start_write(udvp, &mp, V_WAIT | V_PCATCH))) goto unionfs_mkwhiteout_free_out; - error = VOP_WHITEOUT(dvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_start(udvp, &lkflags); + error = VOP_WHITEOUT(udvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_finish(dvp, udvp, lkflags); vn_finished_write(mp); diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 31d30ffb8971..d74d6736e580 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -371,21 +371,27 @@ unionfs_create(struct vop_create_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_CREATE(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_create_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_create_abort: UNIONFS_INTERNAL_DEBUG("unionfs_create: leave (%d)\n", error); return (error); @@ -409,11 +415,14 @@ unionfs_whiteout(struct vop_whiteout_args *ap) error = EOPNOTSUPP; if (udvp != NULLVP) { + int lkflags; switch (ap->a_flags) { case CREATE: case DELETE: case LOOKUP: + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_WHITEOUT(udvp, cnp, ap->a_flags); + unionfs_forward_vop_finish(ap->a_dvp, udvp, lkflags); break; default: error = EINVAL; @@ -445,21 +454,27 @@ unionfs_mknod(struct vop_mknod_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_MKNOD(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_mknod_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_mknod_abort: UNIONFS_INTERNAL_DEBUG("unionfs_mknod: leave (%d)\n", error); return (error); @@ -892,8 +907,12 @@ unionfs_setattr(struct vop_setattr_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETATTR(uvp, vap, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setattr: leave (%d)\n", error); @@ -927,6 +946,7 @@ unionfs_write(struct vop_write_args *ap) struct unionfs_node *unp; struct vnode *tvp; int error; + int lkflags; /* UNIONFS_INTERNAL_DEBUG("unionfs_write: enter\n"); */ @@ -935,7 +955,9 @@ unionfs_write(struct vop_write_args *ap) unp = VTOUNIONFS(ap->a_vp); tvp = (unp->un_uppervp != NULLVP ? unp->un_uppervp : unp->un_lowervp); + unionfs_forward_vop_start(tvp, &lkflags); error = VOP_WRITE(tvp, ap->a_uio, ap->a_ioflag, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, tvp, lkflags); /* UNIONFS_INTERNAL_DEBUG("unionfs_write: leave (%d)\n", error); */ @@ -1001,6 +1023,7 @@ unionfs_fsync(struct vop_fsync_args *ap) struct unionfs_node_status *unsp; struct vnode *ovp; enum unionfs_lkupgrade lkstatus; + int error, lkflags; KASSERT_UNIONFS_VNODE(ap->a_vp); @@ -1019,7 +1042,11 @@ unionfs_fsync(struct vop_fsync_args *ap) if (ovp == NULLVP) return (EBADF); - return (VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td)); + unionfs_forward_vop_start(ovp, &lkflags); + error = VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + + return (error); } static int @@ -1048,6 +1075,7 @@ unionfs_remove(struct vop_remove_args *ap) udvp = dunp->un_uppervp; cnp = ap->a_cnp; td = curthread; + unp = NULL; if (ap->a_vp->v_op != &unionfs_vnodeops) { if (ap->a_vp->v_type != VSOCK) @@ -1097,12 +1125,17 @@ unionfs_remove(struct vop_remove_args *ap) * XXX: if the vnode type is VSOCK, it will create whiteout * after remove. */ + int udvp_lkflags, uvp_lkflags; if (ump == NULL || ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP) cnp->cn_flags |= DOWHITEOUT; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + ((unp == NULL) ? NULL : uvp), &uvp_lkflags); error = VOP_REMOVE(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ((unp == NULL) ? NULL : ap->a_vp), uvp, uvp_lkflags); } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, path, pathlen); + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, path, pathlen); UNIONFS_INTERNAL_DEBUG("unionfs_remove: leave (%d)\n", error); @@ -1158,8 +1191,14 @@ unionfs_link(struct vop_link_args *ap) if (needrelookup != 0) error = unionfs_relookup_for_create(ap->a_tdvp, cnp, td); - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_LINK(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_tdvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_link: leave (%d)\n", error); @@ -1415,7 +1454,6 @@ unionfs_mkdir(struct vop_mkdir_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { - vref(udvp); /* check opaque */ if (!(cnp->cn_flags & ISWHITEOUT)) { error = VOP_GETATTR(udvp, &va, cnp->cn_cred); @@ -1425,38 +1463,27 @@ unionfs_mkdir(struct vop_mkdir_args *ap) cnp->cn_flags |= ISWHITEOUT; } - if ((error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap)) == 0) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); + error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; + if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; - /* - * The underlying VOP_MKDIR() implementation may have - * temporarily dropped the parent directory vnode lock. - * Because the unionfs vnode ordinarily shares that - * lock, this may allow the unionfs vnode to be reclaimed - * and its lock field reset. In that case, the unionfs - * vnode is effectively no longer locked, and we must - * explicitly lock it before returning in order to meet - * the locking requirements of VOP_MKDIR(). - */ - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - error = ENOENT; - goto unionfs_mkdir_cleanup; - } error = unionfs_nodeget(dvp->v_mount, uvp, NULLVP, dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } unionfs_mkdir_cleanup: - - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - vput(udvp); - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); - } else if (udvp != NULLVP) - vrele(udvp); - UNIONFS_INTERNAL_DEBUG("unionfs_mkdir: leave (%d)\n", error); return (error); @@ -1523,10 +1550,16 @@ unionfs_rmdir(struct vop_rmdir_args *ap) */ if (error == 0 && VN_IS_DOOMED(uvp)) error = ENOENT; - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_RMDIR(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, unp->un_path, unp->un_pathlen); if (error == 0) { @@ -1560,15 +1593,24 @@ unionfs_symlink(struct vop_symlink_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); error = VOP_SYMLINK(udvp, &uvp, cnp, ap->a_vap, ap->a_target); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; error = unionfs_nodeget(ap->a_dvp->v_mount, uvp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } UNIONFS_INTERNAL_DEBUG("unionfs_symlink: leave (%d)\n", error); @@ -2277,8 +2319,12 @@ unionfs_setacl(struct vop_setacl_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETACL(uvp, ap->a_type, ap->a_aclp, ap->a_cred, td); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setacl: leave (%d)\n", error); @@ -2460,9 +2506,13 @@ unionfs_setextattr_reopen: ovp = uvp; } - if (ovp == uvp) + if (ovp == uvp) { + int lkflags; + unionfs_forward_vop_start(ovp, &lkflags); error = VOP_SETEXTATTR(ovp, ap->a_attrnamespace, ap->a_name, ap->a_uio, cred, td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + } unionfs_setextattr_abort: UNIONFS_INTERNAL_DEBUG("unionfs_setextattr: leave (%d)\n", error); From nobody Sun Mar 24 03:04:42 2024 X-Original-To: dev-commits-src-all@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 4V2LWv29Myz5Dmxt; Sun, 24 Mar 2024 03:04:43 +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 4V2LWt721nz4tN1; Sun, 24 Mar 2024 03:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249483; 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=J7gF6a0lPs3v1J4uAlJWQ7dytUBjiNj7DvWGMEJL1Xo=; b=Vs+Xo0R3NufQCOagjLB73CDz/yjN+6d/JGQ5hqQpC11cooABypfC0r60EvQmYLkDybhxgB ZDTgFG0fzqD8sPvAZyICnxgXAGB1Cv2UX1fS+YM0rik4tQJmaoA1TJRHhrN/czGkSsiQ2d RLDMfcyYIvIt/maS3zPq9Cc9RmM7YA9c9MKxNT1NsrPD2xuSfq7RnH6To3esn5l3p3i+xd 5DaOMNSGwQhHy9xdwrazJ+fmUdc3O5TOX11LAp1tZ+15cms9Af5zy4s1w9EUiEwWMnE8V+ NIpdd0+RfomwcoOs6QK52FibIu6rz2PH14ylyOLj4zU0ysWGK1UdwW4jwlhuZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711249483; a=rsa-sha256; cv=none; b=gSqAuW4dZbgbQN4xmCq8l7ztIKbPmTtnGuguLVnpdv8DsUC0qv8HNtswiby9K6GmENuw/N QT8TqV1myTvbiYI9EMLZR3UrlB5BT8yQD82KdLwksM0LdV5lHkmxsaqPdH3VQHMjZC8BDu zq+q8xe01q0SfYwWVuFmG/gB8/ZSdSmoEgMGAxhEK5xwmlr80cGr3jxVN26q5miUmh9gyY nEXm4JvGBJLdfMkBzENdyRPzkGNYmCouZOR0ZzRuRQsY+l6ZRVPV/NeGV7BEyYakvqZHVv 9bs+pcMgTQ3IWrYs2wqBUpRezZy7AjO4EfOwpi0hZ1W2ShdYVKU5YJS7tH9HaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711249483; 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=J7gF6a0lPs3v1J4uAlJWQ7dytUBjiNj7DvWGMEJL1Xo=; b=jkiEeh6UWhUdUL+WP0o7dTn/CaIObGazloaoOzbNEkLREhSuNzZPOJBNdOui9OymUyS7kG 4IlkpwzU3f4Hv/WnlM2Ow2onhYNpPhQmA8GwKjpk3cjZxiRbBOCG1SLbL/a+5vEqyAb5m/ USfV6yhO0zqOryL9ob6TvVuWKUpEowfgzb2qkXSejquLTKdRpxjMmXQ8wRzEz9Nonk4EvV hs4TeynISsCIVjXjS2X5ioIVnjPGMMkO6MLbIi4bC6WBRizZVaOSCbtgIiIV0Rjk7f5sL0 gMj0OFLjzVnReMFah1DkvO7r9NNXn0OVdy/GMR7CyZltyqfa8sEXbPEDZbTi9A== 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 4V2LWt6dWzzG3p; Sun, 24 Mar 2024 03:04: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 42O34gHC038604; Sun, 24 Mar 2024 03:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O34ge2038601; Sun, 24 Mar 2024 03:04:42 GMT (envelope-from git) Date: Sun, 24 Mar 2024 03:04:42 GMT Message-Id: <202403240304.42O34ge2038601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 61d9b0cb38bb - stable/14 - uipc_bindat(): Explicitly specify exclusive locking for the new vnode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 61d9b0cb38bb0b057929997c7eab689105bfdeb6 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=61d9b0cb38bb0b057929997c7eab689105bfdeb6 commit 61d9b0cb38bb0b057929997c7eab689105bfdeb6 Author: Jason A. Harmening AuthorDate: 2024-02-03 17:07:16 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-24 02:55:38 +0000 uipc_bindat(): Explicitly specify exclusive locking for the new vnode When calling VOP_CREATE(), uipc_bindat() reuses the componentname object from the preceding lookup operation, which is likely to specify LK_SHARED. Furthermore, the VOP_CREATE() interface technically only requires the newly-created vnode to be returned with a shared lock. However, the socket layer requires the new vnode to be locked exclusive and asserts to that effect. In most cases, this is not a practical concern because most if not all base-layer filesystems (certainly FFS, ZFS, and msdosfs at least) always return the vnode locked exclusive regardless of the lock flags. However, it is an issue for unionfs which uses cn_lkflags to determine how the new unionfs wrapper vnode should be locked. While it would be easy enough to work around this issue within unionfs itself, it seems better for the socket layer to be explicit about its locking requirements when issuing VOP_CREATE(). Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D44047 (cherry picked from commit d56c175ac9353bd701a488bb2606a3372623dcc5) --- sys/kern/uipc_usrreq.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 5d39e5ea91c1..e54cd01956bf 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -622,8 +622,19 @@ restart: error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif - if (error == 0) + if (error == 0) { + /* + * The prior lookup may have left LK_SHARED in cn_lkflags, + * and VOP_CREATE technically only requires the new vnode to + * be locked shared. Most filesystems will return the new vnode + * locked exclusive regardless, but we should explicitly + * specify that here since we require it and assert to that + * effect below. + */ + nd.ni_cnd.cn_lkflags = (nd.ni_cnd.cn_lkflags & ~LK_SHARED) | + LK_EXCLUSIVE; error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + } NDFREE_PNBUF(&nd); if (error) { VOP_VPUT_PAIR(nd.ni_dvp, NULL, true); From nobody Sun Mar 24 05:11:11 2024 X-Original-To: dev-commits-src-all@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 4V2PKr00ykz5F1rP; Sun, 24 Mar 2024 05:11: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 4V2PKq6FfYz45XC; Sun, 24 Mar 2024 05:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257071; 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=R8ajSzvVsiRmhqBjGkNNFxzYepcUrJF54COk1QOfMkM=; b=m+S1ePQ6l7cwnwlJXEQWMXwBpBmk+CbuHkZQRJ69oSQWL8vrvrctQDM8z0kW09pDdO/FOk R91HB0Mb5UFs3lwVpsAoJbML7WufJzp9mkBezE8lb64QD1gR9dWvLbV+/62DOCi6yMrViM 5XDIo95t0qB9Mjt5Yuuami26zBp77WXtvkHyOrb023bk18Y4NgMro45cEvpdPPg8fASoCx Oo2YPeL7BcgrTpvuSJbmqZaKl9IeXUuaF0eZdVSTjTrDc/5jUh7RSSopxzKv2kaXrsZ9xp Vvtfsov3CAasjv2BJLUNNPzjPRFpxKeqzbUGKJT/th+TvjC8hV4h3+LFdux7Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711257071; a=rsa-sha256; cv=none; b=kk1JE2D1+zZWfjk3z/0XvJDsFYYUtL8aFKicaHqZkhCKfi5yl83sF2FnTffTwEQIpa3mjO OoCfpZFXPDSusolZvn8VzNl/8dfGIOrg1fqQyO6+AIxuLOuADk1Ys3q5dKrv3HbUohPCnJ mMN3nqoyjIp6STzKtXa9kz3prOWDCnYRAra/KdpKrGIEaqKx6Hj1b59wF3u1n+/i0Dv7VS zBMdSuvMn+uZu8Np9twA8Ea4RwmDUBjZ/qBwg6D8x6hLKRNlnLaK8rnF2DimdGzEP4Sxuq FZYbHEqYmGikl1RbZfag1xoFzlKPBGsAcmxdqVML3SZcFLArUk9zKNGXGa1o2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257071; 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=R8ajSzvVsiRmhqBjGkNNFxzYepcUrJF54COk1QOfMkM=; b=wnF50+227te/cZ1mU/JfEDHaEbWrJnUGZIZellpn/9STjMKT0CtAN1j5LhC6FakeoY/sbh /4NSbIf0isjjCEougmlWHu4iIz42dWWFuM3Ely1b+jQagmHvJJ6cRCoqc9ckp34leF3OlB Trw266w/vE8I+j2OdWFe0L3ZTaXLYLp6FzNXjkreFVmLuqJo/il2vjCq4yNA8DSHz8qveE 6pYCEY1CyAMXFsRIJMZPwEsME7l8qQT+bUhuGGgDws/msimS26m/O1ogjH3PpJvch5STTU 6FUhaM/890TNh618PEAQp+Y5/vOBmRyEFV76SrpEXoPkjqORspFxIDSoP+69Pg== 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 4V2PKq5sYkzKCW; Sun, 24 Mar 2024 05:11: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 42O5BB98053567; Sun, 24 Mar 2024 05:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O5BBxG053564; Sun, 24 Mar 2024 05:11:11 GMT (envelope-from git) Date: Sun, 24 Mar 2024 05:11:11 GMT Message-Id: <202403240511.42O5BBxG053564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 8a56ef8d75b4 - main - mem.4: Correct the HISTORY section List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a56ef8d75b42ee7228247466c8c1712de6e3b6f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8a56ef8d75b42ee7228247466c8c1712de6e3b6f commit 8a56ef8d75b42ee7228247466c8c1712de6e3b6f Author: Gordon Bergling AuthorDate: 2024-03-24 05:10:39 +0000 Commit: Gordon Bergling CommitDate: 2024-03-24 05:10:39 +0000 mem.4: Correct the HISTORY section The history section (added in CSRG) claimed both first appeared in v6. Looking at the manuals in the TUHS archive, /dev/mem was in v1 and /dev/kmem was introduced in v5. Reviewed by: imp Obtained from: OpenBSD MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D44486 --- share/man/man4/mem.4 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4 index 8359fd1695e9..68969d281532 100644 --- a/share/man/man4/mem.4 +++ b/share/man/man4/mem.4 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 11, 2022 +.Dd March 24, 2024 .Dt MEM 4 .Os .Sh NAME @@ -298,11 +298,13 @@ privilege. .Xr memcontrol 8 .Sh HISTORY The -.Nm mem +.Pa /dev/mem +file appeared in +.At v1 and -.Nm kmem -files appeared in -.At v6 . +.Pa /dev/kmem +in +.At v5 . The ioctl interface for memory range attributes was added in .Fx 3.2 . .Sh BUGS From nobody Sun Mar 24 05:13:06 2024 X-Original-To: dev-commits-src-all@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 4V2PN302pkz5F1rn; Sun, 24 Mar 2024 05:13: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 4V2PN256J2z45wP; Sun, 24 Mar 2024 05:13:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257186; 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=Ul9GZ0LXkxW3h04xJfjQSu/v1qF6vCi1Rsn/rKdROko=; b=trXhkY4E0WnpuJ7nOnIzLwT1s68wftJnDXa343NukFXaJ3AhpGgjswGNfC7lSECPofGX46 HLDnaFO5sYz6KCKXr2dtH03DgkVbOjEOpwq5DplKMLw7cuni8zMAmC1/s5gRFf+mzmDf7p SeAjBo7BeUGbeuMLh+GReYmTVR2uQ5URM3TEcNHNbwDv48DJTUrv3/KFJhH0iGFADpGyt2 0PPIdcJyuAeTNcL0yGB3/hrnKz8KzxqNjKFlTcrOgeQqsPD6DxEMq8KkV/2joQFACQ9n41 qxV0l5Q7WRXMUT6Uc+cDSS9pYTI1zsiIBqgd5RwjXiF5k+q8sFYk+HdPhMqIkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711257186; a=rsa-sha256; cv=none; b=eBbwKvnkIfPqpkVDBvUbfrSN5guGdH2+QMy0Jma9+AGiT7z7zzq/TWyKEX5PN/nY9/YSaT 5i2ZyH4Sfv8Usjmve6Saf2zgJA1v65j8uVMmf8yt7kePxGE8k+q1TB3knDvmuw6Pr52dGv rBUmRD42rOJEfoMS3BCYNT35CYCnLtQEUJ/jQEFsPzSDxVfsitPUN23IADDmnbGclF0Mdk X3LtdxznxS5w6/c6VzsUnZ+KCZqmxLeLYCraWbd4wiinG9UFPLW2s7MCeJzFPMweMPiYQD /WsTSx3NvBoM15YcCpqwwpNdgH9VXnlKoQzhQ3TcvE6f26h/t3PWsRPkakkzFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257186; 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=Ul9GZ0LXkxW3h04xJfjQSu/v1qF6vCi1Rsn/rKdROko=; b=hOb9ye8zo/v/lgLocT2P1TO57gzSxdgRRD4FiRdqP6/LBFeAtrVMFjF1P7DuCwYswof+4Z xBRc8fW5NyzcTFNdTih0H3/3niiUvKer1TGFqmuUnGJkdynZghWYpYPogp7j9EaYnqPBgP DMEx1hTiRNdm078jcNZSt0eV2sYUxCrCGMImQxnSvNxuDDyCIy31hIkIH1Uv+KbTEb8chr KuUeN6jbw1Tphi8WS2e0Xw0c5TZHZzCeEqLi/YFgqMe0GXrVMMZH5mSc0QngQHUHaj/EKO 5vu+eDruYduX2hFtPWGQFdNJGGNRxfE1uTDSdupupEUHw+6bn1iim3Rkk2EFcQ== 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 4V2PN24kLfzJyf; Sun, 24 Mar 2024 05:13: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 42O5D64S058095; Sun, 24 Mar 2024 05:13:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O5D601058092; Sun, 24 Mar 2024 05:13:06 GMT (envelope-from git) Date: Sun, 24 Mar 2024 05:13:06 GMT Message-Id: <202403240513.42O5D601058092@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e87a6f886046 - stable/14 - wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: e87a6f8860463c71773c5a02f9824d940a27d2d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e87a6f8860463c71773c5a02f9824d940a27d2d7 commit e87a6f8860463c71773c5a02f9824d940a27d2d7 Author: Konstantin Belousov AuthorDate: 2024-03-21 08:38:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-24 05:12:39 +0000 wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() PR: 277855 (cherry picked from commit 69d5783ae81b74295118950d01b6dddb3e504a56) --- lib/libc/string/wmemchr.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3 index 4466a7e9b1b4..ebb0881dac16 100644 --- a/lib/libc/string/wmemchr.3 +++ b/lib/libc/string/wmemchr.3 @@ -33,7 +33,7 @@ .\" .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 .\" -.Dd July 14, 2021 +.Dd March 21, 2024 .Dt WMEMCHR 3 .Os .Sh NAME @@ -82,9 +82,9 @@ .Ft wchar_t * .Fn wmemset "wchar_t *s" "wchar_t c" "size_t n" .Ft wchar_t * -.Fn wcpcpy "wchar_t *s1" "wchar_t *s2" +.Fn wcpcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" .Ft wchar_t * -.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n" +.Fn wcpncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n" .Ft int .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2" .Ft wchar_t * From nobody Sun Mar 24 05:13:41 2024 X-Original-To: dev-commits-src-all@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 4V2PNj4vZhz5F1dx; Sun, 24 Mar 2024 05:13:41 +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 4V2PNj3tttz467M; Sun, 24 Mar 2024 05:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257221; 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=6nUiQHY8gX+AzCsuaAvW/C+OWtm0iY75W6M9iIfx9qY=; b=aRl7wSz47+RyWSAugJJM/DzEQ2xDsfmNf7P8OnB1hzeckq6V71RukTvjWccmpUPMyAiJCh c2obf9K+RnePE02+b41B06IZSd2vbL4JSZZKGOe7yqMpcZizc8/UHJIfuYxZBRCgbgr1+O W0oJNjKwA1PJlT/8Q8fKHU3fWXDd8MYrH5ieOO05ZpQ7O0/AeYqbjTmTRE+KzTYdQR1FCw 2IEtYQbOz4kRC6Lndiblqrs0HBQg+L7Ychh1w4bN7BHIL3XjFc2kWsOWZnNofZyCKn7kS1 MsCAT1HlM8PVQq/UxIXPFx2p7Ah4wTkAtXccyi51cyWJltTh5JKrXzPCIn/1/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711257221; a=rsa-sha256; cv=none; b=vR8DWv6PgxMrvLPtq9Usig0THLmxQcpBou9MF6bLTBXiJ4nD4rvJIseliL4eOUb2PaZzhj 2JN4XV+pWKFtVt7iPVzJaahbCrWTjvTG1w35bmdJ4VzncMPFdjTDDvpKVyrze7Wwjg5Zs6 nksyh5NUZ6CKGQ8vjFdM3bV2pidIrpvLXx1xBdA8Dhcq5rQBCuqOEhFNcsupUzqgHP772z wA919n4avxOH98Dl2cKIBs3fFAXrNpJ0d4v3mRAS3eZOrQjxbIjddpre7fzuP68MKJk0IT XWd97pf+9QtoHCJQ96byxv6OPBRTHAh964TESKLvOYD4f0N2XbMW74KkELRHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711257221; 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=6nUiQHY8gX+AzCsuaAvW/C+OWtm0iY75W6M9iIfx9qY=; b=L7kLccWOWxw/4UiatfGsvd0aQXWkBfPIfnRjosngduLnB1czjmp4l66ZjrgRU7uc2vuQ9J d4RMZJccI34pmdLQ92FGS6JMK6aimC+cgrEwkWzY3J3BnhZy7p5cIbMx3c0J3MIbV7ISK/ 61iGGLxwpAqjqMquU8qbr2bsOPbo2bR2rUqyhgiI0JUt30G1Gno6s1Moy5ZgpZrOil5GdH R2RIa1TtJMIv+7QfaVWZ+0AwK4EpO6NocNcI9hzICACLsZpfOrMP0mKEZtFOZaoAeIHdoS 0BCRhQVbjk0o6HLYiJ0OUjVc8vLkk/lWdnvZ05RclghKVe6r1ILLYwzabZt0rA== 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 4V2PNj3TjkzJY5; Sun, 24 Mar 2024 05:13:41 +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 42O5DffY058293; Sun, 24 Mar 2024 05:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42O5DfO1058290; Sun, 24 Mar 2024 05:13:41 GMT (envelope-from git) Date: Sun, 24 Mar 2024 05:13:41 GMT Message-Id: <202403240513.42O5DfO1058290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ed995c67e059 - stable/13 - wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: ed995c67e0596edf30c21a402ed9678a6c86478f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed995c67e0596edf30c21a402ed9678a6c86478f commit ed995c67e0596edf30c21a402ed9678a6c86478f Author: Konstantin Belousov AuthorDate: 2024-03-21 08:38:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-24 05:13:20 +0000 wmemchr(3): fix prototypes for wcpcpy() and wcpncpy() PR: 277855 (cherry picked from commit 69d5783ae81b74295118950d01b6dddb3e504a56) --- lib/libc/string/wmemchr.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3 index 4466a7e9b1b4..ebb0881dac16 100644 --- a/lib/libc/string/wmemchr.3 +++ b/lib/libc/string/wmemchr.3 @@ -33,7 +33,7 @@ .\" .\" from: @(#)strcpy.3 8.1 (Berkeley) 6/4/93 .\" -.Dd July 14, 2021 +.Dd March 21, 2024 .Dt WMEMCHR 3 .Os .Sh NAME @@ -82,9 +82,9 @@ .Ft wchar_t * .Fn wmemset "wchar_t *s" "wchar_t c" "size_t n" .Ft wchar_t * -.Fn wcpcpy "wchar_t *s1" "wchar_t *s2" +.Fn wcpcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" .Ft wchar_t * -.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n" +.Fn wcpncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n" .Ft int .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2" .Ft wchar_t * From nobody Sun Mar 24 15:32:00 2024 X-Original-To: dev-commits-src-all@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 4V2g694Q1Lz5FvZ3; Sun, 24 Mar 2024 15:32: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 4V2g686V12z4B85; Sun, 24 Mar 2024 15:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711294320; 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=byG3xIXCdLmMi/HwR6ZuLSKZ2f6SOmVxFRUW7L2cKW0=; b=C4W+mmXWdYhCwwiAhPjuopm+sFrh3FdKm9K1Jmi6MsqfDf5LLUYu/QXgbid81gIlFajuGP p4xcLc4R6zzvkOnD4LEdy7Hcu1AGWlQ1hgATEMe9YfPbziO68dmeWiq4PgxBDYxEqlEw85 6nB1fSuJK2zDoGOdd1Vmnj/ud3OhTTz3VW52cQ1dkNqiGfqBDv2mafGqtxXawYiIP8ldDu 4w3jZcQtZlU/g3frrjExfUr42fXt9F3pb7uOQdp8zzyqZoFgNH7CzYFVYT8rwSMjDZL5gG eOLNrjGj6V5ysZ7AIkvsHjj8iL+RpGasfIt4T7jhcjHQA3OW1ghbACFDEeXxeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711294320; a=rsa-sha256; cv=none; b=r0mID6/A/eXUnb8d3jWVWhn3tpa6ljNDmWBVgJbPewJ5Dh3bKy0oZj46rJx5C1zOP+4Wrn ES1VV/ZZkhdL681/W7H1Oiy+eVRtDb1HO9MFN4KFLI2oEm6OEsz0ZI8VHkoOmUT1bG3Qtp NFiCZFn4ABWH9cHmqfkdTIf9DP/q3Njn4K0cTpGpO9ySF5GcYtpGWfqwsfAM0sZqbHxjY4 vgUJtE5BJ0bUmwtyCOD/z+rFKuywCmkLxeIF8Y5IKT7Vz1FN5kDbWvdAZqbgeQ7v6Dl05e 8VKEiM47sO1LYlak4Vmo1lGf5yAV2T3+0WK+QOPNHVqfN1fsG6LOGcX8o+lgeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711294320; 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=byG3xIXCdLmMi/HwR6ZuLSKZ2f6SOmVxFRUW7L2cKW0=; b=ddrbCAVakiyYhsbR5BS4LwVNNKjfcWoYJzHGaLv94084Yhhn/k4BVYvmnSx5toZ6hx06/i ygScPsoOLZp/KDqrlKM97RP0s4PyDSwbaro9e9tVgflmYhg8K7SODlVtGL2dg/ET/HJjx6 6eWF5jUJ+bs5FhyrxUVl/crlr+OGfwCkxs42AU1tgaOvtxg6oD4pNAOPewW3IxOl2Gvbz3 Vb/KP+3r0BcDogpcAjG+Rqcp0oFpq9ZC86SQ0x+/tlOilhVO4Cs8kkw1KT3W0Ep8BIjC3K 5QNr/ieMZdQjDV2wtpo42Hm7A8nAgMsa76cbr5Muy/cvs/GlLxE7Jo9CZ/lj8A== 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 4V2g685Q4BzdHT; Sun, 24 Mar 2024 15:32: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 42OFW0aG007985; Sun, 24 Mar 2024 15:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OFW06M007982; Sun, 24 Mar 2024 15:32:00 GMT (envelope-from git) Date: Sun, 24 Mar 2024 15:32:00 GMT Message-Id: <202403241532.42OFW06M007982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 579cb41b132f - main - acpi_hpet: Make use of enum for vm_guest to improve readability List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 579cb41b132f532bf4915121c0d0b2f43688242e Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=579cb41b132f532bf4915121c0d0b2f43688242e commit 579cb41b132f532bf4915121c0d0b2f43688242e Author: Zhenlei Huang AuthorDate: 2024-03-24 15:31:22 +0000 Commit: Zhenlei Huang CommitDate: 2024-03-24 15:31:22 +0000 acpi_hpet: Make use of enum for vm_guest to improve readability No functional change intended. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44402 --- sys/dev/acpica/acpi_hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index de75e70a2d49..9a1abe6ca72d 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -643,7 +643,7 @@ hpet_attach(device_t dev) * The only way to use HPET there is to specify IRQs manually * and/or use legacy_route. Legacy_route mode works on both. */ - if (vm_guest) + if (vm_guest != VM_GUEST_NO) sc->allowed_irqs = 0x00000000; /* Let user override. */ resource_int_value(device_get_name(dev), device_get_unit(dev), From nobody Sun Mar 24 16:19:26 2024 X-Original-To: dev-commits-src-all@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 4V2h8v07WGz5G08m; Sun, 24 Mar 2024 16:19: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 4V2h8t6kTKz4FqN; Sun, 24 Mar 2024 16:19:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297166; 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=JpUbkcG+fEKVGJ7k8e5qXkS60Q6pV1GZ76JlTNYuheM=; b=vs9bbG0F9GbV+1r2Amy+5BH08158B1ObUek7yVK5DAjZXefCOjgFxH1+j3smYHljdLJYec CrnCBDOuC4TMMkkwl//FuhgvfYLILm80u2pEv8Osf+5jVFdBua0JP3Ksc00Z7ChnYMeIv0 aKfDDlypIDMbK6G8LvnwP8tVRYhb8zf0IBih1mVFWaKiY+ncutJVwN3Ql0YOqWiyAP8zdM zMCI+MrfvYqi7qdo5F3WspnvTpbLW9V/n1/eSX1PTxk/Da7g4z0ypp/ZF2YWZdb/T+sklB G71lo34VskjdbVZFdl16zWMsh8mSu0tfMeV20PrhGdCYSv5bPB3UY0dqdekWMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297166; a=rsa-sha256; cv=none; b=KfdSDEp5bQiE9BIcqERRrKD+uXaQx60OQMrxrbiaqmk4EdvGCyD9PB3lOmwGsZMhdYWCGh PpWbmtCE+Jg2y0+vwLHvdD5FNHEKJXq7+aJLcBnf2USYDpMIqv99q1pT+wNQ/ZxpgcNuwM V+zbvoMvmr3KvH29Tykb2zzD7cwIw3enf9MWzTc2066fEsqh+59+xrKqgg18u/rUPV7LbA mE7uQYdtFHGN7mOpF0TGcuEnS6cWnrckcJwO9WcLhPRduu/qXa8alPxYyXL+Uk5tbze+J0 TOHw4pzl0c7FWUauuD+lMY+5pYd3Tl4q9sYhOPBeZxoa8yYfy7X8aDf1Nu/Rpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297166; 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=JpUbkcG+fEKVGJ7k8e5qXkS60Q6pV1GZ76JlTNYuheM=; b=Kdrzmdx9Y+7fmq6QXeUXYKFquMfRvkQJFsEYtzKecd8G0Q0wSKD7k59XvBsyctExI1gqCh ze6lB6buZjWIBCI/u45n4k/ZrDfnhCSBkwlcLTLTRnkMUbRsxDcLglo9PbmaH6JhgIsRCY xZYnMIBrLX7rjOhO8Wp6bbXBonn0EMii3ctGZxdoSHXdMkBSImU5sYUcwy6U4rCU1lkesM BxfSFdJ9ja5NXFe7jMmT8V/l3K1GKLLW4UFIU8O90r38BWzXMZntsa4IJt3eZ+zi88MY4L tO3iNNxX4njM+p5tQekwnkSjVJrTJLpM0NcQjp5RZrx1vNqSxVr2BAYIAknAdA== 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 4V2h8t6LBkzfVJ; Sun, 24 Mar 2024 16:19: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 42OGJQfQ079306; Sun, 24 Mar 2024 16:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJQ6l079303; Sun, 24 Mar 2024 16:19:26 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:26 GMT Message-Id: <202403241619.42OGJQ6l079303@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: 7142ab479066 - main - icmp: do not store per-VNET identical array of strings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 7142ab4790666022a2a3d85910e9cd8e241d9b87 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=7142ab4790666022a2a3d85910e9cd8e241d9b87 commit 7142ab4790666022a2a3d85910e9cd8e241d9b87 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp: do not store per-VNET identical array of strings We need per-VNET struct counter_rate, but we don't need per-VNET set of const char *. Also, identical word "response" can go into the format string instead of being stored 7 times. Reviewed by: kp, zlei, tuexen Differential Revision: https://reviews.freebsd.org/D44475 --- sys/netinet/ip_icmp.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 3da86efa6e72..c2aa1ded3266 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1091,28 +1091,26 @@ ip_next_mtu(int mtu, int dir) * the 'final' error, but it doesn't make sense to solve the printing * delay with more complex code. */ -struct icmp_rate { - const char *descr; - struct counter_rate cr; -}; -VNET_DEFINE_STATIC(struct icmp_rate, icmp_rates[BANDLIM_MAX]) = { - { "icmp unreach response" }, - { "icmp ping response" }, - { "icmp tstamp response" }, - { "closed port RST response" }, - { "open port RST response" }, - { "icmp6 unreach response" }, - { "sctp ootb response" } -}; +VNET_DEFINE_STATIC(struct counter_rate, icmp_rates[BANDLIM_MAX]); #define V_icmp_rates VNET(icmp_rates) +static const char *icmp_rate_descrs[BANDLIM_MAX] = { + [BANDLIM_ICMP_UNREACH] = "icmp unreach", + [BANDLIM_ICMP_ECHO] = "icmp ping", + [BANDLIM_ICMP_TSTAMP] = "icmp tstamp", + [BANDLIM_RST_CLOSEDPORT] = "closed port RST", + [BANDLIM_RST_OPENPORT] = "open port RST", + [BANDLIM_ICMP6_UNREACH] = "icmp6 unreach", + [BANDLIM_SCTP_OOTB] = "sctp ootb", +}; + static void icmp_bandlimit_init(void) { for (int i = 0; i < BANDLIM_MAX; i++) { - V_icmp_rates[i].cr.cr_rate = counter_u64_alloc(M_WAITOK); - V_icmp_rates[i].cr.cr_ticks = ticks; + V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp_rates[i].cr_ticks = ticks; } } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, @@ -1123,7 +1121,7 @@ icmp_bandlimit_uninit(void) { for (int i = 0; i < BANDLIM_MAX; i++) - counter_u64_free(V_icmp_rates[i].cr.cr_rate); + counter_u64_free(V_icmp_rates[i].cr_rate); } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); @@ -1142,7 +1140,7 @@ badport_bandlim(int which) if ((V_icmplim + V_icmplim_curr_jitter) <= 0) V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which].cr, V_icmplim + + pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { /* @@ -1160,8 +1158,9 @@ badport_bandlim(int which) if (pps == -1) return (-1); if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, "Limiting %s from %jd to %d packets/sec\n", - V_icmp_rates[which].descr, (intmax_t )pps, V_icmplim + + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); return (0); } From nobody Sun Mar 24 16:19:27 2024 X-Original-To: dev-commits-src-all@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 4V2h8w0y8Cz5G0SY; Sun, 24 Mar 2024 16:19: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 4V2h8w0XpMz4Fsr; Sun, 24 Mar 2024 16:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297168; 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=Tmxd6jYP3JaBpORBEvhrBxhr+wjwsrBjFjwxBrbRjC0=; b=VZZb0f1p+uSr1tA3HO2H7nEA1SjybAgV2rfrnDyDeoej2XJh2cCsAJLdo0t6NMmr3EkHGS TPME/dJfnqhvIws6AbO5fqG+RGUogfBDuqBBQDZLqCII6WOuszv3QsC4JyOLuSmNie0ubU JhYnfS+gZWi9oW5Vj9fZNOlu4D9mFZKDeBWi5bsfQGJRS66REcER0z5UwD7sicvZShOKI7 l+77cSxFLTFPcjwqD6NXfuT/fUwpQPVR2MOxGIF5fw45jYfqwyaArubYPV3U5t4EwSeqnv SYMS7673YG9Cr+NsyfAG8oTjgXJURa2SSiNmPdQN1sU6EpLQi+i2htiFvjiotQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297168; a=rsa-sha256; cv=none; b=ASkifHWaXSPChfJdOWHQ+dZeYraohZdbrGtsKclPpGkIGCXyoVEV87n3w2QMTQLpEj45f2 3LpUYSiZfE1O43c/Uz53zz1Ac69TGqyz41vKwZKWY8V6VU+/pBVz1POpkQ3ho4iY6IQMWg JL7vVXWhbULvs9wTOyRh/o5PbNxZY5nWbe9Td+hBmFbiWCxv5q09U8jPf6C5eNfwyiCnU+ zo6lUMEgL4G5xgeBUhNDQBtDsAfRI0QtWEUqGKevx58tLx3MBOldUAPSGW1XRH2nplapHB HYBN+RrIM5LuvvrSBqOzaQ5cthUGa8mDPdJs23ILniWlXRmSd1khGp0SXzXAiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297168; 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=Tmxd6jYP3JaBpORBEvhrBxhr+wjwsrBjFjwxBrbRjC0=; b=FuCYdDgpLYXeU8a6wBMes4YawAG60CEoMpORmVR46vVCary7DlaASvb/vRUkbkF/EYgx5g hyUnDg+Vgsx9pocQur8bPzw+/lMvLhaBtPXUilHXazYkARPfmLu+crOoyBgi6Pwtsk5QOY 5W6uX+MNM5OaZ9fjY53vI+Tk2K9n1pHY04N4cziRXu7hw4o6fhS9Mwfazx8HXGVi7/b7OZ ldPaJGr/1geTAkMYbYkiU2lnPtMkt5sGHxaTOUNeJ7Mvlu768teGQQo2bzR3LyZlONClss o8tWXb4uZZK3r5cS65wXnumJfNGw2EiLjzVP8OLmqhfZ5XgKGM9nySlwrS29/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 4V2h8w07vrzg03; Sun, 24 Mar 2024 16:19: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 42OGJRdQ079348; Sun, 24 Mar 2024 16:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJReK079345; Sun, 24 Mar 2024 16:19:27 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:27 GMT Message-Id: <202403241619.42OGJReK079345@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: 9d7f17d7467e - main - icmp: hide icmp_bandlimit_uninit() under VIMAGE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9d7f17d7467ed8c9740730a8db7a82e4768e5177 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7f17d7467ed8c9740730a8db7a82e4768e5177 commit 9d7f17d7467ed8c9740730a8db7a82e4768e5177 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp: hide icmp_bandlimit_uninit() under VIMAGE The uninitialization may be executed only on a kernel with VIMAGE. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44476 --- sys/netinet/ip_icmp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index c2aa1ded3266..fd9342831e43 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1116,6 +1116,7 @@ icmp_bandlimit_init(void) VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); +#ifdef VIMAGE static void icmp_bandlimit_uninit(void) { @@ -1125,6 +1126,7 @@ icmp_bandlimit_uninit(void) } VNET_SYSUNINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, icmp_bandlimit_uninit, NULL); +#endif int badport_bandlim(int which) From nobody Sun Mar 24 16:19:29 2024 X-Original-To: dev-commits-src-all@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 4V2h8x46MPz5G0LJ; Sun, 24 Mar 2024 16:19:29 +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 4V2h8x1tLgz4Fn2; Sun, 24 Mar 2024 16:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297169; 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=j/dDAPSEucDltsEaEdcKLbQHa5X/WehYDn5zX18GdiI=; b=lBXzDCCwasJifeYzZWA4Jo0OJ4lIMlOCpUgnKa0GN9Hj+A6Ghz1EcaxxOTRnlz2YGDabvG YRtAU2nVpCb+bhA+RfXd3XF17jSP+5SRTQRwdWot3GOiKg1wht43M4j9A7DQyL+HLMh1Sq vUMGdUcQQ4Z+GxdaX/EbQwdzw3tGY9u+Vp6ksgXAmk8+edw4xb5nqPj2siokLq3g+Ja13j TDWy5WO2eq1axzPFuOmoV4yEM22eumpAFbddr/QV2A5ee0CxC0rpot+K0ajA94M4CCLWYY ea4YCa64dBniUkYNkD1u9vY5O9iLDoxSstxgBeKO+Nhzg+Y/vRmjOKg5pGv+AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297169; a=rsa-sha256; cv=none; b=IS/H7L2qIu2eRVwG7+gFhKJlXcy5WNs0AwVln4DEOVcJIFcQnwk7JCjdunb7QHB6Lk0KRD RmQ0z6DAJFH9G4HjCT7mW+zI4RaX8772rr09Zb0U2kvztyfgGcAVfn2C3bQJ1jOL24JJOE Yq15aTEyv5it9MZA52kzyuCiD53nVmYslTm2E0BafVMWSWz6XGr6SCkulb+UfkegXwnazn fRxZJzz0G9J/mNd3pM0deeEODWxJh/KWmOQIaf0sJ6WMz3kHATTn6fr+zGHu++xaWmw4BY ivGsOwi3qukC99PjbBYiGco2LH3RzGWASt6ggzKh6OdcLtnk7KFry5KTsyz1Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297169; 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=j/dDAPSEucDltsEaEdcKLbQHa5X/WehYDn5zX18GdiI=; b=boS6GS61GCNbJmVhTgxhviINpilZWLfyCzAQ1fjqXyGuJTocE++w36NUj4UCz3HO54GCn+ ANiUUmlRvicRnTUuO0yj5WENYMBld87q/2rtC71a/PJtL/6D64vXmgr/XO+n15OWlPYi7y Iaaqi5UJN58G7aFqHA1ZSGKGFsQaXj4PjjjapGG+PNpmGWk97i+8oTZHhHFiyEm7Mme/IQ 9idQ1gB2bBh9WCFwu7NBvkxLXaTM2aZYwibEuDjgYQdopU7ZXK5PneNbXgH6lZ2l95S7oT pqRhfh39XghkidVrumomPgv/sxurh/2C83ae2v7OWR4MVSljRv74WFeZ5KwAaA== 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 4V2h8x1C5xzfwM; Sun, 24 Mar 2024 16:19:29 +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 42OGJTmT079412; Sun, 24 Mar 2024 16:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJTDc079409; Sun, 24 Mar 2024 16:19:29 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:29 GMT Message-Id: <202403241619.42OGJTDc079409@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: b508545ce044 - main - icmp: when logging ICMP ratelimiting message use correct jitter value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b508545ce044dbfdd83da772e73f969a3713d59d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b508545ce044dbfdd83da772e73f969a3713d59d commit b508545ce044dbfdd83da772e73f969a3713d59d Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp: when logging ICMP ratelimiting message use correct jitter value The limiting of the very last second has been done using certain jitter value. We update the jitter for the next second. But the logging should report the jitter before the change. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44477 --- sys/netinet/ip_icmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index fd9342831e43..245e1c8040a4 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -1145,6 +1145,11 @@ badport_bandlim(int which) pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { + if (V_icmplim_output) + log(LOG_NOTICE, + "Limiting %s response from %jd to %d packets/sec\n", + icmp_rate_descrs[which], (intmax_t )pps, + V_icmplim + V_icmplim_curr_jitter); /* * Adjust limit +/- to jitter the measurement to deny a * side-channel port scan as in CVE-2020-25705 @@ -1159,10 +1164,5 @@ badport_bandlim(int which) } if (pps == -1) return (-1); - if (pps > 0 && V_icmplim_output) - log(LOG_NOTICE, - "Limiting %s response from %jd to %d packets/sec\n", - icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + - V_icmplim_curr_jitter); return (0); } From nobody Sun Mar 24 16:19:30 2024 X-Original-To: dev-commits-src-all@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 4V2h8y4Tqvz5G0JB; Sun, 24 Mar 2024 16:19: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 4V2h8y2XC1z4GFb; Sun, 24 Mar 2024 16:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297170; 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=M8ISP+AdZ1G83W+GxY+j+N7E4dte/lGe1iun2o2MoLw=; b=gLjXxH8viC3brnSTpcD0i2XflyObeNZfYUzd2MUf7pssaMYcYuHOiwTdAXJsC4fhcmd1m+ gHZGLgt/fnpnwn+Zy4nXyM8VjUPlt6LS1bWHSthueDM2UF0q0CE92vUWFn5v+Z/xed4e+W v+aAkZCb+4AWzTUBbv3SGR2Tr0pA7lTBNNafMD+RGqrLrqzKCmc+oPYVhbZ4Rwf8JylLlg 5EKNcwC74k97/ZAUH3SPV9RKL4YwP0WRGJWmJOLCmnGdO96BxT3H9BqahcK/GY08rvJOoh +vu0OPHQAjO3H3HxNgYPbkVFDFrv1bakOTDP8Jt8XuIcRb2GKHXs04QlUrOvdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297170; a=rsa-sha256; cv=none; b=RVl84mTpZ/jw26MHTgGk2OWtQ4UfqAOPOWSu0K2glZiceveVO0Virinw0Faol1H9wz2BOl m24UovAZNkekEUZ6SgQkG4Ubi8MCY1gx4A5m2tXLuIM6Zab55xoBA9i/vOr4yiArRPI6Ya 8CzxLxYPovS3JFZVPJxj3CwHoYoliPFt0O2bJoASErppXhoITwAD4L74wus46LhNeYhZu+ 1HAm+rmzMY7eGnic35JJ33tdaquXxu5MYJCfr7pLA7ktZu/Epz+xyG5+KeHo4yUkhXniVd 0Y0/49PImCCFxwxCpjl6XQwayfIHAdlpLhzYchiwlszXcxjB12VgSCPKE0xg4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297170; 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=M8ISP+AdZ1G83W+GxY+j+N7E4dte/lGe1iun2o2MoLw=; b=kcMtLvJ0zjKh8ay2zYCGUf4T6ST6e7medi89deSaF9pztCbz4mAjZg8zCg+jL6i5f4jdGO p2Eqxc/l+EnItZ/IVwFAk9o4W4Znz9MJ3KzyBd/rpMdb07sEd8r0tyYIhz5XyDjBzsokCj 88fWGLS46Fu/60KWmnwOSE/9NpvPe8exJoGSkZ61E8Jb/B13g1ALsr1hmmVurq8102skjj uhxsRTLKgdJxY/tq1giHsdvgH44zGGDjGQ4rcnLw6Qo+vPbq/utGBUV7Gn5M+1KeELaKis Iv730jnqOQtdpujDs8YL31VtMEYuI4xRMlaFiblKXUug+RPNYiuiw57RyeSHlw== 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 4V2h8y28F3zfwN; Sun, 24 Mar 2024 16:19: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 42OGJUGo079454; Sun, 24 Mar 2024 16:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJUuJ079451; Sun, 24 Mar 2024 16:19:30 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:30 GMT Message-Id: <202403241619.42OGJUuJ079451@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: ac44739fd834 - main - icmp: improve ICMP limit jitter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: ac44739fd834f51cacb26485a4140fd482e20150 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ac44739fd834f51cacb26485a4140fd482e20150 commit ac44739fd834f51cacb26485a4140fd482e20150 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp: improve ICMP limit jitter Instead of fixing up invalid values set by a user in badport_bandlim() which is a fast path function, provide a sysctl handler sysctl_icmplim_and_jitter(), that will check that jitter is less than the limit. Provide jitter initilization function icmplim_new_jitter() used at boot, in the sysctl handler and when we actually hit the limit. This also fixes no jitter on a fresh booted system until first limit hit. Instead of CVE number provide link the the actual paper that explains what and why we are doing here. The CVE number isn't very informative, it will just tell you what RedHat version you need to upgrade to. Reviewed by: kp, tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44478 --- sys/netinet/ip_icmp.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index 245e1c8040a4..acb707b1d192 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -80,19 +80,22 @@ extern ipproto_ctlinput_t *ip_ctlprotox[]; * routines to turnaround packets back to the originator, and * host table maintenance routines. */ -VNET_DEFINE_STATIC(int, icmplim) = 200; +static int sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmplim) = 200; #define V_icmplim VNET(icmplim) -SYSCTL_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim), 0, - "Maximum number of ICMP responses per second"); +SYSCTL_PROC(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim), 0, + &sysctl_icmplim_and_jitter, "IU", + "Maximum number of ICMP responses per second"); VNET_DEFINE_STATIC(int, icmplim_curr_jitter) = 0; #define V_icmplim_curr_jitter VNET(icmplim_curr_jitter) -VNET_DEFINE_STATIC(int, icmplim_jitter) = 16; +VNET_DEFINE_STATIC(u_int, icmplim_jitter) = 16; #define V_icmplim_jitter VNET(icmplim_jitter) -SYSCTL_INT(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmplim_jitter), 0, - "Random icmplim jitter adjustment limit"); +SYSCTL_PROC(_net_inet_icmp, OID_AUTO, icmplim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmplim_jitter), 0, + &sysctl_icmplim_and_jitter, "IU", + "Random icmplim jitter adjustment limit"); VNET_DEFINE_STATIC(int, icmplim_output) = 1; #define V_icmplim_output VNET(icmplim_output) @@ -1104,6 +1107,52 @@ static const char *icmp_rate_descrs[BANDLIM_MAX] = { [BANDLIM_SCTP_OOTB] = "sctp ootb", }; +static void +icmplim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmplim_jitter > 0) + V_icmplim_curr_jitter = + arc4random_uniform(V_icmplim_jitter * 2 + 1) - + V_icmplim_jitter; +} + +static int +sysctl_icmplim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmplim) || + oidp->oid_arg1 == &VNET_NAME(icmplim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmplim)); + new = lim ? V_icmplim : V_icmplim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmplim_jitter) + error = EINVAL; + else + V_icmplim = new; + } else { + if (new >= V_icmplim) + error = EINVAL; + else { + V_icmplim_jitter = new; + icmplim_new_jitter(); + } + } + } + MPASS(V_icmplim + V_icmplim_curr_jitter > 0); + + return (error); +} + static void icmp_bandlimit_init(void) { @@ -1112,6 +1161,7 @@ icmp_bandlimit_init(void) V_icmp_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); V_icmp_rates[i].cr_ticks = ticks; } + icmplim_new_jitter(); } VNET_SYSINIT(icmp_bandlimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, icmp_bandlimit_init, NULL); @@ -1139,9 +1189,6 @@ badport_bandlim(int which) KASSERT(which >= 0 && which < BANDLIM_MAX, ("%s: which %d", __func__, which)); - if ((V_icmplim + V_icmplim_curr_jitter) <= 0) - V_icmplim_curr_jitter = -V_icmplim + 1; - pps = counter_ratecheck(&V_icmp_rates[which], V_icmplim + V_icmplim_curr_jitter); if (pps > 0) { @@ -1150,17 +1197,7 @@ badport_bandlim(int which) "Limiting %s response from %jd to %d packets/sec\n", icmp_rate_descrs[which], (intmax_t )pps, V_icmplim + V_icmplim_curr_jitter); - /* - * Adjust limit +/- to jitter the measurement to deny a - * side-channel port scan as in CVE-2020-25705 - */ - if (V_icmplim_jitter > 0) { - int32_t inc = - arc4random_uniform(V_icmplim_jitter * 2 +1) - - V_icmplim_jitter; - - V_icmplim_curr_jitter = inc; - } + icmplim_new_jitter(); } if (pps == -1) return (-1); From nobody Sun Mar 24 16:19:31 2024 X-Original-To: dev-commits-src-all@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 4V2h8z4xsNz5G0Fn; Sun, 24 Mar 2024 16:19: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 4V2h8z3WbJz4G79; Sun, 24 Mar 2024 16:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297171; 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=RbnjxlEK5YSO+3c7+c+yZDeGuIrdkbVYgKz64NOMKTE=; b=HRtyIsl4XKK58nUzjh+fd+trmukamkWOP4lojny4O2pa8fx5zi6Nk66/Dm8+Lksv2DTjdS 2L0LU3Yi6b1xHAKPOoKAbXPPYo79BB6ImFpnpOKEr9W2btwI1D5/Dn6rGKI5nSRUUzoU6j 0kQOMQpsIQ+SmUEAyUndQHjEYhk2kGR3ArC4To/jCxGr+DdBABJsfcw4TJabNtoohkmU5t uJ8pkXibsfuLBbpBySKOWh2FyCr3J9ePRistgpqlptQ+Q9m29EqS74iErTB5MfcCULxFMA 0gHZyKl8jXqLQJQn564N/xKGgnXEc+nBVrTC26Emuq4q1z3WPKuG7jJdss3SCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297171; a=rsa-sha256; cv=none; b=AgZgNROIUhk1imKC1wZkUyU5ugZh2auYe40Wo+9d/3g4GNLxEcrpKuUY0W6jY2r3idRqt1 DFMazUYRgn0rS4t2ntLY4i/enyA11fPijNA03LpHFSAKW5WcNwyjHfNS0oR1j4G/goJcBV EnumIKuCQ4n0BD7gEXNyHteCpKJYEhvkfyUJqQ6viWnh96LzWfYX/hR21MYH02d5p0R0Dh yDQnyJO6BTvwmpxVjqjdzrm6yghtCSOD14GTmC/cHT486+i53Dfr3IY9KGeCbDkMYsnwKP 3EoABdgEhycYLwj78lCXjSml1KyjbeX2xr1kksLsm/Nt4CiGD1CTTEfVd2C1JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297171; 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=RbnjxlEK5YSO+3c7+c+yZDeGuIrdkbVYgKz64NOMKTE=; b=i+4XgPeTRmbXLgEZ2a0/idLxo4TIDfuqQ4uO+yGJvUGbHzl4lu+nH2wGfrjCq/HGqlEqe2 u+t0TydvNx9jN4fbz4qeGHaiiVVfF0CPBPCBLmwZ+cncPd+KXm4yZbZ5Ma72nJhhosYl41 sfTn24X9vAeScnXUtPXIvAgd/uX0zGApF2LYx6Ak5w97RMF8zeS7/4IPHNnNAAr0Za9Fqf u+RbibYe57GcxzdgXUjdTCO8tE9GpLnfZHcLHEYwqhW5zjKV8/ZyRlvCHVl1fFSqPRAd7/ szLW6TtovqGvaVMob9itzbvQOaxLydgs0jp6kU6P6wvCM9pmoyCl8rEncUzCUw== 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 4V2h8z35H6zfsr; Sun, 24 Mar 2024 16:19: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 42OGJVnr079508; Sun, 24 Mar 2024 16:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJVie079505; Sun, 24 Mar 2024 16:19:31 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:31 GMT Message-Id: <202403241619.42OGJVie079505@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: c6c96aaba8dd - main - icmp6: make icmp6_ratelimit() responsible to update the stats counter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c6c96aaba8dd74eb39469ed156ff19cc31d599b7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c96aaba8dd74eb39469ed156ff19cc31d599b7 commit c6c96aaba8dd74eb39469ed156ff19cc31d599b7 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp6: make icmp6_ratelimit() responsible to update the stats counter Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44479 --- sys/netinet6/icmp6.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 671fb91da4bf..260f5c7e2467 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -341,10 +341,8 @@ icmp6_error(struct mbuf *m, int type, int code, int param) } /* Finally, do rate limitation check. */ - if (icmp6_ratelimit(&oip6->ip6_src, type, code)) { - ICMP6STAT_INC(icp6s_toofreq); + if (icmp6_ratelimit(&oip6->ip6_src, type, code)) goto freeit; - } /* * OK, ICMP6 can be generated. @@ -2744,6 +2742,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; + ICMP6STAT_INC(icp6s_toofreq); } return ret; From nobody Sun Mar 24 16:19:32 2024 X-Original-To: dev-commits-src-all@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 4V2h906bbDz5G0Fq; Sun, 24 Mar 2024 16:19: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 4V2h904XS6z4GRC; Sun, 24 Mar 2024 16:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297172; 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=/qjdQ68XQTaQDsiQ8xRw7+51DQfTEwEjJJv47rYNl5c=; b=ojaG79F+lBAA4PLkZxXMvaU6zwuacZgklHtGEyHZSRddPWB0jEfWLlSiXVGoVVRe/fxGCq 5R2DicaEDiA4ZQBPBG1sOtmx48T73D1RPRSvXRlR3rTdoGdjWMoOerxSgCozmEJV+MrKiP MfbrO9/AdyN6OA9IxbZveDdoqWBg/0tCBLQdAfoQMsj4SphqrLmfEjUAa35c0MS1PsuCYD fvbarElHjw2XBf7vHzw93R/5gpUAML6q67YtuVyuMB4K0pLD1yZ7VrwQ8gV2shGeVLqGW7 4OvN74p4zDveDgqZqGAfIv6TCV8NpbGr8dpT5ERJ/89slcNqBe6IIYCppZx8ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297172; a=rsa-sha256; cv=none; b=lgFu+FSikCkXvsL107xujejHZ3tB8E6BzpEu/W+vVN9s6lYikqqpxOKOt+8+Bj4b20zipv Oj06ZgPTBOqh+e3RLv8eElLgcKEeEnHZ2F/i8MlVpZVmzTpMWEyjHEaK9L7QkP0wki3xv1 STp6ZCJmgdi2bZjDmTg4zl5Ham4Gw2fVJ3SZ85z23eu1uccbcHLmspdwnspQrHCH9Xy+Lu pMgigHQwvtt7IIL+ftpJdqwVjAZfJiymivKc+4ykmM99tpmJKZmKtdtrxwEzmpIR7vK0JJ V/xgHUXJK6dplFAVb5XTNlRwCzB/GtSERZUZCz6CNxSzaX3WqX2Gu07uj8i7eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297172; 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=/qjdQ68XQTaQDsiQ8xRw7+51DQfTEwEjJJv47rYNl5c=; b=ZeMhox7Es0Yo1Im239aevPK5qrCnvx5xZUo9zGkjQFlBnvjUEFVzkK12kxI3QYlovXGMGO xPcbiI3b7U0F8ZScDWf/EI6d4XbSgAqfwMai3SfZJDMDG768Xvnex5VtGSQ9zLoXnISa2p gEufD3cMgWiWjCfVVArD9DFbanCdC4KHthajO7HhizjQiywYuAg5H4DwkcBXNPe8W/FcxR a10MT8weBHP5YSn7+lVYFpLgWRafdnwZuxoe9r3VhM0bdGKrGtgd0Yjg6EYa+fPWbpQe3j sxLJkx8m6ZDAF3lPA/RdVyRGCDe5WyIqBVQcBPrtOOi4OzCN++mV6u1h+z+cxw== 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 4V2h9046Bbzf1w; Sun, 24 Mar 2024 16:19: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 42OGJWLf079558; Sun, 24 Mar 2024 16:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJWFQ079555; Sun, 24 Mar 2024 16:19:32 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:32 GMT Message-Id: <202403241619.42OGJWFQ079555@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: 32aeee8ce7e7 - main - icmp6: rate limit our echo replies List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 32aeee8ce7e72738fff236ccd5629d55035458f8 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=32aeee8ce7e72738fff236ccd5629d55035458f8 commit 32aeee8ce7e72738fff236ccd5629d55035458f8 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp6: rate limit our echo replies The generation of ICMP6_ECHO_REPLY bypasses icmp6_error(), thus rate limit was not applied. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44480 --- sys/netinet6/icmp6.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 260f5c7e2467..321622bcf7ef 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -546,6 +546,8 @@ icmp6_input(struct mbuf **mp, int *offp, int proto) icmp6_ifstat_inc(ifp, ifs6_in_echo); if (code != 0) goto badcode; + if (icmp6_ratelimit(&ip6->ip6_src, ICMP6_ECHO_REPLY, 0)) + break; if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) == NULL) { /* Give up remote */ break; From nobody Sun Mar 24 16:19:33 2024 X-Original-To: dev-commits-src-all@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 4V2h920F6Zz5G0Sj; Sun, 24 Mar 2024 16:19: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 4V2h91562Yz4GDS; Sun, 24 Mar 2024 16:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297173; 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=ECmI0zpfqW+pixBcqp7DP39JR3YZhnzVpqX0hsnXkDw=; b=wSgh7N5IxAFmFY8E6ffF4l2FqBIcD2E/V9qtnXUth4pTXeJuTbCdoYJLXSxsN8yoHDH4Js XTfi0aUgez7EQLD0KZFTUKpuzEUzslF0Yaq7eMKJq5K6jbx3xVCfCFvZ+eGX//4E0o1GcD oAsSohirG85pWv7lNJMb6u4RWaYmSz71m7FQK41KR0G43FojydrL9u/e0oAN8ZCpO1mN9+ Rticjj9JhGmrqOGmBl1op+7zXoT9aLOCy9YkJeYxgxSwbNlW7kP0xn9neh86EfIzQJDTeW atYszFPME3gVrflBTv21ufhpisxMkKsxjGGUhJhCquSnPYMFHVFKBfKiRqFr9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297173; a=rsa-sha256; cv=none; b=end8rXOP6jjjxtPLSMW14Qz2ATjTod7Jj743hMHQ4tkM37fjj3Hf8l64Iy8Y5S263eUI63 vLYJidBhrIA8wXmEdYql32Ullb+JBmQT1Wx0wtsKuL5LYOzyXF2fnJ2Ggls89NZVamwYFe HEfpyCcbtyKOAtaiW1k92dr2VYNlQi/n4puvFgPlEIYHFT00FXnV1pPvP+mCGeSn9EGkfT Y8y3w7B+87C3znNRNJXAxupwDI4I5nXdP+8Vsyj0henpuQOgTKCBHQhTahxL/cPPnxeWGh sy16j8TZmIRuFc0M/vQDar+TrOQK+vcn+EPOYDwWHVgZLXftlQAsK3qEBACepA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297173; 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=ECmI0zpfqW+pixBcqp7DP39JR3YZhnzVpqX0hsnXkDw=; b=Q8h0BCOS/XNW2bQnGqRCZENgxYIQMa+siyrp4fWco7XPgwepB0SwhJ0hLfFTLnqTZ9infA 0MB3PMM4BjMiN51owKYX09dYRi3WFZwZCv23u9IpXH8+OdJIiR6QbEQeraAdEqroWurHkp Baj6CpC6ILU+xp3YLCp+RR43HS7+U3hrzPQE3Q1MtLpbDp/V7EHh9ZvNd5fO4qAF+sl1oQ hucKfbF8PETaB3HpB6nrgX2K8cjZQMANpiIjbYlJ3mnppNbXB7hsvEQv3TP3z4fjsVVVCE i7ej8Sx6qs2pfIoIQt9lJtVYQaiIF0BAdcLXHCpt6+m9PEYY8A7+1X7frCgP6g== 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 4V2h914gQ5zfhC; Sun, 24 Mar 2024 16:19: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 42OGJX8k079621; Sun, 24 Mar 2024 16:19:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OGJXRJ079618; Sun, 24 Mar 2024 16:19:33 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:33 GMT Message-Id: <202403241619.42OGJXRJ079618@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: 4f96be33fe76 - main - icmp6: move ICMPv6 related tunables to the files where they are used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 4f96be33fe7676c69c5abb476bb09bba0c63a3f4 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4f96be33fe7676c69c5abb476bb09bba0c63a3f4 commit 4f96be33fe7676c69c5abb476bb09bba0c63a3f4 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp6: move ICMPv6 related tunables to the files where they are used Most of them can be declared as static after the move out of in6_proto.c. Keeping sysctl(9) declarations with their text descriptions next to the variable declaration create self-documenting code. There should be no functional changes. Differential Revision: https://reviews.freebsd.org/D44481 --- sys/netinet/icmp6.h | 10 +++----- sys/netinet6/icmp6.c | 34 +++++++++++++++++++++---- sys/netinet6/in6.c | 14 ++++++++++- sys/netinet6/in6_proto.c | 65 ------------------------------------------------ sys/netinet6/ip6_var.h | 5 ---- sys/netinet6/nd6.c | 44 ++++++++++++++++++++++---------- sys/netinet6/nd6.h | 14 ----------- sys/netinet6/nd6_nbr.c | 7 ++++++ sys/netinet6/nd6_rtr.c | 10 +++++--- 9 files changed, 91 insertions(+), 112 deletions(-) diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index e53edde09e11..e344c662783a 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -644,6 +644,10 @@ struct icmp6stat { #ifdef _KERNEL #include +#ifdef SYSCTL_DECL +SYSCTL_DECL(_net_inet6_icmp6); +#endif + VNET_PCPUSTAT_DECLARE(struct icmp6stat, icmp6stat); /* * In-kernel consumers can use these accessor macros directly to update @@ -772,12 +776,6 @@ do { \ } \ } while (/*CONSTCOND*/ 0) -VNET_DECLARE(int, icmp6_rediraccept); /* accept/process redirects */ -VNET_DECLARE(int, icmp6_redirtimeout); /* cache time for redirect routes */ - -#define V_icmp6_rediraccept VNET(icmp6_rediraccept) -#define V_icmp6_redirtimeout VNET(icmp6_redirtimeout) - #define ICMP6_NODEINFO_FQDNOK 0x1 #define ICMP6_NODEINFO_NODEADDROK 0x2 #define ICMP6_NODEINFO_TMPADDROK 0x4 diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 321622bcf7ef..8f039d6dd196 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -114,22 +114,46 @@ extern ip6proto_ctlinput_t *ip6_ctlprotox[]; VNET_PCPUSTAT_DEFINE(struct icmp6stat, icmp6stat); VNET_PCPUSTAT_SYSINIT(icmp6stat); +SYSCTL_VNET_PCPUSTAT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, + struct icmp6stat, icmp6stat, + "ICMPv6 statistics (struct icmp6stat, netinet/icmp6.h)"); #ifdef VIMAGE VNET_PCPUSTAT_SYSUNINIT(icmp6stat); #endif /* VIMAGE */ +VNET_DEFINE_STATIC(int, icmp6_rediraccept) = 1; +#define V_icmp6_rediraccept VNET(icmp6_rediraccept) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, + "Accept ICMPv6 redirect messages"); + +VNET_DEFINE_STATIC(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ +#define V_icmp6_redirtimeout VNET(icmp6_redirtimeout) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT, redirtimeout, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_redirtimeout), 0, + "Delay in seconds before expiring redirect route"); + +VNET_DEFINE_STATIC(int, icmp6_nodeinfo) = 0; +#define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_nodeinfo), 0, + "Mask of enabled RFC4620 node information query types"); + VNET_DECLARE(struct inpcbinfo, ripcbinfo); -VNET_DECLARE(int, icmp6errppslim); +#define V_ripcbinfo VNET(ripcbinfo) + +VNET_DEFINE_STATIC(int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + "Maximum number of ICMPv6 error messages per second"); + VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); -VNET_DECLARE(int, icmp6_nodeinfo); -#define V_ripcbinfo VNET(ripcbinfo) -#define V_icmp6errppslim VNET(icmp6errppslim) #define V_icmp6errpps_count VNET(icmp6errpps_count) #define V_icmp6errppslim_last VNET(icmp6errppslim_last) -#define V_icmp6_nodeinfo VNET(icmp6_nodeinfo) static void icmp6_errcount(int, int); static int icmp6_rip6_input(struct mbuf **, int); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 20e19b2197d7..dba1232fd58d 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -100,6 +100,7 @@ #include #include #include +#include #include #include @@ -123,8 +124,19 @@ _Static_assert(offsetof(struct in6_ifreq, ifr_ifru) == offsetof(struct ifreq, ifr_ifru), "struct in6_ifreq and struct ifreq are not type punnable"); -VNET_DECLARE(int, icmp6_nodeinfo_oldmcprefix); +VNET_DEFINE_STATIC(int, icmp6_nodeinfo_oldmcprefix) = 1; #define V_icmp6_nodeinfo_oldmcprefix VNET(icmp6_nodeinfo_oldmcprefix) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, + nodeinfo_oldmcprefix, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, + "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " + "for compatibility with KAME implementation"); + +VNET_DEFINE_STATIC(int, nd6_useloopback) = 1; +#define V_nd6_useloopback VNET(nd6_useloopback) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_USELOOPBACK, nd6_useloopback, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_useloopback), 0, + "Create a loopback route when configuring an IPv6 address"); /* * Definitions of some costant IP6 addresses. diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index a70734e0ec9c..8541e19eebf8 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -171,11 +171,8 @@ VNET_DEFINE(int, ip6_v6only) = 1; #ifdef IPSTEALTH VNET_DEFINE(int, ip6stealth) = 0; #endif -VNET_DEFINE(int, nd6_onlink_ns_rfc4861) = 0;/* allow 'on-link' nd6 NS - * (RFC 4861) */ VNET_DEFINE(bool, ip6_log_cannot_forward) = 1; -/* icmp6 */ /* * BSDI4 defines these variables in in_proto.c... * XXX: what if we don't define INET? Should we define pmtu6_expire @@ -184,14 +181,6 @@ VNET_DEFINE(bool, ip6_log_cannot_forward) = 1; VNET_DEFINE(int, pmtu_expire) = 60*10; VNET_DEFINE(int, pmtu_probe) = 60*2; -/* ICMPV6 parameters */ -VNET_DEFINE(int, icmp6_rediraccept) = 1;/* accept and process redirects */ -VNET_DEFINE(int, icmp6_redirtimeout) = 10 * 60; /* 10 minutes */ -VNET_DEFINE(int, icmp6errppslim) = 100; /* 100pps */ -/* control how to respond to NI queries */ -VNET_DEFINE(int, icmp6_nodeinfo) = 0; -VNET_DEFINE(int, icmp6_nodeinfo_oldmcprefix) = 1; - VNET_DEFINE_STATIC(int, ip6_log_interval) = 5; VNET_DEFINE_STATIC(int, ip6_log_count) = 0; VNET_DEFINE_STATIC(struct timeval, ip6_log_last) = { 0 }; @@ -356,57 +345,3 @@ SYSCTL_BOOL(_net_inet6_ip6, OID_AUTO, log_cannot_forward, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip6_log_cannot_forward), 1, "Log packets that cannot be forwarded"); - -/* net.inet6.icmp6 */ -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRACCEPT, rediraccept, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_rediraccept), 0, - "Accept ICMPv6 redirect messages"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_REDIRTIMEOUT, redirtimeout, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_redirtimeout), 0, - "Delay in seconds before expiring redirect route"); -SYSCTL_VNET_PCPUSTAT(_net_inet6_icmp6, ICMPV6CTL_STATS, stats, - struct icmp6stat, icmp6stat, - "ICMPv6 statistics (struct icmp6stat, netinet/icmp6.h)"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE, nd6_prune, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_prune), 0, - "Frequency in seconds of checks for expired prefixes and routers"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DELAY, nd6_delay, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_delay), 0, - "Delay in seconds before probing for reachability"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_UMAXTRIES, nd6_umaxtries, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_umaxtries), 0, - "Number of ICMPv6 NS messages sent during reachability detection"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MMAXTRIES, nd6_mmaxtries, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_mmaxtries), 0, - "Number of ICMPv6 NS messages sent during address resolution"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_USELOOPBACK, nd6_useloopback, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_useloopback), 0, - "Create a loopback route when configuring an IPv6 address"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6_nodeinfo), 0, - "Mask of enabled RFC4620 node information query types"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO_OLDMCPREFIX, - nodeinfo_oldmcprefix, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(icmp6_nodeinfo_oldmcprefix), 0, - "Join old IPv6 NI group address in draft-ietf-ipngwg-icmp-name-lookup " - "for compatibility with KAME implementation"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXNUDHINT, nd6_maxnudhint, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_maxnudhint), 0, - ""); /* XXX unused */ -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, nd6_debug, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_debug), 0, - "Log NDP debug messages"); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, - nd6_onlink_ns_rfc4861, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(nd6_onlink_ns_rfc4861), 0, - "Accept 'on-link' ICMPv6 NS messages in compliance with RFC 4861"); -#ifdef EXPERIMENTAL -SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, - nd6_ignore_ipv6_only_ra, CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(nd6_ignore_ipv6_only_ra), 0, - "Ignore the 'IPv6-Only flag' in RA messages in compliance with " - "draft-ietf-6man-ipv6only-flag"); -#endif diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index f3ac13a9caad..014710f9bceb 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -349,11 +349,6 @@ VNET_DECLARE(int, ip6stealth); #define V_ip6stealth VNET(ip6stealth) #endif -#ifdef EXPERIMENTAL -VNET_DECLARE(int, nd6_ignore_ipv6_only_ra); -#define V_nd6_ignore_ipv6_only_ra VNET(nd6_ignore_ipv6_only_ra) -#endif - VNET_DECLARE(bool, ip6_log_cannot_forward); #define V_ip6_log_cannot_forward VNET(ip6_log_cannot_forward) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index b3ca612c90d6..3eacb05f88d7 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -91,21 +91,37 @@ MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery"); -/* timer values */ -VNET_DEFINE(int, nd6_prune) = 1; /* walk list every 1 seconds */ -VNET_DEFINE(int, nd6_delay) = 5; /* delay first probe time 5 second */ -VNET_DEFINE(int, nd6_umaxtries) = 3; /* maximum unicast query */ -VNET_DEFINE(int, nd6_mmaxtries) = 3; /* maximum multicast query */ -VNET_DEFINE(int, nd6_useloopback) = 1; /* use loopback interface for - * local traffic */ -VNET_DEFINE(int, nd6_gctimer) = (60 * 60 * 24); /* 1 day: garbage - * collection timer */ +VNET_DEFINE_STATIC(int, nd6_prune) = 1; +#define V_nd6_prune VNET(nd6_prune) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_PRUNE, nd6_prune, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_prune), 0, + "Frequency in seconds of checks for expired prefixes and routers"); + +VNET_DEFINE_STATIC(int, nd6_delay) = 5; +#define V_nd6_delay VNET(nd6_delay) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DELAY, nd6_delay, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_delay), 0, + "Delay in seconds before probing for reachability"); + +VNET_DEFINE_STATIC(int, nd6_umaxtries) = 3; +#define V_nd6_umaxtries VNET(nd6_umaxtries) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_UMAXTRIES, nd6_umaxtries, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_umaxtries), 0, + "Number of ICMPv6 NS messages sent during reachability detection"); + +VNET_DEFINE(int, nd6_mmaxtries) = 3; +#define V_nd6_mmaxtries VNET(nd6_mmaxtries) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MMAXTRIES, nd6_mmaxtries, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_mmaxtries), 0, + "Number of ICMPv6 NS messages sent during address resolution"); + +VNET_DEFINE_STATIC(int, nd6_gctimer) = (60 * 60 * 24); /* 1 day: garbage + * collection timer */ +#define V_nd6_gctimer VNET(nd6_gctimer) /* preventing too many loops in ND option parsing */ VNET_DEFINE_STATIC(int, nd6_maxndopt) = 10; /* max # of ND options allowed */ -VNET_DEFINE(int, nd6_maxnudhint) = 0; /* max # of subsequent upper - * layer hints */ VNET_DEFINE_STATIC(int, nd6_maxqueuelen) = 16; /* max pkts cached in unresolved * ND entries */ #define V_nd6_maxndopt VNET(nd6_maxndopt) @@ -116,6 +132,10 @@ VNET_DEFINE(int, nd6_debug) = 1; #else VNET_DEFINE(int, nd6_debug) = 0; #endif +#define V_nd6_debug VNET(nd6_debug) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, nd6_debug, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(nd6_debug), 0, + "Log NDP debug messages"); static eventhandler_tag lle_event_eh, iflladdr_event_eh, ifnet_link_event_eh; @@ -148,8 +168,6 @@ VNET_DEFINE_STATIC(struct callout, nd6_slowtimo_ch); VNET_DEFINE_STATIC(struct callout, nd6_timer_ch); #define V_nd6_timer_ch VNET(nd6_timer_ch) -SYSCTL_DECL(_net_inet6_icmp6); - static void nd6_lle_event(void *arg __unused, struct llentry *lle, int evt) { diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 3e7f2d814d47..1db1b666c60b 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -255,26 +255,12 @@ MALLOC_DECLARE(M_IP6NDP); #endif /* nd6.c */ -VNET_DECLARE(int, nd6_prune); -VNET_DECLARE(int, nd6_delay); -VNET_DECLARE(int, nd6_umaxtries); VNET_DECLARE(int, nd6_mmaxtries); -VNET_DECLARE(int, nd6_useloopback); -VNET_DECLARE(int, nd6_maxnudhint); -VNET_DECLARE(int, nd6_gctimer); VNET_DECLARE(struct nd_prhead, nd_prefix); VNET_DECLARE(int, nd6_debug); -VNET_DECLARE(int, nd6_onlink_ns_rfc4861); -#define V_nd6_prune VNET(nd6_prune) -#define V_nd6_delay VNET(nd6_delay) -#define V_nd6_umaxtries VNET(nd6_umaxtries) #define V_nd6_mmaxtries VNET(nd6_mmaxtries) -#define V_nd6_useloopback VNET(nd6_useloopback) -#define V_nd6_maxnudhint VNET(nd6_maxnudhint) -#define V_nd6_gctimer VNET(nd6_gctimer) #define V_nd_prefix VNET(nd_prefix) #define V_nd6_debug VNET(nd6_debug) -#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861) /* Lock for the prefix and default router lists. */ VNET_DECLARE(struct rwlock, nd6_lock); diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index 7b4fa7a8d8c9..353db66c2323 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -110,6 +110,13 @@ VNET_DEFINE_STATIC(int, dad_maxtry) = 15; /* max # of *tries* to transmit DAD packet */ #define V_dad_maxtry VNET(dad_maxtry) +VNET_DEFINE_STATIC(int, nd6_onlink_ns_rfc4861) = 0; +#define V_nd6_onlink_ns_rfc4861 VNET(nd6_onlink_ns_rfc4861) +SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, + nd6_onlink_ns_rfc4861, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(nd6_onlink_ns_rfc4861), 0, + "Accept 'on-link' ICMPv6 NS messages in compliance with RFC 4861"); + /* * Input a Neighbor Solicitation Message. * diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index de991c98b6c3..845f9094f4c4 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -98,11 +98,15 @@ VNET_DEFINE(u_int32_t, ip6_temp_valid_lifetime) = DEF_TEMP_VALID_LIFETIME; VNET_DEFINE(int, ip6_temp_regen_advance) = TEMPADDR_REGEN_ADVANCE; #ifdef EXPERIMENTAL -VNET_DEFINE(int, nd6_ignore_ipv6_only_ra) = 1; +VNET_DEFINE_STATIC(int, nd6_ignore_ipv6_only_ra) = 1; +#define V_nd6_ignore_ipv6_only_ra VNET(nd6_ignore_ipv6_only_ra) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, + nd6_ignore_ipv6_only_ra, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(nd6_ignore_ipv6_only_ra), 0, + "Ignore the 'IPv6-Only flag' in RA messages in compliance with " + "draft-ietf-6man-ipv6only-flag"); #endif -SYSCTL_DECL(_net_inet6_icmp6); - /* RTPREF_MEDIUM has to be 0! */ #define RTPREF_HIGH 1 #define RTPREF_MEDIUM 0 From nobody Sun Mar 24 16:19:34 2024 X-Original-To: dev-commits-src-all@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 4V2h931N7Kz5G0C0; Sun, 24 Mar 2024 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 4V2h92661Gz4GM2; Sun, 24 Mar 2024 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=1711297174; 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=k3yRA9e4dlt/XXZ1AFH96pIIOhDpGbjixeY3p5IOEx4=; b=yz4ecQVfjtJGQadzIXFFcSJB1Kxbbht93jLTrioXDOvDXpL+J7vZYj25EWMEkcxN2dkUyf 4VfoYIWEQIiHc+FwYjexk/5VeFIVIQ+CFt5po+Qbgvb4IJPCdJciH0NyWlMw/JOhh7KrwA tyIdHJqifkIY63Aj0c13vLzh3AiZWN1JNSWNlVofbl+FZPLeY4KDra2TqVs/4WX4j4snLu 6dFzvKer24Lrh8EBxHLBeS4BowHafN+5pH15cjUXnsVHA5eIxbxOx0+b2gCUbYalgxO4ha Bj8Ya8954eXLqvLInnAk2tFFaq3h7WqTbd1cDAHjdkgBEtmM3GWVIJpL+JxNfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711297174; a=rsa-sha256; cv=none; b=pz3EDQbAynWmvmznwhH7iqrsfmSO295GzDpnpJxXBbyRT2+K/TKzlu/E4KX/dXSi0+wjPz zE65nBMwePj5dGdaUqGvLk2H7Z9KNWH07pMhHfr4pX+HiuGud3RHQ7FGAbU+N2C+r/Vl/n UcvTe/UcqDO4PtbIP1NRpExv6cYdXfhyD+QvVTfLQUCwcwCRd8fuB8ZktSmMpiPxSGhQfk QesnVIitRfjSm1FZ0ZM7RJR+U+BbvqK7idA8MXRSIoNY+JfshZT35ZjdxMLmaUiFVtXXPK rGJVOALy8oPFzpbK32s5wd1bk0B2FrnffnM5+rl7lkhic/tyAi2SaxnZSOA/ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711297174; 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=k3yRA9e4dlt/XXZ1AFH96pIIOhDpGbjixeY3p5IOEx4=; b=pqy/ulXTMwadi8IwZcM22ORlXd7fpt1GlRHvb6QKgZZXF6VL8wDJMvYgne4RQOZ7MJQjim tp6gtfOkYqOc7Y6ci94HpOJmCq4lZdEEKVyuv/cIByrhKpqAu7xQZVxGCy9WdLFAGRf2ex wnykCDweTKNgUARXrAhMIC4087qKadknAGfp4kSM4CyqxlQIuzsyWlLwIYO4kaO9wshP1a j+jLTAEtOZLg9gF2x8+UvqFgHfH9/9QGVMe8rYMhwaGG8kbk6qpW8eEriNkPRiv53kHYgl 846zPUouh0r5z1JJ1yZD8Q8imJQcsp3CqRGSIwMzYad2ZSk44TNiL+uoHHZDqA== 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 4V2h925hKqzfST; Sun, 24 Mar 2024 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 42OGJYiA079683; Sun, 24 Mar 2024 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 42OGJYU9079680; Sun, 24 Mar 2024 16:19:34 GMT (envelope-from git) Date: Sun, 24 Mar 2024 16:19:34 GMT Message-Id: <202403241619.42OGJYU9079680@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: a03aff88a144 - main - icmp6: bring rate limiting on a par with IPv4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a03aff88a14448c3084a0384082ec996d7213897 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a03aff88a14448c3084a0384082ec996d7213897 commit a03aff88a14448c3084a0384082ec996d7213897 Author: Gleb Smirnoff AuthorDate: 2024-03-24 16:13:23 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-24 16:13:23 +0000 icmp6: bring rate limiting on a par with IPv4 Use counter_ratecheck() instead of racy and slow ppsratecheck. Use a separate counter for every currently known type of ICMPv6. Provide logging of ratelimit events. Provide jitter to counter open UDP port detection. Reviewed by: tuexen, zlei Differential Revision: https://reviews.freebsd.org/D44482 --- sys/netinet6/icmp6.c | 185 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 162 insertions(+), 23 deletions(-) diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 8f039d6dd196..ef4216b844b5 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -143,18 +143,6 @@ SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_NODEINFO, nodeinfo, VNET_DECLARE(struct inpcbinfo, ripcbinfo); #define V_ripcbinfo VNET(ripcbinfo) -VNET_DEFINE_STATIC(int, icmp6errppslim) = 100; -#define V_icmp6errppslim VNET(icmp6errppslim) -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, - "Maximum number of ICMPv6 error messages per second"); - -VNET_DEFINE_STATIC(int, icmp6errpps_count) = 0; -VNET_DEFINE_STATIC(struct timeval, icmp6errppslim_last); - -#define V_icmp6errpps_count VNET(icmp6errpps_count) -#define V_icmp6errppslim_last VNET(icmp6errppslim_last) - static void icmp6_errcount(int, int); static int icmp6_rip6_input(struct mbuf **, int); static void icmp6_reflect(struct mbuf *, size_t); @@ -2743,6 +2731,126 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) return (error); } +static int sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS); +VNET_DEFINE_STATIC(u_int, icmp6errppslim) = 100; +#define V_icmp6errppslim VNET(icmp6errppslim) +SYSCTL_PROC(_net_inet6_icmp6, ICMPV6CTL_ERRPPSLIMIT, errppslimit, + CTLTYPE_UINT | CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6errppslim), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Maximum number of ICMPv6 error/reply messages per second"); + +VNET_DEFINE_STATIC(int, icmp6lim_curr_jitter) = 0; +#define V_icmp6lim_curr_jitter VNET(icmp6lim_curr_jitter) + +VNET_DEFINE_STATIC(u_int, icmp6lim_jitter) = 8; +#define V_icmp6lim_jitter VNET(icmp6lim_jitter) +SYSCTL_PROC(_net_inet6_icmp6, OID_AUTO, icmp6lim_jitter, CTLTYPE_UINT | + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_jitter), 0, + &sysctl_icmp6lim_and_jitter, "IU", + "Random errppslimit jitter adjustment limit"); + +VNET_DEFINE_STATIC(int, icmp6lim_output) = 1; +#define V_icmp6lim_output VNET(icmp6lim_output) +SYSCTL_INT(_net_inet6_icmp6, OID_AUTO, icmp6lim_output, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(icmp6lim_output), 0, + "Enable logging of ICMPv6 response rate limiting"); + +typedef enum { + RATELIM_PARAM_PROB = 0, + RATELIM_TOO_BIG, + RATELIM_UNREACH, + RATELIM_TEXCEED, + RATELIM_REDIR, + RATELIM_REPLY, + RATELIM_OTHER, + RATELIM_MAX +} ratelim_which; + +static const char *icmp6_rate_descrs[RATELIM_MAX] = { + [RATELIM_PARAM_PROB] = "bad IPv6 header", + [RATELIM_TOO_BIG] = "packet too big", + [RATELIM_UNREACH] = "destination unreachable", + [RATELIM_TEXCEED] = "time exceeded", + [RATELIM_REPLY] = "echo reply", + [RATELIM_REDIR] = "neighbor discovery redirect", + [RATELIM_OTHER] = "(other)", +}; + +static void +icmp6lim_new_jitter(void) +{ + /* + * Adjust limit +/- to jitter the measurement to deny a side-channel + * port scan as in https://dl.acm.org/doi/10.1145/3372297.3417280 + */ + if (V_icmp6lim_jitter > 0) + V_icmp6lim_curr_jitter = + arc4random_uniform(V_icmp6lim_jitter * 2 + 1) - + V_icmp6lim_jitter; +} + +static int +sysctl_icmp6lim_and_jitter(SYSCTL_HANDLER_ARGS) +{ + uint32_t new; + int error; + bool lim; + + MPASS(oidp->oid_arg1 == &VNET_NAME(icmp6errppslim) || + oidp->oid_arg1 == &VNET_NAME(icmp6lim_jitter)); + + lim = (oidp->oid_arg1 == &VNET_NAME(icmp6errppslim)); + new = lim ? V_icmp6errppslim : V_icmp6lim_jitter; + error = sysctl_handle_int(oidp, &new, 0, req); + if (error == 0 && req->newptr) { + if (lim) { + if (new <= V_icmp6lim_jitter) + error = EINVAL; + else + V_icmp6errppslim = new; + } else { + if (new >= V_icmp6errppslim) + error = EINVAL; + else { + V_icmp6lim_jitter = new; + icmp6lim_new_jitter(); + } + } + } + MPASS(V_icmp6errppslim + V_icmp6lim_curr_jitter > 0); + + return (error); +} + + +VNET_DEFINE_STATIC(struct counter_rate, icmp6_rates[RATELIM_MAX]); +#define V_icmp6_rates VNET(icmp6_rates) + +static void +icmp6_ratelimit_init(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) { + V_icmp6_rates[i].cr_rate = counter_u64_alloc(M_WAITOK); + V_icmp6_rates[i].cr_ticks = ticks; + } + icmp6lim_new_jitter(); +} +VNET_SYSINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, + icmp6_ratelimit_init, NULL); + +#ifdef VIMAGE +static void +icmp6_ratelimit_uninit(void) +{ + + for (int i = 0; i < RATELIM_MAX; i++) + counter_u64_free(V_icmp6_rates[i].cr_rate); +} +VNET_SYSUNINIT(icmp6_ratelimit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, + icmp6_ratelimit_uninit, NULL); +#endif + /* * Perform rate limit check. * Returns 0 if it is okay to send the icmp6 packet. @@ -2752,24 +2860,55 @@ icmp6_ctloutput(struct socket *so, struct sockopt *sopt) * XXX per-destination/type check necessary? * * dst - not used at this moment - * type - not used at this moment * code - not used at this moment */ int -icmp6_ratelimit(const struct in6_addr *dst, const int type, - const int code) +icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code) { - int ret; + ratelim_which which; + int64_t pps; - ret = 0; /* okay to send */ + if (V_icmp6errppslim == 0) + return (0); - /* PPS limit */ - if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, - V_icmp6errppslim)) { - /* The packet is subject to rate limit */ - ret++; + switch (type) { + case ICMP6_PARAM_PROB: + which = RATELIM_PARAM_PROB; + break; + case ICMP6_PACKET_TOO_BIG: + which = RATELIM_TOO_BIG; + break; + case ICMP6_DST_UNREACH: + which = RATELIM_UNREACH; + break; + case ICMP6_TIME_EXCEEDED: + which = RATELIM_TEXCEED; + break; + case ND_REDIRECT: + which = RATELIM_REDIR; + break; + case ICMP6_ECHO_REPLY: + which = RATELIM_REPLY; + break; + default: + which = RATELIM_OTHER; + break; + }; + + pps = counter_ratecheck(&V_icmp6_rates[which], V_icmp6errppslim + + V_icmp6lim_curr_jitter); + if (pps > 0) { + if (V_icmp6lim_output) + log(LOG_NOTICE, "Limiting ICMPv6 %s output from %jd " + "to %d packets/sec\n", icmp6_rate_descrs[which], + (intmax_t )pps, V_icmp6errppslim + + V_icmp6lim_curr_jitter); + icmp6lim_new_jitter(); + } + if (pps == -1) { ICMP6STAT_INC(icp6s_toofreq); + return (-1); } - return ret; + return (0); } From nobody Sun Mar 24 17:47:04 2024 X-Original-To: dev-commits-src-all@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 4V2k604ffVz5G7BX; Sun, 24 Mar 2024 17:47: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 4V2k6044zYz4QYZ; Sun, 24 Mar 2024 17:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302424; 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=8alhKtMFvm4oTi54fr0FxJmu/mcVS9l5Gcvwh7o5xI8=; b=Z1zJnau3FhAL9q/rEOHSnzOYu+2cV3MCD4eC76hId4bhLDtwsE4h4IgB7tkgfih5h7eYYy yCS4gm3hykx/z4qp4h/Q6P5aTclKSwdpri4Lqon0tuEE+TtEP4UOfd+AF+Fjv1m7koT9s7 XMkX0FNgmENPocBMeveDCpNJUTRsxKUn7HVP42GPsYlR+0Zkll7pcGwf0YaC8dfJnbnVsB O0er3h0GFcMYKrqRw1FsAsC0QNN6tsc6cTr6FcUEKgIUU+JC9MA9wxu8zBETBM5YCnnGgM wgxTBGJWvRBlJo9V7WMHjYebnzwgw+yGKY6/3IeID7BATmYSU+uF4rRDb9cUZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711302424; a=rsa-sha256; cv=none; b=ZfoxULQptP6BGcAfTOLcquKOIaGYExh9+5qF3BHNEa/eR2zSTEIANovZuupTe43DjVyOm3 GAcm0ZjeSBEmpd7KNZC+r6viIUgIOJc+dlQsQQH20oQz7v761VGIlcxpV5ZpZvwHM1U2ZC sY87utNg1Rujq9MqC+b1VhCPJvCOf0vPqpboHeQZcGBtjlrlRnwF1Qjzfp2DKgcM8XfDT1 JPKVW1i3dAV6B++PZLGUGyi6cdQDAmrXhmP7USaR0M8v2NCKww8VEDN68Xse2d5Dv4CaL3 Tt0YUn+K22ylVVrHjcJr/Ci/78GbTA5LJxoHcGDPDbU0NJ61bb+s2EOMF09ZgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302424; 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=8alhKtMFvm4oTi54fr0FxJmu/mcVS9l5Gcvwh7o5xI8=; b=B19hxOgcI/r7E6LVjoFzd7/J+1qHr+K6eMzLZBqx9agz0al9ziwbj/hrDVBI2XJhg0/nMf SgL0rguQcV6XdH/Bd6qetOYJiFE/meLU2Z67YSYWFwvhXYq/BaY+J8RYGGvWywDeiovEbO IxiM4dJ6J4zTecRFqPP5k1+RnOfXwpR2BtMoSpzJtbrIBRMj/Aevl/s76OMWXukcLY8FTD gkUAwLkHjIiYLmm7FqlUu9JCp6kYCJ+NS5XOpiz601+NnGGVL8bjzaUDFIi2zREitweIgM 0v3PxVijsg/xN+DJLJnf0CaaGyKXXGwdiFpFimGfUQtv1Rhk6z67Es8L9C9/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 4V2k603YfLzjNW; Sun, 24 Mar 2024 17:47: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 42OHl4fq030569; Sun, 24 Mar 2024 17:47:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHl4wk030567; Sun, 24 Mar 2024 17:47:04 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:47:04 GMT Message-Id: <202403241747.42OHl4wk030567@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: 9fabf97682ce - main - arm64: fix free queue and reservation configuration for 16KB pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9fabf97682ce494865c8b26c218f2d00a36c99ea Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=9fabf97682ce494865c8b26c218f2d00a36c99ea commit 9fabf97682ce494865c8b26c218f2d00a36c99ea Author: Eliot Solomon AuthorDate: 2023-11-18 21:13:21 +0000 Commit: Alan Cox CommitDate: 2024-03-24 17:22:20 +0000 arm64: fix free queue and reservation configuration for 16KB pages Correctly configure the free page queues and the reservation size when the base page size is 16KB. In particular, the reservation size was less than the L2 Block size, making L2 promotions and mappings all but impossible. Reviewed by: markj Tested by: gallatin Differential Revision: https://reviews.freebsd.org/D42737 --- sys/arm64/arm64/copyinout.S | 1 + sys/arm64/include/vmparam.h | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/copyinout.S b/sys/arm64/arm64/copyinout.S index 005fa61bfe82..23f56ae85daa 100644 --- a/sys/arm64/arm64/copyinout.S +++ b/sys/arm64/arm64/copyinout.S @@ -30,6 +30,7 @@ #include #include +#include #include #include "assym.inc" diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index 0967d3c0aedf..d5d4a5691f37 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -99,8 +99,17 @@ * are used by UMA, the physical memory allocator reduces the likelihood of * both 2MB page TLB misses and cache misses during the page table walk when * a 2MB page TLB miss does occur. + * + * When PAGE_SIZE is 16KB, an allocation size of 32MB is supported. This + * size is used by level 0 reservations and L2 BLOCK mappings. */ +#if PAGE_SIZE == PAGE_SIZE_4K #define VM_NFREEORDER 13 +#elif PAGE_SIZE == PAGE_SIZE_16K +#define VM_NFREEORDER 12 +#else +#error Unsupported page size +#endif /* * Enable superpage reservations: 1 level. @@ -110,10 +119,17 @@ #endif /* - * Level 0 reservations consist of 512 pages. + * Level 0 reservations consist of 512 pages when PAGE_SIZE is 4KB, and + * 2048 pages when PAGE_SIZE is 16KB. */ #ifndef VM_LEVEL_0_ORDER +#if PAGE_SIZE == PAGE_SIZE_4K #define VM_LEVEL_0_ORDER 9 +#elif PAGE_SIZE == PAGE_SIZE_16K +#define VM_LEVEL_0_ORDER 11 +#else +#error Unsupported page size +#endif #endif /** From nobody Sun Mar 24 17:49:28 2024 X-Original-To: dev-commits-src-all@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 4V2k8n1WRlz5G7gR; Sun, 24 Mar 2024 17:49:29 +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 4V2k8n0xWNz4Qf4; Sun, 24 Mar 2024 17:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302569; 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=vNjgwOS0hG3BckfjDhLYWtmacgvFTnGcnjT5MP09FhU=; b=k3cItUDWagpzfVCweQ/vEJEVfvBrS20+B4BGL/ZrSBuv7aSWANM0aqp4GMIDmOeM5MmE6Q o+bJPUgd8YB8L5xN2WqsZw2D3kj11P47r874w281WknZ4r1Q75xXNG/FKyuDSG7til3WzV Ano0hsOriqS8BuODGoy5vCrwLUiugOxzqx7oFh+i5hS8+/MRSCZMBTRVawqgLdEG6YWRdr 3COP+W1Hq6aaEvb7YJfJ98QI/HLNOw0zmlpUdgG8aO92erev6uO+31hevtQpZsC8KLl+zA mdbmajfybY7yXYrOhu7eyun80Nq9NK4sKZO8e6N4MQuUwAhd2fSBsd7Yxh2D+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711302569; a=rsa-sha256; cv=none; b=KY2Xq/ymAf1B6nminXpd37/QxjXUbpaQddYCe49mklNnU/UkL+PRAZrFwyEnYaWh0I3pfG TdkvQaxv6rmnW5vvOkeXALNROAN8syERzf4s8Q4XlmVfhV01G41Pia+u+N9aHni6YK1sJl 0lqt7VpeX31/EhzkTR7IodzCjavrUQmmfhCxU/Mxr2dEY2fb26Zq9T5Phep13ICcHYIq3r MFTt4zlKHH99PptVuVwYSJ4uBcmwA9hnCA1G9iBxi1CbxfsQrC//swwEMRv5KgPg50t3cQ sDWOhzl0nxYNd3do1Pagl+6u0jTiwdxxuJtVi42e2UQwFdkE+EnCNaovQVVz7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302569; 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=vNjgwOS0hG3BckfjDhLYWtmacgvFTnGcnjT5MP09FhU=; b=VY5kEJ5RcBY3ai1pot/58s8rnjFhCQm8ZNo4w5yU4XY06Gr35d3XRxRSoMfVrJ1KOm8fay kue2vuyoaCcrLcr6atTVwfB2drdX6v0bnHd954lXDObcH88jvUckTgZJ0CXu/JNQPYvJTR JrTMPR5eHQr3LQqNQEjl5ESui5bWtyHOWs/gsZ/W6EYfzNz+bBECWtFp2m1eqMBNDaRXWB bnAQscldD4tFHgDIEPO+AQOcOoQU0xh7ThuJ0SZoRsIVXaj7N+LglVsfohQwEIWsv3WX1n HWws14mBaZo6RihzX3npFb7UxueobKK0s4+FyLlXZBvFnOukamUyKYM1BzclZA== 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 4V2k8n0Y7Hzj3Q; Sun, 24 Mar 2024 17:49:29 +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 42OHnSks031012; Sun, 24 Mar 2024 17:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHnSxH031009; Sun, 24 Mar 2024 17:49:28 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:49:28 GMT Message-Id: <202403241749.42OHnSxH031009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c3c2233c9673 - stable/14 - gpioevents: Fix build with newer Clang List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3c2233c9673f6ce39109d26f934b848b3749b18 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c3c2233c9673f6ce39109d26f934b848b3749b18 commit c3c2233c9673f6ce39109d26f934b848b3749b18 Author: John F. Carr AuthorDate: 2024-03-02 15:38:04 +0000 Commit: Ed Maste CommitDate: 2024-03-24 17:48:55 +0000 gpioevents: Fix build with newer Clang PR: 277422 (cherry picked from commit 42b117a4bd104246589149fa9f7b9b7ddc144f23) --- tools/test/gpioevents/Makefile | 2 ++ tools/test/gpioevents/gpioevents.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/test/gpioevents/Makefile b/tools/test/gpioevents/Makefile index 7976bd03174a..4bc4422ae333 100644 --- a/tools/test/gpioevents/Makefile +++ b/tools/test/gpioevents/Makefile @@ -8,4 +8,6 @@ MK_MAN= no BINDIR= /usr/bin +CWARNFLAGS += -Wno-gnu-folding-constant + .include diff --git a/tools/test/gpioevents/gpioevents.c b/tools/test/gpioevents/gpioevents.c index f1bc8e8ee224..43bad610cb68 100644 --- a/tools/test/gpioevents/gpioevents.c +++ b/tools/test/gpioevents/gpioevents.c @@ -61,7 +61,7 @@ sigio_handler(int sig __unused){ } static void -usage() +usage(void) { fprintf(stderr, "usage: %s [-f ctldev] [-m method] [-s] [-n] [-S] [-u]" "[-t timeout] [-d delay-usec] pin intr-config pin-mode [pin intr-config pin-mode ...]\n\n", @@ -152,7 +152,7 @@ print_poll_events(short event) } static void -calc_utc_offset() +calc_utc_offset(void) { struct timespec monotime, utctime; From nobody Sun Mar 24 17:49:30 2024 X-Original-To: dev-commits-src-all@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 4V2k8p2jSYz5G7x4; Sun, 24 Mar 2024 17:49: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 4V2k8p2HQnz4Qf7; Sun, 24 Mar 2024 17:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302570; 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=tS/JsFkPOny+ZcspvMT/wgYu8mfYWffwSpoNS4bg6vM=; b=T9qYAxmqkELNg0qxPgfIVS8ycJlCVdYiCLhMWIcp4LFQseGT3efx9UrVMsJo/hyHo4x5zh 3ohlPvlHknyhf/w1eUhReVUgM92Yvrj1tId5RKMYXmwQp/0efjDjwDI4u+eKPyIJnKmc6s ngJIphCLZBO+6tb1Fh115KlR7q1eTSZ36SL6y3aCjTyq3ZDxhYenM5zazCJIU0KS2AdVCx sY340HGD/sUpgLkL8l94LC4Dsb4glIgvVEOY0R/SJ08D9gUaoJX/jsUd1qkFTqwFWtuMUf eSed37o30bXwxdMLDSciwn9feHJMieBAbi/Cj5qyjwOTsKblFUWgv/mAGC4sEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711302570; a=rsa-sha256; cv=none; b=llB8hirr98DmMyUcvX9IdetXAK+yW4yLvUWvyJcdyPnRVH89kCLeahWRg7wAF728D7COib 5S+hYAlBE5PEJox2FOOMndIPZoRRKkqZ/LLbby+jj6v8k8ZCG4j3uvILADkiPkV3eLHEtl 5Egr03nc2cdiixQi4omHrh6bNGKSgZBRqXh+vMj1QviQVc930XivXNMPvcKkwT4q7fnCOu 92gSoSXm4CmSPxBrqo32uyOk8TTGKAVaJtz96CFgRyGm5obDZCebVxiNJ9F3hbnTOpRoHd 5hEqQ8VucxmSQd7m3FtY+ag2dbowRyuoLW2rf+J6EckN5Jqjl1K97h5BWrqVPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711302570; 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=tS/JsFkPOny+ZcspvMT/wgYu8mfYWffwSpoNS4bg6vM=; b=JdLItUc74S0Kl8deJOxud3ViYm4jOQWeiEWecJNkI5mblVqTlCkRbF/8ghmHWoqnsNuyPT plAEE95mGpAXpoaRNjDCdrweufBuTLP2Njmznb1YnKqOF684DLbFt1ILVI7hWXx7RSssch VatLPT5+lFPpxvScd7YXxOAGlyFEZwDZ55dIz62czpmufri2/BzNd188sTZComdL+eh0Nf LYmVDzUlPeJ3IsjG6WUge2UUtvh6prgjKmeLbTMANm8vA7e9DdP6J9Hra6P6hCHuO0Go/1 6yKKEjGDQnZVxgnCF/yFulPE1om5CS08Vl83SDCgQjCzWtPC6qNX2bawWAV8Gg== 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 4V2k8p1cFRzj3R; Sun, 24 Mar 2024 17:49: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 42OHnUjJ031063; Sun, 24 Mar 2024 17:49:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OHnUQl031060; Sun, 24 Mar 2024 17:49:30 GMT (envelope-from git) Date: Sun, 24 Mar 2024 17:49:30 GMT Message-Id: <202403241749.42OHnUQl031060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: adc61137fdf7 - stable/14 - Cirrus-CI: bump Clang versions to 16 and 17 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adc61137fdf7b31b5f32354b970a8d824347b0de Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=adc61137fdf7b31b5f32354b970a8d824347b0de commit adc61137fdf7b31b5f32354b970a8d824347b0de Author: Ed Maste AuthorDate: 2024-02-29 22:00:39 +0000 Commit: Ed Maste CommitDate: 2024-03-24 17:48:55 +0000 Cirrus-CI: bump Clang versions to 16 and 17 Clang/LLVM 17 is currently the in-tree default compiler, so use it as the default Cirrus-CI toolchain. Clang/LLVM 18 is coming soon and needs to be added here, but I ran into trouble with llvm18-lite package availability so will look at that later. Reviewed by: dim (earlier), Jose Luis Duran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44162 (cherry picked from commit 51c6bf0478bd331225121eb4a0a60510cc3920b1) --- .cirrus.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 96fbb873136c..d84614321145 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,36 +14,36 @@ env: task: matrix: - - name: amd64-llvm15 World and kernel build and boot smoke test + - name: amd64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: amd64-llvm16 World and kernel build and boot smoke test + - name: amd64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' || $CIRRUS_BRANCH =~ 'pull/.*' env: TARGET: amd64 TARGET_ARCH: amd64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - - name: arm64-llvm15 World and kernel build and boot smoke test + - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm15 + TOOLCHAIN: llvm16 TOOLCHAIN_PKG: ${TOOLCHAIN} - - name: arm64-llvm16 World and kernel build and boot smoke test + - name: arm64-llvm17 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 - TOOLCHAIN: llvm16 + TOOLCHAIN: llvm17 TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' From nobody Sun Mar 24 18:59:09 2024 X-Original-To: dev-commits-src-all@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 4V2ljB0YXMz5GFd4; Sun, 24 Mar 2024 18:59: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 4V2lj95t1Fz4YNb; Sun, 24 Mar 2024 18:59:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711306749; 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=5MVMrb3X+5wsMXJBlVgS0Bex0VGrLagiDurVUYiG5vs=; b=K2TCWlca9menr+FtE5dreZXaXYhRmT+Wf28A95mylR5gRJtNFPlzSjJAoz3QUM4LT95uG4 eWpqx5UqSgjX2Ep+LMwgvHGoJ/ug1TC/VPBMQuAoz4j6wPHQu6xaEq8YXB4ze2+VZgOPaH HXX9bbsQ7wTkz+UgiFCAT8KWH9I6usfPHhEvAry3rF7zDTHKDlNqYSgtQCFFsVQhCiQKKv 1s4pg5GZ9XpG+8dUrcudRGmAt+oQhnraWeXNvsXnX8xfIJgqrWGIICtmDveWZuR8hgy2Cx gYMqQ1OjIP0NSzrCuIdF4AreAtc4PRST6sDN5v4yim5ygIUWFCD/sMRFi1JJKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711306749; a=rsa-sha256; cv=none; b=NdjPmTRzjvV38yWM9mbNFTkdACrao/VRSgkvxqRgNiGBbHIxwB0ITJqFX1rulpLTaUwLF9 8c1YKpK+yDZWwhKnykw7etSvBxX51Dkt2kS2X0fu8o375ZymME7UygK0T9RVAaQd+l0BB2 ZVq08ZV5wbAKrnBphYzqMcQqCWyqq9ibJ4NPZIK+t99K6Ib4TQjrh7XxnzLns/REUSf6MR /AaedXaKSICJCpMP5TNe6kKJlGnlhw3ckgcSw0JTGpcVRXhtClFuc5keBbBw3p02ku4wTw 8EK/KRf6jO8EakyKI4f4Veqawb53v5ZgzrLpGwDLZhmBoFLXGpGlavuGaFfjIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711306749; 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=5MVMrb3X+5wsMXJBlVgS0Bex0VGrLagiDurVUYiG5vs=; b=awcSCUUERmn+zh44gKr1HfN2FjfZa5kzd77FdfSByhQUcueThzGBeuiDGEnqBtkLmAjbW3 y3kBeaLn61Yw2g2RZ50Y3fHSkCm1YimIZCW5yG7fmARLq3EElPQqURjfc9zMDA8kFBF0Ul pKrqRmPoedn+fslJyDmCue0YtP86/xRnOTnvrMQAjtBYnKcEI3k2jeLZEyBn/2CpRdEiDG Njo8QArow1nqPutVWSChgpI1w6h+jkD/PBjR3/e1XA7l5knMKct0J+c1wOvknR9rKDXHfj kZL+1f/m4YQ4KSTY+UAQgE67WTOhMvt5HCTApS/M7gGlh4gzh/8/x8/CfbAz4Q== 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 4V2lj95N4bzkTx; Sun, 24 Mar 2024 18:59: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 42OIx9VN050586; Sun, 24 Mar 2024 18:59:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OIx94k050583; Sun, 24 Mar 2024 18:59:09 GMT (envelope-from git) Date: Sun, 24 Mar 2024 18:59:09 GMT Message-Id: <202403241859.42OIx94k050583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rainer Hurling Subject: git: eb1ca6736a52 - main - usr.bin/calendar/calendars: Add myself as a committer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb1ca6736a52fc81b56b128861314f382e5cc3ab Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/src/commit/?id=eb1ca6736a52fc81b56b128861314f382e5cc3ab commit eb1ca6736a52fc81b56b128861314f382e5cc3ab Author: Rainer Hurling AuthorDate: 2024-03-24 18:57:27 +0000 Commit: Rainer Hurling CommitDate: 2024-03-24 18:57:27 +0000 usr.bin/calendar/calendars: Add myself as a committer --- usr.bin/calendar/calendars/calendar.freebsd | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index f2f374f35c76..f799c27e59fd 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -303,6 +303,7 @@ 07/19 Gleb Smirnoff born in Kharkov, USSR, 1981 07/20 Dru Lavigne born in Kingston, Ontario, Canada, 1965 07/20 Andrey V. Elsukov born in Kotelnich, Russian Federation, 1981 +07/21 Rainer Hurling born in Oldenburg i.O., Lower Saxony, Germany, 1963 07/22 James Housley born in Chicago, Illinois, United States, 1965 07/22 Jens Schweikhardt born in Waiblingen, Baden-Wuerttemberg, Germany, 1967 07/22 Lukas Ertl born in Weissenbach/Enns, Steiermark, Austria, 1976 From nobody Sun Mar 24 19:39:49 2024 X-Original-To: dev-commits-src-all@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 4V2mc62CDNz5GJkG; Sun, 24 Mar 2024 19:39: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 4V2mc54G6Pz4cGk; Sun, 24 Mar 2024 19:39:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711309189; 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=JCZBMALa3A8l9eGDGODbO8N2CNS/biTdfjoEPKU8KRw=; b=mtroD1YaC+UcGUjbPGfrZ4DUECtQajUSTLwe9KjSylE/CL0xXt1LfKd/KVVWa9S03aEbw2 P9TG/hxG/MsiajaNRdXn12mPOwURrKZLBzIbt86Q/tMR2VFp4ItZaQgU7bYklXWxwIBTH5 jM7kW7/ppO6OdlE9/xVQa05LZFiIrTnOldC8yQNGTQlzcPgjJRyT226kNIiXExEhL/SGnP CWipDe/vDiNvK01wCmT+gNOwYAj/apuWaLS7iOT4FKPE5nJDkzs4JL+f9g2jp59c5kw/so vHqDqzUp+gibDi12xLh25hXKAEkIg43qwZBT6mKoWGDwrkT+yEuwyFjJxffXfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711309189; a=rsa-sha256; cv=none; b=FDYYM6jcYVVMU3SvZsdVVRaYgnoBHqsrCxtDRyjRLIT7WGJcjaYPjpiMWYVdwOzWEV64Ei XfYId/8cxn9u8Jsh0+tD7pVuIo3E8IEIXAMakuEFL8vvlDM5KHtVPBTEGIzO0+wS45jOTu T+70yU9jNUm/2IppGJohAwtBTEtaxBp++pyup/gY3iLO4/Ukjz05/NzF2HN3bBFosVAKHF Bosn7tFaI0o0NmSE5eSyshe05slI8C48xpeO51Tk5lqiXSunIzRP2uHwhsfo8Ja21W4JW6 lp1+J4QhS+FKQzj24+lOeYNhMKCLhRq5DnlXrrykkL4VkkfboPu5i9wz2SLVeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711309189; 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=JCZBMALa3A8l9eGDGODbO8N2CNS/biTdfjoEPKU8KRw=; b=vTTsLKFlooJCaRbtdrZDxW9Xv3ZlQ39knd468rhzaRLZzlddphXnwFxXr1vrMBcfoblzG1 UmkMfipPDVNx0m7zs16Jq+7ok2aAVn84CEePjdJ63ZDJognJjLiBGzyMFdsnImg9IjsZIc bdizyFx8LRT1Tu7+HBcOosaqhQ42shWPLv0o/WdF51WLCFyQoa7zf2NPrX2ufsuUQJRdqV 6Pex6Z8nT7vme3uepuxXbUgB+mcGx+bVLwhzM7VGIifkEdtEoZa8OD8aFQSHuJLhdXloam gniGc3WuXUWVKGMow2PufT8mQpE7GUSvzAXSt/9xNoJ0yEuMFxYfT/onMd3Rfg== 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 4V2mc53gS9zlp4; Sun, 24 Mar 2024 19:39: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 42OJdnnO018767; Sun, 24 Mar 2024 19:39:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42OJdn3w018764; Sun, 24 Mar 2024 19:39:49 GMT (envelope-from git) Date: Sun, 24 Mar 2024 19:39:49 GMT Message-Id: <202403241939.42OJdn3w018764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Peek Subject: git: 65904399db91 - main - efibootmgr: allow -u as a valid option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65904399db9167b0970e42e14642e1d6bdbf6d3a Auto-Submitted: auto-generated The branch main has been updated by mp: URL: https://cgit.FreeBSD.org/src/commit/?id=65904399db9167b0970e42e14642e1d6bdbf6d3a commit 65904399db9167b0970e42e14642e1d6bdbf6d3a Author: Mark Peek AuthorDate: 2024-03-24 19:37:12 +0000 Commit: Mark Peek CommitDate: 2024-03-24 19:37:12 +0000 efibootmgr: allow -u as a valid option PR: 277907 Reported by: vsasjason@gmail.com MFC after: 1 week --- usr.sbin/efibootmgr/efibootmgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 2bc79ee26f51..b919130d9c11 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -204,8 +204,8 @@ parse_args(int argc, char *argv[]) int ch; const char *arg; - while ((ch = getopt_long(argc, argv, "AaBb:C:cdDe:EFfhk:L:l:NnOo:pTt:v", - lopts, NULL)) != -1) { + while ((ch = getopt_long(argc, argv, + "AaBb:C:cdDe:EFfhk:L:l:NnOo:pTt:u:v", lopts, NULL)) != -1) { switch (ch) { case 'A': opts.set_inactive = true;