From nobody Mon Jan 29 02:08:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNWtR45nMz57q97; Mon, 29 Jan 2024 02:08: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 4TNWtR3btrz44mM; Mon, 29 Jan 2024 02:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706494111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lVzaEgDceAJ6WZucnu29heKuowRVLVYtZRpFOGy428=; b=DaxP5vfpt8SrarYt8yZ7kw7r/Cz7QxJghSvJ/A0lcM/82RxAYT/BNDYbncjmb0ePwcWThX p/Xt1TyWfc/xfa7lHvLswF9n1aui9wT0xnk47T4hmb8buO8RBccrhNY747zgXInX5YzzTD wgDSY5f1kTElS1ZBSRP0HVpQ2rOK+GACAYdP6+F7EeLQZ+lUvGy+rNoFeDRzRMcQ7wgT5n 6qj2EYlezRf6zBvrcHO/CkD9UJ//GaTXddYJi+xvcl5Xo3EVC6l/s2JUhQ0tOfl2EHdT6L b3NYQZS/sNlAr0FbAEnf2jUCzTAcuyFZyXPlPiEzOiuLDwBxqmH1HorBtCRyMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706494111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6lVzaEgDceAJ6WZucnu29heKuowRVLVYtZRpFOGy428=; b=frSGC4e+IfPIpigHEOmZmy7TrIZM7mOiWKw2h0kCgvAFPVvSj9a5Bw46yghDjlPljWAPrQ LhVxI52LLJHe5qddT2wcYjUIBmewcwsqwIbwMtAbYQRWf3W8kiKrEny2uIoam699xPta80 GEIaWSmDNOMbLt9rpT2O+J+zFyi79AucjhPz8QTOH+yBlwv/OgeVqx2dWIBJq9lQA1gHBd qjN12beNHF5BO891Cuuj0LQ18p8CHuidwb1m5HC6gAtt8VeRfPLxYXQakNYgIbhSnih3Sh 1BPEjf9TkQD0nRc5TJARCOGYvHWbKOCXv7lq6WOD5U9pLozY/S1gVWH9xvreoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706494111; a=rsa-sha256; cv=none; b=PEAnzMJSlnCUxIlKaKbqkNZ3lcSSvGYsvs0aTO39AkkA2TtlfhxmMd2Z6AW/JBkBf2qTlM GSW7YaHtL/XWtXs5rbnAeTmPuS3ntl2Df1hyuuwGz32VnKNT1PkokyRvVA7rVMnHQWNmuM xjN/hQVPMZGdDw9/YFUyL7ZJ2N/gPk0Zg3IkQKNTRNV5Z+1cC6sUppc/qEq2VbL48aMENW NM7xn6fS1xhi3lYS7mXRjZkspjzEr5ZEOq0p89tTMpknUqNHVGsfxDaqRuhwG5bWGVrDaW 8WBBtbh3ePOXjWPfmfVut/d3NXFUY+rwZDTsRTO/fmlNt5fBsZmX4uaCx9t0+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNWtR2gFVzYTr; Mon, 29 Jan 2024 02:08: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 40T28VLW040362; Mon, 29 Jan 2024 02:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T28Va4040359; Mon, 29 Jan 2024 02:08:31 GMT (envelope-from git) Date: Mon, 29 Jan 2024 02:08:31 GMT Message-Id: <202401290208.40T28Va4040359@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: 9c1bad2da5ae - main - release.sh: Add -jN to `make release` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 commit 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47 Author: Colin Percival AuthorDate: 2024-01-29 02:04:20 +0000 Commit: Colin Percival CommitDate: 2024-01-29 02:08:23 +0000 release.sh: Add -jN to `make release` The `make release` command now creates VM and cloudware images (if enabled) in addition to disk images; this results in a very large number of 'make installworld' commands running sequentially. Adding -jN should speed this up significantly. MFC after: 1 month X-MFC-to: stable/14 --- release/release.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/release.sh b/release/release.sh index 75278a12daa6..373d10d9a303 100755 --- a/release/release.sh +++ b/release/release.sh @@ -89,9 +89,11 @@ env_setup() { SRC_CONF="/dev/null" # The number of make(1) jobs, defaults to the number of CPUs available - # for buildworld, and half of number of CPUs available for buildkernel. + # for buildworld, and half of number of CPUs available for buildkernel + # and 'make release'. WORLD_FLAGS="-j$(sysctl -n hw.ncpu)" KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" + RELEASE_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" MAKE_FLAGS="-s" @@ -190,7 +192,7 @@ env_check() { ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" - RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ + RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" From nobody Mon Jan 29 04:45:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNbMK4dkmz586Rm; Mon, 29 Jan 2024 04:45: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 4TNbMK46ytz4Jmd; Mon, 29 Jan 2024 04:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706503517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dfwttkf/EJQCVHg6tDlv4HcC8UQFAabeCNR9+TbVHNU=; b=dmApIiBykhPWOIQmrMcCZRIXtOyIVdWUxl9r+YGPqc801aHMxX2lqCCbNyx1b3rfr/wCcE +VWb0dsExddz3tnxe+SmzOMUJJLQq0NBjYZfpPe+jx0XHreWFkLLoBHVSc/meK4M/BKlcZ 7SZzsJHcbfFRSu8QO2RmpAKV+YJ+WJ6EsCyabVXpE0wUiGiBXWTeowTs9PQk0S3ENLGO90 jcoIWHJ/Of1T2KMa2u0wC0zlNL0+WTcNF/wNUiYKuQQny6Ak2BzjJxC2H3Gm+HDQm1tZHP Vf1e14IDftnJ0DHhm4bJNQQukz2qIYeh2/xYsVRYSsQp+0geDGVAnPQ9kDYVJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706503517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dfwttkf/EJQCVHg6tDlv4HcC8UQFAabeCNR9+TbVHNU=; b=s5NJlfWbSs4l16dfUG1aV7Bf/GA6bLw9t+PYM/pw5tm0Pkgl3eyB5ALJ9ncIvxY3/Gu/oL zbArOqfLRA3KOEJxxGnCI3iWW57ApQoa4xJT7SLHab49ep//w3b3HSXFCyAjNWG4RSPV6h BKkdr1meUrO/HjuoGEg9YKLYtslEOGY2hKIIIUI0U0ARnwWgbH04SQiQb294NSELZVQwVH QGsvSXoiRD1gFOEqEhTUEUAcY46UFOPtSlhxeHy00I4gZawM55NlBg73t6/e5GYH3eca8T iFzhKyXI0q/7iOJHAMaNyHgKheJ2Qrc/mf4Kni3f3FcysTjAWfIdl4oINssXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706503517; a=rsa-sha256; cv=none; b=MM7/CSRHxA6RtYEVWpI6fqwKUvVFuFFXpJJiAvopBaPT9mype1kA9Dw4zQ+EvG+AUEw+ZZ AOSjxtf/8LBcpflhhVdfuTevXQSnQYO4/d4XdUARS4r7pAuAAYgXjhqETPUz1/Y9d84qa+ 4E0qLhXLFk5cWrzZ4ncyqXUPVWKYCNsqlOpPdKfQ+f9/CpAsw4AhBEmgQy+fgiYxiPNrSS 767Mcqh9s2XPtFzdw3K1cdhAxQk7neubVdLSacSfDx/jed98erzhFHFse2Qt1e6U2Ha2ZR LsdS21HdY/BqSwjj0E5IBdo/4ED2FUhFZtuYarGXWvzAHVmc/IwRmTI00gYf3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNbMK3B8LzdRx; Mon, 29 Jan 2024 04:45: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 40T4jHpb010676; Mon, 29 Jan 2024 04:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T4jHYp010673; Mon, 29 Jan 2024 04:45:17 GMT (envelope-from git) Date: Mon, 29 Jan 2024 04:45:17 GMT Message-Id: <202401290445.40T4jHYp010673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 34f0a01b6bd4 - main - mpi3mr: Fix confusion over | and & List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34f0a01b6bd4ff0e61a7066729515148400e0982 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=34f0a01b6bd4ff0e61a7066729515148400e0982 commit 34f0a01b6bd4ff0e61a7066729515148400e0982 Author: Warner Losh AuthorDate: 2023-12-11 02:44:47 +0000 Commit: Warner Losh CommitDate: 2024-01-29 04:43:56 +0000 mpi3mr: Fix confusion over | and & Use sc->mpi3mr_debug & MPI3MR_IOT over the | version to test if a bit is set. CID: 1529718 Sponsored by: Netflix --- sys/dev/mpi3mr/mpi3mr_cam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c index 3cef46f3f642..b842e2a05bda 100644 --- a/sys/dev/mpi3mr/mpi3mr_cam.c +++ b/sys/dev/mpi3mr/mpi3mr_cam.c @@ -1187,7 +1187,7 @@ mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) mpi3mr_dprint(sc, MPI3MR_IOT, "VD: Setting divert flag for tg_id(%d), persist_id(%d)\n", tg->id, targ->per_id); - if (sc->mpi3mr_debug | MPI3MR_IOT) + if (sc->mpi3mr_debug & MPI3MR_IOT) mpi3mr_print_cdb(ccb); mpi3mr_set_io_divert_for_all_vd_in_tg(sc, tg, 1); @@ -1209,7 +1209,7 @@ mpi3mr_enqueue_request(struct mpi3mr_softc *sc, struct mpi3mr_cmd *cm) mpi3mr_dprint(sc, MPI3MR_IOT, "PD: Setting divert flag for persist_id(%d)\n", targ->per_id); - if (sc->mpi3mr_debug | MPI3MR_IOT) + if (sc->mpi3mr_debug & MPI3MR_IOT) mpi3mr_print_cdb(ccb); } } From nobody Mon Jan 29 04:46:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNbNT5pJjz586c8; Mon, 29 Jan 2024 04:46: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 4TNbNT5BRlz4K0K; Mon, 29 Jan 2024 04:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706503577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+F38aMRKYLM9zIdHwLY0NptR1E5i70sCym7ihXQdqgE=; b=fH7uqfe8xr0iF6cQ+3g+cVG1uYEAmW8tpoJ8aYLVcqDZnMqMc6lLZv/1zznTBvaRcjMPBN KyKaWtBOkIjRhIxaktXQ3/Ge0Wt3prd1v+O2WuoRN/gnhB3MAApc5RR0rMMN9Fq9748OIe xubVqYPSar6NMD/QHjUNJhpt9Q6tN9p+4Hi6cXFZs73uYwjEvGWKkrNJjxVsu6IhxlM0yU 0TKR3u11eNKBE8O+3Qd3eOk6TME7tXTFyn8RE+UhggfqYFOZHv8vNKI52wt2eJvS7VR5uE X9oAE9hUonGrPLElD8HbUhr5+XwnR+gdhX7b8IvJYrW3QwAGzR8wOmIdLFNuRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706503577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+F38aMRKYLM9zIdHwLY0NptR1E5i70sCym7ihXQdqgE=; b=MrRgBAI8xId/JsTDJ+EGsYgIfM9qATWh01KvaC6MsqPv5GeWWbuAM8Xl4wGvo6WLVbKkZH 3zojTOp/AkjhooRTxf//poS6Uq6kMkSBYK+3pfwToSnHzkeGu63pt3L9DH/IsfD+G0jyMy Ayr75bhXKOmcSoroTqT1u6ADUfqjzGnK857tblUz3o5WuXtZkrJCfoGL6szeY/jTHWz9BJ UpAsFuCfOhARevBZgVqqB/kraycCxk5orDR48KoIPxM1YRy1QUOd6u3R9wc1XTx2z8fAYO LkHJhuyPpTHji6v8SeceYUsdClchndhw1b94tHqQIMibUDqvFcJ8Lquvk664tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706503577; a=rsa-sha256; cv=none; b=BbVkFAOWBsrdZFFyNn36kxADkR4DyEllVUZhJVr8Ol78DvPT3HE6WkBM1MtG0gk3M54M0N /cLjaDP5whfveTrrZI1PNG68AojGO73USG9FoK/0uH0f+6e1S3bplB9aFM6Ga/Y/FKKWeJ RnQvFKFuC0wx/Uqv6hYkH5OI/eo6gHHdADQFiEIY+nzwZlHxQcmHrvQNo6zrGQwwKSI5/J PUSyaDWq+Jq33+gmtHupXDnd4RktlU4WxkP5hnnigMIJB8d/rNiCOF1hsc57JI2aW8Z9uF xe9NLdCQqLdXKNdjA/e1RD9/uCWNqHAieCcLeisugDAcT0we1ZSAMB4ltaoXBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNbNT4DCZzcyp; Mon, 29 Jan 2024 04:46: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 40T4kHPM010964; Mon, 29 Jan 2024 04:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T4kHN2010961; Mon, 29 Jan 2024 04:46:17 GMT (envelope-from git) Date: Mon, 29 Jan 2024 04:46:17 GMT Message-Id: <202401290446.40T4kHN2010961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2b92b754f18c - main - kldxref: Be more conservative about what we reject. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b92b754f18ce86e11e56f91c73aae8d89be80cc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b92b754f18ce86e11e56f91c73aae8d89be80cc commit 2b92b754f18ce86e11e56f91c73aae8d89be80cc Author: Warner Losh AuthorDate: 2024-01-29 04:45:03 +0000 Commit: Warner Losh CommitDate: 2024-01-29 04:45:23 +0000 kldxref: Be more conservative about what we reject. kldxref anything whose name doesn't end in .ko or that has no dots (eg the kernel). Sponsored by: Netflix Reviewed by: jrtc27, jhb Differential Revision: https://reviews.freebsd.org/D43507 --- usr.sbin/kldxref/kldxref.8 | 14 ++++++-------- usr.sbin/kldxref/kldxref.c | 7 ++++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8 index 0b141bb18a1c..1704847592cd 100644 --- a/usr.sbin/kldxref/kldxref.8 +++ b/usr.sbin/kldxref/kldxref.8 @@ -50,14 +50,12 @@ file is created, and the preexisting hint file (if there was one in that directory) is removed. .Pp .Nm -ignores files with at least two "."s in the filename, such as -.Pa foo.ko.debug -or -.Pa bar.ko.pkgsave . -Note that this means that modules cannot have names such as -.Pa foo.bar.ko . -This limitation however, has been lived practice since the beginning of -FreeBSD's kernel modules. +only processes files that either have no dots in their name like +.Pa kernel +or that end in +.Dq .ko +like +.Pa foo.ko . .Pp The following options are available: .Bl -tag -width indent diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index 1694f069564b..1f06ad811d91 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -842,10 +842,11 @@ main(int argc, char *argv[]) continue; /* * Skip files that generate errors like .debug, .symbol and .pkgsave - * by generally skipping all files with 2 dots. + * by generally skipping all files not ending with ".ko" or that have + * no dots in the name (like kernel). */ - dot = strchr(p->fts_name, '.'); - if (dot && strchr(dot + 1, '.') != NULL) + dot = strrchr(p->fts_name, '.'); + if (dot != NULL && strcmp(dot, ".ko") != 0) continue; read_kld(p->fts_path, p->fts_name); } From nobody Mon Jan 29 05:14:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNc1B1Y0Cz589H2; Mon, 29 Jan 2024 05:14: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 4TNc1B12pmz4NF1; Mon, 29 Jan 2024 05:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706505278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LURtZK8Fc5A6xmQu40vd/U6F/OqqDeyLo5JECiwTKnQ=; b=dLCa5vBho626mvWTmkzHnfC0/4TQpMF3VbiyTSvFj+HpoBFOL8CbeU9SgB77mAFVYSDUv5 fdFK+aFgXdmGTRjM6ECMenlhFtQh0VBwQsfkeVJtCgmwVf4f4y00TjebuPaBK6yuPoov6b rt8NfTgIs+RYzudw5lmwCe7uIMbq6X1p3nwpWGUFtxK+dvS8kQtPRkOwobHp6snBN6NuM3 JvUy5I+GHGRFdjfYZFB0z0QNPddS04oOVuXtzFPVfgk86tW2iumzwW4WswTi4cAEhcfNDW mqR9eVYREwO1hw3WkJoogp+hyGrraXR4jB9kOtM/MsZyEE+x/CcSVyJ5dp3lTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706505278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LURtZK8Fc5A6xmQu40vd/U6F/OqqDeyLo5JECiwTKnQ=; b=qrV9SgaQAuVf/c+iprapwOhmwXkjqXvNNVy2Nze0Aduv5RiVXC9b3pHU+NkcvipNgmmHdE K+ZRih9l+Bp7soNzpvJ9nECjea4Y7eSbuLJCM9BreA/xglrxgl9TLc4yOo+BxlFtEsxUE0 XR9eeklRrZ2ahvsl72TKxb39pSgSezusU3XfV2x946e97vjpph6NX1cUMSia/ySAqxuv3i gSzB2gcnP53we34GjSG4oEOi1d9rAIBTJhoXhLASw9MTdtKhlWLmRnP5pWJsTsUDkmwzGZ GLOsWpJKQ/088bbkL5iTSOqdpMVRsOUo0SoSTFpg0IjuC/+AjYOgUM1pouRoxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706505278; a=rsa-sha256; cv=none; b=WgfnUVkIbdztcnY7HOO7FzjYgYygbv2xnytAqMu4DJ0mzkleNmM+B9bECoZ8hIqxxc7OR5 RVEuLBQHmmoOWuB/8l9ViWsTyTVhChzanrblJ9je2CeFH8kt5tqi3Ih/lhHDYuUposAavQ ibGpe4reAHZtlUsYlDfY9SY2AoFIZ7mwT4zmI+xWvl58sYLxugCSOfOP7mFMkpnSsIC4Js A3xyXLUMcwMGehmWmBPv6uk5ECs9SMnVvnyYt7d/8cuoocYRGlqZYasku6+AAHJuTOl1iw D5bYpXELy/s7c1YZvo8X7fssUTb89FPv5njD2WonTZKpGMkXVflH53zxma+BOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNc196vmlzf6v; Mon, 29 Jan 2024 05:14: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 40T5EbX6061792; Mon, 29 Jan 2024 05:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T5Eb1i061789; Mon, 29 Jan 2024 05:14:37 GMT (envelope-from git) Date: Mon, 29 Jan 2024 05:14:37 GMT Message-Id: <202401290514.40T5Eb1i061789@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3be59adbb5a2 - main - vtnet: Adjust for ethernet alignment. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3be59adbb5a2ae7600d46432d3bc82286e507e95 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3be59adbb5a2ae7600d46432d3bc82286e507e95 commit 3be59adbb5a2ae7600d46432d3bc82286e507e95 Author: Warner Losh AuthorDate: 2024-01-29 05:08:55 +0000 Commit: Warner Losh CommitDate: 2024-01-29 05:08:55 +0000 vtnet: Adjust for ethernet alignment. If the header that we add to the packet's size is 0 % 4 and we're strictly aligning, then we need to adjust where we store the header so the packet that follows will have it's struct ip header properly aligned. We do this on allocation (and when we check the length of the mbufs in the lro_nomrg case). We can't just adjust the clustersz in the softc, because it's also used to allocate the mbufs and it needs to be the proper size for that. Since we otherwise use the size of the mbuf (or sometimes the smaller size of the received packet) to compute how much we can buffer, this ensures no overflows. The 2 byte adjustment also does not affect how many packets we can receive in the lro_nomrg case. PR: 271288 Sponsored by: Netflix Reviewed by: bryanv Differential Revision: https://reviews.freebsd.org/D43224 --- sys/dev/virtio/network/if_vtnet.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 287af7751066..11c640bccdeb 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1534,6 +1534,15 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) } m->m_len = size; +#ifndef __NO_STRICT_ALIGNMENT + /* + * Need to offset the mbuf if the header we're going to add + * will misalign. + */ + if (sc->vtnet_hdr_size % 4 == 0) { + m_adj(m, ETHER_ALIGN); + } +#endif if (m_head != NULL) { m_tail->m_next = m; m_tail = m; @@ -1560,6 +1569,14 @@ vtnet_rxq_replace_lro_nomrg_buf(struct vtnet_rxq *rxq, struct mbuf *m0, sc = rxq->vtnrx_sc; clustersz = sc->vtnet_rx_clustersz; +#ifndef __NO_STRICT_ALIGNMENT + /* + * Need to offset the mbuf if the header we're going to add will + * misalign, account for that here. + */ + if (sc->vtnet_hdr_size % 4 == 0) + clustersz -= ETHER_ALIGN; +#endif m_prev = NULL; m_tail = NULL; @@ -1683,6 +1700,10 @@ vtnet_rxq_enqueue_buf(struct vtnet_rxq *rxq, struct mbuf *m) header_inlined = vtnet_modern(sc) || (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) != 0; /* TODO: ANY_LAYOUT */ + /* + * Note: The mbuf has been already adjusted when we allocate it if we + * have to do strict alignment. + */ if (header_inlined) error = sglist_append_mbuf(sg, m); else { From nobody Mon Jan 29 05:44:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNcg53zltz58D6F; Mon, 29 Jan 2024 05:44: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 4TNcg52xj3z4Qx7; Mon, 29 Jan 2024 05:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706507041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrnTPm9QB20GMrYAzzvRSznjAvHA3RwZp0ze2bgDskU=; b=U7zeQUxES/T6MzsbT/6FI0nGqajn0P858ex4LGPzfBjYu4xf3nEnv6+iOrmPGYo963IUD7 mKyREb/YStzaD2Rndci5Ve3P8pTve3hvSZCo7Etu99TgfySs+KiEQQFF+qLnecbvtlUWXk GPmTgX4dMmekvIWKVEm4ea9UIMPAvkGXKB0u66nTQOsWD8ijbdsSVWGOM2rhRce+HWWb7p Kfv606KoASMH3PWhWPwv5Ej9nRMP3KfD8T5sfKCGzxnAokW4WK4tT6ljk+/TPQSowybJWR DrNw17i4++YCR8suP/ey4ZbtPL+THnvx7LohUTtkRdzVlIRI7yFSIIxZuUnj2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706507041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrnTPm9QB20GMrYAzzvRSznjAvHA3RwZp0ze2bgDskU=; b=vP9l3C/7w/MQjwgto/BZUqMHPtryCHk5VWkZWh14UKa1ltF7Zr9qIaLQLgf0KBnDr2YQ7b K5DTXg8ZMy+LhRz1/wG2Vzbrh1p/xWT4yulZZVQhphInXOwIklc6Iy/LAlHxmhcrlk/qqy gRqaeCPOPk0UPe7LaKdpFv2s45KhnI9/yr7RAmxA89yzuthcA9FQlTQ7PP0+xdu8N5uJ6Z qW79ApW2Z6Jwg2RP8oPcLNwBxK0CiOgEXfRAqkJrXyXZjmJJXlwAtKxKVV1/KeXY4Rr1a5 TKWXX8mnIxqNyNyJYqnMyA2twPfLlcSmgOvCTeGWy4lLnY1P3a2hF6q9X5XrJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706507041; a=rsa-sha256; cv=none; b=RcoheTMXcKzCX6AxMmTAIf/+HIwrzXW0s+MxYozojAD4YYJKORgqTIxFM/GO8PZBddB/GY RJ8NmMAT/YNK7RkZHUgEijnpGA5GLc7xerF16lYZ+NB59X4n06c6tJo9j2FEKPK00R5A1r DsXao8cX8l4e3No/e4s6Oup12knM3BnvXoNVjFxQADM1TewlH61dnuawH1xOPQeENHsciJ BrTdBwr+7Ms+n2U/z/DI4KLPacZzw2RPdUOVHq/mMDAjo3IAY+L+mfluzBFFdFeGh4MQ0G EW63BvqT+WzRkaqOb4ltSQbCpbbtf7AxX5uiL2BuHtjJVi2lCJwfmLVC8fkTOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNcg522JMzfwr; Mon, 29 Jan 2024 05:44: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 40T5i1iA011637; Mon, 29 Jan 2024 05:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T5i15M011635; Mon, 29 Jan 2024 05:44:01 GMT (envelope-from git) Date: Mon, 29 Jan 2024 05:44:01 GMT Message-Id: <202401290544.40T5i15M011635@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: 7b707e797b2c - main - Revert "release.sh: Add -jN to `make release`" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b707e797b2cd6265ba8f6215e59445e9efb9e97 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b707e797b2cd6265ba8f6215e59445e9efb9e97 commit 7b707e797b2cd6265ba8f6215e59445e9efb9e97 Author: Colin Percival AuthorDate: 2024-01-29 05:42:24 +0000 Commit: Colin Percival CommitDate: 2024-01-29 05:43:56 +0000 Revert "release.sh: Add -jN to `make release`" The release-building code is not fully parallel-safe yet. This reverts commit 9c1bad2da5ae2a2a3d957c97dcf33c09b34e1c47. Reported by: jrtc27 --- release/release.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/release/release.sh b/release/release.sh index 373d10d9a303..75278a12daa6 100755 --- a/release/release.sh +++ b/release/release.sh @@ -89,11 +89,9 @@ env_setup() { SRC_CONF="/dev/null" # The number of make(1) jobs, defaults to the number of CPUs available - # for buildworld, and half of number of CPUs available for buildkernel - # and 'make release'. + # for buildworld, and half of number of CPUs available for buildkernel. WORLD_FLAGS="-j$(sysctl -n hw.ncpu)" KERNEL_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" - RELEASE_FLAGS="-j$(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2))" MAKE_FLAGS="-s" @@ -192,7 +190,7 @@ env_check() { ${CONF_FILES}" RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \ KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}" - RELEASE_RMAKEFLAGS="${ARCH_FLAGS} ${RELEASE_FLAGS} \ + RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \ WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \ WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}" From nobody Mon Jan 29 08:25:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNhFL3mz4z58SvD; Mon, 29 Jan 2024 08:25: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 4TNhFL1rDyz4dVm; Mon, 29 Jan 2024 08:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706516726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RVnk7nR1CzK/NHlHzjryXpUhL2380vzSB6htka3E6Q=; b=ujRyRyrniVsQg7xrI7H9iR1YkSQ2hlsDzPnL8jSN4WSjEueh8ggbEgCvKSxloteWCRr1xV EOSTl6gEYC7B8FN+FEF2cwIHP8etlA95CM+TWnJy7/6Lsrm0IaUzaifu4PbHtaWjCNT9cD EXjdly4tbrvaXVcWWl/fAaMgBB6nnB6m5PTEjUrIAsR2lm526PzuSbCjEyNKf6gLpmkALf +ufYpaySbfLkV8YiKflqC6rYfF4ofBQirgofjlgHuEAhI7m5oodhUEyREuz/rAZAjbaky/ F6H2bUscjDWvHBTg9EdFWOjuIFeOQ4rs5hNAHfvivEmap1I0kuEaUt6qv76G8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706516726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6RVnk7nR1CzK/NHlHzjryXpUhL2380vzSB6htka3E6Q=; b=lO3Dc4mYrJHtuTRa/c30mGYavJ9xnvkyhqGf3ubHyYU1aRF7YmkqT9C2gNfnPamdL2ZDGz VLfHarNZGJ4gJiMJLAkUPxfmjKhcZWSbYi6gCqUBSZrPY/7c94MWUaZzC1tfSusj9shG2B bMY2LIPsLl1u2B4Etat1005Icn3Pr1OYtX8biOzBvp3KIYK1I5ks+oACUtX3gQc7C5dps3 uFzho0LwQfaCX4jCA3mWIpsBhJUNre4JuHW5EikrMHsVhi4lXqFUXRvLicRj4wn9qwCPy3 zhYnVYYgC4gvLR8RDE77R+j3mS6h1whg2ENmGTyvDcqkf1JNLAUD8HK5kA569g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706516726; a=rsa-sha256; cv=none; b=WDDrF+/ZoqHeWn788+9TPlZLoD1UhUJNlEhPwD26ynu3zWmtOcsG+qmJy/dQu8+PvHUEB8 8o4SDHlAPmifGiCwcNGkenNPRlzHkYHH/+T1p1o0Cnd2L9ak6yGEMzZOgwp1wr/PA4yYxx MoK541gLFyloc+umrPI3T0DnGhU+vwhZgjTpEsdqAEFvGWVL6DMjVrKv3tsxXE1QlZJ81F x1tzZbjzjjiFdub5BMFw4cb7XGRNxndNRUcSMzr3KZsV1G8Fjn5vpVYhZqY4PwIO0r3YBF jJaDlKVGl3+lljqkHw8bP0zzIfdlbLp1eL1NPSs+tZInQZctnJXIU6vLn3C5PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNhFL0w1Kzkp1; Mon, 29 Jan 2024 08:25: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 40T8PQgP081681; Mon, 29 Jan 2024 08:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40T8PQFp081678; Mon, 29 Jan 2024 08:25:26 GMT (envelope-from git) Date: Mon, 29 Jan 2024 08:25:26 GMT Message-Id: <202401290825.40T8PQFp081678@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: 0b3f9e435f2b - main - tcp: move cc_post_recovery past snd_una update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b3f9e435f2bde9e5be27030d9f574a977a1ad47 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=0b3f9e435f2bde9e5be27030d9f574a977a1ad47 commit 0b3f9e435f2bde9e5be27030d9f574a977a1ad47 Author: Richard Scheffenegger AuthorDate: 2024-01-27 23:16:59 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-27 23:18:51 +0000 tcp: move cc_post_recovery past snd_una update The RFC6675 pipe calculation (sack.revised, enabled by default since D28702), uses outdated information, while the previous default calculated it correctly with up-to-date information from the incoming ACK. This difference can become as large as the receive window (not the congestion window previously), potentially triggering a massive burst of new packets. MFC after: 1 week Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43520 --- sys/netinet/tcp_input.c | 50 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 98564ff67f22..afcda60137ec 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -474,13 +474,12 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) { INP_WLOCK_ASSERT(tptoinpcb(tp)); - /* XXXLAS: KASSERT that we're in recovery? */ - if (CC_ALGO(tp)->post_recovery != NULL) { tp->t_ccv.curack = th->th_ack; CC_ALGO(tp)->post_recovery(&tp->t_ccv); } - /* XXXLAS: EXIT_RECOVERY ? */ + EXIT_RECOVERY(tp->t_flags); + tp->t_bytes_acked = 0; tp->sackhint.delivered_data = 0; tp->sackhint.prr_delivered = 0; @@ -2813,11 +2812,13 @@ resume_partialack: * If the congestion window was inflated to account * for the other side's cached packets, retract it. */ - if (IN_FASTRECOVERY(tp->t_flags)) { - if (SEQ_LT(th->th_ack, tp->snd_recover)) { + if (SEQ_LT(th->th_ack, tp->snd_recover)) { + if (IN_FASTRECOVERY(tp->t_flags)) { if (tp->t_flags & TF_SACK_PERMIT) { - if (V_tcp_do_prr && to.to_flags & TOF_SACK) { - tcp_timer_activate(tp, TT_REXMT, 0); + if (V_tcp_do_prr && + (to.to_flags & TOF_SACK)) { + tcp_timer_activate(tp, + TT_REXMT, 0); tp->t_rtttime = 0; tcp_do_prr_ack(tp, th, &to, sack_changed, &maxseg); @@ -2830,24 +2831,18 @@ resume_partialack: } else { tcp_newreno_partial_ack(tp, th); } - } else { - cc_post_recovery(tp, th); - } - } else if (IN_CONGRECOVERY(tp->t_flags)) { - if (SEQ_LT(th->th_ack, tp->snd_recover)) { - if (V_tcp_do_prr) { - tp->sackhint.delivered_data = BYTES_THIS_ACK(tp, th); - tp->snd_fack = th->th_ack; - /* - * During ECN cwnd reduction - * always use PRR-SSRB - */ - tcp_do_prr_ack(tp, th, &to, SACK_CHANGE, - &maxseg); - (void) tcp_output(tp); - } - } else { - cc_post_recovery(tp, th); + } else if (IN_CONGRECOVERY(tp->t_flags) && + (V_tcp_do_prr)) { + tp->sackhint.delivered_data = + BYTES_THIS_ACK(tp, th); + tp->snd_fack = th->th_ack; + /* + * During ECN cwnd reduction + * always use PRR-SSRB + */ + tcp_do_prr_ack(tp, th, &to, SACK_CHANGE, + &maxseg); + (void) tcp_output(tp); } } /* @@ -2999,12 +2994,11 @@ process_ACK: SEQ_GT(tp->snd_una, tp->snd_recover) && SEQ_LEQ(th->th_ack, tp->snd_recover)) tp->snd_recover = th->th_ack - 1; - /* XXXLAS: Can this be moved up into cc_post_recovery? */ + tp->snd_una = th->th_ack; if (IN_RECOVERY(tp->t_flags) && SEQ_GEQ(th->th_ack, tp->snd_recover)) { - EXIT_RECOVERY(tp->t_flags); + cc_post_recovery(tp, th); } - tp->snd_una = th->th_ack; if (tp->t_flags & TF_SACK_PERMIT) { if (SEQ_GT(tp->snd_una, tp->snd_recover)) tp->snd_recover = tp->snd_una; From nobody Mon Jan 29 13:52:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNqVy0t8qz58lq5; Mon, 29 Jan 2024 13:52: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 4TNqVx75XMz4MjD; Mon, 29 Jan 2024 13:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706536362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyxS/XR5DbYrJFevdroidpIYFBXIv5nOx8xZV9W3dx4=; b=FyrmvfWFOnavX4kPqEi55HYSBsW3TYEXblzR3O7AbbHDSc4QyiYxQmzQ8rNZhafPLWKGRt ZC7bzqIqELatrIYw8LLZ6o/kfO3UUvEfnOUP7ofbSfvP5TMpjn430CpClZgqx+/em6OtAA gPzepHVxr26m7HthArugq7HHirCe+0hQ3mIQOSGXcAG/dqP0K6mrxAvi1ahxSNYqGKajyd plsF6vt6J7Br+aYewnD/pLo872oSD3VC0Yd5pdK8FVWb1EH6k7BxVVGutHQZmKSEQfG62f cbpnK0LnMxaujEvxX/3m0EH3E9tbhM6FdYDFhW1iluYHT7l3nZ/eRQ5wb6B9hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706536362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FyxS/XR5DbYrJFevdroidpIYFBXIv5nOx8xZV9W3dx4=; b=J2HV+4b4QhzZ17+KiUFquDvtIl+kyziie7INjwuMPS/6zJ4kA/0DOUkVb0zE05qmo37ewv csjc/sPWGV+tq1pkiezSQbsOrvSfwitq4GOb1dGpqkHnr5JV8zX7NF6iEVPvxN9x2TXmYW j4WSHKy8cwXuEb5eSpY4LqYububEE1u57H8zkHPZ3hYzS1kLOxoEpOYJcNTwJcRuW4GNtI 1oagwVbe4g5plIx6levLR91ngQvirsJLXewClAfL21Uf6UHB230nQEXYVin8y/2iEVYbcL abYFfv4HflsfkMgaPHIwDs4xk9jKQkU4j8KFPmPOd/qOf2FF976aJp3w7Te4pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706536362; a=rsa-sha256; cv=none; b=BqMV/Igj1jHP6H2Dpv14//dCnFaXcNH8U9GiFlKKbYNpJbZI3ZmtT28vj7cPSPXCwkUy13 X6pipM8ibI5HUpmm9CFcqvHfZHCpjchugXoWuRDUTS4Lr0JniJ31nxxGU4vnl0QzFiWZws 76eP/Put8MLOvlf32ujdyfvTTRelbimFH2hqr79JbWi8MvZouRp7jjWMCUE1mUviEWtGgc M+O3HYHbSan+ofIxoiI8jsa2VMZXAEsv3r3w01JbIJL0i/DqzaV3foPQ6g65rWFyMKn6Ed gt+qiiRV8aoyVIp8QCLN+gz9BvgQqkROqBg1BLUss1VQeENE0WO1xYHLHlPn7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNqVx69QyztR1; Mon, 29 Jan 2024 13:52: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 40TDqftB033576; Mon, 29 Jan 2024 13:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TDqfBZ033573; Mon, 29 Jan 2024 13:52:41 GMT (envelope-from git) Date: Mon, 29 Jan 2024 13:52:41 GMT Message-Id: <202401291352.40TDqfBZ033573@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: ffeab76b6855 - main - pfil: PFIL_PASS never frees the mbuf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffeab76b68550c347abcd7c31c3b3dfcdea732b5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ffeab76b68550c347abcd7c31c3b3dfcdea732b5 commit ffeab76b68550c347abcd7c31c3b3dfcdea732b5 Author: Kristof Provost AuthorDate: 2024-01-26 12:29:31 +0000 Commit: Kristof Provost CommitDate: 2024-01-29 13:10:19 +0000 pfil: PFIL_PASS never frees the mbuf pfil hooks (i.e. firewalls) may pass, modify or free the mbuf passed to them. (E.g. when rejecting a packet, or when gathering up packets for reassembly). If the hook returns PFIL_PASS the mbuf must still be present. Assert this in pfil_mem_common() and ensure that ipfilter follows this convention. pf and ipfw already did. Similarly, if the hook returns PFIL_DROPPED or PFIL_CONSUMED the mbuf must have been freed (or now be owned by the firewall for further processing, like packet scheduling or reassembly). This allows us to remove a few extraneous NULL checks. Suggested by: tuexen Reviewed by: tuexen, zlei Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43617 --- sys/net/if_ethersubr.c | 2 +- sys/net/pfil.c | 7 ++++++- sys/netinet/ip_input.c | 4 ---- sys/netinet6/ip6_input.c | 2 -- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 4 ++++ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index ef0b1f705260..4332f4ce864e 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -878,7 +878,7 @@ ether_demux(struct ifnet *ifp, struct mbuf *m) /* Do not grab PROMISC frames in case we are re-entered. */ if (PFIL_HOOKED_IN(V_link_pfil_head) && !(m->m_flags & M_PROMISC)) { i = pfil_mbuf_in(V_link_pfil_head, &m, ifp, NULL); - if (i != 0 || m == NULL) + if (i != PFIL_PASS) return; } diff --git a/sys/net/pfil.c b/sys/net/pfil.c index 3ceffcefb758..fae150839eb3 100644 --- a/sys/net/pfil.c +++ b/sys/net/pfil.c @@ -211,9 +211,14 @@ pfil_mbuf_common(pfil_chain_t *pch, struct mbuf **m, struct ifnet *ifp, CK_STAILQ_FOREACH(link, pch, link_chain) { rv = link->link_mbuf_chk(m, ifp, flags, link->link_ruleset, inp); - if (rv == PFIL_DROPPED || rv == PFIL_CONSUMED) + if (rv == PFIL_DROPPED || rv == PFIL_CONSUMED) { + MPASS(*m == NULL); break; + } else { + MPASS(*m != NULL); + } } + return (rv); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index e501c15cb7e8..82d7acdd0710 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -621,8 +621,6 @@ tooshort: if (pfil_mbuf_in(V_inet_pfil_head, &m, ifp, NULL) != PFIL_PASS) return; - if (m == NULL) /* consumed by filter */ - return; ip = mtod(m, struct ip *); dchg = (odst.s_addr != ip->ip_dst.s_addr); @@ -827,8 +825,6 @@ ours: if (pfil_mbuf_out(V_inet_local_pfil_head, &m, V_loif, NULL) != PFIL_PASS) return; - if (m == NULL) /* consumed by filter */ - return; ip = mtod(m, struct ip *); } diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 5de8f49b5483..11b92c152a1a 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -894,8 +894,6 @@ passin: if (pfil_mbuf_out(V_inet6_local_pfil_head, &m, V_loif, NULL) != PFIL_PASS) return; - if (m == NULL) /* consumed by filter */ - return; ip6 = mtod(m, struct ip6_hdr *); } diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 1922880e90df..bcde0d2c7323 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -133,6 +133,8 @@ ipf_check_wrapper(struct mbuf **mp, struct ifnet *ifp, int flags, rv = ipf_check(&V_ipfmain, ip, ip->ip_hl << 2, ifp, !!(flags & PFIL_OUT), mp); CURVNET_RESTORE(); + if (rv == 0 && *mp == NULL) + return (PFIL_CONSUMED); return (rv == 0 ? PFIL_PASS : PFIL_DROPPED); } @@ -147,6 +149,8 @@ ipf_check_wrapper6(struct mbuf **mp, struct ifnet *ifp, int flags, rv = ipf_check(&V_ipfmain, mtod(*mp, struct ip *), sizeof(struct ip6_hdr), ifp, !!(flags & PFIL_OUT), mp); CURVNET_RESTORE(); + if (rv == 0 && *mp == NULL) + return (PFIL_CONSUMED); return (rv == 0 ? PFIL_PASS : PFIL_DROPPED); } From nobody Mon Jan 29 13:52:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNqVz2JVwz58lN6; Mon, 29 Jan 2024 13:52: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 4TNqVz0nKmz4MLd; Mon, 29 Jan 2024 13:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706536363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nL+IORLsEmj27omocAzjzvbbtsXRK/tRk+Ib+u+J+64=; b=ZgckFfnOguqH8Oooo8M54RRDM1LInJalh4q3gZrpLeB8GlPq2691cgRMy5dsVvaTrZ7HM+ yGQRn46g4EgHWt7o1vt9kGxfY8UBNDv+UT1FAKYb44eLUJA+OZEp5ux55+ttGZNIGVOyzx zYySVVMLbGcIuq7guykktRfR9LRBW1YYGWqDtYJV5CE1m876mDGOh+GvTPsNKjeQ2h4Mbb wYq4hOSV4Z3fEWi6JBKtNr7c3k8hWEhIqG/Cwe6QM3k+LIQr8637wUZQR5qmFjcfQVbKKx kdw+S3itcxt+9iHl2ohfRwtbZuXpoBvwHOkdZj408r4WqDr/ZyArKV8DlI3l8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706536363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nL+IORLsEmj27omocAzjzvbbtsXRK/tRk+Ib+u+J+64=; b=Im6P8SuZdHnLl489ovfQ58Vndcwk4zXXQiAwRE66zr0atFSniVc04bSUxNiffnjh4w2QLR 0x3ZwTmZwAXvabUKOjHqtTmAapkYv2wxetbXBjlv+VJQVG1WAQ0fwRVZo6DNt+XI8GxZAl wNV4v1RnRZxIpoIAcEaN9UT+hy5RCIfT9O1a5ovoP8I2LyoNQA5VAT443/lVkMskT08Bqi s9DWP8rEDNcRHNmp+uPfIh2eyWUN+DizAvpPgccRNdb02Xh+eqwIO9B9Vyr4Nx3DguHw+Q zTV9/ICxHc0iwYtMVPqU5z/F+N31NwAGLtK3WB1lx29uqSk2EGDinH/vAD06HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706536363; a=rsa-sha256; cv=none; b=XxebXl2VxepmHODCZ787rNt6hdb5B86aveXG2RayVhDk03YxCtScYJaj2ciAYV56Uv53a0 6vbOF5HSMF0OG/SeDapU+73sTPboXNLvI9Pucpg/IJ5Q3lOwxPVC3X3iO/Sli/D7J9oGDt B2X/qJq36eZJyBt4G1wiVNkSoyQNhdnA9Y2Yt2UxX/zJFVBVaYi18SyJhAw9SEncs5SQWD POf/SiO9t4mAGh+n47fgOQcYIIbD/Gp+TCo/No7OqYBYrKPiZRHBAwhBOBtk7TLulTfKAU I+jAu1+C95knDAoO6pvCMnDMPKFb4lrz9X9hovB5X72TGpio+Oaftws1BaCidQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNqVy701Xztdy; Mon, 29 Jan 2024 13:52: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 40TDqgWA033627; Mon, 29 Jan 2024 13:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TDqgSi033624; Mon, 29 Jan 2024 13:52:42 GMT (envelope-from git) Date: Mon, 29 Jan 2024 13:52:42 GMT Message-Id: <202401291352.40TDqgSi033624@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: 31828075e456 - main - pf: bind route-to states to their route-to interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31828075e456c042cabd47ff4eb127c5c19f16e0 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=31828075e456c042cabd47ff4eb127c5c19f16e0 commit 31828075e456c042cabd47ff4eb127c5c19f16e0 Author: Kristof Provost AuthorDate: 2024-01-25 10:16:49 +0000 Commit: Kristof Provost CommitDate: 2024-01-29 13:10:26 +0000 pf: bind route-to states to their route-to interface When we route-to the state should be bound to the route-to interface, not the default route interface. However, we should only do so for outbound traffic, because inbound traffic should bind on the arriving interface, not the one we eventually transmit on. Explicitly check for this in BOUND_IFACE(). We must also extend pf_find_state(), because subsequent packets within the established state will attempt to match the original interface, not the route-to interface. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43589 --- sys/netpfil/pf/pf.c | 27 +++++++++++++++++++++---- tests/sys/netpfil/pf/route_to.sh | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2dc6d02d330a..36ff0eac16ad 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -412,8 +412,27 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); return (PF_PASS); \ } while (0) -#define BOUND_IFACE(r, k) \ - ((r)->rule_flag & PFRULE_IFBOUND) ? (k) : V_pfi_all +static struct pfi_kkif * +BOUND_IFACE(struct pf_krule *r, struct pfi_kkif *k, struct pf_pdesc *pd) +{ + /* Floating unless otherwise specified. */ + if (! (r->rule_flag & PFRULE_IFBOUND)) + return (V_pfi_all); + + /* Don't overrule the interface for states created on incoming packets. */ + if (pd->dir == PF_IN) + return (k); + + /* No route-to, so don't overrrule. */ + if (r->rt != PF_ROUTETO) + return (k); + + if (r->rpool.cur == NULL) + return (k); + + /* Bind to the route-to interface. */ + return (r->rpool.cur->kif); +} #define STATE_INC_COUNTERS(s) \ do { \ @@ -1600,7 +1619,7 @@ pf_find_state(struct pfi_kkif *kif, struct pf_state_key_cmp *key, u_int dir) /* List is sorted, if-bound states before floating ones. */ TAILQ_FOREACH(s, &sk->states[idx], key_list[idx]) - if (s->kif == V_pfi_all || s->kif == kif) { + if (s->kif == V_pfi_all || s->kif == kif || s->orig_kif == kif) { PF_STATE_LOCK(s); PF_HASHROW_UNLOCK(kh); if (__predict_false(s->timeout >= PFTM_MAX)) { @@ -4999,7 +5018,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, __func__, nr, sk, nk)); /* Swap sk/nk for PF_OUT. */ - if (pf_state_insert(BOUND_IFACE(r, kif), kif, + if (pf_state_insert(BOUND_IFACE(r, kif, pd), kif, (pd->dir == PF_IN) ? sk : nk, (pd->dir == PF_IN) ? nk : sk, s)) { REASON_SET(&reason, PFRES_STATEINS); diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index d8cfb1b22d8b..7e8310bceb30 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -365,6 +365,48 @@ dummynet_cleanup() pft_cleanup } +atf_test_case "ifbound" "cleanup" +ifbound_head() +{ + atf_set descr 'Test that route-to states bind the expected interface' + atf_set require.user root +} + +ifbound_body() +{ + pft_init + + j="route_to:ifbound" + + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + ifconfig ${epair_one}b up + + vnet_mkjail ${j}2 ${epair_two}b + jexec ${j}2 ifconfig ${epair_two}b inet 198.51.100.2/24 up + jexec ${j}2 ifconfig ${epair_two}b inet alias 203.0.113.1/24 + jexec ${j}2 route add default 198.51.100.1 + + vnet_mkjail $j ${epair_one}a ${epair_two}a + jexec $j ifconfig ${epair_one}a 192.0.2.1/24 up + jexec $j ifconfig ${epair_two}a 198.51.100.1/24 up + jexec $j route add default 192.0.2.2 + + jexec $j pfctl -e + pft_set_rules $j \ + "set state-policy if-bound" \ + "block" \ + "pass out route-to (${epair_two}a 198.51.100.2)" + + atf_check -s exit:0 -o ignore \ + jexec $j ping -c 3 203.0.113.1 +} + +ifbound_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4" @@ -373,4 +415,5 @@ atf_init_test_cases() atf_add_test_case "multiwanlocal" atf_add_test_case "icmp_nat" atf_add_test_case "dummynet" + atf_add_test_case "ifbound" } From nobody Mon Jan 29 15:08:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNsBK3vrkz58s54; Mon, 29 Jan 2024 15:08: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 4TNsBK3P0Jz4cG6; Mon, 29 Jan 2024 15:08:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706540905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkRngqbmdlT3v590whTngUhQBaWccE80XoOQt2YT/2k=; b=WoS/ZOtAK2I3SM8H6D6G+v2HoMbLCU20M6gOMtljgDc+Txd8B0mkwwN60eds7EZR34KZmv puu0P9JttAqkxNwolyUVR9363qwh+N+km4te3RTjIVBKIkIhgZvGLLdm9JKxJk3DYT2Ix6 oBrGFRN/48yDGhshQqT7N+ye0y5aEH0OFEble5vfayH/OP9dFsOGy0dUkn3ZFuPxWRWMMe iOPLpI0ZxYEt6BqT8xHifQMjRjQLRA/2YuQArGYUzbMDFuXENntZ5dOUEQMvBjBrPUFAUB fw2FR9gNPJmskO/SV2X6djZcELDayP9n33Rcua1o81OsFW46e0IYBtKIIKYnTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706540905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkRngqbmdlT3v590whTngUhQBaWccE80XoOQt2YT/2k=; b=sIPp1vWff0d8JshqyPSnnTge/AJqkWAcvvdAjj5sZ+RmGpL+dtlDjtId5N46gpDz9HFRo1 FfeLZHTgdjTCPlmIHX+TxW+W7NF+E2wmSWJG12mfnh8fRd1C+jzLNO5t2exgUMMZP61Cf6 7k0OPP9a/jsSvKLE2dOa2qWxmwI2HN+/xQn7vOLmEt9pTuaXfME64G0THZ5Xcmkk7MPwYH UZtDUkYlpsLw0uiqj1aUscDPZt8QxmdM//mJyV6mDYMcD0gR8oWMPfGtPZ7xt4uLx8A9BE W2h9ktbbTE0sjzPeAPNWQshe4KceupstIUGqQxxmkAwfGA5dQ46ZkLeF38VmXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706540905; a=rsa-sha256; cv=none; b=ncW+u/CCNhFUfYajxGylGP+1X63klqEy+e6xxPqHEv7tCMyzk0Dk9WV33Xz6a1BW+ZhU+w ONR0tymkwxh1CgWfj3f94ETHE6VAOsU+4AcDsssqqMGdTyZhGHYdcRZtNmqbaKfJSp88AE 9DgzxzRONFG5YIw1T6gu1m7QTpDpbX8UdhUv0SUBa4v8KgsGNJlvJqBzWCg02D6uJyxtKm rl2xRW2NEw4tx2DKc4Iq5cZvig3goZ8B7VMOSAaNcGzUgTDLmK/5dZSiAL8aKkoJiOI1hG b9pV+DpPpIqADB1VQ/Jh0i+4znwtk6Pdh+qIBq94rgoUh7GmbqGoQwYW0C7yCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNsBK2RY9zwDq; Mon, 29 Jan 2024 15:08: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 40TF8Pd7053980; Mon, 29 Jan 2024 15:08:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TF8PSt053977; Mon, 29 Jan 2024 15:08:25 GMT (envelope-from git) Date: Mon, 29 Jan 2024 15:08:25 GMT Message-Id: <202401291508.40TF8PSt053977@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: 5086b6ec32d5 - main - libbe: handle destroying/renaming temporary/bootonce boot environments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5086b6ec32d5c82c3d0894eb7bd74a9b81480644 Auto-Submitted: auto-generated The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=5086b6ec32d5c82c3d0894eb7bd74a9b81480644 commit 5086b6ec32d5c82c3d0894eb7bd74a9b81480644 Author: R. Christian McDonald AuthorDate: 2024-01-26 16:39:38 +0000 Commit: R. Christian McDonald CommitDate: 2024-01-29 15:07:49 +0000 libbe: handle destroying/renaming temporary/bootonce boot environments When a temporary/bootonce boot environment is renamed, we need to also update the bootenv nvlist on-disk to reflect the new name. Additionally, when a temporary/bootonce boot environment is destroyed, we also need to clear out the on-disk state. Reviewed by: kevans Approved by: kp MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43591 --- lib/libbe/be.c | 23 ++++++++-- lib/libbe/be_impl.h | 1 + lib/libbe/be_info.c | 7 +-- sbin/bectl/tests/bectl_test.sh | 102 ++++++++++++++++++++++++++++++++++++----- 4 files changed, 113 insertions(+), 20 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index c74ec9b0f3dc..e61cfc9d68ae 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -175,6 +175,9 @@ libbe_init(const char *root) strcmp(altroot, "-") != 0) lbh->altroot_len = strlen(altroot); + (void) lzbe_get_boot_device(zpool_get_name(lbh->active_phandle), + &lbh->bootonce); + return (lbh); err: if (lbh != NULL) { @@ -199,6 +202,8 @@ libbe_close(libbe_handle_t *lbh) if (lbh->active_phandle != NULL) zpool_close(lbh->active_phandle); libzfs_fini(lbh->lzh); + + free(lbh->bootonce); free(lbh); } @@ -443,6 +448,12 @@ be_destroy_internal(libbe_handle_t *lbh, const char *name, int options, return (set_error(lbh, BE_ERR_DESTROYMNT)); } } + + /* Handle destroying bootonce */ + if (lbh->bootonce != NULL && + strcmp(path, lbh->bootonce) == 0) + (void) lzbe_set_boot_device( + zpool_get_name(lbh->active_phandle), lzbe_add, NULL); } else { /* * If we're initially destroying a snapshot, origin options do @@ -1021,11 +1032,17 @@ be_rename(libbe_handle_t *lbh, const char *old, const char *new) .nounmount = 1, }; err = zfs_rename(zfs_hdl, full_new, flags); + if (err != 0) + goto error; + + /* handle renaming bootonce */ + if (lbh->bootonce != NULL && + strcmp(full_old, lbh->bootonce) == 0) + err = be_activate(lbh, new, true); +error: zfs_close(zfs_hdl); - if (err != 0) - return (set_error(lbh, BE_ERR_UNKNOWN)); - return (0); + return (set_error(lbh, err)); } diff --git a/lib/libbe/be_impl.h b/lib/libbe/be_impl.h index d5fd26c4f072..0327f8abaa0a 100644 --- a/lib/libbe/be_impl.h +++ b/lib/libbe/be_impl.h @@ -36,6 +36,7 @@ struct libbe_handle { char root[BE_MAXPATHLEN]; char rootfs[BE_MAXPATHLEN]; char bootfs[BE_MAXPATHLEN]; + char *bootonce; size_t altroot_len; zpool_handle_t *active_phandle; libzfs_handle_t *lzh; diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c index 88a9b17bf421..509b56cb8cf5 100644 --- a/lib/libbe/be_info.c +++ b/lib/libbe/be_info.c @@ -181,8 +181,8 @@ prop_list_builder_cb(zfs_handle_t *zfs_hdl, void *data_p) dataset = zfs_get_name(zfs_hdl); nvlist_add_string(props, "dataset", dataset); - if (data->bootonce != NULL && - strcmp(dataset, data->bootonce) == 0) + if (data->lbh->bootonce != NULL && + strcmp(dataset, data->lbh->bootonce) == 0) nvlist_add_boolean_value(props, "bootonce", true); name = strrchr(dataset, '/') + 1; @@ -252,9 +252,6 @@ be_proplist_update(prop_data_t *data) ZFS_TYPE_FILESYSTEM)) == NULL) return (BE_ERR_ZFSOPEN); - (void) lzbe_get_boot_device(zpool_get_name(data->lbh->active_phandle), - &data->bootonce); - /* XXX TODO: some error checking here */ zfs_iter_filesystems(root_hdl, prop_list_builder_cb, data); diff --git a/sbin/bectl/tests/bectl_test.sh b/sbin/bectl/tests/bectl_test.sh index 0f167829cf46..00c71e11de09 100755 --- a/sbin/bectl/tests/bectl_test.sh +++ b/sbin/bectl/tests/bectl_test.sh @@ -93,7 +93,6 @@ bectl_cleanup() atf_test_case bectl_create cleanup bectl_create_head() { - atf_set "descr" "Check the various forms of bectl create" atf_set "require.user" root } @@ -157,7 +156,6 @@ bectl_create_cleanup() atf_test_case bectl_destroy cleanup bectl_destroy_head() { - atf_set "descr" "Check bectl destroy" atf_set "require.user" root } @@ -240,14 +238,12 @@ bectl_destroy_body() } bectl_destroy_cleanup() { - bectl_cleanup $(get_zpool_name) } atf_test_case bectl_export_import cleanup bectl_export_import_head() { - atf_set "descr" "Check bectl export and import" atf_set "require.user" root } @@ -278,14 +274,12 @@ bectl_export_import_body() } bectl_export_import_cleanup() { - bectl_cleanup $(get_zpool_name) } atf_test_case bectl_list cleanup bectl_list_head() { - atf_set "descr" "Check bectl list" atf_set "require.user" root } @@ -323,14 +317,12 @@ bectl_list_body() } bectl_list_cleanup() { - bectl_cleanup $(get_zpool_name) } atf_test_case bectl_mount cleanup bectl_mount_head() { - atf_set "descr" "Check bectl mount/unmount" atf_set "require.user" root } @@ -367,14 +359,12 @@ bectl_mount_body() } bectl_mount_cleanup() { - bectl_cleanup $(get_zpool_name) } atf_test_case bectl_rename cleanup bectl_rename_head() { - atf_set "descr" "Check bectl rename" atf_set "require.user" root } @@ -403,14 +393,12 @@ bectl_rename_body() } bectl_rename_cleanup() { - bectl_cleanup $(get_zpool_name) } atf_test_case bectl_jail cleanup bectl_jail_head() { - atf_set "descr" "Check bectl rename" atf_set "require.user" root atf_set "require.progs" jail @@ -577,6 +565,94 @@ bectl_promotion_cleanup() bectl_cleanup $(get_zpool_name) } +atf_test_case bectl_destroy_bootonce cleanup +bectl_destroy_bootonce_head() +{ + atf_set "descr" "Check bectl destroy (bootonce)" + atf_set "require.user" root +} +bectl_destroy_bootonce_body() +{ + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "armv7" ]; then + atf_skip "https://bugs.freebsd.org/249229" + fi + + cwd=$(realpath .) + zpool=$(make_zpool_name) + disk=${cwd}/disk.img + mount=${cwd}/mnt + root=${mount}/root + + be=default2 + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check -s exit:0 -o empty bectl -r ${zpool}/ROOT create -e default ${be} + + # Create boot environment and bootonce activate it + atf_check -s exit:0 -o ignore bectl -r ${zpool}/ROOT activate -t ${be} + atf_check -s exit:0 -o inline:"zfs:${zpool}/ROOT/${be}:\n" zfsbootcfg -z ${zpool} + + # Destroy it + atf_check -s exit:0 -o ignore bectl -r ${zpool}/ROOT destroy ${be} + + # Should be empty + atf_check -s exit:0 -o empty zfsbootcfg -z ${zpool} +} +bectl_destroy_bootonce_cleanup() +{ + bectl_cleanup $(get_zpool_name) +} + +atf_test_case bectl_rename_bootonce cleanup +bectl_rename_bootonce_head() +{ + atf_set "descr" "Check bectl destroy (bootonce)" + atf_set "require.user" root +} +bectl_rename_bootonce_body() +{ + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "i386" ]; then + atf_skip "https://bugs.freebsd.org/249055" + fi + + if [ "$(atf_config_get ci false)" = "true" ] && \ + [ "$(uname -p)" = "armv7" ]; then + atf_skip "https://bugs.freebsd.org/249229" + fi + + cwd=$(realpath .) + zpool=$(make_zpool_name) + disk=${cwd}/disk.img + mount=${cwd}/mnt + root=${mount}/root + + be=default2 + + bectl_create_setup ${zpool} ${disk} ${mount} + atf_check -s exit:0 -o empty bectl -r ${zpool}/ROOT create -e default ${be} + + # Create boot environment and bootonce activate it + atf_check -s exit:0 -o ignore bectl -r ${zpool}/ROOT activate -t ${be} + atf_check -s exit:0 -o inline:"zfs:${zpool}/ROOT/${be}:\n" zfsbootcfg -z ${zpool} + + # Rename it + atf_check -s exit:0 -o ignore bectl -r ${zpool}/ROOT rename ${be} ${be}_renamed + + # Should be renamed + atf_check -s exit:0 -o inline:"zfs:${zpool}/ROOT/${be}_renamed:\n" zfsbootcfg -z ${zpool} +} +bectl_rename_bootonce_cleanup() +{ + bectl_cleanup $(get_zpool_name) +} + atf_init_test_cases() { atf_add_test_case bectl_create @@ -587,4 +663,6 @@ atf_init_test_cases() atf_add_test_case bectl_rename atf_add_test_case bectl_jail atf_add_test_case bectl_promotion + atf_add_test_case bectl_destroy_bootonce + atf_add_test_case bectl_rename_bootonce } From nobody Mon Jan 29 15:26:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNsbT3FXcz58tkn; Mon, 29 Jan 2024 15:26:45 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNsbT06NTz4fKN; Mon, 29 Jan 2024 15:26:44 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 33A3D8D4A177; Mon, 29 Jan 2024 15:26:34 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 1B3092D029D7; Mon, 29 Jan 2024 15:26:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id PaKNKvJKUKtQ; Mon, 29 Jan 2024 15:26:33 +0000 (UTC) Received: from strong-aiccu0.sbone.de (strong-aiccu0.sbone.de [IPv6:fde9:577b:c1a9:f491::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id ACD212D029D2; Mon, 29 Jan 2024 15:26:32 +0000 (UTC) Date: Mon, 29 Jan 2024 15:26:31 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3be59adbb5a2 - main - vtnet: Adjust for ethernet alignment. In-Reply-To: <202401290514.40T5Eb1i061789@gitrepo.freebsd.org> Message-ID: References: <202401290514.40T5Eb1i061789@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Rspamd-Queue-Id: 4TNsbT06NTz4fKN 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:24940, ipnet:2a01:4f8::/32, country:DE] On Mon, 29 Jan 2024, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3be59adbb5a2ae7600d46432d3bc82286e507e95 > > commit 3be59adbb5a2ae7600d46432d3bc82286e507e95 > Author: Warner Losh > AuthorDate: 2024-01-29 05:08:55 +0000 > Commit: Warner Losh > CommitDate: 2024-01-29 05:08:55 +0000 > > vtnet: Adjust for ethernet alignment. > > If the header that we add to the packet's size is 0 % 4 and we're > strictly aligning, then we need to adjust where we store the header so > the packet that follows will have it's struct ip header properly > aligned. We do this on allocation (and when we check the length of the > mbufs in the lro_nomrg case). We can't just adjust the clustersz in the > softc, because it's also used to allocate the mbufs and it needs to be > the proper size for that. Since we otherwise use the size of the mbuf > (or sometimes the smaller size of the received packet) to compute how > much we can buffer, this ensures no overflows. The 2 byte adjustment > also does not affect how many packets we can receive in the lro_nomrg > case. Doesn't this still include at least these two un-asserted/un-documented asumptions: (a) mbuf space is large enough to hold 2 extra bytes? Is this always the case? (b) the struct sizes assigned to vtnet_hdr_size are not odd numbers of bytes? Could add comments or CTASSERTs? > PR: 271288 > Sponsored by: Netflix > Reviewed by: bryanv > Differential Revision: https://reviews.freebsd.org/D43224 -- Bjoern A. Zeeb r15:7 From nobody Mon Jan 29 16:41:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNvFp4n7wz59196; Mon, 29 Jan 2024 16:41: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 4TNvFp2s8gz4qP7; Mon, 29 Jan 2024 16:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706546494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R26wf6CH90qyDmY9tIxuJM0L0XFbpOcNORXIfwMhbmE=; b=TfIMOqFfQe8m20kXVGRAlCz1/0oeIDQ0usN15CAe2rkG5iz6gLPzNA3eKmgSO2IKUVFdmF vv7vg97tiKRt9rdY2Wzr4XMQNmh2TrSsfgd18qEhZYAw6EU3rP3TbtFEmeeDNOO1RnOFT8 9bcqEKUPeSI4/LlWQuTe8YsTl9uXXicy2MUzjPuW5umt9uMAIuhTJYInsQ/TJZKpf9qSAK FcfKfEDJtgY9wZIaRD0b9GvqClFiFFZpw60dyh/2mCNzGeLZbs4dIjgwME4tF763B9/uV3 F47/F18P87X+2kpnnsFQTTILjOq6yIYB2u27LKTD0d60er14VOjUe5JSe1wqNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706546494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R26wf6CH90qyDmY9tIxuJM0L0XFbpOcNORXIfwMhbmE=; b=fa5V8nu+cFISRwfQn96GwbTzIlmNfDl5ucaMC1ZQgKGsxp3qsO2zdgIeArgVGX1+lTYw+F 4kKYbG/8SG1DYg/y/rLVQ33YmPmFhrb8I8nLH5pgMeUZg0lG6lN/oMtI6mEyyap+qVO5mI RlGABASQ1TyC9IO39k1poDDa5KBbGzKYAvkMuZpeP4QA27ysGScOVQl/pPppvR2wOGQfmd MAkr+xoaQt9KoVWunbLMWF4uIxDJvnaVw7aNUaZea3y5jhdMlEnbS3NRIS4KtUVbHxxjJn 7LG8IMy7pOW0+HrU46ytUd0z6YbvdiUA4WbxxRd8RmHNwV95T7XqCP8QfPU78Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706546494; a=rsa-sha256; cv=none; b=naiRVSaV9geue1+gV9JfaBi1k+nghZaeTww4f1y+o3HUaxQtfzzS10ln+HcQnj4FZxzxtM W/2aKEhKi8sdBAlleWOzmzVFjskVaStn+qML5g6gpg+nSDJEfG0ykmasSdqW8YNmiP8p/S VepdqFtXhtu3VYT88kVGJqVPB3iNoeb9PDFeOKhyoi9c3mC2rvfo8CarCXLt0/ooV+KtOq 3GRNMKQeOAgIsRb6Oi46yo1b/TY4KalfmGWzG7RicUw4VolRbOjdZS3lq7dXKuPaD+IDpt DanHdecsI7sh5trZ68I4v9hT9Lq/MvbcA4iKk2/elzLT286db60OKRRs5Ksu9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNvFp1xGSzyl0; Mon, 29 Jan 2024 16:41: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 40TGfYjp018249; Mon, 29 Jan 2024 16:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TGfYFr018246; Mon, 29 Jan 2024 16:41:34 GMT (envelope-from git) Date: Mon, 29 Jan 2024 16:41:34 GMT Message-Id: <202401291641.40TGfYFr018246@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: 7e77089dccd7 - main - linuxkpi: remove invalid KASSERT from hash_add_rcu List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e77089dccd702eb767350a8bd3d20102c4fb591 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7e77089dccd702eb767350a8bd3d20102c4fb591 commit 7e77089dccd702eb767350a8bd3d20102c4fb591 Author: Ed Maste AuthorDate: 2024-01-29 14:25:40 +0000 Commit: Ed Maste CommitDate: 2024-01-29 16:40:17 +0000 linuxkpi: remove invalid KASSERT from hash_add_rcu hash_add_rcu asserted that the node's prev pointer was NULL in an attempt to detect addition of a node already on a list, but the caller is not required to provide a zeroed node. Reported in https://github.com/freebsd/drm-kmod/issues/282 Reviewed by: bz, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43645 --- sys/compat/linuxkpi/common/include/linux/hashtable.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/hashtable.h b/sys/compat/linuxkpi/common/include/linux/hashtable.h index 5703d6282ad7..55755c354959 100644 --- a/sys/compat/linuxkpi/common/include/linux/hashtable.h +++ b/sys/compat/linuxkpi/common/include/linux/hashtable.h @@ -92,8 +92,6 @@ __hash_node_type_assert(struct hlist_node *node) #define hash_add_rcu(ht, node, key) do { \ struct lkpi_hash_head *__head = &(ht)[hash_min(key, HASH_BITS(ht))]; \ __hash_node_type_assert(node); \ - KASSERT(((struct lkpi_hash_entry *)(node))->entry.cle_prev == NULL, \ - ("node is already on list or was not zeroed")); \ CK_LIST_INSERT_HEAD(&__head->head, \ (struct lkpi_hash_entry *)(node), entry); \ } while (0) From nobody Mon Jan 29 16:51:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNvSs6d3Mz5924N; Mon, 29 Jan 2024 16:51: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 4TNvSs66mFz4r5c; Mon, 29 Jan 2024 16:51:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706547069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwTb7pJH/VV9q5gZdKXCg4vCDZKJpSxpoRmJmgsmNGI=; b=FJBR6L63cwAH2lQoWtlLQc9H4hu0yoSpVD/lhw4mYNgvGVupO4cqtPp4oWJCwUjKUvWgCE 8ot95tP8ugG8lX/jTicais+Ps7KcrEsndO8xn+JV28xaPMDQey575CZmYWRZq3uUQO+z6U RDiMdVWUwrcF0k2QgUJUwMORfIVajh61Y2kCrKFWIN45GExU+T7usVmoN0kGQ+7oJN9yS8 MvIKgCG1rQIY2rtOMtrCd+QwsMW2lIVe9UbOzETw0gIxKbOWQPrOsgeYbpOR/2rPehCf5h N8uXxhTxJ9SXcfWjzLK5mF9AKBJZgeyhaT/FoXbv9LmYcqtEWFIwvBMZOPogrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706547069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwTb7pJH/VV9q5gZdKXCg4vCDZKJpSxpoRmJmgsmNGI=; b=mESe3PBMipoepUvnI7od5D/DTs8CJd3XLTIpCFLa7bqpz0mRdsfzqqywYpcgDE0g9Mnwiz PEPVOFUcpBHkVljJawaDqfAiCwpaTCb9yR6DwBrhax8mYdI8aD275lODFmxILRn5uzD5Rb bpfKP+/5Nw7dKvyIsXxvRPmdLUkfOx3uo/44EfxXupsKrsmqJ4gnD7xjO+61XoRms4Y/Kv ogEGPTazYSA9ozAqAXv9erOfmr8oh4HF3I+PaPALlPo6Xt59vEP6fkZWRBNF7/o4Y36oxC 8j9H8wO8MoNnKHum6PA2Wuia7b8PR+3AxuX1oGdyWNI4TmfaA3ioaXoJzg8P+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706547069; a=rsa-sha256; cv=none; b=JDEy4jcR+lqHTMBfgJrN2envOVe4mq0kDDl4j6NGYTgCl88EfSmv0vg3YpU+/EJ3o4hC/2 Qjk7GWHap6tacMCZk2AI7mDWu3pDjLb6LPTzykd3UyCQfjs+xx/bikpk4ZXD4GnJNG4AvG 2GJ4BSHBfzb7v9j8io60K7hgK5uXrjwHfQlP6uAuuMo0XHCqHY75mpXBzJQL5IeYmZydL/ DB6qEca2y8UthD8Sp1TEfucTMReg3IYMU3FgPVzoTBEa+k5vsFi4ZSXSDMvvqzKeQn2Hoz RwkQ5n3qnKqw1YZ0dsHjo1hxdV3IBSPbxVqk/7tm3X618NrFUjl43sxbl3aEQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNvSs59LKz10Bp; Mon, 29 Jan 2024 16:51: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 40TGp91X030584; Mon, 29 Jan 2024 16:51:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TGp9Pm030581; Mon, 29 Jan 2024 16:51:09 GMT (envelope-from git) Date: Mon, 29 Jan 2024 16:51:09 GMT Message-Id: <202401291651.40TGp9Pm030581@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: 8d5353de7447 - main - libc: Annotate a couple of local functions as such List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d5353de74471038bd75a6cb39bf58f50a600642 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5353de74471038bd75a6cb39bf58f50a600642 commit 8d5353de74471038bd75a6cb39bf58f50a600642 Author: Mark Johnston AuthorDate: 2024-01-29 16:43:50 +0000 Commit: Mark Johnston CommitDate: 2024-01-29 16:44:36 +0000 libc: Annotate a couple of local functions as such No functional change intended. MFC after: 1 week --- lib/libc/net/getservent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c index 51fc70658205..26f68f24cc78 100644 --- a/lib/libc/net/getservent.c +++ b/lib/libc/net/getservent.c @@ -937,7 +937,7 @@ fin: return (res); } -int +static int serv_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap, void *cache_mdata) { @@ -1038,7 +1038,7 @@ serv_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap, return (NS_SUCCESS); } -int +static int serv_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap, void *cache_mdata) { From nobody Mon Jan 29 17:14:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNw0J1KHpz593gn for ; Mon, 29 Jan 2024 17:14:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TNw0G5h1yz4tjZ for ; Mon, 29 Jan 2024 17:14:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-55f0367b15fso1534351a12.0 for ; Mon, 29 Jan 2024 09:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706548492; x=1707153292; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=sjl8JQg+UhxhhYlZFwexu+otz5WIqJ/HyVJCJhRBpko=; b=PtKrWLLacr3m1iZcRb4kZUNXzHXV05Tb+DjsvVPomyHBVEIlBdyDbVQcphND0Q7rBn oSFlURDDN99sNfQOX59wFHX8GsT+TCumiIu53VUJPvdxdtKk/rWkiTijqfz1yvHf9ZEZ LBdD/ci1jJ1BACP4B2NSSOdnVThpv0cpC4P4Fv14xz2RcUqHvmXOQlELPNeiAXQxguML 25E3NQoLXWDj78Fji7W8Euf4n9OdFS0uy17BjS2C8VPDVzauQ9I0GVAgFtI1aXjS9PA6 Qg9HJDLdwUSm0AaQUO2BaYY8zElfchymRMA8CDAq4Rwko/7y0IaVAKh4iO8OU5829T8q C/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706548492; x=1707153292; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sjl8JQg+UhxhhYlZFwexu+otz5WIqJ/HyVJCJhRBpko=; b=prfEKS0GBTvQqG6mYUJPgwvR+u52WcTNtf6oPNBDNLSAgy/CkpsUn5ob4itu6cwoQr wohRspQe8knxeSrGiww4m/CeYLArlZk0GMZvseilxCfRBawY0LBXbM3Tuy9HXxfvSX3Y pufQDEILZRouAapYd6qjA7J5P9LmgqXxcNSDmhcdXFHqY1TikWBXncPWfpUgk+iooEPU UojOKand0u4jmaij/W/Dy4VmEYvXVdZyS6MZx+KmPNeWF5gXbk16O2mGTXv07YbSDSD6 /764KK1OEwPT0hVCLWnTFwx4dIxdWx1ABFPuR/Gc1vawGy/x1SmMlRnG1ZSNE5yIouhq I1UQ== X-Gm-Message-State: AOJu0YwUUXIhVjVNK52vT12aggg5qDv8ZY49+SGmd3pmNNnBNa8qCchp H8WGOBGpI4OgVmGpA7i0zKWo2sMTWXX8/JPRWQUGuwTkB8ofpQydBH1rSNJoSzAEUiAKJ8xxF+n oZRR6RU2hPCcJi1ef9IPGPQSc+HrCkn/m4/mBiVxKPDJaRupG6wUBHA== X-Google-Smtp-Source: AGHT+IHP1Ca7XDB6Y3BoKU7TP3IlXuypaxg/CxJCqujD9RW/hBX8xqgyJHEf5Bk3r0MY1Hy1nGq8HFinxXA+fZMjFbw= X-Received: by 2002:aa7:c883:0:b0:55f:6b8:b2fb with SMTP id p3-20020aa7c883000000b0055f06b8b2fbmr1813718eds.1.1706548492372; Mon, 29 Jan 2024 09:14:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401290514.40T5Eb1i061789@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 29 Jan 2024 10:14:41 -0700 Message-ID: Subject: Re: git: 3be59adbb5a2 - main - vtnet: Adjust for ethernet alignment. To: "Bjoern A. Zeeb" Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000ae2099061018c823" X-Rspamd-Queue-Id: 4TNw0G5h1yz4tjZ 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:15169, ipnet:2a00:1450::/32, country:US] --000000000000ae2099061018c823 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jan 29, 2024 at 8:26=E2=80=AFAM Bjoern A. Zeeb < bzeeb-lists@lists.zabbadoz.net> wrote: > On Mon, 29 Jan 2024, Warner Losh wrote: > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D3be59adbb5a2ae7600d46432d3bc822= 86e507e95 > > > > commit 3be59adbb5a2ae7600d46432d3bc82286e507e95 > > Author: Warner Losh > > AuthorDate: 2024-01-29 05:08:55 +0000 > > Commit: Warner Losh > > CommitDate: 2024-01-29 05:08:55 +0000 > > > > vtnet: Adjust for ethernet alignment. > > > > If the header that we add to the packet's size is 0 % 4 and we're > > strictly aligning, then we need to adjust where we store the header = so > > the packet that follows will have it's struct ip header properly > > aligned. We do this on allocation (and when we check the length of > the > > mbufs in the lro_nomrg case). We can't just adjust the clustersz in > the > > softc, because it's also used to allocate the mbufs and it needs to = be > > the proper size for that. Since we otherwise use the size of the mbu= f > > (or sometimes the smaller size of the received packet) to compute ho= w > > much we can buffer, this ensures no overflows. The 2 byte adjustment > > also does not affect how many packets we can receive in the lro_nomr= g > > case. > > > Doesn't this still include at least these two un-asserted/un-documented > asumptions: > > (a) mbuf space is large enough to hold 2 extra bytes? Is this always > the case? > I was sure I puzzled through all the cases correctly. We adjust the length of the available buffer by 2 and offset everything by 2. this work because all the vtnet header types only have 1 or 2 byte data fields. It keeps us from writing too much into the buffer. However, in vtnet_rx_cluster_size, we don't adjust the frame size before allocating. So if the mtu + vlan_header. So if the mtu + 12 + 18 is 2047 or 2048 or mtu =3D 2017 or 2018 we'll get it wrong (we don't adjust in the case whe= re we use vtnet_rx_header which is 14 bytes). But I think in that case, we'll "drop the last two bytes off the end" get it wrong (since we adjust the total length of the mbuf space) rather than "overflow two bytes" get it wrong. For that case, we'd need to add two as I indicated in the comments below. static int vtnet_rx_cluster_size(struct vtnet_softc *sc, int mtu) { int framesz; if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) return (MJUMPAGESIZE); else if (sc->vtnet_flags & VTNET_FLAG_LRO_NOMRG) return (MCLBYTES); /* * Try to scale the receive mbuf cluster size from the MTU. We * could also use the VQ size to influence the selected size, * but that would only matter for very small queues. */ if (vtnet_modern(sc)) { MPASS(sc->vtnet_hdr_size =3D=3D sizeof(struct virtio_net_hdr_v1)); framesz =3D sizeof(struct virtio_net_hdr_v1); } else framesz =3D sizeof(struct vtnet_rx_header); framesz +=3D sizeof(struct ether_vlan_header) + mtu; // XXX if framesz % 4 =3D=3D 2 and we're strict alignment we need to add 2 // XXX or equivalently, if vnet_hdr_size % 4 =3D=3D 0 and ... if (framesz <=3D MCLBYTES) return (MCLBYTES); else if (framesz <=3D MJUMPAGESIZE) return (MJUMPAGESIZE); else if (framesz <=3D MJUM9BYTES) return (MJUM9BYTES); /* Sane default; avoid 16KB clusters. */ return (MCLBYTES); } Do you agree? Is this what you are worried about? It's the only hole I could find this morning (after going over this a dozen other times trying to get it right for the review, and bryanv was happy neither noticed). It also explains why my tests work: I didn't try to have a weird mtu of 2018 bytes. > (b) the struct sizes assigned to vtnet_hdr_size are not odd numbers of > bytes? Could add comments or CTASSERTs? > True, I'll ctassert the sizes and say we rely on things being even sized in if_vnetvar.h. Warner > > PR: 271288 > > Sponsored by: Netflix > > Reviewed by: bryanv > > Differential Revision: https://reviews.freebsd.org/D43224 > > -- > Bjoern A. Zeeb r15:7 > --000000000000ae2099061018c823 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Jan 29, 2024 at 8:26=E2=80=AF= AM Bjoern A. Zeeb <bze= eb-lists@lists.zabbadoz.net> wrote:
On Mon, 29 Jan 2024, Warner Losh wrote:

> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D3be59adbb5a2ae7600d46432d3bc82286e507e95<= /a>
>
> commit 3be59adbb5a2ae7600d46432d3bc82286e507e95
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-01-29 05:08:55 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-01-29 05:08:55 +0000
>
>=C2=A0 =C2=A0 vtnet: Adjust for ethernet alignment.
>
>=C2=A0 =C2=A0 If the header that we add to the packet's size is 0 %= 4 and we're
>=C2=A0 =C2=A0 strictly aligning, then we need to adjust where we store = the header so
>=C2=A0 =C2=A0 the packet that follows will have it's struct ip head= er properly
>=C2=A0 =C2=A0 aligned.=C2=A0 We do this on allocation (and when we chec= k the length of the
>=C2=A0 =C2=A0 mbufs in the lro_nomrg case). We can't just adjust th= e clustersz in the
>=C2=A0 =C2=A0 softc, because it's also used to allocate the mbufs a= nd it needs to be
>=C2=A0 =C2=A0 the proper size for that. Since we otherwise use the size= of the mbuf
>=C2=A0 =C2=A0 (or sometimes the smaller size of the received packet) to= compute how
>=C2=A0 =C2=A0 much we can buffer, this ensures no overflows. The 2 byte= adjustment
>=C2=A0 =C2=A0 also does not affect how many packets we can receive in t= he lro_nomrg
>=C2=A0 =C2=A0 case.


Doesn't this still include at least these two un-asserted/un-documented= asumptions:

(a) mbuf space is large enough to hold 2 extra bytes?=C2=A0 Is this always<= br> =C2=A0 =C2=A0 =C2=A0the case?

I was sur= e I puzzled through all the cases correctly.=C2=A0 We adjust the length
of the available buffer by 2 and offset everything by 2. this work b= ecause
all the vtnet header types only have 1 or 2 byte data fiel= ds. It keeps us from
writing too much into the buffer.
=
However, in vtnet_rx_cluster_size, we don't adjust the f= rame size before
allocating. So if the mtu=C2=A0+ vlan_header. So= if the mtu + 12 + 18 is 2047 or 2048
or mtu =3D 2017 or 2018 we&= #39;ll get it wrong (we don't adjust in the case where
we use= vtnet_rx_header which is 14 bytes). But I think in that case, we'll &q= uot;drop
the last two bytes off the end" get it wrong (since= we adjust the total length
of the mbuf space) rather than "= overflow two bytes" get it wrong. For that
case, we'd ne= ed to add two as I indicated in the comments below.

static int
vtnet_rx_cluster_size(struct vtnet_softc *sc, in= t mtu)
{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 int framesz;

=C2=A0 =C2= =A0 =C2=A0 =C2=A0 if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS)
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (MJUMPAGESIZ= E);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 else if (sc->vtnet_flags & VTNET_= FLAG_LRO_NOMRG)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = return (MCLBYTES);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0* Try to scale the receive mbuf cluster size from the M= TU. We
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* could also use the VQ size to= influence the selected size,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* but th= at would only matter for very small queues.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0*/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (vtnet_modern(sc)) {
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MPASS(sc->vtnet_hdr_siz= e =3D=3D sizeof(struct virtio_net_hdr_v1));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 framesz =3D sizeof(struct virtio_net_hdr_v1);=C2=A0 =C2=A0 =C2=A0 =C2=A0 } else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 framesz =3D sizeof(struct vtnet_rx_header);=C2=A0
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 framesz +=3D sizeof(struct ether_vlan_header) += mtu;
// XXX if framesz % 4 =3D=3D 2 and we're strict alignment we n= eed to add 2
=C2=A0
(b) the struct sizes assigned to vtnet_hdr_size are not odd numbers of
=C2=A0 =C2=A0 =C2=A0bytes?=C2=A0 Could add comments or CTASSERTs?

True, I'll ctassert the sizes and say we rel= y on things being even sized
in if_vnetvar.h.
--000000000000ae2099061018c823-- From nobody Mon Jan 29 17:28:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNwHr3G4Jz5953c; Mon, 29 Jan 2024 17:28: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 4TNwHr2n3yz4vlR; Mon, 29 Jan 2024 17:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706549304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2W7b65v12NTCg3ZXKRvSIDX1TqHSRyWamEKPA6ZjLTs=; b=GZQbEwmQv+RebmJ/wdA7iFEOS5Lnf5szamO98AwcS1Df4xyrCjyVD13K8dea6cwqOiioyW SQY8d1qYivEe+zfNLXn6DOR7i7HeXQA/npBYus2lKA4O4YdQSFfzIBU9hV/13w6JEz5kgn UhA02q2SIvvHr154KftCjlvwkF1h5sKYqWQOQpB0JFi0AsFe47aiAks6H+tQfrTs0KedtX U9lKgn4yTvhmZaGUHwp9emNrMIb4UNBMa+1WrbNiJ4MWusk65eiTAOznSVK/+3pvWXPci9 P/J55imvI4c8KdVZ6f2reDLBQ/ItWb8HHiDbOnW50Nhtmsh90Agusl3Li4N/vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706549304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2W7b65v12NTCg3ZXKRvSIDX1TqHSRyWamEKPA6ZjLTs=; b=HEab8I3+D956C3xlkh4OHR3DAPpQbitwxErqqiQ6efH4CygIi7F0rgnyL8+2eZaVazDAzp x6O37XbdhvtznO4IAyvIZytNRwdl/TXVFAs89w53UTB6BFHYPCM05S886ecZAH7+pn7kb+ H5fOAtYjVSmSxONQUGN3mECyh7iPaaTBSNCYa6iLYLFWiBihmsp4PNQtsj14UOboyzqbh+ FENICXVQt5lAtbrTjQUB+bkVzKvd0M2EocmRzXOGyrrV4VgqueUbMcUoyC8WyBOqdGZW4H vWGIt4KPHn7aAmo1NLP/L739CaV1vTcZ7YX58HhdrOytYCq4rPFrFe6Dir28YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706549304; a=rsa-sha256; cv=none; b=UAVu6pWWHgrNb+N+0omVgasMiaAANx5Xf67z4LenP9leasfNu4kPVQZZTpfZBHSK5qmudB rUiVW7T4Tko+iXNQVNLPKxCocX8GZcAhkaa+urGMMMnp9eHsrtimzIbM8P32JtPbzMueFr QYjBKdBjD+LEoGD9r4VnR9mQ0pNZQ74dFYvhFWo6cKwn+85gKcXEdTgO7eoE9u3HYh5Mtb z70wPdj5pbs6//76HKPRRPoyKqBiCo9CyL2eHBYbG4HEcTY/lunIj1OaYSLSVuDKEAdbam zCGhX/0E66i5lc5QYW0OuIY1K1j9eGAX+ht+CxnGBAVghqAqva2LPj+/eZmw8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNwHr1rhGz118h; Mon, 29 Jan 2024 17:28: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 40THSOeT089035; Mon, 29 Jan 2024 17:28:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40THSO75089032; Mon, 29 Jan 2024 17:28:24 GMT (envelope-from git) Date: Mon, 29 Jan 2024 17:28:24 GMT Message-Id: <202401291728.40THSO75089032@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: ee14a9725d73 - main - Merge commit 4a39d0890894 from llvm-project (by Mark Johnston): List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee14a9725d73150e89367550206803fe36ae3089 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ee14a9725d73150e89367550206803fe36ae3089 commit ee14a9725d73150e89367550206803fe36ae3089 Author: Dimitry Andric AuthorDate: 2024-01-29 17:26:48 +0000 Commit: Dimitry Andric CommitDate: 2024-01-29 17:26:48 +0000 Merge commit 4a39d0890894 from llvm-project (by Mark Johnston): [libc++] Fix filesystem::remove_all() on FreeBSD (#79540) remove_all_impl() opens the target path with O_NOFOLLOW, which fails if the target is a symbolic link. On FreeBSD, rather than returning ELOOP, openat() returns EMLINK. This is unlikely to change for compatibility reasons, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214633 . Thus, check for EMLINK as well. Reported by: markj PR: 276632 MFC after: 3 days --- contrib/llvm-project/libcxx/src/filesystem/operations.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/src/filesystem/operations.cpp b/contrib/llvm-project/libcxx/src/filesystem/operations.cpp index 63a119aa983e..1877bcd79f4d 100644 --- a/contrib/llvm-project/libcxx/src/filesystem/operations.cpp +++ b/contrib/llvm-project/libcxx/src/filesystem/operations.cpp @@ -823,8 +823,9 @@ uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) { // If opening `p` failed because it wasn't a directory, remove it as // a normal file instead. Note that `openat()` can return either ENOTDIR - // or ELOOP depending on the exact reason of the failure. - if (ec == errc::not_a_directory || ec == errc::too_many_symbolic_link_levels) { + // or ELOOP depending on the exact reason of the failure. On FreeBSD it + // may return EMLINK instead of ELOOP, contradicting POSIX. + if (ec == errc::not_a_directory || ec == errc::too_many_symbolic_link_levels || ec == errc::too_many_links) { ec.clear(); if (::unlinkat(parent_directory, p.c_str(), /* flags = */0) == -1) { ec = detail::capture_errno(); From nobody Mon Jan 29 17:49:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNwlg3zbqz596ZZ; Mon, 29 Jan 2024 17:49: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 4TNwlg35nmz500J; Mon, 29 Jan 2024 17:49:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706550543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4M2vANzIIbelIcrxmncG+efns2ue8G9w0ZX2y6ISKk=; b=BfWyyMBeMH0Hzco9+fMyoooZfCvVG29SjOrnhDSctSVuSbuslCSOMn5IyoFLmHtJ+yYbUp 7RvyCIv9mRmy+4BK5LcsZA7VIOHZV83BkUUwrIdevEE6HwJ5QkOFjOVyGybf02dlgL/Lk5 xokX8n2UVq1SzdgbyDw9XXPlHVzeUgZdKN8VtcTTQGpQYrZ09nRcjfROAsT4KVlQiB2b9p 7HCulWsiGvZYXD4Uul9iXUHvZa8fonSvtUBvKG/kCGmV2Ffr0AxHDSPMWXX6DJlkBiO03j kMySzQ7L1Aon4TdFgWRxASjWIxsR8qFhkU2rJMT4o4CG+g0i2PHdf8HFTuQ8Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706550543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S4M2vANzIIbelIcrxmncG+efns2ue8G9w0ZX2y6ISKk=; b=k6Sj3nJA1H+oyWUSFwwDXVXuF0JueLKVtDGs+SiAI2GqV8CUg7V6geBhFVlNMmXJpRANQz NJsuErYp4ec4wjLOw+WoDhvHsql/A9OSdc/QbeYcmtwp5xwPuYkJRPA9V54sd8WF3lTKi/ uTlz90ihLErN66jXe7e3rFwbKGoRnN+ZUa9RKSZcGKYv3b/oDSw0wiRk2xffygGgV0ZX5i za8eBqDhj3X8EAzmfbM2cE3Yq8/v8DGyVzL/gWxsx1In3V50OV7gu7waur6zChP+EsRlkx o6OxP1mAhjnEuJeSo52YN0FT6btQYp1Rma9UwPTgdGy5r30mY2X8KrLWWSFZuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706550543; a=rsa-sha256; cv=none; b=kRydalkuSdexgAxs1qFA0qqqVb823qX7CedjRB32K9IDig6+QYQW7c1bEX1mWmqvUUXO1N uxZ0v1RjcpLpAeZkMyIip7SfY3koxAF09oWEyMSHLwO4SEMW0pdzRabcQDpBCN273hD357 afReGz6FExcFk/kOHxFGsM2bw8V9fXCww5ntkjaCvx62Jk3mtmJwbzHx9k6pu3/p3YU7eF /lF18x6ZqSFsopDX2GeId6vtlw2YN5z1cPHxv52fFuJHeGQFrzHiu2gfO4bWTqytPyF3US Fl28yBkJv0l5XltjWFIhOCpyBwUvI7wmPVXtHhcoPzXny0UgmxcBF4o4eFdw0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNwlg29x6z117k; Mon, 29 Jan 2024 17:49: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 40THn3uQ022651; Mon, 29 Jan 2024 17:49:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40THn3V0022648; Mon, 29 Jan 2024 17:49:03 GMT (envelope-from git) Date: Mon, 29 Jan 2024 17:49:03 GMT Message-Id: <202401291749.40THn3V0022648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Daniel Ebdrup Jensen Subject: git: a84e01f02b15 - main - service(8): direct user to rc(8) for a list of valid commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: debdrup X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a84e01f02b15dc1ec091feab6e532d5ba36ffbbb Auto-Submitted: auto-generated The branch main has been updated by debdrup: URL: https://cgit.FreeBSD.org/src/commit/?id=a84e01f02b15dc1ec091feab6e532d5ba36ffbbb commit a84e01f02b15dc1ec091feab6e532d5ba36ffbbb Author: Lexi Winter AuthorDate: 2024-01-13 23:34:46 +0000 Commit: Daniel Ebdrup Jensen CommitDate: 2024-01-29 17:47:09 +0000 service(8): direct user to rc(8) for a list of valid commands New users may refer to service(8) to discover how to manage services, but this manpage does not explain which commands are permitted besides start/stop (for example, 'enable'). Add a paragraph that directs the reader to rc(8) to discover this. While here, add a few examples of common use-cases. Reported by: Mina Galić Pull request: https://github.com/freebsd/freebsd-src/pull/1057 --- usr.sbin/service/service.8 | 51 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index ada0e6361fb8..2c5dfa3f3a66 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 9, 2021 +.Dd January 29, 2024 .Dt SERVICE 8 .Os .Sh NAME @@ -64,6 +64,13 @@ see It can also be used to list the scripts using various criteria. .Pp +The set of permissible values for +.Ar command +depends on the particular rc.d script being invoked. +For a list of standard commands which are supported by most rc.d +scripts, see +.Xr rc 8 . +.Pp The options are as follows: .Bl -tag -width F1 .It Fl E Ar var=value @@ -129,13 +136,44 @@ option is used, the corresponding variable is set accordingly. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES -The following are examples of typical usage of the -.Nm -command: +These are some examples of the most common service commands. +For a full list of commands available in most rc.d scripts, see +.Xr rc 8 . +.Pp +Enable a service, then start it: +.Bd -literal -offset -indent +service sshd enable +service sshd start +.Ed +.Pp +Stop a service, then disable it: +.Bd -literal -offset -indent +service sshd stop +service sshd disable +.Ed +.Pp +Start a service which is not enabled: +.Bd -literal -offset -indent +service sshd onestart +.Ed +.Pp +Report the status of a service: .Bd -literal -offset -ident service named status -service -j dns named status +.Ed +.Pp +Restart a service running in a jail: +.Bd -literal -offset -indent +service -j dns named restart +.Ed +.Pp +Start a service with a specific environment variable set: +.Bd -literal -offset -indent service -E LC_ALL=C.UTF-8 named start +.Ed +.Pp +Report a verbose listing of all available services: +.Bd -literal -offset -indent service -rv .Ed .Pp @@ -164,7 +202,8 @@ complete -F _service service .Xr bash 1 Pq Pa ports/shells/bash , .Xr rc.conf 5 , .Xr rc 8 , -.Xr rcorder 8 +.Xr rcorder 8 , +.Xr sysrc 8 .Sh HISTORY The .Nm From nobody Mon Jan 29 17:53:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNws50DRMz596mL; Mon, 29 Jan 2024 17:53: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 4TNws46VV8z515Q; Mon, 29 Jan 2024 17:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706550824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTu3t9TJNtBVRszYxdETeRSqSkaBVsywWOALqWXvNOA=; b=AfX4O4fxNBwutxMGbRv5GotLy/NlrTLRBk2uL3O1Z/Wx8QPBZ40t+clyiCk71kK83S1Rrg 3jT9Fq9SrcCv8IwNnLabvHrG8gvanAJkxjUfRRmXZpmgHZLgJUlsEgxeZTyv8esNoMsd76 UusB8GfFTmqmaAzd4Z/qMRhIXv0zbZ5wRJXY+OJtktTap7G6dtsus/wb+2PbK4kHjLHsDW cT0AxU5rDeweAtMv92tJmekd2twZ1B2V5zBI9gopWCOitPJDTQ0UV2y6XLn57xFv9EMVa4 VwQuBrTMbCFiDDAW6IgojQ6rv7wqrn9yPcbCbo6lOG3whgsRpH5zk64V/0G9JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706550824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uTu3t9TJNtBVRszYxdETeRSqSkaBVsywWOALqWXvNOA=; b=I0gwsSn+Px5PFIARJdnWj0T7k8a6JSB9XAUGw2s6Kp01G25Gsjhay1/AFEdvEZA5HYUAY8 4EKvFHyDaCF/S53R/raN5yG5jZ/P01Vk5k34awDtotSf36yP68QLt0BXYWMYeaKIxGl/5i TfKczvlnWqUuODePU1fbInMOifEaMQ5+9iZD6c2gqyD0cx+7vPsJ8LutEWVAmbmYWNsgAR Zks+LO9K8fVnutPUpPcAbZhevMV+Z80Pd3c18D6wYkp/FJmB7JW9WbTc7OCuUNa0HdD1f3 OjI1zOFh8Omgq24jgVTR2KTQFVymmBzbMIXgh832UxFZjWI2RW9RMPrZe3KUVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706550824; a=rsa-sha256; cv=none; b=lTEch5EHx96/q2SzL/sNP700AmF0oJ6IHHVpnEtIIqpWfH9xVhlvqWunXSPZOEoeOCRQRo bGYsquxJ+X+lUaUtrXvw80wi8/xpdAa2sUpKr+ZqD/LQ6y6yRqJ6qTRMUs3bEi0EMR9QMN N2xBDxsQWRyMFHrGFW2uL1fcCt9P/kAIixrJeqTT8/gQNXdadWLSpq+9Pdftet6TiktUNP GYzLO6jZ+LxGT8/GSDGCfoPT5dRATwcytiChH333f/B349fHrFQHtb3kzFfGIhWwblPh6n MgPfkIQNWRUhiBWJtK+JDq+llhz02oQbVF9O+TXh47ykxRzd1R4bE6pL5qgrSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNws45Y9tz11j9; Mon, 29 Jan 2024 17:53: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 40THrid0039012; Mon, 29 Jan 2024 17:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40THrih3039009; Mon, 29 Jan 2024 17:53:44 GMT (envelope-from git) Date: Mon, 29 Jan 2024 17:53:44 GMT Message-Id: <202401291753.40THrih3039009@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: f30c7d56546b - main - TCP LRO: convert TCP header fields to host byte order earlier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f30c7d56546b9f36e42351fb385d96e37dbac1d5 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f30c7d56546b9f36e42351fb385d96e37dbac1d5 commit f30c7d56546b9f36e42351fb385d96e37dbac1d5 Author: Michael Tuexen AuthorDate: 2024-01-29 17:41:24 +0000 Commit: Michael Tuexen CommitDate: 2024-01-29 17:52:17 +0000 TCP LRO: convert TCP header fields to host byte order earlier This is a preparation for adding dtrace hooks in a follow-up commit, which are missing in the code path, where packets are directly queued to the tcpcb. The dtrace hooks expect the fields to be in host byte order. This only applies when TCP HPTS is used. No functional change intended. Reviewed by: rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43594 --- sys/netinet/tcp_lro_hpts.c | 7 ++++--- sys/netinet/tcp_stacks/rack_bbr_common.c | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index 7724e727d5ce..84944c8db1ce 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -74,15 +74,15 @@ build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, ae->flags |= TSTMP_LRO; else if (m->m_flags & M_TSTMP) ae->flags |= TSTMP_HDWR; - ae->seq = ntohl(th->th_seq); - ae->ack = ntohl(th->th_ack); + ae->seq = th->th_seq; + ae->ack = th->th_ack; ae->flags |= tcp_get_flags(th); if (ts_ptr != NULL) { ae->ts_value = ntohl(ts_ptr[1]); ae->ts_echo = ntohl(ts_ptr[2]); ae->flags |= HAS_TSTMP; } - ae->win = ntohs(th->th_win); + ae->win = th->th_win; ae->codepoint = iptos; } @@ -310,6 +310,7 @@ do_bpf_strip_and_compress(struct tcpcb *tp, struct lro_ctrl *lc, th = tcp_lro_get_th(m); th->th_sum = 0; /* TCP checksum is valid. */ + tcp_fields_to_host(th); /* Check if ACK can be compressed */ can_compress = tcp_lro_ack_valid(m, th, &ts_ptr, &other_opts); diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c index b265e8e6f20b..4a4a8af2bd78 100644 --- a/sys/netinet/tcp_stacks/rack_bbr_common.c +++ b/sys/netinet/tcp_stacks/rack_bbr_common.c @@ -415,10 +415,6 @@ skip_vnet: break; #endif } /* end switch */ - /* - * Convert TCP protocol specific fields to host format. - */ - tcp_fields_to_host(th); off = th->th_off << 2; if (off < sizeof (struct tcphdr) || off > tlen) { printf("off:%d < hdrlen:%zu || > tlen:%u -- dump\n", From nobody Mon Jan 29 18:25:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNxYN18Hvz599V4; Mon, 29 Jan 2024 18:25: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 4TNxYN0dcJz561k; Mon, 29 Jan 2024 18:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706552712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iUOS3rKdrfxByhuN9ta4PeGQ9D5ZSY0PMkTIHXAAh3g=; b=kyQEasQ8TAQnAxam6M4fCQtiIyu1WofErNJG98sLVhKGmRAm4aK60nko5gEXSWMwuxJ0ta J/Cg6Tdc84C0wTjefhdcaHre4sSBr+L+Kf1F51PncLDEr4ZP3Zr9xn/ZV1LN7QlOvjjLLA GqcqiAc7XtG1tVWrrNTUaX1tWyn4sIWm6F+VEXgdnU3t229sQxxtRfXmwjatsKyykCZtIM V7+HFAHneJq0FmfM/hhgnYa2t09gytFMyivUHmdRWThr3XdfSG/Jl+RzgQydh9iUS4xWH7 geHpU3GN9XN3kOokOr3oXKldA0JLRkKKoHEBNFJgUJMC1Lpv6dELyo+0o0M3fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706552712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iUOS3rKdrfxByhuN9ta4PeGQ9D5ZSY0PMkTIHXAAh3g=; b=ayyitgkQWWy7VQa1PSjRzmDhvK5Kst5CTF9NYyUUXnu3Nlazjx7k5uii+YJvQMAf7vL0Si 9O7k6ZvmgfuB3FDaoXPvotsWUTN2RAQSAb+4dytFQTSti/aPWdeycZv9fKWKLmMtO8pRzt VZ1Wfxt9IMaLO75kC/z/Oe8IaqahDsOix+DDiUcj16P+0FfUFbJ+2FOqybXXj+uuaD69xc POXCr+FWlwmjTxsv0C3so5QyMlNrjHqfUpVK8GgjY5+MHIBP8Sq4Re9X18YaEj6hGAnTAp v7J4LhqtRwCsOOislmAKzsdrqOFRC0ebqXpfPhUlGbnMMy9IQTAg2J5RyJykig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706552712; a=rsa-sha256; cv=none; b=gF7VG6bGRaRWlZQeBcUmH8w9wCU/V4xR4s19GPbZ9qg/okLnCsxHDW67qsBmWoqXLVCQA1 mKeZPe+8rKxS4V1xmzdULLbdg3966OVt1N7OAcIPdE81dCt8BOUR1Mq5ZDPasvX1RlYapA I410KJ1fwAnn6VkoOXdF0TjPY7y3ZNVKrpY4NqPUSkHJtQguVmsmMNj8SsWDqFDeBphbsr OLUaUliMDopJFzJHB4O+O7WkiHYz3leVEszPqbk9cY5DDmFglFYWHEsV3/m+7NAZz1IQe2 umMwBYsmokR+Gnzis4CLLa+U4c8s/TkYFAJ26LwS1okr00R8oTXb2BpCt5KbLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNxYM6ppmz12b4; Mon, 29 Jan 2024 18:25: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 40TIPBhu090828; Mon, 29 Jan 2024 18:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TIPBOa090825; Mon, 29 Jan 2024 18:25:11 GMT (envelope-from git) Date: Mon, 29 Jan 2024 18:25:11 GMT Message-Id: <202401291825.40TIPBOa090825@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: a5ff900535e2 - main - pkgbase: Create two new rules for creating repo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5ff900535e24e3a3cd02287d733e1d1e5e9583a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a5ff900535e24e3a3cd02287d733e1d1e5e9583a commit a5ff900535e24e3a3cd02287d733e1d1e5e9583a Author: Emmanuel Vadot AuthorDate: 2024-01-26 18:52:03 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-29 18:24:03 +0000 pkgbase: Create two new rules for creating repo This adds two new rules named create-packages-kernel-repo and create-packages-world-repo. The goal of those rules is to create the {kernel,world} packages and after that the repository. It helps a lot for developing with pkgbase by adding the dev machine repository created by those rules on top of the official pkgbase one. Differential Revision: https://reviews.freebsd.org/D43623 Reviewed by: bapt, emaste Sponsored by: Beckhoff Automation GmbH & Co. KG --- Makefile | 4 +++- Makefile.inc1 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c4f7aaebca0..04d8a014b0c6 100644 --- a/Makefile +++ b/Makefile @@ -172,7 +172,9 @@ TGTS= all all-man buildenv buildenvvars buildetc buildkernel buildworld \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ stage-packages stage-packages-kernel stage-packages-world stage-packages-source \ - create-packages-world create-packages-kernel create-packages-source create-packages \ + create-packages-world create-packages-kernel \ + create-packages-kernel-repo create-packages-world-repo \ + create-packages-source create-packages \ update-packages packages installconfig real-packages real-update-packages \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes diff --git a/Makefile.inc1 b/Makefile.inc1 index 8a0073547ed0..1e86cda657dd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2078,6 +2078,10 @@ create-packages-kernel: _pkgbootstrap _repodir .PHONY SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ create-kernel-packages +create-packages-kernel-repo: .PHONY create-packages-kernel sign-packages + +create-packages-world-repo: .PHONY create-packages-world sign-packages + create-packages-source: _pkgbootstrap _repodir .PHONY ${_+_}@cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 \ From nobody Mon Jan 29 18:25:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNxYP21W5z599cr; Mon, 29 Jan 2024 18:25: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 4TNxYP1bnqz564R; Mon, 29 Jan 2024 18:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706552713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av+FlDHRr1yMlbMR+73orTqzXV3Van9n1Cq5pPP2cSM=; b=Hx9rvM7XTYm0KkyuC/QxBP1aOQjBouC8kCP2dt3n0g18oDoVD6bLi49Xl4EVH/qUh/Car9 KSdnB4RzbikHtWbp4E9g4UG+CkghESkclUEiz9pH97F0pjbCRJmO45ztzsOWuUXanlrpb9 SS1aQ2gC4s2S+zMhy4rMIDz24g9cP3v/z0CjGZRHSrIqxaW1ROmYn+xWJt2gaHhqPxRVIJ xJDyrRgvwcOKCA/CjHVRPP/6q6Fu4TCTy8MM92uCNw5QooFESY81jcbRzYHpCz6SuXPBjk OST4ysO6oKxJ1nj7HupG0/DmYMQM0GIAGVQFVwPYfJQVODRcW9l7aVJyS7d7nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706552713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Av+FlDHRr1yMlbMR+73orTqzXV3Van9n1Cq5pPP2cSM=; b=fBRJl6fU6uZsJgrmONnGgnVNv7wkzhme8oeDsPDV7oqIbyYAomfYfzwyolKD2H6V3QCe1P 6dfvTDd0pB7a5QJdgA0yhYoICvq+Dm3N/WRlFayzMGvHgzvU39+vIfNIouaQYabHMvk4n4 oOGtJLD7XLgAJscQx0gZ5OMTmfwqEWDlqMNMzadr8qgFiXalPa4qU9eL+hz1seYfphcSIp pRKGJFS7ePwHXXrKSXY4O3sVDjF4xn+Tau7i7Nex1FrSm3yCpW3XPiPz4GgatghJgGtZ7r JAUUQVK3mLAmeuHOJ/eeHXANHpI8zSHsn9hgeOpapT7I5oqlQ0kozhOtgTg68A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706552713; a=rsa-sha256; cv=none; b=O1Mf1DyZHayGm7dwzRwRbTJ2KzXwuqNJJRiHUnXk7idftIEU5NGr56AsJG85mD5+fjc6+H xCQe3/dItlwktNqHG2ukBYqEVH0B5shQjAVRG2qWou3GTVd/RVjVzSDVUrENB5tn8tQnwj 2yjcA/HC8m7Pap178W1vyVC5UeMIVtDJzbSsvlQ/bCz8AQJFk+SAmCt50SAwhxGkXPrDe5 7mkvUbzLUx999Ojx2YNNRKG/BS/o4FyHVTpuQFwZ2sUt4siGkYPlG+l8bX34zknS9QiQWz +qWTbF9l5OxzyCgDCKAE+mD/VIXn8CtQxEm8s49MEesVd+EgOWtZyLd5jBkyTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNxYP0hq5z12mJ; Mon, 29 Jan 2024 18:25: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 40TIPDhE090870; Mon, 29 Jan 2024 18:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TIPCeX090867; Mon, 29 Jan 2024 18:25:12 GMT (envelope-from git) Date: Mon, 29 Jan 2024 18:25:12 GMT Message-Id: <202401291825.40TIPCeX090867@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: a5afd7920d50 - main - pkgbase: Create a FreeBSD-dtb package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e commit a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e Author: Emmanuel Vadot AuthorDate: 2024-01-27 12:20:49 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-29 18:24:25 +0000 pkgbase: Create a FreeBSD-dtb package Before that dtbs where included in each kernel packages which prevents us to install multiple kernels. Differential Revision: https://reviews.freebsd.org/D43632 Reviewed by: bapt Sponsored by: Beckhoff Automation GmbH & Co. KG --- Makefile.inc1 | 28 +++++++++++++++++++++++++++- release/packages/dtb.ucl | 16 ++++++++++++++++ release/scripts/mtree-to-plist.awk | 20 ++++++++++++++------ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1e86cda657dd..7a9917fd8a74 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2178,9 +2178,35 @@ _default_flavor= -default . if ${MK_DEBUG_FILES} != "no" _debug=-dbg . endif + +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 ; \ + awk -F\" ' \ + /name/ { printf("===> Creating %s-", $$2); next } \ + /version/ {print $$2; next } ' \ + ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ + -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ + -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ + -r ${KSTAGEDIR}/${DISTDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \ + fi + create-kernel-packages: .PHONY . for flavor in "" ${_debug} -create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} +create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ diff --git a/release/packages/dtb.ucl b/release/packages/dtb.ucl new file mode 100644 index 000000000000..e4717b9054a2 --- /dev/null +++ b/release/packages/dtb.ucl @@ -0,0 +1,16 @@ +# +# + +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 = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 479680f235dd - main - nvme: Use the NVMEV macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 479680f235dd89cdabe0503312b3d23f322f4000 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=479680f235dd89cdabe0503312b3d23f322f4000 commit 479680f235dd89cdabe0503312b3d23f322f4000 Author: John Baldwin AuthorDate: 2024-01-29 18:30:54 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:30:54 +0000 nvme: Use the NVMEV macro instead of expanded versions Reviewed by: chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43595 --- sys/dev/nvme/nvme.h | 72 +++++++++++++++++++++++++---------------------- sys/dev/nvme/nvme_ctrlr.c | 11 ++++---- sys/dev/nvme/nvme_ns.c | 16 ++++------- sys/dev/nvme/nvme_qpair.c | 2 +- 4 files changed, 51 insertions(+), 50 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 3e39803f68ab..417651a19bb3 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -73,13 +73,13 @@ #define NVME_CAP_LO_REG_TO_SHIFT (24) #define NVME_CAP_LO_REG_TO_MASK (0xFF) #define NVME_CAP_LO_MQES(x) \ - (((x) >> NVME_CAP_LO_REG_MQES_SHIFT) & NVME_CAP_LO_REG_MQES_MASK) + NVMEV(NVME_CAP_LO_REG_MQES, x) #define NVME_CAP_LO_CQR(x) \ - (((x) >> NVME_CAP_LO_REG_CQR_SHIFT) & NVME_CAP_LO_REG_CQR_MASK) + NVMEV(NVME_CAP_LO_REG_CQR, x) #define NVME_CAP_LO_AMS(x) \ - (((x) >> NVME_CAP_LO_REG_AMS_SHIFT) & NVME_CAP_LO_REG_AMS_MASK) + NVMEV(NVME_CAP_LO_REG_AMS, x) #define NVME_CAP_LO_TO(x) \ - (((x) >> NVME_CAP_LO_REG_TO_SHIFT) & NVME_CAP_LO_REG_TO_MASK) + NVMEV(NVME_CAP_LO_REG_TO, x) #define NVME_CAP_HI_REG_DSTRD_SHIFT (0) #define NVME_CAP_HI_REG_DSTRD_MASK (0xF) @@ -108,31 +108,31 @@ #define NVME_CAP_HI_REG_CRIMS_SHIFT (28) #define NVME_CAP_HI_REG_CRIMS_MASK (0x1) #define NVME_CAP_HI_DSTRD(x) \ - (((x) >> NVME_CAP_HI_REG_DSTRD_SHIFT) & NVME_CAP_HI_REG_DSTRD_MASK) + NVMEV(NVME_CAP_HI_REG_DSTRD, x) #define NVME_CAP_HI_NSSRS(x) \ - (((x) >> NVME_CAP_HI_REG_NSSRS_SHIFT) & NVME_CAP_HI_REG_NSSRS_MASK) + NVMEV(NVME_CAP_HI_REG_NSSRS, x) #define NVME_CAP_HI_CSS(x) \ - (((x) >> NVME_CAP_HI_REG_CSS_SHIFT) & NVME_CAP_HI_REG_CSS_MASK) + NVMEV(NVME_CAP_HI_REG_CSS, x) #define NVME_CAP_HI_CSS_NVM(x) \ - (((x) >> NVME_CAP_HI_REG_CSS_NVM_SHIFT) & NVME_CAP_HI_REG_CSS_NVM_MASK) + NVMEV(NVME_CAP_HI_REG_CSS_NVM, x) #define NVME_CAP_HI_BPS(x) \ - (((x) >> NVME_CAP_HI_REG_BPS_SHIFT) & NVME_CAP_HI_REG_BPS_MASK) + NVMEV(NVME_CAP_HI_REG_BPS, x) #define NVME_CAP_HI_CPS(x) \ - (((x) >> NVME_CAP_HI_REG_CPS_SHIFT) & NVME_CAP_HI_REG_CPS_MASK) + NVMEV(NVME_CAP_HI_REG_CPS, x) #define NVME_CAP_HI_MPSMIN(x) \ - (((x) >> NVME_CAP_HI_REG_MPSMIN_SHIFT) & NVME_CAP_HI_REG_MPSMIN_MASK) + NVMEV(NVME_CAP_HI_REG_MPSMIN, x) #define NVME_CAP_HI_MPSMAX(x) \ - (((x) >> NVME_CAP_HI_REG_MPSMAX_SHIFT) & NVME_CAP_HI_REG_MPSMAX_MASK) + NVMEV(NVME_CAP_HI_REG_MPSMAX, x) #define NVME_CAP_HI_PMRS(x) \ - (((x) >> NVME_CAP_HI_REG_PMRS_SHIFT) & NVME_CAP_HI_REG_PMRS_MASK) + NVMEV(NVME_CAP_HI_REG_PMRS, x) #define NVME_CAP_HI_CMBS(x) \ - (((x) >> NVME_CAP_HI_REG_CMBS_SHIFT) & NVME_CAP_HI_REG_CMBS_MASK) + NVMEV(NVME_CAP_HI_REG_CMBS, x) #define NVME_CAP_HI_NSSS(x) \ - (((x) >> NVME_CAP_HI_REG_NSSS_SHIFT) & NVME_CAP_HI_REG_NSSS_MASK) + NVMEV(NVME_CAP_HI_REG_NSSS, x) #define NVME_CAP_HI_CRWMS(x) \ - (((x) >> NVME_CAP_HI_REG_CRWMS_SHIFT) & NVME_CAP_HI_REG_CRWMS_MASK) + NVMEV(NVME_CAP_HI_REG_CRWMS, x) #define NVME_CAP_HI_CRIMS(x) \ - (((x) >> NVME_CAP_HI_REG_CRIMS_SHIFT) & NVME_CAP_HI_REG_CRIMS_MASK) + NVMEV(NVME_CAP_HI_REG_CRIMS, x) #define NVME_CC_REG_EN_SHIFT (0) #define NVME_CC_REG_EN_MASK (0x1) @@ -164,7 +164,8 @@ #define NVME_CSTS_REG_ST_SHIFT (6) #define NVME_CSTS_REG_ST_MASK (0x1) -#define NVME_CSTS_GET_SHST(csts) (((csts) >> NVME_CSTS_REG_SHST_SHIFT) & NVME_CSTS_REG_SHST_MASK) +#define NVME_CSTS_GET_SHST(csts) \ + NVMEV(NVME_CSTS_REG_SHST, csts) #define NVME_AQA_REG_ASQS_SHIFT (0) #define NVME_AQA_REG_ASQS_MASK (0xFFF) @@ -187,19 +188,19 @@ #define NVME_PMRCAP_REG_CMSS_MASK (0x1) #define NVME_PMRCAP_RDS(x) \ - (((x) >> NVME_PMRCAP_REG_RDS_SHIFT) & NVME_PMRCAP_REG_RDS_MASK) + NVMEV(NVME_PMRCAP_REG_RDS, x) #define NVME_PMRCAP_WDS(x) \ - (((x) >> NVME_PMRCAP_REG_WDS_SHIFT) & NVME_PMRCAP_REG_WDS_MASK) + NVMEV(NVME_PMRCAP_REG_WDS, x) #define NVME_PMRCAP_BIR(x) \ - (((x) >> NVME_PMRCAP_REG_BIR_SHIFT) & NVME_PMRCAP_REG_BIR_MASK) + NVMEV(NVME_PMRCAP_REG_BIR, x) #define NVME_PMRCAP_PMRTU(x) \ - (((x) >> NVME_PMRCAP_REG_PMRTU_SHIFT) & NVME_PMRCAP_REG_PMRTU_MASK) + NVMEV(NVME_PMRCAP_REG_PMRTU, x) #define NVME_PMRCAP_PMRWBM(x) \ - (((x) >> NVME_PMRCAP_REG_PMRWBM_SHIFT) & NVME_PMRCAP_REG_PMRWBM_MASK) + NVMEV(NVME_PMRCAP_REG_PMRWBM, x) #define NVME_PMRCAP_PMRTO(x) \ - (((x) >> NVME_PMRCAP_REG_PMRTO_SHIFT) & NVME_PMRCAP_REG_PMRTO_MASK) + NVMEV(NVME_PMRCAP_REG_PMRTO, x) #define NVME_PMRCAP_CMSS(x) \ - (((x) >> NVME_PMRCAP_REG_CMSS_SHIFT) & NVME_PMRCAP_REG_CMSS_MASK) + NVMEV(NVME_PMRCAP_REG_CMSS, x) /* Command field definitions */ @@ -219,12 +220,18 @@ #define NVME_STATUS_DNR_SHIFT (15) #define NVME_STATUS_DNR_MASK (0x1) -#define NVME_STATUS_GET_P(st) (((st) >> NVME_STATUS_P_SHIFT) & NVME_STATUS_P_MASK) -#define NVME_STATUS_GET_SC(st) (((st) >> NVME_STATUS_SC_SHIFT) & NVME_STATUS_SC_MASK) -#define NVME_STATUS_GET_SCT(st) (((st) >> NVME_STATUS_SCT_SHIFT) & NVME_STATUS_SCT_MASK) -#define NVME_STATUS_GET_CRD(st) (((st) >> NVME_STATUS_CRD_SHIFT) & NVME_STATUS_CRD_MASK) -#define NVME_STATUS_GET_M(st) (((st) >> NVME_STATUS_M_SHIFT) & NVME_STATUS_M_MASK) -#define NVME_STATUS_GET_DNR(st) (((st) >> NVME_STATUS_DNR_SHIFT) & NVME_STATUS_DNR_MASK) +#define NVME_STATUS_GET_P(st) \ + NVMEV(NVME_STATUS_P, st) +#define NVME_STATUS_GET_SC(st) \ + NVMEV(NVME_STATUS_SC, st) +#define NVME_STATUS_GET_SCT(st) \ + NVMEV(NVME_STATUS_SCT, st) +#define NVME_STATUS_GET_CRD(st) \ + NVMEV(NVME_STATUS_CRD, st) +#define NVME_STATUS_GET_M(st) \ + NVMEV(NVME_STATUS_M, st) +#define NVME_STATUS_GET_DNR(st) \ + NVMEV(NVME_STATUS_DNR, st) #define NVME_PWR_ST_MPS_SHIFT (0) #define NVME_PWR_ST_MPS_MASK (0x1) @@ -1751,8 +1758,7 @@ static inline bool nvme_ctrlr_has_dataset_mgmt(const struct nvme_controller_data *cd) { /* Assumes cd was byte swapped by nvme_controller_data_swapbytes() */ - return ((cd->oncs >> NVME_CTRLR_DATA_ONCS_DSM_SHIFT) & - NVME_CTRLR_DATA_ONCS_DSM_MASK); + return (NVMEV(NVME_CTRLR_DATA_ONCS_DSM, cd->oncs) != 0); } /* Namespace helper functions */ diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 845beec9f592..ad56141a556d 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -247,8 +247,7 @@ nvme_ctrlr_wait_for_ready(struct nvme_controller *ctrlr, int desired_val) csts = nvme_mmio_read_4(ctrlr, csts); if (csts == NVME_GONE) /* Hot unplug. */ return (ENXIO); - if (((csts >> NVME_CSTS_REG_RDY_SHIFT) & NVME_CSTS_REG_RDY_MASK) - == desired_val) + if (NVMEV(NVME_CSTS_REG_RDY, csts) == desired_val) break; if (timeout - ticks < 0) { nvme_printf(ctrlr, "controller ready did not become %d " @@ -274,8 +273,8 @@ nvme_ctrlr_disable(struct nvme_controller *ctrlr) cc = nvme_mmio_read_4(ctrlr, cc); csts = nvme_mmio_read_4(ctrlr, csts); - en = (cc >> NVME_CC_REG_EN_SHIFT) & NVME_CC_REG_EN_MASK; - rdy = (csts >> NVME_CSTS_REG_RDY_SHIFT) & NVME_CSTS_REG_RDY_MASK; + en = NVMEV(NVME_CC_REG_EN, cc); + rdy = NVMEV(NVME_CSTS_REG_RDY, csts); /* * Per 3.1.5 in NVME 1.3 spec, transitioning CC.EN from 0 to 1 @@ -321,8 +320,8 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr) cc = nvme_mmio_read_4(ctrlr, cc); csts = nvme_mmio_read_4(ctrlr, csts); - en = (cc >> NVME_CC_REG_EN_SHIFT) & NVME_CC_REG_EN_MASK; - rdy = (csts >> NVME_CSTS_REG_RDY_SHIFT) & NVME_CSTS_REG_RDY_MASK; + en = NVMEV(NVME_CC_REG_EN, cc); + rdy = NVMEV(NVME_CSTS_REG_RDY, csts); /* * See note in nvme_ctrlr_disable. Short circuit if we're already enabled. diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 4aad28c1adf9..89779f23ad4d 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -180,10 +180,8 @@ nvme_ns_get_sector_size(struct nvme_namespace *ns) { uint8_t flbas_fmt, lbads; - flbas_fmt = (ns->data.flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & - NVME_NS_DATA_FLBAS_FORMAT_MASK; - lbads = (ns->data.lbaf[flbas_fmt] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, ns->data.lbaf[flbas_fmt]); return (1 << lbads); } @@ -230,8 +228,7 @@ nvme_ns_get_stripesize(struct nvme_namespace *ns) { uint32_t ss; - if (((ns->data.nsfeat >> NVME_NS_DATA_NSFEAT_NPVALID_SHIFT) & - NVME_NS_DATA_NSFEAT_NPVALID_MASK) != 0) { + if (NVMEV(NVME_NS_DATA_NSFEAT_NPVALID, ns->data.nsfeat) != 0) { ss = nvme_ns_get_sector_size(ns); if (ns->data.npwa != 0) return ((ns->data.npwa + 1) * ss); @@ -551,8 +548,8 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, if (ns->data.nsze == 0) return (ENXIO); - flbas_fmt = (ns->data.flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & - NVME_NS_DATA_FLBAS_FORMAT_MASK; + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, ns->data.flbas); + /* * Note: format is a 0-based value, so > is appropriate here, * not >=. @@ -584,8 +581,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, if (nvme_ctrlr_has_dataset_mgmt(&ctrlr->cdata)) ns->flags |= NVME_NS_DEALLOCATE_SUPPORTED; - vwc_present = (ctrlr->cdata.vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & - NVME_CTRLR_DATA_VWC_PRESENT_MASK; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, ctrlr->cdata.vwc); if (vwc_present) ns->flags |= NVME_NS_FLUSH_SUPPORTED; diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 289ce87c86a5..b886a95b1724 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1068,7 +1068,7 @@ nvme_qpair_timeout(void *arg) * usually doesn't). */ csts = nvme_mmio_read_4(ctrlr, csts); - cfs = (csts >> NVME_CSTS_REG_CFS_SHIFT) & NVME_CSTS_REG_CFS_MASK; + cfs = NVMEV(NVME_CSTS_REG_CFS, csts); if (csts == NVME_GONE || cfs == 1) goto do_reset; From nobody Mon Jan 29 19:03:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP11zf3z59Ddq; Mon, 29 Jan 2024 19:03: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 4TNyP11Ly4z40Jx; Mon, 29 Jan 2024 19:03:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjS3zoTR8rd2o8ljm8aaF8VGZiOaBXpxzsPf62/Lz78=; b=rxi9Hlv6oYFM+npRBPK5jhmlWTGYWsY1syx8boNVtjBuypISv3J792nmEH6B+zZW+8IrjP kinbcxidXG131clzzHQEPsISav3bAr91LXBDd0QGsCEE63q8RScYc++pIpXLcYEYy6Qixb RSeMotoTOFJs9hg4HxgqHDCzSFU8MsTz752gebWzHV2tC12gl6DA/+yWwey5tZ3yoF6EjP J1eQFgnAkPKtN7BpDKpW0YY9qqhBQlARgzEXqsmH1tEJUq71hUlnV0zaTg7QKS/DWpXSUj B3VkGWUDx4zwta4bBDML5Qxy5dxNJM+hJ80fYMnL5z8SkvxT1soe4egXWyFskA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gjS3zoTR8rd2o8ljm8aaF8VGZiOaBXpxzsPf62/Lz78=; b=SHR1htvU2SMPY46tLHLuuAuRUOokee5Vc13ZfgEg/Ony6H0v0H3PzPNDuWmYSOEr16XGTW Gx1VoDjHfTbmu3FuEXlgpUkN/0qc0PO+7lwv4nCqNE7b31GhILO72xHU/fmt75DieveZAk wBcWrOKXLJgayaxEGBP0rIy6cic6ApGbtdfWP6EfVe8/vgCdP7aKpsCFY6S8jPYLrRdGiC Qm45xqioFrUsZAZhML4CIrvFjLBl3kRvz5B1NcbHfDJBzny1A2wQxyPbIpxuxHEaB6HTGd ZOK+uOaec3Yks214XcZUFgUt+BOt/RkRYRdgCZmHIVzCBMysVTQ805C5q5AO2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554981; a=rsa-sha256; cv=none; b=bDyBPnQPBhJslQ5uyukDlcCB94QK1QVrQls7zTR1pmI+L7hHjD9f0vdbB/91uWSKdhc4TF S/YWf2YdCSGWNPr8KmNpBp5S+Pg8837TDjOb9gMrNX/D/89nk2sJwKXTA3b/Y1ctN3bBUz aIgJotcVrAJ376qkVziHQrz8SChkhUtdALy/afu98SIwgNzeDFn9zMlyx3dt2M8peJJPtL 1zmMP/lTr5rvlyKAhXd9+fPjZUAz4FZm9w2qXhky1H+Z5Hq2YbF9zd8TGcc+F1+9WCa25S zXpa9k0I5y3/8GwW7vAsqGNNZRs98Nvba1KQTp69NxeOoYyiGPGtjJYBd2LrLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP10RsHz13gC; Mon, 29 Jan 2024 19:03: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 40TJ30Cw058355; Mon, 29 Jan 2024 19:03:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ30ck058352; Mon, 29 Jan 2024 19:03:00 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:00 GMT Message-Id: <202401291903.40TJ30ck058352@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: 2cb78e71503e - main - nda: Use the NVMEV macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cb78e71503ec9a73054a6f70908c5f20c2ceb73 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2cb78e71503ec9a73054a6f70908c5f20c2ceb73 commit 2cb78e71503ec9a73054a6f70908c5f20c2ceb73 Author: John Baldwin AuthorDate: 2024-01-29 18:33:39 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:33:39 +0000 nda: Use the NVMEV macro instead of expanded versions Reviewed by: chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43596 --- sys/cam/nvme/nvme_da.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 2dd7c6d4a70b..3f6cf8702870 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -911,18 +911,15 @@ ndaregister(struct cam_periph *periph, void *arg) else if (maxio > maxphys) maxio = maxphys; /* for safety */ disk->d_maxsize = maxio; - flbas_fmt = (nsd->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & - NVME_NS_DATA_FLBAS_FORMAT_MASK; - lbads = (nsd->lbaf[flbas_fmt] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsd->lbaf[flbas_fmt]); disk->d_sectorsize = 1 << lbads; disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); disk->d_delmaxsize = disk->d_mediasize; disk->d_flags = DISKFLAG_DIRECT_COMPLETION; if (nvme_ctrlr_has_dataset_mgmt(cd)) disk->d_flags |= DISKFLAG_CANDELETE; - vwc_present = (cd->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & - NVME_CTRLR_DATA_VWC_PRESENT_MASK; + vwc_present = NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cd->vwc); if (vwc_present) disk->d_flags |= DISKFLAG_CANFLUSHCACHE; if ((cpi.hba_misc & PIM_UNMAPPED) != 0) { @@ -945,8 +942,8 @@ ndaregister(struct cam_periph *periph, void *arg) disk->d_hba_subdevice = cpi.hba_subdevice; snprintf(disk->d_attachment, sizeof(disk->d_attachment), "%s%d", cpi.dev_name, cpi.unit_number); - if (((nsd->nsfeat >> NVME_NS_DATA_NSFEAT_NPVALID_SHIFT) & - NVME_NS_DATA_NSFEAT_NPVALID_MASK) != 0 && nsd->npwg != 0) + if (NVMEV(NVME_NS_DATA_NSFEAT_NPVALID, nsd->nsfeat) != 0 && + nsd->npwg != 0) disk->d_stripesize = ((nsd->npwg + 1) * disk->d_sectorsize); else disk->d_stripesize = nsd->noiob * disk->d_sectorsize; From nobody Mon Jan 29 19:03:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP24j0nz59Dc5; Mon, 29 Jan 2024 19: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 4TNyP22Q6kz40MY; Mon, 29 Jan 2024 19: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=1706554982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UMuhj2Tl/tRLb3sYcuhMss6in5VZc43Nhy9i6XGrWOs=; b=SqGgmA2cNYRcorq9lKhFvjmsQFI6BH/N6A5RnPagC/MZ2SWrqf1bhVWP7ei65ZcoRz5EEU XvhUDmAfmRHrgBYpKxSb/EJ4qRnuzkrG2OKn02HlZdeyPrd+jRUuC1qP9XlDIOsXHDiA4Y QKQ5GNoO5ewKGmAxnI+oAPz57Kxdvv/VAV4DCFkyiqqcCsQAd7SJ6BrzsgZLQtSW84M7EI 5hnM2MXvTKm0XEmQBnFBLnFj/DZopf2LdycZTc4n1dNP6eBwCC98kIYEGPzGvgJ5jaVSqd Va6A4nGq+tOr323453v2zTOkp6VLDR921ZNYN6vDw7Yy9fgt4+OrlJDCKWwUvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UMuhj2Tl/tRLb3sYcuhMss6in5VZc43Nhy9i6XGrWOs=; b=P15nO2y10Tzb/mGeITDRvFGKAVa+k+atACBAtMKbSDFYcKYVGPLDXHQwjYtoY/vtRJ5wT4 6VRfRKDtJMjCo4XWg/FfRMySuPIrh0XrTQVXTxtV2/KReSBaKWO+IqPsO64WJPvKQQJ6qu FJVN/FTs+EldFIUErDCaBbECJX/Q4WMRu+KfwttbxU/BNMcqpv9Svm1y5upxCE9LwVV3+g 4UPLLH4+6S5ZXXtr0/92fn5Z6um37GQYql+MoLHuzBYQqZot0SkpeeRIflsgYG2S2T+Y77 uPlJnv+v7/eAFIMYTXgyAdHW9+NrEhXxO1Ta3dQBNVmfst0Gda9e5PkTPeuvDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554982; a=rsa-sha256; cv=none; b=bykLCQzDK0bf1274nShyyxeIv2vj1ySyixZ2fy3PLnXoIUMgoNEfzOPLQ7dK05Rw2bT3c0 e7CYBn6a/qdAfHL+A4/SNMqJYMD4kRcLrtalQOqdkclZd1mGX4LBKNCiaQRC+mLbukuqYE T0xvJuaU7V0n7+T/Sm6+Is3aFkkqNeb1ZJnh9+oeL8aDdMmieXxfbhbXeJJDIPa5Ro+Lxj /Ej3AlE9OZNzkHicbyazyaus/mlNiBsTPRM+OjdlBG5lzAA8wbuGkT5gWEuvBm5pWCiOMs 9F2fl7SzbwsMD43DPRSktyF6OaHUAsNs8K+AG4+4g5iLx6dqh/+ooHmPolfe1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP21G9vz13gD; Mon, 29 Jan 2024 19: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 40TJ32gN058410; Mon, 29 Jan 2024 19: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 40TJ32q8058407; Mon, 29 Jan 2024 19:03:02 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:02 GMT Message-Id: <202401291903.40TJ32q8058407@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: fba73a408314 - main - nvmecontrol: Use the NVMEV macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba73a408314d8e32056d4a812c9a2eb5f618b5d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fba73a408314d8e32056d4a812c9a2eb5f618b5d commit fba73a408314d8e32056d4a812c9a2eb5f618b5d Author: John Baldwin AuthorDate: 2024-01-29 18:34:02 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:34:02 +0000 nvmecontrol: Use the NVMEV macro instead of expanded versions Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43597 --- sbin/nvmecontrol/devlist.c | 6 +- sbin/nvmecontrol/firmware.c | 9 +-- sbin/nvmecontrol/format.c | 27 +++----- sbin/nvmecontrol/identify.c | 109 +++++++++++++---------------- sbin/nvmecontrol/identify_ext.c | 149 ++++++++++++++++------------------------ sbin/nvmecontrol/logpage.c | 63 ++++++----------- sbin/nvmecontrol/ns.c | 39 ++++------- sbin/nvmecontrol/power.c | 12 ++-- sbin/nvmecontrol/sanitize.c | 12 ++-- sbin/nvmecontrol/selftest.c | 3 +- 10 files changed, 167 insertions(+), 262 deletions(-) diff --git a/sbin/nvmecontrol/devlist.c b/sbin/nvmecontrol/devlist.c index ff926987aed6..2b34899d3aea 100644 --- a/sbin/nvmecontrol/devlist.c +++ b/sbin/nvmecontrol/devlist.c @@ -82,10 +82,8 @@ ns_get_sector_size(struct nvme_namespace_data *nsdata) { uint8_t flbas_fmt, lbads; - flbas_fmt = (nsdata->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & - NVME_NS_DATA_FLBAS_FORMAT_MASK; - lbads = (nsdata->lbaf[flbas_fmt] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata->flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsdata->lbaf[flbas_fmt]); return (1 << lbads); } diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index 71e744605c66..9e60bd0cee37 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -277,21 +277,18 @@ firmware(const struct cmd *f, int argc, char *argv[]) if (read_controller_data(fd, &cdata)) errx(EX_IOERR, "Identify request failed"); - oacs_fw = (cdata.oacs >> NVME_CTRLR_DATA_OACS_FIRMWARE_SHIFT) & - NVME_CTRLR_DATA_OACS_FIRMWARE_MASK; + oacs_fw = NVMEV(NVME_CTRLR_DATA_OACS_FIRMWARE, cdata.oacs); if (oacs_fw == 0) errx(EX_UNAVAILABLE, "controller does not support firmware activate/download"); - fw_slot1_ro = (cdata.frmw >> NVME_CTRLR_DATA_FRMW_SLOT1_RO_SHIFT) & - NVME_CTRLR_DATA_FRMW_SLOT1_RO_MASK; + fw_slot1_ro = NVMEV(NVME_CTRLR_DATA_FRMW_SLOT1_RO, cdata.frmw); if (opt.fw_img && opt.slot == 1 && fw_slot1_ro) errx(EX_UNAVAILABLE, "slot %d is marked as read only", opt.slot); - fw_num_slots = (cdata.frmw >> NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT) & - NVME_CTRLR_DATA_FRMW_NUM_SLOTS_MASK; + fw_num_slots = NVMEV(NVME_CTRLR_DATA_FRMW_NUM_SLOTS, cdata.frmw); if (opt.slot > fw_num_slots) errx(EX_UNAVAILABLE, diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index 03706765df38..d1ce0fc4645c 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -159,38 +159,33 @@ format(const struct cmd *f, int argc, char *argv[]) /* Check that controller can execute this command. */ if (read_controller_data(fd, &cd)) errx(EX_IOERR, "Identify request failed"); - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_FORMAT_SHIFT) & - NVME_CTRLR_DATA_OACS_FORMAT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_FORMAT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support format"); - if (((cd.fna >> NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_SHIFT) & - NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_MASK) == 0 && ses == SES_CRYPTO) + if (NVMEV(NVME_CTRLR_DATA_FNA_CRYPTO_ERASE, cd.fna) == 0 && + ses == SES_CRYPTO) errx(EX_UNAVAILABLE, "controller does not support cryptographic erase"); if (nsid != NVME_GLOBAL_NAMESPACE_TAG) { - if (((cd.fna >> NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT) & - NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK) && ses == SES_NONE) + if (NVMEV(NVME_CTRLR_DATA_FNA_FORMAT_ALL, cd.fna) && + ses == SES_NONE) errx(EX_UNAVAILABLE, "controller does not support per-NS format"); - if (((cd.fna >> NVME_CTRLR_DATA_FNA_ERASE_ALL_SHIFT) & - NVME_CTRLR_DATA_FNA_ERASE_ALL_MASK) && ses != SES_NONE) + if (NVMEV(NVME_CTRLR_DATA_FNA_ERASE_ALL, cd.fna) && + ses != SES_NONE) errx(EX_UNAVAILABLE, "controller does not support per-NS erase"); /* Try to keep previous namespace parameters. */ if (read_namespace_data(fd, nsid, &nsd)) errx(EX_IOERR, "Identify request failed"); if (lbaf < 0) - lbaf = (nsd.flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) - & NVME_NS_DATA_FLBAS_FORMAT_MASK; + lbaf = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsd.flbas); if (lbaf > nsd.nlbaf) errx(EX_USAGE, "LBA format is out of range"); if (ms < 0) - ms = (nsd.flbas >> NVME_NS_DATA_FLBAS_EXTENDED_SHIFT) - & NVME_NS_DATA_FLBAS_EXTENDED_MASK; + ms = NVMEV(NVME_NS_DATA_FLBAS_EXTENDED, nsd.flbas); if (pi < 0) - pi = (nsd.dps >> NVME_NS_DATA_DPS_MD_START_SHIFT) - & NVME_NS_DATA_DPS_MD_START_MASK; + pi = NVMEV(NVME_NS_DATA_DPS_MD_START, nsd.dps); if (pil < 0) - pil = (nsd.dps >> NVME_NS_DATA_DPS_PIT_SHIFT) - & NVME_NS_DATA_DPS_PIT_MASK; + pil = NVMEV(NVME_NS_DATA_DPS_PIT, nsd.dps); } else { /* We have no previous parameters, so default to zeroes. */ diff --git a/sbin/nvmecontrol/identify.c b/sbin/nvmecontrol/identify.c index 253682c64a99..ea81f23d3aab 100644 --- a/sbin/nvmecontrol/identify.c +++ b/sbin/nvmecontrol/identify.c @@ -66,11 +66,9 @@ print_namespace(struct nvme_namespace_data *nsdata) uint8_t thin_prov, ptype; uint8_t flbas_fmt, t; - thin_prov = (nsdata->nsfeat >> NVME_NS_DATA_NSFEAT_THIN_PROV_SHIFT) & - NVME_NS_DATA_NSFEAT_THIN_PROV_MASK; + thin_prov = NVMEV(NVME_NS_DATA_NSFEAT_THIN_PROV, nsdata->nsfeat); - flbas_fmt = (nsdata->flbas >> NVME_NS_DATA_FLBAS_FORMAT_SHIFT) & - NVME_NS_DATA_FLBAS_FORMAT_MASK; + flbas_fmt = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata->flbas); printf("Size: %lld blocks\n", (long long)nsdata->nsze); @@ -82,83 +80,77 @@ print_namespace(struct nvme_namespace_data *nsdata) thin_prov ? "Supported" : "Not Supported"); printf("Number of LBA Formats: %d\n", nsdata->nlbaf+1); printf("Current LBA Format: LBA Format #%02d", flbas_fmt); - if (nsdata->lbaf[flbas_fmt] >> NVME_NS_DATA_LBAF_MS_SHIFT & NVME_NS_DATA_LBAF_MS_MASK) - printf(" %s metadata\n", nsdata->flbas >> NVME_NS_DATA_FLBAS_EXTENDED_SHIFT & - NVME_NS_DATA_FLBAS_EXTENDED_MASK ? "Extended" : "Separate"); + if (NVMEV(NVME_NS_DATA_LBAF_MS, nsdata->lbaf[flbas_fmt]) != 0) + printf(" %s metadata\n", + NVMEV(NVME_NS_DATA_FLBAS_EXTENDED, nsdata->flbas) != 0 ? + "Extended" : "Separate"); else printf("\n"); printf("Metadata Capabilities\n"); printf(" Extended: %s\n", - nsdata->mc >> NVME_NS_DATA_MC_EXTENDED_SHIFT & NVME_NS_DATA_MC_EXTENDED_MASK ? "Supported" : "Not Supported"); + NVMEV(NVME_NS_DATA_MC_EXTENDED, nsdata->mc) != 0 ? "Supported" : + "Not Supported"); printf(" Separate: %s\n", - nsdata->mc >> NVME_NS_DATA_MC_POINTER_SHIFT & NVME_NS_DATA_MC_POINTER_MASK ? "Supported" : "Not Supported"); + NVMEV(NVME_NS_DATA_MC_POINTER, nsdata->mc) != 0 ? "Supported" : + "Not Supported"); printf("Data Protection Caps: %s%s%s%s%s%s\n", (nsdata->dpc == 0) ? "Not Supported" : "", - ((nsdata->dpc >> NVME_NS_DATA_DPC_MD_END_SHIFT) & - NVME_NS_DATA_DPC_MD_END_MASK) ? "Last Bytes, " : "", - ((nsdata->dpc >> NVME_NS_DATA_DPC_MD_START_SHIFT) & - NVME_NS_DATA_DPC_MD_START_MASK) ? "First Bytes, " : "", - ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT3_SHIFT) & - NVME_NS_DATA_DPC_PIT3_MASK) ? "Type 3, " : "", - ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT2_SHIFT) & - NVME_NS_DATA_DPC_PIT2_MASK) ? "Type 2, " : "", - ((nsdata->dpc >> NVME_NS_DATA_DPC_PIT1_SHIFT) & - NVME_NS_DATA_DPC_PIT1_MASK) ? "Type 1" : ""); + NVMEV(NVME_NS_DATA_DPC_MD_END, nsdata->dpc) != 0 ? "Last Bytes, " : + "", + NVMEV(NVME_NS_DATA_DPC_MD_START, nsdata->dpc) != 0 ? + "First Bytes, " : "", + NVMEV(NVME_NS_DATA_DPC_PIT3, nsdata->dpc) != 0 ? "Type 3, " : "", + NVMEV(NVME_NS_DATA_DPC_PIT2, nsdata->dpc) != 0 ? "Type 2, " : "", + NVMEV(NVME_NS_DATA_DPC_PIT1, nsdata->dpc) != 0 ? "Type 1" : ""); printf("Data Protection Settings: "); - ptype = (nsdata->dps >> NVME_NS_DATA_DPS_PIT_SHIFT) & - NVME_NS_DATA_DPS_PIT_MASK; - if (ptype) { + ptype = NVMEV(NVME_NS_DATA_DPS_PIT, nsdata->dps); + if (ptype != 0) { printf("Type %d, %s Bytes\n", ptype, - ((nsdata->dps >> NVME_NS_DATA_DPS_MD_START_SHIFT) & - NVME_NS_DATA_DPS_MD_START_MASK) ? "First" : "Last"); + NVMEV(NVME_NS_DATA_DPS_MD_START, nsdata->dps) != 0 ? + "First" : "Last"); } else { printf("Not Enabled\n"); } printf("Multi-Path I/O Capabilities: %s%s\n", (nsdata->nmic == 0) ? "Not Supported" : "", - ((nsdata->nmic >> NVME_NS_DATA_NMIC_MAY_BE_SHARED_SHIFT) & - NVME_NS_DATA_NMIC_MAY_BE_SHARED_MASK) ? "May be shared" : ""); + NVMEV(NVME_NS_DATA_NMIC_MAY_BE_SHARED, nsdata->nmic) != 0 ? + "May be shared" : ""); printf("Reservation Capabilities: %s%s%s%s%s%s%s%s%s\n", (nsdata->rescap == 0) ? "Not Supported" : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_IEKEY13_SHIFT) & - NVME_NS_DATA_RESCAP_IEKEY13_MASK) ? "IEKEY13, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_AR_SHIFT) & - NVME_NS_DATA_RESCAP_EX_AC_AR_MASK) ? "EX_AC_AR, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_AR_SHIFT) & - NVME_NS_DATA_RESCAP_WR_EX_AR_MASK) ? "WR_EX_AR, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_RO_SHIFT) & - NVME_NS_DATA_RESCAP_EX_AC_RO_MASK) ? "EX_AC_RO, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_RO_SHIFT) & - NVME_NS_DATA_RESCAP_WR_EX_RO_MASK) ? "WR_EX_RO, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_EX_AC_SHIFT) & - NVME_NS_DATA_RESCAP_EX_AC_MASK) ? "EX_AC, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_WR_EX_SHIFT) & - NVME_NS_DATA_RESCAP_WR_EX_MASK) ? "WR_EX, " : "", - ((nsdata->rescap >> NVME_NS_DATA_RESCAP_PTPL_SHIFT) & - NVME_NS_DATA_RESCAP_PTPL_MASK) ? "PTPL" : ""); + NVMEV(NVME_NS_DATA_RESCAP_IEKEY13, nsdata->rescap) != 0 ? + "IEKEY13, " : "", + NVMEV(NVME_NS_DATA_RESCAP_EX_AC_AR, nsdata->rescap) != 0 ? + "EX_AC_AR, " : "", + NVMEV(NVME_NS_DATA_RESCAP_WR_EX_AR, nsdata->rescap) != 0 ? + "WR_EX_AR, " : "", + NVMEV(NVME_NS_DATA_RESCAP_EX_AC_RO, nsdata->rescap) != 0 ? + "EX_AC_RO, " : "", + NVMEV(NVME_NS_DATA_RESCAP_WR_EX_RO, nsdata->rescap) != 0 ? + "WR_EX_RO, " : "", + NVMEV(NVME_NS_DATA_RESCAP_EX_AC, nsdata->rescap) != 0 ? + "EX_AC, " : "", + NVMEV(NVME_NS_DATA_RESCAP_WR_EX, nsdata->rescap) != 0 ? + "WR_EX, " : "", + NVMEV(NVME_NS_DATA_RESCAP_PTPL, nsdata->rescap) != 0 ? "PTPL" : ""); printf("Format Progress Indicator: "); - if ((nsdata->fpi >> NVME_NS_DATA_FPI_SUPP_SHIFT) & - NVME_NS_DATA_FPI_SUPP_MASK) { + if (NVMEV(NVME_NS_DATA_FPI_SUPP, nsdata->fpi) != 0) { printf("%u%% remains\n", - (nsdata->fpi >> NVME_NS_DATA_FPI_PERC_SHIFT) & - NVME_NS_DATA_FPI_PERC_MASK); + NVMEV(NVME_NS_DATA_FPI_PERC, nsdata->fpi)); } else printf("Not Supported\n"); - t = (nsdata->dlfeat >> NVME_NS_DATA_DLFEAT_READ_SHIFT) & - NVME_NS_DATA_DLFEAT_READ_MASK; + t = NVMEV(NVME_NS_DATA_DLFEAT_READ, nsdata->dlfeat); printf("Deallocate Logical Block: Read %s%s%s\n", (t == NVME_NS_DATA_DLFEAT_READ_NR) ? "Not Reported" : (t == NVME_NS_DATA_DLFEAT_READ_00) ? "00h" : (t == NVME_NS_DATA_DLFEAT_READ_FF) ? "FFh" : "Unknown", - (nsdata->dlfeat >> NVME_NS_DATA_DLFEAT_DWZ_SHIFT) & - NVME_NS_DATA_DLFEAT_DWZ_MASK ? ", Write Zero" : "", - (nsdata->dlfeat >> NVME_NS_DATA_DLFEAT_GCRC_SHIFT) & - NVME_NS_DATA_DLFEAT_GCRC_MASK ? ", Guard CRC" : ""); + NVMEV(NVME_NS_DATA_DLFEAT_DWZ, nsdata->dlfeat) != 0 ? + ", Write Zero" : "", + NVMEV(NVME_NS_DATA_DLFEAT_GCRC, nsdata->dlfeat) != 0 ? + ", Guard CRC" : ""); printf("Optimal I/O Boundary: %u blocks\n", nsdata->noiob); printf("NVM Capacity: %s bytes\n", uint128_to_str(to128(nsdata->nvmcap), cbuf, sizeof(cbuf))); - if ((nsdata->nsfeat >> NVME_NS_DATA_NSFEAT_NPVALID_SHIFT) & - NVME_NS_DATA_NSFEAT_NPVALID_MASK) { + if (NVMEV(NVME_NS_DATA_NSFEAT_NPVALID, nsdata->nsfeat) != 0) { printf("Preferred Write Granularity: %u blocks\n", nsdata->npwg + 1); printf("Preferred Write Alignment: %u blocks\n", @@ -180,14 +172,11 @@ print_namespace(struct nvme_namespace_data *nsdata) printf("\n"); for (i = 0; i <= nsdata->nlbaf; i++) { lbaf = nsdata->lbaf[i]; - lbads = (lbaf >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, lbaf); if (lbads == 0) continue; - ms = (lbaf >> NVME_NS_DATA_LBAF_MS_SHIFT) & - NVME_NS_DATA_LBAF_MS_MASK; - rp = (lbaf >> NVME_NS_DATA_LBAF_RP_SHIFT) & - NVME_NS_DATA_LBAF_RP_MASK; + ms = NVMEV(NVME_NS_DATA_LBAF_MS, lbaf); + rp = NVMEV(NVME_NS_DATA_LBAF_RP, lbaf); printf("LBA Format #%02d: Data Size: %5d Metadata Size: %5d" " Performance: %s\n", i, 1 << lbads, ms, (rp == 0) ? "Best" : diff --git a/sbin/nvmecontrol/identify_ext.c b/sbin/nvmecontrol/identify_ext.c index 2c2ba2435133..e4126da2d685 100644 --- a/sbin/nvmecontrol/identify_ext.c +++ b/sbin/nvmecontrol/identify_ext.c @@ -56,41 +56,27 @@ nvme_print_controller(struct nvme_controller_data *cdata) uint8_t fwug; oncs = cdata->oncs; - compare = (oncs >> NVME_CTRLR_DATA_ONCS_COMPARE_SHIFT) & - NVME_CTRLR_DATA_ONCS_COMPARE_MASK; - write_unc = (oncs >> NVME_CTRLR_DATA_ONCS_WRITE_UNC_SHIFT) & - NVME_CTRLR_DATA_ONCS_WRITE_UNC_MASK; - dsm = (oncs >> NVME_CTRLR_DATA_ONCS_DSM_SHIFT) & - NVME_CTRLR_DATA_ONCS_DSM_MASK; + compare = NVMEV(NVME_CTRLR_DATA_ONCS_COMPARE, oncs); + write_unc = NVMEV(NVME_CTRLR_DATA_ONCS_WRITE_UNC, oncs); + dsm = NVMEV(NVME_CTRLR_DATA_ONCS_DSM, oncs); oacs = cdata->oacs; - security = (oacs >> NVME_CTRLR_DATA_OACS_SECURITY_SHIFT) & - NVME_CTRLR_DATA_OACS_SECURITY_MASK; - fmt = (oacs >> NVME_CTRLR_DATA_OACS_FORMAT_SHIFT) & - NVME_CTRLR_DATA_OACS_FORMAT_MASK; - fw = (oacs >> NVME_CTRLR_DATA_OACS_FIRMWARE_SHIFT) & - NVME_CTRLR_DATA_OACS_FIRMWARE_MASK; - nsmgmt = (oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK; + security = NVMEV(NVME_CTRLR_DATA_OACS_SECURITY, oacs); + fmt = NVMEV(NVME_CTRLR_DATA_OACS_FORMAT, oacs); + fw = NVMEV(NVME_CTRLR_DATA_OACS_FIRMWARE, oacs); + nsmgmt = NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, oacs); - fw_num_slots = (cdata->frmw >> NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT) & - NVME_CTRLR_DATA_FRMW_NUM_SLOTS_MASK; - fw_slot1_ro = (cdata->frmw >> NVME_CTRLR_DATA_FRMW_SLOT1_RO_SHIFT) & - NVME_CTRLR_DATA_FRMW_SLOT1_RO_MASK; + fw_num_slots = NVMEV(NVME_CTRLR_DATA_FRMW_NUM_SLOTS, cdata->frmw); + fw_slot1_ro = NVMEV(NVME_CTRLR_DATA_FRMW_SLOT1_RO, cdata->frmw); fwug = cdata->fwug; - ns_smart = (cdata->lpa >> NVME_CTRLR_DATA_LPA_NS_SMART_SHIFT) & - NVME_CTRLR_DATA_LPA_NS_SMART_MASK; + ns_smart = NVMEV(NVME_CTRLR_DATA_LPA_NS_SMART, cdata->lpa); - sqes_min = (cdata->sqes >> NVME_CTRLR_DATA_SQES_MIN_SHIFT) & - NVME_CTRLR_DATA_SQES_MIN_MASK; - sqes_max = (cdata->sqes >> NVME_CTRLR_DATA_SQES_MAX_SHIFT) & - NVME_CTRLR_DATA_SQES_MAX_MASK; + sqes_min = NVMEV(NVME_CTRLR_DATA_SQES_MIN, cdata->sqes); + sqes_max = NVMEV(NVME_CTRLR_DATA_SQES_MAX, cdata->sqes); - cqes_min = (cdata->cqes >> NVME_CTRLR_DATA_CQES_MIN_SHIFT) & - NVME_CTRLR_DATA_CQES_MIN_MASK; - cqes_max = (cdata->cqes >> NVME_CTRLR_DATA_CQES_MAX_SHIFT) & - NVME_CTRLR_DATA_CQES_MAX_MASK; + cqes_min = NVMEV(NVME_CTRLR_DATA_CQES_MIN, cdata->cqes); + cqes_max = NVMEV(NVME_CTRLR_DATA_CQES_MAX, cdata->cqes); printf("Controller Capabilities/Features\n"); printf("================================\n"); @@ -107,14 +93,14 @@ nvme_print_controller(struct nvme_controller_data *cdata) cdata->ieee[2], cdata->ieee[1], cdata->ieee[0]); printf("Multi-Path I/O Capabilities: %s%s%s%s%s\n", (cdata->mic == 0) ? "Not Supported" : "", - ((cdata->mic >> NVME_CTRLR_DATA_MIC_ANAR_SHIFT) & - NVME_CTRLR_DATA_MIC_SRIOVVF_MASK) ? "Asymmetric, " : "", - ((cdata->mic >> NVME_CTRLR_DATA_MIC_SRIOVVF_SHIFT) & - NVME_CTRLR_DATA_MIC_SRIOVVF_MASK) ? "SR-IOV VF, " : "", - ((cdata->mic >> NVME_CTRLR_DATA_MIC_MCTRLRS_SHIFT) & - NVME_CTRLR_DATA_MIC_MCTRLRS_MASK) ? "Multiple controllers, " : "", - ((cdata->mic >> NVME_CTRLR_DATA_MIC_MPORTS_SHIFT) & - NVME_CTRLR_DATA_MIC_MPORTS_MASK) ? "Multiple ports" : ""); + NVMEV(NVME_CTRLR_DATA_MIC_ANAR, cdata->mic) != 0 ? + "Asymmetric, " : "", + NVMEV(NVME_CTRLR_DATA_MIC_SRIOVVF, cdata->mic) != 0 ? + "SR-IOV VF, " : "", + NVMEV(NVME_CTRLR_DATA_MIC_MCTRLRS, cdata->mic) != 0 ? + "Multiple controllers, " : "", + NVMEV(NVME_CTRLR_DATA_MIC_MPORTS, cdata->mic) != 0 ? + "Multiple ports" : ""); /* TODO: Use CAP.MPSMIN to determine true memory page size. */ printf("Max Data Transfer Size: "); if (cdata->mdts == 0) @@ -122,24 +108,19 @@ nvme_print_controller(struct nvme_controller_data *cdata) else printf("%ld bytes\n", PAGE_SIZE * (1L << cdata->mdts)); printf("Sanitize Crypto Erase: %s\n", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_CES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_CES_MASK) ? - "Supported" : "Not Supported"); + NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cdata->sanicap) != 0 ? + "Supported" : "Not Supported"); printf("Sanitize Block Erase: %s\n", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_BES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_BES_MASK) ? - "Supported" : "Not Supported"); + NVMEV(NVME_CTRLR_DATA_SANICAP_BES, cdata->sanicap) != 0 ? + "Supported" : "Not Supported"); printf("Sanitize Overwrite: %s\n", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_OWS_SHIFT) & - NVME_CTRLR_DATA_SANICAP_OWS_MASK) ? - "Supported" : "Not Supported"); + NVMEV(NVME_CTRLR_DATA_SANICAP_OWS, cdata->sanicap) != 0 ? + "Supported" : "Not Supported"); printf("Sanitize NDI: %s\n", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_NDI_SHIFT) & - NVME_CTRLR_DATA_SANICAP_NDI_MASK) ? - "Supported" : "Not Supported"); + NVMEV(NVME_CTRLR_DATA_SANICAP_NDI, cdata->sanicap) != 0 ? + "Supported" : "Not Supported"); printf("Sanitize NODMMAS: "); - switch (((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_NODMMAS_SHIFT) & - NVME_CTRLR_DATA_SANICAP_NODMMAS_MASK)) { + switch (NVMEV(NVME_CTRLR_DATA_SANICAP_NODMMAS, cdata->sanicap)) { case NVME_CTRLR_DATA_SANICAP_NODMMAS_UNDEF: printf("Undefined\n"); break; @@ -170,32 +151,26 @@ nvme_print_controller(struct nvme_controller_data *cdata) printf("Namespace Management: %s\n", nsmgmt ? "Supported" : "Not Supported"); printf("Device Self-test: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_SELFTEST_SHIFT) & - NVME_CTRLR_DATA_OACS_SELFTEST_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_SELFTEST, oacs) != 0 ? "" : "Not "); printf("Directives: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_DIRECTIVES_SHIFT) & - NVME_CTRLR_DATA_OACS_DIRECTIVES_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_DIRECTIVES, oacs) != 0 ? "" : "Not "); printf("NVMe-MI Send/Receive: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_NVMEMI_SHIFT) & - NVME_CTRLR_DATA_OACS_NVMEMI_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_NVMEMI, oacs) != 0 ? "" : "Not "); printf("Virtualization Management: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_VM_SHIFT) & - NVME_CTRLR_DATA_OACS_VM_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_VM, oacs) != 0 ? "" : "Not "); printf("Doorbell Buffer Config: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_DBBUFFER_SHIFT) & - NVME_CTRLR_DATA_OACS_DBBUFFER_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_DBBUFFER, oacs) != 0 ? "" : "Not "); printf("Get LBA Status: %sSupported\n", - ((oacs >> NVME_CTRLR_DATA_OACS_GETLBA_SHIFT) & - NVME_CTRLR_DATA_OACS_GETLBA_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_OACS_GETLBA, oacs) != 0 ? "" : "Not "); printf("Sanitize: "); if (cdata->sanicap != 0) { printf("%s%s%s\n", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_CES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_CES_MASK) ? "crypto, " : "", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_BES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_BES_MASK) ? "block, " : "", - ((cdata->sanicap >> NVME_CTRLR_DATA_SANICAP_OWS_SHIFT) & - NVME_CTRLR_DATA_SANICAP_OWS_MASK) ? "overwrite" : ""); + NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cdata->sanicap) != 0 ? + "crypto, " : "", + NVMEV(NVME_CTRLR_DATA_SANICAP_BES, cdata->sanicap) != 0 ? + "block, " : "", + NVMEV(NVME_CTRLR_DATA_SANICAP_OWS, cdata->sanicap) != 0 ? + "overwrite" : ""); } else { printf("Not Supported\n"); } @@ -244,36 +219,30 @@ nvme_print_controller(struct nvme_controller_data *cdata) printf("Dataset Management Command: %s\n", dsm ? "Supported" : "Not Supported"); printf("Write Zeroes Command: %sSupported\n", - ((oncs >> NVME_CTRLR_DATA_ONCS_WRZERO_SHIFT) & - NVME_CTRLR_DATA_ONCS_WRZERO_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_ONCS_WRZERO, oncs) != 0 ? "" : "Not "); printf("Save Features: %sSupported\n", - ((oncs >> NVME_CTRLR_DATA_ONCS_SAVEFEAT_SHIFT) & - NVME_CTRLR_DATA_ONCS_SAVEFEAT_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_ONCS_SAVEFEAT, oncs) != 0 ? "" : "Not "); printf("Reservations: %sSupported\n", - ((oncs >> NVME_CTRLR_DATA_ONCS_RESERV_SHIFT) & - NVME_CTRLR_DATA_ONCS_RESERV_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_ONCS_RESERV, oncs) != 0 ? "" : "Not "); printf("Timestamp feature: %sSupported\n", - ((oncs >> NVME_CTRLR_DATA_ONCS_TIMESTAMP_SHIFT) & - NVME_CTRLR_DATA_ONCS_TIMESTAMP_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_ONCS_TIMESTAMP, oncs) != 0 ? "" : "Not "); printf("Verify feature: %sSupported\n", - ((oncs >> NVME_CTRLR_DATA_ONCS_VERIFY_SHIFT) & - NVME_CTRLR_DATA_ONCS_VERIFY_MASK) ? "" : "Not "); + NVMEV(NVME_CTRLR_DATA_ONCS_VERIFY, oncs) != 0 ? "" : "Not "); printf("Fused Operation Support: %s%s\n", (cdata->fuses == 0) ? "Not Supported" : "", - ((cdata->fuses >> NVME_CTRLR_DATA_FUSES_CNW_SHIFT) & - NVME_CTRLR_DATA_FUSES_CNW_MASK) ? "Compare and Write" : ""); + NVMEV(NVME_CTRLR_DATA_FUSES_CNW, cdata->fuses) != 0 ? + "Compare and Write" : ""); printf("Format NVM Attributes: %s%s Erase, %s Format\n", - ((cdata->fna >> NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_SHIFT) & - NVME_CTRLR_DATA_FNA_CRYPTO_ERASE_MASK) ? "Crypto Erase, " : "", - ((cdata->fna >> NVME_CTRLR_DATA_FNA_ERASE_ALL_SHIFT) & - NVME_CTRLR_DATA_FNA_ERASE_ALL_MASK) ? "All-NVM" : "Per-NS", - ((cdata->fna >> NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT) & - NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK) ? "All-NVM" : "Per-NS"); - t = (cdata->vwc >> NVME_CTRLR_DATA_VWC_ALL_SHIFT) & - NVME_CTRLR_DATA_VWC_ALL_MASK; + NVMEV(NVME_CTRLR_DATA_FNA_CRYPTO_ERASE, cdata->fna) != 0 ? + "Crypto Erase, " : "", + NVMEV(NVME_CTRLR_DATA_FNA_ERASE_ALL, cdata->fna) != 0 ? + "All-NVM" : "Per-NS", + NVMEV(NVME_CTRLR_DATA_FNA_FORMAT_ALL, cdata->fna) != 0 ? + "All-NVM" : "Per-NS"); + t = NVMEV(NVME_CTRLR_DATA_VWC_ALL, cdata->vwc); printf("Volatile Write Cache: %s%s\n", - ((cdata->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & - NVME_CTRLR_DATA_VWC_PRESENT_MASK) ? "Present" : "Not Present", + NVMEV(NVME_CTRLR_DATA_VWC_PRESENT, cdata->vwc) != 0 ? + "Present" : "Not Present", (t == NVME_CTRLR_DATA_VWC_ALL_NO) ? ", no flush all" : (t == NVME_CTRLR_DATA_VWC_ALL_YES) ? ", flush all" : ""); diff --git a/sbin/nvmecontrol/logpage.c b/sbin/nvmecontrol/logpage.c index 23c7bbfa4559..52be71d7ef69 100644 --- a/sbin/nvmecontrol/logpage.c +++ b/sbin/nvmecontrol/logpage.c @@ -405,13 +405,10 @@ print_log_firmware(const struct nvme_controller_data *cdata, void *buf, uint32_t uint16_t oacs_fw; uint8_t fw_num_slots; - afi_slot = fw->afi >> NVME_FIRMWARE_PAGE_AFI_SLOT_SHIFT; - afi_slot &= NVME_FIRMWARE_PAGE_AFI_SLOT_MASK; + afi_slot = NVMEV(NVME_FIRMWARE_PAGE_AFI_SLOT, fw->afi); - oacs_fw = (cdata->oacs >> NVME_CTRLR_DATA_OACS_FIRMWARE_SHIFT) & - NVME_CTRLR_DATA_OACS_FIRMWARE_MASK; - fw_num_slots = (cdata->frmw >> NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT) & - NVME_CTRLR_DATA_FRMW_NUM_SLOTS_MASK; + oacs_fw = NVMEV(NVME_CTRLR_DATA_OACS_FIRMWARE, cdata->oacs); + fw_num_slots = NVMEV(NVME_CTRLR_DATA_FRMW_NUM_SLOTS, cdata->frmw); printf("Firmware Slot Log\n"); printf("=================\n"); @@ -471,41 +468,27 @@ print_log_command_effects(const struct nvme_controller_data *cdata __unused, for (i = 0; i < 255; i++) { s = ce->acs[i]; - if (((s >> NVME_CE_PAGE_CSUP_SHIFT) & - NVME_CE_PAGE_CSUP_MASK) == 0) + if (NVMEV(NVME_CE_PAGE_CSUP, s) == 0) continue; printf("Admin\t%02x\t%s\t%s\t%s\t%s\t%u\t%s\n", i, - ((s >> NVME_CE_PAGE_LBCC_SHIFT) & - NVME_CE_PAGE_LBCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_NCC_SHIFT) & - NVME_CE_PAGE_NCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_NIC_SHIFT) & - NVME_CE_PAGE_NIC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_CCC_SHIFT) & - NVME_CE_PAGE_CCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_CSE_SHIFT) & - NVME_CE_PAGE_CSE_MASK), - ((s >> NVME_CE_PAGE_UUID_SHIFT) & - NVME_CE_PAGE_UUID_MASK) ? "Yes" : "No"); + NVMEV(NVME_CE_PAGE_LBCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_NCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_NIC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_CCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_CSE, s), + NVMEV(NVME_CE_PAGE_UUID, s) != 0 ? "Yes" : "No"); } for (i = 0; i < 255; i++) { s = ce->iocs[i]; - if (((s >> NVME_CE_PAGE_CSUP_SHIFT) & - NVME_CE_PAGE_CSUP_MASK) == 0) + if (NVMEV(NVME_CE_PAGE_CSUP, s) == 0) continue; printf("I/O\t%02x\t%s\t%s\t%s\t%s\t%u\t%s\n", i, - ((s >> NVME_CE_PAGE_LBCC_SHIFT) & - NVME_CE_PAGE_LBCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_NCC_SHIFT) & - NVME_CE_PAGE_NCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_NIC_SHIFT) & - NVME_CE_PAGE_NIC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_CCC_SHIFT) & - NVME_CE_PAGE_CCC_MASK) ? "Yes" : "No", - ((s >> NVME_CE_PAGE_CSE_SHIFT) & - NVME_CE_PAGE_CSE_MASK), - ((s >> NVME_CE_PAGE_UUID_SHIFT) & - NVME_CE_PAGE_UUID_MASK) ? "Yes" : "No"); + NVMEV(NVME_CE_PAGE_LBCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_NCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_NIC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_CCC, s) != 0 ? "Yes" : "No", + NVMEV(NVME_CE_PAGE_CSE, s), + NVMEV(NVME_CE_PAGE_UUID, s) != 0 ? "Yes" : "No"); } } @@ -556,8 +539,7 @@ print_log_sanitize_status(const struct nvme_controller_data *cdata __unused, printf("Sanitize Progress: %u%% (%u/65535)\n", (ss->sprog * 100 + 32768) / 65536, ss->sprog); printf("Sanitize Status: "); - switch ((ss->sstat >> NVME_SS_PAGE_SSTAT_STATUS_SHIFT) & - NVME_SS_PAGE_SSTAT_STATUS_MASK) { + switch (NVMEV(NVME_SS_PAGE_SSTAT_STATUS, ss->sstat)) { case NVME_SS_PAGE_SSTAT_STATUS_NEVER: printf("Never sanitized"); break; @@ -577,12 +559,10 @@ print_log_sanitize_status(const struct nvme_controller_data *cdata __unused, printf("Unknown"); break; } - p = (ss->sstat >> NVME_SS_PAGE_SSTAT_PASSES_SHIFT) & - NVME_SS_PAGE_SSTAT_PASSES_MASK; + p = NVMEV(NVME_SS_PAGE_SSTAT_PASSES, ss->sstat); if (p > 0) printf(", %d passes", p); - if ((ss->sstat >> NVME_SS_PAGE_SSTAT_GDE_SHIFT) & - NVME_SS_PAGE_SSTAT_GDE_MASK) + if (NVMEV(NVME_SS_PAGE_SSTAT_GDE, ss->sstat) != 0) printf(", Global Data Erased"); printf("\n"); printf("Sanitize Command Dword 10: 0x%x\n", ss->scdw10); @@ -804,8 +784,7 @@ logpage(const struct cmd *f, int argc, char *argv[]) if (read_controller_data(fd, &cdata)) errx(EX_IOERR, "Identify request failed"); - ns_smart = (cdata.lpa >> NVME_CTRLR_DATA_LPA_NS_SMART_SHIFT) & - NVME_CTRLR_DATA_LPA_NS_SMART_MASK; + ns_smart = NVMEV(NVME_CTRLR_DATA_LPA_NS_SMART, cdata.lpa); /* * The log page attributes indicate whether or not the controller diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 3d3cccf6c8da..a90692b9ed78 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -416,8 +416,7 @@ nsactive(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); @@ -462,8 +461,7 @@ nsallocated(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); @@ -508,8 +506,7 @@ nscontrollers(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); @@ -570,8 +567,7 @@ nscreate(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&nsdata, 0, sizeof(nsdata)); @@ -629,8 +625,7 @@ nscreate(const struct cmd *f, int argc, char *argv[]) if (nvme_completion_is_error(&pt.cpl)) { errx(EX_IOERR, "namespace creation failed: %s", - get_res_str((pt.cpl.status >> NVME_STATUS_SC_SHIFT) & - NVME_STATUS_SC_MASK)); + get_res_str(NVMEV(NVME_STATUS_SC, pt.cpl.status))); } printf("namespace %d created\n", pt.cpl.cdw0); exit(0); @@ -666,8 +661,7 @@ nsdelete(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); @@ -683,8 +677,7 @@ nsdelete(const struct cmd *f, int argc, char *argv[]) if (nvme_completion_is_error(&pt.cpl)) { errx(EX_IOERR, "namespace deletion failed: %s", - get_res_str((pt.cpl.status >> NVME_STATUS_SC_SHIFT) & - NVME_STATUS_SC_MASK)); + get_res_str(NVMEV(NVME_STATUS_SC, pt.cpl.status))); } printf("namespace %d deleted\n", nsid); exit(0); @@ -733,8 +726,7 @@ nsattach(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); if (attach_opt.ctrlrid == NONE) { @@ -770,8 +762,7 @@ nsattach(const struct cmd *f, int argc, char *argv[]) if (nvme_completion_is_error(&pt.cpl)) { errx(EX_IOERR, "namespace attach failed: %s", - get_res_str((pt.cpl.status >> NVME_STATUS_SC_SHIFT) & - NVME_STATUS_SC_MASK)); + get_res_str(NVMEV(NVME_STATUS_SC, pt.cpl.status))); } printf("namespace %d attached\n", nsid); exit(0); @@ -805,8 +796,7 @@ nsdetach(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); if (detach_opt.ctrlrid == NONE) { @@ -849,8 +839,7 @@ nsdetach(const struct cmd *f, int argc, char *argv[]) if (nvme_completion_is_error(&pt.cpl)) { errx(EX_IOERR, "namespace detach failed: %s", - get_res_str((pt.cpl.status >> NVME_STATUS_SC_SHIFT) & - NVME_STATUS_SC_MASK)); + get_res_str(NVMEV(NVME_STATUS_SC, pt.cpl.status))); } printf("namespace %d detached\n", nsid); exit(0); @@ -884,8 +873,7 @@ nsattached(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); @@ -938,8 +926,7 @@ nsidentify(const struct cmd *f, int argc, char *argv[]) errx(EX_IOERR, "Identify request failed"); /* Check that controller can execute this command. */ - if (((cd.oacs >> NVME_CTRLR_DATA_OACS_NSMGMT_SHIFT) & - NVME_CTRLR_DATA_OACS_NSMGMT_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_NSMGMT, cd.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support namespace management"); memset(&pt, 0, sizeof(pt)); diff --git a/sbin/nvmecontrol/power.c b/sbin/nvmecontrol/power.c index de384f719a14..57270e1995e3 100644 --- a/sbin/nvmecontrol/power.c +++ b/sbin/nvmecontrol/power.c @@ -62,14 +62,10 @@ power_list_one(int i, struct nvme_power_state *nps) int mpower, apower, ipower; uint8_t mps, nops, aps, apw; - mps = (nps->mps_nops >> NVME_PWR_ST_MPS_SHIFT) & - NVME_PWR_ST_MPS_MASK; - nops = (nps->mps_nops >> NVME_PWR_ST_NOPS_SHIFT) & - NVME_PWR_ST_NOPS_MASK; - apw = (nps->apw_aps >> NVME_PWR_ST_APW_SHIFT) & - NVME_PWR_ST_APW_MASK; - aps = (nps->apw_aps >> NVME_PWR_ST_APS_SHIFT) & - NVME_PWR_ST_APS_MASK; + mps = NVMEV(NVME_PWR_ST_MPS, nps->mps_nops); + nops = NVMEV(NVME_PWR_ST_NOPS, nps->mps_nops); + apw = NVMEV(NVME_PWR_ST_APW, nps->apw_aps); + aps = NVMEV(NVME_PWR_ST_APS, nps->apw_aps); mpower = nps->mp; if (mps == 0) diff --git a/sbin/nvmecontrol/sanitize.c b/sbin/nvmecontrol/sanitize.c index df1081217262..ab75900d60da 100644 --- a/sbin/nvmecontrol/sanitize.c +++ b/sbin/nvmecontrol/sanitize.c @@ -154,14 +154,11 @@ sanitize(const struct cmd *f, int argc, char *argv[]) /* Check that controller can execute this command. */ if (read_controller_data(fd, &cd)) errx(EX_IOERR, "Identify request failed"); - if (((cd.sanicap >> NVME_CTRLR_DATA_SANICAP_BES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_BES_MASK) == 0 && sanact == 2) + if (NVMEV(NVME_CTRLR_DATA_SANICAP_BES, cd.sanicap) == 0 && sanact == 2) errx(EX_UNAVAILABLE, "controller does not support Block Erase"); - if (((cd.sanicap >> NVME_CTRLR_DATA_SANICAP_OWS_SHIFT) & - NVME_CTRLR_DATA_SANICAP_OWS_MASK) == 0 && sanact == 3) + if (NVMEV(NVME_CTRLR_DATA_SANICAP_OWS, cd.sanicap) == 0 && sanact == 3) errx(EX_UNAVAILABLE, "controller does not support Overwrite"); - if (((cd.sanicap >> NVME_CTRLR_DATA_SANICAP_CES_SHIFT) & - NVME_CTRLR_DATA_SANICAP_CES_MASK) == 0 && sanact == 4) + if (NVMEV(NVME_CTRLR_DATA_SANICAP_CES, cd.sanicap) == 0 && sanact == 4) errx(EX_UNAVAILABLE, "controller does not support Crypto Erase"); /* @@ -186,8 +183,7 @@ sanitize(const struct cmd *f, int argc, char *argv[]) wait: read_logpage(fd, NVME_LOG_SANITIZE_STATUS, NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, &ss, sizeof(ss)); - switch ((ss.sstat >> NVME_SS_PAGE_SSTAT_STATUS_SHIFT) & - NVME_SS_PAGE_SSTAT_STATUS_MASK) { + switch (NVMEV(NVME_SS_PAGE_SSTAT_STATUS, ss.sstat)) { case NVME_SS_PAGE_SSTAT_STATUS_NEVER: printf("Never sanitized"); break; diff --git a/sbin/nvmecontrol/selftest.c b/sbin/nvmecontrol/selftest.c index a1f09f46b206..6a4da902999e 100644 --- a/sbin/nvmecontrol/selftest.c +++ b/sbin/nvmecontrol/selftest.c @@ -99,8 +99,7 @@ selftest(const struct cmd *f, int argc, char *argv[]) if (read_controller_data(fd, &cdata)) errx(EX_IOERR, "Identify request failed"); - if (((cdata.oacs >> NVME_CTRLR_DATA_OACS_SELFTEST_SHIFT) & - NVME_CTRLR_DATA_OACS_SELFTEST_MASK) == 0) + if (NVMEV(NVME_CTRLR_DATA_OACS_SELFTEST, cdata.oacs) == 0) errx(EX_UNAVAILABLE, "controller does not support self-test"); selftest_op(fd, nsid, opt.stc); From nobody Mon Jan 29 19:03:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP35jtjz59DH4; Mon, 29 Jan 2024 19:03: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 4TNyP33Tjgz40KL; Mon, 29 Jan 2024 19:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOH2HxQDnG3Uz7HjVbCGCQ7TXNo4k2Phn51m+v3cBzo=; b=SE79PPafNc3sjgvO1Kb87nwZWOVY4vbhIJhgp8uhmlpPu03rkYFrlFbOkrYjdBAvslbSEn 34jxdofhEbwug2wjglG6BajI1xeSgFqUpq5tbkn0NtSMMWplLPL8t2HtComOBGXCtOeq7x Z2/l4pXnibeutRXB/ozIom9C7kyY2jXiLfgIWxWIL86Nev89VFg2UAspvSqwTPR4TrscmP 9iVz+9mZN6fxJCVogQ7rUc5bIBZZdeQx+pEi3PfpvYNieHSPTqX36+DypGvpcVtx7sn7wT jGyEGLEmd7eGtj9jQrZQWK8BlaSOSF0pLJ7065Jkhyis+RZph5pMA9uUPDcl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hOH2HxQDnG3Uz7HjVbCGCQ7TXNo4k2Phn51m+v3cBzo=; b=ZDdLVWhmz7isaS3apcJfPix1ahg14pkOak6rgpdiHUeJi6K7z6mtwT34RxpQofvp/CsZ+w aFOF5jJ2XwAAJp/6IustgJ9m8ASJa555bsek1U+NaYcl8kqgYN5axnssak2XkD+q+dsE42 h5NHRoiistl49Phpn+bcue6QDcYui+Sx+ln1VMnTmIcFvWiBAUhnIJNh4QHWr4F51ikYm8 FmCoyO4+EgQDhjbZ04uhxZG0qOFLh0Y24Wzx/WNY5aJGvwk0wtscGURN21MI/KYhDntZtt sPaBYcruDVkraAr7A8VxUgZrN9H8tNp6hNmmp6Q3K2FF/UAX+WfpoF+LDOGWcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554983; a=rsa-sha256; cv=none; b=kzt95zF0fcUkDFaX2xzgVm2iW1zrnNfP0H+Wa2W79WUVaxrnwmS08AwT7H/4fflNaW/fWp FEflauM2gj1nHcrm6oC/59AqVp4sK2RUYlSh4nRIi8BiqjhCnsKY+MtXFVp1H55pkJK2Gi xGbrpgUt97Qy+XY/FIYitFPUDuKIPX/mgTv9xn7FTcZWt7PvbEn9lZAx8nsQn4C2ZzrcBU SROWI6iC2udxUMve2ytx7lzKI6ScyVWkxDWff5xQRxwcEN+tw7NwaoyeYGscOjJs5yJCEt 2D4T+utT6DNrhHjiVGvIZTEv40GtDtqOHWXTIhKy7KE2ucXsiNGXwF7rjzB91Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP32JjCz13Dv; Mon, 29 Jan 2024 19:03: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 40TJ334T058464; Mon, 29 Jan 2024 19:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ33Cp058461; Mon, 29 Jan 2024 19:03:03 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:03 GMT Message-Id: <202401291903.40TJ33Cp058461@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: 94962f5a72ae - main - bhyve: Use the NVMEV macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94962f5a72ae7a5190f38cbe54a0ad4426329a06 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=94962f5a72ae7a5190f38cbe54a0ad4426329a06 commit 94962f5a72ae7a5190f38cbe54a0ad4426329a06 Author: John Baldwin AuthorDate: 2024-01-29 18:49:49 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:49:49 +0000 bhyve: Use the NVMEV macro instead of expanded versions Reviewed by: corvink, chuck (older version) Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43598 --- usr.sbin/bhyve/pci_nvme.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2fd49a84c768..4084f9b007ba 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -369,15 +369,15 @@ static void pci_nvme_io_done(struct blockif_req *, int); /* Controller Configuration utils */ #define NVME_CC_GET_EN(cc) \ - ((cc) >> NVME_CC_REG_EN_SHIFT & NVME_CC_REG_EN_MASK) + NVMEV(NVME_CC_REG_EN, cc) #define NVME_CC_GET_CSS(cc) \ - ((cc) >> NVME_CC_REG_CSS_SHIFT & NVME_CC_REG_CSS_MASK) + NVMEV(NVME_CC_REG_CSS, cc) #define NVME_CC_GET_SHN(cc) \ - ((cc) >> NVME_CC_REG_SHN_SHIFT & NVME_CC_REG_SHN_MASK) + NVMEV(NVME_CC_REG_SHN, cc) #define NVME_CC_GET_IOSQES(cc) \ - ((cc) >> NVME_CC_REG_IOSQES_SHIFT & NVME_CC_REG_IOSQES_MASK) + NVMEV(NVME_CC_REG_IOSQES, cc) #define NVME_CC_GET_IOCQES(cc) \ - ((cc) >> NVME_CC_REG_IOCQES_SHIFT & NVME_CC_REG_IOCQES_MASK) + NVMEV(NVME_CC_REG_IOCQES, cc) #define NVME_CC_WRITE_MASK \ ((NVME_CC_REG_EN_MASK << NVME_CC_REG_EN_SHIFT) | \ @@ -391,7 +391,7 @@ static void pci_nvme_io_done(struct blockif_req *, int); /* Controller Status utils */ #define NVME_CSTS_GET_RDY(sts) \ - ((sts) >> NVME_CSTS_REG_RDY_SHIFT & NVME_CSTS_REG_RDY_MASK) + NVMEV(NVME_CSTS_REG_RDY, sts) #define NVME_CSTS_RDY (1 << NVME_CSTS_REG_RDY_SHIFT) #define NVME_CSTS_CFS (1 << NVME_CSTS_REG_CFS_SHIFT) @@ -1085,8 +1085,7 @@ pci_nvme_init_controller(struct pci_nvme_softc *sc) DPRINTF("%s mapping Admin-SQ guest 0x%lx, host: %p", __func__, sc->regs.asq, sc->submit_queues[0].qbase); - acqs = ONE_BASED((sc->regs.aqa >> NVME_AQA_REG_ACQS_SHIFT) & - NVME_AQA_REG_ACQS_MASK); + acqs = ONE_BASED(NVMEV(NVME_AQA_REG_ACQS, sc->regs.aqa)); if (acqs < 2) { EPRINTLN("%s: illegal ACQS value %#x (aqa=%#x)", __func__, acqs - 1, sc->regs.aqa); @@ -2083,8 +2082,8 @@ pci_nvme_handle_admin_cmd(struct pci_nvme_softc* sc, uint64_t value) break; case NVME_OPC_FORMAT_NVM: DPRINTF("%s command FORMAT_NVM", __func__); - if ((sc->ctrldata.oacs & - (1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT)) == 0) { + if (NVMEV(NVME_CTRLR_DATA_OACS_FORMAT, + sc->ctrldata.oacs) == 0) { pci_nvme_status_genc(&compl.status, NVME_SC_INVALID_OPCODE); break; } From nobody Mon Jan 29 19:03:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP46FF0z59DQd; Mon, 29 Jan 2024 19:03: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 4TNyP44HZMz40Qg; Mon, 29 Jan 2024 19:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tHjg/ZjJ6hPya7y4UfjkodkFtVU8mU+pKb32PMhUjcI=; b=Pw590AgKnZlmUBqNmhYf+fCuXfTNRqIqhubi7dd8506zfBOzAxv+HHAORvMELXEm9+QUv8 O7Zx/Xb5FSlsZG/tlUCYYx2XJn7JezZakfX58iIwQi2cg8K9nBr/XVzIbR0OueeWcnzu86 2y2RZrhz+D8BApZs/RYmaeWrchUBcouYpz2+DoS9mN3zh5LHOL0bSo8YAnikPsUsrhjDMi dtYt+ZtUqLqbupk2o+MbEbSGREgd5sjZP3GRzVkwLee6T0VZxmURRGJDpdIzINJ5DYs7Gl FoEcghKra2+Xq3K4gtXdaxS6wbMYCi3OfwwlapLJwDD7g8uoTjWe18214bFOhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tHjg/ZjJ6hPya7y4UfjkodkFtVU8mU+pKb32PMhUjcI=; b=wwruz0wXoYffBJ1M5/GegaQWUDDG5vjMiXJlxn/xH+lNq4nYOsbptSAH8YYp8yXjeYjOXo jsrxTBIEjVJXpS+AbJ7aL3bUWO2++KurkD89WmHR9PJavAA7aF8oy6Pyn3jvEaj1uHNhcO XkB2Rw2B+H+OrDvn8XxqUP8gAaTCfdU9laKfWvTjeOlr20UXl05nyCU590qkdD3HnWmAdf s6912ZeImONVYy9WqKwle7f08dKIzOcnvqTy4uKKBUI8wFQ8yKxGZWT1h2Wc9xNpM8LNZI oXxQa1SNCGwSmH9Rx+stTPFjvAklGx2JNJr08nDlY3/MDrxuc9pct8qyyj6QGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554984; a=rsa-sha256; cv=none; b=g45o+ocT57jsPGUH8k57kLkadn8HL/hpE3WEl6FmSJ9s2uLFR8Sxdgwe2vB22pI1rmyiDz +eg2NZYDvKyvqpi9b1/AeADzOenX2EwE75AnPgjUXBgSeJd8iZ0DzAASmf21xGrxU4SI0L 032d7FCpfF9dFxIV1y+KwpJBtPR17uozMYgVKheJGu9JU8GYJcoR+f2u0GhZweGe2xU/YR VlutI1Pm39xEPiaNxWSOjbDxKhHMtw38qtDo9QvPA9dekI5f9XiTuoC60XUe6sk4m9Bux6 wZ/JrTYT6SZKoqGS1YXmN61dbkPfxfnhzPnV4FBM/aPeaHYVDXx1v0OepsIcyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP43LY3z13ll; Mon, 29 Jan 2024 19:03: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 40TJ34XZ058524; Mon, 29 Jan 2024 19:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ34s7058521; Mon, 29 Jan 2024 19:03:04 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:04 GMT Message-Id: <202401291903.40TJ34s7058521@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: c9d9315b7401 - main - camdd: Use the NVMEV macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9d9315b74017b0637bcbcc2e7a5c01d7bc58bf1 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c9d9315b74017b0637bcbcc2e7a5c01d7bc58bf1 commit c9d9315b74017b0637bcbcc2e7a5c01d7bc58bf1 Author: John Baldwin AuthorDate: 2024-01-29 18:50:41 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:50:41 +0000 camdd: Use the NVMEV macro instead of expanded versions Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43599 --- usr.sbin/camdd/camdd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index 4f15aa8eedcf..1f067113c562 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -1430,9 +1430,8 @@ camdd_probe_pass_nvme(struct cam_device *cam_dev, union ccb *ccb, *maxsector = nsdata.nsze; /* The LBA Data Size (LBADS) is reported as a power of 2 */ - format = nsdata.flbas & NVME_NS_DATA_FLBAS_FORMAT_MASK; - lbads = (nsdata.lbaf[format] >> NVME_NS_DATA_LBAF_LBADS_SHIFT) & - NVME_NS_DATA_LBAF_LBADS_MASK; + format = NVMEV(NVME_NS_DATA_FLBAS_FORMAT, nsdata.flbas); + lbads = NVMEV(NVME_NS_DATA_LBAF_LBADS, nsdata.lbaf[format]); *block_len = 1 << lbads; retval = 0; From nobody Mon Jan 29 19:03:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP56xRjz59DMv; Mon, 29 Jan 2024 19:03: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 4TNyP55qSMz40TJ; Mon, 29 Jan 2024 19:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YjCI/pdAR6RclLaPL1ap8Nm789qYnZkVw0Kpieq73ig=; b=yICMBEVWieGNlr44pydG5ULyTXqEmAXkmzPVMcl41oElup2IsAw9b/WMILpA3Og5r4QEH7 s/UNcuwSclrs5IpI8FnagR+ztwPmdyAtmdjnR3CuChQRpgStmD240rID6ikhvT+jhhYYB6 y3rSDQwJyi9M2NuHAMHdqLi9pKP9qI6EzyuqgKR47F1kI7d3ggU2sAacUyNLPPN4iDPGQx NyM8NWWEvbEPlzfuRQo7QSNlVTNfK/j+z9SUCeDVa9idplk8W+zXQMCHjXZsH8yabhHwcG NRZRo2ZIW5l1/AfXx1W3YReUEpx2R5LJOzkmCxTtKZPHN8ojTvyC5WqsaRgF2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YjCI/pdAR6RclLaPL1ap8Nm789qYnZkVw0Kpieq73ig=; b=vbf2vhWM3DE6vZmlZPvIu4lVW9GX9Vm8YGLLnXqC4ngmOsEcQeiP82J2z5jDDrK5WAZjIl l8KDqxP3RlzLIDQ6Z6FI61ToWswbq3Nz5Ezfn0FUS5FGskffe/xfvYUpeUxfX+kv2RowS3 45F9LI99jI9FhxWeV2DgVN9ILRYAx3aaQaJop8muUeaeQRroIObsFRiJ7oRzO1TiuqZUQh MHxIM90FBqnLCk6vcvxu2X+W1nX5G121GM7F0RB0EGRXRYLDftoBsJLxuYt/crhzEMZSLD YYrJbn0DDnkgj3ZA0XS5TB0KVqgg4Sl29kk7mKGVpdJVN93bWSr7QGps6Irhdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554985; a=rsa-sha256; cv=none; b=FwpIw7wLPX3bRGXz5K1xY3WThYz/dzYPJEdC9RzXHLOpmWlGpZx02VhE8eyEAJ48ko4sbx V7C7Z8dcMF5OnC2PCwWAsXulTRkAsY0s6wo4xuIkgbb6Xgph2qnqlewk3hOwF+aDPcO+3k doW7FeLyk+JE17HFeEwnl/kM9pHiBKZ7cFozki9p/Gd4961/S6DDXl515rH4Ibhz5YadHu trx8DWO1TdBguuWhca2iqxSRS3A0z7bEWG1dEi0EgkbM2bX9Uqht7JDvf4g9o2fkzsh4T9 yCsefXTc4tEWxdsZcRULgttMviYBsRuvcvs5VER6fkgf/82Wnbl9RbC0lt3o9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP5480Qz13rT; Mon, 29 Jan 2024 19:03: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 40TJ35eS058589; Mon, 29 Jan 2024 19:03:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ35f1058586; Mon, 29 Jan 2024 19:03:05 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:05 GMT Message-Id: <202401291903.40TJ35f1058586@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: c42692360611 - main - bhyve: Use NVMEV to read the ASQS field of AQA List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c42692360611c8afce6ee7bb937a858d64a133f4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c42692360611c8afce6ee7bb937a858d64a133f4 commit c42692360611c8afce6ee7bb937a858d64a133f4 Author: John Baldwin AuthorDate: 2024-01-29 18:51:07 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:51:07 +0000 bhyve: Use NVMEV to read the ASQS field of AQA This is not a functional change, but just being consistent instead of omitting a shift by 0. Reviewed by: corvink, chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43600 --- usr.sbin/bhyve/pci_nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 4084f9b007ba..dd6c9a41d17f 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -1065,7 +1065,7 @@ pci_nvme_init_controller(struct pci_nvme_softc *sc) * cleared to 0h produces undefined results" for both ACQS and * ASQS. If zero, set CFS and do not become ready. */ - asqs = ONE_BASED(sc->regs.aqa & NVME_AQA_REG_ASQS_MASK); + asqs = ONE_BASED(NVMEV(NVME_AQA_REG_ASQS, sc->regs.aqa)); if (asqs < 2) { EPRINTLN("%s: illegal ASQS value %#x (aqa=%#x)", __func__, asqs - 1, sc->regs.aqa); From nobody Mon Jan 29 19:03:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP70PVNz59DQg; Mon, 29 Jan 2024 19:03: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 4TNyP662shz40RG; Mon, 29 Jan 2024 19:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ44iBPqcUd5pm2OYHCySxstCfoSxc68QCRqtD7a9do=; b=uqArPJGBL71wfYQah4pTRLgRvuVYrIke/7V795yKR6mUQzuCl9ENKKb19cSGgyUzX03Kr6 /ngOwq8IMUdygwN0C3PbK1BQwpQHialjjXxdjF5B9HT9Usy53F4qzunlb0z/BbWKWys6Cm RUPyrNk7wUGwmL79xBuJP2W1HLVfmcZOR1rlqZHIhGbn6kXvx2Dpcc9ly04R14FBQtX+HI a4pOEPFL2p3A+tpJaGaa3iye7oTfs49XwSePv4IhlthpLZeIz0yRx0WHTMn5qDD2g9u5FT n6zTh0VAbPxZFMKiiqoWjSRR0PlMibM7CvKlM4hLy5FLRL5xscCAUrC/O+PGsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ44iBPqcUd5pm2OYHCySxstCfoSxc68QCRqtD7a9do=; b=jxbumPzIrO66MwafXdyna3Sl44Al7QLmu+vRxtBOX/eYDpYxjfOrdCzc1cqdDIxbOGQsVa TZjQ1XpNAzCXRPQsKt+xR+VX7MBXpLgX8cC0HzSwL29OShEcwXEwflkWV9ueFv+ShR0mIV UKW09j8GoH0t63nR6HTuPURf8ka08Acue0kB+2v4HuUusuo6anZ3lzTFqO/W+xIZyV6AjY AbmxwBTEJmJrx4FFGIv8o8S3wlgjyjIJwYBWE8864Mns2u/++ekxiGz1mBOF6D+N4LVUSv +OuH+QUO+D7RI1ns2rDw9lii0fZQy69StMxfr9U/w79mfXvAiHUb0oRsBEEruQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554986; a=rsa-sha256; cv=none; b=j9YwWyAN12TDst4UeLbXHEM4GQmcqKngD9SqIljIVX9VdJRWHh4E08VGbtlnjQTChrB/61 m1nGO2VWU0ZUJJV92/QwQT6up9kNqBTfV1aydfF0hQHyIdYGYMle3xm5HtMJa0nLY10nl4 UMcBf24vBdzYK+0Pl4WgOqEFxLa60l8f221/8HYnjyX3SMTa1yyOJbWppR8la7lGrnJYOg cddkllmj143LkENE1jqoySnmwN5vrdjQNz4Hlqar+eWDo4JjS8I5Q/Ht8ec7EAjYlHBXMY pSctrfUykNV5MdI2ztGcX/k6EFC8S50beWZTPHjpc8JJZ4nFrwusCphie24Vjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP658bfz13rV; Mon, 29 Jan 2024 19:03: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 40TJ36Wj058637; Mon, 29 Jan 2024 19:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ36lo058634; Mon, 29 Jan 2024 19:03:06 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:06 GMT Message-Id: <202401291903.40TJ36lo058634@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: 1dade1f255ee - main - nvme: Rename NVMEB helper macro to NVMEM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dade1f255ee535ad357211395b46188bece52dc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1dade1f255ee535ad357211395b46188bece52dc commit 1dade1f255ee535ad357211395b46188bece52dc Author: John Baldwin AuthorDate: 2024-01-29 18:58:28 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:58:28 +0000 nvme: Rename NVMEB helper macro to NVMEM The current macro always builds a full mask for a named field, so use the M suffix for mask. Reviewed by: chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43601 --- sys/dev/nvme/nvme.h | 2 +- usr.sbin/bhyve/pci_nvme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 417651a19bb3..2c36d0813253 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -605,7 +605,7 @@ enum nvme_critical_warning_state { #define NVME_FEAT_SET_FID_MASK (0xff) /* Helper macro to combine *_MASK and *_SHIFT defines */ -#define NVMEB(name) (name##_MASK << name##_SHIFT) +#define NVMEM(name) (name##_MASK << name##_SHIFT) /* Helper macro to extract value from x */ #define NVMEV(name, x) (((x) >> name##_SHIFT) & name##_MASK) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index dd6c9a41d17f..2d426fb19096 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -538,12 +538,12 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->cntrltype = NVME_CNTRLTYPE_IO; cd->oacs = 1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT; - cd->oaes = NVMEB(NVME_CTRLR_DATA_OAES_NS_ATTR); + cd->oaes = NVMEM(NVME_CTRLR_DATA_OAES_NS_ATTR); cd->acl = 2; cd->aerl = 4; /* Advertise 1, Read-only firmware slot */ - cd->frmw = NVMEB(NVME_CTRLR_DATA_FRMW_SLOT1_RO) | + cd->frmw = NVMEM(NVME_CTRLR_DATA_FRMW_SLOT1_RO) | (1 << NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT); cd->lpa = 0; /* TODO: support some simple things like SMART */ cd->elpe = 0; /* max error log page entries */ From nobody Mon Jan 29 19:03:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP83xNrz59DH8; Mon, 29 Jan 2024 19:03: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 4TNyP8111jz40FJ; Mon, 29 Jan 2024 19:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5uDpk/m1ojFHlP9+LBEvJP+labRJi9NAThbtQrivyI=; b=NJVAbbzxTOFUU20R10hNIEXbrL446m772fXkKCpfYFzxP9w5a/Ie3olG+Lzagn/e28uPli JjjkN1Z127//bVilETNqjfFVCLmVhAkTOc91gKpWOyUPK/92IV2LpdJCmj+pAYYFfidH6Q oZLzI/iXGi1jpy/5FpvOTydNZIsjxSxn+fuQmF7Vi+oDIzNbXle5USjsmG0aNsDolL+mQW ShDNnv+sUoneMMM0Hzj+NPMdrF6IFbWe0q27WhbQDdUPoIwDRxRJ/KRb5oanbu27I8HbtJ 9d62mW6yeCcxLBUxnlDDkjAvq/j2JRDECnqVrV0GZ2Udfj+SCX43l7Lt59qhHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b5uDpk/m1ojFHlP9+LBEvJP+labRJi9NAThbtQrivyI=; b=WpkwYymjtTD+5+qVZpIFKQHPJ45hLBpUsF/iBfLT9tNCRJH+jjpInU75oy6cZ82XJLiopC ry469guNWhqLVJ6y5iXQzIRN0kox9Mz2dv9jT2seJqH+qe4NaD7UzMvQxovmOVnu4Rx16e jenu9E7Gw+wKlFFtSitCIhK5Gah1silTlcJR/bYXuvtJ3tjr9X8E5EVexTb0yZXY9MYWcJ kiDp3FRmwqRPyhsDkfRIPwDNJeHMNJvSiVoFjtq8Y4vC7KSwS0ak35kkbJCMD4s+yK4j4z Bmhbv+meoj44JWqXsMVYn8HbWzfUEiaPgAaWDBe434Ljj5Norn31pVvS80SpTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554988; a=rsa-sha256; cv=none; b=KzTNYWseUyiCvB8Gj0+RsiyynY9Nd1ux4ywk5v0ll5CP0b1T+WMrtCFReEKwYrUi8gTBAZ EH30QAXmVBsM5p5AfgbqH0CSAANqcPOBEStforH1iyMll5bmB7Mi5kX1O9AXiW56UnYArC yhOZy1ddMePg0B437xk/ciiC/QOSRfoIGaGhafZXAedKBS2/yj1m4lt8NCari5U+sQbBEn mqcHUNEuuaODISum/z65Pj1hs00oysBNfj8i+CaulYsaqV+QMmpFrcfUkNSiNTn59nIur6 8AcCWiL58dX3TFcdlBAy8Hi8ZqscAksu/4h8axRatuCNkfXRhfMnFRemQEGUAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP75wdbz13jW; Mon, 29 Jan 2024 19:03: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 40TJ37Fr058698; Mon, 29 Jan 2024 19:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ37dC058696; Mon, 29 Jan 2024 19:03:07 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:07 GMT Message-Id: <202401291903.40TJ37dC058696@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: 8488fc417fc2 - main - nvme: Use the NVMEM macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8488fc417fc24af37fa6f1e880f09a5023670950 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8488fc417fc24af37fa6f1e880f09a5023670950 commit 8488fc417fc24af37fa6f1e880f09a5023670950 Author: John Baldwin AuthorDate: 2024-01-29 18:59:37 +0000 Commit: John Baldwin CommitDate: 2024-01-29 18:59:37 +0000 nvme: Use the NVMEM macro instead of expanded versions A few of these omitted a shift of 0, but this is more consistent. Reviewed by: chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43602 --- sys/dev/nvme/nvme_ctrlr.c | 6 +++--- sys/dev/nvme/nvme_ns.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ad56141a556d..c662371aebfd 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -295,7 +295,7 @@ nvme_ctrlr_disable(struct nvme_controller *ctrlr) return (err); } - cc &= ~NVME_CC_REG_EN_MASK; + cc &= ~NVMEM(NVME_CC_REG_EN); nvme_mmio_write_4(ctrlr, cc, cc); /* @@ -1215,7 +1215,7 @@ nvme_pt_done(void *arg, const struct nvme_completion *cpl) pt->cpl.cdw0 = cpl->cdw0; status = cpl->status; - status &= ~NVME_STATUS_P_MASK; + status &= ~NVMEM(NVME_STATUS_P); pt->cpl.status = status; mtx_lock(mtx); @@ -1556,7 +1556,7 @@ nvme_ctrlr_shutdown(struct nvme_controller *ctrlr) int timeout; cc = nvme_mmio_read_4(ctrlr, cc); - cc &= ~(NVME_CC_REG_SHN_MASK << NVME_CC_REG_SHN_SHIFT); + cc &= ~NVMEM(NVME_CC_REG_SHN); cc |= NVME_SHN_NORMAL << NVME_CC_REG_SHN_SHIFT; nvme_mmio_write_4(ctrlr, cc, cc); diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 89779f23ad4d..8826a1f5ff8f 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -285,7 +285,7 @@ nvme_bio_child_inbed(struct bio *parent, int bio_error) if (inbed == children) { bzero(&parent_cpl, sizeof(parent_cpl)); if (parent->bio_flags & BIO_ERROR) { - parent_cpl.status &= ~(NVME_STATUS_SC_MASK << NVME_STATUS_SC_SHIFT); + parent_cpl.status &= ~NVMEM(NVME_STATUS_SC); parent_cpl.status |= (NVME_SC_DATA_TRANSFER_ERROR) << NVME_STATUS_SC_SHIFT; } nvme_ns_bio_done(parent, &parent_cpl); From nobody Mon Jan 29 19:03:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyPB3N0Sz59Df4; Mon, 29 Jan 2024 19:03: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 4TNyPB29fxz40S1; Mon, 29 Jan 2024 19:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkWjXQDdafi9NfUJrN2iyxUvgHiKdbLNtMQtX0YgVis=; b=SlIluaJQToGeGZyOapTl0SHHVKslQ3UHDBwA3oKpRaLnCq6CQSstY4g2VAwVusQqJlODF7 dAV8+x24ad6rZk8OyrrHuapvjXa6RmFUksCz26N1e0ELXQc0CqPAsY6N8C9kSWGcI5Lc+9 Qwsg8WNz8whe95umlPGpMv7XHnb17jMrwcqxum5v8mxNevzDA44WjzbQ9dlvjjrJ8o72zp D0HiVw447s3fwP0k1505i0GOEXUF88fNl4N4LMDXsl+rqnzkiIyLm4dgyn4Sb1RWNR7W9F z7rrSvOH4jktyH3WCrcEElM/q7iCO3MA/+v/1eUsoPDtfbmnMjWs8la0+1gypQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkWjXQDdafi9NfUJrN2iyxUvgHiKdbLNtMQtX0YgVis=; b=Y09kN5hR5sY/qhWsEGyqPLViyj8xlWFf3T501ZwMKtvNfSKIrHarpDaJdRXCjZwvudmeU6 K53zhejKGnAf+B6codgQ5N4nAzNHRYG2y1QPkwUm7jaPPZv0ZjW6XQhi/wLYRO7QMsjV6Y 6edCj4OEvSB2Q6i0osrhe34Pql6NCGo6D5a4ICwdosUlF6K7xmLcNu0Sjpd/pEVh4+RciE uGmWRaOls9ga7E3xmY8KheXlKnF2E3ZXMaBIyTGnYXt4ssQL2KvqhowxHuehZYGONDdRef pIVdyKPJuNI3CAe3CIMQWhCiEHkwVOCdcoH97GXwN0liMpQV1h4olhW1PtLbQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554990; a=rsa-sha256; cv=none; b=IiRWnouCNd683s+zpEn/tpULRcR48EfjP6kqjdIypOl7/+0kIZkvaK8vJ8pVu4GB7v++GP 627XFbLcl13xvCXzqDCt1YISnBPloQYM2Cwy0tL6LfAUXXdm7vmXJIWrNGTEqrNZPc9EfK PDAOHDrOit/eAabLcZeQNzQPyXzfXHJmcksWH4E0CvVCnvGKN3n/o2WiKn/qhFSLmCWK3I Uhdi5Q766dEtjjdTUI9yYv8ORympak4HchV4jteQbdM4xxUUi1hXV0atRzVaIVk3riQoBE lcICjglNPP5Ghx9SF1nTeKhKR015Fsv2lIuyfhED22ug0hWfEYMjYKPvXbB4ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyPB18g0z13HS; Mon, 29 Jan 2024 19:03: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 40TJ3ABk058809; Mon, 29 Jan 2024 19:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ3Ao5058806; Mon, 29 Jan 2024 19:03:10 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:10 GMT Message-Id: <202401291903.40TJ3Ao5058806@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: 3a477a9b70a3 - main - nvme: Add NVMEF helper macro as the inverse of NVMEV List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a477a9b70a34dc0686630599c27f022b1e07bd8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a477a9b70a34dc0686630599c27f022b1e07bd8 commit 3a477a9b70a34dc0686630599c27f022b1e07bd8 Author: John Baldwin AuthorDate: 2024-01-29 19:00:57 +0000 Commit: John Baldwin CommitDate: 2024-01-29 19:00:57 +0000 nvme: Add NVMEF helper macro as the inverse of NVMEV This macro accepts a field name and a value for the field and constructs the shifted field value. Reviewed by: chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43604 --- 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 2c36d0813253..004fa1e9d1ca 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -610,6 +610,9 @@ enum nvme_critical_warning_state { /* Helper macro to extract value from x */ #define NVMEV(name, x) (((x) >> name##_SHIFT) & name##_MASK) +/* Helper macro to construct a field value */ +#define NVMEF(name, x) (((x) & name##_MASK) << name##_SHIFT) + /* CC register SHN field values */ enum shn_value { NVME_SHN_NORMAL = 0x1, From nobody Mon Jan 29 19:03:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyP965Xgz59DFL; Mon, 29 Jan 2024 19:03: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 4TNyP910GLz40LH; Mon, 29 Jan 2024 19:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrRMu96sf7ADxN8PUj5tdzq42VlKS4bg95W8viuE8vg=; b=LM7+CQ3F9R8kY+NjiDsf4YjLWK77Xv6beAnPXF5p6zSlMu+3xebhnBcBwU2ueMbAnhDB3n k5UJFy+YGkcyb7n4D9CJXKyFrpqIMCmLrOORattkJ/f6B7hIAxiQHRkNyeMpQuTSo8vi2/ 9Wn3uUIn069enqj0eyr3vPVQcNz/d1bjdJOmMWg06MLMMsPoVH1gVdHXTpwl2pSYGUB/0S 8lX7iHYj2Z4MpZ9/l1zyqwjYzvZADkRjC5T/fqXM6LvOMXu7WV2K/WSWIsqL/oTSB5w8Gr aIpl0dtLBwoM11QoYUkBBvN6nda+t+j2x6QOibeYxTipdyJul+WeKnkbpsvDdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SrRMu96sf7ADxN8PUj5tdzq42VlKS4bg95W8viuE8vg=; b=UIxV1Z1DWgVCvz8SFCVgS+KQqNufL+t3Qbcwrmj8uJoffdzAs97rBtLyK+R0hN2TcUWszG /6kl/LyRpKI1Kv8niuFiwUCVVqggCe1BIE2oiSnsJVOvQ8KznjYrAIwP/KhKqCZRCKelM3 NbYDyIbexCbQpl/gaiFd39poT4eycWxy1URvWQbdnQM2XMEkUAGdXV6Uk3FCtQgLkHo4hk U13fd3J2eekxq0M+HrtUZqdd88drQSl4RvyZWILxkg5uSLRv3DrBLWmOiFGSyzxbObBiYP XIIiwQ5Xn/sQ1n0xRy4K+AHfEd7HU4Vw9GyyOyBzZUENWunmK0DIu42qaGX0aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554989; a=rsa-sha256; cv=none; b=LP1wz9uxi3J5CpOpBO7HUYHeCoteiZFlqF3XRU2NyRIkb8kUGCKFwf6dreLnvVR1l6wwme ap7rHf7crhm/gmSaOsWmqEKIDVPlySmHKt9Zkl9idAVUcn37gjzIRwFuh9xm3fluU8AbjM tYgGYYH2c5B6e9P5MDQRYWHC0M24lBJtiILIPne/GBOWSzPm18rl+vK28OMHJMrRzoty5Y rw9hLZ67ebFB2Qnr9+rUfI2GItupt1t+k6/i5O6KMldopBybRcQ8QTOLvz4RUHFA+4q1QY yU2YoayOLRUNPkNv5RCzjOLE12sBYoUvpVRCJcQCctzmFW8EMWwvUfoaDLZJVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyP906GTz13gF; Mon, 29 Jan 2024 19:03: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 40TJ38gE058752; Mon, 29 Jan 2024 19:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ38Ji058749; Mon, 29 Jan 2024 19:03:08 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:08 GMT Message-Id: <202401291903.40TJ38Ji058749@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: c85b3903d1b1 - main - bhyve: Use the NVMEM macro instead of expanded versions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c85b3903d1b1cf93f1fba10cd1cffed31ce84418 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c85b3903d1b1cf93f1fba10cd1cffed31ce84418 commit c85b3903d1b1cf93f1fba10cd1cffed31ce84418 Author: John Baldwin AuthorDate: 2024-01-29 19:00:09 +0000 Commit: John Baldwin CommitDate: 2024-01-29 19:00:09 +0000 bhyve: Use the NVMEM macro instead of expanded versions Reviewed by: corvink, chuck Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43603 --- usr.sbin/bhyve/pci_nvme.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2d426fb19096..cd81767d950b 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -380,14 +380,14 @@ static void pci_nvme_io_done(struct blockif_req *, int); NVMEV(NVME_CC_REG_IOCQES, cc) #define NVME_CC_WRITE_MASK \ - ((NVME_CC_REG_EN_MASK << NVME_CC_REG_EN_SHIFT) | \ - (NVME_CC_REG_IOSQES_MASK << NVME_CC_REG_IOSQES_SHIFT) | \ - (NVME_CC_REG_IOCQES_MASK << NVME_CC_REG_IOCQES_SHIFT)) + (NVMEM(NVME_CC_REG_EN) | \ + NVMEM(NVME_CC_REG_IOSQES) | \ + NVMEM(NVME_CC_REG_IOCQES)) #define NVME_CC_NEN_WRITE_MASK \ - ((NVME_CC_REG_CSS_MASK << NVME_CC_REG_CSS_SHIFT) | \ - (NVME_CC_REG_MPS_MASK << NVME_CC_REG_MPS_SHIFT) | \ - (NVME_CC_REG_AMS_MASK << NVME_CC_REG_AMS_SHIFT)) + (NVMEM(NVME_CC_REG_CSS) | \ + NVMEM(NVME_CC_REG_MPS) | \ + NVMEM(NVME_CC_REG_AMS)) /* Controller Status utils */ #define NVME_CSTS_GET_RDY(sts) \ @@ -399,11 +399,10 @@ static void pci_nvme_io_done(struct blockif_req *, int); /* Completion Queue status word utils */ #define NVME_STATUS_P (1 << NVME_STATUS_P_SHIFT) #define NVME_STATUS_MASK \ - ((NVME_STATUS_SCT_MASK << NVME_STATUS_SCT_SHIFT) |\ - (NVME_STATUS_SC_MASK << NVME_STATUS_SC_SHIFT)) + (NVMEM(NVME_STATUS_SCT) | \ + NVMEM(NVME_STATUS_SC)) -#define NVME_ONCS_DSM (NVME_CTRLR_DATA_ONCS_DSM_MASK << \ - NVME_CTRLR_DATA_ONCS_DSM_SHIFT) +#define NVME_ONCS_DSM NVMEM(NVME_CTRLR_DATA_ONCS_DSM) static void nvme_feature_invalid_cb(struct pci_nvme_softc *, struct nvme_feature_obj *, @@ -580,8 +579,7 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) break; } - cd->fna = NVME_CTRLR_DATA_FNA_FORMAT_ALL_MASK << - NVME_CTRLR_DATA_FNA_FORMAT_ALL_SHIFT; + cd->fna = NVMEM(NVME_CTRLR_DATA_FNA_FORMAT_ALL); cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; @@ -2732,8 +2730,7 @@ pci_nvme_handle_io_cmd(struct pci_nvme_softc* sc, uint16_t idx) if ((nsid == 0) || (nsid > sc->ctrldata.nn)) { pci_nvme_status_genc(&status, NVME_SC_INVALID_NAMESPACE_OR_FORMAT); - status |= - NVME_STATUS_DNR_MASK << NVME_STATUS_DNR_SHIFT; + status |= NVMEM(NVME_STATUS_DNR); goto complete; } @@ -2957,8 +2954,7 @@ pci_nvme_write_bar_0(struct pci_nvme_softc *sc, uint64_t offset, int size, if (NVME_CC_GET_SHN(ccreg)) { /* perform shutdown - flush out data to backend */ - sc->regs.csts &= ~(NVME_CSTS_REG_SHST_MASK << - NVME_CSTS_REG_SHST_SHIFT); + sc->regs.csts &= ~NVMEM(NVME_CSTS_REG_SHST); sc->regs.csts |= NVME_SHST_COMPLETE << NVME_CSTS_REG_SHST_SHIFT; } From nobody Mon Jan 29 19:03:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyPC4yPmz59DKR; Mon, 29 Jan 2024 19:03: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 4TNyPC36F3z40bm; Mon, 29 Jan 2024 19:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQlQFtTGXqLr6S9JnxNfHwe5dyQ/aOdqSKI7sT7E2H0=; b=wKnsH0aRtnjHtOK7NQNtSXxwN9gO+LOPVYA2hSvkMv9mBvxbt4UZHWzYjoMfuYTnBaaXoL rRoEtojGUKeZ6KwpCm96uUv6CJ6kYkJmt2lxjaENeIrXdE3lZaPTxkoZqTMNsVBrqwszRu uz7WTXYSvirdN4E1skaoiv1csxFLV7991gkHHTbo/HpZWZo1C+CzCoOK/SxIfx/jajOVbf vzlA+YMwmwbgdOfrThy+PdvCVxKi7eD3jpIPl3vaO9SOunpIy6yZ25SSTqVTJISlfY59jd 8+yZLSm8x0yCtmFirLgpO0VNmEmo/2yFeckd2DWQjsPS7SDKPy1Fhzoz8dfAcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mQlQFtTGXqLr6S9JnxNfHwe5dyQ/aOdqSKI7sT7E2H0=; b=w0qpNJTJppUENrjtkgaOrOcW7udWpup4Wm8up21E/rXgyyzRTi67E5I7otSuI0ODckav5L YCIGqetesXPJ1NQzeBfH63daxLHtr7SngODxfNJebhOICVM4c6jDXKqa0gRSLcwXdcgMFA S8BBOsosBCBLlzTPioFpTc1isOkNZJhOQroErlADZDfSIiiwQZ+HrM9waT/kbGHwEdgB0x umPz5/bTS6In4mg9qKaDus/tbs/pMLKYtOsIFQcM+i59k2Knvzk/IaHuEVpyYjXYpgaZzR O0u5OO3q1VPubhraDcrYmCQK51d9M8vKgDJ7xjLH5tN2Bk6V4tuONryqvfY3yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554991; a=rsa-sha256; cv=none; b=PVRGvq4/N/Lgov6VTIHiK4zjvdTrHHDga1iLwI2a0ONdIhcLLDjS1yrP3hqETVjY9lHhpn DM3BZsFlFjZEH9Cvk5vMVy9xk2BxKcpEWQSjIOs7ijA1gP4VrTnbc8IKWJbWCpYd1wjW7h CGyl0FALLMdnsC6jQ5NpMt3alckE1HxD0kNzy/CJfTIJAcE69UlUuPeBi5YcYm0gM/+RSq 5uYvvZADoq4G/NHtph7egCC2ljztF8sBmCKCYPOhv/Z6gv2Pdedd0B4Bo22yhfbLqg1CQG ZP3lE83e6hzTF0ygrWo9fO4/dYa9FJ0cKCTWfEoIUM3Q8a/UxbeZinE1Z3N5YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyPC2CJ1z13p1; Mon, 29 Jan 2024 19:03: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 40TJ3BPJ058860; Mon, 29 Jan 2024 19:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ3BYL058857; Mon, 29 Jan 2024 19:03:11 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:11 GMT Message-Id: <202401291903.40TJ3BYL058857@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: 5650bd3fe8ef - main - nvme: Use the NVMEF macro to construct fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5650bd3fe8eff1043ef3df33b5bdd7b24b5f2bc0 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5650bd3fe8eff1043ef3df33b5bdd7b24b5f2bc0 commit 5650bd3fe8eff1043ef3df33b5bdd7b24b5f2bc0 Author: John Baldwin AuthorDate: 2024-01-29 19:01:13 +0000 Commit: John Baldwin CommitDate: 2024-01-29 19:01:13 +0000 nvme: Use the NVMEF macro to construct fields Reviewed by: chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43605 --- sys/dev/nvme/nvme_ctrlr.c | 20 ++++++++++---------- sys/dev/nvme/nvme_ns.c | 3 ++- sys/dev/nvme/nvme_qpair.c | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index c662371aebfd..3b3b9bbe6998 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -344,25 +344,25 @@ nvme_ctrlr_enable(struct nvme_controller *ctrlr) qsize = ctrlr->adminq.num_entries - 1; aqa = 0; - aqa = (qsize & NVME_AQA_REG_ACQS_MASK) << NVME_AQA_REG_ACQS_SHIFT; - aqa |= (qsize & NVME_AQA_REG_ASQS_MASK) << NVME_AQA_REG_ASQS_SHIFT; + aqa |= NVMEF(NVME_AQA_REG_ACQS, qsize); + aqa |= NVMEF(NVME_AQA_REG_ASQS, qsize); nvme_mmio_write_4(ctrlr, aqa, aqa); /* Initialization values for CC */ cc = 0; - cc |= 1 << NVME_CC_REG_EN_SHIFT; - cc |= 0 << NVME_CC_REG_CSS_SHIFT; - cc |= 0 << NVME_CC_REG_AMS_SHIFT; - cc |= 0 << NVME_CC_REG_SHN_SHIFT; - cc |= 6 << NVME_CC_REG_IOSQES_SHIFT; /* SQ entry size == 64 == 2^6 */ - cc |= 4 << NVME_CC_REG_IOCQES_SHIFT; /* CQ entry size == 16 == 2^4 */ + cc |= NVMEF(NVME_CC_REG_EN, 1); + cc |= NVMEF(NVME_CC_REG_CSS, 0); + cc |= NVMEF(NVME_CC_REG_AMS, 0); + cc |= NVMEF(NVME_CC_REG_SHN, 0); + cc |= NVMEF(NVME_CC_REG_IOSQES, 6); /* SQ entry size == 64 == 2^6 */ + cc |= NVMEF(NVME_CC_REG_IOCQES, 4); /* CQ entry size == 16 == 2^4 */ /* * Use the Memory Page Size selected during device initialization. Note * that value stored in mps is suitable to use here without adjusting by * NVME_MPS_SHIFT. */ - cc |= ctrlr->mps << NVME_CC_REG_MPS_SHIFT; + cc |= NVMEF(NVME_CC_REG_MPS, ctrlr->mps); nvme_ctrlr_barrier(ctrlr, BUS_SPACE_BARRIER_WRITE); nvme_mmio_write_4(ctrlr, cc, cc); @@ -1557,7 +1557,7 @@ nvme_ctrlr_shutdown(struct nvme_controller *ctrlr) cc = nvme_mmio_read_4(ctrlr, cc); cc &= ~NVMEM(NVME_CC_REG_SHN); - cc |= NVME_SHN_NORMAL << NVME_CC_REG_SHN_SHIFT; + cc |= NVMEF(NVME_CC_REG_SHN, NVME_SHN_NORMAL); nvme_mmio_write_4(ctrlr, cc, cc); timeout = ticks + (ctrlr->cdata.rtd3e == 0 ? 5 * hz : diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 8826a1f5ff8f..360b9f982c20 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -286,7 +286,8 @@ nvme_bio_child_inbed(struct bio *parent, int bio_error) bzero(&parent_cpl, sizeof(parent_cpl)); if (parent->bio_flags & BIO_ERROR) { parent_cpl.status &= ~NVMEM(NVME_STATUS_SC); - parent_cpl.status |= (NVME_SC_DATA_TRANSFER_ERROR) << NVME_STATUS_SC_SHIFT; + parent_cpl.status |= NVMEF(NVME_STATUS_SC, + NVME_SC_DATA_TRANSFER_ERROR); } nvme_ns_bio_done(parent, &parent_cpl); } diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index b886a95b1724..62d27e439180 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -493,9 +493,9 @@ nvme_qpair_manual_complete_tracker( cpl.sqid = qpair->id; cpl.cid = tr->cid; - cpl.status |= (sct & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT; - cpl.status |= (sc & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT; - cpl.status |= (dnr & NVME_STATUS_DNR_MASK) << NVME_STATUS_DNR_SHIFT; + cpl.status |= NVMEF(NVME_STATUS_SCT, sct); + cpl.status |= NVMEF(NVME_STATUS_SC, sc); + cpl.status |= NVMEF(NVME_STATUS_DNR, dnr); /* M=0 : this is artificial so no data in error log page */ /* CRD=0 : this is artificial and no delayed retry support anyway */ /* P=0 : phase not checked */ @@ -511,8 +511,8 @@ nvme_qpair_manual_complete_request(struct nvme_qpair *qpair, memset(&cpl, 0, sizeof(cpl)); cpl.sqid = qpair->id; - cpl.status |= (sct & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT; - cpl.status |= (sc & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT; + cpl.status |= NVMEF(NVME_STATUS_SCT, sct); + cpl.status |= NVMEF(NVME_STATUS_SC, sc); error = nvme_completion_is_error(&cpl); From nobody Mon Jan 29 19:03:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyPG30V3z59Dfn; Mon, 29 Jan 2024 19:03: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 4TNyPF4z6Jz40cG; Mon, 29 Jan 2024 19:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKfI44G+a5jdyI94TBTLC+rtxq7DjBGFpfcGjZVNF4g=; b=vUkCidEpqMEB7/41riK9r88/bFds2rITlcGN9v0ftrWz4F99WNAOIcinWp4+8i3RaYmf8J aahmw39tHViamHwWNpCpZlvcAlHORBOarLZxHKLVf4mBzp8Z8uhqoVomtW35H+eykWDnMS OXhUXjYwJwMl+UahSiWYo+ItsGI4dTGwXZYly8AVgjSJ+LEwfnSKp5qWuRopmfhODOltAn S6CvuaZqHGvYkX8A5riSZxpp1poSsmxk4hmyJXhaZ6V8gWJKx/lH56/DxaNQl/B9bxWwbk 92HBv0t66b3PuMYh8vfJBa3v0ZCUyjPxDoSOpk6VuSSzFlxibYCmp8+0WFHLdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OKfI44G+a5jdyI94TBTLC+rtxq7DjBGFpfcGjZVNF4g=; b=EibMYav56Nh9ZTvbJ77SdKsnUnJd917nOhUj1FK8jEbfJwYpIWi/bmGHHYudTCFi1/Gr3r t82JdP9jUaiIHoJ5nYRVRXaE4LtiSUKqpsJEAR2XFuP06fou6VhNCo1Qn1ARDp9gchzU+c hyZIuclh/souIku1Qs+ITjD5cc8WGKttWJm7WkhJPcyZ0rNVkSqKU/U9SeK5BHxXm6RdT7 fC4M4p9vjZ3waTPfUtF+QChC8ZJzbrpMkuiCbtJDh3HKo4Z4TG/+c4pUhNfhOuYjk4kY0p eve+KzZXdlO5VEPvqhnTNfXr6fKRA5jhCCy9LablEPygptrzZEmFmbyZA3PG3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554993; a=rsa-sha256; cv=none; b=GETR1KPWRJp2DnZtgPtSmvfPxPZ3M8XKs7puFco59168wXuSdtqKZOprZcf+T5v6KBmkHh EwazxYbWFO/OYroA9qoCJscQW8l60B6h8VQHWnQN6yp78dALnrxhmj2F5iDaigVsFiOd1R XjX0Ojgfa0ixk4+hQEKsp4NE6o6DHG25pWLfSvp6NeFgdV8u6FSb8Faxo4VRlzvHlH8wCR 6Y0mDobHsAZa02sk0jalT7K0el5SAX7X4nBOPEUnrxgTjK07+DDpG3fTgHhunNfCJfQuiZ brCGmqT2pEf+Fm7TVwOSS1ZTp8pG7lny8T0xFHSDQhwOg5/MXdpnUYGcg3FFKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyPF3tmQz13p2; Mon, 29 Jan 2024 19:03: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 40TJ3DQG058964; Mon, 29 Jan 2024 19:03:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ3DAb058959; Mon, 29 Jan 2024 19:03:13 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:13 GMT Message-Id: <202401291903.40TJ3DAb058959@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: c46860dbcb20 - main - bhyve: Use NVMEF macro to construct fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c46860dbcb2037933575a260028325418b3e9789 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c46860dbcb2037933575a260028325418b3e9789 commit c46860dbcb2037933575a260028325418b3e9789 Author: John Baldwin AuthorDate: 2024-01-29 19:02:07 +0000 Commit: John Baldwin CommitDate: 2024-01-29 19:02:07 +0000 bhyve: Use NVMEF macro to construct fields Reviewed by: corvink, chuck (older version) Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43607 --- usr.sbin/bhyve/pci_nvme.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index cd81767d950b..45ab1b11fda4 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -393,11 +393,11 @@ static void pci_nvme_io_done(struct blockif_req *, int); #define NVME_CSTS_GET_RDY(sts) \ NVMEV(NVME_CSTS_REG_RDY, sts) -#define NVME_CSTS_RDY (1 << NVME_CSTS_REG_RDY_SHIFT) -#define NVME_CSTS_CFS (1 << NVME_CSTS_REG_CFS_SHIFT) +#define NVME_CSTS_RDY (NVMEF(NVME_CSTS_REG_RDY, 1)) +#define NVME_CSTS_CFS (NVMEF(NVME_CSTS_REG_CFS, 1)) /* Completion Queue status word utils */ -#define NVME_STATUS_P (1 << NVME_STATUS_P_SHIFT) +#define NVME_STATUS_P (NVMEF(NVME_STATUS_P, 1)) #define NVME_STATUS_MASK \ (NVMEM(NVME_STATUS_SCT) | \ NVMEM(NVME_STATUS_SC)) @@ -442,8 +442,7 @@ pci_nvme_status_tc(uint16_t *status, uint16_t type, uint16_t code) { *status &= ~NVME_STATUS_MASK; - *status |= (type & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT | - (code & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT; + *status |= NVMEF(NVME_STATUS_SCT, type) | NVMEF(NVME_STATUS_SC, code); } static __inline void @@ -536,14 +535,14 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->ver = NVME_REV(1,4); cd->cntrltype = NVME_CNTRLTYPE_IO; - cd->oacs = 1 << NVME_CTRLR_DATA_OACS_FORMAT_SHIFT; + cd->oacs = NVMEF(NVME_CTRLR_DATA_OACS_FORMAT, 1); cd->oaes = NVMEM(NVME_CTRLR_DATA_OAES_NS_ATTR); cd->acl = 2; cd->aerl = 4; /* Advertise 1, Read-only firmware slot */ cd->frmw = NVMEM(NVME_CTRLR_DATA_FRMW_SLOT1_RO) | - (1 << NVME_CTRLR_DATA_FRMW_NUM_SLOTS_SHIFT); + NVMEF(NVME_CTRLR_DATA_FRMW_NUM_SLOTS, 1); cd->lpa = 0; /* TODO: support some simple things like SMART */ cd->elpe = 0; /* max error log page entries */ /* @@ -557,13 +556,13 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->cctemp = 0x0157; /* SANICAP must not be 0 for Revision 1.4 and later NVMe Controllers */ - cd->sanicap = (NVME_CTRLR_DATA_SANICAP_NODMMAS_NO << - NVME_CTRLR_DATA_SANICAP_NODMMAS_SHIFT); + cd->sanicap = NVMEF(NVME_CTRLR_DATA_SANICAP_NODMMAS, + NVME_CTRLR_DATA_SANICAP_NODMMAS_NO); - cd->sqes = (6 << NVME_CTRLR_DATA_SQES_MAX_SHIFT) | - (6 << NVME_CTRLR_DATA_SQES_MIN_SHIFT); - cd->cqes = (4 << NVME_CTRLR_DATA_CQES_MAX_SHIFT) | - (4 << NVME_CTRLR_DATA_CQES_MIN_SHIFT); + cd->sqes = NVMEF(NVME_CTRLR_DATA_SQES_MAX, 6) | + NVMEF(NVME_CTRLR_DATA_SQES_MIN, 6); + cd->cqes = NVMEF(NVME_CTRLR_DATA_CQES_MAX, 4) | + NVMEF(NVME_CTRLR_DATA_CQES_MIN, 4); cd->nn = 1; /* number of namespaces */ cd->oncs = 0; @@ -581,7 +580,7 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->fna = NVMEM(NVME_CTRLR_DATA_FNA_FORMAT_ALL); - cd->vwc = NVME_CTRLR_DATA_VWC_ALL_NO << NVME_CTRLR_DATA_VWC_ALL_SHIFT; + cd->vwc = NVMEF(NVME_CTRLR_DATA_VWC_ALL, NVME_CTRLR_DATA_VWC_ALL_NO); ret = snprintf(cd->subnqn, sizeof(cd->subnqn), "nqn.2013-12.org.freebsd:bhyve-%s-%u-%u-%u", @@ -634,7 +633,7 @@ pci_nvme_init_nsdata(struct pci_nvme_softc *sc, be64enc(nd->eui64, nvstore->eui64); /* LBA data-sz = 2^lbads */ - nd->lbaf[0] = nvstore->sectsz_bits << NVME_NS_DATA_LBAF_LBADS_SHIFT; + nd->lbaf[0] = NVMEF(NVME_NS_DATA_LBAF_LBADS, nvstore->sectsz_bits); } static void @@ -657,7 +656,7 @@ pci_nvme_init_logpages(struct pci_nvme_softc *sc) sc->health_log.available_spare_threshold = 10; /* Set Active Firmware Info to slot 1 */ - sc->fw_log.afi = (1 << NVME_FIRMWARE_PAGE_AFI_SLOT_SHIFT); + sc->fw_log.afi = NVMEF(NVME_FIRMWARE_PAGE_AFI_SLOT, 1); memcpy(&sc->fw_log.revision[0], sc->ctrldata.fr, sizeof(sc->fw_log.revision[0])); @@ -1003,10 +1002,10 @@ pci_nvme_reset_locked(struct pci_nvme_softc *sc) DPRINTF("%s", __func__); sc->regs.cap_lo = (ZERO_BASED(sc->max_qentries) & NVME_CAP_LO_REG_MQES_MASK) | - (1 << NVME_CAP_LO_REG_CQR_SHIFT) | - (60 << NVME_CAP_LO_REG_TO_SHIFT); + NVMEF(NVME_CAP_LO_REG_CQR, 1) | + NVMEF(NVME_CAP_LO_REG_TO, 60); - sc->regs.cap_hi = 1 << NVME_CAP_HI_REG_CSS_NVM_SHIFT; + sc->regs.cap_hi = NVMEF(NVME_CAP_HI_REG_CSS_NVM, 1); sc->regs.vs = NVME_REV(1,4); /* NVMe v1.4 */ @@ -2955,8 +2954,8 @@ pci_nvme_write_bar_0(struct pci_nvme_softc *sc, uint64_t offset, int size, if (NVME_CC_GET_SHN(ccreg)) { /* perform shutdown - flush out data to backend */ sc->regs.csts &= ~NVMEM(NVME_CSTS_REG_SHST); - sc->regs.csts |= NVME_SHST_COMPLETE << - NVME_CSTS_REG_SHST_SHIFT; + sc->regs.csts |= NVMEF(NVME_CSTS_REG_SHST, + NVME_SHST_COMPLETE); } if (NVME_CC_GET_EN(ccreg) != NVME_CC_GET_EN(sc->regs.cc)) { if (NVME_CC_GET_EN(ccreg) == 0) From nobody Mon Jan 29 19:03:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNyPD74krz59DcN; Mon, 29 Jan 2024 19:03: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 4TNyPD41S2z40Y8; Mon, 29 Jan 2024 19:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IujeVd7eirLoNzrcoi2Ww0wyLJBVjdfK6bTlTfChMt4=; b=gr6OqlwjGZDSnh8/ZAsDHJo2r9zdFtt8nqkY9Epu0VyC6TfhfXwV832dlmONiVjkG1FGSy FnuPlIIKNsaU2KVWBKzw3vMgCRG3vRcNU82eyn/I+R+fGm8KCCAeIUQcr3Ktw7zi6i46hs QJ88rZYJMcEL1XSYgA+wyKVSt5rDEc73Y2yzWCM9insO9I+EBAKU0wOXp0pILpuUawZLZM Q8ic/rRjuR2B7LHuCEBg33ohg9oLgWmwxzCZmCLKis+8nl+TNsZjL1L9z/5svDLjoXGGHo EB+OcE2oqNHCRwzTPMtHcKAGnnAEdxGM42TnvA9wuU0KhseL2RAaVG5TnRm0SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706554992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IujeVd7eirLoNzrcoi2Ww0wyLJBVjdfK6bTlTfChMt4=; b=B2/a5vGlxHHdiHkN7YiCI+jgA23jOaVC76IV9xuL9xTGWeCyT9Ve4ktwRod2eBEyCleiV4 b6t2GkdKTzcpCzh1K/kX98h0d3k/tmw71qlI8W0FXdACJdSoYcw935ST+xPHYqxVdOzmlX fWNSlwCkrNXYrJcl4XcGcFFwQG42tUTL+YqdflvyyL7wWkwc/hjGiAh7Qk/jptxZ+gwVG+ b3bP637S791aUMhhqxkD5VRi/VXMKt/4s0C4599Yl3URSSZrmpTgr66N7xJMCBOdeqkFhr Vl9Z2MiDKTjv5qsJ68vqHu7HXXZavKqmkKtD4Zl47MFHA0mJYadcgAnJ9ZOEZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706554992; a=rsa-sha256; cv=none; b=o9uRTl9InOFBq+wYP2Gi9EcTXgaG/evEOrPCp4ZDh2O7AfkK8eRY9GRRKdtl7NeSkEWq+D qup9F8adsFjeyjs1gvFU1V2Q0oxm4SnYmEJQQsfvpWNCAfKDMSGzpjFNszBafZV83//QHS zS/JlrRGmc98fUwC+YrUr6GwEUHRYd6uY/au1LgTYXCYsWJ41r5wD3C1rLXM4kkmZ1mX1u R7s8lP7NdRMInbnTUf3uM7cmO7NNWBK1I4IFKt2xd1/OdHls5S0k2d7XG3Z7dxJu6oEa/g GVAlPe4Rcp8f4TDyV9vXCq4hjtLQrvCfVK4oQHysCnnFMzLchr/uk5vBLkaREw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TNyPD37WBz13Dw; Mon, 29 Jan 2024 19:03: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 40TJ3Cqq058908; Mon, 29 Jan 2024 19:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TJ3Cb0058905; Mon, 29 Jan 2024 19:03:12 GMT (envelope-from git) Date: Mon, 29 Jan 2024 19:03:12 GMT Message-Id: <202401291903.40TJ3Cb0058905@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: c68ec278deb2 - main - nvmecontrol: Use NVMEF macro to construct fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c68ec278deb23fd90eb5506c9a6a4f7339784ff3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c68ec278deb23fd90eb5506c9a6a4f7339784ff3 commit c68ec278deb23fd90eb5506c9a6a4f7339784ff3 Author: John Baldwin AuthorDate: 2024-01-29 19:01:46 +0000 Commit: John Baldwin CommitDate: 2024-01-29 19:01:46 +0000 nvmecontrol: Use NVMEF macro to construct fields Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43606 --- sbin/nvmecontrol/ns.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index a90692b9ed78..62923056bd4e 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -579,14 +579,12 @@ nscreate(const struct cmd *f, int argc, char *argv[]) /* Default to the first format, whatever it is. */ nsdata.flbas = 0; if (create_opt.lbaf != NONE) { - nsdata.flbas |= (create_opt.lbaf & - NVME_NS_DATA_FLBAS_FORMAT_MASK) - << NVME_NS_DATA_FLBAS_FORMAT_SHIFT; + nsdata.flbas |= NVMEF(NVME_NS_DATA_FLBAS_FORMAT, + create_opt.lbaf); } if (create_opt.mset != NONE) { - nsdata.flbas |= (create_opt.mset & - NVME_NS_DATA_FLBAS_EXTENDED_MASK) - << NVME_NS_DATA_FLBAS_EXTENDED_SHIFT; + nsdata.flbas |= NVMEF(NVME_NS_DATA_FLBAS_EXTENDED, + create_opt.mset); } } if (create_opt.dps != NONE) { @@ -595,22 +593,19 @@ nscreate(const struct cmd *f, int argc, char *argv[]) /* Default to protection disabled. */ nsdata.dps = 0; if (create_opt.pi != NONE) { - nsdata.dps |= (create_opt.pi & - NVME_NS_DATA_DPS_MD_START_MASK) - << NVME_NS_DATA_DPS_MD_START_SHIFT; + nsdata.dps |= NVMEF(NVME_NS_DATA_DPS_MD_START, + create_opt.pi); } if (create_opt.pil != NONE) { - nsdata.dps |= (create_opt.pil & - NVME_NS_DATA_DPS_PIT_MASK) - << NVME_NS_DATA_DPS_PIT_SHIFT; + nsdata.dps |= NVMEF(NVME_NS_DATA_DPS_PIT, + create_opt.pil); } } if (create_opt.nmic != NONE) { nsdata.nmic = create_opt.nmic; } else { /* Allow namespaces sharing if Multi-Path I/O is supported. */ - nsdata.nmic = cd.mic ? (NVME_NS_DATA_NMIC_MAY_BE_SHARED_MASK << - NVME_NS_DATA_NMIC_MAY_BE_SHARED_SHIFT) : 0; + nsdata.nmic = NVMEF(NVME_NS_DATA_NMIC_MAY_BE_SHARED, !!cd.mic); } nvme_namespace_data_swapbytes(&nsdata); From nobody Mon Jan 29 21:13:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP1Hn1PKqz59QnT for ; Mon, 29 Jan 2024 21:13:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TP1Hl42ZKz4RSk for ; Mon, 29 Jan 2024 21:13:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20230601.gappssmtp.com header.s=20230601 header.b=y4sIgiwP; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52d) smtp.mailfrom=wlosh@bsdimp.com Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-55ef4a66008so1966504a12.3 for ; Mon, 29 Jan 2024 13:13:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706562817; x=1707167617; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6towBHjMHwlxnXyJEGj9jvGcz46FlxE+2X+G+9FKE9w=; b=y4sIgiwPCfrFQeHJIf3gF6q/thgExT4Z4bKWZv5vgwWwUyIxO54Hj0lT9GcTJkiIUc /2G4XpR4EjjbCEvr3xNr6NYBODUFDA6IRw7YxKDppTw6WvqfkbrcHFZZqWe8pkAfTcLJ CACYOWKY27RaKaQwjOgEDf1J4HARv0eSKao1NKQ6YViPhDDgEuruAL8bFUNTy0gwxL+e i4N8iXZ7J0yTa/Vu1FFopDHoLl+m3KSR4nGjdoMPtffqrJWNYRos9z/opz4cBkOtmhEG oSbbmoZm7HBsmgEc77Ilf5QO96AYUAeFaKojvrJJXP0RICOFW49cJBA5zTDaTl3mCIba kRxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706562817; x=1707167617; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6towBHjMHwlxnXyJEGj9jvGcz46FlxE+2X+G+9FKE9w=; b=k+SnVbZiKRi0nA2OC2Dx4i18RFgXeAYqO+5NgXj8OnZExhXGm8tmFmXOP4oz+BSYwq sPf5USdlbpSxcb8/VbjBbuXONj5tQzfLhebebhWfSs/0rZxA6zDil7AJtjcpBqDDtXjb 0nz3xP2jCVQLYxzv6nHFzJSWqVnFAC/Pn7i1mtsR6HO1DIWNTrnADd7p+dbcIwNx/NG/ RVV6SZ4T31QFETT/pUlPDokdjkLldoj9fO8a7XCajWMThsbPUvpCdDHatqeJm4VHtRKv Np1dVcLiRWgFEuZeT6izJnKjKOX5IUlx8foVJ1SSwBnNBTSCZe47lpoc1NoCPpeUazSJ bJLA== X-Gm-Message-State: AOJu0YwlRDngM3AYOF26EnJ9Pt18+4NCixs94zazRCrYye0KNL9Asznv LASUDRUwbfq5hNR3cAGeq01tnoBI0nPSjCwiNvZ5hT9Ic9DdJsQh/exbS8UwwvcDG6dSrpUI/Ac 1fCBqVQ6d1iZhLNjEqMNwQEHa95jCfKhKEGxrfw== X-Google-Smtp-Source: AGHT+IGL2RyyRTMxuXvnqVXXND3ULacP7F5ch9GNUNl8RN/QLxiT3s2uDlGoZ4dr7H36K9iwxoJ/oxi/CWnhwWk3Naw= X-Received: by 2002:a05:6402:b66:b0:55f:354f:fb7c with SMTP id cb6-20020a0564020b6600b0055f354ffb7cmr280356edb.33.1706562816682; Mon, 29 Jan 2024 13:13:36 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401290514.40T5Eb1i061789@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 29 Jan 2024 14:13:25 -0700 Message-ID: Subject: Re: git: 3be59adbb5a2 - main - vtnet: Adjust for ethernet alignment. To: "Bjoern A. Zeeb" Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="00000000000079bbe206101c1e42" X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52d:from]; DMARC_NA(0.00)[bsdimp.com]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; R_SPF_NA(0.00)[no SPF record]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20230601.gappssmtp.com:+] X-Rspamd-Queue-Id: 4TP1Hl42ZKz4RSk --00000000000079bbe206101c1e42 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sorry for (a) the top post and (b) replying to myself... https://reviews.freebsd.org/D43656 is what I think you're worried about. Am I right, or is there some place else that has you uneasy? Warner P.S. I'm also thinking about following that up with https://reviews.freebsd.org/D43654 since that style seems more in fashion these days. On Mon, Jan 29, 2024 at 10:14=E2=80=AFAM Warner Losh wrote= : > > > On Mon, Jan 29, 2024 at 8:26=E2=80=AFAM Bjoern A. Zeeb < > bzeeb-lists@lists.zabbadoz.net> wrote: > >> On Mon, 29 Jan 2024, Warner Losh wrote: >> >> > The branch main has been updated by imp: >> > >> > URL: >> https://cgit.FreeBSD.org/src/commit/?id=3D3be59adbb5a2ae7600d46432d3bc82= 286e507e95 >> > >> > commit 3be59adbb5a2ae7600d46432d3bc82286e507e95 >> > Author: Warner Losh >> > AuthorDate: 2024-01-29 05:08:55 +0000 >> > Commit: Warner Losh >> > CommitDate: 2024-01-29 05:08:55 +0000 >> > >> > vtnet: Adjust for ethernet alignment. >> > >> > If the header that we add to the packet's size is 0 % 4 and we're >> > strictly aligning, then we need to adjust where we store the header >> so >> > the packet that follows will have it's struct ip header properly >> > aligned. We do this on allocation (and when we check the length of >> the >> > mbufs in the lro_nomrg case). We can't just adjust the clustersz in >> the >> > softc, because it's also used to allocate the mbufs and it needs to >> be >> > the proper size for that. Since we otherwise use the size of the mb= uf >> > (or sometimes the smaller size of the received packet) to compute h= ow >> > much we can buffer, this ensures no overflows. The 2 byte adjustmen= t >> > also does not affect how many packets we can receive in the lro_nom= rg >> > case. >> >> >> Doesn't this still include at least these two un-asserted/un-documented >> asumptions: >> >> (a) mbuf space is large enough to hold 2 extra bytes? Is this always >> the case? >> > > I was sure I puzzled through all the cases correctly. We adjust the leng= th > of the available buffer by 2 and offset everything by 2. this work becaus= e > all the vtnet header types only have 1 or 2 byte data fields. It keeps us > from > writing too much into the buffer. > > However, in vtnet_rx_cluster_size, we don't adjust the frame size before > allocating. So if the mtu + vlan_header. So if the mtu + 12 + 18 is 2047 > or 2048 > or mtu =3D 2017 or 2018 we'll get it wrong (we don't adjust in the case w= here > we use vtnet_rx_header which is 14 bytes). But I think in that case, we'l= l > "drop > the last two bytes off the end" get it wrong (since we adjust the total > length > of the mbuf space) rather than "overflow two bytes" get it wrong. For tha= t > case, we'd need to add two as I indicated in the comments below. > > static int > vtnet_rx_cluster_size(struct vtnet_softc *sc, int mtu) > { > int framesz; > > if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS) > return (MJUMPAGESIZE); > else if (sc->vtnet_flags & VTNET_FLAG_LRO_NOMRG) > return (MCLBYTES); > > /* > * Try to scale the receive mbuf cluster size from the MTU. We > * could also use the VQ size to influence the selected size, > * but that would only matter for very small queues. > */ > if (vtnet_modern(sc)) { > MPASS(sc->vtnet_hdr_size =3D=3D sizeof(struct > virtio_net_hdr_v1)); > framesz =3D sizeof(struct virtio_net_hdr_v1); > } else > framesz =3D sizeof(struct vtnet_rx_header); > framesz +=3D sizeof(struct ether_vlan_header) + mtu; > // XXX if framesz % 4 =3D=3D 2 and we're strict alignment we need to add = 2 > // XXX or equivalently, if vnet_hdr_size % 4 =3D=3D 0 and ... > if (framesz <=3D MCLBYTES) > return (MCLBYTES); > else if (framesz <=3D MJUMPAGESIZE) > return (MJUMPAGESIZE); > else if (framesz <=3D MJUM9BYTES) > return (MJUM9BYTES); > > /* Sane default; avoid 16KB clusters. */ > return (MCLBYTES); > } > > Do you agree? Is this what you are worried about? It's the only hole I > could find > this morning (after going over this a dozen other times trying to get it > right for > the review, and bryanv was happy neither noticed). It also explains why m= y > tests work: I didn't try to have a weird mtu of 2018 bytes. > > >> (b) the struct sizes assigned to vtnet_hdr_size are not odd numbers of >> bytes? Could add comments or CTASSERTs? >> > > True, I'll ctassert the sizes and say we rely on things being even sized > in if_vnetvar.h. > > Warner > > >> > PR: 271288 >> > Sponsored by: Netflix >> > Reviewed by: bryanv >> > Differential Revision: https://reviews.freebsd.org/D43224 >> >> -- >> Bjoern A. Zeeb r15:7 >> > --00000000000079bbe206101c1e42 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Sorry=C2=A0for (a) the top post and (b) replying to myself= ...


is what I th= ink you're worried about. Am I right, or is there some place else that = has you uneasy?

Warner

P.= S. I'm also thinking about following that up with=C2=A0https://reviews.freebsd.org/D43654 since= that style seems more in fashion these days.

On Mon, Jan 29, 2024 at = 10:14=E2=80=AFAM Warner Losh <imp@bsdi= mp.com> wrote:


On Mon, Jan 29, 2024 at 8:26=E2= =80=AFAM Bjoern A. Zeeb <bzeeb-lists@lists.zabbadoz.net> wrote:
On Mon, 29 Jan 2024, War= ner Losh wrote:

> The branch main has been updated by imp:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D3be59adbb5a2ae7600d46432d3bc82286e507e95<= /a>
>
> commit 3be59adbb5a2ae7600d46432d3bc82286e507e95
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2024-01-29 05:08:55 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-01-29 05:08:55 +0000
>
>=C2=A0 =C2=A0 vtnet: Adjust for ethernet alignment.
>
>=C2=A0 =C2=A0 If the header that we add to the packet's size is 0 %= 4 and we're
>=C2=A0 =C2=A0 strictly aligning, then we need to adjust where we store = the header so
>=C2=A0 =C2=A0 the packet that follows will have it's struct ip head= er properly
>=C2=A0 =C2=A0 aligned.=C2=A0 We do this on allocation (and when we chec= k the length of the
>=C2=A0 =C2=A0 mbufs in the lro_nomrg case). We can't just adjust th= e clustersz in the
>=C2=A0 =C2=A0 softc, because it's also used to allocate the mbufs a= nd it needs to be
>=C2=A0 =C2=A0 the proper size for that. Since we otherwise use the size= of the mbuf
>=C2=A0 =C2=A0 (or sometimes the smaller size of the received packet) to= compute how
>=C2=A0 =C2=A0 much we can buffer, this ensures no overflows. The 2 byte= adjustment
>=C2=A0 =C2=A0 also does not affect how many packets we can receive in t= he lro_nomrg
>=C2=A0 =C2=A0 case.


Doesn't this still include at least these two un-asserted/un-documented= asumptions:

(a) mbuf space is large enough to hold 2 extra bytes?=C2=A0 Is this always<= br> =C2=A0 =C2=A0 =C2=A0the case?

I was sur= e I puzzled through all the cases correctly.=C2=A0 We adjust the length
of the available buffer by 2 and offset everything by 2. this work b= ecause
all the vtnet header types only have 1 or 2 byte data fiel= ds. It keeps us from
writing too much into the buffer.
=
However, in vtnet_rx_cluster_size, we don't adjust the f= rame size before
allocating. So if the mtu=C2=A0+ vlan_header. So= if the mtu + 12 + 18 is 2047 or 2048
or mtu =3D 2017 or 2018 we&= #39;ll get it wrong (we don't adjust in the case where
we use= vtnet_rx_header which is 14 bytes). But I think in that case, we'll &q= uot;drop
the last two bytes off the end" get it wrong (since= we adjust the total length
of the mbuf space) rather than "= overflow two bytes" get it wrong. For that
case, we'd ne= ed to add two as I indicated in the comments below.

static int
vtnet_rx_cluster_size(struct vtnet_softc *sc, in= t mtu)
{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 int framesz;

=C2=A0 =C2= =A0 =C2=A0 =C2=A0 if (sc->vtnet_flags & VTNET_FLAG_MRG_RXBUFS)
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (MJUMPAGESIZ= E);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 else if (sc->vtnet_flags & VTNET_= FLAG_LRO_NOMRG)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = return (MCLBYTES);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 /*
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0* Try to scale the receive mbuf cluster size from the M= TU. We
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* could also use the VQ size to= influence the selected size,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* but th= at would only matter for very small queues.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0*/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (vtnet_modern(sc)) {
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MPASS(sc->vtnet_hdr_siz= e =3D=3D sizeof(struct virtio_net_hdr_v1));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 framesz =3D sizeof(struct virtio_net_hdr_v1);=C2=A0 =C2=A0 =C2=A0 =C2=A0 } else
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 framesz =3D sizeof(struct vtnet_rx_header);=C2=A0
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 framesz +=3D sizeof(struct ether_vlan_header) += mtu;
// XXX if framesz % 4 =3D=3D 2 and we're strict alignment we n= eed to add 2
=C2=A0
(b) the struct sizes assigned to vtnet_hdr_size are not odd numbers of
=C2=A0 =C2=A0 =C2=A0bytes?=C2=A0 Could add comments or CTASSERTs?

True, I'll ctassert the sizes and say we rel= y on things being even sized
in if_vnetvar.h.
--00000000000079bbe206101c1e42-- From nobody Mon Jan 29 21:40:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP1tM2lS4z59Sm8; Mon, 29 Jan 2024 21:40: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 4TP1tM0qVWz4WMk; Mon, 29 Jan 2024 21:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706564411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qe/eHzfjAD1GWKw7TWOaL/mQSAOO6QZzZjPGxXljq0=; b=cjoZVwv4ZmfqziGtv1fpur9+eMUPbEs6KViqZXOapoDiL+nhQZ+EClXr5FKpm+Ir5y0AE3 Da0OLPrt2yHrO/MYll5rXBd3QiRrvri/q2MpoEYQa+RI7lee10V+jD8tfKLtn75NRCkqHk jnEwSeb7+0v+TcLR7mp8y0EfnRs6DjqD+JqVH7gKL0hL0tU/dKhmBmfkfKPKktJkVsvbdR FeiuP9o2ncVL2P95kPICmvNR54zfHGS9L2uIm2cdXWC++v13CMo9GBAANQQaIJwxnq4diB SymoBB9XopGQaJTNTOriVM8FQ7i60yE7JeS+EX2Xxw232+miAvZsozNyMbZ9lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706564411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2qe/eHzfjAD1GWKw7TWOaL/mQSAOO6QZzZjPGxXljq0=; b=hALeZKAbMJly7bAN2gj6alvSehG+97s32o15Z+QySjJHesRV66lPK3CObe/BKIEmlhkNB4 s43YlxKRCQ4jlUnKovLhSo/ALWa/BhKIATFt3iSnYjxN1IkZEC0kdB6+b5NQnKSzm7TRv4 96/xfZRWtEgS6VFqYFcpGoqGogJQ2q1inwWeHh+PCKt2mTwG5HBW5dWasu3LY1QhZD/iqb hPnjKGbcHLi/4aGOrnmtY7EWnWpcJo/jqWK9zSgBS0ea6TWmDbjTGf70tQEt+mO4Sb2vor H7ELqT5knFTIdR6nzY21mR8OzPfqAxY1AsRh6Ku9EdQbdQ+/nqGpsMr3cFknQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706564411; a=rsa-sha256; cv=none; b=NUa0De6ESjXfREBw5/EkP7ZYbACHasVze2YskhvmEG+32C5n5j5KZ/u7vdyFuUpoCSLZao E+RG6xSoJZ7QwXu8NBp6jVVgOadVzEoj8sGafdYEm/4/Y4mZSsQO/QADzma4KiJgSWkW7R 76wBdxsfN2kFJBfxYvmCbSQwtXR4ptd3XcmC1JaOul2gK2UgyPvnvbwZZpg1cXNYyAkylo 0yVxJ/w5fup1pemJNDEHksXqAjW3HtySC9H+/klmzpKgvj3oMny6Sc9Zo10+lyj06KB1kV QYVaQQSbmHK0TBZt+LiQgDe+MK/EYIZDPAgs5D6VaxYBXrzp1p5IqyvdJ5UKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP1tL6hF2z16wg; Mon, 29 Jan 2024 21: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 40TLeAxU016528; Mon, 29 Jan 2024 21: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 40TLeAA7016517; Mon, 29 Jan 2024 21:40:10 GMT (envelope-from git) Date: Mon, 29 Jan 2024 21:40:10 GMT Message-Id: <202401292140.40TLeAA7016517@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: a570fe4d0dd9 - main - open(2): describe *at behavior for dirfd opened without O_SEARCH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a570fe4d0dd979ce099374259ffc45d56ae4e471 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a570fe4d0dd979ce099374259ffc45d56ae4e471 commit a570fe4d0dd979ce099374259ffc45d56ae4e471 Author: Konstantin Belousov AuthorDate: 2024-01-29 17:54:32 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-29 21:38:48 +0000 open(2): describe *at behavior for dirfd opened without O_SEARCH and move the BUGS paragraph about dirfd permissions into STANDARDS section, noting that we provide POSIX-mandated implementation. Reviewed by: emaste, kevans Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D43652 --- lib/libc/sys/open.2 | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index a6859a6c4931..383dd58b2a31 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 29, 2023 +.Dd January 29, 2024 .Dt OPEN 2 .Os .Sh NAME @@ -314,6 +314,12 @@ may not be used for any read operations like The primary use for this descriptor will be as the lookup descriptor for the .Fn *at family of functions. +If +.Dv O_SEARCH +was not requested at open time, then the +.Fn *at +functions use the current directory permissions for the directory referenced +by the descriptor at the time of the call. .Pp .Dv O_PATH returns a file descriptor that can be used as a directory file descriptor for @@ -661,6 +667,23 @@ when is set in flags and the final component of pathname is a symbolic link to distinguish it from the case of too many symbolic link traversals in one of its non-final components. +.Pp +The Open Group Extended API Set 2 specification, that introduced the +.Fn *at +API, required that the test for whether +.Fa fd +is searchable is based on whether +.Fa fd +is open for searching, not whether the underlying directory currently +permits searches. +The present implementation of the +.Fa openat +system call is believed to be compatible with +.St -p1003.1-2017 , +which specifies that behavior for +.Dv O_SEARCH , +in the absence of the flag the implementation checks the current +permissions of a directory. .Sh HISTORY The .Fn open @@ -673,17 +696,6 @@ function was introduced in .Dv O_DSYNC appeared in 13.0. .Sh BUGS -The Open Group Extended API Set 2 specification requires that the test -for whether -.Fa fd -is searchable is based on whether -.Fa fd -is open for searching, not whether the underlying directory currently -permits searches. -The present implementation of the -.Fa openat -checks the current permissions of directory instead. -.Pp The .Fa mode argument is variadic and may result in different calling conventions From nobody Mon Jan 29 22:32:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32D4R7Nz57ZGP; Mon, 29 Jan 2024 22:32: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 4TP32D33K3z4fkF; Mon, 29 Jan 2024 22:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTilW516EuOUHBs4W3DM813TnE0iritEzIBPXEdn4KA=; b=InNggDf4R5ZrlshgRPuqHBia7ycFpDl0ik8ZlEdLgxN5bZAvzqediDc0O26PVGXCyS4d4I mIzTrHt7u/i1E1T/WBWDC4HHwT9wePGdbSdpFPi4QxIl4h7p7AMnY60MxSYSFGWq9KbsOT suSZzrPyXVHwlpqlvo/kNQ3h/z4u8WcBrf3sP/WqNhes2dT4dTqb9j51cDgflBPoQG7sYm qnpz/VQ8NHLHBDI/Ykb069E2N9YjZC87ElUrwyIUanzqDjgSTp5kTN3yGa0K5t6DKzsbGs UIXFvIVinmtTi0l1aBE5AV69kgPy3OJBuQ64T59BN8WjHL5gdpG7rsk90P+Z4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iTilW516EuOUHBs4W3DM813TnE0iritEzIBPXEdn4KA=; b=gZQbfzFPm38VEqUJvcdC9sfqGcU345n0BS7BZbgHKwWno/tJ22fHLpRIJ5kbZAjjS7ITrR rSq2DUqfXRk1IMB29ox4QXiZ0YDI3KWeQ0hsPBUQbPJBLkmc5AiPhTZhLNsNkd+E+Zd75k UontoFyjFWpn9AzLKt1r1Uod647bZ4FDkOWpo9U6+FOnBiKq6xm6Z/+YDMJSrGKpVpsB69 eBVUs/Y+m1TDqfJoMQszyyYOdhOOeQ4ED3bNsB9a23qNNbuj0BP32ZtrWxwo4vBa/EMzXt Nn01jAx8oeARNESCHFtYZRXgoOl54fyj+o+tNpmcdhls02xZVTdelNsyTcCPMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567524; a=rsa-sha256; cv=none; b=df6yauL17ZL6XnM9erG6pVP89546Jj0ntF4E59RFOWAoVdvNIRBqs6Bp5IRvKN3UOSKL1k 4XK0gyXV6+WypSus6tP3k5v9O1udjwRKXm4Aow4xskH0ep/Ebk0Q27F0uERbgGVhAxoEy+ TIewRdP8GDJDXVGtOpwZEQEujWG4RS4ufMb+oYACdhOItBZD+JXz5IBqbYS+Y22rPt8DaJ 9E9MZcVRcjMV9xIQs/UDSw+ZAFo5v6vg+e6c5aTPOe/64K+4WT2vWeO7OmQGJKrh0xXkn2 08peIyb/T38ierNr7BzDFkVgIlbtGWU1BgPdsD7MdtPOHFFqnVQ6RNQbKqXc1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32D27yTz18fw; Mon, 29 Jan 2024 22:32: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 40TMW4rp011806; Mon, 29 Jan 2024 22:32:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW490011790; Mon, 29 Jan 2024 22:32:04 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:04 GMT Message-Id: <202401292232.40TMW490011790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e99c28e93bd4 - main - setusercontext(): umask: Set it only once (in the common case) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e99c28e93bd4d04ff877459734e9ce06ad2335a7 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e99c28e93bd4d04ff877459734e9ce06ad2335a7 commit e99c28e93bd4d04ff877459734e9ce06ad2335a7 Author: Olivier Certner AuthorDate: 2023-05-25 12:18:45 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:57:58 +0000 setusercontext(): umask: Set it only once (in the common case) Simplify the code and make it more coherent (umask was the only context setting not modified by setlogincontext() directly). Preserve the current behavior of not changing the umask if none is specified in the login class capabilities database, but without the superfluous umask() dance. (The only exception to this is that a special value no user is likely to input in the database now stands for no specification.) If some user has a 'umask' override in its '~/.login_conf', the umask will still be set twice as before (as is the case for all other context settings overriden in '~/.login_conf'). Log a warning in case of an invalid umask specification. This change makes it apparent that the value of LOGIN_DEFUMASK doesn't matter. It will be removed in a subsequent commit. PR: 271747 Reviewed by: emaste, kib (earlier version) Approved by: emaste MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40344 --- lib/libutil/login_class.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 4df6ac765595..e578925214bd 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -384,17 +385,40 @@ setclasscontext(const char *classname, unsigned int flags) * Private function which takes care of processing */ -static mode_t -setlogincontext(login_cap_t *lc, const struct passwd *pwd, - mode_t mymask, unsigned long flags) +static void +setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) { if (lc) { /* Set resources */ if (flags & LOGIN_SETRESOURCES) setclassresources(lc); /* See if there's a umask override */ - if (flags & LOGIN_SETUMASK) - mymask = (mode_t)login_getcapnum(lc, "umask", mymask, mymask); + if (flags & LOGIN_SETUMASK) { + /* + * Make it unlikely that someone would input our default sentinel + * indicating no specification. + */ + const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; + const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); + + if (val != def_val) { + if (val < 0 || val > UINT16_MAX) { + /* We get here also on 'err_val'. */ + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Invalid umask specification: '%s'", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc->lc_class, + login_getcapstr(lc, "umask", "", "")); + } else { + const mode_t mode = val; + + umask(mode); + } + } + } /* Set paths */ if (flags & LOGIN_SETPATH) setclassenvironment(lc, pwd, 1); @@ -405,7 +429,6 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, if (flags & LOGIN_SETCPUMASK) setclasscpumask(lc); } - return (mymask); } @@ -428,7 +451,6 @@ int setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags) { rlim_t p; - mode_t mymask; login_cap_t *llc = NULL; struct rtprio rtp; int error; @@ -532,8 +554,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in } } - mymask = (flags & LOGIN_SETUMASK) ? umask(LOGIN_DEFUMASK) : 0; - mymask = setlogincontext(lc, pwd, mymask, flags); + setlogincontext(lc, pwd, flags); login_close(llc); /* This needs to be done after anything that needs root privs */ @@ -546,13 +567,9 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in * Now, we repeat some of the above for the user's private entries */ if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { - mymask = setlogincontext(lc, pwd, mymask, flags); + setlogincontext(lc, pwd, flags); login_close(lc); } - /* Finally, set any umask we've found */ - if (flags & LOGIN_SETUMASK) - umask(mymask); - return (0); } From nobody Mon Jan 29 22:32:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32F55Sxz57ZD7; Mon, 29 Jan 2024 22:32: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 4TP32F3Yv8z4fyS; Mon, 29 Jan 2024 22:32:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdbqyDGQ7VABrDGTHSeSuPhjcTdU26lxhwvYP2oxm3w=; b=seEAzMpeEHDcFn1HYWJ2qme9pM4GbYq085+7CrJkTYCZ2o879k5lHJ3Hv3WlZp1r25onoH oUApb5DRcBbp2lTNpOVtdbV89rFRFuo04TEK9LKGRRNEvqAHCo7eR6fIlD9/ncx5td5vib SEufVfxI6UPdGKcZIY3ml2d/Vdz7mxFT3DRAhqBl2nSAMKIH08IrmmC3mFprQv8Mfj0Ydw uPHtkTjK5p5M4Cpy1C0t54HyjXQZMD9wFdIwrTkGPqjJr1axp65U6PT2saQ/wQ42E2JSVm qujWHdXDBozyFEpN07uMYjyVs6Np2i4feRACjJU8f2TMKOBwp6ojhGwzC2zLxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UdbqyDGQ7VABrDGTHSeSuPhjcTdU26lxhwvYP2oxm3w=; b=GnXWpayB6pVx0LzWRvKwrK2zR8aI3fW2i6xuVWpXBkAgqMwXat1WVyGlu5Pb329G8QAmnU PnPubwJGeJWqhanEgb7Y168wahnVZE0x3OytZ86NbLEjv5ZCNQ0sCsiCFtPo7UfNPt2jWS Va6/c48Bnml5PgnveamBkzBGoXz2XFFZ450S6UJkc0WyP4waS6zRa/ME7iAomNZ5NWRWAy 3hKPbydXIBNO8ZpY0s0mT3qryo3SJjOQXiY376UiXW3g4dEXcrVNmJPT5QpxUU0KEEOI0l wOz6GpIXdhfoAtt6JDjPEneaX8Nml4uwGMYuQZVerzsKHjRp7sZtWyRp2JWS8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567525; a=rsa-sha256; cv=none; b=St6r7KI/DBeSxiLiNPhJiikpLW4v+0xElWHAYfw/LFFz1ykPebdeErk1cCndgEwX0PU/hg m8eb9MxgPHU52BF5Z2lO85dBHH4idFNdyQfKp0szPXE7tghYIK2Lgvggzgy+7h/6Bt8/vT 4TQRY9dGusIfxktrEtottg3BEUMrfxoKFMWdlQNXl1xjwbsgue+hldtqs4Au90FK7K8Wqz B7nIhbMAl8IDeLRz/3wC3mFQd+/LSs6gyelLuHKXo8eVYtuq14qOy3MXuEmYekOVNrfuWd zEg3F+hn8BgBvCeTLrGJmWYNMnGYaaHgQzG4BxQTYQxAe1U5uZrBQrk8zNEpWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32F2g2zz190J; Mon, 29 Jan 2024 22:32: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 40TMW5QM013128; Mon, 29 Jan 2024 22:32:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW5AU013113; Mon, 29 Jan 2024 22:32:05 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:05 GMT Message-Id: <202401292232.40TMW5AU013113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0d1fe948d97d - main - login.conf(5): umask has no default value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d1fe948d97d2d6e3708349b74cf438f9604a8d1 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1fe948d97d2d6e3708349b74cf438f9604a8d1 commit 0d1fe948d97d2d6e3708349b74cf438f9604a8d1 Author: Olivier Certner AuthorDate: 2023-05-25 12:41:03 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:05 +0000 login.conf(5): umask has no default value The umask is simply left unchanged if no explicit value is specified in the login class capabilities database. PR: 271747 Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40345 --- lib/libutil/login.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index a0b46debbfd1..7449c11f2ba5 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -253,7 +253,7 @@ contain the shell specified in the password file. .It "term string Default terminal type if not able to determine" from other means. .It "timezone string Default value of $TZ environment variable." -.It "umask number 022 Initial umask. Should always have a leading 0 to" +.It "umask number Initial umask. Should always have a leading 0 to" ensure octal interpretation. .It "welcome file /etc/motd File containing welcome message." .El From nobody Mon Jan 29 22:32:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32G5bjXz57Z5w; Mon, 29 Jan 2024 22:32: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 4TP32G4ZRqz4fgl; Mon, 29 Jan 2024 22:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6duhGexOHGdhqbqPh6/ICYsaKBaN4EiaxOA+Vlqp2Tc=; b=ZhPl4fmqTlIIiaRLMVwHRvai4aV5H0mfd0PIvsD5FyVRpMpHZxzIkhraPC6miFh6FPeYp+ jJgj1Yr69es7ICPD4KwDqX99chux/uAFyaPefcbhSTKlZ4zyENj0/xBTbggJyQ+wyaE2UD O2fYuJUy3kx5hj8KpBVm1p18f3htDyuPS5plhm/JQj24zROjJe04ICVhA4AJsDLekEVgQq xkHq0J14D41lTmVXaqnp810jPP4ot6MIG370yHo/k+oGbnxmqDi+ynLK94hHiSCzW3L0hs +k8b6sLSoszHph9d2ndMigv+6EHaZL49mKUTbINGTWVkBmAjgZ1PoxLqRKgtfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6duhGexOHGdhqbqPh6/ICYsaKBaN4EiaxOA+Vlqp2Tc=; b=VhYU8YRRZ4oCpRfisiPSEQMJ8UE7pWG8RQC8yh/jf2maHeYFS/9jCydBmV7NnE15PAY8du mkbVpHh8gDjNvMfkONiO+B8ExDiSBVMH+8kdng+hd8Dc6u4Rc4hudU8KurCsbg7U0xgjuW da53rmktuftl95yICqgvzfH4scZQdbQQB9H8lhGJujIKfE5TKaJZNtAHwVwrZ38fxGgmYT hDLrBqkO0roQdCsgTsODEDxjeTqe3aExWjh4sLMuTxA19TCaPY8yZrMUDgGHvDQbV53BcV fZI1u8/ot64/Yck3tuIX7BIJxQSooUfZIigT8gOaDJ/LAVnPyuDONnRK/NlTMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567526; a=rsa-sha256; cv=none; b=K9qQnPKfG4QHlJdsUk1pPRD7HOk4uaIjQtXPagms6g28/Y1Qi0r8hV+zXiEFU73El4Xy+L jagpdw1DuTQEUvl3+Zs8yD2cwIkftn4KBGJk9vDKXgHHoQq2t3I7/DYhZR5lKipj30zjuS HIrrQh0hDTcPOOMwKGVcLx0h3gtJZ7qCE1NG57Lmfaac04z2OdcNVNICTYcDvK/NDeH/eA vtK66FRdJamVUAwo0pK3PRZI9tC9TF4YO+55pm7j1pSuv4hj9orPkK+QbnQg2rwv1X9fUX oCWLSJQ6WknvusYpKijFq7bCa5aTiQ5kOMsrp7NKzIyxFVHpwn2QkgPdNzfN2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32G3hTHz190K; Mon, 29 Jan 2024 22:32: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 40TMW6fZ013277; Mon, 29 Jan 2024 22:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW6cf013274; Mon, 29 Jan 2024 22:32:06 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:06 GMT Message-Id: <202401292232.40TMW6cf013274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 90e914cd5ac1 - main - New login_getcapenum(): Allows to read named enum values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90e914cd5ac1c8ecbf1ea88e9a65e7fa866c17a9 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=90e914cd5ac1c8ecbf1ea88e9a65e7fa866c17a9 commit 90e914cd5ac1c8ecbf1ea88e9a65e7fa866c17a9 Author: Olivier Certner AuthorDate: 2023-06-20 16:41:32 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:05 +0000 New login_getcapenum(): Allows to read named enum values Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40684 --- lib/libutil/login_cap.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ lib/libutil/login_cap.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index f5e444adeaa3..0d7becacbfc7 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -760,6 +760,52 @@ login_getcapnum(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error) return val; } +/* + * Extract a string capability expected to hold a specific value from a list. + * + * 'values' must be a NULL-terminated array of strings listing the possible + * values. + * + * A non-negative return code indicates success, and is the index of the value + * in 'values' the capability is set to. + * + * Negative return codes indicate an error: + * -4: 'lc' or 'cap' insufficiently initialized or not valid. + * -3: System error (allocation failure). + * -2: Capability not found or not a string. + * -1: Capability has a string value, but not one listed in 'values'. + */ +int +login_getcapenum(login_cap_t *lc, const char *cap, const char * const *values) +{ + int ret, i; + char *cand; + const char * const *val; + + if (lc == NULL || lc->lc_cap == NULL || cap == NULL || *cap == '\0') + return (-4); + + ret = cgetstr(lc->lc_cap, cap, &cand); + + if (ret == -1) + /* Cap not found. */ + return (-2); + else if (ret < 0) + /* System error (normally, allocation failure). */ + return (-3); + + ret = -1; + + for (i = 0, val = values; *val != NULL; val++) + if (strcmp(cand, *val) == 0) { + ret = i; + break; + } + + free(cand); + return (ret); +} + /* diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h index 7312914900a8..0037b41d9055 100644 --- a/lib/libutil/login_cap.h +++ b/lib/libutil/login_cap.h @@ -110,6 +110,8 @@ const char **login_getcaplist(login_cap_t *, const char *, const char *); const char *login_getstyle(login_cap_t *, const char *, const char *); rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t); rlim_t login_getcapnum(login_cap_t *, const char *, rlim_t, rlim_t); +int login_getcapenum(login_cap_t *lc, const char *cap, + const char * const *values); rlim_t login_getcapsize(login_cap_t *, const char *, rlim_t, rlim_t); const char *login_getpath(login_cap_t *, const char *, const char *); int login_getcapbool(login_cap_t *, const char *, int); From nobody Mon Jan 29 22:32:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32H6ptlz57ZDC; Mon, 29 Jan 2024 22:32: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 4TP32H59L1z4fkQ; Mon, 29 Jan 2024 22:32:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZpgpHczOPtuqAFvrqI2DiEy3Dx8ao/RxUtvEBih5kIA=; b=b9rlcbw0kz/3xIKoKJVWbtbmld55m3nf7uDkBX26eyHze1i0/TrJJy2SWBDJUBAomYt/mS XVn7Q3urHnlLoNxzNxEig91Jbtd986KzKpcZQa3FDaZ5Ahtn4zb8vSHHNuaJCO5eV+M9kN AvO/GYygwzqhIkpAKotkvcTaFJlMTBii6kHW64SBgNivzCoRg95/8/8WDxkId9qAVXI2hl 7MWDH7jgVz427nHfsVI27l0KQJ4Ahou4XdJX57Usqj3H87cIwYYzsRhqqCQzJ9Rny7Lbl3 uRAgR45Q9ma06Bx0Es1d7dHOx8zHFn9mqJCfycNkjl0oVjaFYnx5lZmMFTz/lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZpgpHczOPtuqAFvrqI2DiEy3Dx8ao/RxUtvEBih5kIA=; b=aEJe8FEckdCc3RGywmGmf4CfHWTQIGFyRFFQa8cGjG8svLQZU8vXNAg2AcCxL3Ngsv8wVX wrD1yjEHbRbiUsdsYPUDEasDyfMdBQU59Znou4BZRgBwRqbLa0DO6qV5qa+9JpmerGmNDF x3ybC9o1XSL7tWqvqBoqMinP167xm72Mu6JrgplGkcgLAml1AFr6UYBVb6cKyuJiv3Yzco ox3113OQr3jFnziNErjiZLdMRZGRdDuhf3UHCbriyx1zjX5LNZX65hY94smWAmCNXGvD4r EYHXez4dTVPPETnXEO1AOtLXl00H5DkOe+IpJFbjebJZe4AC18wMQKq6D2hLHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567527; a=rsa-sha256; cv=none; b=HkuTHOwDDEvS/JG8sVopfuPxghFVmbOMpVpsbn8gVTnxjKFgBlqV1M8k8IvXD+ehyxCgb7 tvU3Fowl4/d4GPvF4EOZPbpKEdTcss8RpUlege/Lnom8Bm9t1YulszGkx8YrD1cvPrCBr4 91AOluBDKVVaucby7Z6eg/mpxkMBpa63rX4AF7V8qob9jDeqMLygfrkpYpUDHNfdijuvki Dy4DPgIiY/ijtnJWU1CkHalxvkVGHmW9UUW94z6/Zebe5CUEZttjvsdrN61ctcKy+AZnJN C2PQdnibJFy9nMYMoYiSsmNkhRlssq46KAAPTeCs10cZj3IxVmTWS2W2z2lPNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32H4HC9z190L; Mon, 29 Jan 2024 22:32: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 40TMW7H0013319; Mon, 29 Jan 2024 22:32:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW7vf013316; Mon, 29 Jan 2024 22:32:07 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:07 GMT Message-Id: <202401292232.40TMW7vf013316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 97256feb7a65 - main - login_cap(3): Document login_getcapenum() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97256feb7a65cccac51a03846c5308894a2cb445 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=97256feb7a65cccac51a03846c5308894a2cb445 commit 97256feb7a65cccac51a03846c5308894a2cb445 Author: Olivier Certner AuthorDate: 2023-06-20 20:09:57 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:05 +0000 login_cap(3): Document login_getcapenum() Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40685 --- lib/libutil/login_cap.3 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3 index 0281c8428ed5..86142c3b19f9 100644 --- a/lib/libutil/login_cap.3 +++ b/lib/libutil/login_cap.3 @@ -25,6 +25,7 @@ .Nm login_getcapbool , .Nm login_getcaplist , .Nm login_getcapnum , +.Nm login_getcapenum , .Nm login_getcapstr , .Nm login_getcapsize , .Nm login_getcaptime , @@ -60,6 +61,8 @@ .Fn login_getcaptime "login_cap_t *lc" "const char *cap" "rlim_t def" "rlim_t error" .Ft rlim_t .Fn login_getcapnum "login_cap_t *lc" "const char *cap" "rlim_t def" "rlim_t error" +.Ft int +.Fn login_getcapenum "login_cap_t *lc" "const char *cap" "const char * const *values" .Ft rlim_t .Fn login_getcapsize "login_cap_t *lc" "const char *cap" "rlim_t def" "rlim_t error" .Ft int @@ -459,6 +462,31 @@ If the given capability tag cannot be found, the parameter is returned, and if an error occurs, the .Fa error parameter is returned. +.It Fn login_getcapenum +This function returns whether the searched capability is a string with value +among a predefined set passed in argument +.Fa values +as a NULL-terminated array of strings. +.Pp +A non-negative value indicates a match and is the index of the capability's +value in array +.Fa values . +Other possible return values are: +.Bl -tag -width "-4" +.It -4 +Returned if +.Fa lc +or +.Fa cap +are insufficiently initialized or invalid. +.It -3 +Returned on allocation failure (out of memory). +.It -2 +Returned if the capability isn't specified or its value is not a string. +.It -1 +Returned if the capability is specified and a string but its value is not among +.Fa values . +.El .It Fn login_getcapsize .Fn login_getcapsize returns a value representing a size (typically, file or memory) From nobody Mon Jan 29 22:32:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32L1TN0z57Zb7; Mon, 29 Jan 2024 22:32: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 4TP32K75hWz4g00; Mon, 29 Jan 2024 22:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVvtAFZjtb+ORLKeCQnkHhS+69jjwUzWIMdl2N/rdSs=; b=cFK6WWY+igSbUGSvY0HhS9XfGR0WRhD09yCiMiGf+qDqR6aVmHXADE5XH6nmY3p79qjejv z3N9ZBRzAOXfFvCu5/D1sYHtMrUh+vz34bmvN0yQxlUAgNcvf4O46SXS/erTEoSf9+908A jVa9v9fcPTMwlQZgnAg2011Ix6ZBkAeh0efx+71PsD6JapRuQseZgR+NVjn+dOD3J22Brd 9A6vSlQx5HyYUHY8uYlq1deiV4MSekJIcv337BnVBoYnVwjtRQ+XPHmBhkMCs4+P+FO7wk srz0u84H05kI28dx34K9yWq2Ijd3xweDQOjwjHAm/lf2GFc1lvW0dCa1qp06XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVvtAFZjtb+ORLKeCQnkHhS+69jjwUzWIMdl2N/rdSs=; b=oCRhrO+FEGzbGd9nXoeOfgSxpEgva3whoZ9AXFSUigGjIWB/KF9kZIpsCbN6HsgQpaukr9 6wonHYyDifYE9GH4VBv2lQnQ0/rE50PeM7BlwmV2Bf+06cU9uo5PuBcZEOr80splIrnYSu 8PvJzaVRBq9LUaSeNKjBKuZlLaZfYPNEEX/4aPG7m2JHasOlP9B7WbXd/OdjIyDsCtIsow RGc+4kdhHyk+x07MWAka8qsleD8L+NovplwUrYl5hLMXdUHnkuuiIMpfrqpWaYf1QdmcS8 H9yzSz/3Etge2iksdnWFXgbPnajTHLcYimXDTBhtoik/yj+h8GoHMMrZLWHE8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567530; a=rsa-sha256; cv=none; b=jjLypXkfmB4pQWxy4q5y/OqUo9bCuRAuhVFXFedwnz3Qb/Va3li/MUCJxbN6N7yrVhF4zY scIc7AekoIt2jAUA8EvOZHCfI7C6Dm9AJHkqgtQHTjQ9fbwkeqtzvKFsj2DbhUTh3Og4J+ bbGlvgljjgXysFlId14BppqjMBIUv53QbRLhVKtUypz2RA3e2neu30JA0uu9JYJOWsrBvB byUJHzR/V5Ll4H7Z8/xV9lfyOSumb6ftXqGb8IgGuYFFbRng4AAwXanVRUedq19VfyEp4/ kmAxAMk2/moFJl626IAGEzgN4BhUmZ8wF6vFpFoUqbC6SeOQgiihywM0gMSDmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32K6CVWz18g0; Mon, 29 Jan 2024 22:32: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 40TMW9MG013423; Mon, 29 Jan 2024 22:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW963013420; Mon, 29 Jan 2024 22:32:09 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:09 GMT Message-Id: <202401292232.40TMW963013420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c328e6c6ccaa - main - setclassumask(): Accept 'inherit' as a value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c328e6c6ccaa4cdf921c16d68a2f2c5992dd3b72 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c328e6c6ccaa4cdf921c16d68a2f2c5992dd3b72 commit c328e6c6ccaa4cdf921c16d68a2f2c5992dd3b72 Author: Olivier Certner AuthorDate: 2023-06-20 19:41:04 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:06 +0000 setclassumask(): Accept 'inherit' as a value 'inherit' explicitly indicates that the umask should not be changed. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40687 --- lib/libutil/login_class.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index c8dd2cd66563..933d9bc4fe1f 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -380,6 +380,11 @@ setclasscontext(const char *classname, unsigned int flags) } +static const char * const inherit_enum[] = { + "inherit", + NULL +}; + /* * Private function setting umask from the login class. */ @@ -391,7 +396,13 @@ setclassumask(login_cap_t *lc, const struct passwd *pwd) * indicating no specification. */ const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; - const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); + rlim_t val; + + /* If value is "inherit", nothing to change. */ + if (login_getcapenum(lc, "umask", inherit_enum) == 0) + return; + + val = login_getcapnum(lc, "umask", def_val, err_val); if (val != def_val) { if (val < 0 || val > UINT16_MAX) { From nobody Mon Jan 29 22:32:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32K0VXFz57ZDD; Mon, 29 Jan 2024 22:32: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 4TP32J5rjgz4ff6; Mon, 29 Jan 2024 22:32:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEJkiSOtahbK4PiWBXTKh1EJ5fqeCGMrA1kcsnhmlIA=; b=ymwPACAIL9Ip3BnK/fEv2hRegy+0gehWrhudaNrNEcGLOTIm+vJAsQu7z1hRoLwpvaZSdQ 72XFN9g1q5WT1lDlONH580pJaI+RvUPPWCJhxGETUdhA7mf/l+tNZUzQukAprT9E6d/Gha 7fwtBVDzTWgXxMZGrx4DQRKD53NgXeESfwbuAqnPyOnANI5PUmOQGlrg5LNph0Yosm0DCu 6bPddGmx5gjzOvm6jae/LICS62oEnaBmtZztaRbrZ37UYwJh4e+B/T7UHHm5uUHR3lGZkS yXJC9Hm6/4Ord1AmJEQ9yCNiYM8XvOccGoXzqMDpPpml7xmsBGJ6oEFabSKhQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xEJkiSOtahbK4PiWBXTKh1EJ5fqeCGMrA1kcsnhmlIA=; b=eJm8gIcXVYsqzV9lUi0jDcMfZM0fAUL54XebrpjA1paZbuvU4iKLsSx3rIdPegYnW5qEL4 z31swbrouWTF549/2YxLW/IdrKTg8PkvqyfUUDLseRRfYwK4VAF+xMFk3L60WGTYWZhAMR kY5N5w6r9uplmqAAA1hK3VIMz9McmOvQH2n9E+n68FPWQXT5sZxMjgXGpRbSsT607NF1lv hXLHFbERwbzAcPtlachqkxqMWwdDa4OCS3hX8EMtfeETFzoibIYIWkA6/ODygxOyvcuR3z jqkL0PPyYRL3708jncGR1inc0f4v2c0hDkJBK0qnBgbCo+imWSMar9PcsRgLfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567528; a=rsa-sha256; cv=none; b=Tth9KvF3FD3BesZ0k/brJz4Po9Ldrw45m2bYeN2pb1xnrIYRvZFu8cDTCxT8AFwTxeF6KD qeIN5MYwsqIBpmRCXAa2fGdWgDb6qjl/mxyqDMIQ0wEHqs68MbqX7CTptJi9SP16ZNG5BQ NeDpg9w2SKqfo/Ozqm5K6uXnGIqw5+FaUW0dq8rbz+K03CFXKKrKjt39cwZZ7kg7sw1mKx aOifI/bFLupysivXru1iv0OqdHLs3uV7jDXfpLtRaYGuaZLQrSi+ndxS1Y+iqUCeL2JtQw gaS85AlWDLfmCltaThY3BgzYWbOfAcs4IGn87Im4Fyhq2c9Ga4p1VsZCDYB4uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32J4yY9z18fy; Mon, 29 Jan 2024 22:32: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 40TMW8W6013378; Mon, 29 Jan 2024 22:32:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMW8Vj013375; Mon, 29 Jan 2024 22:32:08 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:08 GMT Message-Id: <202401292232.40TMW8Vj013375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 0dd1705f5849 - main - setusercontext(): Set umask in a separate function, setclassumask() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dd1705f584947625892988afe59e4cedb5cdd09 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd1705f584947625892988afe59e4cedb5cdd09 commit 0dd1705f584947625892988afe59e4cedb5cdd09 Author: Olivier Certner AuthorDate: 2023-06-20 16:46:31 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:06 +0000 setusercontext(): Set umask in a separate function, setclassumask() Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40686 --- lib/libutil/login_class.c | 59 ++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index e578925214bd..c8dd2cd66563 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -380,6 +380,37 @@ setclasscontext(const char *classname, unsigned int flags) } +/* + * Private function setting umask from the login class. + */ +static void +setclassumask(login_cap_t *lc, const struct passwd *pwd) +{ + /* + * Make it unlikely that someone would input our default sentinel + * indicating no specification. + */ + const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; + const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); + + if (val != def_val) { + if (val < 0 || val > UINT16_MAX) { + /* We get here also on 'err_val'. */ + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Invalid umask specification: '%s'", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc->lc_class, + login_getcapstr(lc, "umask", "", "")); + } else { + const mode_t mode = val; + + umask(mode); + } + } +} /* * Private function which takes care of processing @@ -393,32 +424,8 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) if (flags & LOGIN_SETRESOURCES) setclassresources(lc); /* See if there's a umask override */ - if (flags & LOGIN_SETUMASK) { - /* - * Make it unlikely that someone would input our default sentinel - * indicating no specification. - */ - const rlim_t def_val = INT64_MIN + 1, err_val = INT64_MIN; - const rlim_t val = login_getcapnum(lc, "umask", def_val, err_val); - - if (val != def_val) { - if (val < 0 || val > UINT16_MAX) { - /* We get here also on 'err_val'. */ - syslog(LOG_WARNING, - "%s%s%sLogin class '%s': " - "Invalid umask specification: '%s'", - pwd ? "Login '" : "", - pwd ? pwd->pw_name : "", - pwd ? "': " : "", - lc->lc_class, - login_getcapstr(lc, "umask", "", "")); - } else { - const mode_t mode = val; - - umask(mode); - } - } - } + if (flags & LOGIN_SETUMASK) + setclassumask(lc, pwd); /* Set paths */ if (flags & LOGIN_SETPATH) setclassenvironment(lc, pwd, 1); From nobody Mon Jan 29 22:32:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32M1q7pz57Z0c; Mon, 29 Jan 2024 22:32: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 4TP32M0nynz4fnj; Mon, 29 Jan 2024 22:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnJb1cp6IHmV3r7QAPvQwrhpSHLi9o8bR3yq+fn+IU4=; b=N6pvLDjPtOPXXZn2eR5CkNiG5lNGUuPme5MZqQbS1grRzLjSCzGGQdgVKSvG6YkQ6QFDLW tibLH9kqP+1C/iEfy0UIQGFDNGn+IqYMQCJMwVCuS9ZdWqEJ6fMcUjukKC+RSSbV8IXRjF b5pSqjQYJGXLS575j0d4JyYxYfIBas1FtZOU0FhkWPfGB/AMI9H0XGG0ZRO7NLIqCuuixo 7yrxnLaYIoL01CvvwqOpfwnmGKVnJaV16tNF0AtsIKYYqY2vZXEkzoIUIvrO9rjcI+sYUl QkgztccburOBnAbctJUxE4Htrx6PaRIXJE6mr5adqH9VI4Yjp5Ku6/tKW9rzeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jnJb1cp6IHmV3r7QAPvQwrhpSHLi9o8bR3yq+fn+IU4=; b=eoUEOLsJiH2U8iXGtCKM7pkB7X4TkGdKxovJJnydeBkc/ih1EQ6NolR1CG4txmJQsbk3yk GkUu16wEhLgbSvisk7kdemhkz3ysstEpNbBHrkPypglPCO/A9qqkKA+t49jEUNFec5jpm8 LSZ7fQTNuRSv4bcGGD6qnq+ULrOjd9Fsf7+p5n715c0QBWr/ZSP35QhJLNJGIWXrtxhp5D EDVRTvBHm1vaY4J/Lc8Bsz6Yeywnol9Ius3ZXkteHmao4182V7e6CEXAxpdGbgpG4G1uGX 7ZfwxXPlUMQaGA7lIpaLZj5prpPbh9/7JfqwOAbfVNhv7KeKG1mN2X2dcmZAoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567531; a=rsa-sha256; cv=none; b=Xu4TmgWU8vPcijPZ0rYco6TlJmoyCfAqbnRmFxLdxLOYc9BIMegftBnFX+wYRiolFtHoT1 NqOcsBkWsty6i3Fa5UCtQeIAQ5X5Clvf50O+GZUwV6qxVXQabj0igtBG7Aaf5QikT3EHeE nOse3jR2ksrKhE/B2Dpi2ipCjwYkSmX7yiNeikEiSarJMDJ7VYgxH1v3sM2qmlUFKhiFDP yw4epIKa1otFxnzrLLN8GnTXxuZuut/8ttgDuIOqgbnAqgyZmFedckdJ3IpLXXaHm0JOjW OQr2xE3P1rz7x/FBIG80CyPSILITVhVJNyS19vDtCR7YgR9GYBfyWwAd5aty3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32L71N8z18T9; Mon, 29 Jan 2024 22:32: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 40TMWA0R013468; Mon, 29 Jan 2024 22:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWANn013465; Mon, 29 Jan 2024 22:32:10 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:10 GMT Message-Id: <202401292232.40TMWANn013465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ea9bd448102b - main - login.conf(5): Document umask's special value 'inherit' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea9bd448102b938ccb8d4b484684a6ba2d934931 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9bd448102b938ccb8d4b484684a6ba2d934931 commit ea9bd448102b938ccb8d4b484684a6ba2d934931 Author: Olivier Certner AuthorDate: 2023-06-21 08:42:44 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:06 +0000 login.conf(5): Document umask's special value 'inherit' Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40688 --- lib/libutil/login.conf.5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index 7449c11f2ba5..b2478bb7a88c 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -255,6 +255,9 @@ from other means. .It "timezone string Default value of $TZ environment variable." .It "umask number Initial umask. Should always have a leading 0 to" ensure octal interpretation. +Special value +.Ql inherit +explicitly indicates not to change the umask. .It "welcome file /etc/motd File containing welcome message." .El .Sh AUTHENTICATION From nobody Mon Jan 29 22:32:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32N5gQsz57Z0g; Mon, 29 Jan 2024 22:32: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 4TP32N1rJZz4g7G; Mon, 29 Jan 2024 22:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LERaRLaMFEzpvJUmPFiU/vpxa8R782bbksimimmBfPg=; b=vNjvt8XwoDIq0pSflWnsD/gEgce3Dbadcj6O9InWJX6+W0P5gzyzgUcaIW8VDDGQ0FeUSs yAtFl0BLhgP2Gja1d9fvegXjZ69Yh+ouljbkMbxG4aLBEpUt9/4Ugw2eOdy6P7h/epdxuL f7UEhvMXzsv2r7jZ+44S3NH3WTsdjSHAKyZtSr9g3T7Bi0bOQWuDBKMENSIRXREUDGe6a4 VPxN4VYIDoKvgDQxUPSPFBuWN6JZtaEWCRFumo8NXvyh9hEtN8FdVPdRyctrOVHLa7nV0Y cPffHwZrndpLAQZQJyYkNPdKXcYFsdNuzam+y9rF0xJZdgzFNhTtNCjL3NgY0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LERaRLaMFEzpvJUmPFiU/vpxa8R782bbksimimmBfPg=; b=iZHQeV8VfW6+L2L16muHAh78BclRSp1pKT12nrkPojwAUfek1yGmkcrfzUXKbhrF5CmN6t R+xbbAVN5gSpO6/gDosGm4/QmOaF5Mpq0fNiGycJP88KZKNoi2PnqO5jMt7oXveF1HSRqc PZLQ7LaY58lTmFYPoF0/I4nOPtzXrRyD/RvSzgc5LSAZrSshMY+klIOfGmmTnVSkD/n1Qo tsHhEIGP1dLljKSj5kL9fZoiN+4ysMVkso+TQqUvyhqQ/7LJUP0gxuKOYt9cJnBu9JDiBd 2WpRKpKDTCtb+uvUTcVyeMRaJjaOkQsndmm+Q2M9pi/3WR5eWbib2AXt0hOGqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567532; a=rsa-sha256; cv=none; b=x33dOcKWDzXDk+D/ljcIVzWt1sawtT5b7aBx6MYnIL4bKmA5O7IT441WPwiogOFP0hTtTu PyugM1lr+f+CVljiE1jEpolqI5mfJ/ynuoted85MFw3rQsscWe3Uq50JLHBuGl2o4MCnjP 8o+4jj+gYAY8wrBlY34Z0jeaqAH+8EzuoPd9VQ21A2a4HOikf0xxYI2E/Xx78OaIsvEHlr Ier7KmmRFEfiPEIqYVsJixmuGOsPa0I/6dzWSZKkpMy0rzFqXAadaQu62NTZ+ggf5v2LqC YBbkeRt6JRS58jXjMhRuA+u+NkO1dHabKb50qidodkHjrKL4bM7fRI2wFcPZ9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32N0xL1z190R; Mon, 29 Jan 2024 22:32: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 40TMWCm0013507; Mon, 29 Jan 2024 22:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWCGC013504; Mon, 29 Jan 2024 22:32:12 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:12 GMT Message-Id: <202401292232.40TMWCGC013504@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 771d5c93ab5a - main - setlogincontext(): Comply to style(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 commit 771d5c93ab5a3fb1701d9706df2ce87d6a9da6f3 Author: Olivier Certner AuthorDate: 2023-05-25 14:29:22 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:07 +0000 setlogincontext(): Comply to style(9) Remove indentation by inverting the big 'if (lc)' and using 'return'. Use explicit binary operators to produce booleans. Reviewed by: emaste, kib, dchagin Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40346 --- lib/libutil/login_class.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 933d9bc4fe1f..ee0cec3423f5 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -430,23 +430,28 @@ setclassumask(login_cap_t *lc, const struct passwd *pwd) static void setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) { - if (lc) { - /* Set resources */ - if (flags & LOGIN_SETRESOURCES) - setclassresources(lc); - /* See if there's a umask override */ - if (flags & LOGIN_SETUMASK) - setclassumask(lc, pwd); - /* Set paths */ - if (flags & LOGIN_SETPATH) - setclassenvironment(lc, pwd, 1); - /* Set environment */ - if (flags & LOGIN_SETENV) - setclassenvironment(lc, pwd, 0); - /* Set cpu affinity */ - if (flags & LOGIN_SETCPUMASK) - setclasscpumask(lc); - } + if (lc == NULL) + return; + + /* Set resources. */ + if ((flags & LOGIN_SETRESOURCES) != 0) + setclassresources(lc); + + /* See if there's a umask override. */ + if ((flags & LOGIN_SETUMASK) != 0) + setclassumask(lc, pwd); + + /* Set paths. */ + if ((flags & LOGIN_SETPATH) != 0) + setclassenvironment(lc, pwd, 1); + + /* Set environment. */ + if ((flags & LOGIN_SETENV) != 0) + setclassenvironment(lc, pwd, 0); + + /* Set cpu affinity. */ + if ((flags & LOGIN_SETCPUMASK) != 0) + setclasscpumask(lc); } From nobody Mon Jan 29 22:32:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32P55JCz57Z76; Mon, 29 Jan 2024 22:32: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 4TP32P382cz4flX; Mon, 29 Jan 2024 22:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W0S/PCkoOaqtB8Stk4OWZizGX++bEKvsE6LRIbDN8Xc=; b=IwIy7IMlYboxy019irsusZ5po4MUKhV7j9binc9DsGjlmjuZLaZBTx8gSFraTW7qX7YfH1 4tSqtf9xOKGUyRkgzvmjQqlvizOHOjpp/fJSatlBGOrG7PrjEjhLJED4PGgeobYDtVZXg6 xKGxMFTlBzRB1i7UTWT4XuYj9f46pvNye/uT5A126nd3MHp1341NqAkqU5GfTW7VL0pzm1 oV0MAb/Phitzo1LSlIRThPew2Bs0eSwKYcMuZqQsK1fJAZr7bM8UjbLTJPYznlVm2WQ7ad ab3/uilQps9pGnjYXRKs68a7UI6uKUJNt+3Hn3N+FpB8KGXKn3aFIW3HUKebxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W0S/PCkoOaqtB8Stk4OWZizGX++bEKvsE6LRIbDN8Xc=; b=G20YxBWWY/aWlgZF7hwWMJJl4ihDXsL9UKW0N4EEBq5OoOCyx/zMRnFnXIl14JZC/op5zm CCNAKP1Ukp+c/78UbTv9C0XoOiFILFHEWAY/iu+/6pi5l3LgPYl/Vq9OZB/37SXCyD/FRi en9BDkN771yT48sdtnqd9RKk563gvnHLsDIFPiOvCP6qJDVIv8/Hp8N2tJc+l5Sp0DLYu2 2ZvBpjKI/nx0yFhVerSFXJq7RhuOXd2KNQ8nEFWzi5cLPjfavB2qJRW/BCqWHG0XNLKCu2 LhI8aREmOuIUPXye0a+HbGlfNJNdsRvxC4DFdbX8JUW73Ak1Nky2KmCrm7ThPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567533; a=rsa-sha256; cv=none; b=D19FrjQVkMzrlLNOmVIPnP//sQbRyfD88sE1OtRP1RI2xmLTdXFhfcXoEpHKYqfnDxYx8z B/juZWsNlEldzqS63UWsMi+239kdk96WPpBGFVpuAG/5qAuDEwnnpiDXxhje6iCt5+nXFs bs9dA0YUAq7XfyG47QWH1nalbp2we8oWmr97lsokojGvz2Q1/IXdX4wVoQ/FV0OdxnrB8x R23cuebnT77Z2qX/RbUOt2maIBnwo3/ioE/LQk8Fv5yHG+Tk8ju2BT9yiObMXyA3PbiGxV WrR7jU6+n5TvNig1C5QLLkjB19M+J8O6iOkSCYw4oMxsmvaxKKLpUUV4I/KOzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32P1sg8z18g3; Mon, 29 Jan 2024 22:32: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 40TMWDsi013566; Mon, 29 Jan 2024 22:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWDxe013563; Mon, 29 Jan 2024 22:32:13 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:13 GMT Message-Id: <202401292232.40TMWDxe013563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 92b2c4358f57 - main - login.conf(5): Default values: Rename column, elaborate on absence of such List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92b2c4358f57ef84f161efd8370ba4832bd9261a Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=92b2c4358f57ef84f161efd8370ba4832bd9261a commit 92b2c4358f57ef84f161efd8370ba4832bd9261a Author: Olivier Certner AuthorDate: 2023-05-29 14:06:37 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:07 +0000 login.conf(5): Default values: Rename column, elaborate on absence of such Column "Notes" in fact only contains default values for capabilities, so make this clear by renaming it to "Default". Add a small introductory text mentioning it, and what an absence of default value means (inheritance). PR: 271748 Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40347 --- lib/libutil/login.conf.5 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index b2478bb7a88c..35ca11452811 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -181,9 +181,15 @@ are considered infinite values. The usual convention to interpolate capability entries using the special .Em tc=value notation may be used. +.Pp +Default values are specified in the +.Ql Default +column. +If there is no default, the value is inherited from the process setting up the +login environment. .Sh RESOURCE LIMITS .Bl -column pseudoterminals indent indent -.It Sy "Name Type Notes Description" +.It Sy "Name Type Default Description" .It "coredumpsize size Maximum coredump size limit." .It "cputime time CPU usage limit." .It "datasize size Maximum data size limit." @@ -209,7 +215,7 @@ The maximum and current limits may be specified individually by appending a -max or -cur to the capability name. .Sh ENVIRONMENT .Bl -column ignorenologin indent xbinxxusrxbin -.It Sy "Name Type Notes Description" +.It Sy "Name Type Default Description" .It "charset string Set $MM_CHARSET environment variable to the specified" value. .It "cpumask string List of cpus to bind the user to." @@ -262,7 +268,7 @@ explicitly indicates not to change the umask. .El .Sh AUTHENTICATION .Bl -column passwd_prompt indent indent -.It Sy "Name Type Notes Description" +.It Sy "Name Type Default Description" .\" .It "approve program Program to approve login. .It "copyright file File containing additional copyright information" .It "host.allow list List of remote host wildcards from which users in" @@ -406,7 +412,7 @@ The following capabilities are reserved for the purposes indicated and may be supported by third-party software. They are not implemented in the base system. .Bl -column host.accounted indent indent -.It Sy "Name Type Notes Description" +.It Sy "Name Type Default Description" .It "accounted bool false Enable session time accounting for all users" in this class. .It "auth list passwd Allowed authentication styles." From nobody Mon Jan 29 22:32:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32Q5Z0dz57ZY7; Mon, 29 Jan 2024 22:32: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 4TP32Q3bWsz4g7f; Mon, 29 Jan 2024 22:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rixTfZl1k9GVNf0EHghs4U9PXgbr0yJKqBYtvsvDVeE=; b=wbQm8XfntVSXJR+EMlWyzzAJod6QQtq6Kq+1p9PMPyTfxJ3dWIFI7r0l9tkdVUKIo7Gcrx Vg7y1a2yhS+xiVvOMTlTLWjCk4UzWPefB0r2UjKQSFpe1RhSTGyeaUlpE9xUxWjvN1JkAu gg8qtVGv/xUX1d1wVCwHdrF5YKP/nhcDolz3h+lsMiU9mp17WbZbIylWcev2jmrX5rG0ca 2/fZKj8dw6R0Ne3Wy1/i20l1GIKURL66t6PLUEBBzjbFYwTDVwVyctJ7UBAciRMLzJAiZU 8wk5WgVDzxhjB4XaKtD+KAKl2f1GepswtawGXnk3Z31MOw0IkPsIIxoIIl3aEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rixTfZl1k9GVNf0EHghs4U9PXgbr0yJKqBYtvsvDVeE=; b=qP0DM0700/FVzwYsb9MkVBKF7oaLMExxIvg981iyqs50J0JPBGvSMcJ8Jp5PsHTvfdm8+o EsNVTu2FhiPpbSW37U010hKwEBJrY2lJNeHzOFPhwQpIKsgAgicsc8/o/0m0erthpPDB6b /3x8CDXYlbzM/w+YtYV5KUA4bOoyuVgG6pKU3h8lPCSsHdYg/yy2aPNe1V5L6xN/Oh+QMp uBNTWhp8notquciswSZeiZ1uj3SQQH3n5aCWFPd2DMbKyZ5aXL1MsgPgfXTCrEWkB9ZwUH oU66plI1eCfwuP5VFr3PKhExIFDvte2RWmHeG/f+dVFotEtSQpViXhTNdfhTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567534; a=rsa-sha256; cv=none; b=CH/fjEquMta0X9C1ty9awDjRBcgbhM1NB8vnLLCGg5LmjIkXzY+GQkQs1pl1B+Ok045BYv PRUBq51mbhXslY0M6cbGn/83qgiwyH0DKpoMpItaM4VpD9q6IDk4cz6N2pJUv7LJ4gsAaU lfk0O6lZkfpL6o5TanjDDqC3USpnG9kyZM3L8034XMSMjxPua9PGwGqOctXtX1Iup4EnCu rHxCLuvGvNoUL6VeDGf4awZTZfrtA+/B7IYZuXLJnG64OU49yd1Qr810SSMjE5YjGlmk9z 0JXNDNwC9OnswzOw57UIoR1st+kr+6IXrMAdH2GUC7eEAKrS8VmQx3K3LfFALg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32Q2hyhz18TD; Mon, 29 Jan 2024 22:32: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 40TMWEJ7013627; Mon, 29 Jan 2024 22:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWEZY013624; Mon, 29 Jan 2024 22:32:14 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:14 GMT Message-Id: <202401292232.40TMWEZY013624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d988621b0c25 - main - setusercontext(): Better error messages when priority is not set correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d988621b0c25209866ed5a98b1a8b20269935761 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d988621b0c25209866ed5a98b1a8b20269935761 commit d988621b0c25209866ed5a98b1a8b20269935761 Author: Olivier Certner AuthorDate: 2023-05-29 16:39:04 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:07 +0000 setusercontext(): Better error messages when priority is not set correctly Polish the syslog messages to contain readily useful information. Behavior of capability 'priority' is inconsistent with what is done for all other contexts: 'umask', 'cpumask', resource limits, etc., where an absence of capability means to inherit the value. It is currently preserved for compatibility, but is subject to change on a future major release. Reviewed by: emaste, kib (older version) Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40349 --- lib/libutil/login_class.c | 51 +++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index ee0cec3423f5..269349a49dad 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -473,9 +473,7 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) int setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned int flags) { - rlim_t p; login_cap_t *llc = NULL; - struct rtprio rtp; int error; if (lc == NULL) { @@ -492,30 +490,49 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in /* Set the process priority */ if (flags & LOGIN_SETPRIORITY) { - p = login_getcapnum(lc, "priority", LOGIN_DEFPRI, LOGIN_DEFPRI); + const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; + rlim_t p = login_getcapnum(lc, "priority", def_val, err_val); + int rc; + + if (p == err_val) { + /* Invariant: 'lc' != NULL. */ + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Invalid priority specification: '%s'", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc->lc_class, + login_getcapstr(lc, "priority", "", "")); + /* Reset the priority, as if the capability was not present. */ + p = def_val; + } if (p > PRIO_MAX) { + struct rtprio rtp; + rtp.type = RTP_PRIO_IDLE; p += RTP_PRIO_MIN - (PRIO_MAX + 1); rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p; - if (rtprio(RTP_SET, 0, &rtp)) - syslog(LOG_WARNING, "rtprio '%s' (%s): %m", - pwd ? pwd->pw_name : "-", - lc ? lc->lc_class : LOGIN_DEFCLASS); + rc = rtprio(RTP_SET, 0, &rtp); } else if (p < PRIO_MIN) { + struct rtprio rtp; + rtp.type = RTP_PRIO_REALTIME; p += RTP_PRIO_MAX - (PRIO_MIN - 1); rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p; - if (rtprio(RTP_SET, 0, &rtp)) - syslog(LOG_WARNING, "rtprio '%s' (%s): %m", - pwd ? pwd->pw_name : "-", - lc ? lc->lc_class : LOGIN_DEFCLASS); - } else { - if (setpriority(PRIO_PROCESS, 0, (int)p) != 0) - syslog(LOG_WARNING, "setpriority '%s' (%s): %m", - pwd ? pwd->pw_name : "-", - lc ? lc->lc_class : LOGIN_DEFCLASS); - } + rc = rtprio(RTP_SET, 0, &rtp); + } else + rc = setpriority(PRIO_PROCESS, 0, (int)p); + + if (rc != 0) + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Setting priority failed: %m", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc ? lc->lc_class : ""); } /* Setup the user's group permissions */ From nobody Mon Jan 29 22:32:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32R6v7Mz57ZY8; Mon, 29 Jan 2024 22:32: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 4TP32R4n8Wz4gLg; Mon, 29 Jan 2024 22:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OeqT6q9T8TAQ1fb9b5ZftE2iXcKHe9iNp7bi4zT1Mg=; b=ovVxJvknxKBmWli2n19ZOya+/OX/iFXbKHnAamaINzRLfEWAoUBwInGFetN4ZTMCPf/wvM Q1AYdlabPxd5ALTsNASADDf8gjZYu0t3Mktv5xmMllQqupF3HGYEUbT9yT9jQ39PEIJamG u7wRy0/WgYeY2tArBkmlHWNj8F5Jff7TmaibAZsWRVmuaXAim6xJR8ORaTTRL/kIBROl7L YElbtQciSrKW86DMQoX3GLKh0cNObLJplvriX7rHXFK08+PkK0XI+C7/eHtL+w4YJ5AoAb U2f9YjjUdHQW+gC+alR9o66brEBEdn0fWME+leZ4RYQiRbSLuht0uqtP/kgOIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5OeqT6q9T8TAQ1fb9b5ZftE2iXcKHe9iNp7bi4zT1Mg=; b=n7DyTGTY7AJlbEuVqM/NRRg5RXtr3rGQmy0duqXvQRZrMaANLC+JUAlcTELQF8rstzVT+h CDinXvCr6bNZEjlmM/pla3lKmuBmVoF7NQ138ix+1gxXB0cBeF6Vy/2oIgIJ5nKksmyXH4 /Qc2rI50JX7Uy3bXppmf8Ej7SINKg3Md2I5pUvmZCHnimr2wqYrXVP37DQuh8LNzjuNSMa LrrpOHM4TwXPec6cDHeEQu5//uXjoDpRBmBFnT+hel5bI6E96B3WlK++pVoeyLuDTYLXNT wk6RekPuRreqhukLykvyyPY9Tu0pSEbzLwjFVQsorT+gmqfj5L23CBQxLcgJeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567535; a=rsa-sha256; cv=none; b=TIR0b12bt0OTksiU+WfOhO8CB9I01xh1QtGmAgVFMUjhFfa+MEWHNyGZl1EUFw6vMnF1EN TWBivcQGnpxAQd6EicUie5mtDDh08JtekuVamjThRwJ3c23vvfZJDvRIV7yA/SeHkju7pX o6U1WhO334a0h+vD/RE8rqVPA9BRwlKF1MDvPUl302QuMeEh1F2a+nWOn7jtDHl7KokyYX nvKfgr7hpXOp92mScpJKydiqT1hA+fqeVBTy3tLVukhPxfkCmGhUszHlP+13mFj5IIo3eQ CDLima2dTI8eVIkEHWX5pNsq2F+GSwm4go+SHUF7bHTn4Q8WEiGdeCuPyviNGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32R3tqlz18hM; Mon, 29 Jan 2024 22:32: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 40TMWFBp013679; Mon, 29 Jan 2024 22:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWFvR013676; Mon, 29 Jan 2024 22:32:15 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:15 GMT Message-Id: <202401292232.40TMWFvR013676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: aa96945e71b0 - main - login.conf(5): Document priority's default and possible values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa96945e71b0f724e6ce673194d23f58d2d637d3 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=aa96945e71b0f724e6ce673194d23f58d2d637d3 commit aa96945e71b0f724e6ce673194d23f58d2d637d3 Author: Olivier Certner AuthorDate: 2023-06-21 08:39:15 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:08 +0000 login.conf(5): Document priority's default and possible values Priority is reset to 0 if not explicitly specified. While here, be more explicit about what "Initial priority (nice) level" means and document that it is possible to set real-time or idle class' priorities with this capability. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40689 --- lib/libutil/login.conf.5 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index 35ca11452811..4a98ee818139 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -247,7 +247,21 @@ for details. .It "nologin file If the file exists it will be displayed and" the login session will be terminated. .It "path path /bin /usr/bin Default search path." -.It "priority number Initial priority (nice) level." +.It "priority number 0 Initial priority level." +A value in the nice range +.Pq -20 to 20 included , +extended below with the 32 real-time class priorities +.Po +so -52 maps to priority 0 in the real-time class, -51 to 1, and so on until -21 +which maps to 31; see +.Xr rtprio 1 +.Pc +and above with the 32 idle class priorities +.Po +so 21 maps to priority 0 in the idle class, 22 to 1, and so on until 52 which +maps to 31; see +.Xr idprio 1 +.Pc . .It "requirehome bool false Require a valid home directory to login." .It "setenv list A comma-separated list of environment variables and" values to which they are to be set. From nobody Mon Jan 29 22:32:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32T0xPWz57Z0m; Mon, 29 Jan 2024 22:32: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 4TP32S5bRrz4gCr; Mon, 29 Jan 2024 22:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8EBSJgSzl6E4vxJ/GktvMD9bT8YgMqcc8zpYjlIIEA=; b=Eu2YxxztWAGHbsQ6BZtw4u9eYzrm3HYjGyuZoUPEQTpa0/p3Bp8amDXMBG9Q2kI5I1C0Wt Ko4d1BoGgXxfooXeHySc0Yx5DqsY3ZghB19/QfmPxjKqjeM+dq/GvwKBX6zRRwcGg+Jl+o +eyCJ9QgPC73UhZmH1S3FCQMPBX0HsnhlzRZQS2MDVkMXxgOrCZpqLt8uOymst9GODTdFU YU7yMuoj+sfZ8P0Mb/wdnH05kc3uyvj/qiUG5ALJiL1c/ACtLB5vPYHWyGMTkj6qGAWqBS dceBmoB8xIECCXUaheV1SetZuS8t9gYJN+Z/FEwqhV3spJOJJgjXrA7G8fCFww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/8EBSJgSzl6E4vxJ/GktvMD9bT8YgMqcc8zpYjlIIEA=; b=FHqXkzBRPT/iA5JIsg4IjRFZQw3JnnyTiEb+kI9SwDgvsy2AdIQM4CfUcj6zl6We79ynnw yqY6JtBiJTVWk53KbW78EwcpzhyXLz2yAb7BxhiQvhP04bOX8Mkz9Z0FZkEwONarWKFZPM kHYbwLksfUjo56EGfU0OqDa/2EDxbIhBGpT9s33XiK/p16prAVa0stNlS5DOx4ttBRK8+O Xs88XEMAtuXes+HAG16kleF44xHNfP80UmW/WxF7KpQrVabIj4JiRkVgR147/mU568DkDT zI5BQ2sisZRaW3WCendOkgAsA+9FmuPUa3zoQtEWBqKMrd59Dd1Xi3VApv2Ieg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567536; a=rsa-sha256; cv=none; b=WAIOpe1Gn3RQ4OFwEtTbpPXIrIectp4Zesvz+vbsrGMDd6Q/jCeJmgrveriUCG72+gVS1S v3VkWSz4z/M6ck4bAiTbKAMMTkPNWCLxJswOOoLtQgae58rEhCYWTuG/CJ0QL8np/hcsoN oSpjw0PLv1YEAJS0lejHFeI6E0Eq5orCskH0Kg2ecgWjyZAXED6ykYtBIkt6vSFn3bvpMk +MHiqSKPUC/R7MMkRzclqdYN7Xi2bxLPkE71YqgX73RGpYEE00ZCKittX6DiLx4gVbW6Ge dFPr4Wmg9izLlK9JWACXV8QH4e7rsjPBPWRIHhlNzIWFiTOvNOnFFiCUPfzcyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32S4jFrz197M; Mon, 29 Jan 2024 22:32: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 40TMWGqZ013730; Mon, 29 Jan 2024 22:32:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWGmq013727; Mon, 29 Jan 2024 22:32:16 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:16 GMT Message-Id: <202401292232.40TMWGmq013727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7b94ec550ef6 - main - setusercontext(): Move priority setting in new setclasspriority() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b94ec550ef6e7b75d608e125e9b78478197d4e7 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7b94ec550ef6e7b75d608e125e9b78478197d4e7 commit 7b94ec550ef6e7b75d608e125e9b78478197d4e7 Author: Olivier Certner AuthorDate: 2023-05-29 17:09:36 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:08 +0000 setusercontext(): Move priority setting in new setclasspriority() In preparation for setting priorities from '~/.login_conf' and to ease reading of setusercontext(). No functional change. Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40350 --- lib/libutil/login_class.c | 97 +++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 269349a49dad..d36926d70224 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -455,6 +455,56 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) } +/* + * Private function to set process priority. + */ +static void +setclasspriority(login_cap_t * const lc, struct passwd const * const pwd) +{ + const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; + rlim_t p = login_getcapnum(lc, "priority", def_val, err_val); + int rc; + + if (p == err_val) { + /* Invariant: 'lc' != NULL. */ + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Invalid priority specification: '%s'", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc->lc_class, + login_getcapstr(lc, "priority", "", "")); + /* Reset the priority, as if the capability was not present. */ + p = def_val; + } + + if (p > PRIO_MAX) { + struct rtprio rtp; + + rtp.type = RTP_PRIO_IDLE; + p += RTP_PRIO_MIN - (PRIO_MAX + 1); + rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p; + rc = rtprio(RTP_SET, 0, &rtp); + } else if (p < PRIO_MIN) { + struct rtprio rtp; + + rtp.type = RTP_PRIO_REALTIME; + p += RTP_PRIO_MAX - (PRIO_MIN - 1); + rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p; + rc = rtprio(RTP_SET, 0, &rtp); + } else + rc = setpriority(PRIO_PROCESS, 0, (int)p); + + if (rc != 0) + syslog(LOG_WARNING, + "%s%s%sLogin class '%s': " + "Setting priority failed: %m", + pwd ? "Login '" : "", + pwd ? pwd->pw_name : "", + pwd ? "': " : "", + lc ? lc->lc_class : ""); +} /* * setusercontext() @@ -489,51 +539,8 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in flags &= ~(LOGIN_SETGROUP | LOGIN_SETLOGIN | LOGIN_SETMAC); /* Set the process priority */ - if (flags & LOGIN_SETPRIORITY) { - const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; - rlim_t p = login_getcapnum(lc, "priority", def_val, err_val); - int rc; - - if (p == err_val) { - /* Invariant: 'lc' != NULL. */ - syslog(LOG_WARNING, - "%s%s%sLogin class '%s': " - "Invalid priority specification: '%s'", - pwd ? "Login '" : "", - pwd ? pwd->pw_name : "", - pwd ? "': " : "", - lc->lc_class, - login_getcapstr(lc, "priority", "", "")); - /* Reset the priority, as if the capability was not present. */ - p = def_val; - } - - if (p > PRIO_MAX) { - struct rtprio rtp; - - rtp.type = RTP_PRIO_IDLE; - p += RTP_PRIO_MIN - (PRIO_MAX + 1); - rtp.prio = p > RTP_PRIO_MAX ? RTP_PRIO_MAX : p; - rc = rtprio(RTP_SET, 0, &rtp); - } else if (p < PRIO_MIN) { - struct rtprio rtp; - - rtp.type = RTP_PRIO_REALTIME; - p += RTP_PRIO_MAX - (PRIO_MIN - 1); - rtp.prio = p < RTP_PRIO_MIN ? RTP_PRIO_MIN : p; - rc = rtprio(RTP_SET, 0, &rtp); - } else - rc = setpriority(PRIO_PROCESS, 0, (int)p); - - if (rc != 0) - syslog(LOG_WARNING, - "%s%s%sLogin class '%s': " - "Setting priority failed: %m", - pwd ? "Login '" : "", - pwd ? pwd->pw_name : "", - pwd ? "': " : "", - lc ? lc->lc_class : ""); - } + if (flags & LOGIN_SETPRIORITY) + setclasspriority(lc, pwd); /* Setup the user's group permissions */ if (flags & LOGIN_SETGROUP) { From nobody Mon Jan 29 22:32:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32V0wMnz57Zbb; Mon, 29 Jan 2024 22:32: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 4TP32T6ZbMz4gKF; Mon, 29 Jan 2024 22:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ru6FMrwuzug5GAUn7NHxW3jPpVo9QRclTHwPQ9EPJY=; b=jAmssm34cZjY2+vmLvBruKc/Hzz0zukCr8+WVgbRzrxhIg3ByP0z1p+zr8it3mIwREx5cy vclqpcCMskJrzkg0WAzpPcOGQXhCKpdF53uakIYkOkqrijKB+7Q3NmBTl3PoqCfOgLtYPt IQzqV9hoaFX0b7GLC+VBTlV2CppKZzirG25StJYmy7zQKBbmHaPYBy0FlIBNGwU6ykwXtL x7WYkUoNCU9xMDwy0g//9Nbf/W6rfbFR31cObMwwb7s/Xv5DmrbIxkRIre2rm6VPhSCqQD VJjdO6LlF8BAWQdrbJA1zf1/4TaCvIXx16bg+vgP3t2FM2XqOEJgo6fjXbZMOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ru6FMrwuzug5GAUn7NHxW3jPpVo9QRclTHwPQ9EPJY=; b=Gg3XPpwoeljs1Bx+cPpKzKowKtyp5oY9+voC8eBgsWsoZOJCnDqn6hQv3wjDlDXu02Ynfi qGP+WGr2RC7mezCZyb0R+seZ4wdWuFqpZ2/EAM4YbOUY9Is3L+oACr2Cs6y8qV4/H8LU8l oIIDFTgMQZiYEnZa2EGyOCq53vQxqz0fJx5aYFE9pgdKz6yMatO0/V3i8svHcY5ntlWClA Zpxrz4xjuhqAfqdDIOukdE1PS4aVaL0hV2k1VH0XvnoDlgGV3Eh1bW5GjUTXnajZZDOjrS xIdVRu7aHrYce5wYFbp3Z/10DEPKf3TJHsj1jZAMw6ncIUuz6o4lkgRH3amryA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567537; a=rsa-sha256; cv=none; b=nA2B4Q6Lvmk/WS165J53/blED+9eFqwbRark47/D6o+6rZwB2piBAYzSDzGokIqKS/hRz4 EUqZrxyyYl/i5mWpMXiAj325a8HuaIkFqoOAAPZM/CYKNO/ujMef+bZUthLzCtQTWZDuXR 3GApRhhhsMi9t0iQcmWVLdxI0ES3fUbdRaTGTwgda8bmiCXsKi1Hgs4rCfSmREyyl7J2GZ 4Bl3zwC9AeSF6fTb8rbuFHj7CnXub/XWkZCKWCiQKyujK/szUogmhk40F34O4GfOiXu0v7 bAECky7djOoWXJwoFqKjWIWm6LzrZo8+JA05BXI/K8/K5/ovd9p7CM8RgCpKog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32T5hG5z18hN; Mon, 29 Jan 2024 22:32: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 40TMWHB4013774; Mon, 29 Jan 2024 22:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWH3o013771; Mon, 29 Jan 2024 22:32:17 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:17 GMT Message-Id: <202401292232.40TMWH3o013771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d162d7e2ad32 - main - setclasspriority(): New possible value 'inherit' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d162d7e2ad327ceada4102c5d6779f9ecd809502 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d162d7e2ad327ceada4102c5d6779f9ecd809502 commit d162d7e2ad327ceada4102c5d6779f9ecd809502 Author: Olivier Certner AuthorDate: 2023-06-21 08:53:37 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:09 +0000 setclasspriority(): New possible value 'inherit' It indicates to the login.conf machinery (setusercontext() / setclasscontext()) to leave priority alone, effectively inheriting it from the parent process. PR: 271749 Reviewed by: emaste, yuripv Approved by: emaste (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40690 --- lib/libutil/login_class.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index d36926d70224..314ab0999320 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -462,9 +462,15 @@ static void setclasspriority(login_cap_t * const lc, struct passwd const * const pwd) { const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; - rlim_t p = login_getcapnum(lc, "priority", def_val, err_val); + rlim_t p; int rc; + /* If value is "inherit", nothing to change. */ + if (login_getcapenum(lc, "priority", inherit_enum) == 0) + return; + + p = login_getcapnum(lc, "priority", def_val, err_val); + if (p == err_val) { /* Invariant: 'lc' != NULL. */ syslog(LOG_WARNING, From nobody Mon Jan 29 22:32:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32W2mNLz57Z7T; Mon, 29 Jan 2024 22:32: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 4TP32W0bzkz4gSS; Mon, 29 Jan 2024 22:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6JjO4576QmDL7QyIKQgE7A48GyMNSpytJKIv/s05wo=; b=aVQaYyn3hFOKW0reNMRKewXwU3R8/7jwQ2eDLUGgUqh0/vMEZmV4NbLu4RHY9Va50MmzMQ R6yDwjU/H2e2+U601PPXN+XcE3lJqh3Io26bQG5WPq09Milx/XdcBpez40hCM95wAOKNZs sCYTcbJXXP3xyj24csAWCIsKMnDYlK6KX15RFI2S/RqgzDwckImXBHnrdV+sOEXKRtvArx lWojrkpdek1DUkA/FiSFarEZZetG2CV254mdivRMPbTvEv1ZN28U4GzoAfjzx1j7sl3l21 Fv/3LkAHlKyDbsm5/wupY/yzoXZGy2VTCdvoGUrM4NQPfINFI3bn0ZUupdpOqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6JjO4576QmDL7QyIKQgE7A48GyMNSpytJKIv/s05wo=; b=LsmivwiBxtrG19vRk+RPSfyPUw7UP1Z0Jdh3NAxlHNpE0nEvu5fTp8DVt4NMug3JrXYsDn mleDovor3N3va/M3fBi400Y9udOLzmHSvQh7Cz6Xtmur0KOFnp7UiI5jeK9ezqMkAY75FL AlmIvJRYm7mXzGzOLb7MCvGmNIJ4Vfh8bpFQ9qgGnHK0dE2kvGMel79HU84KtvjOsLYquf osgZSDY09nzfxIaJVbuo91mxY1e/czQdzru8TyktqnOCIM7JSjFzbzOuKYLLqT9lArQVkM qAehPchPF/aAwrXXr+1pyzyl8i7dzLLX4aJBvAWp0BUfRt6qmIsysEMniAVcFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567539; a=rsa-sha256; cv=none; b=G4GXaRX+etSQIpERCfqYT/MGxx/250kKQelPr2a6j1ANTFXyWlZn9bFtUT7tfbLiOJljSU V/84Cqkh4IN/ed7WkeelgQVsJGgq7IbsytP6PW9OXQWMRrdGnrLl0wSUUftAO4ePDF6lXm kMc6u5ttcS9A+jsoPp8D9pnbYPDPWABUxZ0XjdAfooeg49Jjx9dejREIKQtxdIns5j3x5S UQ/kpVx8nc17rKYu8XhgepSCbA7NH+5HC/7K+tg6c318ZgtaWTO9TE3S9jmGm3IQAApb9K gh/XC6uLg9Zqe0y5s00o9Ejip6s119TsBR7UmztukbE2ybkQs1WdLDsGz7ZGew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32V6q9nz18g5; Mon, 29 Jan 2024 22:32: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 40TMWIid013822; Mon, 29 Jan 2024 22:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWIpv013819; Mon, 29 Jan 2024 22:32:18 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:18 GMT Message-Id: <202401292232.40TMWIpv013819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 33d4ce5496ef - main - login.conf(5): Document priority's special value 'inherit' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33d4ce5496efe96bbaa7663e298876395b1db62c Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=33d4ce5496efe96bbaa7663e298876395b1db62c commit 33d4ce5496efe96bbaa7663e298876395b1db62c Author: Olivier Certner AuthorDate: 2023-06-21 08:39:47 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:09 +0000 login.conf(5): Document priority's special value 'inherit' Reviewed by: emaste, yuripv (older version) Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40691 --- lib/libutil/login.conf.5 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index 4a98ee818139..a749fe5519ab 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -262,6 +262,9 @@ so 21 maps to priority 0 in the idle class, 22 to 1, and so on until 52 which maps to 31; see .Xr idprio 1 .Pc . +Special value +.Ql inherit +prevents resetting the priority. .It "requirehome bool false Require a valid home directory to login." .It "setenv list A comma-separated list of environment variables and" values to which they are to be set. From nobody Mon Jan 29 22:32:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32X3bSBz57ZGc; Mon, 29 Jan 2024 22:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TP32X205Qz4gMn; Mon, 29 Jan 2024 22:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sb72/gkZq9SH2YOi9aFfqd98x0YnuHo14bvDLzETu4M=; b=g61Ac/NQ/T0xYVcupPg5ZTSuhX5PtZb/k0Pk8LWn/8HOjhZVFVgmF4UO94QVKFM9qxdScu m4E/VVaYyzFzsvIH1w7CyZLf2iIJg+stm7aT69BhDKkpZ97pyLVtqrkPu5wMrPkcLe4eJ2 qyvYsuOtpweP6C2OuQrpJAvxppTvm/0zDKuN6hQl0bokgGNfeN/mmU1tMVr3tsu/dHNuf7 7QE5MZqo+Dba9JRY1X9xNDCThoeHMZHh1KtowMtrx5ADJ8Z0johuP4BFo3kFhmHpkvfky4 gJZl8k3Lsuk/dtUtS73Eyg0HSGPsD8bgqPlkhQe2xuYFJKXEJTg33qHfxjFWvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sb72/gkZq9SH2YOi9aFfqd98x0YnuHo14bvDLzETu4M=; b=TtueyiFPmUyR+HlmW/tUZ/bUbxBjoGlTVI0U/TiWsCl2UsbT2R3E5q4Te5CAKt4+j169EE XCeF/jkMKLcBZrHePYaeF6PJ3u8GZJQ+Gy7MhmxWUPQ1iz4OQXus6TGzGqqjZk5yI92JJq Rc4yhZYMjLSibatneuccgbgzS+LtXRUJ9fqs9Mfscp+saRALhf7EhGi352QfCJdurxq73A 8ZR1UTyySHswYjTV969sUHa1CwOpAGe0A2nfWGmUg0Im/CoN/0MStR7zjmsrTor8/dCp1I sIO4/FA05e5chH290IN+F0JfyvKcIKA6wSHFXNKOnqbEQY2oVqtkd2UTrZI6bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567540; a=rsa-sha256; cv=none; b=p8IyynItfNVCb+2krKqJoZTui8Dp1RYUFZodf9fklcrYbsgU3SBUCedgWttooX8DcrwATp 4AYKlb23SXVB7KOa5D7ktDh6eL7q1jF1u2jzChYvaHj3jPv9hei6IaTExj9VrRsHbnVbGc noOrhBupKl7wH8XA/YFR4pCXCYN/kGPr6NJhHfjgkFxHyWcZgFiz4DRA4FKCH6wAl7nHY4 hsD1oV5N6awQZx6N1h9Ixyx0PJ5Zio2JEe1+uxwS8ILDzDEmcLcs5XcRQMbFSsbJcQcPtY R+KXAu9bY2U3EVYp28zcN1p/vDf3/0O4aifIHC2TOyplO6XwICBhOvllePgpAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32X15xBz18TG; Mon, 29 Jan 2024 22:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40TMWKHY013873; Mon, 29 Jan 2024 22:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TMWKFD013870; Mon, 29 Jan 2024 22:32:20 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:20 GMT Message-Id: <202401292232.40TMWKFD013870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: f2a0277d3e51 - main - setusercontext(): Set priority from '~/.login_conf' as well List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2a0277d3e51a6a839151eef17f466d0db2b7300 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f2a0277d3e51a6a839151eef17f466d0db2b7300 commit f2a0277d3e51a6a839151eef17f466d0db2b7300 Author: Olivier Certner AuthorDate: 2023-05-30 15:14:50 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:09 +0000 setusercontext(): Set priority from '~/.login_conf' as well Setting the process priority is done only when the current process' effective UID corresponds to that for which context is to be set. Consequently, setting priority is done with appropriate credentials and will fail if the target user tries to raise it unduly via his '~/.login_conf'. PR: 271751 Reviewed by: kib, Andrew Gierth Approved by: emaste (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40352 --- lib/libutil/login_class.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 314ab0999320..5ae0fbfb80b8 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -621,6 +621,8 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in */ if (geteuid() == uid && (lc = login_getuserclass(pwd)) != NULL) { setlogincontext(lc, pwd, flags); + if (flags & LOGIN_SETPRIORITY) + setclasspriority(lc, pwd); login_close(lc); } From nobody Mon Jan 29 22:32:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32Y5YDdz57ZDq; Mon, 29 Jan 2024 22: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 4TP32Y2f4Vz4gF4; Mon, 29 Jan 2024 22: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=1706567541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDmRTzftd+V0MdfjevSEkAnItvRMFAXppTZ8+HmbbOM=; b=YOCIdY9eQ3oUtGAncc09cJji2ALN/cy60RoxJCpKONF9DPGhxot+abbgzxi1veubvhpg7O lvy63a5ehI/y7tdjEOaoNBVTAWxICq6Sh4DogdW/kQi/LTicDJ2Dk4SXpaUiO363YH5rIh R1cIvj+nCLBlkHdcoXV2mFfGQ7//4kQGDMr3qTC9a6gvIHFdoRXzTjlMX8/mELE1b5sped kPGizYuxLN8jj1Hzp6xM37hW3zKy90U3+Y2clTcALl+ZQurvH+wt+ysvOfkFYtP9467dWc artog5XQHQmLpRsJqJs+NXxRaWcRqorTtnbBtg3F+psusi5nje8ZLw7RrVR7cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YDmRTzftd+V0MdfjevSEkAnItvRMFAXppTZ8+HmbbOM=; b=KNkTTbU3xfRk/ToaJi4BC5ivPNFZ6O1CKtneNu+89FnLErKHahG4Mi7wtKaYk4OyfujKH1 Z28rvH2O0ZaBJYI4WwL/fNu/+heqQG3lpuXj5Xq2QTeoweGsxC5P5epg0XF6buBbBpxU18 UWdYOPF2icsuhJg4HCwc4RUBeRt1uaGdO+p01rLyPKpjNV3UO14V32nVUwqrMkQZVKYJsm iPCugdGHDDEG2FczPnXVV4z4X1FeFpgYAhcDQynOtjkYFUxOP6I5fLFkF5vjsOip/GoRXX MlEaRrcEBG2yFiUs45zougrr/YeQ8V8fpw2sCwzdxVKvfoRf7F3Q3d+wUCs71A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567541; a=rsa-sha256; cv=none; b=T2at1lniE3GdwKw+/KHac+ncU61BS4v9q2oZGPDbZdMzQXUQrGE3DF3sTQIQKA6TJq5Ry1 8qmHgC955EqqrS+e4nFmw3xDDdjvFlPMm9k+HcTuioTgfVSPxDSpxJfANsDd8ghRXew6i+ 2U2r786dvLqCDu8KcnCUa3VFlbyyw7uB6PaQ4aoI/UBUmymdRG+VsluJ1ifCehGH6+IpQZ dgvSreN56vNEEjfBtF/nTzE2IltoHnFYZUiBdYJqk46WL5qc6/iOjwOVzbphO5S4VMztTm 8s+dlE+yBEBCs4YUmz6Wm2JwK5Ip5hH+ezrwg0Sd2ycwqqIjIvy3Jw3cgzt77Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32Y1ljpz190b; Mon, 29 Jan 2024 22: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 40TMWLkm013909; Mon, 29 Jan 2024 22: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 40TMWLTK013906; Mon, 29 Jan 2024 22:32:21 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:21 GMT Message-Id: <202401292232.40TMWLTK013906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: e3a396eb2a02 - main - login_cap.h: Remove LOGIN_DEFUMASK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3a396eb2a029e5dc9161469735aa3f7f16845d1 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e3a396eb2a029e5dc9161469735aa3f7f16845d1 commit e3a396eb2a029e5dc9161469735aa3f7f16845d1 Author: Olivier Certner AuthorDate: 2024-01-25 22:10:40 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:10 +0000 login_cap.h: Remove LOGIN_DEFUMASK This public constant has not been used in-tree since 1997 (this was noticed while working on previous commit "setusercontext(): umask: Set it only once (in the common case)"). Since it was an implementation detail and GitHub's code search and Google show no use of this symbol today, simply remove it. PR: 276570 (exp-run) Reviewed by: emaste, kib (earlier version, then part of D40344) Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43608 --- lib/libutil/login_cap.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h index 0037b41d9055..a48246804a47 100644 --- a/lib/libutil/login_cap.h +++ b/lib/libutil/login_cap.h @@ -32,7 +32,6 @@ #define LOGIN_MECLASS "me" #define LOGIN_DEFSTYLE "passwd" #define LOGIN_DEFSERVICE "login" -#define LOGIN_DEFUMASK 022 #define LOGIN_DEFPRI 0 #define _PATH_LOGIN_CONF "/etc/login.conf" #define _FILE_LOGIN_CONF ".login_conf" From nobody Mon Jan 29 22:32:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP32Z67Fbz57Zdw; Mon, 29 Jan 2024 22:32: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 4TP32Z3hTKz4gFH; Mon, 29 Jan 2024 22: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=1706567542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdGGMf3YQtKTiJv0S534/OzjUb2FfHLYScOaEC0ROqw=; b=x79vJaePVjezyKV3T+Y/ZOLovkB4Doqd8c0cn3VwzXyC2ORfh1lyj6AnZJy7O210PEPa1v yOr3NSxp3WY1CAopN3sB1jquC8Z1ZiVekTYUmNN+tIQoehMGh4aDZ7MBWFo0xX8f2e1aAh 1VZfp6m6lqj+g98Uyygx3pEjmKrCC3QDTRt5SfAi0azvgeda4LsZdIGUaGy9ZFVpajU7Aq MEWkvmdaPe8h5QsMwO0o2DskkGMhXG6XGO2rIcNvO6iEi58cwyY1T+q5nfOjN1pHOu3DYP ILfegmtKIVZekHg3VQfyBAq6dVrgEzFq+riymsIqAc5uwM+5Jo6kz4ktLagWgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706567542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GdGGMf3YQtKTiJv0S534/OzjUb2FfHLYScOaEC0ROqw=; b=uGh8sCM1zHDE9JFe2in9uHX4QxosBgasCJ1B7pRMJBeUpWBdWw8aoL/Hh/5TjcJr3SSGgr GGd6/0v6kXQGE1x21ag02juFYVfG/AnqvYWbq7UdbszrEukpkvpM8bw5lpMvFU56o4xBXs RhPwJjr4Rm/KpjjlyQdJH8OlFcquEgpZziav9nGMrK0OdoNUykRIlg/IsFsnr5WxpAM4zc /z5lLmnvY06z+Aq53LBAd4vwmbbN109OsReomsqgxJ2zjdW8Fy2c326GHQQdRBTIvVNB3f /oqobbO8d2xaC/XcOoWTEZHahLmxqR3oa7vREdtQuxtEkr7fYSG7wF0JsZB67w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706567542; a=rsa-sha256; cv=none; b=LRgKH2dbL6te48riYrD3q0Q1XaLd7s+laxNjN22dOc3S9omVCwMx7dMtWtxoz2tCevztd8 9ny5nnrshJWsdfkcEpEe+c5owosNvARlhNF5eV+Vqjg0CGQSaRf85bJDy9/7mNPq7sN+iV SqEApHRpFed8mgE8yPlFxWGKTRSXqBaHfYlPsd1MlfzR19VolpLeyhM4kO8OiOE/yqTqX3 Z1SyVZE/5k4j4P4irYPw15vaK+P+kHR+COs6mORgrmL6SsCwuWh08lOJfDnkAplEDyOE9+ GDc2E2+vgWa8ovglIDQv0C4kTWzJSUAoM7VmD+TBXX1rWjkw8g1/QB4QNBPg0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP32Z2llLz197N; Mon, 29 Jan 2024 22: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 40TMWMO4013945; Mon, 29 Jan 2024 22: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 40TMWMHs013942; Mon, 29 Jan 2024 22:32:22 GMT (envelope-from git) Date: Mon, 29 Jan 2024 22:32:22 GMT Message-Id: <202401292232.40TMWMHs013942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c7e645269f1c - main - login_cap.h: Remove LOGIN_DEFPRI List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7e645269f1c7e9872a7ccf6b72f045c55a66793 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c7e645269f1c7e9872a7ccf6b72f045c55a66793 commit c7e645269f1c7e9872a7ccf6b72f045c55a66793 Author: Olivier Certner AuthorDate: 2024-01-25 22:25:10 +0000 Commit: Olivier Certner CommitDate: 2024-01-29 21:58:10 +0000 login_cap.h: Remove LOGIN_DEFPRI This is an implementation detail which is likely to become irrelevant in the future, as we move to not resetting the priority if the corresponding capability is not present in the configuration file ('/etc/login.conf'). GitHub's code search and Google show no use of this public constant, and it doesn't exist in OpenBSD and NetBSD. So, remove this definition and its sole use in-tree. PR: 276570 (exp-run) Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43609 --- lib/libutil/login_cap.h | 1 - lib/libutil/login_class.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h index a48246804a47..316d6e62d790 100644 --- a/lib/libutil/login_cap.h +++ b/lib/libutil/login_cap.h @@ -32,7 +32,6 @@ #define LOGIN_MECLASS "me" #define LOGIN_DEFSTYLE "passwd" #define LOGIN_DEFSERVICE "login" -#define LOGIN_DEFPRI 0 #define _PATH_LOGIN_CONF "/etc/login.conf" #define _FILE_LOGIN_CONF ".login_conf" #define _PATH_AUTHPROG "/usr/libexec/login_" diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index 5ae0fbfb80b8..916e69065320 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -461,7 +461,7 @@ setlogincontext(login_cap_t *lc, const struct passwd *pwd, unsigned long flags) static void setclasspriority(login_cap_t * const lc, struct passwd const * const pwd) { - const rlim_t def_val = LOGIN_DEFPRI, err_val = INT64_MIN; + const rlim_t def_val = 0, err_val = INT64_MIN; rlim_t p; int rc; From nobody Tue Jan 30 00:00:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP5025Cfbz57k82; Tue, 30 Jan 2024 00:00: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 4TP5024ftMz4thk; Tue, 30 Jan 2024 00:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706572818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P3Mpit1otC9jS2nMUtk6SWd3rF92FpMDN3GeRBwBnDw=; b=TWljPtJtiKErdASm50c4mDjKhUmtg1iteylSySD78hBDjt9PXvEJzmRZ9rG9WTD3nYEw5q royR/BOUOSeOj2137ihVXuJjuZV9oAq2XnUNE+jA4HOdy06I20xWT3C+yCN37AhcEVe+aO XOG9TRZTYiPLG4VrVaSDUKHvlhAlz5xRUIycNK6MyKzkALtBOEq9rZOk2TWDlFU7K9D7vy xaMVjKT+NmmNptlWDEWTQeoVZIGVn5/lPn8HLT8olC6jRFEcV5JO6LMNNQxlsdSQUEJfCk YCr53G7Kmp68Q/a/hEAtCMYZAKAHDOAFqRPYyn214TVNQxaG4hVx/1X16tYayw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706572818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P3Mpit1otC9jS2nMUtk6SWd3rF92FpMDN3GeRBwBnDw=; b=hcooHswc6tWLishMT4nf9wDLZsPr2gseJurRutz6uBvgjAcLfCWVYqK6xW/0FnpaGd2aGe Vt2vbj3R8UOncyBSG4bNawlJaVN58zwOOJYkQmfVD9fk2R3tGZVtdSMJvuYNJDDHA5RFza 0ED+RbX4aBVl5OFpUuH9/+pV1aPbCWExsvRmGwJUIal/Bw/N3Ov2Rk7QDx+QpiyofYXDND z5P8fkl2PGNqVheADz3G6h/ErepGOOPhQDShGynT/g5OD9DFZ39AOeYkWxrMKMyjltAoOr XpLudyGn95A0sD619sD2+l2jY7wbYScbqZv0ScE1oCPAIldJmYRwSsmfNBGonA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706572818; a=rsa-sha256; cv=none; b=RxNmbv0G+VnmjXTCeYZJuFvfCkkJkSkN+F0r4MvDBhjIaEuFZiggEysYS/KrpnANGX+S+R djkNZOISWhF2yROP2005d7a86os53Ypp9zJZw8KusXf44KA2xLE8AQdzRKfTbmZUDH7Zjb 296Wlwm1DkZfjNvb/EoKSdsHtOPEoOI4NmAa4167Yr+3dcjme7Q4jc6XXHXEsan27b37pH yC+HcQebmAEL8gvuL2pRvbYvQrdyVQlfG3lIcPynBJwACsMkgA8HYpik3zfIUjxFKFkwFi VfgT+gxYJ0A9Ynokw5VR0j8MYZMciTjXKPkOe1Ra/OmPFkdquWRwJADoqutM3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP5023lgvz1C5v; Tue, 30 Jan 2024 00:00: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 40U00IAJ058096; Tue, 30 Jan 2024 00:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40U00IGP058093; Tue, 30 Jan 2024 00:00:18 GMT (envelope-from git) Date: Tue, 30 Jan 2024 00:00:18 GMT Message-Id: <202401300000.40U00IGP058093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bea67504c66d - main - style(9): Remove $FreeBSD$ recommendation. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bea67504c66d455ae2a5ebea2677682cdab8e576 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bea67504c66d455ae2a5ebea2677682cdab8e576 commit bea67504c66d455ae2a5ebea2677682cdab8e576 Author: Minsoo Choo AuthorDate: 2024-01-29 23:53:31 +0000 Commit: Warner Losh CommitDate: 2024-01-29 23:59:10 +0000 style(9): Remove $FreeBSD$ recommendation. Now that stable/12 is now EOL, there's no reason to do this. They've been proactively removed from the tree. Reviewed by: imp, lwhsu Differential Revision: https://reviews.freebsd.org/D43641 --- share/man/man9/style.9 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index a87a12e60564..360c48221c4d 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 28, 2022 +.Dd January 29, 2024 .Dt STYLE 9 .Os .Sh NAME @@ -107,12 +107,6 @@ lines should only be added when making substantial changes to the file, not for trivial changes. .Pp After any copyright and license comment, there is a blank line. -Include -.Li $\&FreeBSD$ -or -.Li __FBSDID("$\&FreeBSD$"); -only if you are certain the new code will be merged to stable/12. -The tag will be removed from legacy code in the future. Non-C/C++ source files follow the example above, while C/C++ source files follow the one below. Version control system ID tags should only exist once in a file From nobody Tue Jan 30 00:00:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP5040qSVz57kPP; Tue, 30 Jan 2024 00:00: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 4TP5035fZ6z4tS8; Tue, 30 Jan 2024 00: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=1706572819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=179POSXuczqR9tJDXIN8igBUSb5jsCtJ+3si9PLpfRE=; b=vScr/8uw7QdhD+g/LzYD2fhJSck6EP639NA+ystvIqmQl0LzBTXYtgYiNiS+XcXf9ENDLh XvXE2ZQcjGjP9hLLRFuyk6X4lCDsIJlbB9KIycluRUPVEDwnnIWZWvF1EL/rPeyV8hBKYE 3XkramkAQCSbUo36dDD+AFDhk2pd8cEvlBBaCyNfcAv6C92QmfSlP1mm/BXBc1kPYUzEEJ F1YkHKu8ilxJF70OrNM0MxtHum/aZqvRDVU0DL8B3u88QBh+oJZ9fUGC/30Su8Mk3gQ+CW iE7Lvuz3D3Weo7jwOT0AdrsZSBRej2DzHPHvL5tcGH5go1eEy77uD+nKnYcRuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706572819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=179POSXuczqR9tJDXIN8igBUSb5jsCtJ+3si9PLpfRE=; b=YjQQqMHK59Ke+9o4F+T9fWahPjogS40zWCi3SabfHWMlKc6UMH1I6FABSw+GSfUAahy5cT QLCh2wNruq1OL8jI40L6zb1thsDpry3lV0T9DgZwgwmGsH076JIUmqNtlZikF8eiGG19TP 1rfQQVuhOI4CJdu6auKdsG58lpeVVCESFVT/3t1NzeiMK++gPqMzqQDf6VSAVAFAbVLB7+ HpPU+YvQCKLunEyDTj9dphxpU12hMsaVeEsk2dIQux4Z3cZga1AT5EsFKdnHrqikbLUYoY IV7zRtvF8x19PSVQ8JezujraoZayRKGf7UL8A/b5BtiKHnv248Zci2YVFB1pGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706572819; a=rsa-sha256; cv=none; b=SVYL3QMz7y8nAvlMpnvWxNE5gjqUj5fED5tlW37L/oAcyMcP8Bc/zGgfT1NnqYQFXliQ3/ VxfCa/KLEMiqvYIUqHc62IkZU1p2v4daH0ATSaF8zpgD+uyNAK6tb37+440XUFOZJUFK24 z7VD/18F8oHzcCeY6bOVUQFyiV+7VLGkKorqbQYZaE9v9urjAFT8fzj3LZAfdjhbMtbQvQ A6FK3SlRtS17VVMLrJwosYThUJyL+3s0okrBn08MsM9wqhwGsqGrtgewi/+uNJPzfU3lcm gofYQeHwRhUrltojJRHhyzeKdusE305rTdmcyhooEpKmBpqj+72MqXoP/Kjbzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP5034l9Vz1C9Y; Tue, 30 Jan 2024 00: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 40U00J1p058141; Tue, 30 Jan 2024 00: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 40U00JZ6058138; Tue, 30 Jan 2024 00:00:19 GMT (envelope-from git) Date: Tue, 30 Jan 2024 00:00:19 GMT Message-Id: <202401300000.40U00JZ6058138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a26b96a930da - main - style(9): Note larger divergence than implied List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a26b96a930da44bbc0cc28e5764b9b6a2cf5b352 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a26b96a930da44bbc0cc28e5764b9b6a2cf5b352 commit a26b96a930da44bbc0cc28e5764b9b6a2cf5b352 Author: Warner Losh AuthorDate: 2024-01-29 23:57:19 +0000 Commit: Warner Losh CommitDate: 2024-01-29 23:59:10 +0000 style(9): Note larger divergence than implied Times have changed, and we've diverged somewhat from the original style guide, while still keeping much of the flavor and flair of its spirit as the C language has evolved over the last 30 years since 4.4 was released. Sponsored by: Netflix --- share/man/man9/style.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 360c48221c4d..b111619e8ff6 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -923,11 +923,11 @@ indentation rules. .Xr style.mdoc 5 , .Xr style.lua 9 .Sh HISTORY -This manual page is largely based on the +This manual page was originally based on the .Pa src/admin/style/style file from the .Bx 4.4 Lite2 -release, with occasional updates to reflect the current practice and +release, with frequent updates to reflect the current practice and desire of the .Fx project. From nobody Tue Jan 30 03:29:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TP9d55vQwz5872w; Tue, 30 Jan 2024 03:29: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 4TP9d55Q3sz4HTq; Tue, 30 Jan 2024 03:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706585353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yr3NGWkQ3WlxIQ7jt6LB91dRfkS6SPrKCbx1f92Qt/s=; b=lDq3gDBiUb30tlO2WCVAWI1Q649MoA+VL4zySn/of2v6qJp/aM+M1IK5khn8Nt5Rhn6hT8 ZO+Fkk+8Q8GWOzrxi43jwS/gnBFFfP01flQ/c+RyFVdBn80dUqqyvnUAuiqS2fFK9xSNAM YwGaMq1y7+yRlusZ1arRVyDZRyiQmTmSawdXVjKheCs+C/Vnm7OIlMTLK+36PG5Uwyrlak brY5A4UckBVcU4PcXVPR+WfPS60jgvniUtnG6lsRgFbslOxeI7ojOJdAEGZVmkVyTf57aC wG2vAyClUHGjCaEXHKKySC6B0ti94Wx1YumWCPQfGi0e8re1TqMP7WUzg3Vcgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706585353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yr3NGWkQ3WlxIQ7jt6LB91dRfkS6SPrKCbx1f92Qt/s=; b=w1+SyB/1dVyV/7PsZnkXwT9h6THxPmpp1LqPlwGa+H9seDjDBdeO2bFr8aW6faM4461InU If63gwPs04OGeC9Vu1MiJ2BGOs6amvIlZ5KnRae7zfp1cP4Mu26F35rWOW54n48d8+chZb 6TRjTGj+kB8+4Se87J89Z6qCXrcMj1oF8BqQU+PVEly8LzhHvJMcgvGmdjX4MlvEh/D8ZT lPjWvJ8x/zWLB3Qd1ymdzunmH6QHNrq9d+m6uqIGfqN+Fo5gJvNh3garReC+vWyflql0ok +qb811qeC4GlvZ+hX+Blr6HVNq5IejfGMtmSnE5o8grgrS9lpMa0q7+S11v9Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706585353; a=rsa-sha256; cv=none; b=OmVuk2Bqqsg4lFWl0B0CJ70sj0W9DF85ZCIwhZjX9rPFw/6BdRNuKGmjusNrp24gzLuINc 7oPz8cjwS8Loyfk/RBx5P3g1L6XUnqFMVtKFtYcx9NmE+duaTd/F7L2YABhVSEiYvocniX La1ejMAm62/CjAIE1UCM11B74c0hykHZyjKs/nKKtZ4I6HkodOwJddpj4oR78oOO7gA0pj 5vDqY7j3kmHZt0bABqeCy9qwkjsGoPoxogi2yHWVtXiGUArNpq+9yZy9edF76qlPECYd9H 2jUfcoUBJ2Oyhq+2aeQ7SG0Ys1ZEhGSgacv4bUuEnSJrApLPow7uNuc3pyfzZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TP9d54TjpzJJb; Tue, 30 Jan 2024 03:29: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 40U3TDkc002388; Tue, 30 Jan 2024 03:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40U3TDwK002385; Tue, 30 Jan 2024 03:29:13 GMT (envelope-from git) Date: Tue, 30 Jan 2024 03:29:13 GMT Message-Id: <202401300329.40U3TDwK002385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 73974a78f7f6 - main - hostname(1): Add test cases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d commit 73974a78f7f60acdbb26cdd5325c21c0bb1d2d4d Author: Lin Lee AuthorDate: 2024-01-17 04:30:29 +0000 Commit: Li-Wen Hsu CommitDate: 2024-01-30 03:26:57 +0000 hostname(1): Add test cases Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1069 --- bin/hostname/Makefile | 4 ++ bin/hostname/tests/Makefile | 6 +++ bin/hostname/tests/hostname_test.sh | 87 +++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 + 4 files changed, 99 insertions(+) diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile index 683611b17299..14628b7850d4 100644 --- a/bin/hostname/Makefile +++ b/bin/hostname/Makefile @@ -1,5 +1,9 @@ +.include PACKAGE=runtime PROG= hostname +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/bin/hostname/tests/Makefile b/bin/hostname/tests/Makefile new file mode 100644 index 000000000000..87295101392f --- /dev/null +++ b/bin/hostname/tests/Makefile @@ -0,0 +1,6 @@ +PACKAGE= tests + +ATF_TESTS_SH= hostname_test +BINDIR= ${TESTSDIR} + +.include diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh new file mode 100644 index 000000000000..57517821f7f1 --- /dev/null +++ b/bin/hostname/tests/hostname_test.sh @@ -0,0 +1,87 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Lin Lee +# +# 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. +# + +# +# These tests need to run in a multibyte locale with non-localized +# error messages. +# +export LC_CTYPE=C.UTF-8 +export LC_MESSAGES=C + +test_jail_name="test-hostname-jail" + +test_jail_conf='%%test_jail_name%% { + host.hostname = "test-hostname.example.org"; + path = "/"; + persist; +}' + +init() +{ + echo "${test_jail_conf}" | \ + sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" + jail -f "./jail.conf" -c ${test_jail_name} +} + +recycle() +{ + jail -f "./jail.conf" -r ${test_jail_name} + rm "./jail.conf" +} + +atf_test_case basic cleanup +basic_head() +{ + atf_set require.user root + atf_set "descr" "basic test for getting hostname" +} +basic_body() +{ + init + + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-hostname.example.org" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -s) + atf_check_equal "test-hostname" "${result}" + + result=$(jexec ${test_jail_name} "hostname" -d) + atf_check_equal "example.org" "${result}" + + jexec ${test_jail_name} "hostname" "test-bsd2" + result=$(jexec ${test_jail_name} "hostname") + atf_check_equal "test-bsd2" "${result}" +} +basic_cleanup() +{ + recycle +} + +atf_init_test_cases() +{ + atf_add_test_case basic +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 660883ed848a..2f7d74cb58f8 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -33,6 +33,8 @@ .. expr .. + hostname + .. ln .. ls From nobody Tue Jan 30 06:47:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPG1Q2P7Bz58Rjl; Tue, 30 Jan 2024 06:47: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 4TPG1Q1ST1z4kP5; Tue, 30 Jan 2024 06:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706597226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jHJ3zYJJBvcf8mJpIEiE39IkEOryFqCFvZ4SoEb/ys=; b=gajM+CWBX9aTC4dXzzzKPQMrKHIXZZT8jr+wJbPQtpPqmWubm+OUkbHRz/XQM12BVh6lsY bYQT3e+qvbE+HuWr5XfA19nroQWFBpN6aGb0qbQoQjlY9WNkm5xBXQO/Tfp0BgTZaEp1Ws /tLcl47EmwC46oCjApLw6H6mm7nZnkFHn0xTQxpxJQxLOVNS3Vw3ZDgJANu6nNdKSyDVQt +RURR9OT4PgGb1m6U/fXjpgyHzkiYmIx7Zyr9BXHGhkI5KB6FKGkWmCUZETKG1vAgDiZag bSwTNgaw7U9+ceXUpQZOiynmoBJdVU0Z29KyCIaVwu1xSDnIscAKGLK/GwSOIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706597226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7jHJ3zYJJBvcf8mJpIEiE39IkEOryFqCFvZ4SoEb/ys=; b=L1Cj1hfdkVx8gYWVma6ZrzcGAJmUhN3XeGOVwW7tG94mX2MG06kgyWjFUL3at9SU6AM2bk WekO6sEZDLToGU1+df/l1XIb3bl4prYbcNP99+F2Uw06M5YXHfbu9hXLoJDrO1SP98lI/K fgYGuuSKv3v/kZrGoWboJ+ykDaWVv2De8rRD3VlprxMdRU/hf3mMu8ARSAcb72wUo4+1eA S5fGNLhASREputO+4JYdtm49+1pLJMNdVVEiFoHP5nbe9ZJQ5Q4duVybGoa39GFCEsKt3e mKJg+AInc03Ofocicne+K2AY5kJM/DkZCUWB4A+vRInkiL1Dc/4c/LYDBNZZfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706597226; a=rsa-sha256; cv=none; b=EXocVJcE2td5j34+OyolM2la6+vl7b+c3Hhj9GUDThwo+fgFKkgqPp9MG1Dtkghxe17k/n kCJaXJS51L23U0Gf5n/kp/uz2ZjHnD3gBd1T1kju6TzUqIAcWZ7FsbV8agERv5cjhpYX8A /rjnP/xbd6fC730HiUSqugFW/uMqEE4o7InECFhaDcqb8Mr8Edz4FS/s/pLEviaDWX9MjX 2Uqh69Ar+vATM0RwyrezrCo83r54SpLNtZSsSBB8oqdi8t3mzs18b+TXCUWL79ut2cs9F7 B8TBXdhLDYmU+5uPtXQgLL6qD57lfYBq/JvPilw+9zxCzFUNRHCXiILmNZkcgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPG1Q0PxCzQ1Z; Tue, 30 Jan 2024 06:47: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 40U6l5ex036968; Tue, 30 Jan 2024 06:47:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40U6l5Ub036965; Tue, 30 Jan 2024 06:47:05 GMT (envelope-from git) Date: Tue, 30 Jan 2024 06:47:05 GMT Message-Id: <202401300647.40U6l5Ub036965@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 486b265a8fb6 - main - rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 486b265a8fb6b2aad37f2819fa04feacf8184d53 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=486b265a8fb6b2aad37f2819fa04feacf8184d53 commit 486b265a8fb6b2aad37f2819fa04feacf8184d53 Author: Andriy Gapon AuthorDate: 2024-01-30 06:45:01 +0000 Commit: Andriy Gapon CommitDate: 2024-01-30 06:45:01 +0000 rdmsr_safe/wrmsr_safe: handle pcb_onfault nesting rdmsr_safe and wrmsr_safe can be called while pcb_onfault is already set, so the functions are modified to preserve the handler rather than resetting it before returning. One case where that happens is when AMD microcode update routine is executed on a stack where copyin / copyout was already active. Here is a sample panic message from a crash caused by resetting the handler: <118>Updating CPU Microcode... Fatal trap 12: page fault while in kernel mode cpuid = 3; apic id = 03 fault virtual address = 0x11ed0de6000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80c2df03 stack pointer = 0x28:0xfffffe01ce4a4c70 frame pointer = 0x28:0xfffffe01ce4a4c70 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 117 (logger) trap number = 12 panic: page fault cpuid = 3 time = 1681462027 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff80615deb = db_trace_self_wrapper+0x2b/frame 0xfffffe01ce4a4830 kdb_backtrace() at 0xffffffff80943c77 = kdb_backtrace+0x37/frame 0xfffffe01ce4a48e0 vpanic() at 0xffffffff808f5fe5 = vpanic+0x185/frame 0xfffffe01ce4a4940 panic() at 0xffffffff808f5da3 = panic+0x43/frame 0xfffffe01ce4a49a0 trap_fatal() at 0xffffffff80c31849 = trap_fatal+0x379/frame 0xfffffe01ce4a4a00 trap_pfault() at 0xffffffff80c318b5 = trap_pfault+0x65/frame 0xfffffe01ce4a4a60 trap() at 0xffffffff80c30f5f = trap+0x29f/frame 0xfffffe01ce4a4b80 trap_check() at 0xffffffff80c31c29 = trap_check+0x29/frame 0xfffffe01ce4a4ba0 calltrap() at 0xffffffff80c07fd8 = calltrap+0x8/frame 0xfffffe01ce4a4ba0 --- trap 0xc, rip = 0xffffffff80c2df03, rsp = 0xfffffe01ce4a4c70, rbp = 0xfffffe01ce4a4c70 --- copyout_nosmap_std() at 0xffffffff80c2df03 = copyout_nosmap_std+0x63/frame 0xfffffe01ce4a4c70 uiomove_faultflag() at 0xffffffff8095f0d5 = uiomove_faultflag+0xe5/frame 0xfffffe01ce4a4cb0 uiomove() at 0xffffffff8095efeb = uiomove+0xb/frame 0xfffffe01ce4a4cc0 pipe_read() at 0xffffffff80968860 = pipe_read+0x230/frame 0xfffffe01ce4a4d30 dofileread() at 0xffffffff809653cb = dofileread+0x8b/frame 0xfffffe01ce4a4d80 sys_read() at 0xffffffff80964fa0 = sys_read+0xc0/frame 0xfffffe01ce4a4df0 amd64_syscall() at 0xffffffff80c3221a = amd64_syscall+0x18a/frame 0xfffffe01ce4a4f30 fast_syscall_common() at 0xffffffff80c088eb = fast_syscall_common+0xf8/frame 0xfffffe01ce4a4f30 --- syscall (3, FreeBSD ELF64, read), rip = 0x11ece41cfaa, rsp = 0x11ecbec4908, rbp = 0x11ecbec4920 --- Uptime: 41s And another one: Fatal trap 12: page fault while in kernel mode cpuid = 4; apic id = 04 fault virtual address = 0x800a22000 fault code = supervisor write data, page not present instruction pointer = 0x20:0xffffffff80b2c7ca stack pointer = 0x28:0xfffffe01c55b5480 frame pointer = 0x28:0xfffffe01c55b5480 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, long 1, def32 0, gran 1 processor eflags = interrupt enabled, resume, IOPL = 0 current process = 68418 (pfctl) trap number = 12 panic: page fault cpuid = 4 time = 1625184463 KDB: stack backtrace: db_trace_self_wrapper() at 0xffffffff805c1e8b = db_trace_self_wrapper+0x2b/frame 0xfffffe01c55b5040 kdb_backtrace() at 0xffffffff808874b7 = kdb_backtrace+0x37/frame 0xfffffe01c55b50f0 vpanic() at 0xffffffff808449d8 = vpanic+0x188/frame 0xfffffe01c55b5150 panic() at 0xffffffff808445f3 = panic+0x43/frame 0xfffffe01c55b51b0 trap_fatal() at 0xffffffff80b300a5 = trap_fatal+0x375/frame 0xfffffe01c55b5210 trap_pfault() at 0xffffffff80b30180 = trap_pfault+0x80/frame 0xfffffe01c55b5280 trap() at 0xffffffff80b2f729 = trap+0x289/frame 0xfffffe01c55b5390 trap_check() at 0xffffffff80b304d9 = trap_check+0x29/frame 0xfffffe01c55b53b0 calltrap() at 0xffffffff80b0bb28 = calltrap+0x8/frame 0xfffffe01c55b53b0 --- trap 0xc, rip = 0xffffffff80b2c7ca, rsp = 0xfffffe01c55b5480, rbp = 0xfffffe01c55b5480 --- copyout_nosmap_std() at 0xffffffff80b2c7ca = copyout_nosmap_std+0x15a/frame 0xfffffe01c55b5480 pfioctl() at 0xffffffff85539358 = pfioctl+0x4d28/frame 0xfffffe01c55b5940 devfs_ioctl() at 0xffffffff807176cf = devfs_ioctl+0xcf/frame 0xfffffe01c55b59a0 VOP_IOCTL_APV() at 0xffffffff80bb26e2 = VOP_IOCTL_APV+0x92/frame 0xfffffe01c55b59c0 VOP_IOCTL() at 0xffffffff80928014 = VOP_IOCTL+0x34/frame 0xfffffe01c55b5a10 vn_ioctl() at 0xffffffff80923330 = vn_ioctl+0xc0/frame 0xfffffe01c55b5b00 devfs_ioctl_f() at 0xffffffff80717bbe = devfs_ioctl_f+0x1e/frame 0xfffffe01c55b5b20 fo_ioctl() at 0xffffffff808abc6b = fo_ioctl+0xb/frame 0xfffffe01c55b5b30 kern_ioctl() at 0xffffffff808abc01 = kern_ioctl+0x1d1/frame 0xfffffe01c55b5b80 sys_ioctl() at 0xffffffff808ab982 = sys_ioctl+0x132/frame 0xfffffe01c55b5c50 syscallenter() at 0xffffffff80b30cc9 = syscallenter+0x159/frame 0xfffffe01c55b5ca0 amd64_syscall() at 0xffffffff80b309a5 = amd64_syscall+0x15/frame 0xfffffe01c55b5d30 fast_syscall_common() at 0xffffffff80b0c44e = fast_syscall_common+0xf8/frame 0xfffffe01c55b5d30 PR: 276426 Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43639 --- sys/amd64/amd64/support.S | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 6e541b75cdae..c95696bbe7ef 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -1532,6 +1532,7 @@ ENTRY(rdmsr_safe) /* int rdmsr_safe(u_int msr, uint64_t *data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx rdmsr /* Read MSR pointed by %ecx. Returns @@ -1540,8 +1541,8 @@ ENTRY(rdmsr_safe) movl %eax,%eax /* zero-extend %eax -> %rax */ orq %rdx,%rax movq %rax,(%rsi) - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1553,6 +1554,7 @@ ENTRY(wrmsr_safe) /* int wrmsr_safe(u_int msr, uint64_t data) */ PUSH_FRAME_POINTER movq PCPU(CURPCB),%r8 + movq PCB_ONFAULT(%r8),%r9 movq $msr_onfault,PCB_ONFAULT(%r8) movl %edi,%ecx movl %esi,%eax @@ -1560,8 +1562,8 @@ ENTRY(wrmsr_safe) movl %esi,%edx wrmsr /* Write MSR pointed by %ecx. Accepts hi byte in edx, lo in %eax. */ - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) + xorl %eax,%eax POP_FRAME_POINTER ret @@ -1570,7 +1572,7 @@ ENTRY(wrmsr_safe) */ ALIGN_TEXT msr_onfault: - movq $0,PCB_ONFAULT(%r8) + movq %r9,PCB_ONFAULT(%r8) movl $EFAULT,%eax POP_FRAME_POINTER ret From nobody Tue Jan 30 07:44:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPHHy58bPz58Y69; Tue, 30 Jan 2024 07:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPHHy3Byzz4r9d; Tue, 30 Jan 2024 07:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706600686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/O4V2TF1Mmg0Zw3LDRoDWcIwG811ChnTZPMWBDi4kU=; b=TVvxjdRtNtPtu9MZMYia4kAL+nIZRTCGmSYGoQOM14julsmTvlGaEotnXWcT1akgiBFhF8 BZWyV7y46flD8UFutpuM0cWrEw/Q5HxIJ96hU3t1L7Y99gDQ3sLFxaRftR1Ljf0hGBNoCI fFkKwVO6vg+OK3UDvGjBvObm+XUVtom/B6z4JPHHuqIdj06sKtZ9FnntVAB4WJUabiXaIq 0Ye5s+NQA3fDGj1If8fJUf0fFpCVFDJADFhhhlaQCcYFi132d355mdlx7B18lmOs9v9Pw7 aw2lpKNyH6bft7ujP9XSJLR9UGI50ycXFqNze7EW+Y95zSy52RI2nTUUTBuJFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706600686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g/O4V2TF1Mmg0Zw3LDRoDWcIwG811ChnTZPMWBDi4kU=; b=UHQR6+eArvKlQkeA5A7pDLrUQjYv646CVpd1qX8VBt8fntItzKZkcolyAouw3Z0sJUV1BL eoQbOL/q6kFwgZAOqG7LgCtzQFoNrcvNwZTryTJd7wBNikoADD1JmWNBGGX76GZYJCSivx WJjuYFE5OCIqyjCS6iI4U9XEjUJaCp0gaEdaB8NTkVsWLssQCgPFzBSuLyCJsvAZo1Tv5c pTCvJR5hB01xdCq+F6LU1+SxAy2FJ7U6Gg21+Ho3nlgY9eN//NJ0qPepoo2JG91PjqouWM QNEleaUXtY1V+T7m3hY6BKWs7WdEc2ZOpsbDKDD4M6kP5UEkCGNVfeKj9WO/oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706600686; a=rsa-sha256; cv=none; b=vS/MPT/uL3hVvYKh3yo2+QyU2ksrYIGhE6PUzvShXC00ZcDyMMe3GiDba5zPx/mGBT2aTp lbOQP7Vnd/T+YxPQtXxU6j2YzlzpCKZhJuDeblN7N+9Oeoo8IQDdwQ58AfiYGTGR5yYHhz Hy97f+WjjezmkLwjEUQs4c+d9lFarlhqqoIZ4HssMOcXcBY+3hlrequLFmq37JITeNG9fB i6A6ggichztZqncHFHNxuMkKE+/btvfrMp92Ai/s7+9OtRdVHma8lw7NyVGK9B+jl9nk6A RdwvAfyb541dug1B31EuyeMPCS2WImXPQOCivTaWZgu9U9ttf/b3RvLzYr+EWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPHHy1cJ3zRXt; Tue, 30 Jan 2024 07:44: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 40U7ik90037762; Tue, 30 Jan 2024 07:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40U7ikPM037759; Tue, 30 Jan 2024 07:44:46 GMT (envelope-from git) Date: Tue, 30 Jan 2024 07:44:46 GMT Message-Id: <202401300744.40U7ikPM037759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zsolt Udvari Subject: git: 7aa4e4eb3617 - main - Add uzsolt@ to committers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa4e4eb36171d349c7f3948e16c09ff7540c241 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa4e4eb36171d349c7f3948e16c09ff7540c241 commit 7aa4e4eb36171d349c7f3948e16c09ff7540c241 Author: Zsolt Udvari AuthorDate: 2024-01-27 18:53:51 +0000 Commit: Zsolt Udvari CommitDate: 2024-01-30 07:44:14 +0000 Add uzsolt@ to committers Committer's Guide, steps for new committers, step 5. Approved by: bofh (mentor), diizzy (mentor) Differential Revision: https://reviews.freebsd.org/D43630 --- share/misc/committers-ports.dot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index dd6e3d402166..f13e6d3a7984 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -130,6 +130,7 @@ tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20\n2018/02/23 tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28\n2018/11/06"] tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15\n2011/04/16"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12\n2022/06/06"] +uzsolt [label="Zsolt Udvari\nuzsolt@FreeBSD.org\n2024/01/12"] vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11\n2018/02/23"] wg [label="William Grzybowski\nwg@FreeBSD.org\n2013/04/01\n2022/06/06"] will [label="Will Andrews\nwill@FreeBSD.org\n2000/03/20\n2006/09/01"] @@ -389,6 +390,8 @@ beech -> mva billf -> sobomax billf -> will +bofh -> uzsolt + brooks -> kmoore clement -> tdb @@ -426,6 +429,8 @@ delphij -> rafan demon -> mat +diizzy -> uzsolt + eadler -> ak eadler -> antoine eadler -> dbn From nobody Tue Jan 30 14:31:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPSKJ5swVz58x6G; Tue, 30 Jan 2024 14:31: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 4TPSKJ3Hv8z4mJq; Tue, 30 Jan 2024 14:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsrsyQORDeVEjXB5hbMAGrTc7c3lUs1PdL2t6CRMsck=; b=MZ8FzoSlpQSz2GolYqybRZiXf5AOvEJY0POSM3+iZrq6S715kUSpOX6ivqaUlxyqnH/Nqh jQ6iUnZTNjKitTkoqz2Z3N0ik7P+FprHhG9wlA0USe9WogHs2Zx4gu8zaKcaX2h4UvdEUV UGaACCZJTSEjf4j9915pfqXzRHeZIMZ35iHdlRPAOntG+qigit9YD7Ua5fp+gi7En+a/Xw 5dT4Ze4bzuEdVMoWCIfAIt1zScS0qSmRzmSLiliMEOJxyK3wUWsoo9rCE2/vKDK51Z2xOM SgwqkLXPKXYPPBe52N0HMWeC0qmaly/QKq7qiowckqWaOnzpIUUC/FOXoNljbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsrsyQORDeVEjXB5hbMAGrTc7c3lUs1PdL2t6CRMsck=; b=Z6mmM5Izx8dEFmW+LZbamjaejSNRilIqlse2ymjLA82OyqHugfIItQktJD8F4UwcVzXvp6 xxG1vzobgPv8cisKgmUGmqsugvPp18SfXU08AiBRD+kT/jGCivUUKjv+//EEzpfWiRHflQ zeilUGK80MK7SnvTYzk248Lpn4Jh3c2AOkt9GKj8+z5rO4iwjTodeEhRkLykSfkUftROqF EefzSqVjseb55q3mo5yI0UrY+qcgtKnwZFrNNgFC8LxPA/irQe5vt68XTa1by1bM+apoc3 djcCxvbyOXwudXna1NMx4XOdL8QvNoe+eiz2pOrEWGH9KxMMzg3PbKdzXe1psQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706625092; a=rsa-sha256; cv=none; b=RbJOQWXXqDLqd/YMsUd4YXC+/GtcD+dpbl9Q28NOew99EDNR3V1lyumkwFeObDLAYxpZJT lSJdWcqNHLP0jVBQepE0WeHvZYO9GtNbsgu15/T50YmyuxweZ5+kgx1XJIfWCYA+A0HMi7 8g05yp5ca+5cWqQWvZmn/D6Bju+BOBH9xDTntccNwLbuq0EG9Vort4SXQZDISRvwl9f0+s wGGvShDJMe9MzxbRgrlO587IzWpwj0Drb1kCxchcYWFsFPbYZtGJzWr5n6Gbv3wVEWhLpl XNdvsylNPFXSq2uXZp3rshfiwXaveWlnm53pXWoVHJLnRID+PpxFyH1bLNkjKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPSKJ2NXlzflg; Tue, 30 Jan 2024 14:31: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 40UEVW5M025472; Tue, 30 Jan 2024 14:31:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UEVW1s025468; Tue, 30 Jan 2024 14:31:32 GMT (envelope-from git) Date: Tue, 30 Jan 2024 14:31:32 GMT Message-Id: <202401301431.40UEVW1s025468@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: c961afe82596 - main - scsi_cd: Maintain a periph reference during media checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c961afe82596bdeb7e6a8626f02ddb181c8a24b6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c961afe82596bdeb7e6a8626f02ddb181c8a24b6 commit c961afe82596bdeb7e6a8626f02ddb181c8a24b6 Author: Mark Johnston AuthorDate: 2024-01-30 01:01:12 +0000 Commit: Mark Johnston CommitDate: 2024-01-30 14:24:55 +0000 scsi_cd: Maintain a periph reference during media checks Otherwise nothing prevents the asynchronous media check state machine from running after the periph has been destroyed, which can result in a double free. Acquire the reference even when performing a synchronous check, since that doesn't hurt and keeps things simpler. PR: 276251 Reviewed by: imp Fixes: dd78f43259ef ("scsi_cd: make the media check asynchronous") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43525 --- sys/cam/scsi/scsi_cd.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 350b7f053ffd..6254596e75d3 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -2674,6 +2674,7 @@ cdmediaprobedone(struct cam_periph *periph) softc->flags &= ~CD_FLAG_MEDIA_WAIT; wakeup(&softc->toc); } + cam_periph_release_locked(periph); } /* @@ -2691,31 +2692,29 @@ cdcheckmedia(struct cam_periph *periph, bool do_wait) softc = (struct cd_softc *)periph->softc; error = 0; - if ((do_wait != 0) - && ((softc->flags & CD_FLAG_MEDIA_WAIT) == 0)) { + /* Released by cdmediaprobedone(). */ + error = cam_periph_acquire(periph); + if (error != 0) + return (error); + + if (do_wait) softc->flags |= CD_FLAG_MEDIA_WAIT; - } if ((softc->flags & CD_FLAG_MEDIA_SCAN_ACT) == 0) { softc->state = CD_STATE_MEDIA_PREVENT; softc->flags |= CD_FLAG_MEDIA_SCAN_ACT; xpt_schedule(periph, CAM_PRIORITY_NORMAL); } - - if (do_wait == 0) - goto bailout; + if (!do_wait) + return (0); error = msleep(&softc->toc, cam_periph_mtx(periph), PRIBIO,"cdmedia",0); - if (error != 0) - goto bailout; - /* * Check to see whether we have a valid size from the media. We * may or may not have a valid TOC. */ - if ((softc->flags & CD_FLAG_VALID_MEDIA) == 0) + if (error == 0 && (softc->flags & CD_FLAG_VALID_MEDIA) == 0) error = EINVAL; -bailout: return (error); } From nobody Tue Jan 30 14:31:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPSKK58Nbz58x6L; Tue, 30 Jan 2024 14:31: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 4TPSKK4FPyz4mYC; Tue, 30 Jan 2024 14:31:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG5MRednlhpRmVcNjWhsgwDKw74i00y6E+1HxtY8Y60=; b=CUGPLOYWHCnSH5rPgKD2VhBzkKr7w1Mr7TctkwiAxIV5L3xOnWTZUMOwXK3XVi9SH7n0j9 GPA0CJHfCMl+OfkZ3IwiAwxGrgZP57Iz0Myk7MjC4R6R1Zy11SMAUHjZqIsWdNPhVp61wW 0yaMy4IbycG7JNODfz0xo8Q4SvB3fH7qMd2Yunemj75kZfs+uag82bzBg2EQut7vlXl5YP klNiGeyzFcvSEZOfzl/FZqex8xtig7nIu+fFqFOm2nPnMn08VuR6WtulcfPoEDUFgYGk10 /p82TABrBdUCMyYp914SBzCIa8g1AES/R8KLL2xLKJUzmVW3nzvlCwZ6RwWgSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eG5MRednlhpRmVcNjWhsgwDKw74i00y6E+1HxtY8Y60=; b=K44WTjPZ+dtY9sHuqClrfM9CuHOtV1P8MON46eDfZGF98SmGqvMzqdY9W/luNe5KhxThuH cBxPaOAM820+KZTfsop2D6P8M2OgUpKss54rnHZ/l8UPjXENw2FYDPqJOjvWkeFBdnPHdb 6sNiqSjC96J4dglPrwOenVhSw/pPt64bhB6q10CICh9r9wrQ2eJMHGesZvvQwn+NKehGes IVvUwun292bpXxn82ipFlGkp4zjgZBjFztfU/hSCUgxK6cRf/VY+Hw5ZmaEm45YuuPIMAq y+HPD6hZR3lZigRDbBeBnozEol0OADAWYX1cbXMAA61gF1KAcNc/6ybpHwlauA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706625093; a=rsa-sha256; cv=none; b=F46cq42uPQtPt0aK7yvB0MT6VXmtI5qlpF/lTmf7Vov28RP+7D2EKOKfSTkZ64APKfGzqk 2QSDHh75X2JmSo4HumAp3KAsyFPZHv5Nni0OwE3kfIDSumSSz7N6vWvHv4XW8QbGjSc6gb fmDagV9uJxMimXatI82SePp0KN64FaiYNUUSHURb3q80mt6mCQVEAkfpD1ycy1X/rL7+G9 k+8k5BiBIWPd5kT+Oo2QOrPja81xer3w7BDfBNdKx8Hun839feAoEKpvXqRQ43nLDYCU4w kSnvQr++Jp8Ee7bbkbVqvxIrM+k5oHIXko/4E61AouYQEHHPNX+pl9xJbK87/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 4TPSKK36lQzfWD; Tue, 30 Jan 2024 14:31: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 40UEVXvG025515; Tue, 30 Jan 2024 14:31:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UEVXJE025512; Tue, 30 Jan 2024 14:31:33 GMT (envelope-from git) Date: Tue, 30 Jan 2024 14:31:33 GMT Message-Id: <202401301431.40UEVXJE025512@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: 0c0ec5c8cc48 - main - scsi_cd: Remove commented-out code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c0ec5c8cc482e68e17e2389df4e550f65242985 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c0ec5c8cc482e68e17e2389df4e550f65242985 commit 0c0ec5c8cc482e68e17e2389df4e550f65242985 Author: Mark Johnston AuthorDate: 2024-01-21 15:19:42 +0000 Commit: Mark Johnston CommitDate: 2024-01-30 14:26:03 +0000 scsi_cd: Remove commented-out code This is left over from before the implementation of asynchronous media probing, which was committed in dd78f43259ef ("scsi_cd: make the media check asynchronous") quite a while ago now. No functional change intended. MFC after: 1 week Reviewed by: imp, avg Differential Revision: https://reviews.freebsd.org/D43650 --- sys/cam/scsi/scsi_cd.c | 201 ------------------------------------------------- 1 file changed, 201 deletions(-) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 6254596e75d3..540419d4f153 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -263,9 +263,6 @@ static int cdgetpagesize(int page_num); static void cdprevent(struct cam_periph *periph, int action); static void cdmediaprobedone(struct cam_periph *periph); static int cdcheckmedia(struct cam_periph *periph, bool do_wait); -#if 0 -static int cdsize(struct cam_periph *periph, uint32_t *size); -#endif static int cd6byteworkaround(union ccb *ccb); static int cderror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags); @@ -2719,204 +2716,6 @@ cdcheckmedia(struct cam_periph *periph, bool do_wait) return (error); } -#if 0 -static int -cdcheckmedia(struct cam_periph *periph) -{ - struct cd_softc *softc; - struct ioc_toc_header *toch; - struct cd_toc_single leadout; - uint32_t size, toclen; - int error, num_entries, cdindex; - - softc = (struct cd_softc *)periph->softc; - - cdprevent(periph, PR_PREVENT); - softc->disk->d_sectorsize = 2048; - softc->disk->d_mediasize = 0; - - /* - * Get the disc size and block size. If we can't get it, we don't - * have media, most likely. - */ - if ((error = cdsize(periph, &size)) != 0) { - softc->flags &= ~(CD_FLAG_VALID_MEDIA|CD_FLAG_VALID_TOC); - cdprevent(periph, PR_ALLOW); - return (error); - } else { - softc->flags |= CD_FLAG_SAW_MEDIA | CD_FLAG_VALID_MEDIA; - softc->disk->d_sectorsize = softc->params.blksize; - softc->disk->d_mediasize = - (off_t)softc->params.blksize * softc->params.disksize; - } - - /* - * Now we check the table of contents. This (currently) is only - * used for the CDIOCPLAYTRACKS ioctl. It may be used later to do - * things like present a separate entry in /dev for each track, - * like that acd(4) driver does. - */ - bzero(&softc->toc, sizeof(softc->toc)); - toch = &softc->toc.header; - /* - * We will get errors here for media that doesn't have a table of - * contents. According to the MMC-3 spec: "When a Read TOC/PMA/ATIP - * command is presented for a DDCD/CD-R/RW media, where the first TOC - * has not been recorded (no complete session) and the Format codes - * 0000b, 0001b, or 0010b are specified, this command shall be rejected - * with an INVALID FIELD IN CDB. Devices that are not capable of - * reading an incomplete session on DDC/CD-R/RW media shall report - * CANNOT READ MEDIUM - INCOMPATIBLE FORMAT." - * - * So this isn't fatal if we can't read the table of contents, it - * just means that the user won't be able to issue the play tracks - * ioctl, and likely lots of other stuff won't work either. They - * need to burn the CD before we can do a whole lot with it. So - * we don't print anything here if we get an error back. - */ - error = cdreadtoc(periph, 0, 0, (uint8_t *)toch, sizeof(*toch), - SF_NO_PRINT); - /* - * Errors in reading the table of contents aren't fatal, we just - * won't have a valid table of contents cached. - */ - if (error != 0) { - error = 0; - bzero(&softc->toc, sizeof(softc->toc)); - goto bailout; - } - - if (softc->quirks & CD_Q_BCD_TRACKS) { - toch->starting_track = bcd2bin(toch->starting_track); - toch->ending_track = bcd2bin(toch->ending_track); - } - - /* Number of TOC entries, plus leadout */ - num_entries = (toch->ending_track - toch->starting_track) + 2; - - if (num_entries <= 0) - goto bailout; - - toclen = num_entries * sizeof(struct cd_toc_entry); - - error = cdreadtoc(periph, CD_MSF_FORMAT, toch->starting_track, - (uint8_t *)&softc->toc, toclen + sizeof(*toch), - SF_NO_PRINT); - if (error != 0) { - error = 0; - bzero(&softc->toc, sizeof(softc->toc)); - goto bailout; - } - - if (softc->quirks & CD_Q_BCD_TRACKS) { - toch->starting_track = bcd2bin(toch->starting_track); - toch->ending_track = bcd2bin(toch->ending_track); - } - /* - * XXX KDM is this necessary? Probably only if the drive doesn't - * return leadout information with the table of contents. - */ - cdindex = toch->starting_track + num_entries -1; - if (cdindex == toch->ending_track + 1) { - error = cdreadtoc(periph, CD_MSF_FORMAT, LEADOUT, - (uint8_t *)&leadout, sizeof(leadout), - SF_NO_PRINT); - if (error != 0) { - error = 0; - goto bailout; - } - softc->toc.entries[cdindex - toch->starting_track] = - leadout.entry; - } - if (softc->quirks & CD_Q_BCD_TRACKS) { - for (cdindex = 0; cdindex < num_entries - 1; cdindex++) { - softc->toc.entries[cdindex].track = - bcd2bin(softc->toc.entries[cdindex].track); - } - } - - softc->flags |= CD_FLAG_VALID_TOC; - - /* If the first track is audio, correct sector size. */ - if ((softc->toc.entries[0].control & 4) == 0) { - softc->disk->d_sectorsize = softc->params.blksize = 2352; - softc->disk->d_mediasize = - (off_t)softc->params.blksize * softc->params.disksize; - } - -bailout: - - /* - * We unconditionally (re)set the blocksize each time the - * CD device is opened. This is because the CD can change, - * and therefore the blocksize might change. - * XXX problems here if some slice or partition is still - * open with the old size? - */ - if ((softc->disk->d_devstat->flags & DEVSTAT_BS_UNAVAILABLE) != 0) - softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; - softc->disk->d_devstat->block_size = softc->params.blksize; - - return (error); -} - -static int -cdsize(struct cam_periph *periph, uint32_t *size) -{ - struct cd_softc *softc; - union ccb *ccb; - struct scsi_read_capacity_data *rcap_buf; - int error; - - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdsize\n")); - - softc = (struct cd_softc *)periph->softc; - - ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); - - /* XXX Should be M_WAITOK */ - rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), - M_SCSICD, M_NOWAIT | M_ZERO); - if (rcap_buf == NULL) - return (ENOMEM); - - scsi_read_capacity(&ccb->csio, - /*retries*/ cd_retry_count, - /*cbfcnp*/NULL, - MSG_SIMPLE_Q_TAG, - rcap_buf, - SSD_FULL_SIZE, - /* timeout */20000); - - error = cdrunccb(ccb, cderror, /*cam_flags*/CAM_RETRY_SELTO, - /*sense_flags*/SF_RETRY_UA|SF_NO_PRINT); - - xpt_release_ccb(ccb); - - softc->params.disksize = scsi_4btoul(rcap_buf->addr) + 1; - softc->params.blksize = scsi_4btoul(rcap_buf->length); - /* Make sure we got at least some block size. */ - if (error == 0 && softc->params.blksize == 0) - error = EIO; - /* - * SCSI-3 mandates that the reported blocksize shall be 2048. - * Older drives sometimes report funny values, trim it down to - * 2048, or other parts of the kernel will get confused. - * - * XXX we leave drives alone that might report 512 bytes, as - * well as drives reporting more weird sizes like perhaps 4K. - */ - if (softc->params.blksize > 2048 && softc->params.blksize <= 2352) - softc->params.blksize = 2048; - - free(rcap_buf, M_SCSICD); - *size = softc->params.disksize; - - return (error); - -} -#endif - static int cd6byteworkaround(union ccb *ccb) { From nobody Tue Jan 30 15:14:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPTHR2YB6z591Ph; Tue, 30 Jan 2024 15:14: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 4TPTHR1sbGz3ww8; Tue, 30 Jan 2024 15:14:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706627699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1yEPx3NX18F1CfGbU0SST82zsDYzxFpLEsdN2safi0=; b=dyKdb01T+ibgWwh0C/sw+Kks013bic21kz/UrrlFIMPd7B1EQkkq7A5d1A1b4zZzYIaZE0 bhDgkFZS10J2Hdfr7P4U0AtyUvzg8NhdQLhgIeWEKkqhRkVvwOE9UuLOT2XNfBmRJwXUck RdCZrgySQX/XwoxGJY7dnIL2EZC20pbtAd7Hq86nYCF1LhXuR/8TVa4Zu0I6OF53nkRk7o CUCWY5l94Eim8kftpTABJoigcDO/pFAj9SnwzY3pzwsZz9xc6LHDi6H4eUY/+ZSdgxh+y5 ptynPwkjlGlt6JH8n37BClPlayVn/8xWppC9fFrl0K4gkZ1jaNqk5pj0qAP4IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706627699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1yEPx3NX18F1CfGbU0SST82zsDYzxFpLEsdN2safi0=; b=XZBcou2pG0hBzuwaim6FePaES7Kx99pmaRd58pVEGCPZNym/scAuto8wc4ymZS9MGDpQhK pK/4x0hJUTPq8hiES1DLav98DVzvVULD0JILhWNoJebkYMdEEDCr3k7dhpMkjQRCMfU00C wp69H8UHDDYeT3pRJ5GLu9a5wi0gyTSqg37PLbv33ZGMJhnMktEvnGV+pS7u3d8pPWn8/f VWQauWObY7M5Sn7P8ptbWPtFtw2ipxbyRYpzU1iBNJmk/NVM8LI6a7kQCQkjLKaEszMhmU 79R94X7EV+SfhIf6d/cSy/p4K6xzqMJIttey2ZYivrtTMHTVPFwenfvqQHUS8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706627699; a=rsa-sha256; cv=none; b=BnZGFjsxz2+JnA7jcHhlK0uKa0HEy1FnehvQCCyd5xrdkS9F+69O2ra1dQPHoJtFvraq5/ 1DYNXDJM8i1fcAEVa925lMyEHj5XKPUxp7h3QZOWoICKlUkmAI64UYt1DzhE0/YiyWO1kQ 9mOPHQquXhLRZ3Cv3qJbFJwp3RiJpS7EbOsqPM57S7A6qOFfuUcKXo2pItUOay501t0Yn8 YC86if09Y3D7883FcvzZPor0rU7G7WyW1vqgVKthFoR8JcjDiZYpuNV/E3KQth+ZaammHT MxbF3mCdzevE1xfOyTaZRJUpeFZiroykM+5dUImsDnGDTE75a5wMwGulXyqlig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPTHR0wpGzgxw; Tue, 30 Jan 2024 15:14: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 40UFExq5096824; Tue, 30 Jan 2024 15:14:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UFExYg096821; Tue, 30 Jan 2024 15:14:59 GMT (envelope-from git) Date: Tue, 30 Jan 2024 15:14:59 GMT Message-Id: <202401301514.40UFExYg096821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 6c892b79de59 - main - snd_hdspe(4): Per device sysctl for sample rate. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c892b79de590443a180269507f61f3d8a9ec879 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=6c892b79de590443a180269507f61f3d8a9ec879 commit 6c892b79de590443a180269507f61f3d8a9ec879 Author: Florian Walpen AuthorDate: 2024-01-30 15:07:57 +0000 Commit: Ruslan Bukin CommitDate: 2024-01-30 15:07:57 +0000 snd_hdspe(4): Per device sysctl for sample rate. Some hardware setups require a specific sample rate due to devices being connected to digital ports (AES, S/PDIF, ADAT). Add a per device sysctl "sample_rate" to let the user override sample rate requests from the pcm infrastructure, when needed. Differential Revision: https://reviews.freebsd.org/D43659 --- share/man/man4/snd_hdspe.4 | 6 +++++- sys/dev/sound/pci/hdspe-pcm.c | 3 +++ sys/dev/sound/pci/hdspe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ sys/dev/sound/pci/hdspe.h | 1 + 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 index d4ddc70f4070..7d8cc2adc1af 100644 --- a/share/man/man4/snd_hdspe.4 +++ b/share/man/man4/snd_hdspe.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 19, 2024 +.Dd January 29, 2024 .Dt SND_HDSPE 4 .Os .Sh NAME @@ -76,6 +76,10 @@ To adjust the following sysctl identifiers for a specific sound card, insert the respective device number in place of .Ql 0 . .Bl -tag -width indent +.It Va dev.hdspe.0.sample_rate +Set a fixed sample rate from 32000, 44100, 48000, up to 192000. +This is usually required for digital connections (AES, S/PDIF, ADAT). +The default value of 0 adjusts the sample rate according to pcm device settings. .It Va dev.hdspe.0.period The number of samples processed per interrupt, from 32, 64, 128, up to 4096. Setting a lower value here results in less latency, but increases system load diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index f6c7c84e026e..cf764f19a933 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -814,6 +814,9 @@ hdspechan_setspeed(kobj_t obj, void *data, uint32_t speed) if (hdspe_running(sc) == 1) goto end; + if (sc->force_speed > 0) + speed = sc->force_speed; + /* First look for equal frequency. */ for (i = 0; rate_map[i].speed != 0; i++) { if (rate_map[i].speed == speed) diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index b1ca67bdc313..1d1068c9f8fe 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -228,6 +228,41 @@ hdspe_map_dmabuf(struct sc_info *sc) } } +static int +hdspe_sysctl_sample_rate(SYSCTL_HANDLER_ARGS) +{ + struct sc_info *sc = oidp->oid_arg1; + int error; + unsigned int speed, multiplier; + + speed = sc->force_speed; + + /* Process sysctl (unsigned) integer request. */ + error = sysctl_handle_int(oidp, &speed, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + + /* Speed from 32000 to 192000, 0 falls back to pcm speed setting. */ + sc->force_speed = 0; + if (speed > 0) { + multiplier = 1; + if (speed > (96000 + 128000) / 2) + multiplier = 4; + else if (speed > (48000 + 64000) / 2) + multiplier = 2; + + if (speed < ((32000 + 44100) / 2) * multiplier) + sc->force_speed = 32000 * multiplier; + else if (speed < ((44100 + 48000) / 2) * multiplier) + sc->force_speed = 44100 * multiplier; + else + sc->force_speed = 48000 * multiplier; + } + + return (0); +} + + static int hdspe_sysctl_period(SYSCTL_HANDLER_ARGS) { @@ -455,6 +490,7 @@ hdspe_init(struct sc_info *sc) /* Set rate. */ sc->speed = HDSPE_SPEED_DEFAULT; + sc->force_speed = 0; sc->ctrl_register &= ~HDSPE_FREQ_MASK; sc->ctrl_register |= HDSPE_FREQ_MASK_DEFAULT; hdspe_write_4(sc, HDSPE_CONTROL_REG, sc->ctrl_register); @@ -562,6 +598,12 @@ hdspe_attach(device_t dev) sc, 0, hdspe_sysctl_period, "A", "Force period of samples per interrupt (32, 64, ... 4096)"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "sample_rate", CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, + sc, 0, hdspe_sysctl_sample_rate, "A", + "Force sample rate (32000, 44100, 48000, ... 192000)"); + return (bus_generic_attach(dev)); } diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index 81116e0cd437..26694f60ce58 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -228,6 +228,7 @@ struct sc_info { uint32_t period; uint32_t speed; uint32_t force_period; + uint32_t force_speed; }; #define hdspe_read_1(sc, regno) \ From nobody Tue Jan 30 17:10:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPWrj0hKXz59C5R; Tue, 30 Jan 2024 17:10: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 4TPWrh6pMvz4DZ0; Tue, 30 Jan 2024 17:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706634629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGZ/73TrLrilb0Uuzb/TUGFmTfrKZ0iaD0azgofIRMY=; b=DAccR8bLywZTzPqoidbOzvryKAR87hboRSQU3VRDCthcPikaeNTQaVgAsvndDkK2JuIYso cPjn1Iwf98hsOOFeCBOMBNBjr0M4Zm1jt2c150k6qzKTAM8lI254LfdmAUyFBQhs6lDOnn DXTi2jB0cNQibaZwj3t99ccRwjy9rDBNk2gCCyMC0Am/GihtJU7Q0oZyzGWfSg/trRlBhr x/nmG0PCec4bLVz9QBqEvgGnBCEyxjLhVY2Eu+dpPDjMLPdXYZG25m6bIzFs/gs5hwyNAG Canzfft0XdoqFqyZHVPOSVCadHqFLwIYuCU6URWRnNm/JJMjwcxxb4qT6mQnTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706634629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WGZ/73TrLrilb0Uuzb/TUGFmTfrKZ0iaD0azgofIRMY=; b=YlmhrrJZdmEzlZgj7tjAuk91g5Fmh9SVxhKAKXVopfctqg0p4ERFZrxb8OMqDGf4pBOh+R NqQ0zNCPBPccoZQiik5EgwlJqeW6U0QhOjSurSSZuNapKJCj7Y25ht6ELmOtQHiwRKAMU/ e1Rtr4iMJlK1LRE60EPA1iP2aU9QUy0HR3AEF5h4s1OvwVdLIOC9NOOQSCkMRgVcWnlSgj rIGF6Ht/B0RaPYP1Q7aFcC6S0klscdScLslQTkL6lhgZc6ffWWCyBDdweCdDAD8hNM/1cO 4PVaz3XOwyUqAedaAUCTDc0vnydwudY8wEGgJW5LX13KMrmTB7RDn/Q3k0IhbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706634629; a=rsa-sha256; cv=none; b=Cca/yzReDNSjKhiSqeStu/X49eKCHxIBWv26aYMuVo9yaCxVve7GOHBp7IEn5Nmv0E/WZu +da/RU7UPhmi0R+68iOigpF7drfa8EQtzn7H6N3mp2dzU8r1uKq6I36oFTCFRqFstkzSY3 Ag7XhHeTzKkVYVYouNocv70ifkFHzvtQUlRCUZswrcPlsMX/ryFWA+ycnYhtp9NmsxAx2X uGvfCQHV8AOTRzGsItwSPLKO+FcN44o1Mu/bRinQ+J8J1DIxoptuxYvx37Xcg+sRReVpdD XonhnFMWBl4UYX1Qz+WvN0e/c9YNjYhdl5V6csUsv7KcSWCVjHEwKXsshTuS7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPWrh5lg1zkTf; Tue, 30 Jan 2024 17:10: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 40UHASS0091257; Tue, 30 Jan 2024 17:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UHASqJ091254; Tue, 30 Jan 2024 17:10:28 GMT (envelope-from git) Date: Tue, 30 Jan 2024 17:10:28 GMT Message-Id: <202401301710.40UHASqJ091254@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: fae467c2212c - main - chflags(1): Fix -f option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae467c2212ced8e82f5fa385d316445c8874941 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fae467c2212ced8e82f5fa385d316445c8874941 commit fae467c2212ced8e82f5fa385d316445c8874941 Author: Ricardo Branco AuthorDate: 2024-01-29 22:17:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 17:08:03 +0000 chflags(1): Fix -f option As stated in the man page, -f must not emit warning on error, and must not set the utility exit code. PR: 276723 Github PR: https://github.com/freebsd/freebsd-src/pull/1088 Reviewed by: imp, kib MFC after: 1 week --- bin/chflags/chflags.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index b92d5b6439f5..0972240558df 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -182,9 +182,11 @@ main(int argc, char *argv[]) if (newflags == p->fts_statp->st_flags) continue; if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, - atflag) == -1 && !fflag) { - warn("%s", p->fts_path); - rval = 1; + atflag) == -1) { + if (!fflag) { + warn("%s", p->fts_path); + rval = 1; + } } else if (vflag || siginfo) { (void)printf("%s", p->fts_path); if (vflag > 1 || siginfo) From nobody Tue Jan 30 17:22:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPX6z4gRwz59CyM for ; Tue, 30 Jan 2024 17:22:51 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPX6z1ks7z4JfL for ; Tue, 30 Jan 2024 17:22:51 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-2cf591d22dfso32397781fa.0 for ; Tue, 30 Jan 2024 09:22:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706635369; x=1707240169; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sJCFn75akw4a1jeawI+LAHWwdzPCpZ5L+wMucZUt4IM=; b=sNiRt9Rxyq+YxOydI/wuPL5BXJ4iibmIZEd4Tq4L7dp5Qsy/ZjA87TYbvBeZiKWO/u 5ojafgyUklbMevNH5YaFrWqL70vgr+LVhzxALCiNuIW2WgzsnXWNQmki4LIC7zQolHcj FivhDkwq4K8trDFybsuFxE02g1tb0epzk5XbNuswKiNAh7w14JAnBcfU3OfLf6Jz18Lm AowPHFCaqmG4LVKrhqn4GECXFqX7rPfCk1+tqAv4Rym/3AJbsWeP90BRrKAbaMGAlWG+ fEDjyuZF63XTeHdCI559c3tDnt2O2g5x1jMGau5ZxA2NPicdzjUi1Ixe7wAIsrPkyRw0 sPsA== X-Gm-Message-State: AOJu0YzpgHrygCcfhrec5YOqNrMPt53buvLI+/uxfY0SHtrkOGQ396ok Dl/moWgxro9XWX2SqkZlekohlSVSEzK0FrUmZaE0OEqrMvqOH2mAo/jxYoxqSRA= X-Google-Smtp-Source: AGHT+IFux3oIpaK35HV2m9kA6sLiJNh5ousJqM8y+1YuNi8a/+Mcod9hKmTquythn30AyF0psDPdbw== X-Received: by 2002:a19:f50a:0:b0:50e:a219:e05d with SMTP id j10-20020a19f50a000000b0050ea219e05dmr99077lfb.12.1706635369254; Tue, 30 Jan 2024 09:22:49 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id n16-20020adfe790000000b0033afed6e9desm537504wrm.98.2024.01.30.09.22.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2024 09:22:48 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: fae467c2212c - main - chflags(1): Fix -f option From: Jessica Clarke In-Reply-To: <202401301710.40UHASqJ091254@gitrepo.freebsd.org> Date: Tue, 30 Jan 2024 17:22:38 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5623BA44-006D-4613-81E9-0B2AE22B48DF@freebsd.org> References: <202401301710.40UHASqJ091254@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TPX6z1ks7z4JfL 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:15169, ipnet:209.85.128.0/17, country:US] On 30 Jan 2024, at 17:10, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfae467c2212ced8e82f5fa385d316445= c8874941 >=20 > commit fae467c2212ced8e82f5fa385d316445c8874941 > Author: Ricardo Branco > AuthorDate: 2024-01-29 22:17:47 +0000 > Commit: Konstantin Belousov > CommitDate: 2024-01-30 17:08:03 +0000 >=20 > chflags(1): Fix -f option >=20 > As stated in the man page, -f must not emit warning on error, and = must > not set the utility exit code. But that was already true of the code; this is not what the bug fix is. The problem was that it would print out the filename with -v (and flags change attempted with -vv) as if it succeeded, when it didn=E2=80=99t. But I=E2=80=99m also not entirely convinced this new code is right with = respect to SIGINFO, as it won=E2=80=99t print anything until it reaches a file = that doesn=E2=80=99t cause an error? I=E2=80=99d normally expect SIGINFO to = tell me exactly what it is doing or just did. Jess > PR: 276723 > Github PR: https://github.com/freebsd/freebsd-src/pull/1088 > Reviewed by: imp, kib > MFC after: 1 week > --- > bin/chflags/chflags.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c > index b92d5b6439f5..0972240558df 100644 > --- a/bin/chflags/chflags.c > +++ b/bin/chflags/chflags.c > @@ -182,9 +182,11 @@ main(int argc, char *argv[]) > if (newflags =3D=3D p->fts_statp->st_flags) > continue; > if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, > - atflag) =3D=3D -1 && !fflag) { > - warn("%s", p->fts_path); > - rval =3D 1; > + atflag) =3D=3D -1) { > + if (!fflag) { > + warn("%s", p->fts_path); > + rval =3D 1; > + } > } else if (vflag || siginfo) { > (void)printf("%s", p->fts_path); > if (vflag > 1 || siginfo) From nobody Tue Jan 30 18:12:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPYD90wM6z59J8x; Tue, 30 Jan 2024 18:12:25 +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 4TPYD83mjkz4QBq; Tue, 30 Jan 2024 18:12:24 +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.17.1/8.17.1) with ESMTP id 40UICAM4038414; Tue, 30 Jan 2024 20:12:13 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 40UICAM4038414 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 40UICAY3038413; Tue, 30 Jan 2024 20:12:10 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 30 Jan 2024 20:12:10 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: fae467c2212c - main - chflags(1): Fix -f option Message-ID: References: <202401301710.40UHASqJ091254@gitrepo.freebsd.org> <5623BA44-006D-4613-81E9-0B2AE22B48DF@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5623BA44-006D-4613-81E9-0B2AE22B48DF@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-Rspamd-Queue-Id: 4TPYD83mjkz4QBq 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] On Tue, Jan 30, 2024 at 05:22:38PM +0000, Jessica Clarke wrote: > On 30 Jan 2024, at 17:10, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=fae467c2212ced8e82f5fa385d316445c8874941 > > > > commit fae467c2212ced8e82f5fa385d316445c8874941 > > Author: Ricardo Branco > > AuthorDate: 2024-01-29 22:17:47 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2024-01-30 17:08:03 +0000 > > > > chflags(1): Fix -f option > > > > As stated in the man page, -f must not emit warning on error, and must > > not set the utility exit code. > > But that was already true of the code; this is not what the bug fix is. > The problem was that it would print out the filename with -v (and flags > change attempted with -vv) as if it succeeded, when it didn’t. Right, sorry it slipped. > > But I’m also not entirely convinced this new code is right with respect > to SIGINFO, as it won’t print anything until it reaches a file that > doesn’t cause an error? I’d normally expect SIGINFO to tell me exactly > what it is doing or just did. This should fix siginfo. commit 57658578cf42fc9b6e8906a05b9effcd03a437a1 Author: Konstantin Belousov Date: Tue Jan 30 20:07:59 2024 +0200 chflags(1): obey siginfo request on chflagsat(2) failure Noted by: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 0972240558df..13a327d9426c 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -183,10 +183,12 @@ main(int argc, char *argv[]) continue; if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, atflag) == -1) { - if (!fflag) { + if (!fflag || siginfo) { warn("%s", p->fts_path); - rval = 1; + siginfo = 0; } + if (!fflag) + rval = 1; } else if (vflag || siginfo) { (void)printf("%s", p->fts_path); if (vflag > 1 || siginfo) From nobody Tue Jan 30 18:13:51 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPYG66dSdz59JdG for ; Tue, 30 Jan 2024 18:14:06 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPYG63SLrz4QqK for ; Tue, 30 Jan 2024 18:14:06 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-680b1335af6so580176d6.1 for ; Tue, 30 Jan 2024 10:14:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706638445; x=1707243245; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cek+MWrWZ1WMhYiTawM9ynCGl02K0Il+RuR3K4VGfnU=; b=S5E5N+bZnr+iQPOuAUwYK35ryENrwSyeHYlCHOKGHBh94prcWklSb2EVnzgONqg3HA 1DwxXuDdcOd6fT+GrF4D3HhX3xuNumLEIwxfbZnTgLjyocICOS5raj1tqrxEY5R3HvVI pUlBCeiiATOhCNJ5HIsWmF3AnZ4F4CFDnqULD4vNBrVJqnERMhbsmiadNYEWlPHPE1Tr D9aFwIQpsM8V5bSRGrilmxzlqTiq17483Zn6x6Qs78dTToewzjBIf2oJYhWZcUgMXyiq tlIREAbH14asnupQf8X9ufHFjagRe3ji0x5CiQFd4qKKFghOsfuqiYqBccukZvZ2r/RH BrQw== X-Gm-Message-State: AOJu0YzPEPKNcbjcJhGp9LhvT+wU3SmWAIvIcDFaMYwc1UEZbAnnDh46 uycXKYzIOq5+Qjo1Zg9pqTiCzuwLFkNlTbLvhLAvUt/WvsbGhoqF48wqXg70Aaw= X-Google-Smtp-Source: AGHT+IGzJ7W5Nsme2XeloyD59RCU0zdXpL/DLf1pU2YNUIVXwJV4ddzntdS+rhpl9cvAQ7mpZ/CsOQ== X-Received: by 2002:a0c:f2cf:0:b0:68c:46ee:de71 with SMTP id c15-20020a0cf2cf000000b0068c46eede71mr2574045qvm.1.1706638445205; Tue, 30 Jan 2024 10:14:05 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id mb7-20020a056214550700b0068602f8966esm2827635qvb.111.2024.01.30.10.14.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2024 10:14:04 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: fae467c2212c - main - chflags(1): Fix -f option From: Jessica Clarke In-Reply-To: Date: Tue, 30 Jan 2024 18:13:51 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202401301710.40UHASqJ091254@gitrepo.freebsd.org> <5623BA44-006D-4613-81E9-0B2AE22B48DF@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TPYG63SLrz4QqK 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:15169, ipnet:209.85.128.0/17, country:US] On 30 Jan 2024, at 18:12, Konstantin Belousov = wrote: >=20 > On Tue, Jan 30, 2024 at 05:22:38PM +0000, Jessica Clarke wrote: >> On 30 Jan 2024, at 17:10, Konstantin Belousov = wrote: >>>=20 >>> The branch main has been updated by kib: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dfae467c2212ced8e82f5fa385d316445= c8874941 >>>=20 >>> commit fae467c2212ced8e82f5fa385d316445c8874941 >>> Author: Ricardo Branco >>> AuthorDate: 2024-01-29 22:17:47 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2024-01-30 17:08:03 +0000 >>>=20 >>> chflags(1): Fix -f option >>>=20 >>> As stated in the man page, -f must not emit warning on error, and = must >>> not set the utility exit code. >>=20 >> But that was already true of the code; this is not what the bug fix = is. >> The problem was that it would print out the filename with -v (and = flags >> change attempted with -vv) as if it succeeded, when it didn=E2=80=99t. > Right, sorry it slipped. >=20 >>=20 >> But I=E2=80=99m also not entirely convinced this new code is right = with respect >> to SIGINFO, as it won=E2=80=99t print anything until it reaches a = file that >> doesn=E2=80=99t cause an error? I=E2=80=99d normally expect SIGINFO = to tell me exactly >> what it is doing or just did. >=20 > This should fix siginfo. >=20 > commit 57658578cf42fc9b6e8906a05b9effcd03a437a1 > Author: Konstantin Belousov > Date: Tue Jan 30 20:07:59 2024 +0200 >=20 > chflags(1): obey siginfo request on chflagsat(2) failure >=20 > Noted by: jrtc27 > Sponsored by: The FreeBSD Foundation > MFC after: 1 week >=20 > diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c > index 0972240558df..13a327d9426c 100644 > --- a/bin/chflags/chflags.c > +++ b/bin/chflags/chflags.c > @@ -183,10 +183,12 @@ main(int argc, char *argv[]) > continue; > if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, > atflag) =3D=3D -1) { > - if (!fflag) { > + if (!fflag || siginfo) { > warn("%s", p->fts_path); warn goes to stderr, it really does need to be a separate printf. Jess > - rval =3D 1; > + siginfo =3D 0; > } > + if (!fflag) > + rval =3D 1; > } else if (vflag || siginfo) { > (void)printf("%s", p->fts_path); > if (vflag > 1 || siginfo) From nobody Tue Jan 30 18:38:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPYpc2wHvz59LBB; Tue, 30 Jan 2024 18:38: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 4TPYpc29WHz4T58; Tue, 30 Jan 2024 18:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706639928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpW3clGmYI2qLTpqPRATToV23Hff1B5ZhIgRi3dCF14=; b=AHAxugOa2Cy4J7p0cSapEeI609OcXIdmupHqsevzvrnlMxJ7FtQP7kkKdWNPS4eueAYwn7 3Wy4/yDgrEtR/dFpDRnz9NKxF4BV5H4s70wyC6odDFixM7wmU/RXqjJGLfdXVAs0/EdWJK LvEZdnjjAXNBodkv1SBpsc9RqViLYXE+To43yYtWesL/yQuD+iyE8fspKypl7Z8Lh6Zr// doxxq9oDZVCTnmk/zjRATl5Tg1UaFTpZ1PYYFCZisS0+Tr/rxnxu2caUg/AowXw2F870rL f4w7I+75c9GReuPkSau8wu4mN8Zf4aymXojByZ9PJtOgRhk3Rg+1x6GZ6otCsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706639928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpW3clGmYI2qLTpqPRATToV23Hff1B5ZhIgRi3dCF14=; b=gFF/ISajcTI/iHpB8D3x/as6eiBcMpBXmYUnJ5ZJp27Zf0eCftEninFA0jtxJQR5vvcF2f cp39qIE4yBgON2j4Uq/PeATbgWGmWr4fqsMrry/ertA+BHpTnBQbNv7ffts0aqyVmvO5vp r7UO66eqKIwXczLkSVjptO3uxXG0oBhKGfN1pF/zAwry62ehiynlwakenPC67IbVcGxQ88 +15EU11zPP59yHv0AklfK8NErp/zllQeW9M9Z9GyxnzUSffk5dLlP2J8oEP1iDYEt5Cw5U QdXoRlnoGcNG/4kGu1xzgw/SYkNz5c3Lkd4GGQcHiObZZlhbIrmxxArDQ0Ej/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706639928; a=rsa-sha256; cv=none; b=Om3v1H+QmkSmw/bg97ZenpsF7XxkmCZTAMpYzRKZlbTpJefg77MO6EdcvyN4vxBKlsgpwS Ialrz+r2deXiH8BmjlBv96Scf7ZdJzeluLesONnymRorDudVHCbawkmN3die/3pQhbVivn sTp3VOhxhq8s8KzoN4ChZJDtiq+yAZ7Eyy/UwDAYCb3JGOUOFY1CcByskAEdZJNZdYY+dM GL+tl8r6c6VIL/CMhna174dyAEuPLk7xR6YyQik/PkVVNE5ej7feCanHFnDBx0ImTIaITR fWSjWiIb4ZM8efMBGAZcEOvtRRM8K6JAbW9WLvkNRYz1ftkvx+2E0pqfM9RjpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPYpc1FbVzmyr; Tue, 30 Jan 2024 18:38: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 40UIcm91035829; Tue, 30 Jan 2024 18:38:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UIcmVA035826; Tue, 30 Jan 2024 18:38:48 GMT (envelope-from git) Date: Tue, 30 Jan 2024 18:38:48 GMT Message-Id: <202401301838.40UIcmVA035826@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: f79a8585bb06 - main - sockets: garbage collect SS_ISCONFIRMING List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f79a8585bb06a4fabe0aa2458586dc480693ea0c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f79a8585bb06a4fabe0aa2458586dc480693ea0c commit f79a8585bb06a4fabe0aa2458586dc480693ea0c Author: Gleb Smirnoff AuthorDate: 2024-01-30 18:09:48 +0000 Commit: Gleb Smirnoff CommitDate: 2024-01-30 18:38:33 +0000 sockets: garbage collect SS_ISCONFIRMING Fixes: 8df32b19dee92b5eaa4b488ae78dca6accfcb38e --- sys/compat/linuxkpi/common/include/linux/net.h | 2 +- sys/kern/uipc_debug.c | 4 ---- sys/kern/uipc_socket.c | 15 ++++----------- sys/kern/uipc_syscalls.c | 2 +- sys/netgraph/ng_ksocket.c | 3 +-- sys/netinet/sctp_pcb.c | 1 - sys/netinet/sctputil.c | 1 - sys/rpc/clnt_vc.c | 2 +- sys/sys/socketvar.h | 2 +- 9 files changed, 9 insertions(+), 23 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/net.h b/sys/compat/linuxkpi/common/include/linux/net.h index dc0b46df9c99..a5172f3f31eb 100644 --- a/sys/compat/linuxkpi/common/include/linux/net.h +++ b/sys/compat/linuxkpi/common/include/linux/net.h @@ -56,7 +56,7 @@ sock_getname(struct socket *so, struct sockaddr *sa, int *sockaddr_len, * length. Such notion doesn't even exist in Linux KPI. */ if (peer) { - if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) + if ((so->so_state & SS_ISCONNECTED) == 0) return (-ENOTCONN); error = so->so_proto->pr_peeraddr(so, sa); diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c index 1e699a10223e..83cb7f6dc00a 100644 --- a/sys/kern/uipc_debug.c +++ b/sys/kern/uipc_debug.c @@ -176,10 +176,6 @@ db_print_sostate(short so_state) db_printf("%sSS_ASYNC", comma ? ", " : ""); comma = 1; } - if (so_state & SS_ISCONFIRMING) { - db_printf("%sSS_ISCONFIRMING", comma ? ", " : ""); - comma = 1; - } } static void diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 65230e39e4ae..5e5e7d2cd058 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -792,7 +792,7 @@ solisten_clone(struct socket *head) return (so); } -/* Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED. */ +/* Connstatus may be 0 or SS_ISCONNECTED. */ struct socket * sonewconn(struct socket *head, int connstatus) { @@ -1516,8 +1516,7 @@ sosend_dgram(struct socket *so, struct sockaddr *addr, struct uio *uio, */ if ((so->so_proto->pr_flags & PR_CONNREQUIRED) && (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) { - if ((so->so_state & SS_ISCONFIRMING) == 0 && - !(resid == 0 && clen != 0)) { + if (!(resid == 0 && clen != 0)) { SOCKBUF_UNLOCK(&so->so_snd); error = ENOTCONN; goto out; @@ -1725,8 +1724,7 @@ restart: */ if ((so->so_proto->pr_flags & PR_CONNREQUIRED) && (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) { - if ((so->so_state & SS_ISCONFIRMING) == 0 && - !(resid == 0 && clen != 0)) { + if (!(resid == 0 && clen != 0)) { SOCKBUF_UNLOCK(&so->so_snd); error = ENOTCONN; goto release; @@ -2068,11 +2066,6 @@ soreceive_generic(struct socket *so, struct sockaddr **psa, struct uio *uio, return (soreceive_rcvoob(so, uio, flags)); if (mp != NULL) *mp = NULL; - if ((pr->pr_flags & PR_WANTRCVD) && (so->so_state & SS_ISCONFIRMING) - && uio->uio_resid) { - VNET_SO_ASSERT(so); - pr->pr_rcvd(so, 0); - } error = SOCK_IO_RECV_LOCK(so, SBLOCKWAIT(flags)); if (error) @@ -3862,7 +3855,7 @@ soisconnected(struct socket *so) bool last __diagused; SOCK_LOCK(so); - so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING); + so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING); so->so_state |= SS_ISCONNECTED; if (so->so_qstate == SQ_INCOMP) { diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 366698054bce..dce0ab9b53d4 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1412,7 +1412,7 @@ kern_getpeername(struct thread *td, int fd, struct sockaddr *sa) if (error != 0) return (error); so = fp->f_data; - if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) { + if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; goto done; } diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 98eb19ab485b..388fe9557db3 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -782,8 +782,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Get function */ if (msg->header.cmd == NGM_KSOCKET_GETPEERNAME) { - if ((so->so_state - & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) + if ((so->so_state & SS_ISCONNECTED) == 0) ERROUT(ENOTCONN); func = sopeeraddr; } else diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index a1742b2fffca..1509ac13901e 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4851,7 +4851,6 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre SOCKBUF_LOCK(&so->so_rcv); so->so_state &= ~(SS_ISCONNECTING | SS_ISDISCONNECTING | - SS_ISCONFIRMING | SS_ISCONNECTED); so->so_state |= SS_ISDISCONNECTED; socantrcvmore_locked(so); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 19180b3cf725..b23efd9c8968 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -5654,7 +5654,6 @@ restart_nosblocks: } so->so_state &= ~(SS_ISCONNECTING | SS_ISDISCONNECTING | - SS_ISCONFIRMING | SS_ISCONNECTED); if (error == 0) { if ((inp->sctp_flags & SCTP_PCB_FLAGS_WAS_CONNECTED) == 0) { diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index 69635413637b..8b69117ba2ac 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -153,7 +153,7 @@ clnt_vc_create( ct->ct_upcallrefs = 0; ct->ct_rcvstate = RPCRCVSTATE_NORMAL; - if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) { + if ((so->so_state & SS_ISCONNECTED) == 0) { error = soconnect(so, raddr, curthread); SOCK_LOCK(so); interrupted = 0; diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 5d651b36b1e7..030087cbc17c 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -211,7 +211,7 @@ struct socket { #define SS_ISDISCONNECTING 0x0008 /* in process of disconnecting */ #define SS_NBIO 0x0100 /* non-blocking ops */ #define SS_ASYNC 0x0200 /* async i/o notify */ -#define SS_ISCONFIRMING 0x0400 /* deciding to accept connection req */ +/* was SS_ISCONFIRMING 0x0400 */ #define SS_ISDISCONNECTED 0x2000 /* socket disconnected from peer */ #ifdef _KERNEL From nobody Tue Jan 30 20:17:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPc0j5zwpz59Thh; Tue, 30 Jan 2024 20:17: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 4TPc0j5Sb9z4g6K; Tue, 30 Jan 2024 20:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706645861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/9+UAjKpi4XSiQkF4YMbZn4N8HJIlSEACmaOP1noN4=; b=RR/VGjokt4Kx2kasHIB60t0rJOQFYutzyXe1wT1w3beduyBeeVPVEg0HtRhJ6rYADdR0SR nEfFmsnSz+/6JIorZd6QSftzEYA5r6lQVQsttWNSTz98WRXUfbFuB7HfUPiB1DtAweOOL/ uoZyClLxfKlA8iTZRJL1KVMw8S2fShxC0Z/86KhVryD9JwNG2jlhBBvgVhZg1S8t8UO1CJ 3kKnVs91u1DQkIkMZIaKadYXXwi7HtLHEjwau0rQ7JQjhaZdegUSQiUSbKoUsZfrmm13/L lMR0BUB3oVlxA/MOP2H3cze9+WletBC4kxT1+Rv/A+rawOCBXXuuXki7Gi2+Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706645861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/9+UAjKpi4XSiQkF4YMbZn4N8HJIlSEACmaOP1noN4=; b=jWwSROC4IGi2LPXUUt9YRpr0G1fOiw192YJi5zw28CsmPnM2AOa2sm5ZKw4pYX0yAfKLu+ M2RbMQonlv1D1AB2+/6BymmwF8rftvbgTvHpBkE54/bLEPUIImNGMSIiEn9vMEWnoVIwaO o5r5KfJjQE8KZJ4XjsIH1VQCP9TjNZJLfArRuGEkpG6xeKMmvB2CGMiBmqB33YGoIuzk41 SjNTlKStF6VWaz9/Ry4j5jE0Udmn4smbW/57pckOYKz6/lviKGanmhgHALYHKrE6VBYYYd DNdEtWsQ2RATd49Uhxp8krTcM8f+u7RJ+O9OLA7JUTM6q0gJxIVv8CqQ5DbtpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706645861; a=rsa-sha256; cv=none; b=UtTT+N3QMofLnRats0tPKGdznu0zUEreI9Z2V1wlF8pRSwoFS24CWxLHyh2qNZtVZWvIbD DGAyS6uCFwYN8VLcfjcu0FgYiPGKs677pZEwcI7U4qA0D7pi0eEgv9/38dqx1jH3Q5mX+m nHxGuFTeFIDvvbhbMC7xLzcL8MVYe5XukEOaORjNSv/xczOf6f83LNN4CojVD7jrU6T5HT 045zrosATmh+RgoRsl8S/GQqXEeCes8yAeUk68RsvEeUbkUGV3U0t4sExgtWl1nnHVgnUr RpRfLtMjkQvY9CdkeFYue5itweOprhPWgIoYE1sX1stXJdUfkRMfzUr1FymFHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPc0j4W5wzqCy; Tue, 30 Jan 2024 20:17: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 40UKHfIi003437; Tue, 30 Jan 2024 20:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UKHfcj003434; Tue, 30 Jan 2024 20:17:41 GMT (envelope-from git) Date: Tue, 30 Jan 2024 20:17:41 GMT Message-Id: <202401302017.40UKHfcj003434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 30c741c6e4bb - main - RELNOTES: document powerd enable on RPI images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30c741c6e4bb66a5814c6c3783de9032e86380e6 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=30c741c6e4bb66a5814c6c3783de9032e86380e6 commit 30c741c6e4bb66a5814c6c3783de9032e86380e6 Author: Mike Karels AuthorDate: 2024-01-30 20:16:51 +0000 Commit: Mike Karels CommitDate: 2024-01-30 20:16:51 +0000 RELNOTES: document powerd enable on RPI images Note that powerd(8) is enabled in /etc/rc.conf. --- RELNOTES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELNOTES b/RELNOTES index 69a464d71873..258ac8090928 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,11 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +4347ef60501f: + The powerd(8) utility is now enabled in /etc/rc.conf by default on + images for the arm64 Raspberry Pi's (arm64-aarch64-RPI img files). + This prevents the CPU clock from running slow all the time. + 0b49e504a32d: rc.d/jail now supports the legacy variable jail_${jailname}_zfs_dataset to allow unmaintained jail managers like ezjail to make use of this From nobody Tue Jan 30 20:23:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPc7513LDz59V3G; Tue, 30 Jan 2024 20:23: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 4TPc750RXzz4h3R; Tue, 30 Jan 2024 20:23:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC4pBz9l2wp0NVCpXQl2r/je34yp8mWMXjuLAGBVa7g=; b=uZumvC/ENxPuNC6iI9GbvW5MDQqjb79lq7jUxHuSiUo4rmZrrt/wb+kDKeOtUFZsyXZHg3 BV3OGMrZsMnyQXcPdCp1VFMBZpEJG+QIUncDlMIZVIJvScg0IU5msbWwg7eaZGChgWf1WY PQVxzxZybGmKHzTpty5nvPEj+PjESnfj8biz+xSvjnQ1WV1k/2eX2OXhnZvBtESXjP6Vx3 lPkzTykAc/0t3ASgO/1AOmLbBUybNIfbZTIF5ZG/R161q4Kj3YrIZSzcuMOrDIcQ8zq9G8 uO0bOsQX1obGBeG1ViF50cAtOdWReq+sz4oLgDO3D6oSCAagmHjW1hIVr8bM/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC4pBz9l2wp0NVCpXQl2r/je34yp8mWMXjuLAGBVa7g=; b=OwyyRjNz8f4GL9A3e7Ov8bebC6XNMusRYy/1yYE0DcP/6oTHfyM9bGCKNRxvHrV8WxpY6z 9Gn73MU5VCWSEBBP+aEpISEnTqcqa6sV7838OfHTqHZywVbWxsFgygEJkiQ+P3eA5Q7Xf7 duGaxK5lFSIi17Pv1PdPfmOx0U6fL5WGQI3aD/gTLPjHpQekFoVQvMRb87KsbdYOMpfLku U4SrKCk+Pw+XpJEAH/SrvjpGx1ku4NE2UdEXdG6NtAGt3xIHTUNkS9cTc78g4RoWfsGRJM /uxi8aLQqNZQ/31PqLduRnaNn4AFRLU+AoTZYHtY6piJTQKClaN4LCeLkRv8ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706646193; a=rsa-sha256; cv=none; b=Vv0zHOHUcqvz7YxNa86WXxr+Qnp4fopiR3CsV4XLAag17FeKoor1Au70gp7XfWDj1iQZH0 gETu5IyEposf+y0qTSvcZYB25mr4tJCoTKxCLVrnIrgYvbW8Wq/VGqepVX2U5KQAYTm0a4 FzaJScR+aIRyWTRRHxV0Jql1aADxBVUGqMPoBDIbMaYNhO/pxfjrWRCJ7Iy2wUa7n8hOCL cBAJKOY6hPWZaSDe+KNm5pSv+SGGb+mfmqCrWInyEC66ygo+0ABOh3iCbJEepseuE1L8lp QQgeWQiVJCtk7NHBpoRChT5K5DAoCf4Hgvy8OlOOOFObZDIZcSUElZLFJBvNuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPc746bNnzqfH; Tue, 30 Jan 2024 20:23: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 40UKNCsd020389; Tue, 30 Jan 2024 20:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UKNCv4020386; Tue, 30 Jan 2024 20:23:12 GMT (envelope-from git) Date: Tue, 30 Jan 2024 20:23:12 GMT Message-Id: <202401302023.40UKNCv4020386@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: 2954af09f143 - main - chflags(1): obey siginfo request on chflagsat(2) failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2954af09f143ed1e484f7ca520e0d2611101e248 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2954af09f143ed1e484f7ca520e0d2611101e248 commit 2954af09f143ed1e484f7ca520e0d2611101e248 Author: Konstantin Belousov AuthorDate: 2024-01-30 18:07:59 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 20:21:55 +0000 chflags(1): obey siginfo request on chflagsat(2) failure Note that the error diagnostic can now be printed both to stderr due to the absence of the -f flag and to stdout due to SIGINFO simultaneously. Noted and reviewed by: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- bin/chflags/chflags.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c index 0972240558df..a78ebbfd471d 100644 --- a/bin/chflags/chflags.c +++ b/bin/chflags/chflags.c @@ -61,7 +61,7 @@ main(int argc, char *argv[]) u_long clear, newflags, set; long val; int Hflag, Lflag, Rflag, fflag, hflag, vflag, xflag; - int ch, fts_options, oct, rval; + int ch, e, fts_options, oct, rval; char *flags, *ep; Hflag = Lflag = Rflag = fflag = hflag = vflag = xflag = 0; @@ -183,10 +183,16 @@ main(int argc, char *argv[]) continue; if (chflagsat(AT_FDCWD, p->fts_accpath, newflags, atflag) == -1) { + e = errno; if (!fflag) { - warn("%s", p->fts_path); + warnc(e, "%s", p->fts_path); rval = 1; } + if (siginfo) { + (void)printf("%s: %s\n", p->fts_path, + strerror(e)); + siginfo = 0; + } } else if (vflag || siginfo) { (void)printf("%s", p->fts_path); if (vflag > 1 || siginfo) From nobody Tue Jan 30 20:33:50 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPcML4jV0z59W23; Tue, 30 Jan 2024 20:33: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 4TPcML4C7bz4kCm; Tue, 30 Jan 2024 20:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBpliP+cNWTE5EPh5H5nfigAQfBUUg/+6u+EpPOagok=; b=LiauAWBw3BnPdW5shrjo5zTk3+/2P+PIPzehhppMww62g+q2/0FoD6ejYlCuiKku8yjlKK /DwUnTZG2vd1v/DkhWXjoMaeHAJ6zTB6vWY/14070rIigYABvKJ1DoZ3kWKQ7b0PVGEst4 /+XVsXGmVtt9Po5+9WB8h1zpJTWFKN9Bv9TrETqJv2MyCWeHbtP+EIvrciicH6yZTwHRlq 0XyqTNK4qkqFkoKi4z4glzkJbDdCwcl7zAlTgl28V0sXnSdHYXseRKTEqoJGQ2mWLdUJIT zG9+hzkRGY0htyCZNg+O3wGvW9WZWj5APH0n2R8lu3n0xw1cJFYMXhcorkIy6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706646830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBpliP+cNWTE5EPh5H5nfigAQfBUUg/+6u+EpPOagok=; b=ggt2ExPRb58eH4Q6sUMQpiJIpx5PYgeTE5jkakmgyYPzx8vbj0+PvwByxDExJYBv4b0mSx G7739crMDnarw6PSGuHcJkEmvcsKXIM4EMI+WFlFaMH6n/1c3gBbvs4ST/lQwQfjbrilpB UBSP6lNTILwUdinyWdletfVwsl21dCvdmOYjx7FeTFp0J25VphGtfwsg7YuQ6DiTnyAUyv hUDRQhxdwGkitrLI0GPNOv0u+okUCCXSJ/JCChtj5ic2sOwEfb2zKKPul7uuZaPLtE50oK UvGdTrnvVQo/Z2NKMgycvku/vD15D0lJ2ua9D+lFXVM+Okejz/djBlfiCt81lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706646830; a=rsa-sha256; cv=none; b=trwZAB5EZGXnmVNKBiAXNFD3WHnTNfPN5nk+dDK3TpelXV8H+YDqUhrmh/EZJ1fdZcgORZ bxuRR8u8hNfSreucjqkGa6w7Qf7wvPKsfQWyDPM7J7LZM3CtRGWRanOVaKvdnp19Z3I0vY qncBBx4nD3sCoZfX6suHxRSXEVGzLD+9+ZUirKApwkICdTVDeB0oboKAgiRg1ZIen/uUyv rVLGafkE4y8m6PZoTSKIcUly3P4DdL06580VnfeyQ6GZmY0mijKfTKx1L8BUDp9K6skiTT utFZvQwH0HyWUsWyxXxMzg6aU2DvaWiE2iYcZo3F+teK7M+VHnggqqSEDl8QSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPcML3FS6zqVl; Tue, 30 Jan 2024 20:33: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 40UKXoj3038451; Tue, 30 Jan 2024 20:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UKXouf038448; Tue, 30 Jan 2024 20:33:50 GMT (envelope-from git) Date: Tue, 30 Jan 2024 20:33:50 GMT Message-Id: <202401302033.40UKXouf038448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 722b40377198 - main - riscv: Remove the unused riscv64_cpu driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 722b40377198e384a808f9561ae7262767068ab2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=722b40377198e384a808f9561ae7262767068ab2 commit 722b40377198e384a808f9561ae7262767068ab2 Author: Jessica Clarke AuthorDate: 2024-01-30 20:33:30 +0000 Commit: Jessica Clarke CommitDate: 2024-01-30 20:33:30 +0000 riscv: Remove the unused riscv64_cpu driver This is a repeat of 63bf2d735ca3 ("Remove the unused arm64_cpu driver.") for RISC-V, which copied the defunct code from arm64 with no changes beyond substituting riscv64 for arm64, and made no use of it elsewhere. It has thus always been entirely superfluous. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43672 --- sys/riscv/riscv/mp_machdep.c | 76 -------------------------------------------- 1 file changed, 76 deletions(-) diff --git a/sys/riscv/riscv/mp_machdep.c b/sys/riscv/riscv/mp_machdep.c index be5c50485bf4..0e4d18ce47fb 100644 --- a/sys/riscv/riscv/mp_machdep.c +++ b/sys/riscv/riscv/mp_machdep.c @@ -79,10 +79,6 @@ static enum { #endif } cpu_enum_method; -static device_identify_t riscv64_cpu_identify; -static device_probe_t riscv64_cpu_probe; -static device_attach_t riscv64_cpu_attach; - static void ipi_ast(void *); static void ipi_hardclock(void *); static void ipi_preempt(void *); @@ -95,7 +91,6 @@ extern cpuset_t all_harts; #ifdef INVARIANTS static uint32_t cpu_reg[MAXCPU][2]; #endif -static device_t cpu_list[MAXCPU]; void mpentry(u_long hartid); void init_secondary(uint64_t); @@ -115,77 +110,6 @@ static volatile int aps_ready; /* Temporary variables for init_secondary() */ void *dpcpu[MAXCPU - 1]; -static device_method_t riscv64_cpu_methods[] = { - /* Device interface */ - DEVMETHOD(device_identify, riscv64_cpu_identify), - DEVMETHOD(device_probe, riscv64_cpu_probe), - DEVMETHOD(device_attach, riscv64_cpu_attach), - - DEVMETHOD_END -}; - -static driver_t riscv64_cpu_driver = { - "riscv64_cpu", - riscv64_cpu_methods, - 0 -}; - -DRIVER_MODULE(riscv64_cpu, cpu, riscv64_cpu_driver, 0, 0); - -static void -riscv64_cpu_identify(driver_t *driver, device_t parent) -{ - - if (device_find_child(parent, "riscv64_cpu", -1) != NULL) - return; - if (BUS_ADD_CHILD(parent, 0, "riscv64_cpu", -1) == NULL) - device_printf(parent, "add child failed\n"); -} - -static int -riscv64_cpu_probe(device_t dev) -{ - u_int cpuid; - - cpuid = device_get_unit(dev); - if (cpuid >= MAXCPU || cpuid > mp_maxid) - return (EINVAL); - - device_quiet(dev); - return (0); -} - -static int -riscv64_cpu_attach(device_t dev) -{ - const uint32_t *reg; - size_t reg_size; - u_int cpuid; - int i; - - cpuid = device_get_unit(dev); - - if (cpuid >= MAXCPU || cpuid > mp_maxid) - return (EINVAL); - KASSERT(cpu_list[cpuid] == NULL, ("Already have cpu %u", cpuid)); - - reg = cpu_get_cpuid(dev, ®_size); - if (reg == NULL) - return (EINVAL); - - if (bootverbose) { - device_printf(dev, "register <"); - for (i = 0; i < reg_size; i++) - printf("%s%x", (i == 0) ? "" : " ", reg[i]); - printf(">\n"); - } - - /* Set the device to start it later */ - cpu_list[cpuid] = dev; - - return (0); -} - static void release_aps(void *dummy __unused) { From nobody Tue Jan 30 20:58:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPcwG0MFQz59XXq; Tue, 30 Jan 2024 20:58:54 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPcwF2gvkz4lr6; Tue, 30 Jan 2024 20:58:53 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of antoine.brodin.freebsd@gmail.com designates 209.85.222.43 as permitted sender) smtp.mailfrom=antoine.brodin.freebsd@gmail.com Received: by mail-ua1-f43.google.com with SMTP id a1e0cc1a2514c-7d2e1a0337bso2075637241.3; Tue, 30 Jan 2024 12:58:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706648332; x=1707253132; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CqSFxA8bK5AkMi6wWiPICROzsKnwGZf7gi/Rpo+wECA=; b=wZ/yMIV07UxNi8Dj/b0wb12kmvgicCwFwEzlRY/5P35rVGtNUzLGnW5j8actj8eFK4 PBfH2YDFbg28XavMQIsNRgKRBA3APKa9FcVwAzpd0iKEFAsK4vziWXekouAxx4x+hU85 HFRXPGVgiJcahPS5M1K80tEUolP/OAFxOUBuoAOCz3I0GnkwsVK4KaCGHPzlcGPb/RvW cufNfBaOqBOQrEpjM5meTuzLhsghZDNaemOoFyzGfDOAG/6kuZqCwkG67xBnkfPxB+wv XNhPezJu1c4vJn7nw9BPhX9aH908cijcclRqrrSftJVPck6+I9Jzij63YA/wBe1IlEbh pOfA== X-Gm-Message-State: AOJu0YylyaW9jh7BRaKHUxW9AW5WsqvdUyvqxGACBnT3lDYuheLO71XT 4d7cIUYx350gq3NH30WOX7v0++DmHYK0nKXqwB/R2+Ij05Zlr/WX20VvtvnvvG/12mqLGQ6kCOJ nvbvo/mRRenlmCDR8De60qxqVpZSbqOSI X-Google-Smtp-Source: AGHT+IHDxDdDSv8d0l+gEjNu2waesdjqo16X32AflxUTuzL1BFchZSP3Og66TvoVBgddjtg1Y0XO3P9d2IG/6rLg8pY= X-Received: by 2002:a05:6122:36aa:b0:4b7:53cf:bee1 with SMTP id ec42-20020a05612236aa00b004b753cfbee1mr4980820vkb.3.1706648332054; Tue, 30 Jan 2024 12:58:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202312271004.3BRA4ZoE028123@gitrepo.freebsd.org> In-Reply-To: <202312271004.3BRA4ZoE028123@gitrepo.freebsd.org> From: Antoine Brodin Date: Tue, 30 Jan 2024 20:58:41 +0000 Message-ID: Subject: Re: git: 3334a537ed38 - main - Convert fsidcmp(9) from macro to inline function To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.12 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; NEURAL_HAM_SHORT(-0.22)[-0.222]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ARC_NA(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.222.43:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.222.43:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4TPcwF2gvkz4lr6 On Wed, Dec 27, 2023 at 10:04=E2=80=AFAM Konstantin Belousov wrote: > > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3334a537ed385e487a47208dab= 8f36b25643bcdb > > commit 3334a537ed385e487a47208dab8f36b25643bcdb > Author: Konstantin Belousov > AuthorDate: 2023-12-26 19:39:33 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-12-27 09:50:16 +0000 > > Convert fsidcmp(9) from macro to inline function > > This allows type checking the arguments. > > Explicit structure members comparisions are done to avoid introductin= g > string.h pollution for userspace. > > Reviewed by: markj > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D43205 Hello, I think this should be spelled __inline ( net-mgmt/resource-agents fails with /usr/include/sys/mount.h:54:8: error: unknown type name 'inline' ) Antoine From nobody Tue Jan 30 21:59:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPfG65GZSz57gxH; Tue, 30 Jan 2024 21:59: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 4TPfG64lpZz51Bp; Tue, 30 Jan 2024 21:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706651966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uFAaL6IyiXlNYR+o03BzT05oazPie8iPcWQgeq/d+0s=; b=a2GpiQR2ynHSqqGVqBpv1i6QXMWzWJ3R2X+uQHGFl0FrhKi6EtFy7+GazcAkzUBAh2nxKT 2cHzW+8jF4/YX/+WA4GxGEFcl9yGSA/ccJCmY3n6Qb0kQnK15/+KbdkMdOCDzH9rjQQ6CC KcRp2iOG3nTYb9VYtLRDjyFRFMrCrtr76NdpzVcZyHHSUsIlr1N2E2WAQmojucEcKz/duJ LOCqT/3Fj90rNqSZSqe83Xdk1ld9l6diFc4kqa3whIt2sdx2ATGYn/l0z+WlCasQmxyJvV KIEgdsKB64xwyLtwksT5HnVt5i0xyMPF4g/D6vpVqaV4e3vO6b9UYoEAi6AQ0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706651966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uFAaL6IyiXlNYR+o03BzT05oazPie8iPcWQgeq/d+0s=; b=oNUhspJKf2qizKkmYxkHkeCqofj6eE6wH5u/mukgpX9NDmxd7Zh6ph76aLozAeSiH+0BWn fRbzxBxP9DWPdknUSLH0T7k/NJIUpklBU0emASdAMkDVpkPtcZyYMDPyb0/accFwRba2fR lc0YArfQfJxC5ptjY/Bhc5iDY5EfCxhvgYV6m0m4i8oBmLGNdt8vzduLeDUK5c/KamRe1f fVI0MYIFIq+RMk3hya+W5T3v6I51I+ewTBDtyAd3aireDOIQtDjt+jo8nzjbRm2SNcZvwR X4gtmyPro/tR63t9iIrFLG/BpTuFBgaKWgGGBIBShTJOyiI4UQpYOW8AG2KDsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706651966; a=rsa-sha256; cv=none; b=QJ+CVhUVoMDZPTpoYr87syc/X4HZo1uZpWaDeJblAluJKPab9InqR47HeWV0VuX8vp2/3k bgHLyoDNaIoCCOXKstLNFJMAnNwYZlHhR2snrvZZKRmxFGC0IWLDMiQwanG/rmQfVId8Lh 0sVsSIzzz2ZS1PBpesUo7lHBuM3g1CH2eScNaTUAu8rZDIuBmu3pGKs7NtIY4dUnoCAnKl OIwzX3czDVCWnnR4EZIU1EqA17k+WgtOWC/mTYpxTcAyNefazfTYmZ2YQwDi6E952coWGX bspAY6k4sglH6nwyjz/VDsphQ76+L4mBi4OBOFw9hd8fMP21R4+KnfAdt77RoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPfG63hqTzsrP; Tue, 30 Jan 2024 21:59: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 40ULxQ6i076366; Tue, 30 Jan 2024 21:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ULxQ8S076363; Tue, 30 Jan 2024 21:59:26 GMT (envelope-from git) Date: Tue, 30 Jan 2024 21:59:26 GMT Message-Id: <202401302159.40ULxQ8S076363@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: 9d784da3a7af - main - pf: uncomment counter asserts after mem leak fix List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d784da3a7af9b9b04536c2e97459a7d9f92e364 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9d784da3a7af9b9b04536c2e97459a7d9f92e364 commit 9d784da3a7af9b9b04536c2e97459a7d9f92e364 Author: Igor Ostapenko AuthorDate: 2024-01-30 21:04:57 +0000 Commit: Kristof Provost CommitDate: 2024-01-30 21:58:50 +0000 pf: uncomment counter asserts after mem leak fix Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D43657 --- sys/netpfil/pf/pf_ioctl.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 20e0b902bd60..7f70321ea560 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -6706,13 +6706,8 @@ pf_unload_vnet(void) V_pf_allrulecount--; LIST_REMOVE(V_pf_rulemarker, allrulelist); - /* - * There are known pf rule leaks when running the test suite. - */ -#ifdef notyet MPASS(LIST_EMPTY(&V_pf_allrulelist)); MPASS(V_pf_allrulecount == 0); -#endif PF_RULES_WUNLOCK(); From nobody Tue Jan 30 22:18:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPfhc40xlz57jnc; Tue, 30 Jan 2024 22:18: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 4TPfhc3WTxz52F8; Tue, 30 Jan 2024 22:18:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNHrAkEWPM2aXSePcUQbG3yD2CTa+5iNHTqFuf84cIU=; b=iRqt5XAO5f+fHKYFsJUexGA55DOSXhqFt7tLAL1xBjHobz4F7XKZGIBgh/4JQ7XM34CCBX mswG4A/aNG1I1kGKvvs0ZwPeIEcxh0hULfDX35lmEriSyK/aeHVAEy56sScp9UcDZyU0k0 T4xm1XOd48/A4Lw8wUT95XgPgb24GzBMIk2S2gWOUStoUVwVDCDavpo9zzKTjK/bGOalf3 ZeF8z0Lm0BZWDAUYzLmNzcb7wJ7rRJ+L2drkKDZI2lhf6O0u4QkDSd/goKenI/H+QFmIWU gGGYR+j64xYLcRN8h6RT2fVn+EhD+REql9BlQD/5No8MbRz0L7XQ/yMA3C//6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RNHrAkEWPM2aXSePcUQbG3yD2CTa+5iNHTqFuf84cIU=; b=ap7uaao2phM7KJCEKs9tI2pJj5sLr4Iuh3Hx327aklYhHtSwOiNeyqjaYMfGqgvpOO4cev sCCUEUesdg7i2SbWGTHy3+Pk99PKOyKNxL6qQGsIvoSyxGe9QEXWcvctaBpdCZhFb3VE5b m1HPoMFCQcFYn8xzuyF/zUo1dXIvaNBsxThCLFQY0+0RhNilUaYv/FVwN8KkYEWGf5fFPB l+z9civlpq+PaHAhh4fuX3ng93QIiQgB5H/xRHHKmF134wVMz7VuiZqUMjNre/bwt+k+/y 22+pm1OKx4mLZIFo9GAUTjepMGWNX2hWd/lQeILlauZxYN6tcwDE5N/lcp+9iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706653136; a=rsa-sha256; cv=none; b=MvDI+zOgH5Mo1tzGdCwFnB/gWxaeCfOqtMYOQtFM57GAiwhfkWxox5D6ET5CzntBhWK0tO RG584MkdOu97Rp5eZWt41KKYNEfhcSWf21cw8QnFvzdVoPD90XKLgqSkc9TFx47C1nULIQ IwTjgLW0WTvk0zeBllTB8szhhoijWvzFcp5nJC840qU1YHluzWYbQUOnKIXXQCnZD5/yA3 QAOja4PFOy66RzvraizWXR4bGkOPRi6+8jw6AQXKBTgw8yao84ccpob+LMJb+RUNxvtb97 eO8ztEBnEb4MEU1tWeb8Hjn7rVf6S1N2cNmqmjzVZ4vREN7zR7ZZ1A7/tISQ0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPfhc2bKCzssx; Tue, 30 Jan 2024 22:18: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 40UMIuTq010544; Tue, 30 Jan 2024 22:18:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UMIuIH010541; Tue, 30 Jan 2024 22:18:56 GMT (envelope-from git) Date: Tue, 30 Jan 2024 22:18:56 GMT Message-Id: <202401302218.40UMIuIH010541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ce047ebf4848 - main - etc: Set DISTBASE during distribute for sub-makes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce047ebf484867453508f38fa5336d6614c0f311 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ce047ebf484867453508f38fa5336d6614c0f311 commit ce047ebf484867453508f38fa5336d6614c0f311 Author: Jessica Clarke AuthorDate: 2024-01-30 22:17:28 +0000 Commit: Jessica Clarke CommitDate: 2024-01-30 22:17:28 +0000 etc: Set DISTBASE during distribute for sub-makes This is normally done by bsd.subdir.mk in its default distribute target, but since etc overrides it we don't get that behaviour. Currently it's not needed, but share/man's makedb (recursed into by etc's afterinstall) will need it in the following commit. Technically this is only needed for install, but do this for distribution too for completeness and consistency. Reviewed by: brooks, emaste Differential Revision: https://reviews.freebsd.org/D43675 --- etc/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 097b7e3728bd..745ca91c60bf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -39,8 +39,9 @@ distribute: # Avoid installing tests here; "make distribution" will do this and # correctly place them in the right location. ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ - DESTDIR=${DISTDIR}/${DISTRIBUTION} - ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + DISTBASE=/${DISTRIBUTION} DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution \ + DISTBASE=/${DISTRIBUTION} DESTDIR=${DISTDIR}/${DISTRIBUTION} .include From nobody Tue Jan 30 22:18:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPfhd57j0z57k0K; Tue, 30 Jan 2024 22:18: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 4TPfhd4SdGz52CV; Tue, 30 Jan 2024 22:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQNAvf+AfRLRFSATuNhk1Jq6Y8eAgB+urvvO+9tkAGw=; b=Z2dNAiCcj45/bV+7OFsvpkNl3kvq6rLFc5Pbjv3D4xptqu6fJIiFBiS1if4TN3QuTo0TTs pLTH/lyHtQ/cj1fkOhD1GupfohJh4uVogUJQ/n/24H60rNtqDsbY5JfIUWc03/DU2gHd+1 0+kq2qifF/492RBMgL+wIfdzc789JRcF87ImFPzib5BpcMStnbn7ZwtbSGgY6XgKslZnd+ 8WZhHhWDhbW4nUdfVcGtCIKCkuenkDsjVduaVNzPJViV2bS7JAAw3ZBZKh9mLpOoP+DWLq GZvW7CiDcyzI9qURI0rj/np7WCqShPrYJnEfQO2mGzoputlW03l4QG7pdS+22w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQNAvf+AfRLRFSATuNhk1Jq6Y8eAgB+urvvO+9tkAGw=; b=LBI6yyhthwTZclfq5x2gDkd3e+3mTHyz6utzh0QNV3t47ckGTgO4Ni0E5nwPNYnDSMnH35 oN40UKhKGJ3hsTiM4abGwP7XdzQh9hxELWIJVea+huRa5RQkte+xJt0yamecvD+ogYZaz2 dg6KfiBAcHVXHeZQLkJJaZ+MNG/vZr2fmtcwOnyBJNDrFXxm1djUtyW+d8YBKr2BbgcqE1 BrxIjrV8vZflyYofjnouIUlT23nOubX1n7Y8GQuLIWU+1WXr3xFShtUFTl7kVcHrqVbDdh d6HE1HHtcObTMdHm0KDT1lsfe6pGPIKyzOGbooJlUSOxvBTgcWC2a3v2vbzj+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706653137; a=rsa-sha256; cv=none; b=YZ6yZTUssRl6NtlEY2Od06/74UgFjWLX1bOaVeTadMbxsj1eGrZ7VEmlUif2RQSejqV/JZ TagNG6Cf6G4+sjz0weUP9DLdRwq0eNvEOgp8+EyYYuomGTQZHI7k3nvU70ZX08SRtXlg65 X2Nj90RyIIyAEVCZxM5oLYUvk0VbZMcuUdLX3ch2LSDTsfbgC3DX8HS3pi7CxqvfLTV9XL 1S8oFKhJYIOpqKQJ1w8Tz3yAmiI3xVRMPSdVf3bMQ0c8d9YHb+E8QGN8dmQHzv/l0Cr6Iz rs54gBBeQSn8pbxHt3GYUSYKU15kbs2NhSe1f7Mvd9NnxWX+z5PG2iHPu/8MOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPfhd3YRgztLg; Tue, 30 Jan 2024 22:18: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 40UMIv40010589; Tue, 30 Jan 2024 22:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UMIv2a010586; Tue, 30 Jan 2024 22:18:57 GMT (envelope-from git) Date: Tue, 30 Jan 2024 22:18:57 GMT Message-Id: <202401302218.40UMIv2a010586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 41eb4a4ca299 - main - share/man: Add mandoc.db files to METALOG List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41eb4a4ca299e54225b0c4b76244bf50f691ee62 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=41eb4a4ca299e54225b0c4b76244bf50f691ee62 commit 41eb4a4ca299e54225b0c4b76244bf50f691ee62 Author: Jessica Clarke AuthorDate: 2024-01-30 22:17:34 +0000 Commit: Jessica Clarke CommitDate: 2024-01-30 22:17:34 +0000 share/man: Add mandoc.db files to METALOG Otherwise these are omitted for -DNO_ROOT builds, whether for disk images or dist tarballs. Reviewed by: brooks, emaste Differential Revision: https://reviews.freebsd.org/D43676 --- share/man/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/share/man/Makefile b/share/man/Makefile index 5c194aa8eb96..cf91101a27f0 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -10,8 +10,16 @@ MAKEWHATIS?= makewhatis makedb: .if ${MK_MAN_UTILS} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/man +.if defined(NO_ROOT) && defined(METALOG) + echo ".${DISTBASE}${BINDIR}/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \ + cat -l >> ${METALOG} +.endif .if ${MK_OPENSSL} != "no" ${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man +.if defined(NO_ROOT) && defined(METALOG) + echo ".${DISTBASE}${BINDIR}/openssl/man/mandoc.db type=file mode=0644 uname=root gname=wheel" | \ + cat -l >> ${METALOG} +.endif .endif .endif From nobody Tue Jan 30 22:31:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPfyj2L2Pz57ky4; Tue, 30 Jan 2024 22:31: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 4TPfyj1sjQz53g8; Tue, 30 Jan 2024 22:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UTVBXmjO4naXHOoM178sOI3hfl8mX90RYKCnanMSk2M=; b=D4eVMt25Whgqc5lcbE3KLSZv9TVb6SAmixBuroyW5YRUuIkEV5dW01KUHlhM5A1QnZVTMo /T/y/ocn7s4yju1zip0x7OabgWlO+xvX6y9tgm34YWkmaUSxSIYmEOlnaRriqYmnHhCmzi X4PPERgbSnppHOZ5A7G6XFT63lPOIC2jpDvAeva7W8x6r+XJnHQzJGPy3H0vkv2rN6keGm vGmhs2y5RJlOv+f4h90iE0xqeWgKfgzZ99wxEmQJHjI0GoCKjwbkwul9EaoPOXDanu5X35 kreA5sk/NyfguqvYmmce4exlvAU175ihS6X0Kn5zljVhe8AFR+8HlntV6zexJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706653869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UTVBXmjO4naXHOoM178sOI3hfl8mX90RYKCnanMSk2M=; b=yoqeNrpv2CoAw6RcX9PXRROjz5EBi/6bCyBCHOC6DQTMHiyb5Bjg3xM4ZUG+xVI5KylQIU mZG8pXn1AaXLrNyhgdStsecWPOUJY4G7ni9R3CUog6MoGUCA4XbmVoDzwvXa2rKLtOk/NX Je5qFKF0sSiUgXkKkvveu/ZwacUV1NoxAk0BoNMP5F/DUoDXdDkutrdj1199oDpDx5reFr ynKUGd2RLT0iwUiPxb0owpDa1MZ5zF5Rzeme4Bsg4cpDEMs2xL/6g1OfJHHk0zIDkbGXoD IbtFAHHODVKiRk4hKrJP5fLRhF6gQH5e9bj9AIKE6YsqjZfgPDw5QUZ3jP0LFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706653869; a=rsa-sha256; cv=none; b=Z+2h/n0nufbxIOslQz1ttyWcogqMEnTK82OTJ4XKo2kHVYSIl9H6AZCbpA/49E17sNsBDo qqM9qgRJopPv/cx3gPxVql8Z3Q9QeYCEqvSlMUdgNdFq4sd+m/3sv0ZapBKkEJPM1+90q4 qaaDKXaWO2DjkmY5VhP/uMA1ocLtsZZV1mLMNtNgvrTv+pxdGBOQQ+dwlWREkstYv0Hs4e laSOulzW0KCrG78vRkKOPtGuoFKHOVeXxWGe0tyxyM8eqZHyMX1KSNmdBQJ9d0+QC7VcKA 9+TabcJYGZdZv1jWb8vomRXJ5P+ia7vYZa604eG5UHSFd94+bxddY0aoDL244g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPfyj0wtNzt79; Tue, 30 Jan 2024 22:31: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 40UMV97E036119; Tue, 30 Jan 2024 22:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UMV96t036116; Tue, 30 Jan 2024 22:31:09 GMT (envelope-from git) Date: Tue, 30 Jan 2024 22:31:09 GMT Message-Id: <202401302231.40UMV96t036116@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: f76cb7bd08e0 - main - sys/mount.h: use __inline List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f76cb7bd08e02d868e640b3442b2bc45edf8f56a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f76cb7bd08e02d868e640b3442b2bc45edf8f56a commit f76cb7bd08e02d868e640b3442b2bc45edf8f56a Author: Konstantin Belousov AuthorDate: 2024-01-30 22:14:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-30 22:30:48 +0000 sys/mount.h: use __inline instead of plain inline, for C89 Reported by: antoine Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/sys/mount.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index dd5eaad184f6..529263204bd6 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -51,7 +51,7 @@ typedef struct fsid { int32_t val[2]; } fsid_t; /* filesystem id type */ /* Returns non-zero if fsids are different. */ -static inline int +static __inline int fsidcmp(const fsid_t *a, const fsid_t *b) { return (a->val[0] != b->val[0] || a->val[1] != b->val[1]); From nobody Tue Jan 30 23:27:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPhCS1Scxz57qgZ; Tue, 30 Jan 2024 23:27: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 4TPhCS1F2Tz3wjK; Tue, 30 Jan 2024 23:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706657236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltP33CjZlulK3m6FsVCaLOaVj9IfNEAWCT6CAhf0bdU=; b=fzrrlBO0cZtSTAnFy+yCuDJp5ecCMv60RtOnBT5/gLcHUWAbT7iC4QIVpZ8ZXA9vMD0ent vktL3kbPCDmmMfr1Akf6Za8x5kuOynoiF0otnjfyMshOFmXmu+zYQmUI7jAoxUsovrWqBk mrDzVOHB1cIyMxfnl+dbWk3T4RCpDrDpnjh80oNnhBCltFEvM9C2MK2sKG6fcKExhCxwvU 1Xi6GTg311/BBiITQlljdTMN3oTfppQ1a1QS14QZfod2pnsYy0DavaXAB+a91sttX5pzt2 UV7W7E2TqfpGGmH8UWgaTr3Qlx/Zl020ponJ9CSlXjdo3ARHG8moNy+z4MiaWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706657236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltP33CjZlulK3m6FsVCaLOaVj9IfNEAWCT6CAhf0bdU=; b=wkUHs3XfJ/wBRBnvDxQnsCjrQsDcYvKV337GidZQEsmlrfwp0Xu6v+zwvWFunurkyPsVDG QsX/OMpgVSzivSTkRa5XrwXL4bCA903l8MjW8bsxLMETKyK68cM+dW2duMUtl6gDEN+zvW DFHkZmOSFDAxVDHLBQAjZ4kc7Q4hTOzgSEiuw2teFloI1G1TlcrWgyJtCR1M1onVQ3evQa aBeqsQZeWhh1+2+peimh8ZE9rNFBtaXyJTFq5P4Ovc+HsY4VmmKYsG9TxMcB+8bYDKxALv w1m4ddEoZr5v1hBPke7W8xyd0gjt61NTUp/4eIGaE/U0S6e+pGK8CVY5hWPdqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706657236; a=rsa-sha256; cv=none; b=Sm0Ar6oX62i5trr1/eaGTeDEZobveG9eHfyGWEraDhCeTZl37IgfZAqHt2Ky2c3KNaH9gv oI62wWQeoXQi8/fkerz08YvuT0kSaoMh2aJ19I2Mz16YyzM/Fk/hK8xpMZ2urO/iXEw6Y1 h6zcmoQWZaLZMVOT0Gi8qQlyb3fpHFq8jPc+d7sexxdeJD2wTYPGFIICvjRClD3f6DT/C3 1VgpTYBOD79+st2ar1bkHgmS/aIR3IJeBPA/l/FAl0L0GJCjFZ1A5QKQ9SU1aFdZuMwyG+ MhavU+ktld87pyEnLskQbuQlgmQEoCBs3m9pqh+Y3mV5RAyepbQZ4TVZdDP0FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPhCS0BBSzvMr; Tue, 30 Jan 2024 23:27: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 40UNRFsX028633; Tue, 30 Jan 2024 23:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UNRDXS028628; Tue, 30 Jan 2024 23:27:13 GMT (envelope-from git) Date: Tue, 30 Jan 2024 23:27:13 GMT Message-Id: <202401302327.40UNRDXS028628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: fd45b686f9d9 - main - zfs: merge openzfs/zfs@2e6b3c4d9 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd45b686f9d92f583366c75b22c04c7ee49709c0 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=fd45b686f9d92f583366c75b22c04c7ee49709c0 commit fd45b686f9d92f583366c75b22c04c7ee49709c0 Merge: f76cb7bd08e0 2e6b3c4d9453 Author: Martin Matuska AuthorDate: 2024-01-30 22:52:29 +0000 Commit: Martin Matuska CommitDate: 2024-01-30 23:06:04 +0000 zfs: merge openzfs/zfs@2e6b3c4d9 Notable upstream pull request merges: #15793 401c3563d libzfs: use zfs_strerror() in place of strerror() #15793 692f0daba libzfs: make userquota_propname_decode threadsafe #15798 0cbf13529 libnvpair.c: replace strstr() with strchr() for a single character #15812 78e8c1f84 Remove list_size struct member from list implementation #15816 aeb33776f Update vdev devid and physpath if changed between imports #15818 8161b7327 Don't assert mg_initialized due to device addition race #15823 c3fd7a521 Update man pages to time(1) from time(2) #15825 884a48d99 zpool wait: print timestamp before the header Obtained from: OpenZFS OpenZFS commit: 2e6b3c4d9453360a351af6148386360a3a7209b3 sys/contrib/openzfs/.github/codeql-cpp.yml | 4 + sys/contrib/openzfs/.github/codeql-python.yml | 4 + .../custom-queries/cpp/deprecatedFunctionUsage.ql | 59 +++++++++ .../.github/codeql/custom-queries/cpp/qlpack.yml | 4 + sys/contrib/openzfs/.github/workflows/README.md | 46 ++++--- .../openzfs/.github/workflows/checkstyle.yaml | 4 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 3 +- .../.github/workflows/scripts/generate-summary.sh | 2 +- .../workflows/scripts/setup-dependencies.sh | 35 +++--- .../openzfs/.github/workflows/zfs-linux-tests.yml | 22 ++-- .../openzfs/.github/workflows/zfs-linux.yml | 8 +- sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 6 +- sys/contrib/openzfs/config/Rules.am | 15 --- sys/contrib/openzfs/config/kernel-acl.m4 | 14 +-- sys/contrib/openzfs/config/kernel-automount.m4 | 2 +- sys/contrib/openzfs/config/kernel-bio.m4 | 2 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 56 ++++++++- .../config/kernel-block-device-operations.m4 | 8 +- .../openzfs/config/kernel-commit-metadata.m4 | 2 +- .../openzfs/config/kernel-dentry-operations.m4 | 2 +- sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 2 +- .../openzfs/config/kernel-encode-fh-inode.m4 | 2 +- sys/contrib/openzfs/config/kernel-evict-inode.m4 | 2 +- sys/contrib/openzfs/config/kernel-fallocate.m4 | 2 +- sys/contrib/openzfs/config/kernel-fsync.m4 | 4 +- sys/contrib/openzfs/config/kernel-get-link.m4 | 8 +- sys/contrib/openzfs/config/kernel-idmap_mnt_api.m4 | 25 ++++ sys/contrib/openzfs/config/kernel-inode-create.m4 | 6 +- sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 8 +- sys/contrib/openzfs/config/kernel-inode-lookup.m4 | 2 +- .../openzfs/config/kernel-inode-permission.m4 | 8 +- sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 6 +- .../openzfs/config/kernel-make-request-fn.m4 | 8 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 6 +- sys/contrib/openzfs/config/kernel-mknod.m4 | 4 +- .../openzfs/config/kernel-proc-operations.m4 | 10 +- sys/contrib/openzfs/config/kernel-put-link.m4 | 4 +- sys/contrib/openzfs/config/kernel-rename.m4 | 10 +- sys/contrib/openzfs/config/kernel-show-options.m4 | 2 +- sys/contrib/openzfs/config/kernel-shrink.m4 | 13 +- sys/contrib/openzfs/config/kernel-strlcpy.m4 | 47 +++++++ sys/contrib/openzfs/config/kernel-symlink.m4 | 4 +- sys/contrib/openzfs/config/kernel-timer.m4 | 4 +- sys/contrib/openzfs/config/kernel-tmpfile.m4 | 8 +- sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 8 +- sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 6 +- .../openzfs/config/kernel-vfs-rw-iterate.m4 | 4 +- sys/contrib/openzfs/config/kernel-writepage_t.m4 | 2 +- sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 24 ++-- sys/contrib/openzfs/config/kernel.m4 | 6 + sys/contrib/openzfs/include/libzutil.h | 10 ++ .../openzfs/include/os/freebsd/spl/sys/list_impl.h | 1 - .../openzfs/include/os/linux/spl/sys/cred.h | 55 ++++++++- .../openzfs/include/os/linux/spl/sys/list.h | 4 +- .../openzfs/include/os/linux/spl/sys/string.h | 49 ++++++++ .../openzfs/include/os/linux/spl/sys/types.h | 11 ++ sys/contrib/openzfs/lib/libnvpair/libnvpair.c | 2 +- sys/contrib/openzfs/lib/libshare/nfs.c | 21 ++-- .../openzfs/lib/libspl/include/sys/list_impl.h | 1 - sys/contrib/openzfs/lib/libspl/list.c | 4 +- .../openzfs/lib/libspl/os/freebsd/getmntany.c | 5 +- .../openzfs/lib/libspl/os/linux/getmntany.c | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 9 +- sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 14 ++- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 17 +-- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 5 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 20 +-- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 6 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 2 +- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 12 +- sys/contrib/openzfs/man/man8/zpool-iostat.8 | 2 +- sys/contrib/openzfs/man/man8/zpool-list.8 | 2 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 2 +- sys/contrib/openzfs/man/man8/zpool-wait.8 | 2 +- sys/contrib/openzfs/module/os/freebsd/spl/list.c | 4 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 1 + .../openzfs/module/os/linux/spl/spl-kstat.c | 1 + .../openzfs/module/os/linux/spl/spl-thread.c | 1 + sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 1 + sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 27 ++-- .../openzfs/module/os/linux/zfs/vdev_disk.c | 137 ++++++++++++--------- sys/contrib/openzfs/module/zfs/metaslab.c | 3 - sys/contrib/openzfs/module/zfs/vdev.c | 40 ++++-- sys/contrib/openzfs/tests/runfiles/common.run | 1 + sys/modules/zfs/zfs_config.h | 21 +++- sys/modules/zfs/zfs_gitrev.h | 2 +- 87 files changed, 711 insertions(+), 332 deletions(-) diff --cc sys/contrib/openzfs/.github/codeql-cpp.yml index 000000000000,88b8c6086025..88b8c6086025 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql-cpp.yml +++ b/sys/contrib/openzfs/.github/codeql-cpp.yml diff --cc sys/contrib/openzfs/.github/codeql-python.yml index 000000000000,93cb4a435ed9..93cb4a435ed9 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql-python.yml +++ b/sys/contrib/openzfs/.github/codeql-python.yml diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql index 000000000000,eb4b7bd6299b..eb4b7bd6299b mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql +++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/deprecatedFunctionUsage.ql diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/qlpack.yml index 000000000000,cbe0f1cbe3c4..cbe0f1cbe3c4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/qlpack.yml +++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/qlpack.yml diff --cc sys/contrib/openzfs/config/kernel-strlcpy.m4 index 000000000000,c31cf52d78b0..c31cf52d78b0 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-strlcpy.m4 +++ b/sys/contrib/openzfs/config/kernel-strlcpy.m4 diff --cc sys/modules/zfs/zfs_config.h index f248e896babb,000000000000..0c7cff4c796e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1176 -1,0 +1,1191 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + ++/* bdev_open_by_path() exists */ ++/* #undef HAVE_BDEV_OPEN_BY_PATH */ ++ ++/* bdev_release() exists */ ++/* #undef HAVE_BDEV_RELEASE */ ++ +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* Define to 1 if you have the `execvpe' function. */ +/* #undef HAVE_EXECVPE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + ++/* mnt_idmap does not have user_namespace */ ++/* #undef HAVE_IDMAP_NO_USERNS */ ++ +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + ++/* strlcpy() exists */ ++/* #undef HAVE_KERNEL_STRLCPY */ ++ ++/* strscpy() exists */ ++/* #undef HAVE_KERNEL_STRSCPY */ ++ +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 *** 362 LINES SKIPPED *** From nobody Wed Jan 31 00:39:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPjpX6kvnz5804V; Wed, 31 Jan 2024 00:39: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 4TPjpX6FYCz43p6; Wed, 31 Jan 2024 00:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gs9KJ7EGwsqX1HDckF3Xm0khr2FnZswwMDI+miwgZ7Q=; b=r1bfltG/1VaXA5I0mKkhvJjJ0KCrySL/GkN6anZ7bk90cl0Ner5MTe4xHgcFTnB+6oLrOM KxsY3OpU5fd8i+ZGLDe8dGDICO3YSIFGCvbc+1dYpvXKwLvjlmySI/bOs+ws8mZjUgYW2+ uCFq8VlaRmVkBGMIkGiZUYmXmJCBY0uVnCPDmniRQcRe4EHAORcotzoJP5fPl6Xx6IrMh9 4oQBjkwnQ9NjffFMw8wHvX7pE2EdRfdFNYWjq7ggfDAAWEEF8WLT5TwDJrEe7O0aiI2gLz BMqznG9T2Wf31R7RzcJXygoBZvr4pDDITgxPuzAUSfye3X9oypFAFfpcTQteSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gs9KJ7EGwsqX1HDckF3Xm0khr2FnZswwMDI+miwgZ7Q=; b=xXNIHYol4d0FkLTvqUsypaB6eZTG6jCPqhZWI1oUwSs2uMZQGrDNI3cs+zbIFH76aIMYvw wNrq4eivqcf5i4H1N3M9flv7hagpW1Uyk3NHaFwg8yOGggK2wZmx8E036yIzj2vANghu3j GV2NC97Dy3nWHtzgcex46VMds0F5YqWti8rExNOYarAfoj0kKNFuCNAfnqp3cLgn5eiv7r VX35mPJGDI1h5tmmBOIw+AEvyGtBtpaNEUI6V3lwi4msLyOUk3KbnjjkIjMzPseX/yd1+Z aGAhzyNi6ZLt2bLjPCsmJNgDQDu7HXKv1bV/0ns35IYYMUD+ZxHNi//ge4uCLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661556; a=rsa-sha256; cv=none; b=TaMN819j5f/yKlcdeobJhrlOHG6ucGKxDH23K197OVnh8fF+NHEoGeUJfxJ40vUpCTqGki C2PlCk60hYpd8rCERbbpHPsTOlQY9WIEKukr0Bx/KOlLu2dEZXbscGFaPvcoKcQcvin/7/ kmOeF3gEkFYM6tEsqutXohqCwlGEHCS0s/6ckV9PyWXAfMyG7xqd8kkNrZjGj9soL97k8E 47c2JBFOeuMyDcwBbM0A5DNufovamDuYHFiorRoDT3eNHupLC0dwHH9P5DKjr8tPEurrTN hrAiOjdvXBauDyY9JYIKWq52E3eua2e4ozJte/WNYCLd8TLn/HY1chxJXxRYeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPjpX5C2hzx7W; Wed, 31 Jan 2024 00:39: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 40V0dG7i046586; Wed, 31 Jan 2024 00:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0dGKc046583; Wed, 31 Jan 2024 00:39:16 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:39:16 GMT Message-Id: <202401310039.40V0dGKc046583@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: 14505c92bc8c - main - syscallsubr.h: Sort kern_membarrier prototype alphabetically List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14505c92bc8ca56d4c8a09072d043642f5e87ed7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=14505c92bc8ca56d4c8a09072d043642f5e87ed7 commit 14505c92bc8ca56d4c8a09072d043642f5e87ed7 Author: John Baldwin AuthorDate: 2024-01-31 00:38:29 +0000 Commit: John Baldwin CommitDate: 2024-01-31 00:38:29 +0000 syscallsubr.h: Sort kern_membarrier prototype alphabetically --- sys/sys/syscallsubr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index c99eebd6d5d4..1eb9582a907d 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -219,13 +219,13 @@ int kern_lseek(struct thread *td, int fd, off_t offset, int whence); int kern_lutimes(struct thread *td, const char *path, enum uio_seg pathseg, const struct timeval *tptr, enum uio_seg tptrseg); int kern_madvise(struct thread *td, uintptr_t addr, size_t len, int behav); +int kern_membarrier(struct thread *td, int cmd, unsigned flags, + int cpu_id); int kern_mincore(struct thread *td, uintptr_t addr, size_t len, char *vec); int kern_minherit(struct thread *td, uintptr_t addr, size_t len, int inherit); int kern_mkdirat(struct thread *td, int fd, const char *path, enum uio_seg segflg, int mode); -int kern_membarrier(struct thread *td, int cmd, unsigned flags, - int cpu_id); int kern_mkfifoat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int mode); int kern_mknodat(struct thread *td, int fd, const char *path, From nobody Wed Jan 31 00:42:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPjsv0W6Sz580Jp; Wed, 31 Jan 2024 00:42: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 4TPjsv047Dz43tq; Wed, 31 Jan 2024 00:42:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgWClD4m+ClBGhnghyflKpxqfuD31GJYYSHjs94Nn3k=; b=jaFKr2fJXR2YKRIIgni2LxpcOCfSmjW3NL4qkNcUUoP10hEs+WmoOJIwUVEorDHstmBX+s Zh9VqVpzEx0bf25MWqHJUPZlYlXLgB4fPYsWTFoTK5FDzF0TePZorDFhzb1BWCto02zRma 6K/eJ06zpd/cih+RbDz/9RfDacsdKxUm3Vg2eAbd9M3OhXUwB6HJkHCx4ivZM0jrY5xEa7 V/JB5vi0YXnFWcaqrzl5tc5ZPROKyUOi9PiP+8cLWq+pkQxJKImSk3AS14zvKr4iXq3ghl 0soXdsMZs3JDhNY9XfNGyKV0xXksKxwOdr42E6lHBQVaNrrjwqySHkuRWv2XLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgWClD4m+ClBGhnghyflKpxqfuD31GJYYSHjs94Nn3k=; b=AvZNKlK5BA0WAiXPB3MaUbyssQ2rycqqMco+10FgeSJY2S7TNcacoK/nQC/xKHfdj0akXu OVRg8mOH/n/6jcKX2KmmqRiHxBgnPPTGAx4rb+nUYcpP/z/0a/VyE90KjfM4QCsOEnUw6w tAAWOk01t9z+2MTXCnTJapyS1Pf2XYuN4f2P8/Iz3eSPQsxJ/63ahYbMmJbn/s3Jrfbz/a WldtlN6nVHI68xF5qcfVVVKwHdjoF+plF1X8aG2MT2vzFEQkaR0Xd1gtqOvRtDukadsBfp ubwjP4ybrxGwjdcYuSUHRK11e6fEaLKs0104YvyaARkqb8ls3ZSxdoNLNdTKSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661731; a=rsa-sha256; cv=none; b=QEYtq5YsAr9n+FDd9vdf22NnR7pzCuRyjOYN5fx08uai+u5IgiXIFm2UbAWkta8x9zEfI+ w7RlNhq8JAToN1mgqinz+PwYXiBH6PayrXubQfmz1sxArdQGEPgTc0rSalkIB7DNy0FoQE gwyhuapI5C6/kABnUQuN6FSV++zLf3wDibTW1jK0iOxnvO6mZ056+T+oqjVO5W7R9rA2ks LmnEq0+rnevvXenzaFEnewTH/s7QRWRwjPzbXDYrMS0OiEOQ4j5sxcLDh/SAMcXMFTiWqZ dOpKheMoPlwblJpLIPvcSSfB/2nAhroRXGwOitglhKcqoZ53eMNUZljJrM2WoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPjst6DfLzxVl; Wed, 31 Jan 2024 00:42: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 40V0gAnh059356; Wed, 31 Jan 2024 00:42:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0gAG6059353; Wed, 31 Jan 2024 00:42:10 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:42:10 GMT Message-Id: <202401310042.40V0gAG6059353@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: c3d4aea6c5be - main - cxgbe: Add counters for POSIX async I/O requests handled by the driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3d4aea6c5bef0dcdc5194d4a828625f4d34a1dc Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3d4aea6c5bef0dcdc5194d4a828625f4d34a1dc commit c3d4aea6c5bef0dcdc5194d4a828625f4d34a1dc Author: John Baldwin AuthorDate: 2024-01-31 00:40:31 +0000 Commit: John Baldwin CommitDate: 2024-01-31 00:40:31 +0000 cxgbe: Add counters for POSIX async I/O requests handled by the driver Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43668 --- sys/dev/cxgbe/adapter.h | 4 ++++ sys/dev/cxgbe/t4_main.c | 4 ++++ sys/dev/cxgbe/t4_sge.c | 16 ++++++++++++++++ sys/dev/cxgbe/tom/t4_cpl_io.c | 6 +++++- sys/dev/cxgbe/tom/t4_ddp.c | 12 ++++++++++-- 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index c3105ecacffd..3157d08cc67b 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -686,6 +686,8 @@ struct sge_ofld_rxq { uint64_t rx_iscsi_padding_errors; uint64_t rx_iscsi_header_digest_errors; uint64_t rx_iscsi_data_digest_errors; + uint64_t rx_aio_ddp_jobs; + uint64_t rx_aio_ddp_octets; u_long rx_toe_tls_records; u_long rx_toe_tls_octets; } __aligned(CACHE_LINE_SIZE); @@ -752,6 +754,8 @@ struct sge_ofld_txq { counter_u64_t tx_iscsi_pdus; counter_u64_t tx_iscsi_octets; counter_u64_t tx_iscsi_iso_wrs; + counter_u64_t tx_aio_jobs; + counter_u64_t tx_aio_octets; counter_u64_t tx_toe_tls_records; counter_u64_t tx_toe_tls_octets; } __aligned(CACHE_LINE_SIZE); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 3b6cb7285e64..4fbc45e16464 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -12026,6 +12026,8 @@ clear_stats(struct adapter *sc, u_int port_id) counter_u64_zero(ofld_txq->tx_iscsi_pdus); counter_u64_zero(ofld_txq->tx_iscsi_octets); counter_u64_zero(ofld_txq->tx_iscsi_iso_wrs); + counter_u64_zero(ofld_txq->tx_aio_jobs); + counter_u64_zero(ofld_txq->tx_aio_octets); counter_u64_zero(ofld_txq->tx_toe_tls_records); counter_u64_zero(ofld_txq->tx_toe_tls_octets); } @@ -12043,6 +12045,8 @@ clear_stats(struct adapter *sc, u_int port_id) ofld_rxq->rx_iscsi_ddp_octets = 0; ofld_rxq->rx_iscsi_fl_pdus = 0; ofld_rxq->rx_iscsi_fl_octets = 0; + ofld_rxq->rx_aio_ddp_jobs = 0; + ofld_rxq->rx_aio_ddp_octets = 0; ofld_rxq->rx_toe_tls_records = 0; ofld_rxq->rx_toe_tls_octets = 0; } diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index b742f22a7d78..76293b06a6a9 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -4146,6 +4146,12 @@ add_ofld_rxq_sysctls(struct sysctl_ctx_list *ctx, struct sysctl_oid *oid, return; children = SYSCTL_CHILDREN(oid); + SYSCTL_ADD_U64(ctx, children, OID_AUTO, "rx_aio_ddp_jobs", + CTLFLAG_RD, &ofld_rxq->rx_aio_ddp_jobs, 0, + "# of aio_read(2) jobs completed via DDP"); + SYSCTL_ADD_U64(ctx, children, OID_AUTO, "rx_aio_ddp_octets", + CTLFLAG_RD, &ofld_rxq->rx_aio_ddp_octets, 0, + "# of octets placed directly for aio_read(2) jobs"); SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_toe_tls_records", CTLFLAG_RD, &ofld_rxq->rx_toe_tls_records, "# of TOE TLS records received"); @@ -4809,6 +4815,8 @@ alloc_ofld_txq(struct vi_info *vi, struct sge_ofld_txq *ofld_txq, int idx) ofld_txq->tx_iscsi_pdus = counter_u64_alloc(M_WAITOK); ofld_txq->tx_iscsi_octets = counter_u64_alloc(M_WAITOK); ofld_txq->tx_iscsi_iso_wrs = counter_u64_alloc(M_WAITOK); + ofld_txq->tx_aio_jobs = counter_u64_alloc(M_WAITOK); + ofld_txq->tx_aio_octets = counter_u64_alloc(M_WAITOK); ofld_txq->tx_toe_tls_records = counter_u64_alloc(M_WAITOK); ofld_txq->tx_toe_tls_octets = counter_u64_alloc(M_WAITOK); add_ofld_txq_sysctls(&vi->ctx, oid, ofld_txq); @@ -4847,6 +4855,8 @@ free_ofld_txq(struct vi_info *vi, struct sge_ofld_txq *ofld_txq) counter_u64_free(ofld_txq->tx_iscsi_pdus); counter_u64_free(ofld_txq->tx_iscsi_octets); counter_u64_free(ofld_txq->tx_iscsi_iso_wrs); + counter_u64_free(ofld_txq->tx_aio_jobs); + counter_u64_free(ofld_txq->tx_aio_octets); counter_u64_free(ofld_txq->tx_toe_tls_records); counter_u64_free(ofld_txq->tx_toe_tls_octets); free_wrq(sc, &ofld_txq->wrq); @@ -4874,6 +4884,12 @@ add_ofld_txq_sysctls(struct sysctl_ctx_list *ctx, struct sysctl_oid *oid, SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "tx_iscsi_iso_wrs", CTLFLAG_RD, &ofld_txq->tx_iscsi_iso_wrs, "# of iSCSI segmentation offload work requests"); + SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "tx_aio_jobs", + CTLFLAG_RD, &ofld_txq->tx_aio_jobs, + "# of zero-copy aio_write(2) jobs transmitted"); + SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "tx_aio_octets", + CTLFLAG_RD, &ofld_txq->tx_aio_octets, + "# of payload octets in transmitted zero-copy aio_write(2) jobs"); SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "tx_toe_tls_records", CTLFLAG_RD, &ofld_txq->tx_toe_tls_records, "# of TOE TLS records transmitted"); diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 235d4196226d..2f425c7b5c6d 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2173,6 +2173,7 @@ t4_aiotx_process_job(struct toepcb *toep, struct socket *so, struct kaiocb *job) struct inpcb *inp; struct tcpcb *tp; struct mbuf *m; + u_int sent; int error, len; bool moretocome, sendmore; @@ -2275,7 +2276,9 @@ sendanother: goto out; } - job->aio_sent += m_length(m, NULL); + sent = m_length(m, NULL); + job->aio_sent += sent; + counter_u64_add(toep->ofld_txq->tx_aio_octets, sent); sbappendstream(sb, m, 0); m = NULL; @@ -2328,6 +2331,7 @@ sendanother: * socket. */ aiotx_free_job(job); + counter_u64_add(toep->ofld_txq->tx_aio_jobs, 1); out: if (error) { diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index c529639d9a1f..c50446d98e2b 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -319,8 +319,11 @@ insert_ddp_data(struct toepcb *toep, uint32_t n) placed = n; if (placed > job->uaiocb.aio_nbytes - copied) placed = job->uaiocb.aio_nbytes - copied; - if (placed > 0) + if (placed > 0) { job->msgrcv = 1; + toep->ofld_rxq->rx_aio_ddp_jobs++; + } + toep->ofld_rxq->rx_aio_ddp_octets += placed; if (!aio_clear_cancel_function(job)) { /* * Update the copied length for when @@ -560,6 +563,8 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len) CURVNET_RESTORE(); job->msgrcv = 1; + toep->ofld_rxq->rx_aio_ddp_jobs++; + toep->ofld_rxq->rx_aio_ddp_octets += len; if (db->cancel_pending) { /* * Update the job's length but defer completion to the @@ -724,8 +729,11 @@ handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt) placed = len; if (placed > job->uaiocb.aio_nbytes - copied) placed = job->uaiocb.aio_nbytes - copied; - if (placed > 0) + if (placed > 0) { job->msgrcv = 1; + toep->ofld_rxq->rx_aio_ddp_jobs++; + } + toep->ofld_rxq->rx_aio_ddp_octets += placed; if (!aio_clear_cancel_function(job)) { /* * Update the copied length for when From nobody Wed Jan 31 00:42:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPjsw2Sglz5800q; Wed, 31 Jan 2024 00:42: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 4TPjsw167sz442t; Wed, 31 Jan 2024 00:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqcG5yRYQu1caLJngPCITrod1CI3JlKzKFnb9LIUboI=; b=qSfsnF61b+Y6sJ1pjULyKSKKK1jiVd5VxBYttnjXBALKbWb4hrl1xini4GgP77E3L0/x8+ uRQMqglR8wl7DnM4f017wktIndwvltVUHfFXv9FULa0HmFqgtCcIZiQdoCzdsKnXZqSd5N TzbcC2zeJWgnTWunG1LAXUn14MEmAVi0zU4PrWeDs/Jred/J6qGneh9MFq2q8VWObOReeW Aue8L4eJ6Pbq9sx4ZJnt1Sevy28lKHG+D+2vIirocp/RWLw8n6wSssD1eTmS40VhraFg2g nWJiQ3Dj958QCUcnntEWLr8FmrpXYhPYnJblxlZk8qQzfei6AB3kY5FtkuyyKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eqcG5yRYQu1caLJngPCITrod1CI3JlKzKFnb9LIUboI=; b=vRg73b7xhVf+I6Afrr8TfdvAnsdgfcXohHPGmZwqnn9laKpt5909QItvPhifEcVwAWujd2 wU04ZW+p4Z1n0QzrBfC7yR9vsdd1CV5jPY423eh1ROCjK/V4h9Yb7yM7j4pJqpnov0tGHu crOjnqeDgsoeL56N2L+3FSbvrKjlEKzolKgwXyaMBtGXxt6cKJPyakcY12O/9jEU8jcW7k kP7AkxwYClttiedcEmaToCvuOLdHNM3w1/G1Zvgzvw1DcT8MKd0AK9Hxh5aTMIRpGMKqZH uVP+vuk1Ut1LZwiXFUjLtZkd9G1pbhKIqVU4Cr+aOJ4jWrS6t0SWYiWMeccvjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661732; a=rsa-sha256; cv=none; b=ZjAd8+CJHCxT4T8A7/oKMWGWJzA755/pi8ml8Ye9lI1XgzVcl70f81ETA58mW5y18OE/ow h/f5/NwrXY5+GKxnZBDArWQ1w0w4rOxQFsPV85X8DbW/6XHmdKxGHnnRgB4uhNlVu2wfo6 2MvCnN/KaplYPbmKFoEcdW/VRcQPyfAlkfTzqJBBQqtIxMDlgEcTW4DTfwdIIIBsuTRKSx G5VnGxpRTgykdKok3ZFN4iJpJ0oZ++2NiEIqFdW+qPMe2Ae3q15qFs0JaEouSu68s2kRdc kfY0zQpjr897UJdfVXmFdWrzrZ6XLLprXoUMkOXob9RU7BlRn3FFbvQe4Se8cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPjsw0C8HzxYw; Wed, 31 Jan 2024 00:42: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 40V0gB1o059413; Wed, 31 Jan 2024 00:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0gBLR059410; Wed, 31 Jan 2024 00:42:11 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:42:11 GMT Message-Id: <202401310042.40V0gBLR059410@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: afaefb773799 - main - cxgbe tom: Limit TOE connections to 2 reassembly islands always List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afaefb7737994293f9264953e361de095c666c18 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=afaefb7737994293f9264953e361de095c666c18 commit afaefb7737994293f9264953e361de095c666c18 Author: John Baldwin AuthorDate: 2024-01-31 00:41:23 +0000 Commit: John Baldwin CommitDate: 2024-01-31 00:41:23 +0000 cxgbe tom: Limit TOE connections to 2 reassembly islands always Previously this was only limited on T6 cards to support switching from ULP_MODE_NONE to ULP_MODE_TLS. To support switching to ULP_MODE_TCPDDP, enable this for all adapters. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43669 --- sys/dev/cxgbe/t4_main.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 4fbc45e16464..e20c697d2865 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -5726,18 +5726,15 @@ set_params__post_init(struct adapter *sc) } #endif -#ifdef KERN_TLS - if (sc->cryptocaps & FW_CAPS_CONFIG_TLSKEYS && - sc->toecaps & FW_CAPS_CONFIG_TOE) { - /* - * Limit TOE connections to 2 reassembly "islands". - * This is required to permit migrating TOE - * connections to UPL_MODE_TLS. - */ - t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, - V_PASSMODE(M_PASSMODE), V_PASSMODE(2)); - } + /* + * Limit TOE connections to 2 reassembly "islands". This is + * required to permit migrating TOE connections to either + * ULP_MODE_TCPDDP or UPL_MODE_TLS. + */ + t4_tp_wr_bits_indirect(sc, A_TP_FRAG_CONFIG, V_PASSMODE(M_PASSMODE), + V_PASSMODE(2)); +#ifdef KERN_TLS if (is_ktls(sc)) { sc->tlst.inline_keys = t4_tls_inline_keys; sc->tlst.combo_wrs = t4_tls_combo_wrs; From nobody Wed Jan 31 00:42:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPjsx4NXSz57yvJ; Wed, 31 Jan 2024 00:42: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 4TPjsx220bz44D8; Wed, 31 Jan 2024 00:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5//P6aw5xHwz/ftaBEXFy3ljB05UE6zhCua8HYqQwm8=; b=hqxqZYUeJIvmzd3VK2WErFtS5UqXnZ6brQVobgFc4qM/oKPwf7IHtWI3IzOt8FxdfKPBo9 67qOzgGM34RGS5pCaozBus2vPI7toD70AWP7kTTondvvl1D4B27K6R1c/QBxJIDXbf6Ph2 Fr6j9jZxKTakVZpEPaM5JfeDuBpZIRNGjmCujzchIFCx6jU5tpMyXERIDzY15SHr5lwFHn Ho3pU6R6E1BC2+RwOmenFGQETD3TgDn1okwe6RvEAUcvjnB99jxlTlLrbBK6IXGR0Y+/UY /8oikMqI/59GTfgTDbZA4hbpdFxgGShUTm62KLBRQRtf4vNhSCmBkFW0LQUUEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706661733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5//P6aw5xHwz/ftaBEXFy3ljB05UE6zhCua8HYqQwm8=; b=fjgA1sJfqSHiiWAEt3yMtW4jHsTypCo8TlVoj7BQyBzObZjGzMsuxo/efb+jYQnLVZPeLH Ls/x6drLhlp9pTZ1tJebceNczjm8KzKJZSy0u8zEWAd/2J4I/EK7K7DGPlf89ImmTj5VjA obe25dfGe6vNGwKa8MuobGWV43aHCIw32ypOtzXQhuUYELeDoQw8vLJcxJCShVo48TDCIQ wjtxoxcBhzVJ34z29msK6TRJXyMo+AphBG58iBO/Zlh+PN60cCPzQxqkWIXKPqK7XZZcdI o8gO9LUsqVQJRjeaDTOxdoJ/apJJOtx+4ejKARhbwR6dlJx1AszmQgzivLxw/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706661733; a=rsa-sha256; cv=none; b=jg+WaOQAVWE+5cp7Ba+J4xRG5BFVpsQkgLDo7h75aAnNaq2+M/l2NP88zQLf295jEbI/uU wlIxK9m/W6yNiLaDj4sgYLfPos49SctxgiTWMF8MiM6obXRuoPiJUVMr36cU/RXEGZupPy x70H5N1l1F7zZZw2goGQOJ7qXfLNN9cG47haO+0TBBHb3o5sdovQCg3m4uk9+hBV+ubg2+ clOMcq1IQVny+pnKNqMnAcQ8AZ6wKMCgcXpBfeVauPps6PhA1tCPAX/0VCttAe8TnUd4AS vcj18fcrpArp4hrRaAMLiLEd6l3RfJ0kbNNF4vIjRcPoYt8TtaqhFsHANT6kjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPjsx14hHzxw3; Wed, 31 Jan 2024 00:42: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 40V0gDDw059465; Wed, 31 Jan 2024 00:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V0gD96059461; Wed, 31 Jan 2024 00:42:13 GMT (envelope-from git) Date: Wed, 31 Jan 2024 00:42:13 GMT Message-Id: <202401310042.40V0gD96059461@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: a5a965d75934 - main - cxgbe tom: Enable ULP_MODE_TCPDDP on demand List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5a965d75934ae809884f8613bcad156bb5d7148 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a5a965d75934ae809884f8613bcad156bb5d7148 commit a5a965d75934ae809884f8613bcad156bb5d7148 Author: John Baldwin AuthorDate: 2024-01-31 00:41:43 +0000 Commit: John Baldwin CommitDate: 2024-01-31 00:41:43 +0000 cxgbe tom: Enable ULP_MODE_TCPDDP on demand Most ULP modes in cxgbe's TOE are enabled on the fly when a protocol is needed (e.g. ULP_MODE_ISCSI is enabled by cxgbei when offloading a connection using iSCSI, and ULP_MODE_TLS is enabled when RX TLS keys are programmed for a TOE connection). The one exception to this is ULP_MODE_TCPDDP. Currently the cxgbe driver enables ULP_MODE_TCPDDP when a TOE connection is first created. However, since DDP connections cannot be converted to other connection types, this requires some special handling in the driver. For example, iSCSI daemons use the SO_NO_DDP socket option to ensure TOE connections use ULP_MODE_NONE so they can be converted to ULP_MODE_ISCSI. Similarly, using TLS receive offload (ULP_MODE_TLS) requires disabling TCP DDP for new connections by default. This commit changes cxgbe to instead switch a connection from ULP_MODE_NONE to ULP_MODE_TCPDDP when a connection first attempts to use TCP DDP via aio_read(2). This permits connections to always start as ULP_MODE_NONE and switch to a protocol-specific mode as needed. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D43670 --- sys/dev/cxgbe/tom/t4_cpl_io.c | 11 +++--- sys/dev/cxgbe/tom/t4_ddp.c | 86 ++++++++++++++++++++++++++++++++++++++++++- sys/dev/cxgbe/tom/t4_tom.c | 17 +++------ sys/dev/cxgbe/tom/t4_tom.h | 1 - 4 files changed, 95 insertions(+), 20 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 2f425c7b5c6d..4d61189f5fe3 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1753,17 +1753,18 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) if (changed) { if (toep->ddp.flags & DDP_SC_REQ) toep->ddp.flags ^= DDP_ON | DDP_SC_REQ; - else { - KASSERT(cpl->ddp_off == 1, - ("%s: DDP switched on by itself.", - __func__)); - + else if (cpl->ddp_off == 1) { /* Fell out of DDP mode */ toep->ddp.flags &= ~DDP_ON; CTR1(KTR_CXGBE, "%s: fell out of DDP mode", __func__); insert_ddp_data(toep, ddp_placed); + } else { + /* + * Data was received while still + * ULP_MODE_NONE, just fall through. + */ } } diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index c50446d98e2b..89cb7269e218 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -192,7 +192,7 @@ free_ddp_buffer(struct tom_data *td, struct ddp_buffer *db) free_pageset(td, db->ps); } -void +static void ddp_init_toep(struct toepcb *toep) { @@ -810,6 +810,78 @@ do_rx_ddp_complete(struct sge_iq *iq, const struct rss_header *rss, return (0); } +static bool +set_ddp_ulp_mode(struct toepcb *toep) +{ + struct adapter *sc = toep->vi->adapter; + struct wrqe *wr; + struct work_request_hdr *wrh; + struct ulp_txpkt *ulpmc; + int fields, len; + + if (!sc->tt.ddp) + return (false); + + fields = 0; + + /* Overlay region including W_TCB_RX_DDP_FLAGS */ + fields += 3; + + /* W_TCB_ULP_TYPE */ + fields++; + +#ifdef USE_DDP_RX_FLOW_CONTROL + /* W_TCB_T_FLAGS */ + fields++; +#endif + + len = sizeof(*wrh) + fields * roundup2(LEN__SET_TCB_FIELD_ULP, 16); + KASSERT(len <= SGE_MAX_WR_LEN, + ("%s: WR with %d TCB field updates too large", __func__, fields)); + + wr = alloc_wrqe(len, toep->ctrlq); + if (wr == NULL) + return (false); + + CTR(KTR_CXGBE, "%s: tid %u", __func__, toep->tid); + + wrh = wrtod(wr); + INIT_ULPTX_WRH(wrh, len, 1, 0); /* atomic */ + ulpmc = (struct ulp_txpkt *)(wrh + 1); + + /* + * Words 26/27 are zero except for the DDP_OFF flag in + * W_TCB_RX_DDP_FLAGS (27). + */ + ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, 26, + 0xffffffffffffffff, (uint64_t)V_TF_DDP_OFF(1) << 32); + + /* Words 28/29 are zero. */ + ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, 28, + 0xffffffffffffffff, 0); + + /* Words 30/31 are zero. */ + ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, 30, + 0xffffffffffffffff, 0); + + /* Set the ULP mode to ULP_MODE_TCPDDP. */ + toep->params.ulp_mode = ULP_MODE_TCPDDP; + ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, W_TCB_ULP_TYPE, + V_TCB_ULP_TYPE(M_TCB_ULP_TYPE), + V_TCB_ULP_TYPE(ULP_MODE_TCPDDP)); + +#ifdef USE_DDP_RX_FLOW_CONTROL + /* Set TF_RX_FLOW_CONTROL_DDP. */ + ulpmc = mk_set_tcb_field_ulp(ulpmc, toep, W_TCB_T_FLAGS, + V_TF_RX_FLOW_CONTROL_DDP(1), V_TF_RX_FLOW_CONTROL_DDP(1)); +#endif + + ddp_init_toep(toep); + + t4_wrq_tx(sc, wr); + return (true); +} + static void enable_ddp(struct adapter *sc, struct toepcb *toep) { @@ -2203,7 +2275,8 @@ t4_aio_cancel_queued(struct kaiocb *job) int t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) { - struct tcpcb *tp = sototcpcb(so); + struct inpcb *inp = sotoinpcb(so); + struct tcpcb *tp = intotcpcb(inp); struct toepcb *toep = tp->t_toe; @@ -2211,6 +2284,15 @@ t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) if (job->uaiocb.aio_lio_opcode != LIO_READ) return (EOPNOTSUPP); + INP_WLOCK(inp); + if (__predict_false(ulp_mode(toep) == ULP_MODE_NONE)) { + if (!set_ddp_ulp_mode(toep)) { + INP_WUNLOCK(inp); + return (EOPNOTSUPP); + } + } + INP_WUNLOCK(inp); + DDP_LOCK(toep); /* diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index 77b6ba5d4032..9bfe6ec818e4 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -179,8 +179,7 @@ init_toepcb(struct vi_info *vi, struct toepcb *toep) toep->ctrlq = &sc->sge.ctrlq[pi->port_id]; tls_init_toep(toep); - if (ulp_mode(toep) == ULP_MODE_TCPDDP) - ddp_init_toep(toep); + MPASS(ulp_mode(toep) != ULP_MODE_TCPDDP); toep->flags |= TPF_INITIALIZED; @@ -1216,10 +1215,7 @@ calc_options2(struct vi_info *vi, struct conn_params *cp) opt2 |= V_RX_COALESCE(M_RX_COALESCE); opt2 |= V_RX_FC_DDP(0) | V_RX_FC_DISABLE(0); -#ifdef USE_DDP_RX_FLOW_CONTROL - if (cp->ulp_mode == ULP_MODE_TCPDDP) - opt2 |= F_RX_FC_DDP; -#endif + MPASS(cp->ulp_mode != ULP_MODE_TCPDDP); return (htobe32(opt2)); } @@ -1327,11 +1323,7 @@ init_conn_params(struct vi_info *vi , struct offload_settings *s, cp->tx_align = 0; /* ULP mode. */ - if (s->ddp > 0 || - (s->ddp < 0 && sc->tt.ddp && (so_options_get(so) & SO_NO_DDP) == 0)) - cp->ulp_mode = ULP_MODE_TCPDDP; - else - cp->ulp_mode = ULP_MODE_NONE; + cp->ulp_mode = ULP_MODE_NONE; /* Rx coalescing. */ if (s->rx_coalesce >= 0) @@ -1972,7 +1964,8 @@ t4_aio_queue_tom(struct socket *so, struct kaiocb *job) if (SOLISTENING(so)) return (EINVAL); - if (ulp_mode(toep) == ULP_MODE_TCPDDP) { + if (ulp_mode(toep) == ULP_MODE_TCPDDP || + ulp_mode(toep) == ULP_MODE_NONE) { error = t4_aio_queue_ddp(so, job); if (error != EOPNOTSUPP) return (error); diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index b492fe86ae3a..d74f3f908286 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -505,7 +505,6 @@ int t4_aio_queue_ddp(struct socket *, struct kaiocb *); void t4_ddp_mod_load(void); void t4_ddp_mod_unload(void); void ddp_assert_empty(struct toepcb *); -void ddp_init_toep(struct toepcb *); void ddp_uninit_toep(struct toepcb *); void ddp_queue_toep(struct toepcb *); void release_ddp_resources(struct toepcb *toep); From nobody Wed Jan 31 04:06:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPpPG3gxgz58L3Y; Wed, 31 Jan 2024 04:06: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 4TPpPG3PBQz4Td5; Wed, 31 Jan 2024 04:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706673970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnv43Q8wsitPv8Oj/MRar0SyUCvO7bJpIw3H6ix2Xuw=; b=bfsobod/wsK2IPfDhJLCUv0GrJ3/hoft02IMuDVFcFhbDFE/DF7jHucQOM/tj2zcbHZ+pg d9/kKExaAO60pDFZWYtccK4ReVNqYH2yhRMVz2hH4E7fcN9jyuwUyMWa79JSzhxsRz3h7M G6O4nlMJWfH3YW+uKAqKPF1/u7Zh19Evr/+BJdLLA6a9Fa7i1+8E/5Mui2LaFGhx1L6X8z D11O9p8yWyapMCaISBHEwO64KA/frKFpffb5Ye5A+jbe+dXOZ2qtYD0gko5uDT4hwRGU9k 4T7oN35ETHLxcpe920GkQy7EXSrrTIPAugnoOxYqnFL/y69K9/m2IqJHVH7Gnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706673970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cnv43Q8wsitPv8Oj/MRar0SyUCvO7bJpIw3H6ix2Xuw=; b=CmIK0R8979p3AmFTRvBbNgX3bZfJqhOh9QE6P5eh3gBgw8wrhgTuSQVDRpUkFMfvBNkTEh mLk37WnO0pZvyTSoeL5DGvu7G7k/2DIYrMD10kTWHZq3+ZOcW9EPXjbwzXwoITz7oEi8U+ saXSA/0oF6jbcUVSXH6+aJznXvTC0shHPBDmpZAsjPnRv6prS+VhFbj28X9nG6g0KBcYtJ D3VuScK2o6NqtitPEySx2gvwKPPAy4jeDhdu1qVNdmu2kq0ZkaOtXqnlRgTMKl24WEQct9 mQ1AOAt9vPwbAiE5Kfu48cKuvknfi3rHPuyASJAsHJUCKMvwBOMQWrKnA6wfAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706673970; a=rsa-sha256; cv=none; b=NSySAt90vD+vh9CP4zR0SsDisX4juhlsxaI7MzoDpXNqN739yBqSEWPmoDl5GnN0ORZZJb k8J7SZ06z8KNgmYYAshYT2ohsPee2T+zHkWJy1WSNDAipw4otkQ5RZT9okvLz1AUYYweJz NdJiyoXqQWvj0eMdJKwK/05RuuZZc8yCJBv4XgjpPghWiVQDrqZ7BZBQ3EHeFnDxSNsTur AvjFjVf2lR/jheVXDt/qe0ltj06jmuwXwAbzU+3juOKbri/2e4IQ2pZm+lH3nrjF/iS+SB XEONjPKGo2GBzAjMjflMU02M18Zr+vOQaKrknIcijtHW0akIHf5eLi3B7Hg61A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPpPG2M4qz13Tj; Wed, 31 Jan 2024 04:06: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 40V46Atw000840; Wed, 31 Jan 2024 04:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V46AUG000837; Wed, 31 Jan 2024 04:06:10 GMT (envelope-from git) Date: Wed, 31 Jan 2024 04:06:10 GMT Message-Id: <202401310406.40V46AUG000837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 722b16673c40aedf280895f2f2f676bb494518d7 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7 commit 722b16673c40aedf280895f2f2f676bb494518d7 Author: Jung-uk Kim AuthorDate: 2024-01-30 21:43:45 +0000 Commit: Jung-uk Kim CommitDate: 2024-01-31 03:16:36 +0000 acpica: Import ACPICA 20230331 (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) --- sys/contrib/dev/acpica/acpica_prep.sh | 8 +- sys/contrib/dev/acpica/changes.txt | 105 ++++++++ sys/contrib/dev/acpica/common/acfileio.c | 2 +- sys/contrib/dev/acpica/common/acgetline.c | 2 +- sys/contrib/dev/acpica/common/adfile.c | 2 +- sys/contrib/dev/acpica/common/adisasm.c | 3 +- sys/contrib/dev/acpica/common/adwalk.c | 2 +- sys/contrib/dev/acpica/common/ahids.c | 2 +- sys/contrib/dev/acpica/common/ahpredef.c | 2 +- sys/contrib/dev/acpica/common/ahtable.c | 5 +- sys/contrib/dev/acpica/common/ahuuids.c | 2 +- sys/contrib/dev/acpica/common/cmfsize.c | 2 +- sys/contrib/dev/acpica/common/dmextern.c | 10 +- sys/contrib/dev/acpica/common/dmrestag.c | 11 +- sys/contrib/dev/acpica/common/dmswitch.c | 2 +- sys/contrib/dev/acpica/common/dmtable.c | 54 +++- sys/contrib/dev/acpica/common/dmtables.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump.c | 2 +- sys/contrib/dev/acpica/common/dmtbdump1.c | 93 ++++++- sys/contrib/dev/acpica/common/dmtbdump2.c | 242 ++++++++++++++++- sys/contrib/dev/acpica/common/dmtbdump3.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo1.c | 55 +++- sys/contrib/dev/acpica/common/dmtbinfo2.c | 191 +++++++++++++- sys/contrib/dev/acpica/common/dmtbinfo3.c | 2 +- sys/contrib/dev/acpica/common/getopt.c | 2 +- sys/contrib/dev/acpica/compiler/aslallocate.c | 8 +- sys/contrib/dev/acpica/compiler/aslanalyze.c | 2 +- sys/contrib/dev/acpica/compiler/aslascii.c | 2 +- sys/contrib/dev/acpica/compiler/aslbtypes.c | 5 +- sys/contrib/dev/acpica/compiler/aslcache.c | 2 +- sys/contrib/dev/acpica/compiler/aslcodegen.c | 2 +- sys/contrib/dev/acpica/compiler/aslcompile.c | 2 +- sys/contrib/dev/acpica/compiler/aslcompiler.h | 5 +- sys/contrib/dev/acpica/compiler/aslcompiler.l | 14 +- sys/contrib/dev/acpica/compiler/aslcstyle.y | 2 +- sys/contrib/dev/acpica/compiler/asldebug.c | 2 +- sys/contrib/dev/acpica/compiler/asldefine.h | 2 +- sys/contrib/dev/acpica/compiler/aslerror.c | 2 +- sys/contrib/dev/acpica/compiler/aslexternal.c | 2 +- sys/contrib/dev/acpica/compiler/aslfileio.c | 2 +- sys/contrib/dev/acpica/compiler/aslfiles.c | 2 +- sys/contrib/dev/acpica/compiler/aslfold.c | 2 +- sys/contrib/dev/acpica/compiler/aslglobal.h | 2 +- sys/contrib/dev/acpica/compiler/aslhelp.c | 2 +- sys/contrib/dev/acpica/compiler/aslhelpers.y | 2 +- sys/contrib/dev/acpica/compiler/aslhex.c | 2 +- sys/contrib/dev/acpica/compiler/aslkeywords.y | 13 +- sys/contrib/dev/acpica/compiler/asllength.c | 2 +- sys/contrib/dev/acpica/compiler/asllisting.c | 2 +- sys/contrib/dev/acpica/compiler/asllistsup.c | 2 +- sys/contrib/dev/acpica/compiler/aslload.c | 2 +- sys/contrib/dev/acpica/compiler/asllookup.c | 2 +- sys/contrib/dev/acpica/compiler/aslmain.c | 2 +- sys/contrib/dev/acpica/compiler/aslmap.c | 8 +- sys/contrib/dev/acpica/compiler/aslmapenter.c | 2 +- sys/contrib/dev/acpica/compiler/aslmapoutput.c | 2 +- sys/contrib/dev/acpica/compiler/aslmaputils.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.c | 2 +- sys/contrib/dev/acpica/compiler/aslmessages.h | 2 +- sys/contrib/dev/acpica/compiler/aslmethod.c | 2 +- sys/contrib/dev/acpica/compiler/aslnamesp.c | 2 +- sys/contrib/dev/acpica/compiler/asloffset.c | 2 +- sys/contrib/dev/acpica/compiler/aslopcodes.c | 2 +- sys/contrib/dev/acpica/compiler/asloperands.c | 2 +- sys/contrib/dev/acpica/compiler/aslopt.c | 2 +- sys/contrib/dev/acpica/compiler/asloptions.c | 2 +- sys/contrib/dev/acpica/compiler/aslparseop.c | 6 +- sys/contrib/dev/acpica/compiler/aslparser.y | 4 +- sys/contrib/dev/acpica/compiler/aslpld.c | 2 +- sys/contrib/dev/acpica/compiler/aslpredef.c | 2 +- sys/contrib/dev/acpica/compiler/aslprepkg.c | 2 +- sys/contrib/dev/acpica/compiler/aslprimaries.y | 2 +- sys/contrib/dev/acpica/compiler/aslprintf.c | 2 +- sys/contrib/dev/acpica/compiler/aslprune.c | 2 +- sys/contrib/dev/acpica/compiler/aslresource.c | 8 +- sys/contrib/dev/acpica/compiler/aslresources.y | 18 +- sys/contrib/dev/acpica/compiler/aslrestype1.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype1i.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2.c | 8 +- sys/contrib/dev/acpica/compiler/aslrestype2d.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2e.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2q.c | 2 +- sys/contrib/dev/acpica/compiler/aslrestype2s.c | 129 ++++++++-- sys/contrib/dev/acpica/compiler/aslrestype2w.c | 2 +- sys/contrib/dev/acpica/compiler/aslrules.y | 2 +- sys/contrib/dev/acpica/compiler/aslstartup.c | 2 +- sys/contrib/dev/acpica/compiler/aslstubs.c | 2 +- sys/contrib/dev/acpica/compiler/aslsupport.l | 4 +- sys/contrib/dev/acpica/compiler/aslsupport.y | 2 +- sys/contrib/dev/acpica/compiler/asltokens.y | 8 +- sys/contrib/dev/acpica/compiler/asltransform.c | 2 +- sys/contrib/dev/acpica/compiler/asltree.c | 5 +- sys/contrib/dev/acpica/compiler/asltypes.h | 4 +- sys/contrib/dev/acpica/compiler/asltypes.y | 5 +- sys/contrib/dev/acpica/compiler/aslutils.c | 8 +- sys/contrib/dev/acpica/compiler/asluuid.c | 2 +- sys/contrib/dev/acpica/compiler/aslwalks.c | 2 +- sys/contrib/dev/acpica/compiler/aslxref.c | 2 +- sys/contrib/dev/acpica/compiler/aslxrefout.c | 2 +- sys/contrib/dev/acpica/compiler/cvcompiler.c | 2 +- sys/contrib/dev/acpica/compiler/cvdisasm.c | 2 +- sys/contrib/dev/acpica/compiler/cvparser.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompile.c | 2 +- sys/contrib/dev/acpica/compiler/dtcompiler.h | 21 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtcompilerparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtexpress.c | 7 +- sys/contrib/dev/acpica/compiler/dtfield.c | 4 +- sys/contrib/dev/acpica/compiler/dtio.c | 2 +- sys/contrib/dev/acpica/compiler/dtparser.l | 2 +- sys/contrib/dev/acpica/compiler/dtparser.y | 2 +- sys/contrib/dev/acpica/compiler/dtsubtable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable.c | 2 +- sys/contrib/dev/acpica/compiler/dttable1.c | 91 ++++++- sys/contrib/dev/acpica/compiler/dttable2.c | 285 ++++++++++++++++++++- sys/contrib/dev/acpica/compiler/dttemplate.c | 2 +- sys/contrib/dev/acpica/compiler/dttemplate.h | 79 +++++- sys/contrib/dev/acpica/compiler/dtutils.c | 4 +- sys/contrib/dev/acpica/compiler/preprocess.h | 11 +- sys/contrib/dev/acpica/compiler/prexpress.c | 2 +- sys/contrib/dev/acpica/compiler/prmacros.c | 50 ++-- sys/contrib/dev/acpica/compiler/prparser.l | 2 +- sys/contrib/dev/acpica/compiler/prparser.y | 2 +- sys/contrib/dev/acpica/compiler/prscan.c | 9 +- sys/contrib/dev/acpica/compiler/prutils.c | 240 ++++++++++++++++- .../dev/acpica/components/debugger/dbcmds.c | 2 +- .../dev/acpica/components/debugger/dbconvert.c | 2 +- .../dev/acpica/components/debugger/dbdisply.c | 2 +- .../dev/acpica/components/debugger/dbexec.c | 2 +- .../dev/acpica/components/debugger/dbfileio.c | 2 +- .../dev/acpica/components/debugger/dbhistry.c | 2 +- .../dev/acpica/components/debugger/dbinput.c | 2 +- .../dev/acpica/components/debugger/dbmethod.c | 2 +- .../dev/acpica/components/debugger/dbnames.c | 5 +- .../dev/acpica/components/debugger/dbobject.c | 2 +- .../dev/acpica/components/debugger/dbstats.c | 2 +- .../dev/acpica/components/debugger/dbtest.c | 2 +- .../dev/acpica/components/debugger/dbutils.c | 2 +- .../dev/acpica/components/debugger/dbxface.c | 2 +- .../dev/acpica/components/disassembler/dmbuffer.c | 2 +- .../dev/acpica/components/disassembler/dmcstyle.c | 2 +- .../acpica/components/disassembler/dmdeferred.c | 2 +- .../dev/acpica/components/disassembler/dmnames.c | 2 +- .../dev/acpica/components/disassembler/dmopcode.c | 2 +- .../dev/acpica/components/disassembler/dmresrc.c | 3 +- .../dev/acpica/components/disassembler/dmresrcl.c | 4 +- .../dev/acpica/components/disassembler/dmresrcl2.c | 42 ++- .../dev/acpica/components/disassembler/dmresrcs.c | 2 +- .../dev/acpica/components/disassembler/dmutils.c | 2 +- .../dev/acpica/components/disassembler/dmwalk.c | 2 +- .../dev/acpica/components/dispatcher/dsargs.c | 2 +- .../dev/acpica/components/dispatcher/dscontrol.c | 2 +- .../dev/acpica/components/dispatcher/dsdebug.c | 2 +- .../dev/acpica/components/dispatcher/dsfield.c | 2 +- .../dev/acpica/components/dispatcher/dsinit.c | 2 +- .../dev/acpica/components/dispatcher/dsmethod.c | 12 +- .../dev/acpica/components/dispatcher/dsmthdat.c | 2 +- .../dev/acpica/components/dispatcher/dsobject.c | 2 +- .../dev/acpica/components/dispatcher/dsopcode.c | 2 +- .../dev/acpica/components/dispatcher/dspkginit.c | 2 +- .../dev/acpica/components/dispatcher/dsutils.c | 2 +- .../dev/acpica/components/dispatcher/dswexec.c | 8 +- .../dev/acpica/components/dispatcher/dswload.c | 2 +- .../dev/acpica/components/dispatcher/dswload2.c | 2 +- .../dev/acpica/components/dispatcher/dswscope.c | 2 +- .../dev/acpica/components/dispatcher/dswstate.c | 11 +- sys/contrib/dev/acpica/components/events/evevent.c | 4 +- sys/contrib/dev/acpica/components/events/evglock.c | 2 +- sys/contrib/dev/acpica/components/events/evgpe.c | 2 +- .../dev/acpica/components/events/evgpeblk.c | 2 +- .../dev/acpica/components/events/evgpeinit.c | 2 +- .../dev/acpica/components/events/evgpeutil.c | 2 +- .../dev/acpica/components/events/evhandler.c | 2 +- sys/contrib/dev/acpica/components/events/evmisc.c | 2 +- .../dev/acpica/components/events/evregion.c | 2 +- .../dev/acpica/components/events/evrgnini.c | 2 +- sys/contrib/dev/acpica/components/events/evsci.c | 2 +- sys/contrib/dev/acpica/components/events/evxface.c | 2 +- .../dev/acpica/components/events/evxfevnt.c | 2 +- sys/contrib/dev/acpica/components/events/evxfgpe.c | 2 +- .../dev/acpica/components/events/evxfregn.c | 103 +++++++- .../dev/acpica/components/executer/exconcat.c | 2 +- .../dev/acpica/components/executer/exconfig.c | 2 +- .../dev/acpica/components/executer/exconvrt.c | 2 +- .../dev/acpica/components/executer/excreate.c | 2 +- .../dev/acpica/components/executer/exdebug.c | 2 +- .../dev/acpica/components/executer/exdump.c | 2 +- .../dev/acpica/components/executer/exfield.c | 2 +- .../dev/acpica/components/executer/exfldio.c | 2 +- .../dev/acpica/components/executer/exmisc.c | 2 +- .../dev/acpica/components/executer/exmutex.c | 2 +- .../dev/acpica/components/executer/exnames.c | 2 +- .../dev/acpica/components/executer/exoparg1.c | 2 +- .../dev/acpica/components/executer/exoparg2.c | 2 +- .../dev/acpica/components/executer/exoparg3.c | 2 +- .../dev/acpica/components/executer/exoparg6.c | 2 +- .../dev/acpica/components/executer/exprep.c | 2 +- .../dev/acpica/components/executer/exregion.c | 2 +- .../dev/acpica/components/executer/exresnte.c | 2 +- .../dev/acpica/components/executer/exresolv.c | 2 +- .../dev/acpica/components/executer/exresop.c | 2 +- .../dev/acpica/components/executer/exserial.c | 2 +- .../dev/acpica/components/executer/exstore.c | 2 +- .../dev/acpica/components/executer/exstoren.c | 2 +- .../dev/acpica/components/executer/exstorob.c | 2 +- .../dev/acpica/components/executer/exsystem.c | 6 +- .../dev/acpica/components/executer/extrace.c | 2 +- .../dev/acpica/components/executer/exutils.c | 2 +- .../dev/acpica/components/hardware/hwacpi.c | 2 +- .../dev/acpica/components/hardware/hwesleep.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwgpe.c | 2 +- sys/contrib/dev/acpica/components/hardware/hwpci.c | 2 +- .../dev/acpica/components/hardware/hwregs.c | 2 +- .../dev/acpica/components/hardware/hwsleep.c | 13 +- .../dev/acpica/components/hardware/hwtimer.c | 2 +- .../dev/acpica/components/hardware/hwvalid.c | 10 +- .../dev/acpica/components/hardware/hwxface.c | 2 +- .../dev/acpica/components/hardware/hwxfsleep.c | 2 +- .../dev/acpica/components/namespace/nsaccess.c | 2 +- .../dev/acpica/components/namespace/nsalloc.c | 2 +- .../dev/acpica/components/namespace/nsarguments.c | 2 +- .../dev/acpica/components/namespace/nsconvert.c | 2 +- .../dev/acpica/components/namespace/nsdump.c | 2 +- .../dev/acpica/components/namespace/nsdumpdv.c | 2 +- .../dev/acpica/components/namespace/nseval.c | 2 +- .../dev/acpica/components/namespace/nsinit.c | 2 +- .../dev/acpica/components/namespace/nsload.c | 2 +- .../dev/acpica/components/namespace/nsnames.c | 2 +- .../dev/acpica/components/namespace/nsobject.c | 2 +- .../dev/acpica/components/namespace/nsparse.c | 2 +- .../dev/acpica/components/namespace/nspredef.c | 2 +- .../dev/acpica/components/namespace/nsprepkg.c | 2 +- .../dev/acpica/components/namespace/nsrepair.c | 16 +- .../dev/acpica/components/namespace/nsrepair2.c | 11 +- .../dev/acpica/components/namespace/nssearch.c | 2 +- .../dev/acpica/components/namespace/nsutils.c | 4 +- .../dev/acpica/components/namespace/nswalk.c | 2 +- .../dev/acpica/components/namespace/nsxfeval.c | 2 +- .../dev/acpica/components/namespace/nsxfname.c | 4 +- .../dev/acpica/components/namespace/nsxfobj.c | 2 +- sys/contrib/dev/acpica/components/parser/psargs.c | 2 +- sys/contrib/dev/acpica/components/parser/psloop.c | 2 +- .../dev/acpica/components/parser/psobject.c | 2 +- .../dev/acpica/components/parser/psopcode.c | 2 +- .../dev/acpica/components/parser/psopinfo.c | 2 +- sys/contrib/dev/acpica/components/parser/psparse.c | 2 +- sys/contrib/dev/acpica/components/parser/psscope.c | 2 +- sys/contrib/dev/acpica/components/parser/pstree.c | 2 +- sys/contrib/dev/acpica/components/parser/psutils.c | 2 +- sys/contrib/dev/acpica/components/parser/pswalk.c | 2 +- sys/contrib/dev/acpica/components/parser/psxface.c | 2 +- .../dev/acpica/components/resources/rsaddr.c | 14 +- .../dev/acpica/components/resources/rscalc.c | 33 ++- .../dev/acpica/components/resources/rscreate.c | 10 +- .../dev/acpica/components/resources/rsdump.c | 2 +- .../dev/acpica/components/resources/rsdumpinfo.c | 21 +- .../dev/acpica/components/resources/rsinfo.c | 7 +- sys/contrib/dev/acpica/components/resources/rsio.c | 2 +- .../dev/acpica/components/resources/rsirq.c | 14 +- .../dev/acpica/components/resources/rslist.c | 11 +- .../dev/acpica/components/resources/rsmemory.c | 2 +- .../dev/acpica/components/resources/rsmisc.c | 11 +- .../dev/acpica/components/resources/rsserial.c | 46 +++- .../dev/acpica/components/resources/rsutils.c | 2 +- .../dev/acpica/components/resources/rsxface.c | 2 +- sys/contrib/dev/acpica/components/tables/tbdata.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfadt.c | 2 +- sys/contrib/dev/acpica/components/tables/tbfind.c | 2 +- .../dev/acpica/components/tables/tbinstal.c | 2 +- sys/contrib/dev/acpica/components/tables/tbprint.c | 3 +- sys/contrib/dev/acpica/components/tables/tbutils.c | 7 +- sys/contrib/dev/acpica/components/tables/tbxface.c | 2 +- .../dev/acpica/components/tables/tbxfload.c | 2 +- .../dev/acpica/components/tables/tbxfroot.c | 2 +- .../dev/acpica/components/utilities/utaddress.c | 2 +- .../dev/acpica/components/utilities/utalloc.c | 2 +- .../dev/acpica/components/utilities/utascii.c | 2 +- .../dev/acpica/components/utilities/utbuffer.c | 2 +- .../dev/acpica/components/utilities/utcache.c | 2 +- .../dev/acpica/components/utilities/utcksum.c | 4 +- .../dev/acpica/components/utilities/utcopy.c | 2 +- .../dev/acpica/components/utilities/utdebug.c | 2 +- .../dev/acpica/components/utilities/utdecode.c | 2 +- .../dev/acpica/components/utilities/utdelete.c | 2 +- .../dev/acpica/components/utilities/uterror.c | 2 +- .../dev/acpica/components/utilities/uteval.c | 2 +- .../dev/acpica/components/utilities/utexcep.c | 2 +- .../dev/acpica/components/utilities/utglobal.c | 2 +- .../dev/acpica/components/utilities/uthex.c | 2 +- .../dev/acpica/components/utilities/utids.c | 2 +- .../dev/acpica/components/utilities/utinit.c | 2 +- .../dev/acpica/components/utilities/utlock.c | 2 +- .../dev/acpica/components/utilities/utmath.c | 2 +- .../dev/acpica/components/utilities/utmisc.c | 2 +- .../dev/acpica/components/utilities/utmutex.c | 2 +- .../dev/acpica/components/utilities/utnonansi.c | 2 +- .../dev/acpica/components/utilities/utobject.c | 2 +- .../dev/acpica/components/utilities/utosi.c | 2 +- .../dev/acpica/components/utilities/utownerid.c | 2 +- .../dev/acpica/components/utilities/utpredef.c | 2 +- .../dev/acpica/components/utilities/utresdecode.c | 15 +- .../dev/acpica/components/utilities/utresrc.c | 16 +- .../dev/acpica/components/utilities/utstate.c | 2 +- .../dev/acpica/components/utilities/utstring.c | 2 +- .../dev/acpica/components/utilities/utstrsuppt.c | 2 +- .../dev/acpica/components/utilities/utstrtoul64.c | 2 +- .../dev/acpica/components/utilities/uttrack.c | 2 +- .../dev/acpica/components/utilities/utuuid.c | 2 +- .../dev/acpica/components/utilities/utxface.c | 2 +- .../dev/acpica/components/utilities/utxferror.c | 2 +- .../dev/acpica/components/utilities/utxfinit.c | 2 +- .../dev/acpica/components/utilities/utxfmutex.c | 2 +- sys/contrib/dev/acpica/include/acapps.h | 4 +- sys/contrib/dev/acpica/include/acbuffer.h | 2 +- sys/contrib/dev/acpica/include/acclib.h | 2 +- sys/contrib/dev/acpica/include/accommon.h | 2 +- sys/contrib/dev/acpica/include/acconfig.h | 2 +- sys/contrib/dev/acpica/include/acconvert.h | 2 +- sys/contrib/dev/acpica/include/acdebug.h | 2 +- sys/contrib/dev/acpica/include/acdisasm.h | 45 +++- sys/contrib/dev/acpica/include/acdispat.h | 2 +- sys/contrib/dev/acpica/include/acevents.h | 2 +- sys/contrib/dev/acpica/include/acexcep.h | 2 +- sys/contrib/dev/acpica/include/acglobal.h | 2 +- sys/contrib/dev/acpica/include/achware.h | 2 +- sys/contrib/dev/acpica/include/acinterp.h | 2 +- sys/contrib/dev/acpica/include/aclocal.h | 5 +- sys/contrib/dev/acpica/include/acmacros.h | 2 +- sys/contrib/dev/acpica/include/acnames.h | 2 +- sys/contrib/dev/acpica/include/acnamesp.h | 2 +- sys/contrib/dev/acpica/include/acobject.h | 2 +- sys/contrib/dev/acpica/include/acopcode.h | 2 +- sys/contrib/dev/acpica/include/acoutput.h | 2 +- sys/contrib/dev/acpica/include/acparser.h | 2 +- sys/contrib/dev/acpica/include/acpi.h | 2 +- sys/contrib/dev/acpica/include/acpiosxf.h | 2 +- sys/contrib/dev/acpica/include/acpixf.h | 21 +- sys/contrib/dev/acpica/include/acpredef.h | 2 +- sys/contrib/dev/acpica/include/acresrc.h | 4 +- sys/contrib/dev/acpica/include/acrestyp.h | 41 ++- sys/contrib/dev/acpica/include/acstruct.h | 2 +- sys/contrib/dev/acpica/include/actables.h | 2 +- sys/contrib/dev/acpica/include/actbinfo.h | 21 +- sys/contrib/dev/acpica/include/actbl.h | 2 +- sys/contrib/dev/acpica/include/actbl1.h | 97 ++++++- sys/contrib/dev/acpica/include/actbl2.h | 244 ++++++++++++++++-- sys/contrib/dev/acpica/include/actbl3.h | 2 +- sys/contrib/dev/acpica/include/actypes.h | 8 +- sys/contrib/dev/acpica/include/acutils.h | 4 +- sys/contrib/dev/acpica/include/acuuid.h | 2 +- sys/contrib/dev/acpica/include/amlcode.h | 2 +- sys/contrib/dev/acpica/include/amlresrc.h | 27 +- sys/contrib/dev/acpica/include/platform/acenv.h | 4 +- sys/contrib/dev/acpica/include/platform/acenvex.h | 2 +- .../dev/acpica/include/platform/acfreebsd.h | 2 +- sys/contrib/dev/acpica/include/platform/acgcc.h | 13 +- sys/contrib/dev/acpica/include/platform/acgccex.h | 2 +- .../acpica/os_specific/service_layers/osunixxf.c | 2 +- 359 files changed, 2837 insertions(+), 557 deletions(-) diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh index 1a53d8c44ae1..034541cc69d7 100755 --- a/sys/contrib/dev/acpica/acpica_prep.sh +++ b/sys/contrib/dev/acpica/acpica_prep.sh @@ -21,10 +21,10 @@ stripdirs="generate libraries parsers preprocessor tests tools" stripfiles="Makefile README aslcompiler.y accygwin.h acdragonfly.h \ acdragonflyex.h acefi.h acefiex.h achaiku.h acintel.h aclinux.h \ aclinuxex.h acmacosx.h acmsvc.h acmsvcex.h acnetbsd.h acos2.h \ - acqnx.h acwin.h acwin64.h acwinex.h new_table.txt osbsdtbl.c \ - osefitbl.c osefixf.c osfreebsdtbl.c oslinuxtbl.c osunixdir.c \ - osunixmap.c oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c \ - utprint.c" + acqnx.h acwin.h acwin64.h acwinex.h aczephyr.h new_table.txt \ + osbsdtbl.c osefitbl.c osefixf.c osfreebsdtbl.c oslinuxtbl.c \ + osunixdir.c osunixmap.c oswindir.c oswintbl.c oswinxf.c \ + oszephyr.c readme.txt utclib.c utprint.c" # include files to canonify src_headers="acapps.h acbuffer.h acclib.h accommon.h acconfig.h \ diff --git a/sys/contrib/dev/acpica/changes.txt b/sys/contrib/dev/acpica/changes.txt index cf3c21898c51..af896ec7e0b0 100644 --- a/sys/contrib/dev/acpica/changes.txt +++ b/sys/contrib/dev/acpica/changes.txt @@ -1,3 +1,108 @@ +---------------------------------------- +31 March 2023. Summary of changes for version 20230331: + +This release is available at https://acpica.org/downloads + +0) Global changes: + + +Update all copyright notices to the year 2023. This effects all source +modules, as well as utility signons. +Add OS-specific support for Zephyr RTOS. +Fix miscellaneous code that accesses various objects. +Remove some dead code. +Add C ?Flexible Array? support. +Add support for 64 bit LoongArch compilation. +Add first batch of RISC-V related definitions. +Performed a global automated update to remove tabs, fix indentation +issues, etc. + +1) ACPICA kernel-resident subsystem: + +hwvalid: Drop port I/O validation. + +2) ACPICA tools and utilities: + +iASL: Added full macro support in the preprocessor. Example: +#define ABCD(a,b,c,d) a+b+c-d + +Known macro support limitations (at this time): + No support for multi-line #define macros (backslash continuation +lines) + No support for the C-style ternary operator + No support for the stringizing operator (#) + No support for the concatenation (token pasting) operator (##) + No support for variable number of macro arguments + +Add support for AMD Secure Processor Table (ASPT) version 1. +Add support for Arm's MPAM ACPI table version 2. +ACPI 6.5: MADT: add support for trace buffer extension in GICC. +Headers: Delete bogus NodeArray array of pointers from AEST table. +PHAT table support is still ongoing. + + +---------------------------------------- +20 October 2022. Summary of changes for version 20221020: + +This release is available at https://acpica.org/downloads + +0) Global changes: + +Allow disabling of -Werror. For distro maintainers having `-Werror` can +delay update of GCC. Since every GCC release might add new warnings that +were not yet captured, it might break the build of packages. With this +change, distros can now build with `NOWERROR=TRUE` instead of patching +either the errors or the makefiles. The default behavior keeps on using +`-Werror`. + +1) ACPICA kernel-resident subsystem: + +Added support for FFH Operation Region special context data. FFH(Fixed +Function Hardware) Opregion is approved to be added in ACPI 6.5 via code +first approach[1]. It requires special context data similar to GPIO and +Generic Serial Bus as it needs to know platform specific offset and +length. + +Reverted this commit "executer/exsystem: Warn about sleeps greater than +10 ms." Due to user complaints about valid sleeps greater than 10ms seen +in some existing machines -- generating lots of warnings. + +Do not touch VGA memory when EBDA < 1KiB. The ACPICA code assumes that +EBDA region must be at least 1KiB in size. Because this is not +guaranteed, it might happen that while scanning the memory for RSDP +pointer, the kernel touches memory above 640KiB. This is unwanted as the +VGA memory range may not be decoded or even present when running under +virtualization. + +Check that EBDA pointer is in valid memory. If the memory at 0x40e is +uninitialized, the retrieved physical memory address of EBDA may be +beyond the low memory (i.e. above 640K). If so, the kernel may +unintentionally access the VGA memory, that might not be decoded or even +present in case of virtualization. + +2) iASL Compiler/Disassembler and ACPICA tools: + +Completed the existing partial support for the CDAT "table". Although +this isn't technically an ACPI table (It doesn't go into the XSDT), it is +possible to support this table in the Data Table compiler. Created one +new file, "utilities/utcksum.c", used to centralize checksum +generation/validation into one location. Includes changes to makefiles +and MSVC project files. + +Updated support for the IORT table - update to version E.e + +Added CXL 3.0 structures (CXIMS & RDPAS) to the CEDT table + +iASL: Added CCEL table to both compiler/disassembler. + +iASL: NHLT table: Fixed compilation of optional undocumented fields + +iASL: Fix iASL compile error due to ACPI_TDEL_OFFSET. Commit # 10e4763 +("iASL: Add CCEL table to both compiler/disassembler") introduced the +iASL build issue. The issue is due to using ACPI_TDEL_OFFSET for CCEL +table member reference. To fix it, change ACPI_TDEL_OFFSET with +ACPI_CCEL_OFFSET. + ---------------------------------------- 31 March 2022. Summary of changes for version 20220331: diff --git a/sys/contrib/dev/acpica/common/acfileio.c b/sys/contrib/dev/acpica/common/acfileio.c index 819e7ceaa7e6..b6cb59bfe8df 100644 --- a/sys/contrib/dev/acpica/common/acfileio.c +++ b/sys/contrib/dev/acpica/common/acfileio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/acgetline.c b/sys/contrib/dev/acpica/common/acgetline.c index 7ad10510168e..04c052f8ca6c 100644 --- a/sys/contrib/dev/acpica/common/acgetline.c +++ b/sys/contrib/dev/acpica/common/acgetline.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/adfile.c b/sys/contrib/dev/acpica/common/adfile.c index a4639e30e4ac..c17946307eff 100644 --- a/sys/contrib/dev/acpica/common/adfile.c +++ b/sys/contrib/dev/acpica/common/adfile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/adisasm.c b/sys/contrib/dev/acpica/common/adisasm.c index 7aac349458d9..16a2bb7b18e5 100644 --- a/sys/contrib/dev/acpica/common/adisasm.c +++ b/sys/contrib/dev/acpica/common/adisasm.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -789,6 +789,7 @@ AdDoExternalFileList ( AcpiDmFinishNamespaceLoad (AcpiGbl_ParseOpRoot, AcpiGbl_RootNode, OwnerId); AcpiPsDeleteParseTree (AcpiGbl_ParseOpRoot); + AcpiGbl_ParseOpRoot = NULL; ExternalListHead = ExternalListHead->Next; } diff --git a/sys/contrib/dev/acpica/common/adwalk.c b/sys/contrib/dev/acpica/common/adwalk.c index 44b3485a21ba..31449ab9527d 100644 --- a/sys/contrib/dev/acpica/common/adwalk.c +++ b/sys/contrib/dev/acpica/common/adwalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/ahids.c b/sys/contrib/dev/acpica/common/ahids.c index 7c1aabdf8b89..3e21b04b2d58 100644 --- a/sys/contrib/dev/acpica/common/ahids.c +++ b/sys/contrib/dev/acpica/common/ahids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/ahpredef.c b/sys/contrib/dev/acpica/common/ahpredef.c index afad65543194..97655cfab6f7 100644 --- a/sys/contrib/dev/acpica/common/ahpredef.c +++ b/sys/contrib/dev/acpica/common/ahpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/ahtable.c b/sys/contrib/dev/acpica/common/ahtable.c index b925be84ec6b..838a773a248c 100644 --- a/sys/contrib/dev/acpica/common/ahtable.c +++ b/sys/contrib/dev/acpica/common/ahtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -202,6 +202,7 @@ const AH_TABLE AcpiGbl_SupportedTables[] = {ACPI_SIG_AEST, "Arm Error Source Table"}, {ACPI_SIG_AGDI, "Arm Generic Diagnostic Dump and Reset Device Interface Table"}, {ACPI_SIG_ASF, "Alert Standard Format Table"}, + {ACPI_SIG_ASPT, "AMD Secure Processor Table"}, {ACPI_SIG_BDAT, "BIOS Data ACPI Table"}, {ACPI_SIG_BERT, "Boot Error Record Table"}, {ACPI_SIG_BGRT, "Boot Graphics Resource Table"}, @@ -232,6 +233,7 @@ const AH_TABLE AcpiGbl_SupportedTables[] = {ACPI_SIG_MADT, "Multiple APIC Description Table (MADT)"}, {ACPI_SIG_MCFG, "Memory Mapped Configuration Table"}, {ACPI_SIG_MCHI, "Management Controller Host Interface Table"}, + {ACPI_SIG_MPAM, "Memory System Resource Partitioning and Monitoring Table"}, {ACPI_SIG_MPST, "Memory Power State Table"}, {ACPI_SIG_MSCT, "Maximum System Characteristics Table"}, {ACPI_SIG_MSDM, "Microsoft Data Management Table"}, @@ -244,6 +246,7 @@ const AH_TABLE AcpiGbl_SupportedTables[] = {ACPI_SIG_PPTT, "Processor Properties Topology Table"}, {ACPI_SIG_PRMT, "Platform Runtime Mechanism Table"}, {ACPI_SIG_RASF, "RAS Features Table"}, + {ACPI_SIG_RHCT, "RISC-V Hart Capabilities Table"}, {ACPI_SIG_RGRT, "Regulatory Graphics Resource Table"}, {ACPI_RSDP_NAME,"Root System Description Pointer"}, {ACPI_SIG_RSDT, "Root System Description Table"}, diff --git a/sys/contrib/dev/acpica/common/ahuuids.c b/sys/contrib/dev/acpica/common/ahuuids.c index 5e92903e0ecb..50b5346c10a0 100644 --- a/sys/contrib/dev/acpica/common/ahuuids.c +++ b/sys/contrib/dev/acpica/common/ahuuids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/cmfsize.c b/sys/contrib/dev/acpica/common/cmfsize.c index 2a0b907bae2f..fa45d20fd7f2 100644 --- a/sys/contrib/dev/acpica/common/cmfsize.c +++ b/sys/contrib/dev/acpica/common/cmfsize.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/dmextern.c b/sys/contrib/dev/acpica/common/dmextern.c index b9293282a24e..b021e49db857 100644 --- a/sys/contrib/dev/acpica/common/dmextern.c +++ b/sys/contrib/dev/acpica/common/dmextern.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -1493,7 +1493,6 @@ AcpiDmMarkExternalConflict ( ACPI_EXTERNAL_LIST *ExternalList = AcpiGbl_ExternalList; char *ExternalPath; char *InternalPath; - char *Temp; ACPI_STATUS Status; @@ -1526,13 +1525,6 @@ AcpiDmMarkExternalConflict ( while (ExternalList) { - Temp = ExternalList->InternalPath; - if ((*ExternalList->InternalPath == AML_ROOT_PREFIX) && - (ExternalList->InternalPath[1])) - { - Temp++; - } - if (!strcmp (ExternalList->InternalPath, InternalPath)) { ExternalList->Flags |= ACPI_EXT_CONFLICTING_DECLARATION; diff --git a/sys/contrib/dev/acpica/common/dmrestag.c b/sys/contrib/dev/acpica/common/dmrestag.c index e26f3d092a3c..c6ae1d452705 100644 --- a/sys/contrib/dev/acpica/common/dmrestag.c +++ b/sys/contrib/dev/acpica/common/dmrestag.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -480,6 +480,14 @@ static const ACPI_RESOURCE_TAG AcpiDmIoFlagTags[] = {0, NULL} }; +/* Subtype tables for ClockInput descriptor */ + +static const ACPI_RESOURCE_TAG AcpiDmClockInputTags[] = +{ + {( 6 * 8), ACPI_RESTAG_FQD}, + {( 8 * 8), ACPI_RESTAG_FQN}, + {0, NULL} +}; /* * Dispatch table used to obtain the correct tag table for a descriptor. @@ -531,6 +539,7 @@ static const ACPI_RESOURCE_TAG *AcpiGbl_ResourceTags[] = NULL, /* 0x10, ACPI_RESOURCE_NAME_PIN_GROUP */ AcpiDmPinGroupFunctionTags, /* 0x11, ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION */ AcpiDmPinConfigTags, /* 0x12, ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG - Same as PinConfig */ + AcpiDmClockInputTags, /* 0x13, ACPI_RESOURCE_NAME_CLOCK_INPUT */ }; /* GPIO Subtypes */ diff --git a/sys/contrib/dev/acpica/common/dmswitch.c b/sys/contrib/dev/acpica/common/dmswitch.c index 9cad863b6c03..7b94a3c9c7d0 100644 --- a/sys/contrib/dev/acpica/common/dmswitch.c +++ b/sys/contrib/dev/acpica/common/dmswitch.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/dmtable.c b/sys/contrib/dev/acpica/common/dmtable.c index c5582530d497..0d7cdceb5b4a 100644 --- a/sys/contrib/dev/acpica/common/dmtable.c +++ b/sys/contrib/dev/acpica/common/dmtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -234,6 +234,14 @@ static const char *AcpiDmAsfSubnames[] = "Unknown Subtable Type" /* Reserved */ }; +static const char *AcpiDmAsptSubnames[] = +{ + "ASPT Global Registers", + "ASPT SEV Mailbox Registers", + "ASPT ACPI Mailbox Registers", + "Unknown Subtable Type" /* Reserved */ +}; + static const char *AcpiDmCdatSubnames[] = { "Device Scoped Memory Affinity Structure (DSMAS)", @@ -421,10 +429,22 @@ static const char *AcpiDmMadtSubnames[] = "MSI Interrupt Controller", /* ACPI_MADT_TYPE_MSI_PIC */ "Bridge I/O Interrupt Controller", /* ACPI_MADT_TYPE_BIO_PIC */ "LPC Interrupt Controller", /* ACPI_MADT_TYPE_LPC_PIC */ + "RISC-V Interrupt Controller", /* ACPI_MADT_TYPE_RINTC */ "Unknown Subtable Type", /* Reserved */ "Types 80-FF are used for OEM data" /* Reserved for OEM data */ }; +static const char *AcpiDmMpamSubnames[] = +{ + "Processor cache", /* ACPI_MPAM_LOCATION_TYPE_PROCESSOR_CACHE */ + "Memory", /* ACPI_MPAM_LOCATION_TYPE_MEMORY */ + "SMMU", /* ACPI_MPAM_LOCATION_TYPE_SMMU */ + "Memory-side cache", /* ACPI_MPAM_LOCATION_TYPE_MEMORY_CACHE */ + "ACPI device", /* ACPI_MPAM_LOCATION_TYPE_ACPI_DEVICE */ + "Interconnect", /* ACPI_MPAM_LOCATION_TYPE_INTERCONNECT */ + "Unknown" /* ACPI_MPAM_LOCATION_TYPE_UNKNOWN */ +}; + static const char *AcpiDmNfitSubnames[] = { "System Physical Address Range", /* ACPI_NFIT_TYPE_SYSTEM_ADDRESS */ @@ -672,6 +692,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = {ACPI_SIG_AGDI, AcpiDmTableInfoAgdi, NULL, NULL, TemplateAgdi}, {ACPI_SIG_APMT, NULL, AcpiDmDumpApmt, DtCompileApmt, TemplateApmt}, {ACPI_SIG_ASF, NULL, AcpiDmDumpAsf, DtCompileAsf, TemplateAsf}, + {ACPI_SIG_ASPT, NULL, AcpiDmDumpAspt, DtCompileAspt, TemplateAspt}, {ACPI_SIG_BDAT, AcpiDmTableInfoBdat, NULL, NULL, TemplateBdat}, {ACPI_SIG_BERT, AcpiDmTableInfoBert, NULL, NULL, TemplateBert}, {ACPI_SIG_BGRT, AcpiDmTableInfoBgrt, NULL, NULL, TemplateBgrt}, @@ -700,6 +721,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = {ACPI_SIG_MADT, NULL, AcpiDmDumpMadt, DtCompileMadt, TemplateMadt}, {ACPI_SIG_MCFG, NULL, AcpiDmDumpMcfg, DtCompileMcfg, TemplateMcfg}, {ACPI_SIG_MCHI, AcpiDmTableInfoMchi, NULL, NULL, TemplateMchi}, + {ACPI_SIG_MPAM, NULL, AcpiDmDumpMpam, DtCompileMpam, TemplateMpam}, {ACPI_SIG_MPST, AcpiDmTableInfoMpst, AcpiDmDumpMpst, DtCompileMpst, TemplateMpst}, {ACPI_SIG_MSCT, NULL, AcpiDmDumpMsct, DtCompileMsct, TemplateMsct}, {ACPI_SIG_MSDM, NULL, AcpiDmDumpSlic, DtCompileSlic, TemplateMsdm}, @@ -713,6 +735,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = {ACPI_SIG_PRMT, NULL, AcpiDmDumpPrmt, DtCompilePrmt, TemplatePrmt}, {ACPI_SIG_RASF, AcpiDmTableInfoRasf, NULL, NULL, TemplateRasf}, {ACPI_SIG_RGRT, NULL, AcpiDmDumpRgrt, DtCompileRgrt, TemplateRgrt}, + {ACPI_SIG_RHCT, NULL, AcpiDmDumpRhct, DtCompileRhct, TemplateRhct}, {ACPI_SIG_RSDT, NULL, AcpiDmDumpRsdt, DtCompileRsdt, TemplateRsdt}, {ACPI_SIG_S3PT, NULL, NULL, NULL, TemplateS3pt}, {ACPI_SIG_SBST, AcpiDmTableInfoSbst, NULL, NULL, TemplateSbst}, @@ -1128,6 +1151,7 @@ AcpiDmDumpTable ( case ACPI_DMT_IVRS_DE: case ACPI_DMT_GTDT: case ACPI_DMT_MADT: + case ACPI_DMT_MPAM_LOCATOR: case ACPI_DMT_NHLT1: case ACPI_DMT_NHLT1a: case ACPI_DMT_NHLT1b: @@ -1158,6 +1182,7 @@ AcpiDmDumpTable ( ByteLength = 1; break; + case ACPI_DMT_ASPT: case ACPI_DMT_UINT16: case ACPI_DMT_DMAR: case ACPI_DMT_HEST: @@ -1375,7 +1400,7 @@ AcpiDmDumpTable ( AcpiOsPrintf ("%2.2X\n", (*Target >> 2) & 0xFF); break; - case ACPI_DMT_FLAGS4: + case ACPI_DMT_FLAGS4: AcpiOsPrintf ("%1.1X\n", (*Target >> 4) & 0x03); break; @@ -1661,6 +1686,17 @@ AcpiDmDumpTable ( AcpiDmAestXruptNames[Temp8]); break; + case ACPI_DMT_ASPT: + /* ASPT subtable types */ + Temp16 = ACPI_GET16(Target); + if (Temp16 > ACPI_ASPT_TYPE_UNKNOWN) + { + Temp16 = ACPI_ASPT_TYPE_UNKNOWN; + } + + AcpiOsPrintf(UINT16_FORMAT, Temp16, AcpiDmAsptSubnames[Temp16]); + break; + case ACPI_DMT_ASF: /* ASF subtable types */ @@ -1890,6 +1926,20 @@ AcpiDmDumpTable ( AcpiDmMadtSubnames[Temp8]); break; + case ACPI_DMT_MPAM_LOCATOR: + + /* MPAM subtable locator types */ + + Temp8 = *Target; + if (Temp8 > ACPI_MPAM_LOCATION_TYPE_INTERCONNECT) + { + Temp8 = ACPI_MPAM_LOCATION_TYPE_INTERCONNECT + 1; + } + + AcpiOsPrintf (UINT8_FORMAT, *Target, + AcpiDmMpamSubnames[Temp8]); + break; + case ACPI_DMT_NFIT: /* NFIT subtable types */ diff --git a/sys/contrib/dev/acpica/common/dmtables.c b/sys/contrib/dev/acpica/common/dmtables.c index 72af05952701..1556d1403a63 100644 --- a/sys/contrib/dev/acpica/common/dmtables.c +++ b/sys/contrib/dev/acpica/common/dmtables.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/dmtbdump.c b/sys/contrib/dev/acpica/common/dmtbdump.c index e4bb62eaab6e..a370fd551f1f 100644 --- a/sys/contrib/dev/acpica/common/dmtbdump.c +++ b/sys/contrib/dev/acpica/common/dmtbdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License diff --git a/sys/contrib/dev/acpica/common/dmtbdump1.c b/sys/contrib/dev/acpica/common/dmtbdump1.c index 1c40e5f6def8..f72555dfe4a7 100644 --- a/sys/contrib/dev/acpica/common/dmtbdump1.c +++ b/sys/contrib/dev/acpica/common/dmtbdump1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2023, Intel Corp. * All rights reserved. * * 2. License @@ -609,6 +609,95 @@ AcpiDmDumpAsf ( } } +/******************************************************************************* + * + * FUNCTION: AcpiDmDumpAspt + * + * PARAMETERS: Table - A ASPT table + * + * RETURN: None + * + * DESCRIPTION: Format the contents of a ASPT table + * + ******************************************************************************/ + +void +AcpiDmDumpAspt ( + ACPI_TABLE_HEADER *Table) +{ + ACPI_STATUS Status; + UINT32 Offset = sizeof (ACPI_TABLE_ASPT); + UINT32 Length = Table->Length; + ACPI_ASPT_HEADER *Subtable; + ACPI_DMTABLE_INFO *InfoTable; + UINT16 Type; + + /* Main table */ + Status = AcpiDmDumpTable(Length, 0, Table, 0, AcpiDmTableInfoAspt); + + /* Subtables */ + + Subtable = ACPI_ADD_PTR (ACPI_ASPT_HEADER, Table, Offset); + while (Offset < Table->Length) + { + AcpiOsPrintf ("\n"); + + /* Common subtable header */ + Status = AcpiDmDumpTable (Table->Length, Offset, Subtable, + Subtable->Length, AcpiDmTableInfoAsptHdr); + if (ACPI_FAILURE (Status)) + { + return; + } + + Type = Subtable->Type; + + switch (Type) + { + case ACPI_ASPT_TYPE_GLOBAL_REGS: + + InfoTable = AcpiDmTableInfoAspt0; + break; + + case ACPI_ASPT_TYPE_SEV_MBOX_REGS: + *** 8496 LINES SKIPPED *** From nobody Wed Jan 31 04:06:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPpPH5zwjz58LBH; Wed, 31 Jan 2024 04:06: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 4TPpPH42tNz4Tb0; Wed, 31 Jan 2024 04:06:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706673971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwtFPcQaCNrfTLliy8SQtvRHUonS3rxmXOt2tMLnsfg=; b=u4vyN6nqmHyq5Dgx8R62QyufxlmV8BGZGjZ16RLZwyUR1Qz7vGHbZiv5DsGq6T6qPvbnMZ hbRj4JBZZaduVvetaMj6hlhwIUb9DqEOLHDC9KDZbQIjuBxpSWcZ0a3vx6X1+fjUCCG1sx vXxcSg/PwGLdHDJEyCz35YCA8IKbKsOFxs5tCy3Eb5n+2TeqYS6MOWxaVZ4CVuao59dHWS 46D0MK4vNndq5JilmnyAohvelILlanX8pcO2r0GJaBr7YiYzJTtzwfoeQ4rojcc7/ldGJM 8LJ0P8AsdC0I0VDeQkX4U59U5m/iyaGK/y6cuj71jxkM/QmGYeE56uqMO/q0Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706673971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AwtFPcQaCNrfTLliy8SQtvRHUonS3rxmXOt2tMLnsfg=; b=R5ED6fu2ZEoFAj6jqGi8sV/Ws9hGFZnwvjM1vlpcq43bfvo2lUYAPeLlqL21PzfNk7a4tN 5bRlJz6OXXnzLhU/uAT8V0lItWaP4/Por+zpWgcOjknf4zXccquvBzS7mTeylOi27fjg5Y n9OH2/ZVOD55PYUauo9z+ukiTskhWMarMh6TCOjp6hdwYNgEYHs96LS9WHjwD9dy9CawIT VFK7SXOpWQKCp/sF2ymmM6Of18sZcXAfqH1L1EhR9VG0ifT9TL2ISLYar/hl3UlhFG72eW V23o9yrOluwEkLhodo/MgLyBlJb1Kz5TXSACd5M3SAYQPeYfsYv2fGNnOez+/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706673971; a=rsa-sha256; cv=none; b=yKSgqerGDy3Aj0ar2iQ8jbiO8kIHHdlNHmu0coriSRBkVC41sRQMu6mf8Y99YVC4OVfua2 kwRE6f78CmduOB2Uh2G2BHfB9dM0kNsd54X0GdjwUkzZKOdyXLJv3vssB7Q73deidXN16u 3+X/alHWRh25jiwxJfxvnv2lYwK49LOvA6tCLNAGt4/ZRoyVBow1lSsDYF2q/M+5fJWCq+ LyrGepswQle0ml6kJ1PgpTyt1AtSAstWJpYq70mgkmkxSCicIgTtAWUa5rFSzqYcMOU0wt ZKoBnNgSDg2NoojaqzEDZVuIbCpNI1i3KXGjcGLCtj/J5u1BdSfG8AOXr49B6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPpPH37CGz13Rq; Wed, 31 Jan 2024 04:06: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 40V46B97000879; Wed, 31 Jan 2024 04:06:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V46B9a000876; Wed, 31 Jan 2024 04:06:11 GMT (envelope-from git) Date: Wed, 31 Jan 2024 04:06:11 GMT Message-Id: <202401310406.40V46B9a000876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07c64d74917e7c8ca61c77413dbd533390e7dca7 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=07c64d74917e7c8ca61c77413dbd533390e7dca7 commit 07c64d74917e7c8ca61c77413dbd533390e7dca7 Author: Jung-uk Kim AuthorDate: 2024-01-30 21:49:20 +0000 Commit: Jung-uk Kim CommitDate: 2024-01-31 03:58:33 +0000 acpica: Import ACPICA 20230628 (cherry picked from commit ef3ba9d625927fd4592a8c071698a562821485bd) --- sys/contrib/dev/acpica/changes.txt | 30 ++++ sys/contrib/dev/acpica/common/ahpredef.c | 1 + sys/contrib/dev/acpica/common/dmtable.c | 26 ++++ sys/contrib/dev/acpica/common/dmtbdump2.c | 83 +++++++++- sys/contrib/dev/acpica/common/dmtbinfo1.c | 2 +- sys/contrib/dev/acpica/common/dmtbinfo2.c | 173 ++++++++++++++++++++- sys/contrib/dev/acpica/compiler/aslrestype2.c | 6 +- sys/contrib/dev/acpica/compiler/dttable2.c | 67 +++++++- sys/contrib/dev/acpica/compiler/dttemplate.h | 51 ++++-- .../dev/acpica/components/debugger/dbcmds.c | 59 ++++++- .../dev/acpica/components/debugger/dbinput.c | 8 + .../dev/acpica/components/disassembler/dmresrcl.c | 2 +- .../dev/acpica/components/dispatcher/dswstate.c | 4 +- sys/contrib/dev/acpica/components/events/evevent.c | 11 +- .../dev/acpica/components/executer/exserial.c | 3 +- .../dev/acpica/components/hardware/hwsleep.c | 11 -- .../dev/acpica/components/parser/psopcode.c | 2 +- .../dev/acpica/components/resources/rsaddr.c | 2 +- .../dev/acpica/components/resources/rscreate.c | 8 +- .../dev/acpica/components/resources/rsdumpinfo.c | 8 +- .../dev/acpica/components/resources/rsirq.c | 12 +- .../dev/acpica/components/utilities/utdebug.c | 5 + .../dev/acpica/components/utilities/utglobal.c | 1 - sys/contrib/dev/acpica/include/acdebug.h | 4 + sys/contrib/dev/acpica/include/acdisasm.h | 13 ++ sys/contrib/dev/acpica/include/acglobal.h | 1 + sys/contrib/dev/acpica/include/aclocal.h | 29 ++-- sys/contrib/dev/acpica/include/acnames.h | 1 + sys/contrib/dev/acpica/include/acpixf.h | 2 +- sys/contrib/dev/acpica/include/acpredef.h | 3 + sys/contrib/dev/acpica/include/acrestyp.h | 8 +- sys/contrib/dev/acpica/include/actbinfo.h | 15 +- sys/contrib/dev/acpica/include/actbl1.h | 4 +- sys/contrib/dev/acpica/include/actbl2.h | 81 +++++++++- sys/contrib/dev/acpica/include/actbl3.h | 4 +- sys/contrib/dev/acpica/include/actypes.h | 3 +- sys/contrib/dev/acpica/include/amlresrc.h | 2 +- sys/contrib/dev/acpica/include/platform/acgcc.h | 2 +- 38 files changed, 651 insertions(+), 96 deletions(-) diff --git a/sys/contrib/dev/acpica/changes.txt b/sys/contrib/dev/acpica/changes.txt index af896ec7e0b0..edcc674d90ab 100644 --- a/sys/contrib/dev/acpica/changes.txt +++ b/sys/contrib/dev/acpica/changes.txt @@ -1,4 +1,34 @@ ---------------------------------------- +28 June 2023. Summary of changes for version 20230628: + +0) Global changes: + +Fixed a problem with the ASL/AML Timer() operator. Discovered by UBSAN: ?array-index-out-of-bounds in acpica/dswexec.c:401:12 index -1 is out of range for type 'acpi_operand_object?. Added AML_NO_OPERAND_RESOLVE flag to Timer (since there are no runtime arguments). Reported by: Abhishek Mainkar abmainkar@nvidia.com. + +Added a define for size of acpi_srat_generic_affinity DeviceHandle. Replaced a magic number with a define. The Linux kernel code will utilize this. Reported by Dave Jiang dave.jiang@intel.com. + +Added support for _DSC (Deepest State for Configuration) as per ACPI 6.5. + +1) ACPICA kernel-resident subsystem: + +Added port definitions for CDAT SSLBIS. Add upstream port and any port definitions for SSLBIS. Reported by: Dave Jiang dave.jiang@intel.com. + +Fixed misspelled CDAT DSMAS define: ACPI_CEDT_DSMAS_NON_VOLATILE -> ACPI_CDAT_DSMAS_NON_VOLATILE. Reported by: Dave Jiang dave.jiang@intel.com. + +1) ACPICA kernel-resident subsystem: + +Fix GCC 12 dangling-pointer warning. We're storing a persistent pointer to an ephemeral local variable which technically is a dangling pointer and the compiler is correct. However, since we never indirect the pointer, this is a safe operation and we can suppress the warning. + +Also, some C run-times (like MUSL) aren't including indirectly so we must include it explicitly or we won't have the type definition for uintptr_t. + +2) iASL Compiler/Disassembler and ACPICA tools:. + +IASL/RHCT: Enable dumping and compiling newly added nodes. The RHCT table is updated with new nodes. Add compile and dump functionality for these new structures. + +AcpiExec: Added a new command, ?interrupt?. The Interrupt command simulates an interrupt with a IntID (GSIV) equal to the first argument of the call/invocation. The acpiexec code simulates the behavior by OSPM: execute the _EVT method of the GED device associated with that IntID. Submitted by: Jose Marinho jose.marinho@arm.com. + +AcpiExec: Detect GED device and keep track of _EVT. The GED device is described by a _HID of ACPI0013. This code traverses the namespace identifying all GED devices. For each GED device in the namespace we record the Interrupt object and the _EVT method. This information is used when an interrupt is simulated via the ?interrupt? command. Submitted by: Jose Marinho jose.marinho@arm.com. +---------------------------------------- 31 March 2023. Summary of changes for version 20230331: This release is available at https://acpica.org/downloads diff --git a/sys/contrib/dev/acpica/common/ahpredef.c b/sys/contrib/dev/acpica/common/ahpredef.c index 97655cfab6f7..38653468560e 100644 --- a/sys/contrib/dev/acpica/common/ahpredef.c +++ b/sys/contrib/dev/acpica/common/ahpredef.c @@ -234,6 +234,7 @@ const AH_PREDEFINED_NAME AslPredefinedInfo[] = AH_PREDEF ("_DMA", "Direct Memory Access", "Returns device current resources for DMA transactions, and resource field"), AH_PREDEF ("_DOD", "Display Output Devices", "Enumerate all devices attached to the display adapter"), AH_PREDEF ("_DOS", "Disable Output Switching", "Sets the display output switching mode"), + AH_PREDEF ("_DSC", "Deepest State for Configuration", "Returns the deepest D-state of the device to the OSPM"), AH_PREDEF ("_DPL", "Device Selection Polarity", "Polarity of Device Selection signal, Resource Descriptor field"), AH_PREDEF ("_DRS", "Drive Strength", "Drive Strength setting for GPIO connection, Resource Descriptor field"), AH_PREDEF ("_DSD", "Device-Specific Data", "Returns a list of device property information"), diff --git a/sys/contrib/dev/acpica/common/dmtable.c b/sys/contrib/dev/acpica/common/dmtable.c index 0d7cdceb5b4a..80aa700bb5e7 100644 --- a/sys/contrib/dev/acpica/common/dmtable.c +++ b/sys/contrib/dev/acpica/common/dmtable.c @@ -430,6 +430,9 @@ static const char *AcpiDmMadtSubnames[] = "Bridge I/O Interrupt Controller", /* ACPI_MADT_TYPE_BIO_PIC */ "LPC Interrupt Controller", /* ACPI_MADT_TYPE_LPC_PIC */ "RISC-V Interrupt Controller", /* ACPI_MADT_TYPE_RINTC */ + "RISC-V Incoming MSI Controller", /* ACPI_MADT_TYPE_IMSIC */ + "RISC-V APLIC Controller", /* ACPI_MADT_TYPE_APLIC */ + "RISC-V PLIC Controller", /* ACPI_MADT_TYPE_PLIC */ "Unknown Subtable Type", /* Reserved */ "Types 80-FF are used for OEM data" /* Reserved for OEM data */ }; @@ -669,6 +672,14 @@ static const char *AcpiDmGasAccessWidth[] = "Unknown Width Encoding" }; +static const char *AcpiDmRhctSubnames[] = +{ + "RISC-V ISA string structure", /* ACPI_RHCT_ISA_STRING */ + "RISC-V CMO node structure", /* ACPI_RHCT_CMO_NODE */ + "RISC-V MMU node structure", /* ACPI_RHCT_MMU_NODE */ + "RISC-V Hart Info structure", /* ACPI_RHCT_HART_INFO */ +}; + /******************************************************************************* * @@ -1190,6 +1201,7 @@ AcpiDmDumpTable ( case ACPI_DMT_NFIT: case ACPI_DMT_NHLT1e: case ACPI_DMT_PHAT: + case ACPI_DMT_RHCT: ByteLength = 2; break; @@ -2169,6 +2181,20 @@ AcpiDmDumpTable ( AcpiDmRgrtSubnames[Temp8]); break; + case ACPI_DMT_RHCT: + + /* RHCT subtable types */ + + Temp16 = ACPI_GET16 (Target); + if (Temp16 == ACPI_RHCT_NODE_TYPE_HART_INFO) + { + Temp16 = ACPI_RHCT_NODE_TYPE_RESERVED; + } + + AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target), + AcpiDmRhctSubnames[Temp16]); + break; + case ACPI_DMT_SDEV: /* SDEV subtable types */ diff --git a/sys/contrib/dev/acpica/common/dmtbdump2.c b/sys/contrib/dev/acpica/common/dmtbdump2.c index 61f62fee8315..6c94ac7bf04a 100644 --- a/sys/contrib/dev/acpica/common/dmtbdump2.c +++ b/sys/contrib/dev/acpica/common/dmtbdump2.c @@ -990,6 +990,61 @@ AcpiDmDumpMadt ( InfoTable = AcpiDmTableInfoMadt16; break; + case ACPI_MADT_TYPE_CORE_PIC: + + InfoTable = AcpiDmTableInfoMadt17; + break; + + case ACPI_MADT_TYPE_LIO_PIC: + + InfoTable = AcpiDmTableInfoMadt18; + break; + + case ACPI_MADT_TYPE_HT_PIC: + + InfoTable = AcpiDmTableInfoMadt19; + break; + + case ACPI_MADT_TYPE_EIO_PIC: + + InfoTable = AcpiDmTableInfoMadt20; + break; + + case ACPI_MADT_TYPE_MSI_PIC: + + InfoTable = AcpiDmTableInfoMadt21; + break; + + case ACPI_MADT_TYPE_BIO_PIC: + + InfoTable = AcpiDmTableInfoMadt22; + break; + + case ACPI_MADT_TYPE_LPC_PIC: + + InfoTable = AcpiDmTableInfoMadt23; + break; + + case ACPI_MADT_TYPE_RINTC: + + InfoTable = AcpiDmTableInfoMadt24; + break; + + case ACPI_MADT_TYPE_IMSIC: + + InfoTable = AcpiDmTableInfoMadt25; + break; + + case ACPI_MADT_TYPE_APLIC: + + InfoTable = AcpiDmTableInfoMadt26; + break; + + case ACPI_MADT_TYPE_PLIC: + + InfoTable = AcpiDmTableInfoMadt27; + break; + default: if ((Subtable->Type >= ACPI_MADT_TYPE_RESERVED) && @@ -1021,7 +1076,7 @@ AcpiDmDumpMadt ( /* Dump the OEM data */ Status = AcpiDmDumpTable (Length, Offset, ACPI_CAST_PTR (UINT8, Table) + Offset, - Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt17); + Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt128); if (ACPI_FAILURE (Status)) { return; @@ -1058,16 +1113,16 @@ NextSubtable: Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, Subtable->Length); - DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", - Subtable, Subtable->Length); - DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", - ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); - Offset = ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table); if (Offset >= Table->Length) { return; } + + DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", + Subtable, Subtable->Length); + DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); } } @@ -2765,6 +2820,8 @@ AcpiDmDumpRhct ( ACPI_RHCT_NODE_HEADER *Subtable; ACPI_RHCT_HART_INFO *RhctHartInfo; ACPI_RHCT_ISA_STRING *RhctIsaString; + ACPI_RHCT_CMO_NODE *RhctCmoNode; + ACPI_RHCT_MMU_NODE *RhctMmuNode; UINT32 Length = Table->Length; UINT8 SubtableOffset, IsaPadOffset; UINT32 Offset = sizeof (ACPI_TABLE_RHCT); @@ -2850,6 +2907,20 @@ AcpiDmDumpRhct ( (Subtable->Length - IsaPadOffset), AcpiDmTableInfoRhctIsaPad); } + break; + + case ACPI_RHCT_NODE_TYPE_CMO: + RhctCmoNode = ACPI_ADD_PTR (ACPI_RHCT_CMO_NODE, Subtable, SubtableOffset); + Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset, + RhctCmoNode, 4, AcpiDmTableInfoRhctCmo1); + break; + + case ACPI_RHCT_NODE_TYPE_MMU: + RhctMmuNode = ACPI_ADD_PTR (ACPI_RHCT_MMU_NODE, Subtable, SubtableOffset); + Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset, + RhctMmuNode, 2, AcpiDmTableInfoRhctMmu1); + break; + default: break; } diff --git a/sys/contrib/dev/acpica/common/dmtbinfo1.c b/sys/contrib/dev/acpica/common/dmtbinfo1.c index 058bb2e72215..d53ec515cbde 100644 --- a/sys/contrib/dev/acpica/common/dmtbinfo1.c +++ b/sys/contrib/dev/acpica/common/dmtbinfo1.c @@ -947,7 +947,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[] = { {ACPI_DMT_UINT24, ACPI_DMAR4_OFFSET (Reserved[0]), "Reserved", 0}, {ACPI_DMT_UINT8, ACPI_DMAR4_OFFSET (DeviceNumber), "Device Number", 0}, - {ACPI_DMT_STRING, ACPI_DMAR4_OFFSET (u.DeviceName[0]), "Device Name", 0}, + {ACPI_DMT_STRING, ACPI_DMAR4_OFFSET (DeviceName[0]), "Device Name", 0}, ACPI_DMT_TERMINATOR }; diff --git a/sys/contrib/dev/acpica/common/dmtbinfo2.c b/sys/contrib/dev/acpica/common/dmtbinfo2.c index e1e325dec277..9a3bf952fe40 100644 --- a/sys/contrib/dev/acpica/common/dmtbinfo2.c +++ b/sys/contrib/dev/acpica/common/dmtbinfo2.c @@ -678,8 +678,6 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoLpit0[] = {ACPI_DMT_UINT64, ACPI_LPIT0_OFFSET (CounterFrequency), "Counter Frequency", 0}, ACPI_DMT_TERMINATOR }; - - /******************************************************************************* * * MADT - Multiple APIC Description Table and subtables @@ -926,12 +924,155 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[] = ACPI_DMT_TERMINATOR }; -/* 17: OEM data structure */ +/* 17: core interrupt controller */ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT17_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (ProcessorId), "ProcessorId", 0}, + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (CoreId), "CoreId", 0}, + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (Flags), "Flags", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 18: Legacy I/O interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt18[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT18_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT64, ACPI_MADT18_OFFSET (Address), "Address", 0}, + {ACPI_DMT_UINT16, ACPI_MADT18_OFFSET (Size), "Size", 0}, + {ACPI_DMT_UINT16, ACPI_MADT18_OFFSET (Cascade), "Cascade", 0}, + {ACPI_DMT_UINT64, ACPI_MADT18_OFFSET (CascadeMap), "CascadeMap", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 19: HT interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt19[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT19_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT64, ACPI_MADT19_OFFSET (Address), "Address", 0}, + {ACPI_DMT_UINT16, ACPI_MADT19_OFFSET (Size), "Size", 0}, + {ACPI_DMT_UINT64, ACPI_MADT19_OFFSET (Cascade), "Cascade", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 20: Extend I/O interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt20[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Cascade), "Cascade", 0}, + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Node), "Node", 0}, + {ACPI_DMT_UINT64, ACPI_MADT20_OFFSET (NodeMap), "NodeMap", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 21: MSI controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt21[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT21_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT64, ACPI_MADT21_OFFSET (MsgAddress), "MsgAddress", 0}, + {ACPI_DMT_UINT32, ACPI_MADT21_OFFSET (Start), "Start", 0}, + {ACPI_DMT_UINT32, ACPI_MADT21_OFFSET (Count), "Count", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 22: BIO interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt22[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT22_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT64, ACPI_MADT22_OFFSET (Address), "Address", 0}, + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (Size), "Size", 0}, + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (Id), "Id", 0}, + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (GsiBase), "GsiBase", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 23: LPC interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt23[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT23_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT64, ACPI_MADT23_OFFSET (Address), "Address", 0}, + {ACPI_DMT_UINT16, ACPI_MADT23_OFFSET (Size), "Size", 0}, + {ACPI_DMT_UINT8, ACPI_MADT23_OFFSET (Cascade), "Cascade", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 24: RINTC interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt24[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT24_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT8, ACPI_MADT24_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT64, ACPI_MADT24_OFFSET (HartId), "HartId", 0}, + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (Uid), "Uid", 0}, + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (ExtIntcId), "ExtIntcId", 0}, + {ACPI_DMT_UINT64, ACPI_MADT24_OFFSET (ImsicAddr), "ImsicAddr", 0}, + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (ImsicSize), "ImsicSize", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 25: RISC-V IMSIC interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt25[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_MADT25_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT16, ACPI_MADT25_OFFSET (NumIds), "NumIds", 0}, + {ACPI_DMT_UINT16, ACPI_MADT25_OFFSET (NumGuestIds), "NumGuestIds", 0}, + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GuestIndexBits), "GuestIndexBits", 0}, + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (HartIndexBits), "HartIndexBits", 0}, + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GroupIndexBits), "GroupIndexBits", 0}, + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GroupIndexShift), "GroupIndexShift", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 26: RISC-V APLIC interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt26[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT26_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT8, ACPI_MADT26_OFFSET (Id), "Id", 0}, + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT64, ACPI_MADT26_OFFSET (HwId), "HwId", 0}, + {ACPI_DMT_UINT16, ACPI_MADT26_OFFSET (NumIdcs), "NumIdcs", 0}, + {ACPI_DMT_UINT16, ACPI_MADT26_OFFSET (NumSources), "NumSources", 0}, + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (GsiBase), "GsiBase", 0}, + {ACPI_DMT_UINT64, ACPI_MADT26_OFFSET (BaseAddr), "BaseAddr", 0}, + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (Size), "Size", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 27: RISC-V PLIC interrupt controller */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt27[] = +{ + {ACPI_DMT_UINT8, ACPI_MADT27_OFFSET (Version), "Version", 0}, + {ACPI_DMT_UINT8, ACPI_MADT27_OFFSET (Id), "Id", 0}, + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT64, ACPI_MADT27_OFFSET (HwId), "HwId", 0}, + {ACPI_DMT_UINT16, ACPI_MADT27_OFFSET (NumIrqs), "NumIrqs", 0}, + {ACPI_DMT_UINT16, ACPI_MADT27_OFFSET (MaxPrio), "MaxPrio", 0}, + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Size), "Size", 0}, + {ACPI_DMT_UINT64, ACPI_MADT27_OFFSET (BaseAddr), "BaseAddr", 0}, + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (GsiBase), "GsiBase", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 128: OEM data structure */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt128[] = { {ACPI_DMT_RAW_BUFFER, 0, "OEM Data", 0}, - ACPI_DMT_TERMINATOR + ACPI_DMT_TERMINATOR }; /******************************************************************************* @@ -2080,7 +2221,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt0[] = ACPI_DMTABLE_INFO AcpiDmTableInfoRhct[] = { - {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (Flags), "Flags", 0}, {ACPI_DMT_UINT64, ACPI_RHCT_OFFSET (TimeBaseFreq), "Timer Base Frequency", 0}, {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (NodeCount), "Number of nodes", 0}, {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (NodeOffset), "Offset to the node array", 0}, @@ -2092,7 +2233,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRhct[] = ACPI_DMTABLE_INFO AcpiDmTableInfoRhctNodeHdr[] = { - {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Type), "Subtable Type", 0}, + {ACPI_DMT_RHCT, ACPI_RHCTH_OFFSET (Type), "Subtable Type", 0}, {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Length), "Length", 0}, {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Revision), "Revision", 0}, ACPI_DMT_TERMINATOR @@ -2116,6 +2257,26 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRhctIsaPad[] = ACPI_DMT_TERMINATOR }; +/* 1: CMO node type */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoRhctCmo1[] = +{ + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbomSize), "CBOM Block Size", 0}, + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbopSize), "CBOP Block Size", 0}, + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbozSize), "CBOZ Block Size", 0}, + ACPI_DMT_TERMINATOR +}; + +/* 2: MMU node type */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoRhctMmu1[] = +{ + {ACPI_DMT_UINT8, ACPI_RHCT2_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT8, ACPI_RHCT2_OFFSET (MmuType), "MMU Type", 0}, + ACPI_DMT_TERMINATOR +}; + /* 0xFFFF: Hart Info type */ ACPI_DMTABLE_INFO AcpiDmTableInfoRhctHartInfo1[] = diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2.c b/sys/contrib/dev/acpica/compiler/aslrestype2.c index ab021866cd02..9406a2172481 100644 --- a/sys/contrib/dev/acpica/compiler/aslrestype2.c +++ b/sys/contrib/dev/acpica/compiler/aslrestype2.c @@ -337,7 +337,7 @@ RsDoInterruptDescriptor ( Descriptor->ExtendedIrq.InterruptCount = 0; Rover = ACPI_CAST_PTR (AML_RESOURCE, - (&(Descriptor->ExtendedIrq.u.Interrupts[0]))); + (&(Descriptor->ExtendedIrq.Interrupts[0]))); /* Process all child initialization nodes */ @@ -466,7 +466,7 @@ RsDoInterruptDescriptor ( RsCreateDwordField (InitializerOp, ACPI_RESTAG_INTERRUPT, CurrentByteOffset + - ASL_RESDESC_OFFSET (ExtendedIrq.u.Interrupts[0])); + ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0])); } } @@ -494,7 +494,7 @@ RsDoInterruptDescriptor ( } Rnode->BufferLength = - (ASL_RESDESC_OFFSET (ExtendedIrq.u.Interrupts[0]) - + (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) - ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType)) + OptionIndex + StringLength; return (Rnode); diff --git a/sys/contrib/dev/acpica/compiler/dttable2.c b/sys/contrib/dev/acpica/compiler/dttable2.c index 9046851e313c..af6ac5f6319e 100644 --- a/sys/contrib/dev/acpica/compiler/dttable2.c +++ b/sys/contrib/dev/acpica/compiler/dttable2.c @@ -371,11 +371,66 @@ DtCompileMadt ( InfoTable = AcpiDmTableInfoMadt16; break; + case ACPI_MADT_TYPE_CORE_PIC: + + InfoTable = AcpiDmTableInfoMadt17; + break; + + case ACPI_MADT_TYPE_LIO_PIC: + + InfoTable = AcpiDmTableInfoMadt18; + break; + + case ACPI_MADT_TYPE_HT_PIC: + + InfoTable = AcpiDmTableInfoMadt19; + break; + + case ACPI_MADT_TYPE_EIO_PIC: + + InfoTable = AcpiDmTableInfoMadt20; + break; + + case ACPI_MADT_TYPE_MSI_PIC: + + InfoTable = AcpiDmTableInfoMadt21; + break; + + case ACPI_MADT_TYPE_BIO_PIC: + + InfoTable = AcpiDmTableInfoMadt22; + break; + + case ACPI_MADT_TYPE_LPC_PIC: + + InfoTable = AcpiDmTableInfoMadt23; + break; + + case ACPI_MADT_TYPE_RINTC: + + InfoTable = AcpiDmTableInfoMadt24; + break; + + case ACPI_MADT_TYPE_IMSIC: + + InfoTable = AcpiDmTableInfoMadt25; + break; + + case ACPI_MADT_TYPE_APLIC: + + InfoTable = AcpiDmTableInfoMadt26; + break; + + case ACPI_MADT_TYPE_PLIC: + + InfoTable = AcpiDmTableInfoMadt27; + break; + default: if (MadtHeader->Type >= ACPI_MADT_TYPE_OEM_RESERVED) { - InfoTable = AcpiDmTableInfoMadt17; + InfoTable = AcpiDmTableInfoMadt128; } else { @@ -2190,6 +2245,16 @@ DtCompileRhct ( InfoTable = AcpiDmTableInfoRhctHartInfo1; break; + case ACPI_RHCT_NODE_TYPE_CMO: + + InfoTable = AcpiDmTableInfoRhctCmo1; + break; + + case ACPI_RHCT_NODE_TYPE_MMU: + + InfoTable = AcpiDmTableInfoRhctMmu1; + break; + default: DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "RHCT"); diff --git a/sys/contrib/dev/acpica/compiler/dttemplate.h b/sys/contrib/dev/acpica/compiler/dttemplate.h index 755da40224e4..c97a8ed24eee 100644 --- a/sys/contrib/dev/acpica/compiler/dttemplate.h +++ b/sys/contrib/dev/acpica/compiler/dttemplate.h @@ -1128,11 +1128,11 @@ const unsigned char TemplateLpit[] = const unsigned char TemplateMadt[] = { - 0x41,0x50,0x49,0x43,0x6A,0x01,0x00,0x00, /* 00000000 "APICj..." */ - 0x05,0x9D,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x41,0x50,0x49,0x43,0x60,0x02,0x00,0x00, /* 00000000 "APIC...." */ + 0x05,0x69,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x13,0x11,0x20,0x20,0x00,0x00,0x00,0x00, /* 00000020 ".. ...." */ + 0x31,0x03,0x22,0x20,0x00,0x00,0x00,0x00, /* 00000020 "1." ...." */ 0x01,0x00,0x00,0x00,0x00,0x08,0x00,0x00, /* 00000028 "........" */ 0x01,0x00,0x00,0x00,0x01,0x0C,0x01,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -1173,7 +1173,37 @@ const unsigned char TemplateMadt[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000150 "........" */ 0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00, /* 00000158 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000160 "........" */ - 0x00,0x00 /* 00000168 ".." */ + 0x00,0x00,0x11,0x0F,0x01,0x01,0x00,0x00, /* 00000168 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /* 00000170 "........" */ + 0x00,0x12,0x17,0x01,0x00,0x14,0xE0,0x1F, /* 00000178 "........" */ + 0x00,0x00,0x00,0x00,0x80,0x00,0x02,0x03, /* 00000180 "........" */ + 0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF, /* 00000188 "........" */ + 0x13,0x15,0x01,0x80,0x00,0x00,0xFB,0xFD, /* 00000190 "........" */ + 0x0E,0x00,0x00,0x40,0x00,0x00,0x00,0x00, /* 00000198 "...@...." */ + 0xFF,0x00,0x00,0x00,0x00,0x14,0x0D,0x01, /* 000001A0 "........" */ + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001A8 "........" */ + 0x00,0x00,0x15,0x13,0x01,0x00,0x00,0xF0, /* 000001B0 "........" */ + 0x2F,0x00,0x00,0x00,0x00,0x40,0x00,0x00, /* 000001B8 "/....@.." */ + 0x00,0xC0,0x00,0x00,0x00,0x16,0x11,0x01, /* 000001C0 "........" */ + 0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00, /* 000001C8 "........" */ + 0x00,0x10,0x00,0x00,0x40,0x00,0x17,0x0E, /* 000001D0 "....@..." */ + 0x01,0x00,0x20,0x00,0x10,0x00,0x00,0x00, /* 000001D8 ".. ....." */ + 0x00,0x00,0x10,0x13,0x18,0x24,0x01,0x00, /* 000001E0 "........" */ + 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E8 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001F0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28, /* 000001F8 ".......(" */ + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, /* 00000200 "........" */ + 0x19,0x10,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000208 "........" */ + 0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x18, /* 00000210 "........" */ + 0x1A,0x24,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000218 ".$......" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000220 "........" */ + 0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00, /* 00000228 "..`....." */ + 0x00,0x00,0x00,0x0D,0x00,0x00,0x00,0x00, /* 00000230 "........" */ + 0x00,0x80,0x00,0x00,0x1B,0x24,0x01,0x00, /* 00000238 ".....$.." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000240 "........" */ + 0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000248 "`.....`." */ + 0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x0C, /* 00000250 "..`....." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 00000258 "........" */ }; const unsigned char TemplateMcfg[] = @@ -1718,8 +1748,8 @@ const unsigned char TemplateRgrt[] = const unsigned char TemplateRhct[] = { - 0x52,0x48,0x43,0x54,0x7C,0x00,0x00,0x00, /* 00000000 "RHCT|..." */ - 0x01,0x7D,0x4F,0x45,0x4D,0x43,0x41,0x00, /* 00000008 "..OEMCA." */ + 0x52,0x48,0x43,0x54,0x96,0x00,0x00,0x00, /* 00000000 "RHCT|..." */ + 0x01,0x24,0x4F,0x45,0x4D,0x43,0x41,0x00, /* 00000008 "..OEMCA." */ 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ 0x28,0x09,0x22,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ @@ -1731,9 +1761,12 @@ const unsigned char TemplateRhct[] = 0x72,0x5F,0x7A,0x69,0x66,0x65,0x6E,0x63, /* 00000050 "r_zifenc" */ 0x65,0x69,0x5F,0x7A,0x62,0x61,0x5F,0x7A, /* 00000058 "ei_zba_z" */ 0x62,0x62,0x5F,0x7A,0x62,0x63,0x5F,0x7A, /* 00000060 "bb_zbc_z" */ - 0x62,0x73,0x00,0x00,0xFF,0xFF,0x10,0x00, /* 00000068 "bs......" */ - 0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ - 0x38,0x00,0x00,0x00 /* 00000078 "........" */ + 0x62,0x73,0x00,0x00,0xFF,0xFF,0x18,0x00, /* 00000068 "bs......" */ + 0x01,0x00,0x03,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ + 0x38,0x00,0x00,0x00,0x7c,0x00,0x00,0x00, /* 00000078 "........" */ + 0x8E,0x00,0x00,0x00,0x01,0x00,0x0A,0x00, /* 00000080 "........" */ + 0x01,0x00,0x00,0x06,0x06,0x06,0x02,0x00, /* 00000088 "........" */ + 0x08,0x00,0x01,0x00,0x00,0x02 /* 00000090 "........" */ }; const unsigned char TemplateRsdp[] = diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c index dca5468870ed..4c8f091f126c 100644 --- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c +++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c @@ -157,7 +157,6 @@ #include #include - #define _COMPONENT ACPI_CA_DEBUGGER ACPI_MODULE_NAME ("dbcmds") @@ -1291,6 +1290,64 @@ AcpiDbDisplayResources ( } +/******************************************************************************* + * + * FUNCTION: AcpiDbGenerateGed + * + * PARAMETERS: GedArg - Raw GED number, ascii string + * + * RETURN: None + * + * DESCRIPTION: Simulate firing of a GED + * + ******************************************************************************/ + +void +AcpiDbGenerateInterrupt ( + char *GsivArg) +{ + UINT32 GsivNumber; + ACPI_GED_HANDLER_INFO *GedInfo = AcpiGbl_GedHandlerList; + + if (!GedInfo) { + AcpiOsPrintf ("No GED handling present\n"); + } + + GsivNumber = strtoul (GsivArg, NULL, 0); + + while (GedInfo) { + + if (GedInfo->IntId == GsivNumber) { + ACPI_OBJECT_LIST ArgList; + ACPI_OBJECT Arg0; + ACPI_HANDLE EvtHandle = GedInfo->EvtMethod; + ACPI_STATUS Status; + + AcpiOsPrintf ("Evaluate GED _EVT (GSIV=%d)\n", GsivNumber); + + if (!EvtHandle) { + AcpiOsPrintf ("Undefined _EVT method\n"); + return; + } + + Arg0.Integer.Type = ACPI_TYPE_INTEGER; + Arg0.Integer.Value = GsivNumber; + + ArgList.Count = 1; + ArgList.Pointer = &Arg0; + + Status = AcpiEvaluateObject (EvtHandle, NULL, &ArgList, NULL); + if (ACPI_FAILURE (Status)) + { + AcpiOsPrintf ("Could not evaluate _EVT\n"); + return; + } + + } + GedInfo = GedInfo->Next; + } +} + #if (!ACPI_REDUCED_HARDWARE) /******************************************************************************* * diff --git a/sys/contrib/dev/acpica/components/debugger/dbinput.c b/sys/contrib/dev/acpica/components/debugger/dbinput.c index 84173d0c14e4..c900c4ec7acf 100644 --- a/sys/contrib/dev/acpica/components/debugger/dbinput.c +++ b/sys/contrib/dev/acpica/components/debugger/dbinput.c @@ -264,6 +264,7 @@ enum AcpiExDebuggerCommands CMD_THREADS, CMD_TEST, + CMD_INTERRUPT, #endif }; @@ -345,6 +346,7 @@ static const ACPI_DB_COMMAND_INFO AcpiGbl_DbCommands[] = {"THREADS", 3}, {"TEST", 1}, + {"INTERRUPT", 1}, #endif {NULL, 0} }; @@ -461,6 +463,7 @@ static const ACPI_DB_COMMAND_HELP AcpiGbl_DbCommandHelp[] = {1, " Gpes", "Display info on all GPE devices\n"}, {1, " Sci", "Generate an SCI\n"}, {1, " Sleep [SleepState]", "Simulate sleep/wake sequence(s) (0-5)\n"}, + {1, " Interrupt ", "Simulate an interrupt\n"}, #endif {0, NULL, NULL} }; @@ -1263,6 +1266,11 @@ AcpiDbCommandDispatch ( AcpiOsPrintf ("Event command not implemented\n"); break; + case CMD_INTERRUPT: + + AcpiDbGenerateInterrupt (AcpiGbl_DbArgs[1]); + break; + case CMD_GPE: AcpiDbGenerateGpe (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]); diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c index 19e6eb884d0c..1df288229457 100644 --- a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c +++ b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c @@ -1112,7 +1112,7 @@ AcpiDmInterruptDescriptor ( { AcpiDmIndent (Level + 1); AcpiOsPrintf ("0x%8.8X,\n", - (UINT32) Resource->ExtendedIrq.u.Interrupts[i]); + (UINT32) Resource->ExtendedIrq.Interrupts[i]); } AcpiDmIndent (Level); diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c index 2c8cfa8a57b8..9b49696423b8 100644 --- a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c +++ b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c @@ -310,8 +310,8 @@ AcpiDsResultPush ( if (!Object) { ACPI_ERROR ((AE_INFO, - "Null Object! Obj=%p State=%p Num=%u", - Object, WalkState, WalkState->ResultCount)); + "Null Object! State=%p Num=%u", + WalkState, WalkState->ResultCount)); return (AE_BAD_PARAMETER); } diff --git a/sys/contrib/dev/acpica/components/events/evevent.c b/sys/contrib/dev/acpica/components/events/evevent.c index 7c2e21ae7375..70255aae9bd0 100644 --- a/sys/contrib/dev/acpica/components/events/evevent.c +++ b/sys/contrib/dev/acpica/components/events/evevent.c @@ -312,8 +312,7 @@ AcpiEvFixedEventInitialize ( { Status = AcpiWriteBitRegister ( AcpiGbl_FixedEventInfo[i].EnableRegisterId, - (i == ACPI_EVENT_PCIE_WAKE) ? - ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT); + ACPI_DISABLE_EVENT); if (ACPI_FAILURE (Status)) { return (Status); @@ -362,11 +361,6 @@ AcpiEvFixedEventDetect ( return (IntStatus); } - if (FixedEnable & ACPI_BITMASK_PCIEXP_WAKE_DISABLE) - FixedEnable &= ~ACPI_BITMASK_PCIEXP_WAKE_DISABLE; - else - FixedEnable |= ACPI_BITMASK_PCIEXP_WAKE_DISABLE; - ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS, "Fixed Event Block: Enable %08X Status %08X\n", FixedEnable, FixedStatus)); @@ -437,8 +431,7 @@ AcpiEvFixedEventDispatch ( { (void) AcpiWriteBitRegister ( AcpiGbl_FixedEventInfo[Event].EnableRegisterId, - (Event == ACPI_EVENT_PCIE_WAKE) ? - ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT); + ACPI_DISABLE_EVENT); ACPI_ERROR ((AE_INFO, "No installed handler for fixed event - %s (%u), disabling", diff --git a/sys/contrib/dev/acpica/components/executer/exserial.c b/sys/contrib/dev/acpica/components/executer/exserial.c index 0f756dfaefd1..ef1eaf37daa1 100644 --- a/sys/contrib/dev/acpica/components/executer/exserial.c +++ b/sys/contrib/dev/acpica/components/executer/exserial.c @@ -505,8 +505,7 @@ AcpiExWriteSerialBus ( /* Copy the input buffer data to the transfer buffer */ Buffer = BufferDesc->Buffer.Pointer; - DataLength = (BufferLength < SourceDesc->Buffer.Length ? - BufferLength : SourceDesc->Buffer.Length); + DataLength = ACPI_MIN (BufferLength, SourceDesc->Buffer.Length); memcpy (Buffer, SourceDesc->Buffer.Pointer, DataLength); /* Lock entire transaction if requested */ diff --git a/sys/contrib/dev/acpica/components/hardware/hwsleep.c b/sys/contrib/dev/acpica/components/hardware/hwsleep.c index 4a352fb9b7d2..7ddb6c2b30d3 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwsleep.c +++ b/sys/contrib/dev/acpica/components/hardware/hwsleep.c @@ -475,17 +475,6 @@ AcpiHwLegacyWake ( AcpiGbl_FixedEventInfo[ACPI_EVENT_SLEEP_BUTTON].StatusRegisterId, ACPI_CLEAR_STATUS); - /* Enable pcie wake event if support */ - if ((AcpiGbl_FADT.Flags & ACPI_FADT_PCI_EXPRESS_WAKE)) - { - (void) AcpiWriteBitRegister ( - AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].EnableRegisterId, - ACPI_DISABLE_EVENT); - (void) AcpiWriteBitRegister ( - AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].StatusRegisterId, - ACPI_CLEAR_STATUS); - } - AcpiHwExecuteSleepMethod (METHOD_PATHNAME__SST, ACPI_SST_WORKING); return_ACPI_STATUS (Status); } diff --git a/sys/contrib/dev/acpica/components/parser/psopcode.c b/sys/contrib/dev/acpica/components/parser/psopcode.c index 0ec2590cc42f..a36148ebcd31 100644 --- a/sys/contrib/dev/acpica/components/parser/psopcode.c +++ b/sys/contrib/dev/acpica/components/parser/psopcode.c @@ -436,7 +436,7 @@ const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES] = /* ACPI 3.0 opcodes */ -/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R), +/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R | AML_NO_OPERAND_RESOLVE), /* ACPI 5.0 opcodes */ diff --git a/sys/contrib/dev/acpica/components/resources/rsaddr.c b/sys/contrib/dev/acpica/components/resources/rsaddr.c index 3a719a80d737..4a2d02f4562f 100644 --- a/sys/contrib/dev/acpica/components/resources/rsaddr.c +++ b/sys/contrib/dev/acpica/components/resources/rsaddr.c @@ -431,11 +431,11 @@ AcpiRsGetAddressCommon ( ACPI_RESOURCE *Resource, AML_RESOURCE *Aml) { + /* Avoid undefined behavior: member access within misaligned address */ AML_RESOURCE_ADDRESS Address; memcpy(&Address, Aml, sizeof(Address)); - ACPI_FUNCTION_ENTRY(); /* Validate the Resource Type */ diff --git a/sys/contrib/dev/acpica/components/resources/rscreate.c b/sys/contrib/dev/acpica/components/resources/rscreate.c index 60694d470b72..5cb7e0923c16 100644 --- a/sys/contrib/dev/acpica/components/resources/rscreate.c +++ b/sys/contrib/dev/acpica/components/resources/rscreate.c @@ -475,9 +475,9 @@ AcpiRsCreatePciRoutingTable ( /* Use *remaining* length of the buffer as max for pathname */ PathBuffer.Length = OutputBuffer->Length - - (UINT32) ((UINT8 *) UserPrt->u.Source - + (UINT32) ((UINT8 *) UserPrt->Source - (UINT8 *) OutputBuffer->Pointer); - PathBuffer.Pointer = UserPrt->u.Source; + PathBuffer.Pointer = UserPrt->Source; Status = AcpiNsHandleToPathname ( (ACPI_HANDLE) Node, &PathBuffer, FALSE); *** 637 LINES SKIPPED *** From nobody Wed Jan 31 04:29:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPpwD4mdlz58MVQ for ; Wed, 31 Jan 2024 04:29:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPpwC66RYz4XHs for ; Wed, 31 Jan 2024 04:29:31 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-40e72a567eeso63999735e9.0 for ; Tue, 30 Jan 2024 20:29:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706675370; x=1707280170; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X2sO71y+f64zBYJIQhWG6Ziq+i5DeNbprhH9Qwsa3x8=; b=uRV7+DooOxcnldpvKDYSlcWT3Z9TOtX2WCdtJDKPzYZeW7P2YTuebIDFJDzSrMcFgv bp6L+O3XUNGXk2vNtCVOjpNYDzG/ThVFP7hw+UqG7mv0RnBPr0ouYx1tTWeGL7zpjS5Z BxqKlKcX24zwte9MqgYSsX1DhVisF8VFgjMLWClw11Sp/UvS07Atv1nalH93Aw8/m4wM T97N5RQ0yFUtiZzYSXEvEK2C2sttrc1ncdQ0SNbuYS3oNou4faDSAl5oTdu41iuFM1Hq KQikqnQwObhpaBKXmEbeo+/dEavzLmUs5DzkyNZvvdCH8nm7LIx8sH7sY+2CJunrSO9J UYkw== X-Gm-Message-State: AOJu0YykIPjbRbYBzFA7TAIuII3q1IxEmn0uYKRYtGZ45yzrAPeAfUNG IRHH+oiJm+sVAm5onF5aDGDSH/bSiL9r0PjXFNgfW6t5Z5sljTyJGViGqeR2qcY= X-Google-Smtp-Source: AGHT+IEx6abvzuv4wBk3gEp67gdFAIpRs/T+FgQCZT3bObBucJK70uuYB8tO0hlrbmV9zqqEjgrO1w== X-Received: by 2002:adf:fbc9:0:b0:33b:149:24b4 with SMTP id d9-20020adffbc9000000b0033b014924b4mr331982wrs.17.1706675369726; Tue, 30 Jan 2024 20:29:29 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id v9-20020adff689000000b0033af5c43155sm4351007wrp.56.2024.01.30.20.29.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2024 20:29:29 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 From: Jessica Clarke In-Reply-To: <202401310406.40V46AUG000837@gitrepo.freebsd.org> Date: Wed, 31 Jan 2024 04:29:18 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> To: Jung-uk Kim X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TPpwC66RYz4XHs 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:15169, ipnet:209.85.128.0/17, country:US] On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: >=20 > The branch main has been updated by jkim: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f2f676bb= 494518d7 >=20 > commit 722b16673c40aedf280895f2f2f676bb494518d7 > Author: Jung-uk Kim > AuthorDate: 2024-01-30 21:43:45 +0000 > Commit: Jung-uk Kim > CommitDate: 2024-01-31 03:16:36 +0000 >=20 > acpica: Import ACPICA 20230331 >=20 > (cherry picked from commit = 8e013e1e3b81740266738226667431cf5c28b17a) Cherry-pick not merge for a vendor merge?.. Jess From nobody Wed Jan 31 04:57:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqX94LMkz58Q5D; Wed, 31 Jan 2024 04:57:13 +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 4TPqX922TPz4ZdL; Wed, 31 Jan 2024 04:57:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id V2Xcr6ucEGAIJV2eurDUWX; Wed, 31 Jan 2024 04:57:12 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id V2etr8mef9Cr4V2etr22VI; Wed, 31 Jan 2024 04:57:12 +0000 X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=65b9d328 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=uaIHpgkpcgMenpJzt6UA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id BC322173B; Tue, 30 Jan 2024 20:57:10 -0800 (PST) Received: from slippy (localhost [IPv6:::1]) by slippy.cwsent.com (Postfix) with ESMTP id 9DD1E23D; Tue, 30 Jan 2024 20:57:10 -0800 (PST) Date: Tue, 30 Jan 2024 20:57:10 -0800 From: Cy Schubert To: Jessica Clarke Cc: Jung-uk Kim , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: <20240130205710.11cf19cf@slippy> In-Reply-To: <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> Organization: KOMQUATS X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfHiR2Vbattp0EJYfb0VzIw1wBo0c5qGdijJ+YoTID/mWmkknGvwGzVIO7KHQ+zwn7ZNZcWYu0/64SKYDkWnF378jKqSApVY5tXp2NfGxqR2CY5FXouBR Lay/5VQIeQrIdP6eEl6FLF1TeUJuwdcDn2gpEUZrnhXPg9xylIx7q5StY0kAx1hZIp7Ckl7NKNbdb9VEj/wrwXXfXe75KmPzXgP69grK8FoyK4BcddK2eKn3 g9scU3QcuNYlkznVuDy83p6HWVJrKyLwUh4mLefyM1MX/+4Crn5Cvj2lUkc6nH48ZxuNVlkm0ZjwlrrNbMdnxNn17g5o89uAIGuiEI8ya7X0SWMAsflhLWyy 0ba9K56p X-Rspamd-Queue-Id: 4TPqX922TPz4ZdL 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] On Wed, 31 Jan 2024 04:29:18 +0000 Jessica Clarke wrote: > On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: > > > > The branch main has been updated by jkim: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7 > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > Author: Jung-uk Kim > > AuthorDate: 2024-01-30 21:43:45 +0000 > > Commit: Jung-uk Kim > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > acpica: Import ACPICA 20230331 > > > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) > > Cherry-pick not merge for a vendor merge?.. Probably not Kosher but, a general git question about cherry-picks vs merges. A cherry-pick, without the -x but specifying the source branch, results in no cherry picked merge but a merge of the last commit of the source branch to the current branch. Can someone explain this? And if this would be any different from a merge from a branch that is ahead by one commit since the last merge? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Jan 31 05:07:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqmq4HVRz58RJ6 for ; Wed, 31 Jan 2024 05:08:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPqmq2ZMcz4bPM for ; Wed, 31 Jan 2024 05:08:11 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-55f8abbeeddso135494a12.1 for ; Tue, 30 Jan 2024 21:08:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706677688; x=1707282488; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Mghc1pFHRq4WuPFRhzGYpPORUUmwUD5Jv3dOZDYVphU=; b=Z/xXdaEGWG5dFXJ4/H8nnTVeSGdahcsl4SWgdQ33xAzO3TdtiXpYSdd+u9bDaYtGKN H0OHHYdR4b4AsM7PNmTrrHcfFc2LZ0oNxxu8dNaZ5RxiQjRTSF+1PK5CWYNBd3erCunB +RJBI4gU3qWgBiMXz1T7Syh3ku4BtWfhk09fid2kmHGPXsq6JFlThYP0WkFibUD1waYK UEh9TZq5lCe8hLQaw2TX+/PI4Ms2eXq+GPGPKgmedOXFpZ2O1vSGV+fuN8JjlPj64LV1 D/yPDbcaaWNToOwn3+EhQOy2zlVMJLfKMukYwYjfUrz22G1dC5QlWg0BznjhgLkIHZ0J 6ptQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706677688; x=1707282488; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Mghc1pFHRq4WuPFRhzGYpPORUUmwUD5Jv3dOZDYVphU=; b=BAI1hZm64OYsn1twK6s3jlUajuNVg115r/Nwn+70fOutzxdnTN7VWdiwPxpkRZAw+x psF82pj8BuSBmgeQmK+ZjFrME6FqIIcM3CFOjT1D/6s0Fd63jMtP4SQgEGp7kccyR/aS As9AXx3z2sgBvlpL/NK6SK28wJATCEpEF69i+P2P3OIe7fHD7moTF35l4L20sD/M/BEW /33gdK39iPgqQpcUNiHPMZKyj0L4v8melBs+CS8Hq1KBSgdsFqHwEHQ3uotEszOgW0cr IvAcQTca9QSqZGnb4rEyuueFWSSv05l1ddUUXVVtBYCgi299LUJ2Uu8YrFuQuwkffGZL RCGA== X-Gm-Message-State: AOJu0Yzd7wY0f0755UfAqCKBNTMvZleGK2owYHDnOdk0Eyhsn+pBlGOF p95M6OXsaOq2g9DmfpB0320nbvSROBziO/6DsHy4XyFQNKzRfPCTmDJJYGAsL2grkuvtiw05A3B SFeV9fuPU02cN2WydnoNCtuFMEyVWH1cSZeq1KQ== X-Google-Smtp-Source: AGHT+IG1Kjo+vAyyHoE3T+sTyidGJq1rfR7dB6Ywng9jCLeEQrxUi7dpT7WH+U6sNwqZBJPToXi6tjkcgw7CM/zA3hE= X-Received: by 2002:a05:6402:3181:b0:55c:d503:764c with SMTP id di1-20020a056402318100b0055cd503764cmr306763edb.22.1706677687854; Tue, 30 Jan 2024 21:08:07 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> In-Reply-To: <20240130205710.11cf19cf@slippy> From: Warner Losh Date: Tue, 30 Jan 2024 22:07:56 -0700 Message-ID: Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 To: Cy Schubert Cc: Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000054b556061036dd0f" X-Rspamd-Queue-Id: 4TPqmq2ZMcz4bPM 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:15169, ipnet:2a00:1450::/32, country:US] --00000000000054b556061036dd0f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert wrote: > On Wed, 31 Jan 2024 04:29:18 +0000 > Jessica Clarke wrote: > > > On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: > > > > > > The branch main has been updated by jkim: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f2f676b= b494518d7 > > > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > > Author: Jung-uk Kim > > > AuthorDate: 2024-01-30 21:43:45 +0000 > > > Commit: Jung-uk Kim > > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > > > acpica: Import ACPICA 20230331 > > > > > > (cherry picked from commit > 8e013e1e3b81740266738226667431cf5c28b17a) > > > > Cherry-pick not merge for a vendor merge?.. > > Probably not Kosher but, a general git question about cherry-picks vs > merges. A cherry-pick, without the -x but specifying the source branch, > results in no cherry picked merge but a merge of the last commit of the > source branch to the current branch. > > Can someone explain this? And if this would be any different from a > merge from a branch that is ahead by one commit since the last merge? > This is functionally identical in the resulting tree, except only one parent is recorded for the commit. If there were no fixups needed, the next merge would automatically skip the cherry-picked commit due the commit hashes matching. However if fixups were needed, there may be conflicts on the next merge in cases I can only hand wave about, but have hit once or twice. A merge seems to be better because it only looks at changes since the last common ancestor. I think a merge would handle the need to revert better, though my experience with awk is making me question that. Warner --=20 > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > --00000000000054b556061036dd0f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert <= Cy.Schubert@cschubert.com&= gt; wrote:
On Wed, 31 Jan 2024 04:2= 9:18 +0000
Jessica Clarke <jrtc27@freebsd.org> wrote:

> On 31 Jan 2024, at 04:06, Jung-uk Kim <jkim@FreeBSD.org> wrote:<= br> > >
> > The branch main has been updated by jkim:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f= 2f676bb494518d7
> >
> > commit 722b16673c40aedf280895f2f2f676bb494518d7
> > Author:=C2=A0 =C2=A0 =C2=A0Jung-uk Kim <jkim@FreeBSD.org> > > AuthorDate: 2024-01-30 21:43:45 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Jung-uk Kim <jkim@FreeBSD.org> > > CommitDate: 2024-01-31 03:16:36 +0000
> >
> >=C2=A0 =C2=A0 acpica: Import ACPICA 20230331
> >
> >=C2=A0 =C2=A0 (cherry picked from commit 8e013e1e3b817402667382266= 67431cf5c28b17a)=C2=A0
>
> Cherry-pick not merge for a vendor merge?..

Probably not Kosher but, a general git question about cherry-picks vs
merges. A cherry-pick, without the -x but specifying the source branch,
results in no cherry picked merge but a merge of the last commit of the
source branch to the current branch.

Can someone explain this? And if this would be any different from a
merge from a branch that is ahead by one commit since the last merge?

This i= s functionally identical in the resulting tree, except only one parent is r= ecorded for the commit. If there were no fixups needed, the next merge woul= d automatically skip the cherry-picked commit due the commit hashes matchin= g. However if fixups were needed, there may be conflicts on the next merge = in cases I can only hand wave about, but have hit once or twice. A merge se= ems to be better because it only looks at changes since the last common anc= estor. I think a merge would handle the need to revert better, though my ex= perience with awk is making me question that.

Warner

--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 ht= tps://FreeBSD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2= =A0 Web:=C2=A0 https://nwtime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0
--00000000000054b556061036dd0f-- From nobody Wed Jan 31 05:11:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqs54p1Wz58RYc; Wed, 31 Jan 2024 05:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPqs543WSz4cFx; Wed, 31 Jan 2024 05:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706677913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvAfaVphgQas2+I62O+5nYw6mIGMy7aqW4UTinjGm+U=; b=eZPlJUEo7OyqSTdzHovJzpdt+Hw568VZ1aw86X0l9BZrujk0mzpaUQO8GAGSL9d4pWDthm Vkq5DenE8MtIU5X+NRuc0EKgnYzVx1aVhjkKmz8xrbJjLzb9MAshT2arXlT/+gsbhfBGTh 5i7PATX7Ck0w1ScdErPVhDRFSryu50wAtaT3OqYbrv20oTfYAuqwu6lxEIM74xDVpZO692 F6kR8dGje5k3KV38t7SD6tQ7cr2s4OhHzGeIfeoPmS2T57RAlCvdiOi0yaePLJuNTG8+6T LL604Z6ia6+KicYIaEzoUpSzrmLXeK2CGITfC09olVynOomkhSsYfzKiYPhKBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706677913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DvAfaVphgQas2+I62O+5nYw6mIGMy7aqW4UTinjGm+U=; b=vrpfVAAfozzgdae2oVHyFLg/LnfJ9K2tRUxxmURmndpECVxjb9hon1UiW68v/I0jAdPj9V vI9Km5wdPisigBtWnK8WFGBkwmRbLYdtJl6XlCiOUQF9MhK3vkrkiIFKd21cFeO4F90thG cR9ymvyXexVcrkQvdwDDmAqACGlV022DECblaLeKWwxQZvnrkv4pi/u6xLF4fPu81NkdQ3 Xpwgy0jsDgSD95D28OfA/31vGzciLotiCI8jau0BykeFqfl7ZAu7j/tVpy4+mZQK+LnuQL 9sBuuWNLAowigcijXlLB30wrnMILcGVEgkWA4bjHOxNmt4mvAGmVmu39D3sHGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706677913; a=rsa-sha256; cv=none; b=igAaOMWvXc0JPcpXNwS1hw4OtiTdxzrCYWEZwBizPqIoteoGEuMvJhr6/fdHFvR2IcMBRQ RP5oq5tJg7sn8xklmfA4Ja5YzWTPl2NF2GiDyE4kW09aFciIOmHn4+xQJunnVeBi+RF0wY 93Lam+F9wEAVOVbtIiQvwZYbLNjRHqnOGrudu7mqjgi7PRncjBwiOstOU4IafUAE7kjBI9 47Xb0ojL3DMSdevESpksKdAHJyCHDk178pCU/Wq2hfodo/2NV2aKizIp6X0Vr8ef+TO4HN ylyZW879BMXTYVYpfgCoCA+Ihp03uXK3tJhC71M9cWyFQvrfI7nrrDjR2hMlVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TPqs536p6z15Bs; Wed, 31 Jan 2024 05:11: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 40V5Br01015604; Wed, 31 Jan 2024 05:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40V5Bro8015600; Wed, 31 Jan 2024 05:11:53 GMT (envelope-from git) Date: Wed, 31 Jan 2024 05:11:53 GMT Message-Id: <202401310511.40V5Bro8015600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Venteicher Subject: git: e6b8c1d780b4 - main - virtio: Add more device IDs from the specification List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bryanv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6b8c1d780b490283dd378aa560591a14583caf1 Auto-Submitted: auto-generated The branch main has been updated by bryanv: URL: https://cgit.FreeBSD.org/src/commit/?id=e6b8c1d780b490283dd378aa560591a14583caf1 commit e6b8c1d780b490283dd378aa560591a14583caf1 Author: Bryan Venteicher AuthorDate: 2024-01-31 05:02:59 +0000 Commit: Bryan Venteicher CommitDate: 2024-01-31 05:08:12 +0000 virtio: Add more device IDs from the specification --- sys/dev/virtio/virtio.c | 6 ++++++ sys/dev/virtio/virtio_ids.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/dev/virtio/virtio.c b/sys/dev/virtio/virtio.c index 75e0e150d67f..9e375e98d1e3 100644 --- a/sys/dev/virtio/virtio.c +++ b/sys/dev/virtio/virtio.c @@ -66,6 +66,12 @@ static struct virtio_ident { { VIRTIO_ID_INPUT, "Input" }, { VIRTIO_ID_VSOCK, "VSOCK Transport" }, { VIRTIO_ID_CRYPTO, "Crypto" }, + { VIRTIO_ID_IOMMU, "IOMMU" }, + { VIRTIO_ID_SOUND, "Sound" }, + { VIRTIO_ID_FS, "Filesystem" }, + { VIRTIO_ID_PMEM, "Persistent Memory" }, + { VIRTIO_ID_RPMB, "RPMB" }, + { VIRTIO_ID_GPIO, "GPIO" }, { 0, NULL } }; diff --git a/sys/dev/virtio/virtio_ids.h b/sys/dev/virtio/virtio_ids.h index 2e3df0f38436..c9bd6f52bef6 100644 --- a/sys/dev/virtio/virtio_ids.h +++ b/sys/dev/virtio/virtio_ids.h @@ -45,5 +45,11 @@ #define VIRTIO_ID_INPUT 18 #define VIRTIO_ID_VSOCK 19 #define VIRTIO_ID_CRYPTO 20 +#define VIRTIO_ID_IOMMU 23 +#define VIRTIO_ID_SOUND 25 +#define VIRTIO_ID_FS 26 +#define VIRTIO_ID_PMEM 27 +#define VIRTIO_ID_RPMB 28 +#define VIRTIO_ID_GPIO 41 #endif /* _VIRTIO_IDS_H_ */ From nobody Wed Jan 31 05:17:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TPqzt3XF6z58RwD; Wed, 31 Jan 2024 05:17:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TPqzt2YYXz4cwj; Wed, 31 Jan 2024 05:17:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTPS id UmJ7rWhhnxDxGV2yorGrDc; Wed, 31 Jan 2024 05:17:46 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id V2ymrApUsByQrV2ynrRC4C; Wed, 31 Jan 2024 05:17:45 +0000 X-Authority-Analysis: v=2.4 cv=UOF+Hzfy c=1 sm=1 tr=0 ts=65b9d7f9 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=jx4tM7Ehyi6vgjVKVF0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 1A5CB1769; Tue, 30 Jan 2024 21:17:44 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id EDDE915B; Tue, 30 Jan 2024 21:17:43 -0800 (PST) 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: Warner Losh cc: Cy Schubert , Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 In-reply-to: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> Comments: In-reply-to Warner Losh message dated "Tue, 30 Jan 2024 22:07:56 -0700." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 30 Jan 2024 21:17:43 -0800 Message-Id: <20240131051743.EDDE915B@slippy.cwsent.com> X-CMAE-Envelope: MS4xfLq8LlQ5Y+h9Tx6mtFgSmRUtfNY9LCDKyZa7nt+IJmHvdL0rLnkEUJd0ZPyPtaVrmn6rfxp97PvPlfijLMn7GjfFDAVYUVECPHmwDbBhmfEpEeDXEJBS 06Ji84iI5ZtLu7S1/uZzp742B7YhAVTE76+9xCln3Pb8wuVeYV+YtPBD49CRYecNT+DJvbuk8eSW2rri54vZ+6G2G9zOC3AM+VSdnduRs4bj88tYXN0IW9u9 5bROMeg4WymH4upcIuBIQ578ilmicgeeFnd3F5Gt5D3YiO8RDczhONrS1DeR2MXkyHQ5zckMxg7bgcmF3HtruE/eRNsr3WTgUkwxtEsg387UuIIofdfSFtda I5ob9xOhsttk05utOy0lEt6Mjow15g== X-Rspamd-Queue-Id: 4TPqzt2YYXz4cwj 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] In message , Warner Losh writes: > --00000000000054b556061036dd0f > Content-Type: text/plain; charset="UTF-8" > Content-Transfer-Encoding: quoted-printable > > On Tue, Jan 30, 2024, 9:57=E2=80=AFPM Cy Schubert m> wrote: > > > On Wed, 31 Jan 2024 04:29:18 +0000 > > Jessica Clarke wrote: > > > > > On 31 Jan 2024, at 04:06, Jung-uk Kim wrote: > > > > > > > > The branch main has been updated by jkim: > > > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D722b16673c40aedf280895f2f2f676b= > b494518d7 > > > > > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > > > Author: Jung-uk Kim > > > > AuthorDate: 2024-01-30 21:43:45 +0000 > > > > Commit: Jung-uk Kim > > > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > > > > > acpica: Import ACPICA 20230331 > > > > > > > > (cherry picked from commit > > 8e013e1e3b81740266738226667431cf5c28b17a) > > > > > > Cherry-pick not merge for a vendor merge?.. > > > > Probably not Kosher but, a general git question about cherry-picks vs > > merges. A cherry-pick, without the -x but specifying the source branch, > > results in no cherry picked merge but a merge of the last commit of the > > source branch to the current branch. > > > > Can someone explain this? And if this would be any different from a > > merge from a branch that is ahead by one commit since the last merge? > > > > This is functionally identical in the resulting tree, except only one > parent is recorded for the commit. If there were no fixups needed, the next > merge would automatically skip the cherry-picked commit due the commit > hashes matching. However if fixups were needed, there may be conflicts on > the next merge in cases I can only hand wave about, but have hit once or > twice. A merge seems to be better because it only looks at changes since > the last common ancestor. I think a merge would handle the need to revert > better, though my experience with awk is making me question that. I understand the patches would be the same -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 but would the history graph be different? Or does that matter? From nobody Wed Jan 31 12:24:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ1St3YG0z58QVb; Wed, 31 Jan 2024 12:25:02 +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 4TQ1St3FZ8z4YWP; Wed, 31 Jan 2024 12:25:02 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706703902; 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=StPZE2uGA0eJF7ek8GyCzjEXPVMnBSS5u8vx1HCNh30=; b=tYSPJKM8OTAPzwNzCQy3q2EdAHTWkl74Z0Tu/1BhxgvftvxU/CIjXsOeDHjRsAfYlhBGK5 q6DHHqVSj21LfgYNMs0Chnw2w6T/+a+pisR+Pi17TxqqaW/6IY3GRfRKGHaWl6RbsEl6IU ZFe+aOHlkMbDl0UQu7vpACMOAhxmYojJWUgIjkz8LVeBWRHiH1n376flsdazFlZ0tkVBGj sckj2KJ+Bc9+WQJC1r45zmWYgnhqZXoXqyAzQOwSwJcfRyPBY5jHYHWrsipwF0ZugH6P/4 1pKfTi/8jMghD+CC2GwgSEa8BzT7BXoGeH+1cvVXSE5uXwUdykW87z1MBs6sRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706703902; 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=StPZE2uGA0eJF7ek8GyCzjEXPVMnBSS5u8vx1HCNh30=; b=eOA03PpDTidiePRh/uYu/JBUJKJOGVPl4ZTonAjEiYfuJovM/WkxmIKbO5O3+x+m5u5mJq ZOMhemClkjEmrC5LIUYrDB5SDd0l55rFUJDXpVcUsGdkPoOuYwZWitoKBiKoOzB7dq7Nl7 bQnp2nhlSaWPHx7J4ZbtNH4lStiutKHT51hzU8L8ifcDcSgUl41UPBQ3cvb7VBmTN6GCKo mZXYG5uWsPQk4r7hTMfiWaiKtFeebwZta4KUbrLe2VTgcAxZfUtXpvwV0wGgUURdBcBpXb xy+NSm35IsjQH2CawG+VJlFGzAsE+WN6VpaewPID5iloibOq9vDVIni2AU7SkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706703902; a=rsa-sha256; cv=none; b=E1sZ+8TH8mUZKomPAVQwot1QwC+tPYijssP9V0s7cIhD/Zkkdihdc8UIhp0RJ5sleTIq/2 waSdeM32LdR/zOq5DWxPq+20B0NxZX9ht6RgcBAVeKKnjSi8NZloHURcprcFC0LGSgfRME kbXPr7U/E7iy8H39KFapuEv4UCC4Q75SFb7J1BKbtE62ss2/eQxAJbTtQIMgm+nPSluxPs 7uJj0BS/PIBG/kVF8OQ1OAulM/m6u0Af1iJaQ8Xz7x6JYJubhTzs03fu2rjfH5qww9FgBp T7Nq6CstDSbh9LHjA38SKmc92tAGRPw4NTIJ75PU+VhwijMyjP0tttL2F5gNVA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQ1Ss70SdzdHM; Wed, 31 Jan 2024 12:25:01 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 57E9E11B386; Wed, 31 Jan 2024 13:24:59 +0100 (CET) Date: Wed, 31 Jan 2024 13:24:59 +0100 From: Baptiste Daroussin To: Jung-uk Kim Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Message-ID: References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202401310406.40V46B9a000876@gitrepo.freebsd.org> Hello, Either this one or the previous import is breaking arm64 build --- acpi_iort.o --- /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field 'data' with variable sized type 'union (unnamed union at /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 )' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end] 103 | } data; | ^ best regards, Bapt On Wed, Jan 31, 2024 at 04:06:11AM +0000, Jung-uk Kim wrote: > The branch main has been updated by jkim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=07c64d74917e7c8ca61c77413dbd533390e7dca7 > > commit 07c64d74917e7c8ca61c77413dbd533390e7dca7 > Author: Jung-uk Kim > AuthorDate: 2024-01-30 21:49:20 +0000 > Commit: Jung-uk Kim > CommitDate: 2024-01-31 03:58:33 +0000 > > acpica: Import ACPICA 20230628 > > (cherry picked from commit ef3ba9d625927fd4592a8c071698a562821485bd) > --- > sys/contrib/dev/acpica/changes.txt | 30 ++++ > sys/contrib/dev/acpica/common/ahpredef.c | 1 + > sys/contrib/dev/acpica/common/dmtable.c | 26 ++++ > sys/contrib/dev/acpica/common/dmtbdump2.c | 83 +++++++++- > sys/contrib/dev/acpica/common/dmtbinfo1.c | 2 +- > sys/contrib/dev/acpica/common/dmtbinfo2.c | 173 ++++++++++++++++++++- > sys/contrib/dev/acpica/compiler/aslrestype2.c | 6 +- > sys/contrib/dev/acpica/compiler/dttable2.c | 67 +++++++- > sys/contrib/dev/acpica/compiler/dttemplate.h | 51 ++++-- > .../dev/acpica/components/debugger/dbcmds.c | 59 ++++++- > .../dev/acpica/components/debugger/dbinput.c | 8 + > .../dev/acpica/components/disassembler/dmresrcl.c | 2 +- > .../dev/acpica/components/dispatcher/dswstate.c | 4 +- > sys/contrib/dev/acpica/components/events/evevent.c | 11 +- > .../dev/acpica/components/executer/exserial.c | 3 +- > .../dev/acpica/components/hardware/hwsleep.c | 11 -- > .../dev/acpica/components/parser/psopcode.c | 2 +- > .../dev/acpica/components/resources/rsaddr.c | 2 +- > .../dev/acpica/components/resources/rscreate.c | 8 +- > .../dev/acpica/components/resources/rsdumpinfo.c | 8 +- > .../dev/acpica/components/resources/rsirq.c | 12 +- > .../dev/acpica/components/utilities/utdebug.c | 5 + > .../dev/acpica/components/utilities/utglobal.c | 1 - > sys/contrib/dev/acpica/include/acdebug.h | 4 + > sys/contrib/dev/acpica/include/acdisasm.h | 13 ++ > sys/contrib/dev/acpica/include/acglobal.h | 1 + > sys/contrib/dev/acpica/include/aclocal.h | 29 ++-- > sys/contrib/dev/acpica/include/acnames.h | 1 + > sys/contrib/dev/acpica/include/acpixf.h | 2 +- > sys/contrib/dev/acpica/include/acpredef.h | 3 + > sys/contrib/dev/acpica/include/acrestyp.h | 8 +- > sys/contrib/dev/acpica/include/actbinfo.h | 15 +- > sys/contrib/dev/acpica/include/actbl1.h | 4 +- > sys/contrib/dev/acpica/include/actbl2.h | 81 +++++++++- > sys/contrib/dev/acpica/include/actbl3.h | 4 +- > sys/contrib/dev/acpica/include/actypes.h | 3 +- > sys/contrib/dev/acpica/include/amlresrc.h | 2 +- > sys/contrib/dev/acpica/include/platform/acgcc.h | 2 +- > 38 files changed, 651 insertions(+), 96 deletions(-) > > diff --git a/sys/contrib/dev/acpica/changes.txt b/sys/contrib/dev/acpica/changes.txt > index af896ec7e0b0..edcc674d90ab 100644 > --- a/sys/contrib/dev/acpica/changes.txt > +++ b/sys/contrib/dev/acpica/changes.txt > @@ -1,4 +1,34 @@ > ---------------------------------------- > +28 June 2023. Summary of changes for version 20230628: > + > +0) Global changes: > + > +Fixed a problem with the ASL/AML Timer() operator. Discovered by UBSAN: ?array-index-out-of-bounds in acpica/dswexec.c:401:12 index -1 is out of range for type 'acpi_operand_object?. Added AML_NO_OPERAND_RESOLVE flag to Timer (since there are no runtime arguments). Reported by: Abhishek Mainkar abmainkar@nvidia.com. > + > +Added a define for size of acpi_srat_generic_affinity DeviceHandle. Replaced a magic number with a define. The Linux kernel code will utilize this. Reported by Dave Jiang dave.jiang@intel.com. > + > +Added support for _DSC (Deepest State for Configuration) as per ACPI 6.5. > + > +1) ACPICA kernel-resident subsystem: > + > +Added port definitions for CDAT SSLBIS. Add upstream port and any port definitions for SSLBIS. Reported by: Dave Jiang dave.jiang@intel.com. > + > +Fixed misspelled CDAT DSMAS define: ACPI_CEDT_DSMAS_NON_VOLATILE -> ACPI_CDAT_DSMAS_NON_VOLATILE. Reported by: Dave Jiang dave.jiang@intel.com. > + > +1) ACPICA kernel-resident subsystem: > + > +Fix GCC 12 dangling-pointer warning. We're storing a persistent pointer to an ephemeral local variable which technically is a dangling pointer and the compiler is correct. However, since we never indirect the pointer, this is a safe operation and we can suppress the warning. > + > +Also, some C run-times (like MUSL) aren't including indirectly so we must include it explicitly or we won't have the type definition for uintptr_t. > + > +2) iASL Compiler/Disassembler and ACPICA tools:. > + > +IASL/RHCT: Enable dumping and compiling newly added nodes. The RHCT table is updated with new nodes. Add compile and dump functionality for these new structures. > + > +AcpiExec: Added a new command, ?interrupt?. The Interrupt command simulates an interrupt with a IntID (GSIV) equal to the first argument of the call/invocation. The acpiexec code simulates the behavior by OSPM: execute the _EVT method of the GED device associated with that IntID. Submitted by: Jose Marinho jose.marinho@arm.com. > + > +AcpiExec: Detect GED device and keep track of _EVT. The GED device is described by a _HID of ACPI0013. This code traverses the namespace identifying all GED devices. For each GED device in the namespace we record the Interrupt object and the _EVT method. This information is used when an interrupt is simulated via the ?interrupt? command. Submitted by: Jose Marinho jose.marinho@arm.com. > +---------------------------------------- > 31 March 2023. Summary of changes for version 20230331: > > This release is available at https://acpica.org/downloads > diff --git a/sys/contrib/dev/acpica/common/ahpredef.c b/sys/contrib/dev/acpica/common/ahpredef.c > index 97655cfab6f7..38653468560e 100644 > --- a/sys/contrib/dev/acpica/common/ahpredef.c > +++ b/sys/contrib/dev/acpica/common/ahpredef.c > @@ -234,6 +234,7 @@ const AH_PREDEFINED_NAME AslPredefinedInfo[] = > AH_PREDEF ("_DMA", "Direct Memory Access", "Returns device current resources for DMA transactions, and resource field"), > AH_PREDEF ("_DOD", "Display Output Devices", "Enumerate all devices attached to the display adapter"), > AH_PREDEF ("_DOS", "Disable Output Switching", "Sets the display output switching mode"), > + AH_PREDEF ("_DSC", "Deepest State for Configuration", "Returns the deepest D-state of the device to the OSPM"), > AH_PREDEF ("_DPL", "Device Selection Polarity", "Polarity of Device Selection signal, Resource Descriptor field"), > AH_PREDEF ("_DRS", "Drive Strength", "Drive Strength setting for GPIO connection, Resource Descriptor field"), > AH_PREDEF ("_DSD", "Device-Specific Data", "Returns a list of device property information"), > diff --git a/sys/contrib/dev/acpica/common/dmtable.c b/sys/contrib/dev/acpica/common/dmtable.c > index 0d7cdceb5b4a..80aa700bb5e7 100644 > --- a/sys/contrib/dev/acpica/common/dmtable.c > +++ b/sys/contrib/dev/acpica/common/dmtable.c > @@ -430,6 +430,9 @@ static const char *AcpiDmMadtSubnames[] = > "Bridge I/O Interrupt Controller", /* ACPI_MADT_TYPE_BIO_PIC */ > "LPC Interrupt Controller", /* ACPI_MADT_TYPE_LPC_PIC */ > "RISC-V Interrupt Controller", /* ACPI_MADT_TYPE_RINTC */ > + "RISC-V Incoming MSI Controller", /* ACPI_MADT_TYPE_IMSIC */ > + "RISC-V APLIC Controller", /* ACPI_MADT_TYPE_APLIC */ > + "RISC-V PLIC Controller", /* ACPI_MADT_TYPE_PLIC */ > "Unknown Subtable Type", /* Reserved */ > "Types 80-FF are used for OEM data" /* Reserved for OEM data */ > }; > @@ -669,6 +672,14 @@ static const char *AcpiDmGasAccessWidth[] = > "Unknown Width Encoding" > }; > > +static const char *AcpiDmRhctSubnames[] = > +{ > + "RISC-V ISA string structure", /* ACPI_RHCT_ISA_STRING */ > + "RISC-V CMO node structure", /* ACPI_RHCT_CMO_NODE */ > + "RISC-V MMU node structure", /* ACPI_RHCT_MMU_NODE */ > + "RISC-V Hart Info structure", /* ACPI_RHCT_HART_INFO */ > +}; > + > > /******************************************************************************* > * > @@ -1190,6 +1201,7 @@ AcpiDmDumpTable ( > case ACPI_DMT_NFIT: > case ACPI_DMT_NHLT1e: > case ACPI_DMT_PHAT: > + case ACPI_DMT_RHCT: > > ByteLength = 2; > break; > @@ -2169,6 +2181,20 @@ AcpiDmDumpTable ( > AcpiDmRgrtSubnames[Temp8]); > break; > > + case ACPI_DMT_RHCT: > + > + /* RHCT subtable types */ > + > + Temp16 = ACPI_GET16 (Target); > + if (Temp16 == ACPI_RHCT_NODE_TYPE_HART_INFO) > + { > + Temp16 = ACPI_RHCT_NODE_TYPE_RESERVED; > + } > + > + AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target), > + AcpiDmRhctSubnames[Temp16]); > + break; > + > case ACPI_DMT_SDEV: > > /* SDEV subtable types */ > diff --git a/sys/contrib/dev/acpica/common/dmtbdump2.c b/sys/contrib/dev/acpica/common/dmtbdump2.c > index 61f62fee8315..6c94ac7bf04a 100644 > --- a/sys/contrib/dev/acpica/common/dmtbdump2.c > +++ b/sys/contrib/dev/acpica/common/dmtbdump2.c > @@ -990,6 +990,61 @@ AcpiDmDumpMadt ( > InfoTable = AcpiDmTableInfoMadt16; > break; > > + case ACPI_MADT_TYPE_CORE_PIC: > + > + InfoTable = AcpiDmTableInfoMadt17; > + break; > + > + case ACPI_MADT_TYPE_LIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt18; > + break; > + > + case ACPI_MADT_TYPE_HT_PIC: > + > + InfoTable = AcpiDmTableInfoMadt19; > + break; > + > + case ACPI_MADT_TYPE_EIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt20; > + break; > + > + case ACPI_MADT_TYPE_MSI_PIC: > + > + InfoTable = AcpiDmTableInfoMadt21; > + break; > + > + case ACPI_MADT_TYPE_BIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt22; > + break; > + > + case ACPI_MADT_TYPE_LPC_PIC: > + > + InfoTable = AcpiDmTableInfoMadt23; > + break; > + > + case ACPI_MADT_TYPE_RINTC: > + > + InfoTable = AcpiDmTableInfoMadt24; > + break; > + > + case ACPI_MADT_TYPE_IMSIC: > + > + InfoTable = AcpiDmTableInfoMadt25; > + break; > + > + case ACPI_MADT_TYPE_APLIC: > + > + InfoTable = AcpiDmTableInfoMadt26; > + break; > + > + case ACPI_MADT_TYPE_PLIC: > + > + InfoTable = AcpiDmTableInfoMadt27; > + break; > + > default: > > if ((Subtable->Type >= ACPI_MADT_TYPE_RESERVED) && > @@ -1021,7 +1076,7 @@ AcpiDmDumpMadt ( > /* Dump the OEM data */ > > Status = AcpiDmDumpTable (Length, Offset, ACPI_CAST_PTR (UINT8, Table) + Offset, > - Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt17); > + Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt128); > if (ACPI_FAILURE (Status)) > { > return; > @@ -1058,16 +1113,16 @@ NextSubtable: > Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, > Subtable->Length); > > - DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", > - Subtable, Subtable->Length); > - DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", > - ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); > - > Offset = ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table); > if (Offset >= Table->Length) > { > return; > } > + > + DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", > + Subtable, Subtable->Length); > + DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", > + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); > } > } > > @@ -2765,6 +2820,8 @@ AcpiDmDumpRhct ( > ACPI_RHCT_NODE_HEADER *Subtable; > ACPI_RHCT_HART_INFO *RhctHartInfo; > ACPI_RHCT_ISA_STRING *RhctIsaString; > + ACPI_RHCT_CMO_NODE *RhctCmoNode; > + ACPI_RHCT_MMU_NODE *RhctMmuNode; > UINT32 Length = Table->Length; > UINT8 SubtableOffset, IsaPadOffset; > UINT32 Offset = sizeof (ACPI_TABLE_RHCT); > @@ -2850,6 +2907,20 @@ AcpiDmDumpRhct ( > (Subtable->Length - IsaPadOffset), AcpiDmTableInfoRhctIsaPad); > } > > + break; > + > + case ACPI_RHCT_NODE_TYPE_CMO: > + RhctCmoNode = ACPI_ADD_PTR (ACPI_RHCT_CMO_NODE, Subtable, SubtableOffset); > + Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset, > + RhctCmoNode, 4, AcpiDmTableInfoRhctCmo1); > + break; > + > + case ACPI_RHCT_NODE_TYPE_MMU: > + RhctMmuNode = ACPI_ADD_PTR (ACPI_RHCT_MMU_NODE, Subtable, SubtableOffset); > + Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset, > + RhctMmuNode, 2, AcpiDmTableInfoRhctMmu1); > + break; > + > default: > break; > } > diff --git a/sys/contrib/dev/acpica/common/dmtbinfo1.c b/sys/contrib/dev/acpica/common/dmtbinfo1.c > index 058bb2e72215..d53ec515cbde 100644 > --- a/sys/contrib/dev/acpica/common/dmtbinfo1.c > +++ b/sys/contrib/dev/acpica/common/dmtbinfo1.c > @@ -947,7 +947,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[] = > { > {ACPI_DMT_UINT24, ACPI_DMAR4_OFFSET (Reserved[0]), "Reserved", 0}, > {ACPI_DMT_UINT8, ACPI_DMAR4_OFFSET (DeviceNumber), "Device Number", 0}, > - {ACPI_DMT_STRING, ACPI_DMAR4_OFFSET (u.DeviceName[0]), "Device Name", 0}, > + {ACPI_DMT_STRING, ACPI_DMAR4_OFFSET (DeviceName[0]), "Device Name", 0}, > ACPI_DMT_TERMINATOR > }; > > diff --git a/sys/contrib/dev/acpica/common/dmtbinfo2.c b/sys/contrib/dev/acpica/common/dmtbinfo2.c > index e1e325dec277..9a3bf952fe40 100644 > --- a/sys/contrib/dev/acpica/common/dmtbinfo2.c > +++ b/sys/contrib/dev/acpica/common/dmtbinfo2.c > @@ -678,8 +678,6 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoLpit0[] = > {ACPI_DMT_UINT64, ACPI_LPIT0_OFFSET (CounterFrequency), "Counter Frequency", 0}, > ACPI_DMT_TERMINATOR > }; > - > - > /******************************************************************************* > * > * MADT - Multiple APIC Description Table and subtables > @@ -926,12 +924,155 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[] = > ACPI_DMT_TERMINATOR > }; > > -/* 17: OEM data structure */ > +/* 17: core interrupt controller */ > > ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT17_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (ProcessorId), "ProcessorId", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (CoreId), "CoreId", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT17_OFFSET (Flags), "Flags", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 18: Legacy I/O interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt18[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT18_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT18_OFFSET (Address), "Address", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT18_OFFSET (Size), "Size", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT18_OFFSET (Cascade), "Cascade", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT18_OFFSET (CascadeMap), "CascadeMap", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 19: HT interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt19[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT19_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT19_OFFSET (Address), "Address", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT19_OFFSET (Size), "Size", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT19_OFFSET (Cascade), "Cascade", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 20: Extend I/O interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt20[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Cascade), "Cascade", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT20_OFFSET (Node), "Node", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT20_OFFSET (NodeMap), "NodeMap", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 21: MSI controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt21[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT21_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT21_OFFSET (MsgAddress), "MsgAddress", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT21_OFFSET (Start), "Start", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT21_OFFSET (Count), "Count", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 22: BIO interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt22[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT22_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT22_OFFSET (Address), "Address", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (Size), "Size", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (Id), "Id", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT22_OFFSET (GsiBase), "GsiBase", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 23: LPC interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt23[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT23_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT23_OFFSET (Address), "Address", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT23_OFFSET (Size), "Size", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT23_OFFSET (Cascade), "Cascade", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 24: RINTC interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt24[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT24_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT24_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT24_OFFSET (HartId), "HartId", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (Uid), "Uid", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (ExtIntcId), "ExtIntcId", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT24_OFFSET (ImsicAddr), "ImsicAddr", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT24_OFFSET (ImsicSize), "ImsicSize", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 25: RISC-V IMSIC interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt25[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT25_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT25_OFFSET (NumIds), "NumIds", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT25_OFFSET (NumGuestIds), "NumGuestIds", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GuestIndexBits), "GuestIndexBits", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (HartIndexBits), "HartIndexBits", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GroupIndexBits), "GroupIndexBits", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT25_OFFSET (GroupIndexShift), "GroupIndexShift", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 26: RISC-V APLIC interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt26[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT26_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT26_OFFSET (Id), "Id", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT26_OFFSET (HwId), "HwId", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT26_OFFSET (NumIdcs), "NumIdcs", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT26_OFFSET (NumSources), "NumSources", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (GsiBase), "GsiBase", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT26_OFFSET (BaseAddr), "BaseAddr", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT26_OFFSET (Size), "Size", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 27: RISC-V PLIC interrupt controller */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt27[] = > +{ > + {ACPI_DMT_UINT8, ACPI_MADT27_OFFSET (Version), "Version", 0}, > + {ACPI_DMT_UINT8, ACPI_MADT27_OFFSET (Id), "Id", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT27_OFFSET (HwId), "HwId", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT27_OFFSET (NumIrqs), "NumIrqs", 0}, > + {ACPI_DMT_UINT16, ACPI_MADT27_OFFSET (MaxPrio), "MaxPrio", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (Size), "Size", 0}, > + {ACPI_DMT_UINT64, ACPI_MADT27_OFFSET (BaseAddr), "BaseAddr", 0}, > + {ACPI_DMT_UINT32, ACPI_MADT27_OFFSET (GsiBase), "GsiBase", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 128: OEM data structure */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt128[] = > { > {ACPI_DMT_RAW_BUFFER, 0, "OEM Data", 0}, > - ACPI_DMT_TERMINATOR > + ACPI_DMT_TERMINATOR > }; > > /******************************************************************************* > @@ -2080,7 +2221,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt0[] = > > ACPI_DMTABLE_INFO AcpiDmTableInfoRhct[] = > { > - {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (Flags), "Flags", 0}, > {ACPI_DMT_UINT64, ACPI_RHCT_OFFSET (TimeBaseFreq), "Timer Base Frequency", 0}, > {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (NodeCount), "Number of nodes", 0}, > {ACPI_DMT_UINT32, ACPI_RHCT_OFFSET (NodeOffset), "Offset to the node array", 0}, > @@ -2092,7 +2233,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRhct[] = > > ACPI_DMTABLE_INFO AcpiDmTableInfoRhctNodeHdr[] = > { > - {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Type), "Subtable Type", 0}, > + {ACPI_DMT_RHCT, ACPI_RHCTH_OFFSET (Type), "Subtable Type", 0}, > {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Length), "Length", 0}, > {ACPI_DMT_UINT16, ACPI_RHCTH_OFFSET (Revision), "Revision", 0}, > ACPI_DMT_TERMINATOR > @@ -2116,6 +2257,26 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoRhctIsaPad[] = > ACPI_DMT_TERMINATOR > }; > > +/* 1: CMO node type */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoRhctCmo1[] = > +{ > + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbomSize), "CBOM Block Size", 0}, > + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbopSize), "CBOP Block Size", 0}, > + {ACPI_DMT_UINT8, ACPI_RHCT1_OFFSET (CbozSize), "CBOZ Block Size", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +/* 2: MMU node type */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoRhctMmu1[] = > +{ > + {ACPI_DMT_UINT8, ACPI_RHCT2_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT8, ACPI_RHCT2_OFFSET (MmuType), "MMU Type", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > /* 0xFFFF: Hart Info type */ > > ACPI_DMTABLE_INFO AcpiDmTableInfoRhctHartInfo1[] = > diff --git a/sys/contrib/dev/acpica/compiler/aslrestype2.c b/sys/contrib/dev/acpica/compiler/aslrestype2.c > index ab021866cd02..9406a2172481 100644 > --- a/sys/contrib/dev/acpica/compiler/aslrestype2.c > +++ b/sys/contrib/dev/acpica/compiler/aslrestype2.c > @@ -337,7 +337,7 @@ RsDoInterruptDescriptor ( > Descriptor->ExtendedIrq.InterruptCount = 0; > > Rover = ACPI_CAST_PTR (AML_RESOURCE, > - (&(Descriptor->ExtendedIrq.u.Interrupts[0]))); > + (&(Descriptor->ExtendedIrq.Interrupts[0]))); > > /* Process all child initialization nodes */ > > @@ -466,7 +466,7 @@ RsDoInterruptDescriptor ( > > RsCreateDwordField (InitializerOp, ACPI_RESTAG_INTERRUPT, > CurrentByteOffset + > - ASL_RESDESC_OFFSET (ExtendedIrq.u.Interrupts[0])); > + ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0])); > } > } > > @@ -494,7 +494,7 @@ RsDoInterruptDescriptor ( > } > > Rnode->BufferLength = > - (ASL_RESDESC_OFFSET (ExtendedIrq.u.Interrupts[0]) - > + (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) - > ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType)) > + OptionIndex + StringLength; > return (Rnode); > diff --git a/sys/contrib/dev/acpica/compiler/dttable2.c b/sys/contrib/dev/acpica/compiler/dttable2.c > index 9046851e313c..af6ac5f6319e 100644 > --- a/sys/contrib/dev/acpica/compiler/dttable2.c > +++ b/sys/contrib/dev/acpica/compiler/dttable2.c > @@ -371,11 +371,66 @@ DtCompileMadt ( > InfoTable = AcpiDmTableInfoMadt16; > break; > > + case ACPI_MADT_TYPE_CORE_PIC: > + > + InfoTable = AcpiDmTableInfoMadt17; > + break; > + > + case ACPI_MADT_TYPE_LIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt18; > + break; > + > + case ACPI_MADT_TYPE_HT_PIC: > + > + InfoTable = AcpiDmTableInfoMadt19; > + break; > + > + case ACPI_MADT_TYPE_EIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt20; > + break; > + > + case ACPI_MADT_TYPE_MSI_PIC: > + > + InfoTable = AcpiDmTableInfoMadt21; > + break; > + > + case ACPI_MADT_TYPE_BIO_PIC: > + > + InfoTable = AcpiDmTableInfoMadt22; > + break; > + > + case ACPI_MADT_TYPE_LPC_PIC: > + > + InfoTable = AcpiDmTableInfoMadt23; > + break; > + > + case ACPI_MADT_TYPE_RINTC: > + > + InfoTable = AcpiDmTableInfoMadt24; > + break; > + > + case ACPI_MADT_TYPE_IMSIC: > + > + InfoTable = AcpiDmTableInfoMadt25; > + break; > + > + case ACPI_MADT_TYPE_APLIC: > + > + InfoTable = AcpiDmTableInfoMadt26; > + break; > + > + case ACPI_MADT_TYPE_PLIC: > + > + InfoTable = AcpiDmTableInfoMadt27; > + break; > + > default: > > if (MadtHeader->Type >= ACPI_MADT_TYPE_OEM_RESERVED) > { > - InfoTable = AcpiDmTableInfoMadt17; > + InfoTable = AcpiDmTableInfoMadt128; > } > else > { > @@ -2190,6 +2245,16 @@ DtCompileRhct ( > InfoTable = AcpiDmTableInfoRhctHartInfo1; > break; > > + case ACPI_RHCT_NODE_TYPE_CMO: > + > + InfoTable = AcpiDmTableInfoRhctCmo1; > + break; > + > + case ACPI_RHCT_NODE_TYPE_MMU: > + > + InfoTable = AcpiDmTableInfoRhctMmu1; > + break; > + > default: > > DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "RHCT"); > diff --git a/sys/contrib/dev/acpica/compiler/dttemplate.h b/sys/contrib/dev/acpica/compiler/dttemplate.h > index 755da40224e4..c97a8ed24eee 100644 > --- a/sys/contrib/dev/acpica/compiler/dttemplate.h > +++ b/sys/contrib/dev/acpica/compiler/dttemplate.h > @@ -1128,11 +1128,11 @@ const unsigned char TemplateLpit[] = > > const unsigned char TemplateMadt[] = > { > - 0x41,0x50,0x49,0x43,0x6A,0x01,0x00,0x00, /* 00000000 "APICj..." */ > - 0x05,0x9D,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > + 0x41,0x50,0x49,0x43,0x60,0x02,0x00,0x00, /* 00000000 "APIC...." */ > + 0x05,0x69,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ > 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > - 0x13,0x11,0x20,0x20,0x00,0x00,0x00,0x00, /* 00000020 ".. ...." */ > + 0x31,0x03,0x22,0x20,0x00,0x00,0x00,0x00, /* 00000020 "1." ...." */ > 0x01,0x00,0x00,0x00,0x00,0x08,0x00,0x00, /* 00000028 "........" */ > 0x01,0x00,0x00,0x00,0x01,0x0C,0x01,0x00, /* 00000030 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ > @@ -1173,7 +1173,37 @@ const unsigned char TemplateMadt[] = > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000150 "........" */ > 0x00,0x00,0x10,0x10,0x00,0x00,0x00,0x00, /* 00000158 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000160 "........" */ > - 0x00,0x00 /* 00000168 ".." */ > + 0x00,0x00,0x11,0x0F,0x01,0x01,0x00,0x00, /* 00000168 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /* 00000170 "........" */ > + 0x00,0x12,0x17,0x01,0x00,0x14,0xE0,0x1F, /* 00000178 "........" */ > + 0x00,0x00,0x00,0x00,0x80,0x00,0x02,0x03, /* 00000180 "........" */ > + 0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF, /* 00000188 "........" */ > + 0x13,0x15,0x01,0x80,0x00,0x00,0xFB,0xFD, /* 00000190 "........" */ > + 0x0E,0x00,0x00,0x40,0x00,0x00,0x00,0x00, /* 00000198 "...@...." */ > + 0xFF,0x00,0x00,0x00,0x00,0x14,0x0D,0x01, /* 000001A0 "........" */ > + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001A8 "........" */ > + 0x00,0x00,0x15,0x13,0x01,0x00,0x00,0xF0, /* 000001B0 "........" */ > + 0x2F,0x00,0x00,0x00,0x00,0x40,0x00,0x00, /* 000001B8 "/....@.." */ > + 0x00,0xC0,0x00,0x00,0x00,0x16,0x11,0x01, /* 000001C0 "........" */ > + 0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00, /* 000001C8 "........" */ > + 0x00,0x10,0x00,0x00,0x40,0x00,0x17,0x0E, /* 000001D0 "....@..." */ > + 0x01,0x00,0x20,0x00,0x10,0x00,0x00,0x00, /* 000001D8 ".. ....." */ > + 0x00,0x00,0x10,0x13,0x18,0x24,0x01,0x00, /* 000001E0 "........" */ > + 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E8 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001F0 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x28, /* 000001F8 ".......(" */ > + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, /* 00000200 "........" */ > + 0x19,0x10,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000208 "........" */ > + 0xFF,0x00,0xFF,0x00,0x00,0x00,0x00,0x18, /* 00000210 "........" */ > + 0x1A,0x24,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000218 ".$......" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000220 "........" */ > + 0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00, /* 00000228 "..`....." */ > + 0x00,0x00,0x00,0x0D,0x00,0x00,0x00,0x00, /* 00000230 "........" */ > + 0x00,0x80,0x00,0x00,0x1B,0x24,0x01,0x00, /* 00000238 ".....$.." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000240 "........" */ > + 0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000248 "`.....`." */ > + 0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x0C, /* 00000250 "..`....." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 /* 00000258 "........" */ > }; > > const unsigned char TemplateMcfg[] = > @@ -1718,8 +1748,8 @@ const unsigned char TemplateRgrt[] = > > const unsigned char TemplateRhct[] = > { > - 0x52,0x48,0x43,0x54,0x7C,0x00,0x00,0x00, /* 00000000 "RHCT|..." */ > - 0x01,0x7D,0x4F,0x45,0x4D,0x43,0x41,0x00, /* 00000008 "..OEMCA." */ > + 0x52,0x48,0x43,0x54,0x96,0x00,0x00,0x00, /* 00000000 "RHCT|..." */ > + 0x01,0x24,0x4F,0x45,0x4D,0x43,0x41,0x00, /* 00000008 "..OEMCA." */ > 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ > 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > 0x28,0x09,0x22,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ > @@ -1731,9 +1761,12 @@ const unsigned char TemplateRhct[] = > 0x72,0x5F,0x7A,0x69,0x66,0x65,0x6E,0x63, /* 00000050 "r_zifenc" */ > 0x65,0x69,0x5F,0x7A,0x62,0x61,0x5F,0x7A, /* 00000058 "ei_zba_z" */ > 0x62,0x62,0x5F,0x7A,0x62,0x63,0x5F,0x7A, /* 00000060 "bb_zbc_z" */ > - 0x62,0x73,0x00,0x00,0xFF,0xFF,0x10,0x00, /* 00000068 "bs......" */ > - 0x01,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ > - 0x38,0x00,0x00,0x00 /* 00000078 "........" */ > + 0x62,0x73,0x00,0x00,0xFF,0xFF,0x18,0x00, /* 00000068 "bs......" */ > + 0x01,0x00,0x03,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ > + 0x38,0x00,0x00,0x00,0x7c,0x00,0x00,0x00, /* 00000078 "........" */ > + 0x8E,0x00,0x00,0x00,0x01,0x00,0x0A,0x00, /* 00000080 "........" */ > + 0x01,0x00,0x00,0x06,0x06,0x06,0x02,0x00, /* 00000088 "........" */ > + 0x08,0x00,0x01,0x00,0x00,0x02 /* 00000090 "........" */ > }; > > const unsigned char TemplateRsdp[] = > diff --git a/sys/contrib/dev/acpica/components/debugger/dbcmds.c b/sys/contrib/dev/acpica/components/debugger/dbcmds.c > index dca5468870ed..4c8f091f126c 100644 > --- a/sys/contrib/dev/acpica/components/debugger/dbcmds.c > +++ b/sys/contrib/dev/acpica/components/debugger/dbcmds.c > @@ -157,7 +157,6 @@ > #include > #include > > - > #define _COMPONENT ACPI_CA_DEBUGGER > ACPI_MODULE_NAME ("dbcmds") > > @@ -1291,6 +1290,64 @@ AcpiDbDisplayResources ( > } > > > +/******************************************************************************* > + * > + * FUNCTION: AcpiDbGenerateGed > + * > + * PARAMETERS: GedArg - Raw GED number, ascii string > + * > + * RETURN: None > + * > + * DESCRIPTION: Simulate firing of a GED > + * > + ******************************************************************************/ > + > +void > +AcpiDbGenerateInterrupt ( > + char *GsivArg) > +{ > + UINT32 GsivNumber; > + ACPI_GED_HANDLER_INFO *GedInfo = AcpiGbl_GedHandlerList; > + > + if (!GedInfo) { > + AcpiOsPrintf ("No GED handling present\n"); > + } > + > + GsivNumber = strtoul (GsivArg, NULL, 0); > + > + while (GedInfo) { > + > + if (GedInfo->IntId == GsivNumber) { > + ACPI_OBJECT_LIST ArgList; > + ACPI_OBJECT Arg0; > + ACPI_HANDLE EvtHandle = GedInfo->EvtMethod; > + ACPI_STATUS Status; > + > + AcpiOsPrintf ("Evaluate GED _EVT (GSIV=%d)\n", GsivNumber); > + > + if (!EvtHandle) { > + AcpiOsPrintf ("Undefined _EVT method\n"); > + return; > + } > + > + Arg0.Integer.Type = ACPI_TYPE_INTEGER; > + Arg0.Integer.Value = GsivNumber; > + > + ArgList.Count = 1; > + ArgList.Pointer = &Arg0; > + > + Status = AcpiEvaluateObject (EvtHandle, NULL, &ArgList, NULL); > + if (ACPI_FAILURE (Status)) > + { > + AcpiOsPrintf ("Could not evaluate _EVT\n"); > + return; > + } > + > + } > + GedInfo = GedInfo->Next; > + } > +} > + > #if (!ACPI_REDUCED_HARDWARE) > /******************************************************************************* > * > diff --git a/sys/contrib/dev/acpica/components/debugger/dbinput.c b/sys/contrib/dev/acpica/components/debugger/dbinput.c > index 84173d0c14e4..c900c4ec7acf 100644 > --- a/sys/contrib/dev/acpica/components/debugger/dbinput.c > +++ b/sys/contrib/dev/acpica/components/debugger/dbinput.c > @@ -264,6 +264,7 @@ enum AcpiExDebuggerCommands > CMD_THREADS, > > CMD_TEST, > + CMD_INTERRUPT, > #endif > }; > > @@ -345,6 +346,7 @@ static const ACPI_DB_COMMAND_INFO AcpiGbl_DbCommands[] = > {"THREADS", 3}, > > {"TEST", 1}, > + {"INTERRUPT", 1}, > #endif > {NULL, 0} > }; > @@ -461,6 +463,7 @@ static const ACPI_DB_COMMAND_HELP AcpiGbl_DbCommandHelp[] = > {1, " Gpes", "Display info on all GPE devices\n"}, > {1, " Sci", "Generate an SCI\n"}, > {1, " Sleep [SleepState]", "Simulate sleep/wake sequence(s) (0-5)\n"}, > + {1, " Interrupt ", "Simulate an interrupt\n"}, > #endif > {0, NULL, NULL} > }; > @@ -1263,6 +1266,11 @@ AcpiDbCommandDispatch ( > AcpiOsPrintf ("Event command not implemented\n"); > break; > > + case CMD_INTERRUPT: > + > + AcpiDbGenerateInterrupt (AcpiGbl_DbArgs[1]); > + break; > + > case CMD_GPE: > > AcpiDbGenerateGpe (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]); > diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c > index 19e6eb884d0c..1df288229457 100644 > --- a/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c > +++ b/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c > @@ -1112,7 +1112,7 @@ AcpiDmInterruptDescriptor ( > { > AcpiDmIndent (Level + 1); > AcpiOsPrintf ("0x%8.8X,\n", > - (UINT32) Resource->ExtendedIrq.u.Interrupts[i]); > + (UINT32) Resource->ExtendedIrq.Interrupts[i]); > } > > AcpiDmIndent (Level); > diff --git a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c > index 2c8cfa8a57b8..9b49696423b8 100644 > --- a/sys/contrib/dev/acpica/components/dispatcher/dswstate.c > +++ b/sys/contrib/dev/acpica/components/dispatcher/dswstate.c > @@ -310,8 +310,8 @@ AcpiDsResultPush ( > if (!Object) > { > ACPI_ERROR ((AE_INFO, > - "Null Object! Obj=%p State=%p Num=%u", > - Object, WalkState, WalkState->ResultCount)); > + "Null Object! State=%p Num=%u", > + WalkState, WalkState->ResultCount)); > return (AE_BAD_PARAMETER); > } > > diff --git a/sys/contrib/dev/acpica/components/events/evevent.c b/sys/contrib/dev/acpica/components/events/evevent.c > index 7c2e21ae7375..70255aae9bd0 100644 > --- a/sys/contrib/dev/acpica/components/events/evevent.c > +++ b/sys/contrib/dev/acpica/components/events/evevent.c > @@ -312,8 +312,7 @@ AcpiEvFixedEventInitialize ( > { > Status = AcpiWriteBitRegister ( > AcpiGbl_FixedEventInfo[i].EnableRegisterId, > - (i == ACPI_EVENT_PCIE_WAKE) ? > - ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT); > + ACPI_DISABLE_EVENT); > if (ACPI_FAILURE (Status)) > { > return (Status); > @@ -362,11 +361,6 @@ AcpiEvFixedEventDetect ( > return (IntStatus); > } > > - if (FixedEnable & ACPI_BITMASK_PCIEXP_WAKE_DISABLE) > - FixedEnable &= ~ACPI_BITMASK_PCIEXP_WAKE_DISABLE; > - else > - FixedEnable |= ACPI_BITMASK_PCIEXP_WAKE_DISABLE; > - > ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS, > "Fixed Event Block: Enable %08X Status %08X\n", > FixedEnable, FixedStatus)); > @@ -437,8 +431,7 @@ AcpiEvFixedEventDispatch ( > { > (void) AcpiWriteBitRegister ( > AcpiGbl_FixedEventInfo[Event].EnableRegisterId, > - (Event == ACPI_EVENT_PCIE_WAKE) ? > - ACPI_ENABLE_EVENT : ACPI_DISABLE_EVENT); > + ACPI_DISABLE_EVENT); > > ACPI_ERROR ((AE_INFO, > "No installed handler for fixed event - %s (%u), disabling", > diff --git a/sys/contrib/dev/acpica/components/executer/exserial.c b/sys/contrib/dev/acpica/components/executer/exserial.c > index 0f756dfaefd1..ef1eaf37daa1 100644 > --- a/sys/contrib/dev/acpica/components/executer/exserial.c > +++ b/sys/contrib/dev/acpica/components/executer/exserial.c > @@ -505,8 +505,7 @@ AcpiExWriteSerialBus ( > /* Copy the input buffer data to the transfer buffer */ > > Buffer = BufferDesc->Buffer.Pointer; > - DataLength = (BufferLength < SourceDesc->Buffer.Length ? > - BufferLength : SourceDesc->Buffer.Length); > + DataLength = ACPI_MIN (BufferLength, SourceDesc->Buffer.Length); > memcpy (Buffer, SourceDesc->Buffer.Pointer, DataLength); > > /* Lock entire transaction if requested */ > diff --git a/sys/contrib/dev/acpica/components/hardware/hwsleep.c b/sys/contrib/dev/acpica/components/hardware/hwsleep.c > index 4a352fb9b7d2..7ddb6c2b30d3 100644 > --- a/sys/contrib/dev/acpica/components/hardware/hwsleep.c > +++ b/sys/contrib/dev/acpica/components/hardware/hwsleep.c > @@ -475,17 +475,6 @@ AcpiHwLegacyWake ( > AcpiGbl_FixedEventInfo[ACPI_EVENT_SLEEP_BUTTON].StatusRegisterId, > ACPI_CLEAR_STATUS); > > - /* Enable pcie wake event if support */ > - if ((AcpiGbl_FADT.Flags & ACPI_FADT_PCI_EXPRESS_WAKE)) > - { > - (void) AcpiWriteBitRegister ( > - AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].EnableRegisterId, > - ACPI_DISABLE_EVENT); > - (void) AcpiWriteBitRegister ( > - AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].StatusRegisterId, > - ACPI_CLEAR_STATUS); > - } > - > AcpiHwExecuteSleepMethod (METHOD_PATHNAME__SST, ACPI_SST_WORKING); > return_ACPI_STATUS (Status); > } > diff --git a/sys/contrib/dev/acpica/components/parser/psopcode.c b/sys/contrib/dev/acpica/components/parser/psopcode.c > index 0ec2590cc42f..a36148ebcd31 100644 > --- a/sys/contrib/dev/acpica/components/parser/psopcode.c > +++ b/sys/contrib/dev/acpica/components/parser/psopcode.c > @@ -436,7 +436,7 @@ const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES] = > > /* ACPI 3.0 opcodes */ > > -/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R), > +/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R | AML_NO_OPERAND_RESOLVE), > > /* ACPI 5.0 opcodes */ > > diff --git a/sys/contrib/dev/acpica/components/resources/rsaddr.c b/sys/contrib/dev/acpica/components/resources/rsaddr.c > index 3a719a80d737..4a2d02f4562f 100644 > --- a/sys/contrib/dev/acpica/components/resources/rsaddr.c > +++ b/sys/contrib/dev/acpica/components/resources/rsaddr.c > @@ -431,11 +431,11 @@ AcpiRsGetAddressCommon ( > ACPI_RESOURCE *Resource, > AML_RESOURCE *Aml) > { > + > /* Avoid undefined behavior: member access within misaligned address */ > > AML_RESOURCE_ADDRESS Address; > memcpy(&Address, Aml, sizeof(Address)); > - > ACPI_FUNCTION_ENTRY(); > > /* Validate the Resource Type */ > diff --git a/sys/contrib/dev/acpica/components/resources/rscreate.c b/sys/contrib/dev/acpica/components/resources/rscreate.c > index 60694d470b72..5cb7e0923c16 100644 > --- a/sys/contrib/dev/acpica/components/resources/rscreate.c > +++ b/sys/contrib/dev/acpica/components/resources/rscreate.c > @@ -475,9 +475,9 @@ AcpiRsCreatePciRoutingTable ( > /* Use *remaining* length of the buffer as max for pathname */ > > PathBuffer.Length = OutputBuffer->Length - > - (UINT32) ((UINT8 *) UserPrt->u.Source - > + (UINT32) ((UINT8 *) UserPrt->Source - > (UINT8 *) OutputBuffer->Pointer); > - PathBuffer.Pointer = UserPrt->u.Source; > + PathBuffer.Pointer = UserPrt->Source; > > Status = AcpiNsHandleToPathname ( > (ACPI_HANDLE) Node, &PathBuffer, FALSE); > *** 637 LINES SKIPPED *** From nobody Wed Jan 31 14:49:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ4hQ5sHJz58gXq; Wed, 31 Jan 2024 14:50:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ4hQ2PGxz41Fv; Wed, 31 Jan 2024 14:50:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f178.google.com with SMTP id 38308e7fff4ca-2cf1288097aso69864651fa.0; Wed, 31 Jan 2024 06:50:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706712612; x=1707317412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VfoAgaJ/xYC2RMlxz/5r6/hwzqOS7ZX364TvkjMv39E=; b=jDUJRzLaqsPduMcUNSgxrClYB/D3Chnn83pxR42uPnM9gRF96cwr5f6VNMtJgKI/lp wtI6geXUO5WxlZvtBy7Tdyi+lGS2x6tfjNUoAHQ0Q/yw1atM3rT4piA2zKl0uSVVdkPo QWJ1LPHRwTP7ZFJN3liIBwH7p569XFK4Cu2mYRBRDJsP1cgkSmEwHw9lPOLrDtD/z4Lm uUn88XzP7fXX+EdrpguzQ0lbLUqdnVTcx44wWK2pBs8EQ4e1kM/ulfpUgv78450Tf85d CzPVHXi8CgpmmS6Tr2hefUenqVI7i2qSwI8Kz9qoTgWWFTMxLhkmkVUXPtjQkabTxyVW 91Pg== X-Gm-Message-State: AOJu0YyKyHVZCtyiSUmPVoQmgxptWJ7ust0CK3xZGKznSw9JFmbnwv8j DDUIIM2ny9YP+b8hct7XIzZSOefLzBs1V9ilztlc5NKS0dWBtrlo3Z3ZetbGcyodie4BcJIdF/6 cK7Anr4YGzTrie6WuBpCm833Nd9U= X-Google-Smtp-Source: AGHT+IG0SetDs/jDJd0eWRIgS26LjWLPPnNpVbgO+Br/EPC/W+nuH0Z7bdJ5cBbT4aCsqMQnHxT/b1WwywnZnSct5vg= X-Received: by 2002:a2e:950c:0:b0:2d0:4ef8:3472 with SMTP id f12-20020a2e950c000000b002d04ef83472mr1287550ljh.47.1706712612075; Wed, 31 Jan 2024 06:50:12 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> <20240131051743.EDDE915B@slippy.cwsent.com> In-Reply-To: <20240131051743.EDDE915B@slippy.cwsent.com> From: Ed Maste Date: Wed, 31 Jan 2024 09:49:59 -0500 Message-ID: Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 To: Cy Schubert Cc: Warner Losh , Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4TQ4hQ2PGxz41Fv 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:15169, ipnet:209.85.128.0/17, country:US] On Wed, 31 Jan 2024 at 00:17, Cy Schubert wrote: > > but would the history graph be different? Or does that matter? It will be different - a merge would be main --- A --- B ---- C ---- D / / / / vendor --- X ------------ Y cherry-pick will be: main --- A --- B ---- C ---- D' / / vendor --- X ------------ Y as you mention D and D' have the same contents, but D' has only one parent. When searching for unmerged changes commit Y might be reported, but that view of the history won't otherwise cause material issues. If there's another update in the future and it's merged we'll be back to: main --- A --- B ---- C ---- D' --- E / / / / vendor --- X ------------ Y ---- Z In this case Y would no longer get reported as needing to be merged. From nobody Wed Jan 31 15:35:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ5j40Yh0z58lJG for ; Wed, 31 Jan 2024 15:35:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ5j35NQVz4672 for ; Wed, 31 Jan 2024 15:35:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-557dcb0f870so5971071a12.2 for ; Wed, 31 Jan 2024 07:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706715348; x=1707320148; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Md9shYk7884Q+svMcpmmr9uXN25VVY9UCrrHUUvDb10=; b=hKxYG+jW/txIo/AtMIeaIVGCW1zDtYjWUodgRSQfTK3eOXZI2WyRwtsaCiKlcAJCD5 UZdCNR6lEra3pTttmrtaq1LqJp516veBvAknX9tTFr0JaKgq6G5Dod4jbE39g2KgRamg ftnfX5ePDutgUbRVFUwSxkE8BZHXFEFO7V7XGl+M2u3GFZdeHcNig2Nqh/MlGi23XjKX P33+TLb7wMi/kgAm/Kh+2Gs8IqbBWm7oCkJOYEpojsLhaYtlKKni7PVvX82hwSe9EmYF lLtZpuX10N49/3bwsUdZUB45toibWYIrxcVWaUg3BnFRdPd/jWpv3rTYWGJ31fRil0/1 yYgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706715348; x=1707320148; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Md9shYk7884Q+svMcpmmr9uXN25VVY9UCrrHUUvDb10=; b=HKjQRwGMoiETdlc7xmHHDFDeHxjfPTJdX3RFnmJTFWnG3KzvybA+mch7yG6D3LioKA S+PY0AbD3hHvEfmwHEd8cB3Gn/uAEW1Kqc4knVtufgsPOdyfpVTOu+vu8CEgtDxz71es gNxzevdRZHvobKTOKePGNkIT3hSqhiJ7Is+LsjlL+vCEnK7ZIFQDc1QxBOs+p2a0zQrL ND+NcolvDbdzvF6/LxF4Pf08AhWzGNPNvfRnPgHBRSue2/RR10NrPPsnSwsdZmNLclKA 0MHT0vYiexfhFIA1oC8MbXDc3lObCPBnOo2Jx/pKPjyERzHqyq/oZ4zjR7aM7Jjg5jN7 ePDQ== X-Gm-Message-State: AOJu0YxzbeuqesJvHkvuAaQe7K3AqY9F8F4ISZpVX7rnclNbYC14rK/h Zu6hYA1/RBVwb2DGSDBhzBHzBREU6HgaaNXj7zCwCBbGlhJ7Qa1kFTMIo/WINhcU8ZDx+9OjOhu mf2QYXwTkOrjXvYafuqIa3cWrVvlmu19fXGwiIw== X-Google-Smtp-Source: AGHT+IHG65gN96+jC3twuSlcLsmHSXmTPUUCVYGh5SEzW7rSlr89eHKGpbmDhmtfJkGaJZWf0SEOCC9YhVkdqKyCU5E= X-Received: by 2002:a05:6402:1a2f:b0:55f:a102:55 with SMTP id be15-20020a0564021a2f00b0055fa1020055mr348289edb.10.1706715348218; Wed, 31 Jan 2024 07:35:48 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> <20240131051743.EDDE915B@slippy.cwsent.com> In-Reply-To: From: Warner Losh Date: Wed, 31 Jan 2024 08:35:37 -0700 Message-ID: Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 To: Ed Maste Cc: Cy Schubert , Jessica Clarke , Jung-uk Kim , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000010461a06103fa2eb" X-Rspamd-Queue-Id: 4TQ5j35NQVz4672 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:15169, ipnet:2a00:1450::/32, country:US] --00000000000010461a06103fa2eb Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jan 31, 2024 at 7:50=E2=80=AFAM Ed Maste wrote= : > On Wed, 31 Jan 2024 at 00:17, Cy Schubert > wrote: > > > > but would the history graph be different? Or does that matter? > > It will be different - a merge would be > > main --- A --- B ---- C ---- D > / / > / / > vendor --- X ------------ Y > > cherry-pick will be: > > main --- A --- B ---- C ---- D' > / > / > vendor --- X ------------ Y > > as you mention D and D' have the same contents, but D' has only one > parent. When searching for unmerged changes commit Y might be > reported, but that view of the history won't otherwise cause material > issues. > > If there's another update in the future and it's merged we'll be back to: > > main --- A --- B ---- C ---- D' --- E > / / > / / > vendor --- X ------------ Y ---- Z > > In this case Y would no longer get reported as needing to be merged. > There's an important detail here. If D really is identical to D' except for the second parent and its delta is the same as from X to Y, then when it comes time to merge Z to create E, we'll be fine. Git understands how to cope with cherry-picked changed in this situation because the change hash (different than the commit hash) will be the same. However, if there was any change at all, no matter how trivial or trifling, then it will consider those changes in need of merging, and conflicts are possible during that process.It will require that you do additional work to sort them out when you sorted out them already in the cherry-pick. If we always merge, the only conflicts that are possible are actual conflicts. It's why we don't do this by cherry-pick generally. While rerere can code adequately, the data for rerer= e is on an individual's machine, while the merge info metadata is inside the pushed repo. Warner --00000000000010461a06103fa2eb Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Jan 31, 2024 at 7:50=E2=80=AF= AM Ed Maste <emaste@freebsd.org> wrote:
On = Wed, 31 Jan 2024 at 00:17, Cy Schubert <Cy.Schubert@cschubert.com> wrote:
>
>=C2=A0 but would the history graph be different? Or does that matter?
It will be different - a merge would be

main=C2=A0 =C2=A0--- A --- B ---- C ---- D
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0/
vendor --- X ------------ Y

cherry-pick will be:

main=C2=A0 =C2=A0--- A --- B ---- C ---- D'
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /
vendor --- X ------------ Y

as you mention D and D' have the same contents, but D' has only one=
parent. When searching for unmerged changes commit Y might be
reported, but that view of the history won't otherwise cause material issues.

If there's another update in the future and it's merged we'll b= e back to:

main=C2=A0 =C2=A0--- A --- B ---- C ---- D' --- E
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/
vendor --- X ------------ Y ---- Z

In this case Y would no longer get reported as needing to be merged.

There's an important detail here. If D really = is identical to D' except
for the secon= d parent and its delta is the same as from X to Y, then when
it comes time to merge Z to create E, we'll be fine. = Git understands how
to cope with cherry-pic= ked changed in this situation because the change
hash (different than the commit hash) will be the same. However, if t= here was
any change at all, no matter how t= rivial or trifling, then it will consider
t= hose changes in need of merging, and conflicts are possible during that
process.It will require that you do additional= work to sort them out when you
sorted out = them already in the cherry-pick. If we always merge, the only
conflicts that are possible are actual conflicts. It'= ;s why we don't do this by
cherry-pick = generally. While rerere can code adequately, the data for rerere
is on an individual's machine, while the merge in= fo metadata is inside the
pushed repo.

Warner
=
--00000000000010461a06103fa2eb-- From nobody Wed Jan 31 16:28:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ6tJ6zWQz58qff; Wed, 31 Jan 2024 16:28:56 +0000 (UTC) (envelope-from jkim@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 4TQ6tJ6Q9nz4D3W; Wed, 31 Jan 2024 16:28:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706718536; 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=qx9B+Rx2I2eXneB77Iz0QZQHmm9BCCTdLMFffrCjzWc=; b=okWxIm0xMsnJMhh+5ztigINl9TIYz8VDiRvEe5TMEMaD1jawZlB2pkyQUMvuCYiwDeN3FN 9jiGV/2/sSjK+2UQx/fMro89I4r/tUhZbRW8V/p5R5gI1aoyH+SNRE3ZAs0PBD9uo0xy/W BWZgeqVFXaTqVlmKMbkUdRAlN1SaDEBZEPHTjE35ETgYF/wF6ncOn8tZSohdVNW1Dt9Icz Lmkjgf/qFrhv3XBqYs1/Js1gtodz7g5XlTOYEWue630kjBS7laKuoVDqEExh7USuSnrHHS 9AEWSkeUEm8LeeE51S/ChNbjN4nRdP6gkxkrqGuj4pS5/2DSW+hoPDUqR8vOcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706718536; 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=qx9B+Rx2I2eXneB77Iz0QZQHmm9BCCTdLMFffrCjzWc=; b=SQYbQaBFMJBuCs8oHdJVtle5ieCdrRsr9xIi9rRVcLOF5v0SU99VMWjWiUpiK+rC8BZk85 SGTG0S2nj7RebNWWgCLsNvguyK8Ws77Adk3M3UwhD/ccp5RFiWfsHH1LdYZjEOtIdhrPsl UJxy6KEMh+WVKKpFU4xISeViwW82m+JN5qIXr84pNr4slAPf6lVX63mYRmtUJgZ9XfzuNU tFp2C+9U86TUVs1KBGNk6aPmqy/JDWwBAJJwVsl8Pt4GPLzqNkic2X8UskVWW7FJtFn+qy pc+anqah3oI3Ku7dzmDcykbkgqkV9EZ+Qu+5V8CK6PrpXrcD/fKzRhqxdGwVoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706718536; a=rsa-sha256; cv=none; b=KjVPAbYa7n6QSuNDZUlO1Ui3S2JxwVm1lCydv7uR9XVvuiUcpRkED3Cd6bu3lm5/yZZu/j ZKtTB01Rf35ZCKuIZybieO2fqhG+QJ3upLwyu8jGr++s1xaUq0n/ZwfS2+OHsWbBAOr4Tj DP4674TlSQVanjJ8tThxubBHq4MPESKYakJCenACDTkEI2JUXrsvTDAMsx+iS0hW0T0beP Giudf0jvuaZ+VvxaIeAW2/bkXH12BYnbZFHrgnDJH97ChL+QuXOY8neOeYzttoYxZQlINg VdtPwa0OV1jK5jWp0CNZWPbXhmb/GhIQlWGcAtiE8oE6AkSuEM/YZHuLa2+ySQ== Received: from freefall.freebsd.org (pool-108-53-202-102.nwrknj.fios.verizon.net [108.53.202.102]) (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: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQ6tJ4wH3zjKK; Wed, 31 Jan 2024 16:28:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Message-ID: <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> Date: Wed, 31 Jan 2024 11:28:56 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 To: Baptiste Daroussin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dmitry Salychev References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> Content-Language: en-US From: Jung-uk Kim Organization: FreeBSD.org In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24. 1. 31., Baptiste Daroussin wrote: > Hello, > > Either this one or the previous import is breaking arm64 build > > --- acpi_iort.o --- > /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field > 'data' with variable sized type 'union (unnamed union at > /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 > )' not at the end of a struct or class is a GNU extension > [-Werror,-Wgnu-variable-sized-type-not-at-end] > 103 | } data; > | ^ Sorry for the breakage. I will fix it soon. BTW, this code was added by this: https://reviews.freebsd.org/D31267 It seems struct iort_named_component was a hack, which duplicated ACPI_IORT_NAMED_COMPONENT but with a fixed length field DeviceName[32]. Is it really necessary? Jung-uk Kim From nobody Wed Jan 31 17:30:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ8FK0CxNz58wB2; Wed, 31 Jan 2024 17:30: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 4TQ8FJ5yTzz4Htx; Wed, 31 Jan 2024 17:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706722228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUunj9Lc99VYvvpxEcSnHBm8DtRt4KmNRw9CMPNRUhk=; b=JEucozGSQ2c7Mrcxm5aitPAwqVcRxQmFVqJs67O51Q9Lor0rt8ImSwEIZI9S4hT7oW6keL X+LbLE43iUWQWGU6xwljcfjxie5loiJd5xLjtEs8mNfq9v8iyhrN5GnslX1vECkSaMpDnp glKTK2uXJ66RNG4pMrlYf7feuW+m8GVcRWBaVzq6ABWfURXg+GbpMDUpj/BwKIR2HCR+qf NcfeBGRRLVnW+XZ23NAPguBIn61zZTeyLWQ/Dmi/clvXiafZV3VbTcnzUkFOt+HZIyL1QP M9Dpcw+acEUUtd5/7sYjD9P7KUQ0l69Ylh5N6UvGJd7fDIYLvdn+ZOcPbbUoWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706722228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUunj9Lc99VYvvpxEcSnHBm8DtRt4KmNRw9CMPNRUhk=; b=b994O0OmqDunBHip7foXTYh7TZH+xOowxaDXIrXN4xYrGtEZ2niy2UePlpsXYRuOnR92ay lXvX4lD84bqmSqFeBCorZFaaW2VbW2cYpa2yOojk9jaH9SxA3Tc0vNqNoULWxGUTsYZ/zC 7+x9c29rGjeQJ7U59sbUWfrpvjmqMimUW90fni64rfbWc0To8DNRH/HOODtcyf1Q22cJ8Y 2kJdf8fzjAftQ+nAUHEDL7zElRcBz2LkzYn3BFgF9z52WTcMko3KDe1wElrw5X1K2WTl7t x64ETuzI7nEES7EV9NKLWJ1izt9P6HHzRVA8B7N0HRQmHUdm3KnN0+4ZqcwdRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706722228; a=rsa-sha256; cv=none; b=mC/BsDoBGNkWY2DoTW0weXugcd/J/qAOa8WFTxobSYpnxlyZKsYHPcQ3u242vOCbnYeZoy x20leh4cmxZkKLik3x5uqydlsl9hMFWgsZAb3jikWZdfQNfnMVY1ZTpyjsL5wS5So0Rg5m DivgUjv8cvTNWPIURKFzA5pOXv+CyFqNVhs29JlIr998dTVvxDcKaivTNQSLRW7WR14m5j e5l0W31/cj1Bin1tEcLGZDlOWNL0tPfLk9jE9Cr0+gO/FY266VyNdFchIiO6Lv3kdhRhnO dskDMGbfKfaBXmF9G+CIICH/M2uRkw2mia0LFyttGPgB3sBlFvw5t+QaJ7Sq+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 4TQ8FJ51shzRcc; Wed, 31 Jan 2024 17:30: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 40VHUS4G054102; Wed, 31 Jan 2024 17:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VHUSnE054099; Wed, 31 Jan 2024 17:30:28 GMT (envelope-from git) Date: Wed, 31 Jan 2024 17:30:28 GMT Message-Id: <202401311730.40VHUSnE054099@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: 18cb422356f2 - main - timerfd: Move kern_timerfd_* prototypes to List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18cb422356f259f83ad3189cc4494e56265aef94 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=18cb422356f259f83ad3189cc4494e56265aef94 commit 18cb422356f259f83ad3189cc4494e56265aef94 Author: John Baldwin AuthorDate: 2024-01-31 17:15:58 +0000 Commit: John Baldwin CommitDate: 2024-01-31 17:30:12 +0000 timerfd: Move kern_timerfd_* prototypes to --- sys/kern/sys_timerfd.c | 1 + sys/sys/syscallsubr.h | 5 +++++ sys/sys/timerfd.h | 7 ------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index d9c0e189baf2..30c3709e59a6 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 1eb9582a907d..25df3f03f1de 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -362,6 +362,11 @@ int kern_thr_alloc(struct proc *, int pages, struct thread **); int kern_thr_exit(struct thread *td); int kern_thr_new(struct thread *td, struct thr_param *param); int kern_thr_suspend(struct thread *td, struct timespec *tsp); +int kern_timerfd_create(struct thread *td, int clockid, int flags); +int kern_timerfd_gettime(struct thread *td, int fd, + struct itimerspec *curr_value); +int kern_timerfd_settime(struct thread *td, int fd, int flags, + const struct itimerspec *new_value, struct itimerspec *old_value); int kern_truncate(struct thread *td, const char *path, enum uio_seg pathseg, off_t length); int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, diff --git a/sys/sys/timerfd.h b/sys/sys/timerfd.h index cace3b71498c..06409a77f7d2 100644 --- a/sys/sys/timerfd.h +++ b/sys/sys/timerfd.h @@ -58,13 +58,6 @@ __END_DECLS #else /* _KERNEL */ -struct thread; - -int kern_timerfd_create(struct thread *td, int clockid, int flags); -int kern_timerfd_gettime(struct thread *td, int fd, - struct itimerspec *curr_value); -int kern_timerfd_settime(struct thread *td, int fd, int flags, - const struct itimerspec *new_value, struct itimerspec *old_value); void timerfd_jumped(void); #endif /* !_KERNEL */ From nobody Wed Jan 31 17:40:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ8Sy4Bn5z58x8G; Wed, 31 Jan 2024 17:40:34 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQ8Sy017Yz4KnY; Wed, 31 Jan 2024 17:40:33 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id V5kKrXhqExDxGVEZdrHvXo; Wed, 31 Jan 2024 17:40:33 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id VEZbrBMza9Cr4VEZcr2ocS; Wed, 31 Jan 2024 17:40:33 +0000 X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=65ba8611 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=TY5y7QwLGcO0zdUOPHQA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id AC45620E; Wed, 31 Jan 2024 09:40:30 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8787610F; Wed, 31 Jan 2024 09:40:30 -0800 (PST) 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: Jung-uk Kim cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dmitry Salychev Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 In-reply-to: <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> Comments: In-reply-to Jung-uk Kim message dated "Wed, 31 Jan 2024 11:28:56 -0500." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 31 Jan 2024 09:40:30 -0800 Message-Id: <20240131174030.8787610F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfACdP3xL0AmS+MNKUSBMshFGGPU1dPSXgW5xuse6natYa0LDNgjqnDZNfxTXrd94EOqxYteWSntia0r4As4itUezSChNGhZ0bR9Dw8h/aYbKyHzKXgxK fm/Htde/bJHiq/U+Y6YykLHLAOnbEu5tUnGiXq95Dta9CX49ZVbVOnvPd+AYiZNU0ZRDwp7ykXcB2n5up4cGJM5HpbLwoVGwV5Tlz91LYVnvtUc0PjSCnJCd brJFWGPU68T1Qh2tSgbsPPqAQPG78x3SzdZl4nR/nPXF5fWdtDTvCetaWo5Il1zm1bHi61Zs1bh+NAgPMffqke8lLOv4Rn8gU1aFBCLJMwV85YCDv6iYjksE 11P/fvg3q6W+qT8xsgzZeTzVUMb8Sg== X-Rspamd-Queue-Id: 4TQ8Sy017Yz4KnY 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] In message <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org>, Jung-uk Kim writ es: > On 24. 1. 31., Baptiste Daroussin wrote: > > Hello, > > > > Either this one or the previous import is breaking arm64 build > > > > --- acpi_iort.o --- > > /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field > > 'data' with variable sized type 'union (unnamed union at > > /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 > > )' not at the end of a struct or class is a GNU extension > > [-Werror,-Wgnu-variable-sized-type-not-at-end] > > 103 | } data; > > | ^ > > Sorry for the breakage. I will fix it soon. > > BTW, this code was added by this: > > https://reviews.freebsd.org/D31267 > > It seems struct iort_named_component was a hack, which duplicated > ACPI_IORT_NAMED_COMPONENT but with a fixed length field DeviceName[32]. > Is it really necessary? Though they incorporated the WOL patch I've been using, they've broken poweroff. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Jan 31 18:36:02 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ9hy6QxBz59296; Wed, 31 Jan 2024 18:36: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 4TQ9hy5ts9z4RDV; Wed, 31 Jan 2024 18:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJoqRXbTPc0a20U0d+KvkS7a8fI886kO2gQzBU/a6Sk=; b=w8VkLMbBsJjQdNwKqv420yJiR/+KjuC+4sy157ZyZXJf27qMYtv/b8iNnuuewxdaGxg3A7 VBvjmMdx2srTiuwFF0D7CbHPgxwpj9J9aOnohXhUA9fFTdrnjZckhGMNZlOYGa2KYhszR0 jTA2zfNlOijBVCohclhzaj2MYs09Rr8EKeroRYHmzNAfc2W3nMeAfA4IMGW57w/yY86iwy /lKiwp0osHIcadHykDU1xI7SvZ4CXsIzCF9xAH9NoBCu9zAl/92YRcW2Badr6Jw9KU8ul3 xhBa80ec6Z6uWuCeIno3FFKA6HcWolbIF1ziEgPyOGZkIoSEE96TrM/pJLsm5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJoqRXbTPc0a20U0d+KvkS7a8fI886kO2gQzBU/a6Sk=; b=C0hBVNAgpiIzotxfycGyFu0cKyhhkQKjWdIQDO3y1SQY6N7iWOMkEmVT7e5UVIeHNDfSbT 76pgeb8OwY3Q0GArRG5YuKAvqI1Vrr/nk+q8ll1ASLVVZnqp97JpeHViinKUv2IGFxpWDJ 5JnNPXDWb7r5906TK/vDuirDwLBb16vhoox4HCfrAqFl7EmQRv+pcGjED+nqqaoXhLcMc1 E7WpvXw4Xe/Y/PChP9+BR3uEThwTfHetmXtwIvsgD5loglkzfrt+7Gk7R+fWrpc4zHIpYU F9DIBlHkEvbqD17gRy2c68e4gBzIpe7ydNpu6xpGXyurMU0ONFAHIUPvl0PHGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706726162; a=rsa-sha256; cv=none; b=gFYk8lHeuvnmeKjqyPnyaEjPXpSs3WU9CWxkypRwqSP+2W1PVy5wis/RMCAWUPmA4R7ciy G3jnT0k0CWf6vcdr+Y2ugPzlYSyw4lJbD98aGapgqPQj5JBKkKhuRDB5FBNPecjRqB8tw6 j7LkK0FdCVTwVh/2QgiWc//BPRD7FBnG0C1YTbMF5Xkl0tgvFM4SyqzEoxJSpIjiJtCj8q 1GrrD22rcDXEKOpSCIe4ECwcw8qzf3OuZzbYAd3q1y4S9aZJ+7EWg6cNdPKg1vAni84NPu Wl+caaXR1vsBNLaDcIg0bas2PTz2Kh00UOBFs+0eEqMhVr7K0UVDyUuRgOenQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQ9hy4ypszVDC; Wed, 31 Jan 2024 18:36: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 40VIa2nX062657; Wed, 31 Jan 2024 18:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VIa2NM062654; Wed, 31 Jan 2024 18:36:02 GMT (envelope-from git) Date: Wed, 31 Jan 2024 18:36:02 GMT Message-Id: <202401311836.40VIa2NM062654@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: 712fd5ac9181 - main - intro.9: minor changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 712fd5ac9181b544d8ffcf88ab6313233c8ddaed Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=712fd5ac9181b544d8ffcf88ab6313233c8ddaed commit 712fd5ac9181b544d8ffcf88ab6313233c8ddaed Author: Graham Perrin AuthorDate: 2023-08-06 17:34:03 +0000 Commit: Mitchell Horne CommitDate: 2024-01-31 18:31:32 +0000 intro.9: minor changes A correction: 'and' -> 'an'. Plus, several tweaks for brevity or clarity. Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/813 --- share/man/man9/intro.9 | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/share/man/man9/intro.9 b/share/man/man9/intro.9 index 458ee0ab4697..e13566725976 100644 --- a/share/man/man9/intro.9 +++ b/share/man/man9/intro.9 @@ -6,7 +6,7 @@ .\" This manual page was written by Mitchell Horne under .\" sponsorship from the FreeBSD Foundation. .\" -.Dd August 2, 2023 +.Dd January 30, 2024 .Dt INTRO 9 .Os .Sh NAME @@ -16,7 +16,7 @@ Welcome to the .Fx kernel documentation. -Outside of the source code itself, this set of +Outside the source code itself, this set of .Xr man 1 pages is the primary resource for information on usage of the numerous programming interfaces available within the kernel. @@ -177,9 +177,10 @@ The kernel interface for file systems is File system implementations register themselves with .Xr vfsconf 9 . .Pp -The abstract and filesystem-independent representation of a file, directory, or -other file-like entity within the kernel is the -.Xr vnode 9 . +The +.Xr vnode 9 +is the abstract and filesystem-independent representation of a file, +directory, or other file-like entity within the kernel. .Pp The implementation of access control lists for filesystems is described by .Xr acl 9 . @@ -371,7 +372,7 @@ Signals can be sent to processes or process groups using the functions described by .Xr psignal 9 . .Ss Security -See the generic security overview in +See the overview in .Xr security 7 . .Pp The basic structure for user credentials is @@ -397,7 +398,7 @@ see .Xr mac 9 . .Pp Cryptographic services are provided by the OpenCrypto framework. -This API provides and interface for both consumers and crypto drivers; +This API provides an interface for both consumers and crypto drivers; see .Xr crypto 9 . .Pp @@ -409,9 +410,9 @@ and The interfaces for declaring loadable kernel modules are described by .Xr module 9 . .Ss Interrupts -The machine-independent portion of the interrupt framework supporting the -registration and execution of interrupt handlers is described by -.Xr intr_event 9 . +.Xr intr_event 9 +describes the machine-independent portion of the interrupt framework +that supports registration and execution of interrupt handlers. .Pp Software interrupts are provided by .Xr swi 9 . @@ -450,17 +451,16 @@ Kernel sanitizers can perform additional compiler-assisted checks against memory use/access. These runtimes are capable of detecting difficult-to-identify classes of bugs, at the cost of a large overhead. -Supported is the Kernel Address Sanitizer -.Xr KASAN 9 , -and the Kernel Memory Sanitizer -.Xr KMSAN 9 . +The Kernel Address Sanitizer +.Xr KASAN 9 +and Kernel Memory Sanitizer +.Xr KMSAN 9 +are supported. .Pp The -.Cd LOCK_PROFILING +.Xr LOCK_PROFILING 9 kernel config option enables extra code to assist with profiling and/or -debugging lock performance; -see -.Xr LOCK_PROFILING 9 . +debugging lock performance. .Ss Driver Tools Defined functions/APIs for specific types of devices. .Bl -tag -width "Xr usbdi 9" @@ -514,6 +514,6 @@ The kernel object implementation is described by .Xr man 1 , .Xr style 9 .Rs -.%T "The FreeBSD Architecture Handbook" -.%U "https://docs.freebsd.org/en/books/arch-handbook/" +.%T The FreeBSD Architecture Handbook +.%U https://docs.freebsd.org/en/books/arch-handbook/ .Re From nobody Wed Jan 31 18:47:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQ9yT03Shz593DG; Wed, 31 Jan 2024 18:47: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 4TQ9yS5KmJz4SRf; Wed, 31 Jan 2024 18:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR98SMg2VVfNxuZPvhHBw6K+A+HPDoaGo3PnCogmbmk=; b=VZpCkyOm4tcO4wIWLe2SAmnf3Qdf5X3U/dlpt+YSKhtNCaa8urLtCN8EGVwKRaa6ig1l74 UxHePFsRBHHslHk2Juj5ITRcf8KCoov3BB3WJpqiz6meTT2cCxbUSpHNuO0FI05WuUjfpy gx8EfBEHiF6y7+FdONqRzXlLxDGUJYghGFiLCNgFgeJsR9/07IEPYOIjLQJrmrXklPdum3 5pmSnwml8KuEz0G0zOYoxy2ukrtIdX4K695uAMJvC8jM/D8b/O3dOhOa3eM+JwluuiFaTo 3mXQdDKa5kbtxNOWulNgrKsIwhqeLEnjFNX2phqJUD3gSMxuPIhF/JHW5/9kIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706726864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LR98SMg2VVfNxuZPvhHBw6K+A+HPDoaGo3PnCogmbmk=; b=r8dhdGqpELx0KPpPome0ev0gIMaDZ8ZuZKqtZqLuOVl9KgNLObB01tE187AwPecRWnJUF4 SNUr/hP74mVc/iODwuSSxj36+NKHRMEI4UvE0cfMP5y8E9zcTED1wYyzt1aHGak+LAYiLN vj4bn7kfamIXBwcg0RUxAuz/8f5H57c7rvDjqv66Kboj41U1PAP2DB9NhmLBuwNkP0zBKb 78RePTYHmEQT+w9XYybK1GBvU+MjZRljlPrqUUENpVjWXABpgJQuV8cu3ZL7uxXcgyUz96 b4KTzooDkyHp88Dt9hZ4zO1ZnT+y0ALTy1KCHF7Qdh3klLDK6FpF2fVw/rql8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706726864; a=rsa-sha256; cv=none; b=Vm4MmaOvCnyjqzF7siwRry1VIdFe5YoaPmKPQDxKEodaFZYG0+GsOYUoGc7BVOWDblc7jf T51+EU4t4PW2Iel5Uh5myFFulGTJWVc0VktKIkfmhuFcjxVezeS3LaTJR3hb3zZ+rvYBVd NklzftP8bJrpiV5NaSruYTXrZiDqmtrZlMAir/LXyROzpQbbQs+OtPt3u5FaQjuAMy8AgM 0c1lKqFFrIHQ+LG69TPegfRpSY9mMrUenBMvQvmnCRKIOSlQlRL/n3gh1tPVTLvPUnxK7/ BCLI4DOcZq9bVmywPmCd3GinDmP46wKjsUwJ0AJkvltGd/CP1q3H3bV/VvMoZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQ9yS4QV1zVn8; Wed, 31 Jan 2024 18:47: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 40VIliIq079868; Wed, 31 Jan 2024 18:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VIlioU079865; Wed, 31 Jan 2024 18:47:44 GMT (envelope-from git) Date: Wed, 31 Jan 2024 18:47:44 GMT Message-Id: <202401311847.40VIlioU079865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 81bee6d793ee - main - acpica: Fix build with ACPICA 20230331 and later List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81bee6d793ee9543dc5391d980b0675cbdeb189a Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=81bee6d793ee9543dc5391d980b0675cbdeb189a commit 81bee6d793ee9543dc5391d980b0675cbdeb189a Author: Jung-uk Kim AuthorDate: 2024-01-31 18:41:29 +0000 Commit: Jung-uk Kim CommitDate: 2024-01-31 18:41:29 +0000 acpica: Fix build with ACPICA 20230331 and later ACPICA is using flexible arrays since 20230331 and it broke aarch64 build. --- acpi_iort.o --- /usr/src/sys/arm64/acpica/acpi_iort.c:103:4: error: field 'data' with variable sized type 'union (unnamed union at /usr/src/sys/arm64/acpica/acpi_iort.c:98:2)' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end] 103 | } data; | ^ Reported by: bapt Tested by: bapt --- sys/arm64/acpica/acpi_iort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/acpica/acpi_iort.c b/sys/arm64/acpica/acpi_iort.c index ef6557ff9c98..a0e24788b775 100644 --- a/sys/arm64/acpica/acpi_iort.c +++ b/sys/arm64/acpica/acpi_iort.c @@ -95,16 +95,16 @@ struct iort_node { u_int nentries; /* items in array below */ u_int usecount; /* for bookkeeping */ u_int revision; /* node revision */ + union { + struct iort_map_entry *mappings; /* node mappings */ + struct iort_its_entry *its; /* ITS IDs array */ + } entries; union { ACPI_IORT_ROOT_COMPLEX pci_rc; /* PCI root complex */ ACPI_IORT_SMMU smmu; ACPI_IORT_SMMU_V3 smmu_v3; struct iort_named_component named_comp; } data; - union { - struct iort_map_entry *mappings; /* node mappings */ - struct iort_its_entry *its; /* ITS IDs array */ - } entries; }; /* Lists for each of the types. */ From nobody Wed Jan 31 19:50:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQCLx6p7Lz589K5; Wed, 31 Jan 2024 19:50: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 4TQCLx6HtSz4d9J; Wed, 31 Jan 2024 19:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+xsLyMosYdMMWpaz5o8h5chs0cP0xsp7kdR4tJ5azM=; b=by22PIoO7LkIXvPgNgrNzr6aS/tpd1bIAM2FrYkG/AEZzALFsCTTZIowuFQj+uB600hSr0 rMzRF7aJgxecg+9yY8gilcATW+eOJ+fqxp6J4cnAnMF3c58MB2NvEi2ovROpFMNAeHgViw G7pFdSHOqSoz1a1wgidgCSFccg0Pua2pWobWGW71xX1WN76BI4iApY9qoT3pmr7SeofmBM 18VKrpxsyiWKCJAI5rP7AYy/KQdvpXNbS88+yB2SyWbLYiCrzIcMiE1yj2YgStrjmZHq3G RbStJRUL6GVsvHeyXEcsmDrGW6IfZRxwzCNxmixg8utHzrGzGj5gpdjUxpo6GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706730633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+xsLyMosYdMMWpaz5o8h5chs0cP0xsp7kdR4tJ5azM=; b=YJlZr2CtRD74cWsjLyMz3hBBvAPn9R1XY55OW/Vp/i/JdljkdGtgDJQQr3PHpO0AQmlqD7 TnF/2EnUIrT//pEvPxxiQ9o+jm50aXBcu200xqmBeo92p7o5W2jAl6mm0mUcaiXfm3QshF LIb89E5HbFKZNg7QIKHWUA9ADIHTVFc94y0OdhLOh9KQmhVfEoYAW3J5UeTPcFT5pW0zrf ZcCKkjXw+dUTvH58SDeqtV+pwwgQNmgUa0HLJcHKYnjB1n7taAkspK7sInX6pSpnpyx/EL QGdE8B1WcpVQBkjsb0Q11C0RlfhO8uHnDu9z/dvp4dx/7c1bRtoIvl5+PsqHEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706730633; a=rsa-sha256; cv=none; b=vgzQsV47MBoNYhDbmDmAi8CoG2jg2xXbUAISfAtisJmRYseu631TK4JU9ipnm5eBCE1+Bv sTyNHUcCDRCcW19Q31T4R7d8ri1PNpseb2+HEPu699q17qjYgrH7xNQZpymiYXFc5LraPV x9qCDiFg+sjcSskX1f9hBUWlyJXQT590mfeH0ZWgKnStTnGCsoma1gccDkYpocgXc0L4ZM Txdkaemax4b46eBdDb6bf6IUTnizY9We+/K5Cw6EF5WsxYmnP/wz4ePtaY6lCeZAxupvFz 3GQ9wCHVc+c1O/N36giMV7N0f/ALsKuL63AjtdX81lvw9mzZNmodEW+l/jcieg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQCLx5LN9zX53; Wed, 31 Jan 2024 19:50: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 40VJoXi4090475; Wed, 31 Jan 2024 19:50:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VJoXo4090472; Wed, 31 Jan 2024 19:50:33 GMT (envelope-from git) Date: Wed, 31 Jan 2024 19:50:33 GMT Message-Id: <202401311950.40VJoXo4090472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b771d5705fc9 - main - tools/build/make.py: Avoid Python 3.7+ subprocess.run capture_output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b771d5705fc95445d4d81e054be664b7842156ff Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b771d5705fc95445d4d81e054be664b7842156ff commit b771d5705fc95445d4d81e054be664b7842156ff Author: Jessica Clarke AuthorDate: 2024-01-31 19:45:59 +0000 Commit: Jessica Clarke CommitDate: 2024-01-31 19:45:59 +0000 tools/build/make.py: Avoid Python 3.7+ subprocess.run capture_output This is just a convenient alias for setting stdout and stderr to PIPE, so substitute it for that to be compatible with Python 3.6. Fixes: 69cfdc81ea7b ("tools/build/make.py: Keep bootstrapped bmake binary up-to-date") --- tools/build/make.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/build/make.py b/tools/build/make.py index 1cca5b14ec70..73788a8896c7 100755 --- a/tools/build/make.py +++ b/tools/build/make.py @@ -81,8 +81,8 @@ def bootstrap_bmake(source_root, objdir_prefix): bmake_config = bmake_install_dir / ".make-py-config" bmake_source_version = subprocess.run([ - "sh", "-c", ". \"$0\"/VERSION; echo $_MAKE_VERSION", - bmake_source_dir], capture_output=True).stdout.strip() + "sh", "-c", ". \"$0\"/VERSION; echo $_MAKE_VERSION", bmake_source_dir], + stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip() try: bmake_source_version = int(bmake_source_version) except ValueError: @@ -92,7 +92,7 @@ def bootstrap_bmake(source_root, objdir_prefix): if bmake_binary.exists(): bmake_installed_version = subprocess.run([ bmake_binary, "-r", "-f", "/dev/null", "-V", "MAKE_VERSION"], - capture_output=True).stdout.strip() + stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip() try: bmake_installed_version = int(bmake_installed_version.strip()) except ValueError: @@ -187,8 +187,9 @@ def default_cross_toolchain(): # default to homebrew-installed clang on MacOS if available if sys.platform.startswith("darwin"): if shutil.which("brew"): - llvm_dir = subprocess.run(["brew", "--prefix", "llvm"], - capture_output=True).stdout.strip() + llvm_dir = subprocess.run([ + "brew", "--prefix", "llvm"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip() debug("Inferred LLVM dir as", llvm_dir) try: if llvm_dir and Path(llvm_dir.decode("utf-8"), "bin").exists(): From nobody Wed Jan 31 20:36:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDN05S5Kz58FPn; Wed, 31 Jan 2024 20:36:32 +0000 (UTC) (envelope-from avg@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 4TQDN04zHnz4jsZ; Wed, 31 Jan 2024 20:36:32 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706733392; 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; bh=7e2s4KtTkNVWJkrbKZ4tuOpwouzVg74rEC4OLj/oiss=; b=jrldkp2+qNnNVGRNEfP5y7m1azGBzWgZcKbl/4rI/yesSvaffoJjHzfqQBT3RS2M8Drv+m /8TODJYJiE9Dp7S4Cd2hy2OycHmmDckE1F/8K8/MXxN820dZe1l2IQuKbcp6v3h/oNQ0Ii Yiv3waHjsV24+6xBxTXUwsmXHOWbwEAP3XF9lJAMGOQBQGSb4vx9F5CRTwzMM+6GUhZQF0 ba+7v88DoVGxLGAAACqJKUHxm7pVkQbQkRkKcrsrIqEPCQbIT9FLZS7PId+g/pL2LeNaG2 IPvpD/9HphORw3ZxBYux2EbKIr+Ya8gMlJxdTXUY8ZatTPP4FO5QXqbp3hDTRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706733392; 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; bh=7e2s4KtTkNVWJkrbKZ4tuOpwouzVg74rEC4OLj/oiss=; b=mHqLgHvKgtP9sRCHDiDCVHiYNN5EAj4P+N6L4MaFMoe/4+dQH67n9hKDPBEDBsrUmEAuYY tAhwckwizJJPvHG3IY3oYU+F/X0iVPb8ksmolidRZkWv6dcCnKQMX6lHUGv1p/mvwBOvi3 78XQI9oBzB63+fnRp7pHxcB4Kz9hFNYWAKe5Fk6I/oEEGHKVZkGnb5/HfyiDFEcgYkIUA1 nAaTDTpMEtZBBIU1MrWMmAuWfm1d1bHII9aOWSJvAGNqFC0Myprd74KcLyX7zQdWjbznDK aAxv6Cb1BJNj5DHRL10mtROUcfJtpUUr5kkz6u3U2gqxtDkmw6ePBlc0AQ4Yuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706733392; a=rsa-sha256; cv=none; b=oKOlkJVF5l6+3eCe78UJx4SEp11HapjjOTS0u3tJ8HLcj2nghOwpZqsi7960duzbHvpfy3 VQ87jQnQhp9K+0XDEMbIazNw89aqIMIvIeFaigQtqIAcmX5OALJf8i+NMnKyMwUFNOUWoJ HVoujO2jURx37zcsJkbTy1PQNhbDhkleBDgxB2RiAmPFZn+n9exkCf93xWxUZaxmIKk4mH L7FjmiZex5n62HJp3MUJdIFp+sJoSeHQx9lEp07P5ab5xFznZXv71R48x/E86E4wqav2WS fNMRvtgacGZXcWEG9ewIO0UqE39MPDRTvDdBfn97ViI+73/cAhD5KBNtupZirQ== Received: from [192.168.0.88] (unknown [93.188.39.137]) (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: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQDMz4XSgz12h5; Wed, 31 Jan 2024 20:36:31 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org> Date: Wed, 31 Jan 2024 22:36:28 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Content-Language: en-US To: Cy Schubert , Jung-uk Kim Cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dmitry Salychev From: Andriy Gapon Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 31/01/2024 19:40, Cy Schubert wrote: > In message <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org>, Jung-uk Kim > writ > es: >> On 24. 1. 31., Baptiste Daroussin wrote: >>> Hello, >>> >>> Either this one or the previous import is breaking arm64 build >>> >>> --- acpi_iort.o --- >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field >>> 'data' with variable sized type 'union (unnamed union at >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 >>> )' not at the end of a struct or class is a GNU extension >>> [-Werror,-Wgnu-variable-sized-type-not-at-end] >>> 103 | } data; >>> | ^ >> >> Sorry for the breakage. I will fix it soon. >> >> BTW, this code was added by this: >> >> https://reviews.freebsd.org/D31267 >> >> It seems struct iort_named_component was a hack, which duplicated >> ACPI_IORT_NAMED_COMPONENT but with a fixed length field DeviceName[32]. >> Is it really necessary? > > Though they incorporated the WOL patch I've been using, they've broken > poweroff. The poweroff issue could be because of 9cdf326b4f -- Andriy Gapon From nobody Wed Jan 31 20:41:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDTy40Bsz58FbC; Wed, 31 Jan 2024 20:41: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 4TQDTy3CX9z4lgs; Wed, 31 Jan 2024 20:41:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706733702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWvXFjNgzDQXZNq42k5VilITARsHTFBucnxpCWIlWWg=; b=MKyE1JDClgtSdDrboFpIXDnTWhxZS7G2z4Xfl7d+nh5Dmawy4SCVrXB9qAyG/ddKw3TLJn PnF48K9wKAIqVteGbRnNSg43G2z2Engb61UKv92cGsAKrNvRV0/To35DaacIIKtk8vmDJj 9ECgQklhOPUzG2bdtyQlnzQDjrqdJCcpMYIAirrKf543HduqB8HXDQacrG8eqfkjjqDPVo 5l+pM8Unjeb/EWqoq45K3pfYBo2hiWHgA1EncclSKNkxEhlHkJBXVoGudtqOCq6eVcInB9 nRvilmA3F5An4PnwuqYIU6RMQBuVBw/F2NEkGcjEm/vrQmdRP1md1YehFqUq4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706733702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWvXFjNgzDQXZNq42k5VilITARsHTFBucnxpCWIlWWg=; b=pbQ7E+a/PEK6Rr4Q1eoxkw/3HhCuL8Hm81ptBAZiGR2Y3nLXhdHkcAsXeOO2a/XVPvy6Dz SXxLFu7Y11bFYPOJOiwIVMXnVVMZnnaJtXB/lg6edmYRs5PA8VF7FrswERPRIYyeqc2Lu7 /GxdyAIxXkNRKfuS9SIg9NtNaB92nhGry9KcyaVvtYse0CacJ69ijXcYwFOU/zCaaMejNL Q/BetrLiSAD1UX9dKTGYP4QOmLSzc0eb0ui9aYd7ya8uuFPy6GUaGwhSuEljQXI3bJF8Ph DAdslHch0s+iO6jNwiTzI6WEIP2PglunSCB3bvmm+oANHUgoPzzzbShvCX7htQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706733702; a=rsa-sha256; cv=none; b=eP9nFdRPrnuvqubhqk0iyzX9L3vovIzFPJUMlVqRy96Yp2+AmVmutsOU9gssLbUBAkql5D dd6HRAwRmx2aHssb2aoUmcNQVmrk14MBNEVTXFcdF1in/RBxiQxX1GmrRpjrr2l1DZty3z btbSjhKNy+EBrzKrtgGEejjFjnBYG36TTV/DAUEv9JNV7LNZj4TuIPIE62JYZd/EjMSuJr AI4UmOUoy4Z1eKNk3V7AxRSYezG7lt1HJDZuGPB511nm7Lx76qYICGPDFuYVfs4NCG5lyd PI5k70OwukvMZryi7zF6CvAcumrXN/WT7W/rI3zvEbzmiu+lu9PUc5dW7V9zqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQDTy2JtszZ1J; Wed, 31 Jan 2024 20:41: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 40VKfgCs080603; Wed, 31 Jan 2024 20:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VKfgE0080600; Wed, 31 Jan 2024 20:41:42 GMT (envelope-from git) Date: Wed, 31 Jan 2024 20:41:42 GMT Message-Id: <202401312041.40VKfgE0080600@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: ed3563b0ac31 - main - csu: add crtbrand.o dependency on sys/param.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed3563b0ac31d854bf907d4d847ac0195ec9637b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ed3563b0ac31d854bf907d4d847ac0195ec9637b commit ed3563b0ac31d854bf907d4d847ac0195ec9637b Author: Ed Maste AuthorDate: 2024-01-12 15:01:49 +0000 Commit: Ed Maste CommitDate: 2024-01-31 20:40:27 +0000 csu: add crtbrand.o dependency on sys/param.h __FreeBSD_version is recorded in *crt1.o and crti.o via crtbrand.o. Add an explicit dependency to pick up __FreeBSD_version bumps. Additional changes are required to fully plumb *crt1.o dependencies through the build. Reported by: bapt Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43417 --- lib/csu/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 55aaf589f48f..1509a1ece2c3 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -55,6 +55,9 @@ Scrt1_c.o: ${CRT1SRC} Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${CRT1OBJ} ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o} +# __FreeBSD_version is recorded in crt1.o et al via crtbrand. +crtbrand.o: ${SRCTOP}/sys/sys/param.h + crtbegin.o: crtbegin.c crtbeginS.o: crtbegin.c crtbeginT.o: crtbegin.c From nobody Wed Jan 31 20:43:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDXZ5dJLz58Fx3; Wed, 31 Jan 2024 20:43:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQDXZ3PJsz4mVd; Wed, 31 Jan 2024 20:43:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTPS id VCOCrXvudxDxGVHR7rIbyg; Wed, 31 Jan 2024 20:43:57 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id VHR6rCRRV9Cr4VHR6r3GKw; Wed, 31 Jan 2024 20:43:57 +0000 X-Authority-Analysis: v=2.4 cv=etl8zZpX c=1 sm=1 tr=0 ts=65bab10d a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=dEuoMetlWLkA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=S-cxxyXkFpmfPYfbDscA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id A87913B1; Wed, 31 Jan 2024 12:43:55 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9EA2B19F; Wed, 31 Jan 2024 12:43:55 -0800 (PST) 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: Andriy Gapon cc: Cy Schubert , Jung-uk Kim , Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Dmitry Salychev Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 In-reply-to: <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org> References: <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org> Comments: In-reply-to Andriy Gapon message dated "Wed, 31 Jan 2024 22:36:28 +0200." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 31 Jan 2024 12:43:55 -0800 Message-Id: <20240131204355.9EA2B19F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfAKIu5oasPJIEYFpS2orRQl44m6PAudgRZ+789yv99kNitxFav7Qe6wAznVtsQkKJb0tQUYkfNuvsAZ9xEO7sPutMaOjPQXLOJ16nwqgo3IeEiLyQAca eWklq0nZabFIeB51OLWJLcEmiZ2j2gm5PgLMX4+92GT8IHH2iAY9tr7Aj3qX1vLq6qhMe1J/vL1Emi7MwQQsLMrg35HLMKPqANmKk89rEWwVtwGDj2xHb7SA dWgOP0sbyDcYei78eq5Fy9vGVTnX/K0C6b63Qa+4mqRCgXoSg2bW4LQjuB7M3zR60R6CjH5WDZEnUk/NJ+ZWsERHQNHfew0bGlGWQiTrSDRVqxjpoVVg33O8 kKUgxGAzbdIIMpL9xFQDFv/74CI7zvo6O2nDT8tvJ1Xs5bF8yxk= X-Rspamd-Queue-Id: 4TQDXZ3PJsz4mVd 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] In message <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org>, Andriy Gapon wri tes: > On 31/01/2024 19:40, Cy Schubert wrote: > > In message <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org>, Jung-uk Kim > > writ > > es: > >> On 24. 1. 31., Baptiste Daroussin wrote: > >>> Hello, > >>> > >>> Either this one or the previous import is breaking arm64 build > >>> > >>> --- acpi_iort.o --- > >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: fiel > d > >>> 'data' with variable sized type 'union (unnamed union at > >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 > >>> )' not at the end of a struct or class is a GNU extension > >>> [-Werror,-Wgnu-variable-sized-type-not-at-end] > >>> 103 | } data; > >>> | ^ > >> > >> Sorry for the breakage. I will fix it soon. > >> > >> BTW, this code was added by this: > >> > >> https://reviews.freebsd.org/D31267 > >> > >> It seems struct iort_named_component was a hack, which duplicated > >> ACPI_IORT_NAMED_COMPONENT but with a fixed length field DeviceName[32]. > >> Is it really necessary? > > > > Though they incorporated the WOL patch I've been using, they've broken > > poweroff. > > The poweroff issue could be because of 9cdf326b4f Thanks. I clued into that a while ago after taking a break to read the ML. This smelled of the original WOL problem I had last year that required pulling the plug to allow the NIC to see the magic packet, but worse. Hence I was barking up the wrong tree. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed Jan 31 20:47:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDcZ69v7z58G6j; Wed, 31 Jan 2024 20:47: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 4TQDcZ5gyHz4n2b; Wed, 31 Jan 2024 20:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706734046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIV7GkOXWG62/LQgttY2L6qttn+6386qqm8aPicNgzU=; b=CehI/t7ZMxkVpcjKryk0UKIrxqLfxyDMdlTExWqdO+m+6p8BlDUa+ywHR6zsmFmes0B4pE HZIpHkDFg3cFhsb21fKJdO29E2mIIuyBhgxuVm4V7RW5tpdsMD7PDWgVOurCY85at/gmLR 8eB11hK7vc2+1YZAxWjDeP4NhhcyaOVUBpLlntrY7K+xEy2voyYng9bww/eFSsJVfE/85f EnIHJrLi2Hu0Qh1Z1f+Acx6slt/irx0OJkbQN+/jVhrIRsbS60y3Uoz+rm/SuDw/14PIlC EJ+qmNdZv9fSCY9QLvxFku4oAvkUFwdJ3DGjJLVRsdbHmkZy+ha2xplYbxGZLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706734046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIV7GkOXWG62/LQgttY2L6qttn+6386qqm8aPicNgzU=; b=blHZBIH4S9E/OBhBrysoXPTG3FqKZ05PN+/kcfpiiZLr6B4QU8xcCQHAdrnhn9ATUkUBqU bk+10WzN165g3Fi4KkiSUz89JuPx4KyFyJ1kkm5GjyMexHDDgax1Nk/LQGjFjTexLNQ0a/ oI1Xr/WlKwtCcFoibS/YtyOlc2IXp7qo68xRg8WG9FstO4Eg7NobxMASWOyMKycSMdiMLr KBAyAzquluj6jg/w4Tfah5QOKV0ngQO1I4kZjxwsyNEicYlVcoigyVAFAce2Ngf2oid516 CSkrqsC2ITphs0F1XUr8BG+uxuQu8u12lWi61iqarGjIFjWrwC+wOQ0S42VgIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706734046; a=rsa-sha256; cv=none; b=bG5YUQoGaPRp85CSMdQAsw9NLE1k+pJ7ysk2lwrLoBerUu+B4/aQhtOB/c4H05zI8Umuer vFmS+SpFlIIqHjUIqVcKtc++C1JOiiaF+GYf51ujzkxUfMBn73U3qHwd0nFqTJ4FaLLY5q a1SAYc2HRpPiEKx8Adflra2lDxbSSuHyO0m7ZD/skjq9tAvU0v23EO1PxsbzoBoB+chrYx rX5Kml6B6ZQqpJn2vQR/yxvaFhfY4Ypb7jj1rNiuFeFl1FpVDnLuk41BKEc8pQElINmHox PBKrjKX4bjKqU/a8DM7IqK7SL7i7iunLpCE783VihiapIvMKD7eGLvRQPqmBHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQDcZ4dllzZP5; Wed, 31 Jan 2024 20:47: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 40VKlQPf083408; Wed, 31 Jan 2024 20:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VKlQuH083405; Wed, 31 Jan 2024 20:47:26 GMT (envelope-from git) Date: Wed, 31 Jan 2024 20:47:26 GMT Message-Id: <202401312047.40VKlQuH083405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d6251ebad5bf - main - periodic: fix a typo in a comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6251ebad5bf91cc070d52e001b570d5fc0ae1e2 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d6251ebad5bf91cc070d52e001b570d5fc0ae1e2 commit d6251ebad5bf91cc070d52e001b570d5fc0ae1e2 Author: Enji Cooper AuthorDate: 2024-01-31 20:45:32 +0000 Commit: Enji Cooper CommitDate: 2024-01-31 20:45:32 +0000 periodic: fix a typo in a comment No functional change. --- usr.sbin/periodic/periodic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index bb7ecaa01894..09727a840eff 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -50,7 +50,7 @@ export host # If we were called normally, then create a lock file for each argument # in turn and reinvoke ourselves with the LOCKED argument. This prevents # very long running jobs from being overlapped by another run as this is -# will lead the system running progressivly slower and more and more jobs +# will lead the system running progressively slower and more and more jobs # are run at once. if [ $1 != "LOCKED" ]; then ret=0 From nobody Wed Jan 31 20:57:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDrj0Rfwz58GxP for ; Wed, 31 Jan 2024 20:57:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQDrh5W3wz4p3N for ; Wed, 31 Jan 2024 20:57:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-55ef011e934so225190a12.3 for ; Wed, 31 Jan 2024 12:57:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706734673; x=1707339473; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=L1OQhj7tqr3CFxAB9Atr4++0glIc7WVkr6jaaf5uiuk=; b=PP1atdUgG3oDOKD9zwYVz1wk4tGhmrwc9vu4Wbt6Hu52R/JB60sAmZBIHhIrqg9PXG J6O9E6u35fHz83zNls4UIcRFU/Ntc+PsACyVXHPCYMfImQYR+Twaq2QDHQcvtYiswf0g M92jYS7ETqHnHDjZ4ti0c66SRY+s+cqnRO6FvJcKnD2XI2ur+4L8E/iSZ1L3tthQWVfL gk6ZSAq4I0rsBt3bq+kR3Q/2Lj1th2pI3edJvlubBb2c4UEAK3dQwP/TIavKnEVOxTHY rsnlh4b6ldtBSdph3cDdT5XSsniwEJOpA+pjYxpS24FRjBmZmAB6gbm1P69m7UtMcp6E Zgmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706734673; x=1707339473; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L1OQhj7tqr3CFxAB9Atr4++0glIc7WVkr6jaaf5uiuk=; b=Ti2h59arJCwDUbV/t330qBoHBprb6gWpOHGxTr6PdYtgMYZTarYwXH6pk7uc39dHwM 3bAW+SR17T8WbbtFoREcSfFR96nlabO0B+kYBDBradsplYc9yGN3lMysGinhnX4sxqwi TlJsEmtoCXRNV8wLNYeHjLmkOn/mFoJk+Zu4M+LM+AX7vTK9p9QC0sDBOZy1oA0gl4tF NRfuKB9glpUs8yBj1b7phN6aQxQA8kgRLn/HrkhZBS0u999M2BvQFdj7fvnnlQi2jDpy EcwneE5gzJ/5BCiAdv9kcRRwDxvcAr8op87oYigGmoNVffkLAkr1+ue87X21PrLmepH/ XMag== X-Gm-Message-State: AOJu0YyaUwVtNnB0wXyAXfMqI+soMArdn8GJl1NtUKEWKXE70hhLzPvH adFKTHVgvPta9K4ikO5elvmynJTAZF8QOnmQ9tDKi+M6BU/1/R6+8hg8cp4rXqU7sM5oKzrELax 9av+D9Pn4U33/4J3zxaBkk0nRwckPEtC8m5AOWw== X-Google-Smtp-Source: AGHT+IFY1JZIS+pYN1i7wvyY3Z27pStNN1KtkEGJ8i0xSZSMbZe7noC8Ytni2n5puul1Hj4eyumAdSvcZ7fn13OYSDM= X-Received: by 2002:aa7:ccd1:0:b0:55f:19a4:e5f with SMTP id y17-20020aa7ccd1000000b0055f19a40e5fmr1937582edt.20.1706734672469; Wed, 31 Jan 2024 12:57:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401312041.40VKfgE0080600@gitrepo.freebsd.org> In-Reply-To: <202401312041.40VKfgE0080600@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 31 Jan 2024 13:57:41 -0700 Message-ID: Subject: Re: git: ed3563b0ac31 - main - csu: add crtbrand.o dependency on sys/param.h To: Ed Maste Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000e0f95d0610442124" X-Rspamd-Queue-Id: 4TQDrh5W3wz4p3N 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:15169, ipnet:2a00:1450::/32, country:US] --000000000000e0f95d0610442124 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jan 31, 2024, 1:41=E2=80=AFPM Ed Maste wrote: > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Ded3563b0ac31d854bf907d4d847ac01= 95ec9637b > > commit ed3563b0ac31d854bf907d4d847ac0195ec9637b > Author: Ed Maste > AuthorDate: 2024-01-12 15:01:49 +0000 > Commit: Ed Maste > CommitDate: 2024-01-31 20:40:27 +0000 > > csu: add crtbrand.o dependency on sys/param.h > > __FreeBSD_version is recorded in *crt1.o and crti.o via crtbrand.o. > Add > an explicit dependency to pick up __FreeBSD_version bumps. > > Additional changes are required to fully plumb *crt1.o dependencies > through the build. > So a kernel bump now rebuilds (or at least relinks) everything? Or soon will? Reported by: bapt > Reviewed by: bapt > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D43417 > --- > lib/csu/Makefile.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc > index 55aaf589f48f..1509a1ece2c3 100644 > --- a/lib/csu/Makefile.inc > +++ b/lib/csu/Makefile.inc > @@ -55,6 +55,9 @@ Scrt1_c.o: ${CRT1SRC} > Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${CRT1OBJ} > ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o} > > +# __FreeBSD_version is recorded in crt1.o et al via crtbrand. > +crtbrand.o: ${SRCTOP}/sys/sys/param.h > + > crtbegin.o: crtbegin.c > crtbeginS.o: crtbegin.c > crtbeginT.o: crtbegin.c > --000000000000e0f95d0610442124 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Jan 31, 2024, 1:41=E2=80=AFPM Ed Maste <emaste@freebsd.org> wrote:
The branch main has been updated by emast= e:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3Ded3563b0ac31d854bf907d4d847ac0195ec= 9637b

commit ed3563b0ac31d854bf907d4d847ac0195ec9637b
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-01-12 15:01:49 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-01-31 20:40:27 +0000

=C2=A0 =C2=A0 csu: add crtbrand.o dependency on sys/param.h

=C2=A0 =C2=A0 __FreeBSD_version is recorded in *crt1.o and crti.o via crtbr= and.o.=C2=A0 Add
=C2=A0 =C2=A0 an explicit dependency to pick up __FreeBSD_version bumps.
=C2=A0 =C2=A0 Additional changes are required to fully plumb *crt1.o depend= encies
=C2=A0 =C2=A0 through the build.

So a kernel bump now rebuilds (or at least = relinks) everything? Or soon will?=C2=A0

<= div dir=3D"auto">
=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 bapt
=C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 bapt
=C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation
=C2=A0 =C2=A0 Differential Revision: https://reviews.fr= eebsd.org/D43417
---
=C2=A0lib/csu/Makefile.inc | 3 +++
=C2=A01 file changed, 3 insertions(+)

diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index 55aaf589f48f..1509a1ece2c3 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -55,6 +55,9 @@ Scrt1_c.o: ${CRT1SRC}
=C2=A0Scrt1.o: Scrt1_c.o ${CRT1OBJS} ${CRT1OBJ}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*= .o}

+# __FreeBSD_version is recorded in crt1.o et al via crtbrand.
+crtbrand.o: ${SRCTOP}/sys/sys/param.h
+
=C2=A0crtbegin.o: crtbegin.c
=C2=A0crtbeginS.o: crtbegin.c
=C2=A0crtbeginT.o: crtbegin.c
--000000000000e0f95d0610442124-- From nobody Wed Jan 31 20:59:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQDty3566z58H56 for ; Wed, 31 Jan 2024 20:59:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQDty0s2Fz4pJ9 for ; Wed, 31 Jan 2024 20:59:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40f02b8d176so2187395e9.1 for ; Wed, 31 Jan 2024 12:59:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706734792; x=1707339592; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=NrcCEmiADp66qPIs9y2DA9yR4Pa7Z8E7WZcZhOdgqzc=; b=zRnfusijo/KBzSufTofDl3InJcG4KWUQQtEk7ZjpfJYEFbHC4ukGrUXDFqYxFBLxTC 5pEibghXDj9gcSBSPbmutyqSAKr0i5mknSWrBvejqF/OVrxydNsFSFFkb/vWCXMq2ZIL HuuP2eRWe/aRlJuQeD/jPKwrF49OQhp4kqsFjl1Wn8DNle84+5MLmRE/B2B+D4FrsggP eEoM2AYgsaZDCXCN8vGTVta+Sm8Ha/RgMVMOtJo7B/rkV6hudMrBUfHTnuVgDa44sCZ+ WzGumh2GBtzFf7+Hf2Nqp24M5IK0lzym5B+RbwaXdcb4hnCyVkm/7MMZ48R83HKekP8P lb5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706734792; x=1707339592; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NrcCEmiADp66qPIs9y2DA9yR4Pa7Z8E7WZcZhOdgqzc=; b=U0NWMpJQ58xVVhkZgUzT884/BGeIm3MRXsSG0N7vkXiJIlYTK+Eg10ZigFJVV5k9po cYCfvjMbBXLAdy0h7rKAwqTzyiBsBHMM26Sdutv0yfYPAAkrmNLBAjZXHNkIGTLM1Tn/ JZTnp8IFtO3PPf6X+EJ0qSrw6xlESMBdcQUKmz2T/A3XcFI6hcVjygz3IXp4jTSSedu5 OE+3sPH/6uPdhHunp1ZqKifyV2ta77HSGOjzBAfH/YxWGs/j+ogZyrgr3kEPzJgVA0K3 ROFTnNjGCBGLQEy9JgY1jE6ZaPmLFwnE4AkVGlEdK/Pv/bFPBR8dXWTAGEnas3/buUVE bb4w== X-Gm-Message-State: AOJu0Yw4iZFlokMJml762iDOI7yA3av5Aj0qQkK5OMrAq/04SsnOYlC7 GUSunft4JqKDxnS88RIEUHrhQX2WcOc9m08AeravqJF1pq8FAbxe2Zv1cSMNPL0TESGcUOGVOAu 0k4nqbOlSwL4/GeyVSBqvzaPq45nV5ixVct0bdQ== X-Google-Smtp-Source: AGHT+IENc1u2nSpWBhQCzH6yYP7XLYVFt07DQvtw13THW+rgdyQsgk8mDdPvCrZe4wXdfJwD4KifHrFXNJubRrFMt9U= X-Received: by 2002:adf:fd82:0:b0:33b:1275:21e7 with SMTP id d2-20020adffd82000000b0033b127521e7mr209984wrr.1.1706734792296; Wed, 31 Jan 2024 12:59:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org> <20240131204355.9EA2B19F@slippy.cwsent.com> In-Reply-To: <20240131204355.9EA2B19F@slippy.cwsent.com> From: Warner Losh Date: Wed, 31 Jan 2024 13:59:41 -0700 Message-ID: Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 To: Cy Schubert Cc: Andriy Gapon , Jung-uk Kim , Baptiste Daroussin , src-committers , "" , "" , Dmitry Salychev Content-Type: multipart/alternative; boundary="0000000000000560d10610442914" X-Rspamd-Queue-Id: 4TQDty0s2Fz4pJ9 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:15169, ipnet:2a00:1450::/32, country:US] --0000000000000560d10610442914 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jan 31, 2024, 1:44=E2=80=AFPM Cy Schubert wrote: > In message <737703f2-26a6-4a84-a64b-3fa55cad721c@FreeBSD.org>, Andriy > Gapon > wri > tes: > > On 31/01/2024 19:40, Cy Schubert wrote: > > > In message <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org>, > Jung-uk Kim > > > writ > > > es: > > >> On 24. 1. 31., Baptiste Daroussin wrote: > > >>> Hello, > > >>> > > >>> Either this one or the previous import is breaking arm64 build > > >>> > > >>> --- acpi_iort.o --- > > >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error= : > fiel > > d > > >>> 'data' with variable sized type 'union (unnamed union at > > >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 > > >>> )' not at the end of a struct or class is a GNU extension > > >>> [-Werror,-Wgnu-variable-sized-type-not-at-end] > > >>> 103 | } data; > > >>> | ^ > > >> > > >> Sorry for the breakage. I will fix it soon. > > >> > > >> BTW, this code was added by this: > > >> > > >> https://reviews.freebsd.org/D31267 > > >> > > >> It seems struct iort_named_component was a hack, which duplicated > > >> ACPI_IORT_NAMED_COMPONENT but with a fixed length field > DeviceName[32]. > > >> Is it really necessary? > > > > > > Though they incorporated the WOL patch I've been using, they've broke= n > > > poweroff. > > > > The poweroff issue could be because of 9cdf326b4f > > Thanks. I clued into that a while ago after taking a break to read the ML= . > > This smelled of the original WOL problem I had last year that required > pulling the plug to allow the NIC to see the magic packet, but worse. > Hence > I was barking up the wrong tree. > On an semi-related issue... mind if I do a proper merge commit to catch up and not leave hidden landmines for the future? Warner > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=3D0 > > > --0000000000000560d10610442914 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Jan 31, 2024, 1:44=E2=80=AFPM Cy Schubert <= Cy.Schubert@cschubert.com&= gt; wrote:
In message <737703f2-= 26a6-4a84-a64b-3fa55cad721c@FreeBSD.org>, Andriy Gapon
wri
tes:
> On 31/01/2024 19:40, Cy Schubert wrote:
> > In message <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org&g= t;, Jung-uk Kim
> > writ
> > es:
> >> On 24. 1. 31., Baptiste Daroussin wrote:
> >>> Hello,
> >>>
> >>> Either this one or the previous import is breaking arm64 = build
> >>>
> >>> --- acpi_iort.o ---
> >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:10= 3:4: error: fiel
> d
> >>> 'data' with variable sized type 'union (unnam= ed union at
> >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98= :2
> >>> )' not at the end of a struct or class is a GNU exten= sion
> >>> [-Werror,-Wgnu-variable-sized-type-not-at-end]
> >>>=C2=A0 =C2=A0 =C2=A0103 |=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0} data;
> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0^
> >>
> >> Sorry for the breakage.=C2=A0 I will fix it soon.
> >>
> >> BTW, this code was added by this:
> >>
> >> https://reviews.freebsd.org/D31267 > >>
> >> It seems struct iort_named_component was a hack, which duplic= ated
> >> ACPI_IORT_NAMED_COMPONENT but with a fixed length field Devic= eName[32].
> >> Is it really necessary?
> >
> > Though they incorporated the WOL patch I've been using, they&= #39;ve broken
> > poweroff.
>
> The poweroff issue could be because of 9cdf326b4f

Thanks. I clued into that a while ago after taking a break to read the ML.<= br>
This smelled of the original WOL problem I had last year that required
pulling the plug to allow the NIC to see the magic packet, but worse. Hence=
I was barking up the wrong tree.

On an semi-related issue... mind if I do a = proper merge commit to catch up and not leave hidden landmines for the futu= re?

Warner

--
Cheers,
Cy Schubert <Cy.Schubert@cschubert.com>
FreeBSD UNIX:=C2=A0 <cy@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 ht= tps://FreeBSD.org
NTP:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0<cy@nwtime.org>=C2=A0 =C2= =A0 Web:=C2=A0 https://nwtime.org

=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 e^(i*pi)+1=3D0


--0000000000000560d10610442914-- From nobody Wed Jan 31 22:05:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQGLr1lmGz58NN0; Wed, 31 Jan 2024 22:05: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 4TQGLr1GcLz3wxD; Wed, 31 Jan 2024 22:05:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706738740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSYkjl4qHD3vJ2NPlYlemtbh7/AypxTOhODRYvtCIIs=; b=TKHHq5k/4rrn1DlfJe5uwyxQXonxHZAeZvCR0evcocO1UouPHwmjv843UoHKs6JVMMEZLl S8TD5+wCZrvrL0uzqY355MrCffoJpU3VyK1QGSRgR63Rqln3dCtibLlkCwCZzfEwgxyHk+ buIT22fA06CSfzNGfTY4knWIjxJJSZxo8Ei470NU2dqaw9LE3bTiOVrji0hKo0j/MKjORT +vIYunmp+MK09VOTRhIgNFvBuCeQMojtlsLFDXtI1+0HwnXDXBWwr/OU0dzCa3azssaHy/ 7NvuGPMPpP0J1O1vY3U0nFowTMB7futUUOpd1txGAiiK4kPnSlMUSAoD3i9/bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706738740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KSYkjl4qHD3vJ2NPlYlemtbh7/AypxTOhODRYvtCIIs=; b=cN0HYwKZTdf/6APtSmylJfhKcs0t8LljyeeYuLGQaf+Oe/e0S7qNTP0BVWPXMGdqhCF0Nu HGZYnO1Gy2VxQFt+FJERUEzwOYyp3RKt2NR9xD+vtEB5QPt/xz63rrsEBtbTKk9obxyCwG aNCV+0kp1JPmppkM06OlZM6Nr5IEBefVtxIdMbWq5RCxhHMwnao8JyiBCmrNpnH8r1xFdb FIa1AGJns9TlZ6MdYew3ngnKk6DvQQIZaUPaJ0NMtOik5cOwps5eoPJKXjKC/Acho2mygz yPSJFjSaL3iT8A73DB/1mirTi8HjhEYvsZStkyD1JSzn+GZdHTaoZ7jc0Zoy4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706738740; a=rsa-sha256; cv=none; b=sQy5BJkXOBXhuDHFjB1c1pmz0+9hhIf1SB7JyeCo2FwGK2iyxbktyAmLlBeO30Us3wipvp 3FFRxfyC/ibsiv/gU3B+JPZf8fT3pYG0lq4XuGGDTDKrM2vxCKqJ9ngoltmSNFEouduWGW 2JMPVE/HJ7RnPSuRAzu7GHCihpAVkbh/Ph9+kR3A3kfURMElYxNCLUZzE8OOgZ5YK0vfMu QvnSyNJ2PzwswfPAj4TbM5inZ22s6yLaVE896+AhJidAFpytmyAUhYhLuXS24PaJie/mXL Sq8tgy3nQAM8MjdsAsyTpdipvhTXwN94RUlG/k2B5OO2GWpQNRmaujzhNyl0NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQGLr0Hjkzc7R; Wed, 31 Jan 2024 22:05: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 40VM5dQ9018687; Wed, 31 Jan 2024 22:05:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VM5dQS018685; Wed, 31 Jan 2024 22:05:39 GMT (envelope-from git) Date: Wed, 31 Jan 2024 22:05:39 GMT Message-Id: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 009d3f66cb5f - main - bsdinstall: separate out dist selection in prep for pkgbase support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e Auto-Submitted: auto-generated The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=009d3f66cb5f0cf3f1d353f311d3a6878b2a534e commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e Author: Brad Davis AuthorDate: 2024-01-26 17:46:46 +0000 Commit: Brad Davis CommitDate: 2024-01-31 22:05:27 +0000 bsdinstall: separate out dist selection in prep for pkgbase support No functional change intended. Approved by: asiciliano Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43621 --- usr.sbin/bsdinstall/scripts/auto | 40 ++++-------------- usr.sbin/bsdinstall/scripts/selectdists | 73 +++++++++++++++++++++++++++++++++ usr.sbin/bsdinstall/startbsdinstall | 1 + 3 files changed, 82 insertions(+), 32 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 9f4b5b52fe5d..c651d654d62e 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -153,36 +153,10 @@ trap true SIGINT # This section is optional trap error SIGINT # Catch cntrl-C here if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || error "Set hostname failed"; fi -export DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` - DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" - - if [ -n "$DISTMENU" ]; then - exec 5>&1 - EXTRA_DISTS=$( eval bsddialog \ - --backtitle \"$OSNAME Installer\" \ - --title \"Distribution Select\" --nocancel --separate-output \ - --checklist \"Choose optional system components to install:\" \ - 0 0 0 $DISTMENU \ - 2>&1 1>&5 ) - for dist in $EXTRA_DISTS; do - export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" - done - fi -fi - -FETCH_DISTRIBUTIONS="" -for dist in $DISTRIBUTIONS; do - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then - FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist" - fi -done - -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then - bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 - bsdinstall netconfig || error - NETCONFIG_DONE=yes +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then + exec 5>&1 + export DISTRIBUTIONS=$( `dirname $0`/selectdists 2>&1 1>&5 ) + exec 5>&- fi rm -f $PATH_FSTAB @@ -347,8 +321,10 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" fi -bsdinstall checksum || error "Distribution checksum failed" -bsdinstall distextract || error "Distribution extract failed" +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then + bsdinstall checksum || error "Distribution checksum failed" + bsdinstall distextract || error "Distribution extract failed" +fi # Set up boot loader bsdinstall bootconfig || error "Failed to configure bootloader" diff --git a/usr.sbin/bsdinstall/scripts/selectdists b/usr.sbin/bsdinstall/scripts/selectdists new file mode 100644 index 000000000000..b548e82a95f8 --- /dev/null +++ b/usr.sbin/bsdinstall/scripts/selectdists @@ -0,0 +1,73 @@ +#!/bin/sh +#- +# Copyright (c) 2011 Nathan Whitehorn +# Copyright (c) 2013-2018 Devin Teske +# 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. +# +# +############################################################ INCLUDES + +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 + +############################################################ CONFIGURATION + +# +# Default distributions +# +DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" + +############################################################ MAIN + +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then + DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` + DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" + + if [ -n "$DISTMENU" ]; then + EXTRA_DISTS=$( eval bsddialog \ + --backtitle \"$OSNAME Installer\" \ + --title \"Distribution Select\" --nocancel --separate-output \ + --checklist \"Choose optional system components to install:\" \ + 0 0 0 $DISTMENU \ + 2>&1 >&3 ) + for dist in $EXTRA_DISTS; do + DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" + done + fi +fi + +FETCH_DISTRIBUTIONS="" +for dist in $DISTRIBUTIONS; do + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then + FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist" + fi +done + +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then + bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 + bsdinstall netconfig || error + NETCONFIG_DONE=yes +fi + +echo $DISTRIBUTIONS >&2 diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index 63239c969ac6..8d9fb981c11d 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -6,6 +6,7 @@ : ${BSDDIALOG_EXTRA=3} : ${BSDDIALOG_ESC=5} : ${BSDDIALOG_ERROR=255} +export BSDINSTALL_USE_DISTRIBUTIONS=y kbdcontrol -d >/dev/null 2>&1 if [ $? -eq 0 ]; then From nobody Wed Jan 31 22:15:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQGYx1LsSz58PVK for ; Wed, 31 Jan 2024 22:15:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQGYw6q4Cz40Dc for ; Wed, 31 Jan 2024 22:15:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-40faff092a2so2649315e9.2 for ; Wed, 31 Jan 2024 14:15:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706739315; x=1707344115; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MZP8N5HarDmUIYlGeM4HaNKMAJM6mOWaP+0Y8Lpd/P8=; b=dc9G4Zauk3K3m9yZwA3ALZ980pjRzlKEr7MWwcW1QLwtYnpo6C4F86ractZtpYkm3F YWMJLrbs9bPXWQLl7jSiLi2USPLE4nzyyPHOVcYwvDqLpaudGoCRUHp3de5qOHjctIeX 4v9qD2RCDfeMEf6vOXA7oqS64yDiZu6GxmYEtx+EZhK4dqUQzfgMd975whgs7LFBGHEl JZjGK4bYgzCT38w0sLKpqDKRe2rLKOkNybBhlkl8A58kWlOhWasr7duM49o7k1/dRJXk wnTtNcke222NOhFFqS48M4DdM8MJ+IJnMTH7e3QeZHAETAEaDYpAMtq+ZWA6QSMfrwfd 1s+w== X-Gm-Message-State: AOJu0YytkwSXl4Dd6RLkV1UhrUgCt5gsrFOw4Hq56cjUvN0URJJE87Av 9yW656dmEsto40fK1BNrBbdoJ1IsGXPSV3AQ+ef83ofHxrZeSseEf0T+u6/Iq+Y= X-Google-Smtp-Source: AGHT+IFEXs0LgPG0PMD8YYtRy1NYKfoZziVYGbcl+J3bqvfTmqhgGL93knkNTSc50bnkPD5d6QVVDQ== X-Received: by 2002:a5d:5f52:0:b0:33a:f521:7062 with SMTP id cm18-20020a5d5f52000000b0033af5217062mr2574184wrb.3.1706739314905; Wed, 31 Jan 2024 14:15:14 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id cc9-20020a5d5c09000000b0033afb963d0dsm5335066wrb.101.2024.01.31.14.15.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2024 14:15:14 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 009d3f66cb5f - main - bsdinstall: separate out dist selection in prep for pkgbase support From: Jessica Clarke In-Reply-To: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> Date: Wed, 31 Jan 2024 22:15:03 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1D1F0A7A-C735-4D6F-B333-39920E84CD5D@freebsd.org> References: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> To: Brad Davis X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TQGYw6q4Cz40Dc 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:15169, ipnet:209.85.128.0/17, country:US] On 31 Jan 2024, at 22:05, Brad Davis wrote: >=20 > The branch main has been updated by brd: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D009d3f66cb5f0cf3f1d353f311d3a687= 8b2a534e >=20 > commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e > Author: Brad Davis > AuthorDate: 2024-01-26 17:46:46 +0000 > Commit: Brad Davis > CommitDate: 2024-01-31 22:05:27 +0000 >=20 > bsdinstall: separate out dist selection in prep for pkgbase support >=20 > No functional change intended. >=20 > Approved by: asiciliano > Sponsored by: Rubicon Communications, LLC ("Netgate") > Differential Revision: https://reviews.freebsd.org/D43621 > --- > usr.sbin/bsdinstall/scripts/auto | 40 ++++-------------- > usr.sbin/bsdinstall/scripts/selectdists | 73 = +++++++++++++++++++++++++++++++++ > usr.sbin/bsdinstall/startbsdinstall | 1 + > 3 files changed, 82 insertions(+), 32 deletions(-) >=20 > diff --git a/usr.sbin/bsdinstall/scripts/auto = b/usr.sbin/bsdinstall/scripts/auto > index 9f4b5b52fe5d..c651d654d62e 100755 > --- a/usr.sbin/bsdinstall/scripts/auto > +++ b/usr.sbin/bsdinstall/scripts/auto > @@ -153,36 +153,10 @@ trap true SIGINT # This section is optional > trap error SIGINT # Catch cntrl-C here > if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || = error "Set hostname failed"; fi >=20 > -export DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" > -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then > - DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' = $BSDINSTALL_DISTDIR/MANIFEST` > - DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" > - > - if [ -n "$DISTMENU" ]; then > - exec 5>&1 > - EXTRA_DISTS=3D$( eval bsddialog \ > - --backtitle \"$OSNAME Installer\" \ > - --title \"Distribution Select\" --nocancel --separate-output \ > - --checklist \"Choose optional system components to install:\" \ > - 0 0 0 $DISTMENU \ > - 2>&1 1>&5 ) > - for dist in $EXTRA_DISTS; do > - export DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" > - done > - fi > -fi > - > -FETCH_DISTRIBUTIONS=3D"" > -for dist in $DISTRIBUTIONS; do > - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then > - FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" > - fi > -done > - > -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; = then > - bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 > - bsdinstall netconfig || error > - NETCONFIG_DONE=3Dyes > +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then > + exec 5>&1 > + export DISTRIBUTIONS=3D$( `dirname $0`/selectdists 2>&1 1>&5 ) > + exec 5>&- > fi >=20 > rm -f $PATH_FSTAB > @@ -347,8 +321,10 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then >=20 > [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote = distributions" > fi > -bsdinstall checksum || error "Distribution checksum failed" > -bsdinstall distextract || error "Distribution extract failed" > +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then > + bsdinstall checksum || error "Distribution checksum failed" > + bsdinstall distextract || error "Distribution extract failed" > +fi >=20 > # Set up boot loader > bsdinstall bootconfig || error "Failed to configure bootloader" > diff --git a/usr.sbin/bsdinstall/scripts/selectdists = b/usr.sbin/bsdinstall/scripts/selectdists > new file mode 100644 > index 000000000000..b548e82a95f8 > --- /dev/null > +++ b/usr.sbin/bsdinstall/scripts/selectdists > @@ -0,0 +1,73 @@ > +#!/bin/sh > +#- > +# Copyright (c) 2011 Nathan Whitehorn > +# Copyright (c) 2013-2018 Devin Teske > +# 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. > +# > +# > +############################################################ INCLUDES > + > +BSDCFG_SHARE=3D"/usr/share/bsdconfig" > +. $BSDCFG_SHARE/common.subr || exit 1 > + > +############################################################ = CONFIGURATION > + > +# > +# Default distributions > +# > +DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" > + > +############################################################ MAIN > + > +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then > + DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' = $BSDINSTALL_DISTDIR/MANIFEST` > + DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" > + > + if [ -n "$DISTMENU" ]; then > + EXTRA_DISTS=3D$( eval bsddialog \ > + --backtitle \"$OSNAME Installer\" \ > + --title \"Distribution Select\" --nocancel --separate-output \ > + --checklist \"Choose optional system components to install:\" \ > + 0 0 0 $DISTMENU \ > + 2>&1 >&3 ) > + for dist in $EXTRA_DISTS; do > + DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" > + done > + fi > +fi > + > +FETCH_DISTRIBUTIONS=3D"" > +for dist in $DISTRIBUTIONS; do > + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then > + FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" > + fi > +done > + > +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; = then > + bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 > + bsdinstall netconfig || error > + NETCONFIG_DONE=3Dyes > +fi > + > +echo $DISTRIBUTIONS >&2 > diff --git a/usr.sbin/bsdinstall/startbsdinstall = b/usr.sbin/bsdinstall/startbsdinstall > index 63239c969ac6..8d9fb981c11d 100644 > --- a/usr.sbin/bsdinstall/startbsdinstall > +++ b/usr.sbin/bsdinstall/startbsdinstall > @@ -6,6 +6,7 @@ > : ${BSDDIALOG_EXTRA=3D3} > : ${BSDDIALOG_ESC=3D5} > : ${BSDDIALOG_ERROR=3D255} > +export BSDINSTALL_USE_DISTRIBUTIONS=3Dy I said it in the review and I=E2=80=99ll say it again here since you = decided to just ignore me: this does not belong here. Please remove it and fix the default in selectdists. Jess From nobody Wed Jan 31 22:39:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQH5f4hw9z58Rx2; Wed, 31 Jan 2024 22:39:18 +0000 (UTC) (envelope-from glebius@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 4TQH5f45bDz42QB; Wed, 31 Jan 2024 22:39:18 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706740758; 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=N+ej5MVQWw51OL6GstZvnJ1knyLMV03SNlVSzesW3Ss=; b=XfiVYqF7j4E2B10VapkWx3UzcgE+LrCXMkCClR36Uaf4VHa7kqoA+umei2hadmEJxxpaS/ xqeaej3DNS5YOvKCxz+OT5cORF3ck98masZ+f5H8l/xGz4erJCflzEIMFVYWQK61NR+tE+ vjSPoOgltN+M8bbwzaDi3UVjbxK1Z8iJpO6N2IUDwUwEey2Q5j0G9OPeKqe0RI5g7D5Xc0 /UudOUGMqB/ollROr5D3Ss+MO2SEvI8v0S27uD1+FuOhZoc+56x9xAqNOR948sJz/3lFlC TIf5wLkrphPRHYC1Q5pnGcj+mhpj21u9aMcnKpbzobK3hQ8/08f99Bh4Y7CP2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706740758; 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=N+ej5MVQWw51OL6GstZvnJ1knyLMV03SNlVSzesW3Ss=; b=utc7GjmhwnAWnaoeauEtsJswjWYRmtl7v+GWCl6l18lunqbez2o2L9MXIsC8XwZGbGeyoe G93NRO2SC9Jnti2zYdD6w56QkdHdhgZG99uh05ze6odPieXTMe3jnwBk3h2/jL6F+Bpme9 dxmvhB/ijsd9WcmnIXkpLVIHb3boXeS4XghvKft26ywlpq3TIwiOWcV/KbStZ7E6LElREu KzlPc5OH7vJZPUkX6x1pQ0cxrs5qDRyrO+ErtcPEQbkmelBcw8oG3pqwt+GCKvA2liG5tb nfh7LaQs+1SbyqFB57ZVawg8SdJWoLr+RpNY2FcvqziKMNoqYx+SrKwfE0zeyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706740758; a=rsa-sha256; cv=none; b=QrPzTm83yw1EEDjkqOzOpcPDC88zzAaGMXm4f1n3A4QctV5cc0TDegz2UcVTb195Eymgwf eU2sVV85jBmwFn5LurJDn8OuVLRD8GhJHZdia+z3bJdXDtwHySoLmCTwCQW1LY4Q/JQSpo YbbEmw6pZr1gfzpUYuEJDL2QqOarObwugNJ6CL9vagdR4tAIt/QvUbEwCqSqpbdeDoW1Rk SNwpfTgM6/7cFkYzkfYmm3oIBA6Xd0VG4GDiP0APYtyDLUjBxxJ2F47D2wimvfZX5VsA0j n0oZSgONXj+SJeQkz7EzJIH3Ix86JUry8giTaN9Om0+ADmSNf4XvkBMei09lHg== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_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: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQH5d3xKLz15GX; Wed, 31 Jan 2024 22:39:17 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Wed, 31 Jan 2024 14:39:14 -0800 From: Gleb Smirnoff To: Cy Schubert Cc: Jessica Clarke , Jung-uk Kim , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240130205710.11cf19cf@slippy> On Tue, Jan 30, 2024 at 08:57:10PM -0800, Cy Schubert wrote: C> > > commit 722b16673c40aedf280895f2f2f676bb494518d7 C> > > Author: Jung-uk Kim C> > > AuthorDate: 2024-01-30 21:43:45 +0000 C> > > Commit: Jung-uk Kim C> > > CommitDate: 2024-01-31 03:16:36 +0000 C> > > C> > > acpica: Import ACPICA 20230331 C> > > C> > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) C> > C> > Cherry-pick not merge for a vendor merge?.. C> C> Probably not Kosher but, a general git question about cherry-picks vs C> merges. A cherry-pick, without the -x but specifying the source branch, C> results in no cherry picked merge but a merge of the last commit of the C> source branch to the current branch. C> C> Can someone explain this? And if this would be any different from a C> merge from a branch that is ahead by one commit since the last merge? The object hashes would be the same, but the second parent meta-data is basically lost, although can be recorded in the commit text message with -x. The second parent is important. When searching for regressions you may go into bisecting the acpica history instead of FreeBSD history once you figured out that this is the merge that brough the regression. With second parent this can be automated and in case of manual search still easier to do. So, please don't do cherry-picks instead of merges for vendor subprojects. -- Gleb Smirnoff From nobody Wed Jan 31 22:48:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQHJc4Pvlz58Skc; Wed, 31 Jan 2024 22:48: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 4TQHJc48gPz44b7; Wed, 31 Jan 2024 22:48:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rd7cMOm4BQ/LZE5dXiLlF6YJhhN57KHPmLzh/jgoIuE=; b=pXSmtZdBdP/9E07ZS4OGjSL/+9dnPFhCXohEaQ/FFaY7voFfJf1IsyB2iGKlDMMCVbG7hN jb1rc5lUyu2F1BxlmXlLUHnEQwg1dW8PvRTzBeAdYmIukbQMb2HDIqGWvobUvRnY/joCVZ Do4gtblXaKXPD/luu3lHqWUFj69B/mgSGvpu+5/9CiDZxF6B4wSbnUhBofL/vOqQKiWiWC DqtXucPNrFrMiiSYiJWEBn9WQO7/6VwX9aOTfLVpx3srHaAdL4Xcij9T+3/tOZeuIXhWZU jb2qxbSaYL6k5K+EDWNcxTg2RFpxuotT+5uxmS1lcBPLBcoLpltlnZ/NvH7HHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rd7cMOm4BQ/LZE5dXiLlF6YJhhN57KHPmLzh/jgoIuE=; b=PotBVHDOWl+rZW24lfH0QQDYTf5JqCKqY/dunfmCSyhh1/bpzQkHsnpcHHEOr1BgjYXHQT Wa4t31ppd1shgqmwZHL1GZrfgn5uZz6xinYk5JpJ39O77725M6BlbX9up7wz1JhfFtAiye nY9sOt9lm5VZWRdtXTgrDfmSqET0L3GcVYYT8tjH/fkc4CrBHRl34qGA3QFxb7YcB5b/YZ aKp5BvhycfUW5qrZ/vy336MegVgUASSIIzmqgBTUpzl+QeF3JbZY1uixmW1LW7Qn4VFZPi soV6QTw6ERWKRHezCec3Ihjq5OjY00oPOHMwPDvHaj2MsjSZYL9sMMbIL1R/og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706741328; a=rsa-sha256; cv=none; b=xHULshgJUxbuvqmPpQX05Xw4/ZA3EgVNp4W73+poPCAGOpi16on80Dsjj2Czz2QCM8Wlf7 UqhBvrwB8nyCTm9u9TfLXtKmR4Tci2+636Ybu9Al67rS85e38rWm6X6X7ZLAoUJ8AdJ84r DAd6WbYeBt4vO6KEh1jJxbHwajEh7WAaPXvNPKyScf6STbJu7obC4sIPhFGXLFbaXt6sOA SKhGYCMbk+H0wUjYXRbfzNVTLJBoH/Lm5n2sNrDjrZUtGOH3fI7cWMzKbv01hVh7kZYNtM a5yqooiXhMN1g6+tIcSes/QzgWUSvIFmICrtxRSPovNyVxwutShk4WnU6M1Hhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQHJc3Bztzcsb; Wed, 31 Jan 2024 22:48: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 40VMmmui085322; Wed, 31 Jan 2024 22:48:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40VMmmFS085319; Wed, 31 Jan 2024 22:48:48 GMT (envelope-from git) Date: Wed, 31 Jan 2024 22:48:48 GMT Message-Id: <202401312248.40VMmmFS085319@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: 1f1b2286fd5a - main - pmap: Convert boolean_t to bool. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f1b2286fd5ae4cd7f8e6412723201e92d28771a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1f1b2286fd5ae4cd7f8e6412723201e92d28771a commit 1f1b2286fd5ae4cd7f8e6412723201e92d28771a Author: John Baldwin AuthorDate: 2024-01-31 22:48:26 +0000 Commit: John Baldwin CommitDate: 2024-01-31 22:48:26 +0000 pmap: Convert boolean_t to bool. Reviewed by: kib (older version) Differential Revision: https://reviews.freebsd.org/D39921 --- sys/amd64/amd64/pmap.c | 207 ++++++++++++++++++------------------ sys/amd64/include/pmap.h | 6 +- sys/arm/arm/pmap-v6.c | 156 +++++++++++++-------------- sys/arm/include/pmap.h | 2 +- sys/arm/include/pmap_var.h | 20 ++-- sys/arm64/arm64/pmap.c | 71 ++++++------- sys/i386/i386/pmap.c | 153 +++++++++++++------------- sys/i386/i386/pmap_base.c | 14 +-- sys/i386/include/pmap.h | 4 +- sys/i386/include/pmap_base.h | 14 +-- sys/powerpc/aim/mmu_oea.c | 50 ++++----- sys/powerpc/aim/mmu_oea64.c | 50 ++++----- sys/powerpc/aim/mmu_radix.c | 135 ++++++++++++----------- sys/powerpc/booke/pmap.c | 44 ++++---- sys/powerpc/booke/pmap_32.c | 10 +- sys/powerpc/booke/pmap_64.c | 4 +- sys/powerpc/include/mmuvar.h | 10 +- sys/powerpc/include/pmap.h | 4 +- sys/powerpc/powerpc/pmap_dispatch.c | 22 ++-- sys/riscv/riscv/pmap.c | 63 ++++++----- sys/vm/pmap.h | 14 +-- 21 files changed, 524 insertions(+), 529 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index ebc065e0d040..d74c40915fe1 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -174,14 +174,14 @@ #define PMAP_MEMDOM 1 #endif -static __inline boolean_t +static __inline bool pmap_type_guest(pmap_t pmap) { return ((pmap->pm_type == PT_EPT) || (pmap->pm_type == PT_RVI)); } -static __inline boolean_t +static __inline bool pmap_emulate_ad_bits(pmap_t pmap) { @@ -309,12 +309,12 @@ pmap_pku_mask_bit(pmap_t pmap) return (pmap->pm_type == PT_X86 ? X86_PG_PKU_MASK : 0); } -static __inline boolean_t +static __inline bool safe_to_clear_referenced(pmap_t pmap, pt_entry_t pte) { if (!pmap_emulate_ad_bits(pmap)) - return (TRUE); + return (true); KASSERT(pmap->pm_type == PT_EPT, ("invalid pm_type %d", pmap->pm_type)); @@ -324,16 +324,16 @@ safe_to_clear_referenced(pmap_t pmap, pt_entry_t pte) * if the EPT_PG_WRITE bit is set. */ if ((pte & EPT_PG_WRITE) != 0) - return (FALSE); + return (false); /* * XWR = 100 is allowed only if the PMAP_SUPPORTS_EXEC_ONLY is set. */ if ((pte & EPT_PG_EXECUTE) == 0 || ((pmap->pm_flags & PMAP_SUPPORTS_EXEC_ONLY) != 0)) - return (TRUE); + return (true); else - return (FALSE); + return (false); } #ifdef PV_STATS @@ -1280,10 +1280,10 @@ static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap, static void pmap_abort_ptp(pmap_t pmap, vm_offset_t va, vm_page_t mpte); static int pmap_change_props_locked(vm_offset_t va, vm_size_t size, vm_prot_t prot, int mode, int flags); -static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); -static boolean_t pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, +static bool pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); +static bool pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, struct rwlock **lockp); -static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, +static bool pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va); static int pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, struct rwlock **lockp); @@ -1307,7 +1307,7 @@ static vm_paddr_t pmap_large_map_kextract(vm_offset_t va); static bool pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, struct rwlock **lockp); #endif -static boolean_t pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, +static bool pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot); static void pmap_pte_props(pt_entry_t *pte, u_long bits, u_long mask); static void pmap_pti_add_kva_locked(vm_offset_t sva, vm_offset_t eva, @@ -1322,10 +1322,10 @@ static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, static vm_page_t pmap_remove_pt_page(pmap_t pmap, vm_offset_t va); static void pmap_remove_page(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, struct spglist *free); -static bool pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, +static bool pmap_remove_ptes(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, pd_entry_t *pde, struct spglist *free, struct rwlock **lockp); -static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, +static bool pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m, struct rwlock **lockp); static void pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, pd_entry_t newpde); @@ -2482,7 +2482,7 @@ pmap_init(void) "at physical 1G\n"); for (i = 0; i < atop(0x400000); i++) { ret = vm_page_blacklist_add(0x40000000 + - ptoa(i), FALSE); + ptoa(i), false); if (!ret && bootverbose) printf("page at %#lx already used\n", 0x40000000 + ptoa(i)); @@ -2676,7 +2676,7 @@ pmap_swap_pat(pmap_t pmap, pt_entry_t entry) return (entry); } -boolean_t +bool pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) { @@ -2689,7 +2689,7 @@ pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) * caching mode. */ int -pmap_cache_bits(pmap_t pmap, int mode, boolean_t is_pde) +pmap_cache_bits(pmap_t pmap, int mode, bool is_pde) { int cache_bits, pat_flag, pat_idx; @@ -2727,7 +2727,7 @@ pmap_cache_bits(pmap_t pmap, int mode, boolean_t is_pde) } static int -pmap_cache_mask(pmap_t pmap, boolean_t is_pde) +pmap_cache_mask(pmap_t pmap, bool is_pde) { int mask; @@ -3814,7 +3814,7 @@ pmap_flush_cache_phys_range(vm_paddr_t spa, vm_paddr_t epa, vm_memattr_t mattr) spa = dmaplimit; } - pte_bits = pmap_cache_bits(kernel_pmap, mattr, 0) | X86_PG_RW | + pte_bits = pmap_cache_bits(kernel_pmap, mattr, false) | X86_PG_RW | X86_PG_V; error = vmem_alloc(kernel_arena, PAGE_SIZE, M_BESTFIT | M_WAITOK, &vaddr); @@ -3985,7 +3985,7 @@ pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) int cache_bits; pte = vtopte(va); - cache_bits = pmap_cache_bits(kernel_pmap, mode, 0); + cache_bits = pmap_cache_bits(kernel_pmap, mode, false); pte_store(pte, pa | pg_g | pg_nx | X86_PG_A | X86_PG_M | X86_PG_RW | X86_PG_V | cache_bits); } @@ -4042,7 +4042,7 @@ pmap_qenter(vm_offset_t sva, vm_page_t *ma, int count) endpte = pte + count; while (pte < endpte) { m = *ma++; - cache_bits = pmap_cache_bits(kernel_pmap, m->md.pat_mode, 0); + cache_bits = pmap_cache_bits(kernel_pmap, m->md.pat_mode, false); pa = VM_PAGE_TO_PHYS(m) | cache_bits; if ((*pte & (PG_FRAME | X86_PG_PTE_CACHE)) != pa) { oldpte |= *pte; @@ -4084,8 +4084,7 @@ pmap_qremove(vm_offset_t sva, int count) * physical memory manager after the TLB has been updated. */ static __inline void -pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, - boolean_t set_PG_ZERO) +pmap_add_delayed_free_list(vm_page_t m, struct spglist *free, bool set_PG_ZERO) { if (set_PG_ZERO) @@ -4141,19 +4140,19 @@ pmap_remove_pt_page(pmap_t pmap, vm_offset_t va) /* * Decrements a page table page's reference count, which is used to record the * number of valid page table entries within the page. If the reference count - * drops to zero, then the page table page is unmapped. Returns TRUE if the - * page table page was unmapped and FALSE otherwise. + * drops to zero, then the page table page is unmapped. Returns true if the + * page table page was unmapped and false otherwise. */ -static inline boolean_t +static inline bool pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) { --m->ref_count; if (m->ref_count == 0) { _pmap_unwire_ptp(pmap, va, m, free); - return (TRUE); + return (true); } else - return (FALSE); + return (false); } static void @@ -4217,7 +4216,7 @@ _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) * Put page on a list so that it is released after * *ALL* TLB shootdown is done */ - pmap_add_delayed_free_list(m, free, TRUE); + pmap_add_delayed_free_list(m, free, true); } /* @@ -4363,14 +4362,14 @@ pmap_pinit_pml5(vm_page_t pml5pg) */ pm_pml5[pmap_pml5e_index(UPT_MAX_ADDRESS)] = KPML4phys | X86_PG_V | X86_PG_RW | X86_PG_A | X86_PG_M | pg_g | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, false); /* * Install self-referential address mapping entry. */ pm_pml5[PML5PML5I] = VM_PAGE_TO_PHYS(pml5pg) | X86_PG_RW | X86_PG_V | X86_PG_M | X86_PG_A | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, false); } static void @@ -4400,7 +4399,7 @@ pmap_pinit_pml5_pti(vm_page_t pml5pgu) pm_pml5u[pmap_pml5e_index(UPT_MAX_ADDRESS)] = pmap_kextract((vm_offset_t)pti_pml4) | X86_PG_V | X86_PG_RW | X86_PG_A | X86_PG_M | pg_g | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, false); } /* Allocate a page table page and do related bookkeeping */ @@ -5899,7 +5898,7 @@ pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va) * Conditionally create the PV entry for a 4KB page mapping if the required * memory can be allocated without resorting to reclamation. */ -static boolean_t +static bool pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m, struct rwlock **lockp) { @@ -5912,9 +5911,9 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m, CHANGE_PV_LIST_LOCK_TO_VM_PAGE(lockp, m); TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_next); m->md.pv_gen++; - return (TRUE); + return (true); } else - return (FALSE); + return (false); } /* @@ -5962,11 +5961,11 @@ pmap_fill_ptp(pt_entry_t *firstpte, pt_entry_t newpte) * Tries to demote a 2MB page mapping. If demotion fails, the 2MB page * mapping is invalidated. */ -static boolean_t +static bool pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) { struct rwlock *lock; - boolean_t rv; + bool rv; lock = NULL; rv = pmap_demote_pde_locked(pmap, pde, va, &lock); @@ -6019,7 +6018,7 @@ pmap_demote_pde_abort(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, va, pmap); } -static boolean_t +static bool pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, struct rwlock **lockp) { @@ -6036,7 +6035,7 @@ pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, PG_M = pmap_modified_bit(pmap); PG_RW = pmap_rw_bit(pmap); PG_V = pmap_valid_bit(pmap); - PG_PTE_CACHE = pmap_cache_mask(pmap, 0); + PG_PTE_CACHE = pmap_cache_mask(pmap, false); PG_PKU_MASK = pmap_pku_mask_bit(pmap); PMAP_LOCK_ASSERT(pmap, MA_OWNED); @@ -6053,7 +6052,7 @@ pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, KASSERT((oldpde & PG_W) == 0, ("pmap_demote_pde: a wired mapping is missing PG_A")); pmap_demote_pde_abort(pmap, va, pde, oldpde, lockp); - return (FALSE); + return (false); } mpte = pmap_remove_pt_page(pmap, va); @@ -6090,7 +6089,7 @@ pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, */ if (mpte == NULL) { pmap_demote_pde_abort(pmap, va, pde, oldpde, lockp); - return (FALSE); + return (false); } if (!in_kernel) @@ -6158,7 +6157,7 @@ pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, counter_u64_add(pmap_pde_demotions, 1); CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx in pmap %p", va, pmap); - return (TRUE); + return (true); } /* @@ -6256,7 +6255,7 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, KASSERT(mpte->ref_count == NPTEPG, ("pmap_remove_pde: pte page ref count error")); mpte->ref_count = 0; - pmap_add_delayed_free_list(mpte, free, FALSE); + pmap_add_delayed_free_list(mpte, free, false); } } return (pmap_unuse_pt(pmap, sva, *pmap_pdpe(pmap, sva), free)); @@ -6642,12 +6641,12 @@ retry: /* * pmap_protect_pde: do the things to protect a 2mpage in a process */ -static boolean_t +static bool pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot) { pd_entry_t newpde, oldpde; vm_page_t m, mt; - boolean_t anychanged; + bool anychanged; pt_entry_t PG_G, PG_M, PG_RW; PG_G = pmap_global_bit(pmap); @@ -6657,7 +6656,7 @@ pmap_protect_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t sva, vm_prot_t prot) PMAP_LOCK_ASSERT(pmap, MA_OWNED); KASSERT((sva & PDRMASK) == 0, ("pmap_protect_pde: sva is not 2mpage aligned")); - anychanged = FALSE; + anychanged = false; retry: oldpde = newpde = *pde; if ((prot & VM_PROT_WRITE) == 0) { @@ -6682,7 +6681,7 @@ retry: if ((oldpde & PG_G) != 0) pmap_invalidate_pde_page(kernel_pmap, sva, oldpde); else - anychanged = TRUE; + anychanged = true; } return (anychanged); } @@ -6701,7 +6700,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) pd_entry_t ptpaddr, *pde; pt_entry_t *pte, PG_G, PG_M, PG_RW, PG_V; pt_entry_t obits, pbits; - boolean_t anychanged; + bool anychanged; KASSERT((prot & ~VM_PROT_ALL) == 0, ("invalid prot %x", prot)); if (prot == VM_PROT_NONE) { @@ -6717,7 +6716,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) PG_M = pmap_modified_bit(pmap); PG_V = pmap_valid_bit(pmap); PG_RW = pmap_rw_bit(pmap); - anychanged = FALSE; + anychanged = false; /* * Although this function delays and batches the invalidation @@ -6773,7 +6772,7 @@ retry_pdpe: if (!atomic_cmpset_long(pdpe, obits, pbits)) /* PG_PS cannot be cleared under us, */ goto retry_pdpe; - anychanged = TRUE; + anychanged = true; } continue; } @@ -6805,7 +6804,7 @@ retry_pdpe: * invalidated by pmap_protect_pde(). */ if (pmap_protect_pde(pmap, pde, sva, prot)) - anychanged = TRUE; + anychanged = true; continue; } else if (!pmap_demote_pde(pmap, pde, sva)) { /* @@ -6842,7 +6841,7 @@ retry: if (obits & PG_G) pmap_invalidate_page(pmap, sva); else - anychanged = TRUE; + anychanged = true; } } } @@ -6887,7 +6886,7 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, vm_page_t mpte, PG_V = pmap_valid_bit(pmap); PG_RW = pmap_rw_bit(pmap); PG_PKU_MASK = pmap_pku_mask_bit(pmap); - PG_PTE_CACHE = pmap_cache_mask(pmap, 0); + PG_PTE_CACHE = pmap_cache_mask(pmap, false); /* * Examine the first PTE in the specified PTP. Abort if this PTE is @@ -7158,7 +7157,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, vm_paddr_t opa, pa; vm_page_t mpte, om; int rv; - boolean_t nosleep; + bool nosleep; PG_A = pmap_accessed_bit(pmap); PG_G = pmap_global_bit(pmap); @@ -7434,8 +7433,8 @@ pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, PMAP_LOCK_ASSERT(pmap, MA_OWNED); PG_V = pmap_valid_bit(pmap); - newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(pmap, m->md.pat_mode, 1) | - PG_PS | PG_V; + newpde = VM_PAGE_TO_PHYS(m) | + pmap_cache_bits(pmap, m->md.pat_mode, true) | PG_PS | PG_V; if ((m->oflags & VPO_UNMANAGED) == 0) newpde |= PG_MANAGED; if ((prot & VM_PROT_EXECUTE) == 0) @@ -7804,7 +7803,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, pmap_resident_count_adj(pmap, 1); newpte = VM_PAGE_TO_PHYS(m) | PG_V | - pmap_cache_bits(pmap, m->md.pat_mode, 0); + pmap_cache_bits(pmap, m->md.pat_mode, false); if ((m->oflags & VPO_UNMANAGED) == 0) newpte |= PG_MANAGED; if ((prot & VM_PROT_EXECUTE) == 0) @@ -7914,7 +7913,7 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, * will not affect the termination of this loop. */ PMAP_LOCK(pmap); - for (pa = ptepa | pmap_cache_bits(pmap, pat_mode, 1); + for (pa = ptepa | pmap_cache_bits(pmap, pat_mode, true); pa < ptepa + size; pa += NBPDR) { pde = pmap_alloc_pde(pmap, addr, &pdpg, NULL); if (pde == NULL) { @@ -8322,7 +8321,7 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], vm_page_t pages[2]; vm_offset_t vaddr[2], a_pg_offset, b_pg_offset; int cnt; - boolean_t mapped; + bool mapped; while (xfersize > 0) { a_pg_offset = a_offset & PAGE_MASK; @@ -8331,12 +8330,12 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], pages[1] = mb[b_offset >> PAGE_SHIFT]; cnt = min(xfersize, PAGE_SIZE - a_pg_offset); cnt = min(cnt, PAGE_SIZE - b_pg_offset); - mapped = pmap_map_io_transient(pages, vaddr, 2, FALSE); + mapped = pmap_map_io_transient(pages, vaddr, 2, false); a_cp = (char *)vaddr[0] + a_pg_offset; b_cp = (char *)vaddr[1] + b_pg_offset; bcopy(a_cp, b_cp, cnt); if (__predict_false(mapped)) - pmap_unmap_io_transient(pages, vaddr, 2, FALSE); + pmap_unmap_io_transient(pages, vaddr, 2, false); a_offset += cnt; b_offset += cnt; xfersize -= cnt; @@ -8350,23 +8349,23 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[], * is only necessary that true be returned for a small * subset of pmaps for proper page aging. */ -boolean_t +bool pmap_page_exists_quick(pmap_t pmap, vm_page_t m) { struct md_page *pvh; struct rwlock *lock; pv_entry_t pv; int loops = 0; - boolean_t rv; + bool rv; KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_page_exists_quick: page %p is not managed", m)); - rv = FALSE; + rv = false; lock = VM_PAGE_TO_PV_LIST_LOCK(m); rw_rlock(lock); TAILQ_FOREACH(pv, &m->md.pv_list, pv_next) { if (PV_PMAP(pv) == pmap) { - rv = TRUE; + rv = true; break; } loops++; @@ -8377,7 +8376,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_page_t m) pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m)); TAILQ_FOREACH(pv, &pvh->pv_list, pv_next) { if (PV_PMAP(pv) == pmap) { - rv = TRUE; + rv = true; break; } loops++; @@ -8455,17 +8454,17 @@ restart: } /* - * Returns TRUE if the given page is mapped individually or as part of - * a 2mpage. Otherwise, returns FALSE. + * Returns true if the given page is mapped individually or as part of + * a 2mpage. Otherwise, returns false. */ -boolean_t +bool pmap_page_is_mapped(vm_page_t m) { struct rwlock *lock; - boolean_t rv; + bool rv; if ((m->oflags & VPO_UNMANAGED) != 0) - return (FALSE); + return (false); lock = VM_PAGE_TO_PV_LIST_LOCK(m); rw_rlock(lock); rv = !TAILQ_EMPTY(&m->md.pv_list) || @@ -8519,7 +8518,7 @@ pmap_remove_pages(pmap_t pmap) #ifdef PV_STATS int freed; #endif - boolean_t superpage; + bool superpage; vm_paddr_t pa; /* @@ -8569,7 +8568,7 @@ pmap_remove_pages(pmap_t pmap) pte = pmap_pdpe_to_pde(pte, pv->pv_va); tpte = *pte; if ((tpte & (PG_PS | PG_V)) == PG_V) { - superpage = FALSE; + superpage = false; ptepde = tpte; pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & PG_FRAME); @@ -8586,7 +8585,7 @@ pmap_remove_pages(pmap_t pmap) * regular page could be mistaken for * a superpage. */ - superpage = TRUE; + superpage = true; } if ((tpte & PG_V) == 0) { @@ -8660,7 +8659,7 @@ pmap_remove_pages(pmap_t pmap) KASSERT(mpte->ref_count == NPTEPG, ("pmap_remove_pages: pte page reference count error")); mpte->ref_count = 0; - pmap_add_delayed_free_list(mpte, &free, FALSE); + pmap_add_delayed_free_list(mpte, &free, false); } } else { pmap_resident_count_adj(pmap, -1); @@ -8697,8 +8696,8 @@ pmap_remove_pages(pmap_t pmap) vm_page_free_pages_toq(&free, true); } -static boolean_t -pmap_page_test_mappings(vm_page_t m, boolean_t accessed, boolean_t modified) +static bool +pmap_page_test_mappings(vm_page_t m, bool accessed, bool modified) { struct rwlock *lock; pv_entry_t pv; @@ -8707,9 +8706,9 @@ pmap_page_test_mappings(vm_page_t m, boolean_t accessed, boolean_t modified) pt_entry_t PG_A, PG_M, PG_RW, PG_V; pmap_t pmap; int md_gen, pvh_gen; - boolean_t rv; + bool rv; - rv = FALSE; + rv = false; lock = VM_PAGE_TO_PV_LIST_LOCK(m); rw_rlock(lock); restart: @@ -8787,7 +8786,7 @@ out: * Return whether or not the specified physical page was modified * in any physical maps. */ -boolean_t +bool pmap_is_modified(vm_page_t m) { @@ -8798,8 +8797,8 @@ pmap_is_modified(vm_page_t m) * If the page is not busied then this check is racy. */ if (!pmap_page_is_write_mapped(m)) - return (FALSE); - return (pmap_page_test_mappings(m, FALSE, TRUE)); + return (false); + return (pmap_page_test_mappings(m, false, true)); } /* @@ -8808,20 +8807,20 @@ pmap_is_modified(vm_page_t m) * Return whether or not the specified virtual address is eligible * for prefault. */ -boolean_t +bool pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) { pd_entry_t *pde; pt_entry_t *pte, PG_V; - boolean_t rv; + bool rv; PG_V = pmap_valid_bit(pmap); /* - * Return TRUE if and only if the PTE for the specified virtual + * Return true if and only if the PTE for the specified virtual * address is allocated but invalid. */ - rv = FALSE; + rv = false; PMAP_LOCK(pmap); pde = pmap_pde(pmap, addr); if (pde != NULL && (*pde & (PG_PS | PG_V)) == PG_V) { @@ -8838,13 +8837,13 @@ pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr) * Return whether or not the specified physical page was referenced * in any physical maps. */ -boolean_t +bool pmap_is_referenced(vm_page_t m) { KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_is_referenced: page %p is not managed", m)); - return (pmap_page_test_mappings(m, TRUE, FALSE)); + return (pmap_page_test_mappings(m, true, false)); } /* @@ -8966,7 +8965,7 @@ pmap_ts_referenced(vm_page_t m) vm_paddr_t pa; int cleared, md_gen, not_cleared, pvh_gen; struct spglist free; - boolean_t demoted; + bool demoted; KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("pmap_ts_referenced: page %p is not managed", m)); @@ -9034,7 +9033,7 @@ retry: if (safe_to_clear_referenced(pmap, oldpde)) { atomic_clear_long(pde, PG_A); pmap_invalidate_page(pmap, pv->pv_va); - demoted = FALSE; + demoted = false; } else if (pmap_demote_pde_locked(pmap, pde, pv->pv_va, &lock)) { /* @@ -9045,7 +9044,7 @@ retry: * this removal never frees a page * table page. */ - demoted = TRUE; + demoted = true; va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_PS_FRAME); pte = pmap_pde_to_pte(pde, va); @@ -9053,7 +9052,7 @@ retry: NULL, &lock); pmap_invalidate_page(pmap, va); } else - demoted = TRUE; + demoted = true; if (demoted) { /* @@ -9544,7 +9543,7 @@ pmap_unmapdev(void *p, vm_size_t size) /* * Tries to demote a 1GB page mapping. */ -static boolean_t +static bool pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) { pdp_entry_t newpdpe, oldpdpe; @@ -9567,7 +9566,7 @@ pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) if (pdpg == NULL) { CTR2(KTR_PMAP, "pmap_demote_pdpe: failure for va %#lx" " in pmap %p", va, pmap); - return (FALSE); + return (false); } pdpgpa = VM_PAGE_TO_PHYS(pdpg); firstpde = (pd_entry_t *)PHYS_TO_DMAP(pdpgpa); @@ -9599,7 +9598,7 @@ pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) counter_u64_add(pmap_pdpe_demotions, 1); CTR2(KTR_PMAP, "pmap_demote_pdpe: success for va %#lx" " in pmap %p", va, pmap); - return (TRUE); + return (true); } /* @@ -9942,12 +9941,12 @@ pmap_change_props_locked(vm_offset_t va, vm_size_t size, vm_prot_t prot, * is not mandatory. The caller may, however, request a TLB invalidation. */ void -pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) +pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, bool invalidate) { pdp_entry_t *pdpe; pd_entry_t *pde; vm_offset_t va; - boolean_t changed; + bool changed; if (len == 0) return; @@ -9956,7 +9955,7 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) ("pmap_demote_DMAP: base is not a multiple of len")); if (len < NBPDP && base < dmaplimit) { va = PHYS_TO_DMAP(base); - changed = FALSE; + changed = false; PMAP_LOCK(kernel_pmap); pdpe = pmap_pdpe(kernel_pmap, va); if ((*pdpe & X86_PG_V) == 0) @@ -9964,7 +9963,7 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) if ((*pdpe & PG_PS) != 0) { if (!pmap_demote_pdpe(kernel_pmap, pdpe, va)) panic("pmap_demote_DMAP: PDPE failed"); - changed = TRUE; + changed = true; } if (len < NBPDR) { pde = pmap_pdpe_to_pde(pdpe, va); @@ -9973,7 +9972,7 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) if ((*pde & PG_PS) != 0) { if (!pmap_demote_pde(kernel_pmap, pde, va)) panic("pmap_demote_DMAP: PDE failed"); - changed = TRUE; + changed = true; } } if (changed && invalidate) @@ -10581,7 +10580,7 @@ pmap_quick_enter_page(vm_page_t m) invlpg(qframe); pte_store(vtopte(qframe), paddr | X86_PG_RW | X86_PG_V | X86_PG_A | - X86_PG_M | pmap_cache_bits(kernel_pmap, m->md.pat_mode, 0)); + X86_PG_M | pmap_cache_bits(kernel_pmap, m->md.pat_mode, false)); return (qframe); } @@ -10794,7 +10793,7 @@ pmap_large_map(vm_paddr_t spa, vm_size_t len, void **addr, MPASS(*pdpe == 0); *pdpe = pa | pg_g | X86_PG_PS | X86_PG_RW | X86_PG_V | X86_PG_A | pg_nx | - pmap_cache_bits(kernel_pmap, mattr, TRUE); + pmap_cache_bits(kernel_pmap, mattr, true); inc = NBPDP; } else if (len >= NBPDR && (pa & PDRMASK) == 0 && (va & PDRMASK) == 0) { @@ -10802,7 +10801,7 @@ pmap_large_map(vm_paddr_t spa, vm_size_t len, void **addr, MPASS(*pde == 0); *pde = pa | pg_g | X86_PG_PS | X86_PG_RW | X86_PG_V | X86_PG_A | pg_nx | - pmap_cache_bits(kernel_pmap, mattr, TRUE); + pmap_cache_bits(kernel_pmap, mattr, true); PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pde))-> ref_count++; inc = NBPDR; @@ -10811,7 +10810,7 @@ pmap_large_map(vm_paddr_t spa, vm_size_t len, void **addr, MPASS(*pte == 0); *pte = pa | pg_g | X86_PG_RW | X86_PG_V | X86_PG_A | pg_nx | pmap_cache_bits(kernel_pmap, - mattr, FALSE); + mattr, false); PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pte))-> ref_count++; inc = PAGE_SIZE; @@ -11325,7 +11324,7 @@ pmap_pti_add_kva_locked(vm_offset_t sva, vm_offset_t eva, bool exec) pa = pmap_kextract(sva); ptev = pa | X86_PG_RW | X86_PG_V | X86_PG_A | X86_PG_G | (exec ? 0 : pg_nx) | pmap_cache_bits(kernel_pmap, - VM_MEMATTR_DEFAULT, FALSE); + VM_MEMATTR_DEFAULT, false); if (*pte == 0) { pte_store(pte, ptev); pmap_pti_wire_pte(pte); diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index cb95b311a3b9..591244e19b7c 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -443,10 +443,10 @@ void pmap_activate_boot(pmap_t pmap); void pmap_activate_sw(struct thread *); void pmap_allow_2m_x_ept_recalculate(void); void pmap_bootstrap(vm_paddr_t *); -int pmap_cache_bits(pmap_t pmap, int mode, boolean_t is_pde); +int pmap_cache_bits(pmap_t pmap, int mode, bool is_pde); int pmap_change_attr(vm_offset_t, vm_size_t, int); int pmap_change_prot(vm_offset_t, vm_size_t, vm_prot_t); -void pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate); +void pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, bool invalidate); void pmap_flush_cache_range(vm_offset_t, vm_offset_t); void pmap_flush_cache_phys_range(vm_paddr_t, vm_paddr_t, vm_memattr_t); void pmap_init_pat(void); @@ -462,7 +462,7 @@ void *pmap_mapdev(vm_paddr_t, vm_size_t); void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); void *pmap_mapdev_pciecfg(vm_paddr_t pa, vm_size_t size); bool pmap_not_in_di(void); -boolean_t pmap_page_is_mapped(vm_page_t m); +bool pmap_page_is_mapped(vm_page_t m); void pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma); void pmap_page_set_memattr_noflush(vm_page_t m, vm_memattr_t ma); void pmap_pinit_pml4(vm_page_t); diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 5d454f4e9e58..a2e1e28f53e6 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -324,7 +324,7 @@ static struct mtx PMAP2mutex; #define PMAP_ENTER_NOREPLACE 0x2000000 /* Don't replace mappings. */ static __inline void pt2_wirecount_init(vm_page_t m); -static boolean_t pmap_demote_pte1(pmap_t pmap, pt1_entry_t *pte1p, +static bool pmap_demote_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_offset_t va); static int pmap_enter_pte1(pmap_t pmap, vm_offset_t va, pt1_entry_t pte1, u_int flags, vm_page_t m); @@ -397,7 +397,7 @@ CTASSERT(VM_MEMATTR_SO == 3); CTASSERT(VM_MEMATTR_WRITE_THROUGH == 4); #define VM_MEMATTR_END (VM_MEMATTR_WRITE_THROUGH + 1) -boolean_t +bool pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) { @@ -2294,15 +2294,15 @@ pmap_pinit(pmap_t pmap) } #ifdef INVARIANTS -static boolean_t +static bool pt2tab_user_is_empty(pt2_entry_t *tab) { u_int i, end; end = pt2tab_index(VM_MAXUSER_ADDRESS); for (i = 0; i < end; i++) - if (tab[i] != 0) return (FALSE); - return (TRUE); + if (tab[i] != 0) return (false); + return (true); } #endif /* @@ -2437,14 +2437,14 @@ pt2_wirecount_get(vm_page_t m, uint32_t pte1_idx) return (m->md.pt2_wirecount[pte1_idx & PT2PG_MASK]); } -static __inline boolean_t +static __inline bool pt2_is_empty(vm_page_t m, vm_offset_t va) { return (m->md.pt2_wirecount[pte1_index(va) & PT2PG_MASK] == 0); } -static __inline boolean_t +static __inline bool pt2_is_full(vm_page_t m, vm_offset_t va) { @@ -2452,7 +2452,7 @@ pt2_is_full(vm_page_t m, vm_offset_t va) NPTE2_IN_PT2); } -static __inline boolean_t +static __inline bool pt2pg_is_empty(vm_page_t m) { @@ -2645,10 +2645,10 @@ pmap_unwire_pt2pg(pmap_t pmap, vm_offset_t va, vm_page_t m) /* * Decrements a L2 page table page's wire count, which is used to record the * number of valid page table entries within the page. If the wire count - * drops to zero, then the page table page is unmapped. Returns TRUE if the - * page table page was unmapped and FALSE otherwise. + * drops to zero, then the page table page is unmapped. Returns true if the + * page table page was unmapped and false otherwise. */ -static __inline boolean_t +static __inline bool pmap_unwire_pt2(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) { pt2_wirecount_dec(m, pte1_index(va)); @@ -2661,9 +2661,9 @@ pmap_unwire_pt2(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free) */ pmap_unwire_pt2pg(pmap, va, m); pmap_add_delayed_free_list(m, free); - return (TRUE); + return (true); } else - return (FALSE); + return (false); } /* @@ -2716,14 +2716,14 @@ pmap_unwire_pt2_all(pmap_t pmap, vm_offset_t va, vm_page_t m, * After removing a L2 page table entry, this routine is used to * conditionally free the page, and manage the hold/wire counts. */ -static boolean_t +static bool pmap_unuse_pt2(pmap_t pmap, vm_offset_t va, struct spglist *free) { pt1_entry_t pte1; vm_page_t mpte; if (va >= VM_MAXUSER_ADDRESS) - return (FALSE); + return (false); pte1 = pte1_load(pmap_pte1(pmap, va)); mpte = PHYS_TO_VM_PAGE(pte1_link_pa(pte1)); return (pmap_unwire_pt2(pmap, va, mpte, free)); @@ -2993,7 +2993,7 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv) * when needed. */ static pv_entry_t -get_pv_entry(pmap_t pmap, boolean_t try) +get_pv_entry(pmap_t pmap, bool try) { static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; @@ -3077,7 +3077,7 @@ pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m) rw_assert(&pvh_global_lock, RA_WLOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - pv = get_pv_entry(pmap, FALSE); + pv = get_pv_entry(pmap, false); pv->pv_va = va; TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_next); } @@ -3193,7 +3193,7 @@ pmap_pv_promote_pte1(pmap_t pmap, vm_offset_t va, vm_paddr_t pa) /* *** 2852 LINES SKIPPED *** From nobody Wed Jan 31 22:57:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQHV53ZWpz58TKX; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@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 4TQHV532GRz45FJ; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741821; 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=HynYAlE3BQoi73W4YWlfneYJYgds0pplIzh3/qSFT5w=; b=sdveVgd0jErJq0fy+EPp/XmbL7i0pGyjodUJMU5ID2mgDaBSX4kiWN6O6nBLLNUlmVi2nj ArXVlFYBMjtsamBb+X/n72OMtUOCsZOF7KYV650eIwPYGepq5/9DRVxrB6BB9BnnhE4UUY WfSVJUQKQv3vLYM0W4wW5NuLGB15oYqdEu2fips+ZdlMX0CNyLTeisrGzPn/3ODFE3JLVu YiIl/SJEaqNbJ8WCYRWBB4xXUpgafVzqwvnRXFbrI3Qm8M4KgjvJ9GihysWND3NndbCuAI +Ss29r7/F4hVfnMrhwR6SbgYkDl/SvXQrsvW20ef82xd/rw8jtrTOxf6MOTmUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706741821; 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=HynYAlE3BQoi73W4YWlfneYJYgds0pplIzh3/qSFT5w=; b=AvUa7ki7DeQiUkhXVNNQkhoVMdm0LhnaLj0jOZdgRwAsj676YDd37whkOKNrRC3CBInA6a QuiC7W9ABIyYHVWQA43qq8MIvjnqykrxDeVYq7Q6PDTDJZEO4WueN4mRMhp3lHzK7IIgYF 8lsSN+D1qmnOwMygY56ekDW3E2U+8g1xxl1FoGIEMTlmJIUv+X+VJI/TsO0Bwi5mOx589H bXLUlPgZBevjUgq/jpV99EdPp25D9WsQkqYe2cvBd9IN3r6AY8nqRQsIMlR/X2ohWEs/pj A3J+gg7+d89kDZt5TorKM58WrZI88PRYqRn7wPJNdk/FJ8wZh785a72hEUld+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706741821; a=rsa-sha256; cv=none; b=KCVicdDELa9lvjX7ZEaNgiWrAI1gywM2RNxIkJVARrJ2y4KozlXP/N/V6eRNCgiN+a0uoZ nUuf2OP5XiWumZLySa9WwVr7NCz8DBNYmVQq1+9593Oqg3yWXI1EL7qTBLO6wV4eI+VFAb QARdDJvJ0HAFA8e81Uj/D9p49HVOZllFUprfA0sH54i5yyhUaWzAmmCnmoxWw19l3uuTvy g/p+naQu0OzCVHNYhoAjBLmQ9i4MFQoDDnkMkKqxPL9/bhWAt/6XnQWDCefH7RawWiMsVI Y5pS2qHAShGy1x+3431ZgSWMC6JCAN10g5lzVK106MJcIp3zr5UfqPursauu7g== Received: from freefall.freebsd.org (pool-108-53-202-102.nwrknj.fios.verizon.net [108.53.202.102]) (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: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQHV51VjCz15D4; Wed, 31 Jan 2024 22:57:01 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Message-ID: Date: Wed, 31 Jan 2024 17:57:00 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Content-Language: en-US To: Gleb Smirnoff , Cy Schubert Cc: Jessica Clarke , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> From: Jung-uk Kim Organization: FreeBSD.org In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24. 1. 31., Gleb Smirnoff wrote: > On Tue, Jan 30, 2024 at 08:57:10PM -0800, Cy Schubert wrote: > C> > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > C> > > Author: Jung-uk Kim > C> > > AuthorDate: 2024-01-30 21:43:45 +0000 > C> > > Commit: Jung-uk Kim > C> > > CommitDate: 2024-01-31 03:16:36 +0000 > C> > > > C> > > acpica: Import ACPICA 20230331 > C> > > > C> > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) > C> > > C> > Cherry-pick not merge for a vendor merge?.. > C> > C> Probably not Kosher but, a general git question about cherry-picks vs > C> merges. A cherry-pick, without the -x but specifying the source branch, > C> results in no cherry picked merge but a merge of the last commit of the > C> source branch to the current branch. > C> > C> Can someone explain this? And if this would be any different from a > C> merge from a branch that is ahead by one commit since the last merge? > > The object hashes would be the same, but the second parent meta-data > is basically lost, although can be recorded in the commit text > message with -x. > > The second parent is important. When searching for regressions you may > go into bisecting the acpica history instead of FreeBSD history once > you figured out that this is the merge that brough the regression. With > second parent this can be automated and in case of manual search still > easier to do. > > So, please don't do cherry-picks instead of merges for vendor subprojects. In very early days of git adoption, I once did "git merge" from vendor branch by the git primer and it broke git repo. At the time, someone (imp?) had to manually fix it and I was told that I should never ever do "git merge". Am I confused again? :-( Jung-uk Kim From nobody Wed Jan 31 23:05:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQHhN3kmSz58V7r for ; Wed, 31 Jan 2024 23:05:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQHhN1njVz4644 for ; Wed, 31 Jan 2024 23:05:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-51124e31f72so419995e87.0 for ; Wed, 31 Jan 2024 15:05:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706742354; x=1707347154; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZgrfDfZs3V/Ai2m84sVm5pq6JfJGBwuiIJZKpzbavzw=; b=oEodzS2Lqsohy74XcLmOUibl9CwGCvccUAds7V1wlH1scNfBaygPVsN1v/tYqw4xDw eJDO34ysD+Vj+zGyfzn1nDFXGbWdFmgkdNPzBTkhjghk+368xbiWhOynYpW4FKQE8qDG o2zNzJPYQWp+mpZfB7cQKksbcuzL3fYXR7KKLiL4MVQ1M+d4uVcM/EE4sYiTyXOy/pIR oQJ1sSMbk03R53YeyJlBqrlYT6z5H0/AE5krNgMgIhm/JdVs6yPpF/JLsreJDiVe/PQg Q2nWi+OYuyJCJP8340zICUM2F0G1QrdynA3u57f5XnN54iH1B4AYGvixvvN2q3tCziN3 vJ1Q== X-Gm-Message-State: AOJu0Yy6qG1hCUCeeER6CMT8SYe3SHFCmCLL+F+hyKgs2Ap5Ac39cCTK AzJHlfQdvoAiuFeSr38s7GcvaKfCoWV8z0gGYTX3gGaPa1poWeFvRQsj+/kP2Jw= X-Google-Smtp-Source: AGHT+IG8g1OexIwBocLq7m/g7oIQ34Ym6f4lLHCfKUOYPXcxLKQbpaIcvWn5xWMX+UH8JJ18EhMx5A== X-Received: by 2002:ac2:42d1:0:b0:511:1eb5:2269 with SMTP id n17-20020ac242d1000000b005111eb52269mr536602lfl.21.1706742354020; Wed, 31 Jan 2024 15:05:54 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e17-20020a05600c4b9100b0040e3bdff98asm2678735wmp.23.2024.01.31.15.05.53 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2024 15:05:53 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 From: Jessica Clarke In-Reply-To: Date: Wed, 31 Jan 2024 23:05:45 +0000 Cc: Gleb Smirnoff , Cy Schubert , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> <20240130205710.11cf19cf@slippy> To: Jung-uk Kim X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TQHhN1njVz4644 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:15169, ipnet:209.85.128.0/17, country:US] On 31 Jan 2024, at 22:57, Jung-uk Kim wrote: >=20 > On 24. 1. 31., Gleb Smirnoff wrote: >> On Tue, Jan 30, 2024 at 08:57:10PM -0800, Cy Schubert wrote: >> C> > > commit 722b16673c40aedf280895f2f2f676bb494518d7 >> C> > > Author: Jung-uk Kim >> C> > > AuthorDate: 2024-01-30 21:43:45 +0000 >> C> > > Commit: Jung-uk Kim >> C> > > CommitDate: 2024-01-31 03:16:36 +0000 >> C> > > >> C> > > acpica: Import ACPICA 20230331 >> C> > > >> C> > > (cherry picked from commit = 8e013e1e3b81740266738226667431cf5c28b17a) >> C> > >> C> > Cherry-pick not merge for a vendor merge?.. >> C> >> C> Probably not Kosher but, a general git question about cherry-picks = vs >> C> merges. A cherry-pick, without the -x but specifying the source = branch, >> C> results in no cherry picked merge but a merge of the last commit = of the >> C> source branch to the current branch. >> C> >> C> Can someone explain this? And if this would be any different from = a >> C> merge from a branch that is ahead by one commit since the last = merge? >> The object hashes would be the same, but the second parent meta-data >> is basically lost, although can be recorded in the commit text >> message with -x. >> The second parent is important. When searching for regressions you = may >> go into bisecting the acpica history instead of FreeBSD history once >> you figured out that this is the merge that brough the regression. = With >> second parent this can be automated and in case of manual search = still >> easier to do. >> So, please don't do cherry-picks instead of merges for vendor = subprojects. >=20 > In very early days of git adoption, I once did "git merge" from vendor = branch by the git primer and it broke git repo. At the time, someone = (imp?) had to manually fix it and I was told that I should never ever do = "git merge". Am I confused again? :-( Yes, a plain git merge is wrong, what you=E2=80=99re looking for is git = subtree merge. There=E2=80=99s a section[1] in the Committer=E2=80=99s Guide = documenting the whole process. Note MFCs are different and should be cherry-picks like normal commits, albeit with slightly special options[2]. Jess [1] = https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git [2] = https://docs.freebsd.org/en/articles/committers-guide/#_mfc_a_vendor_impor= t From nobody Thu Feb 1 00:15:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKDs22wLz58bm3; Thu, 1 Feb 2024 00:15: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 4TQKDs1XsFz4Gps; Thu, 1 Feb 2024 00:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnwtRWUIY2iw9tNeMRJEvaFzeykqry4GbMw/+bEegQ0=; b=QFwSiH1wXtjjDXynZD627pI3u49kj4p8NoiApHvs4rJw48R9E1SPMe6ZhqRMhZ62v0TCeD atC/13yl2fgG2hKfQZ8YK2GfgabMf03WFEM3yjRyF/CaryeiAmh3hIQpuTi88rS2xN7S6W sBmFXzcrSWfEHyAOMutuYPtL/8KlOQdchguJ9gMEYrzuzEbaP8tJLetFOtMnmuBwn/uR8k xYV0BOGvIY5JQzBKMTAzzcHmdq5dSETeb9xOe7dQKDtJs14/MSta6dhlETK5WR66TgGs3S YOgUnfwuIUahciQA9MDEbAx/AA3tBkkRAaCYvCUy9Y08urIW+d88YSOYCmFC2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnwtRWUIY2iw9tNeMRJEvaFzeykqry4GbMw/+bEegQ0=; b=fSOhy4A9otCbWDj6Ou4tKdRt/xEXiLvwb3LPz49mfGRPNmIfT3pw2/HnbusOAF7IFWgjZt TjtlwvMQA0Lao1imFsk7JXmA0Rq/aa0N2TOcXVToBNJQ8wlOCn/wqEBFlwT0QjyiwbwSUD S38tbZ73DFZJ7s5FiH6YU+t32o67qk6bZBLoCBHfU1MM03K19x0LeSJVDM+enFJUjLJwbn 13j0lCS8UxJ6JaphGTTdZh5xkciADKRawfazWKYyNAm++wuuKdXoneNIEuSEG6kc+aU1hz svOw8Nj9YX27osBTDLXJtfKZMsiK4E16d3IQpXuQGhqKdVGtoH1gq1nJnQECaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706746541; a=rsa-sha256; cv=none; b=vPakaqkfOfk+HD4hHNYB5oK872f65VCKh5Vuamxq8X0mSE/h5zhzSZ8pN/kbzmlrgrS8AO jFPX93IfaR1PlA/RubUmMPwUMUvs7lnYLxGDnWa6aRQXjotyn42WWxiSKyzIi4uWMQtvNj 4Ckn9st3vVgbaWlmRyvCjE7f9Ro/7saWIh9ZhhqMEPTHvJxiFlCKxD0DUxjnOxmdBuwgpG BGV/1KJ9Gdy0Cm8bQuT+F53I9+s7PDNHLXVHc2Bwkn0gYvxinKp5PD+MPlRYEUoYWWfSdm m6TF/a+IOdT+ykJAN604pyHWHg+5H68r/zCHnoAxT66u4uBCbhTGgcZkRHJZog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKDs0TQwzgHH; Thu, 1 Feb 2024 00:15: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 4110Fe20036155; Thu, 1 Feb 2024 00:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110FeY5036152; Thu, 1 Feb 2024 00:15:40 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:15:40 GMT Message-Id: <202402010015.4110FeY5036152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: d39bd2c1388b - main - Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d39bd2c1388b520fcba9abed1932acacead60fba Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=d39bd2c1388b520fcba9abed1932acacead60fba commit d39bd2c1388b520fcba9abed1932acacead60fba Merge: 1f1b2286fd5a 850ef5ae11d6 Author: Gregory Neil Shapiro AuthorDate: 2024-01-31 23:53:48 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-01-31 23:53:48 +0000 Merge commit '850ef5ae11d69ea3381bd310f564f025fc8caea3' Merge vendor sendmail 8.18.1 into HEAD contrib/sendmail/KNOWNBUGS | 17 +- contrib/sendmail/PGPKEYS | 625 +++++++- contrib/sendmail/README | 26 +- contrib/sendmail/RELEASE_NOTES | 215 ++- contrib/sendmail/cf/README | 29 +- contrib/sendmail/cf/cf/submit.cf | 15 +- contrib/sendmail/cf/feature/check_cert_altnames.m4 | 2 +- contrib/sendmail/cf/feature/enhdnsbl.m4 | 14 +- contrib/sendmail/cf/feature/fips3.m4 | 16 + contrib/sendmail/cf/feature/ldap_routing.m4 | 2 +- contrib/sendmail/cf/hack/xconnect.m4 | 4 +- contrib/sendmail/cf/m4/proto.m4 | 84 +- contrib/sendmail/cf/m4/version.m4 | 2 +- contrib/sendmail/cf/sh/makeinfo.sh | 2 +- contrib/sendmail/contrib/buildvirtuser | 2 +- contrib/sendmail/doc/op/Makefile | 6 +- contrib/sendmail/doc/op/op.me | 271 ++-- contrib/sendmail/include/libsmdb/smdb.h | 2 +- contrib/sendmail/include/sendmail/sendmail.h | 1 + contrib/sendmail/include/sm/conf.h | 8 +- contrib/sendmail/include/sm/fdset.h | 1 + contrib/sendmail/include/sm/gen.h | 4 + contrib/sendmail/include/sm/ixlen.h | 1 + contrib/sendmail/include/sm/notify.h | 7 +- contrib/sendmail/include/sm/os/sm_os_openbsd.h | 14 - contrib/sendmail/include/sm/rpool.h | 2 + contrib/sendmail/libmilter/README | 3 + contrib/sendmail/libmilter/docs/overview.html | 2 +- .../sendmail/libmilter/docs/smfi_getsymval.html | 17 +- .../sendmail/libmilter/docs/smfi_replacebody.html | 2 +- contrib/sendmail/libmilter/docs/xxfi_body.html | 2 +- contrib/sendmail/libmilter/docs/xxfi_header.html | 4 +- contrib/sendmail/libmilter/engine.c | 24 +- contrib/sendmail/libsm/Makefile.m4 | 1 - contrib/sendmail/libsm/README | 4 +- contrib/sendmail/libsm/b-strl.c | 2 +- contrib/sendmail/libsm/exc.html | 2 +- contrib/sendmail/libsm/heap.c | 2 +- contrib/sendmail/libsm/io.html | 14 +- contrib/sendmail/libsm/ldap.c | 110 +- contrib/sendmail/libsm/lowercase.c | 35 +- contrib/sendmail/libsm/mpeix.c | 2 +- contrib/sendmail/libsm/notify.c | 68 +- contrib/sendmail/libsm/notify.h | 111 ++ contrib/sendmail/libsm/rewind.c | 2 +- contrib/sendmail/libsm/setvbuf.c | 3 +- contrib/sendmail/libsm/stdio.c | 2 +- contrib/sendmail/libsm/strcaseeq.c | 12 +- contrib/sendmail/libsm/t-ixlen.c | 56 +- contrib/sendmail/libsm/t-notify.c | 141 +- contrib/sendmail/libsm/t-qic.c | 16 +- contrib/sendmail/libsm/t-streq.c | 42 +- contrib/sendmail/libsm/t-streq.sh | 19 + contrib/sendmail/libsm/test.c | 2 +- contrib/sendmail/libsm/util.c | 10 +- contrib/sendmail/libsm/vfprintf.c | 16 +- contrib/sendmail/libsm/vfscanf.c | 2 +- contrib/sendmail/libsmdb/smcdb.c | 2 +- contrib/sendmail/libsmdb/smdb.c | 7 +- contrib/sendmail/libsmdb/smdb1.c | 2 +- contrib/sendmail/libsmdb/smdb2.c | 2 +- contrib/sendmail/libsmdb/smndbm.c | 4 +- contrib/sendmail/libsmutil/t-lockfile.c | 104 +- contrib/sendmail/mail.local/mail.local.c | 2 +- contrib/sendmail/makemap/makemap.8 | 8 + contrib/sendmail/makemap/makemap.c | 187 ++- contrib/sendmail/smrsh/README | 2 +- contrib/sendmail/src/Makefile.m4 | 2 +- contrib/sendmail/src/README | 25 +- contrib/sendmail/src/SECURITY | 14 +- contrib/sendmail/src/TRACEFLAGS | 16 +- contrib/sendmail/src/alias.c | 209 ++- contrib/sendmail/src/bf.c | 2 +- contrib/sendmail/src/collect.c | 258 +++- contrib/sendmail/src/conf.c | 158 +- contrib/sendmail/src/conf.h | 8 +- contrib/sendmail/src/control.c | 2 - contrib/sendmail/src/daemon.c | 137 +- contrib/sendmail/src/daemon.h | 2 +- contrib/sendmail/src/deliver.c | 1603 +++++++++++++++----- contrib/sendmail/src/domain.c | 482 +++++- contrib/sendmail/src/err.c | 4 - contrib/sendmail/src/headers.c | 32 +- contrib/sendmail/src/helpfile | 6 +- contrib/sendmail/src/macro.c | 59 +- contrib/sendmail/src/main.c | 126 +- contrib/sendmail/src/map.c | 438 ++++-- contrib/sendmail/src/map.h | 8 + contrib/sendmail/src/mci.c | 13 +- contrib/sendmail/src/milter.c | 27 +- contrib/sendmail/src/mime.c | 8 +- contrib/sendmail/src/parseaddr.c | 44 +- contrib/sendmail/src/queue.c | 214 +-- contrib/sendmail/src/ratectrl.c | 3 +- contrib/sendmail/src/readcf.c | 238 ++- contrib/sendmail/src/recipient.c | 11 +- contrib/sendmail/src/savemail.c | 4 +- contrib/sendmail/src/sched.c | 172 +++ contrib/sendmail/src/sendmail.8 | 4 +- contrib/sendmail/src/sendmail.h | 179 ++- contrib/sendmail/src/sfsasl.c | 8 +- contrib/sendmail/src/sm_resolve.c | 206 +-- contrib/sendmail/src/sm_resolve.h | 28 +- contrib/sendmail/src/srvrsmtp.c | 465 ++++-- contrib/sendmail/src/stab.c | 6 + contrib/sendmail/src/tls.c | 599 ++++++-- contrib/sendmail/src/tls.h | 91 +- contrib/sendmail/src/tlsh.c | 37 +- contrib/sendmail/src/udb.c | 16 +- contrib/sendmail/src/usersmtp.c | 75 +- contrib/sendmail/src/util.c | 142 +- contrib/sendmail/src/version.c | 2 +- contrib/sendmail/test/README | 9 +- contrib/sendmail/vacation/vacation.1 | 25 +- contrib/sendmail/vacation/vacation.c | 232 ++- 115 files changed, 6703 insertions(+), 2166 deletions(-) diff --cc contrib/sendmail/cf/feature/fips3.m4 index 000000000000,0d17642a111b..0d17642a111b mode 000000,100644..100644 --- a/contrib/sendmail/cf/feature/fips3.m4 +++ b/contrib/sendmail/cf/feature/fips3.m4 diff --cc contrib/sendmail/cf/sh/makeinfo.sh index 1c907ccd68fa,29d6ac4a8fd6..4ab306665e24 --- a/contrib/sendmail/cf/sh/makeinfo.sh +++ b/contrib/sendmail/cf/sh/makeinfo.sh @@@ -54,7 -52,7 +54,7 @@@ the else host=`uname -n` fi -echo '#####' built by $user@$host on `date` +echo '#####' built by $user@$host echo '#####' in `pwd` | sed 's/\/tmp_mnt//' echo '#####' using $1 as configuration include directory | sed 's/\/tmp_mnt//' - echo "define(\`__HOST__', $host)dnl" + echo "define(\`__HOST__', \`$host')dnl" diff --cc contrib/sendmail/libsm/notify.h index 000000000000,a314e75a4bb2..a314e75a4bb2 mode 000000,100644..100644 --- a/contrib/sendmail/libsm/notify.h +++ b/contrib/sendmail/libsm/notify.h diff --cc contrib/sendmail/src/sched.c index 000000000000,8a15bcf10f6e..8a15bcf10f6e mode 000000,100644..100644 --- a/contrib/sendmail/src/sched.c +++ b/contrib/sendmail/src/sched.c From nobody Thu Feb 1 00:15:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKDt3J1Bz58bsJ; Thu, 1 Feb 2024 00:15: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 4TQKDt28Dyz4Gs2; Thu, 1 Feb 2024 00:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2lEvaUJmF3aarvUSnTkoOlswPSUKEzh1ijCKEDFlLI=; b=sObqJceJeynLUWHz0ffSqiAaZ3vwQVHrhiz6EJWKH5W4AYFmOBsHCIo95nW1OcUQOWXIoL 4mfLh+X2ihLqKWmARDjS/tzeL8M24z16EYL6mlYJrsQFXVlQ0iEgFhW/8i+HrvUDBDNwoQ 5e1Uxizgn4PdlqBOF9Ck9F0jtAC+2Lm1WxcRwp0g6g61RmK0K6RRKXlIfuMvoCCWb3rc20 EsyiCelYypXuZbTL5b9jCDz0a1ARcAOl6tgX4qixLOALNEL2Jxa6A6AP6xfc0zmwn6yRFq 3PmRvwkOqlx3hproQB1mIMxwikY1Ft00mQYa5dJhSpHZDzdpAM4WPhA1+E6UUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w2lEvaUJmF3aarvUSnTkoOlswPSUKEzh1ijCKEDFlLI=; b=SFx3Qf/USM3pt2HQ5GrR9uYY1GWG9y8RrB6YCzddzhE/p/OJiCIQ1kNBs9DGgJvSrdZX7E /SJ6gc0nxsUQmOQ64T6+xzhO8261UdKonytzPQ6hZZcuirTAfoSCOoipwT8uHnPOD/DM1G TuuGPl+aIkMN8K+Ea3Kh1VS4imaJGGb4v6kLDIaFrDbdF+0K7VifISnYEeN6QybVwmzsWS oTQxMRe9AN8Lf42S/3oBnISGZQVUdTA3BqyohJ1z3EdlG4xZ42xxqnQ3C9oTJeXjUef8UK RQxt1c9VaIwVxUKTOJaaCF+zZLVAzS9AT/dX8341Bf+xFo5JNT+jPpJjfhTw6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706746542; a=rsa-sha256; cv=none; b=snYkFxu3n7Vk3icbrEYwRUrU8XHTINZV8W5Qc0nDNA1rLa7TE9grIcv/4ig8XUq6mNmlKb SLmY3ZuUYSJxHHaOltKQXvfxg5tyLvnGFdqdCQOjbdh4iBAQBRCFQTiLEHWRoKq/4+1P42 HK8i9ts73bXHoyVcisLqCIQVo02IrlqIXf7oRX5HVQofEZlMuVqT+0GB9xvhj+4TP5x+4y btxxRnyeJjuurvc0nRd0z3ExSrBYRtBZem2YaJnu1QBSHHu0/5BFpC8AhzZ07XC6EOQc6t OBn99hrM0HcXeb7vnBqfzB3SbYodtDCNOnf5l1Auhzobr93OsybBqu1E/qmR5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKDt1CfQzgS6; Thu, 1 Feb 2024 00:15: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 4110FgIT036212; Thu, 1 Feb 2024 00:15:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110Fg5v036209; Thu, 1 Feb 2024 00:15:42 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:15:42 GMT Message-Id: <202402010015.4110Fg5v036209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 19d4fb85bf17 - main - Add new source file for sendmail 8.18.1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19d4fb85bf17579780e8f0c3cbae8a5e92a6922e Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=19d4fb85bf17579780e8f0c3cbae8a5e92a6922e commit 19d4fb85bf17579780e8f0c3cbae8a5e92a6922e Author: Gregory Neil Shapiro AuthorDate: 2024-02-01 00:04:53 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-02-01 00:04:53 +0000 Add new source file for sendmail 8.18.1 --- usr.sbin/sendmail/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 64058543094a..b062d417a042 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -15,7 +15,7 @@ MLINKS+=sendmail.8 purgestat.8 SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \ convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \ macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \ - ratectrl.c readcf.c recipient.c savemail.c sasl.c sfsasl.c \ + ratectrl.c readcf.c recipient.c savemail.c sasl.c sched.c sfsasl.c \ shmticklib.c sm_resolve.c srvrsmtp.c stab.c stats.c sysexits.c \ timers.c tlsh.c tls.c trace.c udb.c usersmtp.c util.c version.c BINOWN= root From nobody Thu Feb 1 00:15:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKDv4wZ2z58bpt; Thu, 1 Feb 2024 00:15: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 4TQKDv3B8mz4HGj; Thu, 1 Feb 2024 00:15:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXqMx3p1J95geOxVgbakqJZk8kkLEJXKsucWHRyaZyU=; b=yBali1nR3T1ZIXQ9wy5SUILzepjT6UJQPsXZMrAmuS9cq2b29xq4CUrIcvt+466+nUBf7B hMnOf+i8jOFZ6fRvTeXuiQaTvXYm2SbM94GqWXHD1bNC0960WcKMobd9C9wvI3cO07v21Y s5wIDSt3hybLEWNNsDcBS5b+gPfgNhPxu8FRoArJwcbgYNftw6sMNRqODlZalEkQEnps6d R9Qf5bI0bQ7sqHF7V53gRjcfiFerKYRo58CGr7vdu1waPDvC3r04CCV8xZywkJ1KCMXW0i a6EN3XTHE8O2NsOKwdYBvX85WCq03Hx9ZmU7/rSTP1mGseD75UC5levkuo+j2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tXqMx3p1J95geOxVgbakqJZk8kkLEJXKsucWHRyaZyU=; b=t7jBu5jXKY3AB0v1TmYkenY05fJ6YrjLLV+RgK5mSD09ULAIU54kYb13fUcI1iF4PGyL/4 9qibXe9QHta2guMsrzECn9sZE72eDZuCrsEKibgceYGrbxGgU3/6ZMqjWLHsLDeJObAXeR 0Ukx+cJ2RlGp9BrSezm+8iAFoYqIKZtUA1SKS2jEt+0WSFDriJW1vxbmyQP1p+ZUDC9dxQ L7yylpU7zNllobpFm6jQLfDQFoWr1BQTlDSTy2nOw2zHiZ+EcIVS+T2Jhiep7RhspbsNqq ayFJluB5cMPLpoM6knB5/iOP6ZyRulxRL3F3t1/HZWqytfFe6jHoTNVamisWfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706746543; a=rsa-sha256; cv=none; b=orO1nBP7pwWWH5F+nLrBX1PaqszXAcNjMksRp4NoSp3EPIcy6+Z5kegOUaRZHRpWecBF9U oJzcT7NbMfFl/X69WFR1EN8rn0aw/Ei6cMuoWA+aaK4lbO4rY2Z7ktAFK79D9IDS5wHV2m umRtKnJ6p7CEA73rqZki0y3RilmBrpXlZQn2SuccFQg8QMVuEzIufhXw/phmZuqsl97iu9 GEt6sEewe8jzINo5F5rcwhLVIIH8LSDuep8W3s2kkt1C1QA60E35MUzxCd2ScsXVLBf7cH vHGutOHeZapG7RBfDoiM8/J0Me+djZMDOIdQ/rEMMtlts151bRdr3JxI/Yg/eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKDv2DHFzg1S; Thu, 1 Feb 2024 00:15: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 4110Fhxf036257; Thu, 1 Feb 2024 00:15:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110Fh76036254; Thu, 1 Feb 2024 00:15:43 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:15:43 GMT Message-Id: <202402010015.4110Fh76036254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 1b6a5580c1f9 - main - New sendmail 8.18.1 cf file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b6a5580c1f999fb1ba5f9860cf63a8aefc55b3c Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=1b6a5580c1f999fb1ba5f9860cf63a8aefc55b3c commit 1b6a5580c1f999fb1ba5f9860cf63a8aefc55b3c Author: Gregory Neil Shapiro AuthorDate: 2024-02-01 00:13:58 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-02-01 00:13:58 +0000 New sendmail 8.18.1 cf file --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e0f624bbad96..680bf02fa783 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7205,6 +7205,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4 OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4 OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4 OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/fips3.m4 OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4 OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4 OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4 From nobody Thu Feb 1 00:22:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKNN18D8z58c8x; Thu, 1 Feb 2024 00:22: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 4TQKNN0dr1z4JLG; Thu, 1 Feb 2024 00:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qaXePg5SG7caHdcABhwCEBcEz+24PPE2z8ngDOhji/4=; b=V7FHrD0kGHaQtUfq7T/apWahWIhsk6kdgHp74lEMivcMclz4flRJ66JWcLiaxhCm2Z+kKs 9w0YlQsR0dQP++LrCYhcSlFQtdm+GZBlz8Tml3Un4FmNQIoVb1G7NEdbf/ggzK52hDtIz9 qlY6WzKppze4Z1zMNYeWq64S5Q49SEh6vgKh0QCiiQLN69t/TgLWA/IlG/WvPupH2IaI22 DMvJzPY9ZlFa160C2JAyUnTSPTjHsSertqNxmMG4QAtJuvIrxUBJKG4FJ1D7SePWLMvVmC 55w4vmkMCXQE/p6P7lTwHx9Era5oUVcQHWuDLWQlZPaw5gDMW4fGZbm+4JqOYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706746932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qaXePg5SG7caHdcABhwCEBcEz+24PPE2z8ngDOhji/4=; b=iefWDFYLeHAORKl6A07IVFDaC7IPGyLQyNMq+yLnGBVrsoDPCcdjHd3SxvxjXrSo6G0AIY CNkGJAgQgcp+6gk9uo+hKy1GfawWaao3ttnHwIyf8b9WC4bR/VxWiW68rWWxCWER/rAUHc SsMLPUUPpm5jZ2Ix04sO40WejT8d/20Sfl2FZpqfTnDTOCgLTXL2kM4V4jiDkn/hOHLNi0 1E6ZgCfIrYXedTJUEyBzTDeG6syfA5GPSBOiaaYuUc0tuNpJlJSHJfCA5HtwZ56CZn2jAJ cAynNtf/9sWqTvXtZ87KVdEzGVw8jEiHbzyx6RmwTaTI7GmIurrcGeAk+4bs5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706746932; a=rsa-sha256; cv=none; b=IfcWFZmd26buDiLHsN1pQwfqKZhvOhddDqYq8TzkeNwsVMqYGqUjGERdfWVigTpHRATELg C/4lvunN8J9lHtIWp5ed7yAOB2mGGT4Y+NqquOm4hZjb4AIYyRIfEmk32CK+Elc70MTKlA 4aVBIfEJp1So/+l/MBTXaHZv32xSiyxn1WsN8UE8oS7K4fR17vs75PBYhtLewMVcBgiPZH kvqmIgel95vyjKHvYrQc6vr15D9ovEwIRzAjJFGL+0Zo7Gw0H1FjQ2LPu+OEZoVpazHits j2re81UMAyIzmRtEKJ1t39v6mnuR2C2Pk6rFvBurLnyfy3JdXHCiT2LoKpRvtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKNM6qDfzgYr; Thu, 1 Feb 2024 00:22: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 4110MBT2052548; Thu, 1 Feb 2024 00:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110MBWK052545; Thu, 1 Feb 2024 00:22:11 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:22:11 GMT Message-Id: <202402010022.4110MBWK052545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 21c1f1deb6a3 - main - Add a note about sendmail 8.18.1's stricter SMTP protocol enforcement List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21c1f1deb6a3ac6a60e4516261e5264a28e0b7a6 Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=21c1f1deb6a3ac6a60e4516261e5264a28e0b7a6 commit 21c1f1deb6a3ac6a60e4516261e5264a28e0b7a6 Author: Gregory Neil Shapiro AuthorDate: 2024-02-01 00:21:15 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-02-01 00:21:15 +0000 Add a note about sendmail 8.18.1's stricter SMTP protocol enforcement --- UPDATING | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/UPDATING b/UPDATING index 2ffd1baaf472..14fae1eb0656 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20240201: + sendmail 8.18.1 has been imported and merged. This version enforces + stricter RFC compliance by default, especially with respect to line + endings. This may cause issues with receiving messages from + non-compliant MTAs; please see the first 8.18.1 release note in + contrib/sendmail/RELEASE_NOTES for mitigations. + 20240111: Commit cc760de2183f changed the internal interface between the nfscommon and nfscl modules. As such, both need to be From nobody Thu Feb 1 00:28:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQKWm5jpxz58cp6; Thu, 1 Feb 2024 00:28: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 4TQKWm5BrGz4K8y; Thu, 1 Feb 2024 00:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706747316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYfnGwq74A32ZeyyAJRHJ6PWk3XQTzywtnydY7mibcs=; b=Y4Ie3/FzUkgc9amAlFoMuyKwuWLp5nUrcCt4MFDXva1hatGihQ0AlV9h+QvpKzkVWxQ9sn D2mTAROyf6a09V/HcEM53k3Yv8l6Gpw2VwRrqnX2JwPahZku80iwt1frJ5kwP0in4q0oDF giXv3XlwQPCjU8GnZSRyjwQjC20TrKEFosIuolshRMf9dgtKpk2MHs+zlPBAsA3r5wmQIq 7W14fPVK04mNth12psvvR1x1bLDc32jFbsf6hNM0jsrqJWPITRM2iC4oTzcJ/FxGAG6p1s CrIhE01DuBVTOA3k9TYQlMlvNdqO7vGV2ZNJHercQFEd22vLkaLkbKwBsbM9BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706747316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYfnGwq74A32ZeyyAJRHJ6PWk3XQTzywtnydY7mibcs=; b=RzD3bJe0NiW+4v/4WUFZ+OFvYgUQ+bzTMlJAJaDEVam10kxyPWsiqQI+JRuHgtOieO7RJW XveyWFwGqhiqj//mPf0myzoKjivxhfYq+yTYz0/U74SV6hL4XDY0ZEVBW90TWZbIiuI1Qq 2ZG7UCDPfPjU+4n2s7H0VEywo6E5lmKzFXbqzjgwwaSEYoR8tbv3U3E8f4xrPDyARij0x2 9IjmK0w+bLa7eczBg5708KDcuy8Qn+qS3MNZC63rVWKIiF8pX/D1tnTIEl0+poMAU193hl bYlMPSni1AmO+bz+16s8BhRbL//ZgyBRaPAlk6NHGhdCGjze95gBkmuEdku1gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706747316; a=rsa-sha256; cv=none; b=WTogBdqehVIbX7tQiC7JWMDoDp6bSArvY8dqFLiTdFpl1CuQPe8EsS+j49Y6oALEVV/jRi CJQQzVtLObG01/LBvDC/A5bWrmMTch+1SwM3gq1XreTpCWr/U1g4/Owq3UixcTO7n9YhPk HO+3aBfAtJBkbBSigoqjcyiMK1jA1sVho3lorZNdPaoxO43sSfaHHj4VnKO9r9U1D9uHIY ZgspJf7w0N4U/YNcJNNyjRqEE0UJxl/OmbRmwfP7H3NZqqdYLLlxgRotJxy5O8Tb9JOO9w Un9nfjtT7Zw0O066Z9UUBd4GhC0XiFcWgADJwf9y2UdjV22rVEgLl3mSRNghaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQKWm4FDPzgTK; Thu, 1 Feb 2024 00:28: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 4110Sa3H053599; Thu, 1 Feb 2024 00:28:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4110SaG3053596; Thu, 1 Feb 2024 00:28:36 GMT (envelope-from git) Date: Thu, 1 Feb 2024 00:28:36 GMT Message-Id: <202402010028.4110SaG3053596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 2c191ba6b0b5 - main - Minor change to update these files so new freebsd*.cf files are generated List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c191ba6b0b5d1b3729a5ac428d51cfc5d5f3d2e Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=2c191ba6b0b5d1b3729a5ac428d51cfc5d5f3d2e commit 2c191ba6b0b5d1b3729a5ac428d51cfc5d5f3d2e Author: Gregory Neil Shapiro AuthorDate: 2024-02-01 00:27:37 +0000 Commit: Gregory Neil Shapiro CommitDate: 2024-02-01 00:27:37 +0000 Minor change to update these files so new freebsd*.cf files are generated --- etc/sendmail/freebsd.mc | 1 + etc/sendmail/freebsd.submit.mc | 1 + 2 files changed, 2 insertions(+) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index cf80a3133c74..1d9ca3272c0b 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -46,6 +46,7 @@ divert(-1) # and owner of the SSL certificates and keys in /etc/mail/certs to be usable # by that user. # +# Last updated: 2024-02-01 divert(0) OSTYPE(freebsd6) diff --git a/etc/sendmail/freebsd.submit.mc b/etc/sendmail/freebsd.submit.mc index e14a6bc56500..0cee55610b1f 100644 --- a/etc/sendmail/freebsd.submit.mc +++ b/etc/sendmail/freebsd.submit.mc @@ -12,6 +12,7 @@ divert(-1) # This is the FreeBSD configuration for a set-group-ID sm-msp sendmail # that acts as a initial mail submission program. # +# Last updated: 2024-02-01 divert(0)dnl define(`confCF_VERSION', `Submit')dnl From nobody Thu Feb 1 01:53:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQMQM36Tgz58lcV; Thu, 1 Feb 2024 01:54:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TQMQM0mFFz4Wtr; Thu, 1 Feb 2024 01:54:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-50eabbc3dccso475614e87.2; Wed, 31 Jan 2024 17:54:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706752441; x=1707357241; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fo+UDuMTLZffJhlyJJP0V3FlWmmsm+ca213Vt7uBP6o=; b=X4BBpIbJvJEqAXo0VIr2EoM7VkJYa3LlQxRgKTicdE9GpNEFGHWprSCDIYouVjJ73U CVfCr9nKaWG8cftNJq8BLlo2xjuHF97KFNYMl3xnoZPn9Tq4hyPqE/2fnkgKNUgL8tIX ioxoZ1i1ysY5R3eqGRqwHz1r0rMipUIhNtWmw/4Zk70YFo3rJdDse3OkgSbZhVXBiPLO IIucq0JdQhTaUoH/qZTDskDV7XUPK0Q8HNvHHB3v55tOacKvIsuDIGuF6s4bA6EC57Lc zK4+/a4O9rDUXBIkUeJ5NH4O5//ZF+8KZD/+bpc4e9MURcXD0EpAUNkJhAy5AmZT/5On t6tQ== X-Gm-Message-State: AOJu0YytfpAVD5TnZu+gLxrF6pdN43wwI1jdw8IvVsY87qRzq+P7FK6t MVeHiO+0WhUk8yOZeB2piWxB6fzGAL3Sw9BJjMroxtHo4d97T2j5KTrwDK+L6vNZjM4mRLDAji0 ncRGDqy0GGwhUiau2m028Jn6icpga2n5D X-Google-Smtp-Source: AGHT+IGjJeSVRCBkAQs4lX2OGITIoLvcsH/KYRvtW7+iGrWC+DFrEu1bdzitttmOzJtUfjOlet2IZHlv1PxSK5W2+XY= X-Received: by 2002:ac2:4c06:0:b0:50e:4a61:c369 with SMTP id t6-20020ac24c06000000b0050e4a61c369mr801785lfq.46.1706752440918; Wed, 31 Jan 2024 17:54:00 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202401312041.40VKfgE0080600@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Wed, 31 Jan 2024 20:53:49 -0500 Message-ID: Subject: Re: git: ed3563b0ac31 - main - csu: add crtbrand.o dependency on sys/param.h To: Warner Losh Cc: src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4TQMQM0mFFz4Wtr 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:15169, ipnet:209.85.128.0/17, country:US] On Wed, 31 Jan 2024 at 15:57, Warner Losh wrote: > >> commit ed3563b0ac31d854bf907d4d847ac0195ec9637b >> Author: Ed Maste >> AuthorDate: 2024-01-12 15:01:49 +0000 >> Commit: Ed Maste >> CommitDate: 2024-01-31 20:40:27 +0000 >> >> csu: add crtbrand.o dependency on sys/param.h >> >> __FreeBSD_version is recorded in *crt1.o and crti.o via crtbrand.o. Add >> an explicit dependency to pick up __FreeBSD_version bumps. >> >> Additional changes are required to fully plumb *crt1.o dependencies >> through the build. > > So a kernel bump now rebuilds (or at least relinks) everything? Or soon will? Right now no, because of the second point in the commit message - we don't currently record the dependency on *crt*.o files. We should do that though; clean and NO_CLEAN builds should produce identical output. Once that dependency is added, bumping __FreeBSD_version will indeed cause everything to be rebuilt. If that's too annoying we could add a src.conf knob to skip those dependencies to provide fast but inconsistent builds as today. From nobody Thu Feb 1 02:47:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQNbg5C0Pz58r6q; Thu, 1 Feb 2024 02:47: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 4TQNbg4hmpz4c9l; Thu, 1 Feb 2024 02:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706755631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JvRRWPJTt5Z6ow4dxYe0JoheY1LRef+LuretC3/bMDQ=; b=vKW1QNO2VR6pQWwRXBu0BQCd8CXbqgNkmxREui5EMeL7lak6q42pD+NtLQMvP37JRinF5R 1CcCknSCVctmnk/QuQZxqEprX/UqJPVpHSJWXbo8RQtZhhH4exF+G+nQ6kBFJ/+BPCvH/k GM6WeK47hYbO/W3lUqp9hTHecWvRfxXXYrRKMRjt3fruwrWd1pMF+bGcdKzZDvMfOmXZdT sDIpY5ndjxy5nIgYOXp9AC5ebCSrttYZMnW0m/4ZE4LQzgwJtl4+1nXxaQLJgdpfgg0gYq BWVWrZPHYWzfH60I4Yy5+amNJpMTeMlr0XnjVL9m+1QWHDwIEIl8CpNDxXtDqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706755631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JvRRWPJTt5Z6ow4dxYe0JoheY1LRef+LuretC3/bMDQ=; b=RoiqSbeMXKZJmufVX+yQ1KOLRgFTtaD00sGcN9qgr8GosT0UKT62882zHXRSKTRSOraabk 4KZMDnvEOL9lE1hI78+xIhmt3CrVAHmqJ74AsLICTZi0+F+LZlcm5Ix/ka2OGnmjYf3cVH JuAjZo1KqIxcouwGTj1K1OsP9pdlU2WtCOJzjfHHYj5ZPxGLTF4TydiNQ3xdmoLpR/x+/n fdZV5yWAT47mVPZOkQwmrNQgMYc7/0S01jCISTRBRTwRhFoiGOR+/8I1IAlpEUE456gn8P TFwCLdGALCBaa2Li/8SOOlQ/6EK/4lDLNiu//PVVek/YgIfnur1oBUwpy4pLGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706755631; a=rsa-sha256; cv=none; b=VplS1vsDkL8mJpppxJBEg0kXXUtWZUUyO8nB6zbDA9TpvJzBpiNvwTKYL9UXq59R8E4YXD RtyrNtIVUsfKN+9H/bO5D4dWMYEgrcIsD+8bhK9j0nrEjfqCOT/3VtCDatZNQYv8Bl8G5B Ha5dloe3bJLJ+bUOwRClsOdHBsrNuDTcp7K/lRtl3NqJThc7HzF43EtBtVMxHqcI4VBTGu b1m1bfZQpH9BlFm67yZwtc0JuNrFO6JK4KcOlf7xn8eFW66jQsgEvcTup/N4B4zNCWzqDM 6nDkVVA2uK1Y9CciiYalW805FpkZxiMoW+/IXffSTbKQdKb5gssquPUrm0dJlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQNbg3lv1zkVZ; Thu, 1 Feb 2024 02:47: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 4112lB4n087901; Thu, 1 Feb 2024 02:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4112lBtS087898; Thu, 1 Feb 2024 02:47:11 GMT (envelope-from git) Date: Thu, 1 Feb 2024 02:47:11 GMT Message-Id: <202402010247.4112lBtS087898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: d9b3bba2f302 - main - mpr: endianess fix for set/get dpm page0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9b3bba2f3022f1b577fb7a18c523c92551d8257 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b3bba2f3022f1b577fb7a18c523c92551d8257 commit d9b3bba2f3022f1b577fb7a18c523c92551d8257 Author: Robert Wing AuthorDate: 2024-02-01 02:33:05 +0000 Commit: Robert Wing CommitDate: 2024-02-01 02:33:05 +0000 mpr: endianess fix for set/get dpm page0 Reviewed by: oshogbo, imp Sponsored by: Klara, Inc. Sponsored by: Datazap Differential Revision: https://reviews.freebsd.org/D43505 --- sys/dev/mpr/mpr_config.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/mpr/mpr_config.c b/sys/dev/mpr/mpr_config.c index 768f69cdc89f..b7882feed158 100644 --- a/sys/dev/mpr/mpr_config.c +++ b/sys/dev/mpr/mpr_config.c @@ -547,8 +547,8 @@ mpr_config_get_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, request->ExtPageType = MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING; request->Header.PageNumber = 0; request->ExtPageLength = request->Header.PageVersion = 0; - request->PageAddress = sc->max_dpm_entries << - MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT; + request->PageAddress = htole32(sc->max_dpm_entries << + MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT); cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL; error = mpr_wait_command(sc, &cm, 60, CAN_SLEEP); @@ -597,8 +597,8 @@ mpr_config_get_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, request->ExtPageType = MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING; request->Header.PageNumber = 0; request->Header.PageVersion = mpi_reply->Header.PageVersion; - request->PageAddress = sc->max_dpm_entries << - MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT; + request->PageAddress = htole32(sc->max_dpm_entries << + MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT); request->ExtPageLength = mpi_reply->ExtPageLength; cm->cm_length = le16toh(request->ExtPageLength) * 4; cm->cm_sge = &request->PageBufferSGE; @@ -684,9 +684,8 @@ int mpr_config_set_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, request->ExtPageType = MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING; request->Header.PageNumber = 0; request->ExtPageLength = request->Header.PageVersion = 0; - /* We can remove below two lines ????*/ - request->PageAddress = 1 << MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT; - request->PageAddress |= htole16(entry_idx); + request->PageAddress = htole32( + (1 << MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT) | entry_idx); cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL; error = mpr_wait_command(sc, &cm, 60, CAN_SLEEP); @@ -736,8 +735,8 @@ int mpr_config_set_dpm_pg0(struct mpr_softc *sc, Mpi2ConfigReply_t *mpi_reply, request->Header.PageNumber = 0; request->Header.PageVersion = mpi_reply->Header.PageVersion; request->ExtPageLength = mpi_reply->ExtPageLength; - request->PageAddress = 1 << MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT; - request->PageAddress |= htole16(entry_idx); + request->PageAddress = htole32( + (1 << MPI2_DPM_PGAD_ENTRY_COUNT_SHIFT) | entry_idx); cm->cm_length = le16toh(mpi_reply->ExtPageLength) * 4; cm->cm_sge = &request->PageBufferSGE; cm->cm_sglsize = sizeof(MPI2_SGE_IO_UNION); From nobody Thu Feb 1 07:46:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQWDg62Gdz584X1; Thu, 1 Feb 2024 07: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 4TQWDg52mnz56t3; Thu, 1 Feb 2024 07: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=1706773571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fd/afU4TbslM+mpQBKmgUCnmht+jqavYLrzjWE1P5B0=; b=nmNpDZfGM/zrgZwrQ3lfA1ZYc9n/DX7w77+/abAEMO+PoqO9icSQ3TDhKSoioZbribbu9v 9CrIEJ9Ij8teHNd7I/OXgekPboBskkGFrOH1aEfSWk5Fs8BGFuOsLjDYE1kHN4V85Kq4TQ as8UZQTaHbhJ6uOdNyt0PeNvsUmKIhqyW1LXMLkQEU3e9eCc7fN9ci1O9DSU98jVfVNQLq 3RXsv1wF+yWOoQlXrrG1AKZdrdGR9mQghkOPnNSqn+5hs/1jAX23AJrmWJ6fnbo3mnje3j CTqGmY1Lp4ryx8rIyTLkMiLR/q/hdX34x9t5MC46Gv0AmuxgWp+HbRyAOKIA+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706773571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fd/afU4TbslM+mpQBKmgUCnmht+jqavYLrzjWE1P5B0=; b=ZV39ZvzMMnNZs2Jw3QjUd1a83PzgogU8Gfc1Z8SCUT3Z6e2xh8ggEcLkjFC/3wcEerpgKY dNHIHLY2CtFw1adNf+fj07+Lf8j0/gC31zB5NCT4LOj5U5ultqMwpdGDBS4cr9d0iUqB+M TxF32JDMuOfxdbThDJPUhSFI6r4NNQ22h4BCf7T/d8xKBeMEbEW32yeX8d/YrJbvcj5ayl xKGezx2IhVa4LukjdHwhHW9VI/SZk7rbgOfTEIYgKFxWRmRq/aIrj3i/eAanSOhBsDIHH9 AMdM403hyqay5rhov0WZAbNQ49avswZo7ZR/Sar2E0ZTxD309j/woCEznZSE9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706773571; a=rsa-sha256; cv=none; b=E8LJTNWAFAeqvb/YcIOkdp/elma6c3g2ePldUPYGJrxY5TqKIRCg9wcS2P2M6MnrwRHyw0 FcbjQl6q7zT/XnyJpv/PxrRxdqFnChQxxCVSSRUIgiL4VcdoXjMXU5zwH0DwmrlRoOSq38 SzSO17bKO31jNpef/oox2TYbxZ/dhko3HgvRY9gnj+FJ1mT1UaBvwcnE/niqi3QB0Jut4M C2JE8cMEdejcLJSsV3hmCmCDIc4L1kOy45WsmyyAEic0K8hpiXH8udrv55C6P8JrA9ZOS/ v1cuYxGKodngOb9OKNgzi5J1BgBk5mNLl0U3YLnCGPckUk6wFREeeIptnzwarQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQWDg45bBztkF; Thu, 1 Feb 2024 07:46: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 4117kBEn091580; Thu, 1 Feb 2024 07:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4117kBmp091577; Thu, 1 Feb 2024 07:46:11 GMT (envelope-from git) Date: Thu, 1 Feb 2024 07:46:11 GMT Message-Id: <202402010746.4117kBmp091577@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: f14ea00c8f46 - main - kbdmap: remove debug List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f14ea00c8f4677d29ca966db6f0906e07f42fdbf Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f14ea00c8f4677d29ca966db6f0906e07f42fdbf commit f14ea00c8f4677d29ca966db6f0906e07f42fdbf Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:40:00 +0000 Commit: Baptiste Daroussin CommitDate: 2024-02-01 07:45:50 +0000 kbdmap: remove debug --- 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 d476fed87f91..71ff1a515a1c 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -398,7 +398,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 @@ -408,7 +407,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 Thu Feb 1 07:46:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQWDh6c5fz584X5; Thu, 1 Feb 2024 07:46: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 4TQWDh62sZz575m; Thu, 1 Feb 2024 07:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706773572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWaNz01EkfZGJ3ywzYfz/EtDs9drCN7VQAlEM9zHBxg=; b=anbXeSucQhfyL/K+Tceu1hFM3BG0He/qewbjzvI3QbIWsrP84d+vhPARgGhliXOsl1HbFw YqkpUg/BKnw8csueRJ+IJdsUsIYX7pM8Jokg0Ajbsyg9oQz1ajQj8tMecCauLL4MeIUbeY xnbgJ7w+j6aT2uMfwpkTkGqtBx1YqzCGpNtihDaN4A1/0BBt8cQVwjeLrNjhKeqMazEaoL 9tRW7p/COk2HP+Zhrgnt4RDTjFtPRzITN9SUO47RfaXpzSo5ZIatcmt9A3LOcShKyE3Ihq fr0PMEWsEeQ7MHaPlIjpCsrtkGC4a6Hif/8OJx75ooNamp/sVTqK/1gyxMS8Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706773572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EWaNz01EkfZGJ3ywzYfz/EtDs9drCN7VQAlEM9zHBxg=; b=msaCKa1d97mQEifKlXv85iD9+qozTdNkrWAdyqQaytR/i4rtPyWkbvmNdGMW7CQQh4TwXt Ac5mkdPIG9lcdMul/AIOANiacEq5h0SfCFoOxJlF2+BU2VTiXqxD1ZG8ah1krLu2sQKiTb 0yt3k7P2+s7rk3vAeNdsF6sA+TBI4WL/PiRAnSlFSGgN1wrwPERrulkWKDj7VhZ+PKGbW6 yBSNx+WbLIpvAJgLwupJL3/p+8MWzUXOqyc+IbVcAmD1mNULeDIB1v/2r0ZRJtvVV7n5jQ UKIRUy+gbzh3ALaxlDTIMW0RpO16TV6Ko29BPwshrTgTvM0/+WfN/VZwBh0tCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706773572; a=rsa-sha256; cv=none; b=hGEORO3FP/sZmAmmqwETb55W59vWGCqZuLwczpp2SG+AFStm6hZz9Jdm1Ec36C+Thj3fZg hSn2w5lyV91yP8PO/GM+XhOiagpASAA/BMyfp0H8yyxNHzOUmbItQ4roAGlzka39U8rktU BvpnPUtqYAX5F0H3GGg1uEElCnd5Rjf8+gGugGQCU51pUwJ3+eCyN1m6G3d8nKh5HBOqMs dOvArKZo7ey0FGsTViO1ZDmnB26mI9fQhOfoHomZzgJAKvkDHxJH/Mjl0a3ex4BbM6zwxO FK3QDnRUccEzHPWqphtlLo4MaEvsSD/0xEGeDhv7tEEA0tq1nA9PQBm7yj/POQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQWDh56Z5ztbk; Thu, 1 Feb 2024 07:46: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 4117kCXQ091638; Thu, 1 Feb 2024 07:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4117kCj2091636; Thu, 1 Feb 2024 07:46:12 GMT (envelope-from git) Date: Thu, 1 Feb 2024 07:46:12 GMT Message-Id: <202402010746.4117kCj2091636@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: 0f4e8037332f - main - kbdmap: fix typo preventing kbdmap to work under vt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f4e8037332fa5e64b3bb291c9b1ba7f8d8b4d4e Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4e8037332fa5e64b3bb291c9b1ba7f8d8b4d4e commit 0f4e8037332fa5e64b3bb291c9b1ba7f8d8b4d4e Author: Baptiste Daroussin AuthorDate: 2024-02-01 07:44:04 +0000 Commit: Baptiste Daroussin CommitDate: 2024-02-01 07:45:50 +0000 kbdmap: fix typo preventing kbdmap to work under vt --- 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 71ff1a515a1c..75663ad87ff3 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -398,7 +398,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 Thu Feb 1 13:11:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQfRd4vvDz58ccB; Thu, 1 Feb 2024 13:11: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 4TQfRd2c8Vz4WB2; Thu, 1 Feb 2024 13:11:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XzjHmnx9thCxlDcuibWDMNgbAayS5phXypDZ2FU2wuA=; b=jWYUkDkrtBogPyDQIcw080pt8bIDCNKAv8ZUSItLUvvuKh/o0/tPABIlM8kWCoZks8ExIP QfaQayPiT9bavIMmZPuf5G4wftawH2lQ+v6KzWKqKFskltzpwcCmvfEiHe1bgsfr9apBik ksMNDc8diThAd9bjF2mPrXNptCLDd55+TJSN5bpmCYHEn8zB45bHlrUSqp9e1WeGvRSTH0 O4c2XrU2+74blgTiZFfelcKqO8eKDNZWla92OJwHfL5Q3ROOzfUE/2NOJ7jneFPVqomkQu oGvSXW0l7ieRPIbzg08hotc+/4CLHAAxBtccgwd6Sla6ASsw83x95xOjJ9d5Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XzjHmnx9thCxlDcuibWDMNgbAayS5phXypDZ2FU2wuA=; b=MQf+vJjwdVIAuWFuxJRn6r3R2vsgFN9UdAywdUivvyVlTAXOfdjS/bSDXeiGZS9Y0xL5dM izYkP32RDBoASrevGe9PZsUshKFy66PQJzVqR/LU+8bDYZ3687u6vmUTc8MHmI2R/TdLFw QxmLBu196nLRt8HsStFxu0u2SWcVv1wOaPlTqxtD5er3aCToHah1xP1q2Y98fcCmMt63ub AIDTD8YoitY3gP08mhQjlxODwpKtvhl/gtydmiDtwZdHIdvaHLyCKQnWamHov9hrJS4XL2 ssMK6elYV5922xLZ2pXjGdXG5ln18NPDbQ8bq5yv2ipoJoix3ohdbiMiqS9DdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706793069; a=rsa-sha256; cv=none; b=dZEHpIqb69n3cERdRphFdpric60svvvUhjlD/PdZSOgBCGetaJsuCvQgkPyD13DSw3w0jG KpF60tgCpAlLKahbDsi3z+PAyJNYDQKVwTxKR8maEnyrADvmY0WTVu1dqBF7JPUsXlyj7y 4PVYXPiyJFxyFR/X2EqIPFoykzgDvQfpkUp8jKMNCwhA17RS7gAVjvSVXxYnrAqXYAP4MS lc7e35Rcu35SLtqg1ApFe+46uer7gXanuyDlePuGjREwYgrtS1R2+Leg6c/I4IpQCku+1o yiVyipMduXObnDq4EbrluU9up+I2r+0ptcw9AM90Ue1vNgz3SdRl+wFEPTzEwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQfRd1fpTz13lt; Thu, 1 Feb 2024 13:11: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 411DB9Bl039207; Thu, 1 Feb 2024 13:11:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411DB9Bp039204; Thu, 1 Feb 2024 13:11:09 GMT (envelope-from git) Date: Thu, 1 Feb 2024 13:11:09 GMT Message-Id: <202402011311.411DB9Bp039204@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: 5cb28f797977 - main - bintrans: Error out if writing to the output failed. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cb28f7979773715615cc2131fe40e0c5879ed1d Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5cb28f7979773715615cc2131fe40e0c5879ed1d commit 5cb28f7979773715615cc2131fe40e0c5879ed1d Author: Dag-Erling Smørgrav AuthorDate: 2024-02-01 13:10:31 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-01 13:10:31 +0000 bintrans: Error out if writing to the output failed. - Cover all code paths. - When decoding, check all output files, not just the last one. - A simple `ferror()` check is not enough as an error may later occur while flushing whatever remains in the output buffer. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43532 --- usr.bin/bintrans/uudecode.c | 33 ++++++++++++++++++++++----------- usr.bin/bintrans/uuencode.c | 4 ++-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c index 56128d230b00..5a252b71055e 100644 --- a/usr.bin/bintrans/uudecode.c +++ b/usr.bin/bintrans/uudecode.c @@ -331,11 +331,22 @@ checkend(const char *ptr, const char *end, const char *msg) warnx("%s: %s: %s", infile, outfile, msg); return (1); } - if (fclose(outfp) != 0) { + return (0); +} + +static int +checkout(int rval) +{ + if (fflush(outfp) != 0) { warn("%s: %s", infile, outfile); - return (1); + rval = 1; } - return (0); + if (outfp != stdout) { + (void)fclose(outfp); + outfp = stdout; + } + outfile = "/dev/stdout"; + return (rval); } static int @@ -349,9 +360,9 @@ uu_decode(void) for (;;) { switch (get_line(buf, sizeof(buf))) { case 0: - return (0); + return (checkout(0)); case 1: - return (1); + return (checkout(1)); } #define DEC(c) (((c) - ' ') & 077) /* single character decode */ @@ -408,11 +419,11 @@ uu_decode(void) } switch (get_line(buf, sizeof(buf))) { case 0: - return (0); + return (checkout(0)); case 1: - return (1); + return (checkout(1)); default: - return (checkend(buf, "end", "no \"end\" line")); + return (checkout(checkend(buf, "end", "no \"end\" line"))); } } @@ -430,9 +441,9 @@ base64_decode(void) switch (get_line(inbuf + strlen(inbuf), sizeof(inbuf) - strlen(inbuf))) { case 0: - return (0); + return (checkout(0)); case 1: - return (1); + return (checkout(1)); } count = 0; @@ -459,7 +470,7 @@ base64_decode(void) break; fwrite(outbuf, 1, n, outfp); } - return (checkend(inbuf, "====", "error decoding base64 input stream")); + return (checkout(checkend(inbuf, "====", "error decoding base64 input stream"))); } static void diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index 221811c56d4d..db0419ef0dac 100644 --- a/usr.bin/bintrans/uuencode.c +++ b/usr.bin/bintrans/uuencode.c @@ -74,7 +74,7 @@ main_base64_encode(const char *in, const char *w) if (w != NULL) columns = arg_to_col(w); base64_encode(); - if (ferror(output)) + if (fflush(output) != 0) errx(1, "write error"); exit(0); } @@ -144,7 +144,7 @@ main_encode(int argc, char *argv[]) base64_encode(); else encode(); - if (ferror(output)) + if (fflush(output) != 0) errx(1, "write error"); exit(0); } From nobody Thu Feb 1 13:11:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQfRf5fJcz58ccF; Thu, 1 Feb 2024 13:11: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 4TQfRf3YT8z4WZN; Thu, 1 Feb 2024 13:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KEsv+AgYsqIORBuJWEWV+ncm69XUnhpkhZHQGuhxas=; b=ICpcASGN8f3vALL8VOu3nCmEGsAbev3MdUppKn5WbriJ/FhQ+38YWIZSjo+IfJ9FtaFSI2 UhqD3rtQ/tAz8lCFlpB5jP2GIm6GQCTFNtEnxTI5yca/NlnLWMwCtr/m4Y4eBW+MFUd4qG cqjvwIkPsqQd5YyHsWLzG/XoDIZbeUt78dcJ4mLJqs1YZc7YExhBye23wByHug998Jc6If If88cQOBvGo+xSDtgUct9TihVhkLOi6iyP0F7d3Q/PjgoifhPFS0A1oDJ5mE2r3htIQ6vM ojBmIBKVzA1P//s3Ggr0sdZ2UnBJEv2TmDDjVorGulhueG7h0EcM/VTPystG2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KEsv+AgYsqIORBuJWEWV+ncm69XUnhpkhZHQGuhxas=; b=BIDAspv60S9gFhy9atyYnGC64J2zcYXjQzsJa447oxx8PIDa3j3G4tUZAY4oIGfHijauCV b4lb5xDq0nZ01yEWmd6CtRLvMUmNz00A1t/CyyOVcsf8fdMEaqfr9fccFRlUTnFuo4iy+P yGA+Era1jL0BKUnj61Uos9qSe1hLHhFYh0fq4mv+YY0+80CDO6LhNfW+zTiGHf0JFD9OM8 y4jqT7rnVSeS6618SzBvxNgCmwejdBohh97Y5vVYqEUgoeql9QBzJSsjPLvy+Dnle6OslQ aVmAV7pyE0/V89Gmu/uzyQXZyGNx5SModuqdIJVxsyQ9U/spdgga6GYP7XP5CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706793070; a=rsa-sha256; cv=none; b=ZwkoIUioz+B2NXoJmUU4QstgnCtM9beYr9Ll5KBWPUYSe2tUlpaMBrTXajjiFbVXN8U1aF BCpmOFFnG7UPcupJQvlVwEmFkn7i0JhxfNGhkyeCdH65wrDPL+MWI8lzBynlPhf+qhpR7s 4FEW6YPdII7ux/fHDpHkgx6b3D1xxB4dvlUyK/6Wkd+UJ1D3/btTgxToNki0Jt9oZnMosx YPUL/FpywBRmEVRLPtFq89qZ2vW7WVb6rVwPKClYhjETtYWChhm2DYGK/RStTLq5zrU9wi TO2hZOCt9ZPD2QHKCJ5XzqK9kyYtiJw39GbwApBESxfJZF0YSu4VV6Qvcv47jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQfRf2dSyz12xr; Thu, 1 Feb 2024 13:11: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 411DBA3l039255; Thu, 1 Feb 2024 13:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411DBAIR039252; Thu, 1 Feb 2024 13:11:10 GMT (envelope-from git) Date: Thu, 1 Feb 2024 13:11:10 GMT Message-Id: <202402011311.411DBAIR039252@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: bce34cba07bc - main - bintrans: Fix uninitialized variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce34cba07bcfed9cd519a658e594c9910c8f210 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bce34cba07bcfed9cd519a658e594c9910c8f210 commit bce34cba07bcfed9cd519a658e594c9910c8f210 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-01 13:10:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-01 13:10:37 +0000 bintrans: Fix uninitialized variable. `prev` may be used uninitialized if `body` starts with a newline. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D43534 --- usr.bin/bintrans/qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/bintrans/qp.c b/usr.bin/bintrans/qp.c index 74fa1ec3ae90..33aabb35a101 100644 --- a/usr.bin/bintrans/qp.c +++ b/usr.bin/bintrans/qp.c @@ -90,9 +90,9 @@ decode_quoted_printable(const char *body, FILE *fpo) static void encode_quoted_printable(const char *body, FILE *fpo) { - char prev; const char *end = body + strlen(body); size_t linelen = 0; + char prev = '\0'; while (*body != '\0') { if (linelen == 75) { From nobody Thu Feb 1 13:11:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQfRg6BSNz58clD; Thu, 1 Feb 2024 13:11: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 4TQfRg40Ztz4WLJ; Thu, 1 Feb 2024 13: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=1706793071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGQQYtqRoic6fu6z/U+XNj+t7F9DbkUEpEIggXvq69w=; b=gOESR1u8QGUOArCdRfyFRQBaE5PrDcaE7mebUTKF3NlXUxEzi4ee/q8H524Q/kfOWxzvKk i9oYWyHI2bZFVFxbAqbF4KPtWEmCEEDfogMCa4ajv0fTrVy9SISP4eGfDJLpZdRweFwdNq QLz9af1BI5x94IRMy4rGzWEc8JnQwUbOLPmy8IApWtPmhVfIsSTU7SqAkh3TyHtzLz1pMM ooY36+wfbWoB5wesPG9hJdp8WUKZ8OrStcfrdCz8S3NAfEbJuBa6mb21SuUHv/1hv9Cyto MTgHQGWMe8H/RFQXsh8cpT0PT48LlDrSxLE0tUAakR6Kyznxx4sIZLifHrXzLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xGQQYtqRoic6fu6z/U+XNj+t7F9DbkUEpEIggXvq69w=; b=uRD6qO9Sm0na8zAeMEsOSZAvF9NPzl0ziLCGKZizXvmwWVvPkpfWl88LBZV763mxCQN75J MlpdWzwbO6hTnE7mrDFGoiwp+kMGj/Hnf4P2XGJ06wq05x2i6hYtQSQuqoRzG0hzYxS918 8FyqkMdlp28jhHUX1p3AhP3tBe36XDW245W0fNGO9kiL/A3vD28FKAQaFyOkZtF0bUdMNB 1/4/lH8meaYRQnAd1kpHVA+Lx6h9S+lpVgiVH+2BK6UGBDBkHsJ0l6EOh8YfMkJvUKESpj eicpSgooiL+h9DM+pc2CR7+uQMmlJ7u8aRmkBneQ0iSzTPNbXFqtGNdoV0vivg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706793071; a=rsa-sha256; cv=none; b=jxoFgWw709giikDMxFKB1idPLnP/QKjaWfFXf+avRp0QduYKDfqtbZqbbDqtPTzZKlC+26 T/pLxCJL1tFZm0zZFP/kIa5Br4BnuYs/9WYGRxxacw81BD8aPbn+xuHbXxaclff8nYsqih usGgW3E4cBzlJtKfCnCw/c5zqhyMFaFSmuHIu6EZATaDnBhYb8cmYY0XuZ3zNcADUL0Y6i QNj5WgJMhz7zDHHvqYm2Bcw/SIS5TwGLbJxL3BIYxUM4+tuC1FSuKR4KN7JeCfE7zHI92y KR9bnFC2+yd8Tftf2OHgJM0139bjbpDVWxKHEvfb72KklYaa+FrxqIiv3ucvzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQfRg35rdz13lw; Thu, 1 Feb 2024 13: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 411DBBBu039606; Thu, 1 Feb 2024 13: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 411DBBrG039591; Thu, 1 Feb 2024 13:11:11 GMT (envelope-from git) Date: Thu, 1 Feb 2024 13:11:11 GMT Message-Id: <202402011311.411DBBrG039591@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: 64028ac3ba96 - main - bintrans: Add base64 to name list in manual page. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64028ac3ba9668cff31bfe2c79d85a3b89e10953 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64028ac3ba9668cff31bfe2c79d85a3b89e10953 commit 64028ac3ba9668cff31bfe2c79d85a3b89e10953 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-01 13:10:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-01 13:10:41 +0000 bintrans: Add base64 to name list in manual page. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: 0mp, pstef Differential Revision: https://reviews.freebsd.org/D43558 --- usr.bin/bintrans/bintrans.1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index b2b4d039a407..16ae66aa21d1 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2022 +.Dd January 23, 2024 .Dt BINTRANS 1 .Os .Sh NAME @@ -33,8 +33,9 @@ .Nm uuencode , .Nm uudecode , .Nm b64encode , -.Nm b64decode -.Nd encode/decode a binary file +.Nm b64decode , +.Nm base64 +.Nd encode / decode a binary file .Sh SYNOPSIS .Nm .Op algorithm From nobody Thu Feb 1 13:11:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQfRj07XXz58ccP; Thu, 1 Feb 2024 13:11: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 4TQfRh5JfVz4Wd0; Thu, 1 Feb 2024 13:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJkao6JE9y4IAJ6yUWRlkSylXGK29y9E+W9pffxT4EQ=; b=Kx7/Ncm1JTdD17LFxtbjEwMFSv8bB1hd+UdGz1IOsF4drRw9QN6RMl1C6mHCpY+BLpgBZo w0iMCooQrIqZsuS16O5GvainZNyIajLr5tmF5yfl4pKYW92VahoAKiNb/8SU8AFIJqAINe P0Nz8oJ6UlFqYc4Ymq13sOftsINKa0r1VVoOa6hKQVtGI3JGU128WwMeOZ2ywrA6DBPasj hOr/7xPmFerK2ohidn5C6otRdeVMqWYcoaKF6/K83VP8Jhnh6PDqCZZZ9mEbHyH/qoHinP gpsFVdAPj/7DkXBK8M5Zn/1V8+gqWhxq0Zb6xzXqWWl8atPydBrCxGP+RiBnjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706793072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJkao6JE9y4IAJ6yUWRlkSylXGK29y9E+W9pffxT4EQ=; b=mHveYT+Cu7cy+CqA77OpNvHumHY309RBpRH5YQgYIOeItsox+ki4GcYP14Moq5uIML/q1P VD/Ff26wImZLAMIlqBIig8y8PkhYWdh4CbVDMzcx6DoCj6bv4ioJmuCheWpNFccMM4iPgh B7ZF3vOd66++wHn4P/GijkbwlVsN/qoz6jVIHyU9lKn5PO4lwpX9krFiNUPxpxCmPg+kb0 f/OCrH0I9rMUOuW3kKg+m3EO5EBrWEqRYK9S1MaUpnNN8SnLxXgJ8CmjOHw992+nYQFlYe U6FYisEf3QeczOXzvDHha6msyvAyo16dKRQme1hVhOlqzQZYYH6J8s0eY6zICw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706793072; a=rsa-sha256; cv=none; b=Vj27OmBeFcEJwI8aCge/AMaoe9oSWoLEJLin51vABwIR2r4kieda6udScGqa/R5/+XQb+x EMmN/2cYgoTz5vRNXwEOuivRUFmddud+Wpp21cm4P3Bi15oJhBSzGm6nAqgDZNRQW9dIcK c+UQuIwMCnJVSGQCWHJlvcw3MxhG6+RgEOtXoV5DdMFgrRtmgGA3TcMGhvzsMIM8zoi2qS chvH1r5w/7mf2Rp/BdEp67eeXQBBnU02M7tlnUB+ajXVpY0z2AsLO6r/8opajPdnnZ9I3/ R6ihixijTfioQC6IPskaQvBc6oruGvprAIzBF1qFZ3RNUV9TS3UW02LrzALR7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQfRh4FdHz13Qg; Thu, 1 Feb 2024 13:11: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 411DBCMQ040375; Thu, 1 Feb 2024 13:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411DBCpT040372; Thu, 1 Feb 2024 13:11:12 GMT (envelope-from git) Date: Thu, 1 Feb 2024 13:11:12 GMT Message-Id: <202402011311.411DBCpT040372@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: bc2913d1736c - main - bintrans: Remove unused variable. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc2913d1736c2b299a265741a779014d001bd108 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bc2913d1736c2b299a265741a779014d001bd108 commit bc2913d1736c2b299a265741a779014d001bd108 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-01 13:10:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-01 13:10:45 +0000 bintrans: Remove unused variable. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43559 --- usr.bin/bintrans/qp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.bin/bintrans/qp.c b/usr.bin/bintrans/qp.c index 33aabb35a101..c2c9dfa7a224 100644 --- a/usr.bin/bintrans/qp.c +++ b/usr.bin/bintrans/qp.c @@ -138,12 +138,11 @@ qp(FILE *fp, FILE *fpo, bool encode) { char *line = NULL; size_t linecap = 0; - ssize_t linelen; void (*codec)(const char *line, FILE *f); codec = encode ? encode_quoted_printable : decode_quoted_printable ; - while ((linelen = getline(&line, &linecap, fp)) > 0) + while (getline(&line, &linecap, fp) > 0) codec(line, fpo); free(line); } From nobody Thu Feb 1 17:15:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQls96Dypz591vt; Thu, 1 Feb 2024 17: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 4TQls95lbVz44H7; Thu, 1 Feb 2024 17: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=1706807709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CrRCpZLVVGSV7WWghZc76uZF9RlBvEZhDHKBy3oj/7M=; b=ttyrEIAclcCaaZrt8MsohyhIK/H8w4cpexvnKwcyTwRPxf1NopqN8OP87Y36jxn7OG9lbd wPGyN2/aIWXrS0M2cPPwkoBNSwbx0N/ZbyKEGFgzOlngORiwTxjO2nqluF06gs1GRnjHZO YVTYB4KkV7f86vkLM3mAZBmQAvBy1ojsdh3RM93eOgDiNCBkTRRMQlPtmWCaM4UfQBXVxO pubp8A8ylJIIFcxtomVFBwAiHKfkh5/7q0WY7pxQK4JWrTzm1mtyoRHzrPaAo/amo0W312 M/jO6twmi4vYx+0qN/T2HM/qIOqDRxR+9hrSH7YXyUZ3pHn+8QXSu0RzB8B3nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706807709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CrRCpZLVVGSV7WWghZc76uZF9RlBvEZhDHKBy3oj/7M=; b=Rz3HSxKOTwSZ+ylJec3QYthbAaj94a2XtHI4Rjfizh1lPmeDbhjiHHlzzQDyWlkrd1HaK0 TBODitKOXw4XVRnUpO+X5/YQM4Qx74XJ3mMSlCwOlFfNrT8KMfw8Y2DpNakzomt3kNCWHU 1zcWqrV+5IKMK2ZdT0vOAVQo+qD2mo09Ji7qe0d27seVbRXc7eUDCcr81u0/zuQWSENWBQ 0gdYPYXa3k0PLHiMiha8I+9KofeU74e68ZtjOeC9zZotodjWTJ6dNOmCQ6fKWcAlHglVHu +k8ayVLCwZFLMIdxcFuNHxiYbrqd5IN+bJJogedbU2QDXoTucNVT17YYvISS+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706807709; a=rsa-sha256; cv=none; b=X2eX/N0XVwEOU9af61MZlV9neBignckOg/vtVAiGIbRnUvTFUfqfaqRoB+pfnG36vvF5Yg umsR8QCu/zSot73sN5OGNO77AWLUv7iMualP1B8wr7nvX4kapNb+p1P6xuNCnsC4qiwZgG vY3oskvaDdaTwmZVKgBkWnN8KR04X1VpKzX7ocajrfd9UXq4kCMwE2rcccgnoQ6ijnD8RX S8TSkle5QiyjDh8gqY4+S15/OkEaSbvCjMASOzDrsrutmhJsjLIyz/kBeuiGAekgR0vqOL j9+TMjKT94Wn+aDZIYVsVS80snVQzyJKq4JnAsuG0eWNg+x06KPuHoPC3zI4RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQls94rHPz18QT; Thu, 1 Feb 2024 17: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 411HF9Hb049012; Thu, 1 Feb 2024 17: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 411HF9rR049009; Thu, 1 Feb 2024 17:15:09 GMT (envelope-from git) Date: Thu, 1 Feb 2024 17:15:09 GMT Message-Id: <202402011715.411HF9rR049009@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: d6d4183cc54e - main - syscalls.master: Remove stray blank lines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6d4183cc54e8fc59619d03fd6b8dc08fd9ecc6f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d6d4183cc54e8fc59619d03fd6b8dc08fd9ecc6f commit d6d4183cc54e8fc59619d03fd6b8dc08fd9ecc6f Author: Brooks Davis AuthorDate: 2024-02-01 17:13:19 +0000 Commit: Brooks Davis CommitDate: 2024-02-01 17:14:40 +0000 syscalls.master: Remove stray blank lines No functional change. --- sys/kern/syscalls.master | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 2f1bea33ac8f..e85bc2796401 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1277,7 +1277,6 @@ 217 AUE_NULL NODEF|NOTSTATIC lkmnosys lkmnosys nosys_args int 218 AUE_NULL NODEF|NOTSTATIC lkmnosys lkmnosys nosys_args int 219 AUE_NULL NODEF|NOTSTATIC lkmnosys lkmnosys nosys_args int - 220 AUE_SEMCTL COMPAT7|NOSTD { int __semctl( int semid, @@ -2300,19 +2299,16 @@ int sig ); } - 434 AUE_NULL COMPAT10 { int _umtx_lock( _Inout_ struct umtx *umtx ); } - 435 AUE_NULL COMPAT10 { int _umtx_unlock( _Inout_ struct umtx *umtx ); } - 436 AUE_JAIL_ATTACH STD { int jail_attach( int jid @@ -2437,7 +2433,6 @@ _In_ void *value ); } - 457 AUE_MQ_OPEN NOSTD { int kmq_open( _In_z_ const char *path, From nobody Thu Feb 1 20:54:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQrvq63d7z58fBR; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@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 4TQrvq5Vpkz4StB; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706821367; 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=Fhf6UpJuy9K8ygu9a/L1LuAxH88mZrR9/MQJAX5TaFs=; b=x97RisxqoJhmR1JqiRy2ZKcOBNuDNcM3Hhooolrp8jpx1fzZuIghHss7927kClrH21vM0M dddHn+sUpj/s2f7j+zYJF8xzA/hyglsQ1RjhA0WeeOMj1yD18wkYvi86soDQYqTq7Ws3fh mlf/EnGAjrvqTpU4yHBzned4B43SoIUKDvOUJrFD5PhWxZzF8A+9tw65xVMebMuEFsUSci 50+r72QTPZtfB3WRJ9D+pznudNyoSwpR6jGO8fEI+uMBoH9v8Dl9Di6joinTwFVDTbdqWc eI9xZeTuNZErhzTV9FKbhFXWRQQj01EVSHS2ykP5QL4ETIWf6RgHDCySYT6A6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706821367; 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=Fhf6UpJuy9K8ygu9a/L1LuAxH88mZrR9/MQJAX5TaFs=; b=namW16syQ6NmvHUX7L1cgJdr8h0+R4MuuHKs85R3S2C1/GyP6e1JBe8WnBZhcvB8KftNPD TEC0eovylptHLZohU0HMjrQgDoLjWp0Lb4vHkiGT4L1bp66oSLGBgAQRFsHKYPDzDGv1X/ SaZvxPmz4VBOiK8D5lup1zZBxtKGvUuFsZQeOx6HPE3fkBC6yM/U1kjed+PaF9LVJouvfW /xyMu8eIr406Kn2sh8mte6uFY07iVJoC+epY3+fV7JI7+k+KWheAGGXp3O5T45dVMIoD3M lp6QYGQ+zZZuW/NDhf775o0rnVGkVczaIN4ZR1UCeytTbRtKBmqdo8oknoiscw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706821367; a=rsa-sha256; cv=none; b=pWN8mW/aghkYwxk0BrAi8NvPIZKy5PENFEMsDzsHNaHk7myC3nRLvTBPAawz+3tXGKx0xF pI81qRJDq0hjzo4dwTQrX+fAB/X9oZxeP1mLt0CJsblsumFcSh0IDIUe4pDP9kV5Tv/BIc r+Guv4dhTxl43SXpzUVnWtDjSkVYz4e0YNT3jubM0ClENgmKgnA+LumnT5myPc0KJz/rpJ fHDD3CP4SGLi4roanEEkTsNpWtbh+EfFx1P6MfoJYY5UWJW2eOAxCSx7v8kisJN9nVUb94 u61zqBQG6kqPx/Z2f9Flp5zEoiCIb/DoeLiqlmt7qji6nG7OtVHGdEE5PLMWyg== Received: from localhost (unknown [91.226.51.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dsl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQrvq2V2hzJ3H; Thu, 1 Feb 2024 21:02:47 +0000 (UTC) (envelope-from dsl@FreeBSD.org) References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> User-agent: mu4e 1.8.13; emacs 29.1 From: Dmitry Salychev To: Jung-uk Kim Cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Date: Thu, 01 Feb 2024 21:54:10 +0100 In-reply-to: <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> Message-ID: <86o7cz99u6.fsf@peasant.tower.home> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi, Jung-uk Kim writes: > On 24. 1. 31., Baptiste Daroussin wrote: >> Hello, >> Either this one or the previous import is breaking arm64 build >> --- acpi_iort.o --- >> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field >> 'data' with variable sized type 'union (unnamed union at >> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 >> )' not at the end of a struct or class is a GNU extension >> [-Werror,-Wgnu-variable-sized-type-not-at-end] >> 103 | } data; >> | ^ > > Sorry for the breakage. I will fix it soon. > > BTW, this code was added by this: > > https://reviews.freebsd.org/D31267 > > It seems struct iort_named_component was a hack, which duplicated > ACPI_IORT_NAMED_COMPONENT but with a fixed length field > DeviceName[32]. Is it really necessary? > > Jung-uk Kim I'm struggling to understand (a) how the entire anonymous "data" union was added by https://reviews.freebsd.org/D31267 as was "named_comp" only and (b) what the problem with the "struct iort_named_component" really is as ACPI_IORT_ROOT_COMPLEX and ACPI_IORT_SMMU were re-defined as incomplete types in the new version of ACPICA. Everything is compilable as it used to be with the attached patch. Regards, Dmitry -- https://wiki.freebsd.org/DmitrySalychev --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-acpica-Revert-declarations-back-to-complete-types.patch >From 0b4210943fab59ff985953408ec7e11b1f90e90e Mon Sep 17 00:00:00 2001 From: Dmitry Salychev Date: Thu, 1 Feb 2024 21:47:48 +0100 Subject: [PATCH] acpica: Revert declarations back to complete types --- sys/contrib/dev/acpica/include/actbl2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/acpica/include/actbl2.h b/sys/contrib/dev/acpica/include/actbl2.h index 140b386f802f..3e87844cc682 100644 --- a/sys/contrib/dev/acpica/include/actbl2.h +++ b/sys/contrib/dev/acpica/include/actbl2.h @@ -664,7 +664,7 @@ typedef struct acpi_iort_root_complex UINT32 PciSegmentNumber; UINT8 MemoryAddressLimit; /* Memory address size limit */ UINT16 PasidCapabilities; /* PASID Capabilities */ - UINT8 Reserved[]; /* Reserved, must be zero */ + UINT8 Reserved[1]; /* Reserved, must be zero */ } ACPI_IORT_ROOT_COMPLEX; @@ -688,7 +688,7 @@ typedef struct acpi_iort_smmu UINT32 ContextInterruptOffset; UINT32 PmuInterruptCount; UINT32 PmuInterruptOffset; - UINT64 Interrupts[]; /* Interrupt array */ + UINT64 Interrupts[1]; /* Interrupt array */ } ACPI_IORT_SMMU; -- 2.43.0 --=-=-=-- From nobody Thu Feb 1 21:42:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQsp75bqRz58k9v; Thu, 1 Feb 2024 21:42:55 +0000 (UTC) (envelope-from jkim@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 4TQsp74yzxz4hyk; Thu, 1 Feb 2024 21:42:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823775; 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=fpQS9GtZ38gTECW1ONT+9veEQodF/L6WcNhjY4sL13o=; b=iAm/bz5BbETFHxQBoBikhjRdKXYZVQsS+bSMobx474KTX/ty9o3110mTS3JO0H5HHKUIod XBWCCCJrGynkFZKeo45i/8+8COhfntzv/6RSlBBHBYFwOH+tVgKYUgKEDJAzxPxuqt0Fki WHzpuYZG0yFPi7wMR3QVc7x4NbrSf619EtKDYMeKbfclcgmMCfmkdbRYOy2HQ6NahjaTYV Zg3cpzZ333VMUw65CM2HCPaUw8E9ffrWL5aDfP/FOtqhUxle/3Fju8wRBjnBBXyX4MxUjH yaRjR3HpXL+304tXMgezwWBofl/vahtDow3XhN1Huk0PWQPzxXPd/wUp9T4Zfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823775; 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=fpQS9GtZ38gTECW1ONT+9veEQodF/L6WcNhjY4sL13o=; b=CCPGgfRlyCUYHob10SIlLf8Cg8rwPIP/GuRW+fk6egIZ++Seb7uaPHNDCDatGUACl2FGCq OrK5Z+8hSRiM4Y9nM9HePHRHPdKLX/dNYplmV16QuTQy3c2vqv7TJ5uyvlUEt0C5ac4G5S Rz1Mdadm9o6U5hCuRqu/cCOULWXqsgqL+pmQdXGQTiThKbWKVsyGpG2xIcSRWZduyGo/06 iwAx7pMgA1ik4pqZNIzdbN0QMTwPEFhvfYM3DHeMKvrC6D8Eed8ffHwPt1beSwAhAvpYbq fpyd+nRsa7A3FWPWaPsgjPvS0BkeHZl/pak8h5yCIHvQfzmcIJ0kWpb/tS3MhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823775; a=rsa-sha256; cv=none; b=o7SUATtNpQHsOYVp/9gS19Spbe5gu7Q/ZZNETxNjZciz/y/wEP8RStJEftYKEnQi+KmHTO N5tnO8SWEM1gtsyPdfH+ZbT9eK49uJNBXAj+20vq+bMBguIyxjSXD5oTkD0cMrIphhZs7A w5dQmPJ4pkz5bsSs/PT27sxlJMwhXxaBMns5R9KMyTQmgg7ajgX2p8T2nDtgme0jNiMdXT Z1LW0bbmLuguPDN0SdJQuP3Fk9tPJ2YtlntuwGopEgOVYfNKWHNePvfIDvRVLGUa+Bob93 kHWGSF/GKVQC0iruxe/iM/WWlEKSMFL1e3EsQ/waA5tgcizZ6zQl6A780TIAtw== Received: from freefall.freebsd.org (pool-108-53-202-102.nwrknj.fios.verizon.net [108.53.202.102]) (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: jkim/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQsp73VQVzGs8; Thu, 1 Feb 2024 21:42:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Content-Type: multipart/mixed; boundary="------------cjikkbECSwXq41OizwlgXpQS" Message-ID: Date: Thu, 1 Feb 2024 16:42:55 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Content-Language: en-US To: Dmitry Salychev Cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> <86o7cz99u6.fsf@peasant.tower.home> From: Jung-uk Kim Organization: FreeBSD.org In-Reply-To: <86o7cz99u6.fsf@peasant.tower.home> This is a multi-part message in MIME format. --------------cjikkbECSwXq41OizwlgXpQS Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 24. 2. 1., Dmitry Salychev wrote: > > Hi, > > Jung-uk Kim writes: > >> On 24. 1. 31., Baptiste Daroussin wrote: >>> Hello, >>> Either this one or the previous import is breaking arm64 build >>> --- acpi_iort.o --- >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field >>> 'data' with variable sized type 'union (unnamed union at >>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 >>> )' not at the end of a struct or class is a GNU extension >>> [-Werror,-Wgnu-variable-sized-type-not-at-end] >>> 103 | } data; >>> | ^ >> >> Sorry for the breakage. I will fix it soon. >> >> BTW, this code was added by this: >> >> https://reviews.freebsd.org/D31267 >> >> It seems struct iort_named_component was a hack, which duplicated >> ACPI_IORT_NAMED_COMPONENT but with a fixed length field >> DeviceName[32]. Is it really necessary? >> >> Jung-uk Kim > > I'm struggling to understand (a) how the entire anonymous "data" union > was added by https://reviews.freebsd.org/D31267 as was "named_comp" > only and (b) what the problem with the "struct iort_named_component" really > is as ACPI_IORT_ROOT_COMPLEX and ACPI_IORT_SMMU were re-defined as > incomplete types in the new version of ACPICA. Everything is compilable > as it used to be with the attached patch. FYI, ACPICA 20230331 dropped support for ANSI C (C89) and minimum requirement is C99 now. One of the first feature they used was the variable-length array, which replaced "foo[1]" hack. Previously, "sizeof(struct bar)" was not real size because of the (fake variable-length) array at the end of it. Now they removed the hack and started using real variable-length arrays. I believe the hack in acpi_iort.c was to work around the fake 1-byte array but it does not work any more because all ACPI_IORT_* are now using correct VLA. So, the cleanest way to fix this is using ACPI_IORT_NAMED_COMPONENT instead of "struct iort_named_component" (see attached PoC patch), which also eliminates the need for DeviceName[32]. Jung-uk Kim --------------cjikkbECSwXq41OizwlgXpQS Content-Type: text/x-patch; charset=UTF-8; name="iort.diff" Content-Disposition: attachment; filename="iort.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3N5cy9hcm02NC9hY3BpY2EvYWNwaV9pb3J0LmMgYi9zeXMvYXJtNjQv YWNwaWNhL2FjcGlfaW9ydC5jCmluZGV4IGEwZTI0Nzg4Yjc3NS4uMjk4Njc5ZDA1YzdkIDEw MDY0NAotLS0gYS9zeXMvYXJtNjQvYWNwaWNhL2FjcGlfaW9ydC5jCisrKyBiL3N5cy9hcm02 NC9hY3BpY2EvYWNwaV9pb3J0LmMKQEAgLTc0LDE0ICs3NCw2IEBAIHN0cnVjdCBpb3J0X2l0 c19lbnRyeSB7CiAJaW50CQkJcHhtOwogfTsKIAotc3RydWN0IGlvcnRfbmFtZWRfY29tcG9u ZW50Ci17Ci0JVUlOVDMyICAgICAgICAgICAgICAgICAgTm9kZUZsYWdzOwotCVVJTlQ2NCAg ICAgICAgICAgICAgICAgIE1lbW9yeVByb3BlcnRpZXM7Ci0JVUlOVDggICAgICAgICAgICAg ICAgICAgTWVtb3J5QWRkcmVzc0xpbWl0OwotCWNoYXIgICAgICAgICAgICAgICAgICAgIERl dmljZU5hbWVbMzJdOyAvKiBQYXRoIG9mIG5hbWVzcGFjZSBvYmplY3QgKi8KLX07Ci0KIC8q CiAgKiBJT1JUIG5vZGUuIEVhY2ggbm9kZSBoYXMgc29tZSBkZXZpY2Ugc3BlY2lmaWMgZGF0 YSBkZXBlbmRpbmcgb24gdGhlCiAgKiB0eXBlIG9mIHRoZSBub2RlLiBUaGUgbm9kZSBjYW4g YWxzbyBoYXZlIGEgc2V0IG9mIG1hcHBpbmdzLCBPUiBpbgpAQCAtMTAzLDcgKzk1LDcgQEAg c3RydWN0IGlvcnRfbm9kZSB7CiAJCUFDUElfSU9SVF9ST09UX0NPTVBMRVgJCXBjaV9yYzsJ LyogUENJIHJvb3QgY29tcGxleCAqLwogCQlBQ1BJX0lPUlRfU01NVQkJCXNtbXU7CiAJCUFD UElfSU9SVF9TTU1VX1YzCQlzbW11X3YzOwotCQlzdHJ1Y3QgaW9ydF9uYW1lZF9jb21wb25l bnQJbmFtZWRfY29tcDsKKwkJQUNQSV9JT1JUX05BTUVEX0NPTVBPTkVOVAluYW1lZF9jb21w OwogCX0gZGF0YTsKIH07CiAKQEAgLTMyNSw2ICszMTcsNyBAQCBpb3J0X2FkZF9ub2RlcyhB Q1BJX0lPUlRfTk9ERSAqbm9kZV9lbnRyeSwgdV9pbnQgbm9kZV9vZmZzZXQpCiAJQUNQSV9J T1JUX1NNTVVfVjMgKnNtbXVfdjM7CiAJQUNQSV9JT1JUX05BTUVEX0NPTVBPTkVOVCAqbmFt ZWRfY29tcDsKIAlzdHJ1Y3QgaW9ydF9ub2RlICpub2RlOworCXNpemVfdCBuYW1lX2xlbjsK IAogCW5vZGUgPSBtYWxsb2Moc2l6ZW9mKCpub2RlKSwgTV9ERVZCVUYsIE1fV0FJVE9LIHwg TV9aRVJPKTsKIAlub2RlLT50eXBlID0gIG5vZGVfZW50cnktPlR5cGU7CkBAIC0zNjAsMTAg KzM1MywxNCBAQCBpb3J0X2FkZF9ub2RlcyhBQ1BJX0lPUlRfTk9ERSAqbm9kZV9lbnRyeSwg dV9pbnQgbm9kZV9vZmZzZXQpCiAJCW1lbWNweSgmbm9kZS0+ZGF0YS5uYW1lZF9jb21wLCBu YW1lZF9jb21wLCBzaXplb2YoKm5hbWVkX2NvbXApKTsKIAogCQkvKiBDb3B5IG5hbWUgb2Yg dGhlIG5vZGUgc2VwYXJhdGVseS4gKi8KKwkJbmFtZV9sZW4gPSBub2RlX2VudHJ5LT5MZW5n dGg7CisJCW5hbWVfbGVuIC09IEFDUElfT0ZGU0VUKEFDUElfSU9SVF9OQU1FRF9DT01QT05F TlQsIERldmljZU5hbWUpOworCQluYW1lX2xlbiA9IHN0cm5sZW4obm9kZS0+ZGF0YS5uYW1l ZF9jb21wLkRldmljZU5hbWUsIG5hbWVfbGVuKTsKKwkJbmFtZWRfY29tcCA9IHJlYWxsb2Mo bmFtZWRfY29tcCwgc2l6ZW9mKCpub2RlKSArIG5hbWVfbGVuICsgMSwKKwkJICAgIE1fREVW QlVGLCBNX1dBSVRPSyB8IE1fWkVSTyk7CiAJCXN0cm5jcHkobm9kZS0+ZGF0YS5uYW1lZF9j b21wLkRldmljZU5hbWUsCi0JCSAgICBuYW1lZF9jb21wLT5EZXZpY2VOYW1lLAotCQkgICAg c2l6ZW9mKG5vZGUtPmRhdGEubmFtZWRfY29tcC5EZXZpY2VOYW1lKSk7Ci0JCW5vZGUtPmRh dGEubmFtZWRfY29tcC5EZXZpY2VOYW1lWzMxXSA9IDA7CisJCSAgICBuYW1lZF9jb21wLT5E ZXZpY2VOYW1lLCBuYW1lX2xlbiArIDEpOworCQlub2RlLT5kYXRhLm5hbWVkX2NvbXAuRGV2 aWNlTmFtZVtuYW1lX2xlbl0gPSAwOwogCiAJCWlvcnRfY29weV9kYXRhKG5vZGUsIG5vZGVf ZW50cnkpOwogCQlUQUlMUV9JTlNFUlRfVEFJTCgmbmFtZWRfbm9kZXMsIG5vZGUsIG5leHQp Owo= --------------cjikkbECSwXq41OizwlgXpQS-- From nobody Thu Feb 1 21:44:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQsrD6Spzz58knV; Thu, 1 Feb 2024 21:44: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 4TQsrD5yY8z4jZ7; Thu, 1 Feb 2024 21:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXhOJ0ZPRUV4uFCAMBXd2yarRfI54tqz+6QzMljOpUc=; b=de9HI+OVQTy/Ey+xfCGGLsWh6xyB/AK/mu6u5LGhkc4O530Bt8WHyuAVDMdjx6OS6EVJY1 3Ez/K8i4uE95GShlAha4fgBTZkg563mh1eR9zujH0rjjiGzsov3iZ4lCrMc3HwP/LxjneI 8fbUb6nhQYT2GHNQrDg/iBNe+Ssx2Liv9Kal1nXITlSzljPo0jp6Af53E8y6rE4CXj8bat 3AVoD321q+dHVzuU8lHFiZnkAXKjTKlRbxtKOLTCa9v5PFSKQ6vJ1568+JAEf4DEO5XK8P nCcHYVom38aaK2MxGWlOdjeNPTdD4OeggXzpn4rRr6fJI5VW4JZfGrKlI5JnVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oXhOJ0ZPRUV4uFCAMBXd2yarRfI54tqz+6QzMljOpUc=; b=jRfgQu5XIMWWa3hSWtEUcMSxm2DehbMO1FpJuw454iwVj5e6B+KtS+m9+r5R5D9gngVcKu ZyzTihoM34EL/sbSqqgiq2eBA3Bv0yHs8O4SnSUjCHsm9KXMt0vys/gV4JFf3uW9b5qdW6 Vzy5HTJiuj6iye6LmEA+kvXY0/fCWX+kQX3qFLLZ7qASJ6/xpCIV+v+agwP67URxBvH0Sf FWa923cGJ7YMVDM4zXHThqkM6CUu8RKVIXYOb4j9Hupuf77mkw6oU5Mr/aWeHzsBcXBHy+ 7zDwagxnViK8RaGmd1rnHyTA4tu8DdYfMAAV6Sxu5VHr+fVmM/MHZ1SzfAnbhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823884; a=rsa-sha256; cv=none; b=XQBnNLubgBkDT+3KOJx59CLfyTmNKenMBHvNMpJI8MBCs2vdeCmi4ThFdQFxJ2clI6dutt e+/pD3wn1koTI/SmaYFcoD/a91m0zqr9Zzg8xJXtXimyxuey3qOqfKwLd0yWMjrEB8GgbN BlnE1fLYEMxnSRdPzryRiTohGIVs7IUifnIK91Dbt+06mZAWE0xWtASaFxk9POsbGQOz7Y yBqAfzmZ75e4ONGOA0KKyuJw65E8J1XEbtGXplEtdY55z7HKMCMorDlSBQ9MN/qN6xnK/u 0Yt+dMgxm1/wkNRHYhlz47CzKAoeb4Z7UEczg0xdKvYosREIccsztfXK2ZNghg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQsrD544jz1Hhl; Thu, 1 Feb 2024 21:44: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 411LiiAC004642; Thu, 1 Feb 2024 21:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411Liika004639; Thu, 1 Feb 2024 21:44:44 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:44:44 GMT Message-Id: <202402012144.411Liika004639@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: 5bdf8150cd7d - main - unix/dgram: don't clear so_error in case of MSG_PEEK List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bdf8150cd7d19b0bd672992e6f964d30ce66408 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=5bdf8150cd7d19b0bd672992e6f964d30ce66408 commit 5bdf8150cd7d19b0bd672992e6f964d30ce66408 Author: Gleb Smirnoff AuthorDate: 2024-02-01 21:37:26 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-01 21:37:26 +0000 unix/dgram: don't clear so_error in case of MSG_PEEK --- sys/kern/uipc_usrreq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 554099586bbc..976490dbe2d8 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1440,7 +1440,8 @@ uipc_soreceive_dgram(struct socket *so, struct sockaddr **psa, struct uio *uio, (m = STAILQ_FIRST(&so->so_rcv.uxdg_mb)) == NULL) { if (so->so_error) { error = so->so_error; - so->so_error = 0; + if (!(flags & MSG_PEEK)) + so->so_error = 0; SOCK_RECVBUF_UNLOCK(so); SOCK_IO_RECV_UNLOCK(so); return (error); From nobody Thu Feb 1 21:44:45 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQsrF74F3z58kVF; Thu, 1 Feb 2024 21:44: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 4TQsrF6Y0Cz4jPX; Thu, 1 Feb 2024 21:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQgQV9V0NTTEnpOW/U97UagjiKMWRJp2D0/aRNfBwJ8=; b=w6jP1lExxe94DD+lJeGAE1JgoXrB/7v6SY04ZPJl+tTzDHXHWbJtmq+9js+SpscCUzf3Gz smCG+gZnlrkSPkgbUU2sJB7Nz/ZxhiYvR6huc7WT6nIE2VA7NBV6l0929JYTDq25WyQJi0 KGwTWDDdTxRAonEncSUyTuZIyfg2wFovqwZ3RDQ1QWk4buMvZ0mdtuHhRqpqaF2pE1DLM7 bEIBNkLn3bh4l1lA9aZNIq7t9EanHCQFlrjXaQK9LZJ2Qs32TlpaqTfcdC6YyZMpINvhKl lVlLfSLHbW7AXO+8KCqCI9+CmqGOmFwNEJk6knz00kWzQUKk0aocKlKcJoVcUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hQgQV9V0NTTEnpOW/U97UagjiKMWRJp2D0/aRNfBwJ8=; b=IQjeDYEjGoLm9B8tMs33ZnIQh+EBnBRFZlof7t3JqA7mbibuKNNbgSQFIDRoThn26WuAme yB9EtW5EMQyEJKhdLzBsmXCyHEeeheCepVtbX6aRkjHjklTTpeDZ+GN7Hl2Us98iY5dUFo NoV1JZKiM8xRBXbl/0/F1CFCp4JIkLOfZvgr4CP4jIaIZjYU5QVy5E7KEc1ucRuTnCAor4 Ca7Hp7RsHj0riHMvShH+ebzIzv4IYL0aQxkgi9kMPWLrys6rvrdhHw4/sS2hM+LxlUlo7s 9SwFKVZKVekTca1UZIX+v7tCAvJTHL301HOY5XrpEUJ8O+Q1G+M8dInKzuNSvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823885; a=rsa-sha256; cv=none; b=H8ufAWEU/dFfbBAhEDw0sm18wKRFMF/+u2bhRA2SiL9Cmg1OdObWfZLqpiTScHe1KyC+eV vN6FJE0Hf+wZtMkqMKXKRRvWDRwmwA4wxbRiI79mB+yH+x/h6TJhBFwqwngw/p3PJIhhaS 6QlgNwRFIfbDM7VynIbFCavmekjiU58N7jVV3FcYI/h+nP6yPDSly07ohLpF8NaoGBJbRG CKZdczWHbvzeM8Zz2lkJxM4jSnd8liIuKbmU76/hyFpVdoO5S2TSBj/pwpFrgldzgqtMO9 kEB1eajgLQPIm6qCCdhaxmDUhBo8mvEByRmbzvjCAzn3yBGbrQQCcvtucfNdeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQsrF5d12z1JYN; Thu, 1 Feb 2024 21:44: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 411Lijh7004684; Thu, 1 Feb 2024 21:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LijGq004681; Thu, 1 Feb 2024 21:44:45 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:44:45 GMT Message-Id: <202402012144.411LijGq004681@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: 702c48184718 - main - socket tests: improve error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 702c481847181005c9717ad04ec79efb32627089 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=702c481847181005c9717ad04ec79efb32627089 commit 702c481847181005c9717ad04ec79efb32627089 Author: Gleb Smirnoff AuthorDate: 2024-02-01 21:37:26 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-01 21:37:26 +0000 socket tests: improve error message --- tests/sys/kern/socket_msg_waitall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_waitall.c b/tests/sys/kern/socket_msg_waitall.c index e1e10a4c7886..4ad26b7419ba 100644 --- a/tests/sys/kern/socket_msg_waitall.c +++ b/tests/sys/kern/socket_msg_waitall.c @@ -50,7 +50,7 @@ close_test_client(void *arg) n = recv(s, buf, buflen, MSG_WAITALL); ATF_REQUIRE_MSG(n == (ssize_t)p->msglen, - "recv: %s", strerror(errno)); + "recv: got %zd expected %zd", n, (ssize_t)p->msglen); ATF_REQUIRE(close(s) == 0); } From nobody Thu Feb 1 21:44:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQsrH37Ppz58kl7; Thu, 1 Feb 2024 21:44: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 4TQsrH0kydz4jYH; Thu, 1 Feb 2024 21:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLxh92dolyFtHQkW4h4vEfNH5C0YPHbVqjBIzar+gyM=; b=H+oL/TwV2TefZ3Tn1gAA0MCTn7zKZdwN8/ewOonNA+gjytYqlrEAP0XNjEHKzDSpPsNL9B gcdFzHSthwc/agaTU5f1YeVYweDJcrezFjr4NZs0LvG5BXX2+B0cBcL1DukxvvlHT8+1g2 kYGuO6wLvn6jFq1W/qjIGLKtnH6gKnkBMHqp8mwLOwVXWXr851HboY9GVP30zq31IUaQ9f 0H1y2XAPsy0YNNxU3LWuxWvlzqRgctgo0PNT1MAMKoq/ZTLuOrBX7GGTXejl/U/oWD7/95 cIITV6x6clgbf9URETiCJzFh+P7G5+hWgoP7e/Ibk6Gg6awa4zlzuL/jiHQLWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pLxh92dolyFtHQkW4h4vEfNH5C0YPHbVqjBIzar+gyM=; b=FXVek166128+4QCBm0UGEpCYZz06caKLdbQHUDZb2egVobWmUU06wzjqcAW7APJiDVLRET fIijnvOLvpBKj3fusmqR3eEFRXoy8p84PYxdAC2L4nWfAUt/6wiTQWGl+rNCFKSdY6mIWD c6kInQQknQfjSYX3/Cuj0YRBG3BxL92zJPeO8Pvzvbf5qrDF+M4lEuFD7E6aNAI1gdJrXS 2+TC2bb/xlUEInz05HZLaA9/ZE0WwuPayZ+btw5++lxMpfxTtv2sG4WhTpYKFpgaoFBGlb ovBdK1XluXem1VSeIymmOrWmXIC3U5r8DSy2o5jTyD+uUIEVTYGIJyNpVMEWVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823887; a=rsa-sha256; cv=none; b=sOv97jXrJhbKKpKn4lrAAIi15ml/HKh1uqRkxgSK6rs5U13tw4PX+vwCqRxLp43NtMZzsR qwrfVoU5OBwKiliLYgetwnBM97zOuvQOXIwV2YxaNBQA3+6daz/BkzeNB7fqrePhf+elDt VmfdeXFjyGmXMti1RvXRGNu74UhGNytXU2I4/8Y6P3QrYxltR9t3jNrUSyRNxShq4ULTOc rgibdfe17Qk4yE7G75IvqqxklaTJypomEzLaUlfSjFGVzJz7QY4jbiGaP58m05trcwlc5z efgvE1LM5NTzWF4PtqANaSnRgcPd34wpgvcFQuT+zOs+zZyomI+hOY2uM0XcsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQsrG6fvJz1J8H; Thu, 1 Feb 2024 21:44: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 411LikSV004736; Thu, 1 Feb 2024 21:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LikWU004733; Thu, 1 Feb 2024 21:44:46 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:44:46 GMT Message-Id: <202402012144.411LikWU004733@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: 861274c9f8cf - main - tests/netinet: add a demo of TCP implied connect List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 861274c9f8cf2a5c00ded9580ea91b22def683f7 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=861274c9f8cf2a5c00ded9580ea91b22def683f7 commit 861274c9f8cf2a5c00ded9580ea91b22def683f7 Author: Gleb Smirnoff AuthorDate: 2024-02-01 21:37:26 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-01 21:43:36 +0000 tests/netinet: add a demo of TCP implied connect The TCP implied connect is an artifact left after T/TCP. To my surprise it still works, hence the existence of this test. Please read this email first: https://lists.freebsd.org/pipermail/freebsd-net/2010-August/026311.html An interesting fact that this test takes 220 - 240 milliseconds to execute on my Threadripper PRO. Flipping the '#if 0' to '#if 1' in the test, thus bringing it back to normal connect(2), would speed the test up a hundred times and I guess all this time is fork+exec of the test. --- tests/sys/netinet/Makefile | 1 + tests/sys/netinet/tcp_implied_connect.c | 81 +++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 434aadc87f46..b86457c2d723 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C= ip_reass_test \ so_reuseport_lb_test \ socket_afinet \ tcp_connect_port_test \ + tcp_implied_connect \ tcp_md5_getsockopt ATF_TESTS_SH= arp \ diff --git a/tests/sys/netinet/tcp_implied_connect.c b/tests/sys/netinet/tcp_implied_connect.c new file mode 100644 index 000000000000..2961626d5e5b --- /dev/null +++ b/tests/sys/netinet/tcp_implied_connect.c @@ -0,0 +1,81 @@ +/*- + * 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 + +static struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), +}; + +static const char buf[] = "hello"; +static char repl[sizeof(buf)]; + +ATF_TC_WITHOUT_HEAD(tcp_implied_connect); +ATF_TC_BODY(tcp_implied_connect, tc) +{ + socklen_t len; + int s, c, a; + + ATF_REQUIRE(s = socket(PF_INET, SOCK_STREAM, 0)); + ATF_REQUIRE(c = socket(PF_INET, SOCK_STREAM, 0)); + + ATF_REQUIRE(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + len = sizeof(sin); + ATF_REQUIRE(getsockname(s, (struct sockaddr *)&sin, &len) == 0); + ATF_REQUIRE(listen(s, -1) == 0); +#if 0 + /* + * The disabled code is that you would normally do. + */ + ATF_REQUIRE(connect(c, (struct sockaddr *)&sin, sizeof(sin)) == 0); + ATF_REQUIRE(send(c, &buf, sizeof(buf), 0) == sizeof(buf)); +#else + /* + * And this is implied connect. + */ + ATF_REQUIRE(sendto(c, &buf, sizeof(buf), 0, (struct sockaddr *)&sin, + sizeof(sin)) == sizeof(buf)); +#endif + + ATF_REQUIRE((a = accept(s, NULL, NULL)) != 1); + ATF_REQUIRE(recv(a, &repl, sizeof(repl), 0) == sizeof(buf)); + ATF_REQUIRE(strcmp(buf, repl) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, tcp_implied_connect); + + return (atf_no_error()); +} From nobody Thu Feb 1 22:03:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQtFg4zhbz58lZM; Thu, 1 Feb 2024 22:03: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 4TQtFg4MCQz4lX2; Thu, 1 Feb 2024 22:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706824999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2k4ZZF4xJB6rSosbnHPkAEiLwxihVAENZ0ypbEZWQ0=; b=NU5O8XLvxKOU/h3XNYu+N/8kDAj2o+BSBjiahQM6AL3rmgo9Sp2SgSi06Ca+ofUdZygjc9 T/DkXNQ2qqSAoriDRnvOQLLz1t5jEGkUeWdbERpPr6qAWUnhPJq+0x+RrbXiJ8ZsJ50TmT Z55Ptfr3kkCc9e/d9m6HQEeNcj8pADJW6y9nT4XuDAatxlXkRtDZGHBwWvKGDolLWiKI9A g4uovDtkYc7Rsr1wF0Dmij3Aq3hz9tD2mHv8/GYZNgAiqq6jivEvQNPOD+6FuiPWKG/jBZ 3OEdpRSzNtPlnQGgjnLVkIQlNBwwmHzcag4huyk3iIbB+ZVIEMBL7XefRhSdsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706824999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h2k4ZZF4xJB6rSosbnHPkAEiLwxihVAENZ0ypbEZWQ0=; b=T7ggYb8a+mt0rKzYJmXWW0fwCro6B0/bf3GeEItH47wH11+MWbangGwsr5P7R3+Ro62NLP 7ekSdI5I9eCY3BUMQeoA8Y20qz6prFz4RvUvW9hv5tn7SrkF9BBrFONRAAFhGCBnKN4Sm3 BgNUsWprai8cTV9hJtQJrNw9THLUT+Gc6KkP1QLxo2OyC5f6v6Vi5BLJNRGFzHSI61O7Z/ XBO9j7H+ODoPmBOevlWPxjH9c8yMzt/Ilf0+mQI4SSxag3Rx9LrgDC9v+OsDjV7jiDMbfa xA0QHk0bRFuk8DUvn4+B4aAe9f6iWQKv82JVNS1sENPghEUaCBe6C/QfPKyl3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706824999; a=rsa-sha256; cv=none; b=Y0Jd1HQgXqKfMW2ptSX8Bb8/gvGY8raI/DE7lG/4mGrTJlLp2uafQk1FQ7Hb4XJX1UWdEc VUxzSIA2fUdQ3tmdK1LXkxbsMN10HcZNXT6ZiSt86q/PBHyVCziZmVEhnsmk+sQNbrsb6l DCCxq//g04EBmN2lsQ0DHEpL1sgVk61/YZAdotD5m1EHBQsICV75McLk3pUfqKAWrcpWso ZvFB6UKk1jjN4QDJJ4OOGRQDb++/dZqeypjRq432kYD0okwxy/wGRm9PQxE/tXA0kvxtBE isFs9+bkLzlsuqjwZ1ivPJ5I+w2flFx5ALlumDwa9rH1TnZGkQh9IFaOa1nc7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQtFg3QCRz1JJ7; Thu, 1 Feb 2024 22:03: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 411M3JBq039187; Thu, 1 Feb 2024 22:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411M3J1p039184; Thu, 1 Feb 2024 22:03:19 GMT (envelope-from git) Date: Thu, 1 Feb 2024 22:03:19 GMT Message-Id: <202402012203.411M3J1p039184@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: 5f047ae0c73b - main - pflowctl: add missing break to case 's' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f047ae0c73b4424b29e64d50b71346b9abd058e Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f047ae0c73b4424b29e64d50b71346b9abd058e commit 5f047ae0c73b4424b29e64d50b71346b9abd058e Author: Ed Maste AuthorDate: 2024-02-01 21:22:11 +0000 Commit: Ed Maste CommitDate: 2024-02-01 22:03:12 +0000 pflowctl: add missing break to case 's' CID: 1534009 Reported by: Coverity Scan Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D43704 --- sbin/pflowctl/pflowctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/pflowctl/pflowctl.c b/sbin/pflowctl/pflowctl.c index f6ca8980db1b..b6561f7787c0 100644 --- a/sbin/pflowctl/pflowctl.c +++ b/sbin/pflowctl/pflowctl.c @@ -577,6 +577,7 @@ main(int argc, char *argv[]) op = OP_SET; set_arg_count = argc - optind; set_args = argv + optind; + break; case 'v': verbose = true; break; From nobody Thu Feb 1 23:27:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQw7d3C55z58vJh; Thu, 1 Feb 2024 23:28:13 +0000 (UTC) (envelope-from dsl@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 4TQw7d2NSFz4sk3; Thu, 1 Feb 2024 23:28:13 +0000 (UTC) (envelope-from dsl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706830093; 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=eJPV52JB8M2A9LaZnEbqlYPkkXVOL1iFYr7FSHJ4Saw=; b=GGoYTqOVxKBJPM8mPppZVLz1s1et8z7w/zX+nElFTEJUC19cEb9Hr0OZGO/t5U0kj1skNT PRblsimBbjOeEkV/fAvIP7BJ83Q9f5pU/vvY8/Fp0qgezDMGOsvLFpn2BjZLIkqaC+A40b fuZgDbmhvWrmdpKXZNLd+M/3wfjYR/py0oka6TiqZGEkp/2bK0cMpvTDMiHxiHL7kwBHzr vo8blgS0ZirO7Y75/NAwr7jDgIj3VD6k9zKqD0JRv5dA3anNGgjrBeUFGhyWB9ezGibvmf tkChodBgas54yj6OqQ1h8Va2IBCe3YA9gwj2m6gzdU34d1TeQNl3auOZVXZ0UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706830093; 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=eJPV52JB8M2A9LaZnEbqlYPkkXVOL1iFYr7FSHJ4Saw=; b=sxQ++txb5gW3aCZRPzIqjIoh6LVLkhXGSuwO2V3o1LzwOMgnNQtuFn6k7rF9D9BDd/AwnD C37e2fCnp+DtFNyVDifRGrPV542esaLApYouGn5A3druMaH9stSOB50vScc6ADvCffbbSb 4QqiUPMCyNEhcgrCoHQQvD5RUtxeMZ3Oouszj+FVUayZL37CUn8iIRk8CFbegckQmB9kMm AdjEIBivf1GUT4Li0ddq+FISrl1SbmEFsGVTSdTawLAcL+wxv1RYvE3aHwghxLUI2SfHuR PCiOc6lyAbRsymI6ewQrNjjLYUh5QK/yfHDADi1wok5bRNeVg+wrA+GyHRwu9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706830093; a=rsa-sha256; cv=none; b=CjsbLZiZd2K3vo2+5rDxH2C0YJ0L+rI4xPmVkHUp9vWYvfgiNNszwirK8dyoigx6Z9X8IX +tbjZpox3hXd0v9zN4qCysJeiD/Kspp36Vdpzb7wHaoC/dcovyPyLtrUgcKrOUE7le9qg1 /Rs8xIGvBkMlxRjIH1O6bkcIv4r9JadRnFyvqAjs7WO2DNkwnlmnVHbr9Yh0EGWcA/+iIc dXU334vV1e5O1NTnoFZZLgtIX2/IsJmHYMy87lvSav9gArMVvkSmhe7Ys/VnrZgKghF7zj x1iDwj+yU0xCzQ4dx8QRl8iE6Hf1Y36yXhgQvtQQ+Z0uoAft+uY3DZoFcYikvw== Received: from localhost (unknown [91.226.51.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dsl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TQw7c6NzbzLHR; Thu, 1 Feb 2024 23:28:12 +0000 (UTC) (envelope-from dsl@FreeBSD.org) References: <202401310406.40V46B9a000876@gitrepo.freebsd.org> <04c4a0e1-aa79-4d25-a1f7-2196cfa65578@FreeBSD.org> <86o7cz99u6.fsf@peasant.tower.home> User-agent: mu4e 1.8.13; emacs 29.1 From: Dmitry Salychev To: Jung-uk Kim Cc: Baptiste Daroussin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c64d74917e - main - acpica: Import ACPICA 20230628 Date: Fri, 02 Feb 2024 00:27:04 +0100 In-reply-to: Message-ID: <86jznn933q.fsf@peasant.tower.home> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Jung-uk Kim writes: > On 24. 2. 1., Dmitry Salychev wrote: >> Hi, >> Jung-uk Kim writes: >> >>> On 24. 1. 31., Baptiste Daroussin wrote: >>>> Hello, >>>> Either this one or the previous import is breaking arm64 build >>>> --- acpi_iort.o --- >>>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:103:4: error: field >>>> 'data' with variable sized type 'union (unnamed union at >>>> /home/bapt/worktrees/main/sys/arm64/acpica/acpi_iort.c:98:2 >>>> )' not at the end of a struct or class is a GNU extension >>>> [-Werror,-Wgnu-variable-sized-type-not-at-end] >>>> 103 | } data; >>>> | ^ >>> >>> Sorry for the breakage. I will fix it soon. >>> >>> BTW, this code was added by this: >>> >>> https://reviews.freebsd.org/D31267 >>> >>> It seems struct iort_named_component was a hack, which duplicated >>> ACPI_IORT_NAMED_COMPONENT but with a fixed length field >>> DeviceName[32]. Is it really necessary? >>> >>> Jung-uk Kim >> I'm struggling to understand (a) how the entire anonymous "data" >> union >> was added by https://reviews.freebsd.org/D31267 as was "named_comp" >> only and (b) what the problem with the "struct iort_named_component" really >> is as ACPI_IORT_ROOT_COMPLEX and ACPI_IORT_SMMU were re-defined as >> incomplete types in the new version of ACPICA. Everything is compilable >> as it used to be with the attached patch. > > FYI, ACPICA 20230331 dropped support for ANSI C (C89) and minimum > requirement is C99 now. One of the first feature they used was the > variable-length array, which replaced "foo[1]" hack. Previously, > "sizeof(struct bar)" was not real size because of the (fake > variable-length) array at the end of it. Now they removed the hack > and started using real variable-length arrays. I believe the hack in > acpi_iort.c was to work around the fake 1-byte array but it does not > work any more because all ACPI_IORT_* are now using correct VLA. So, > the cleanest way to fix this is using ACPI_IORT_NAMED_COMPONENT > instead of "struct iort_named_component" (see attached PoC patch), > which also eliminates the need for DeviceName[32]. > > Jung-uk Kim > > [2. text/x-patch; iort.diff]... Please, open a review for your patch. I've several questions. Regards, Dmitry -- https://wiki.freebsd.org/DmitrySalychev From nobody Fri Feb 2 02:03:28 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TQzZq0d57z598s1; Fri, 2 Feb 2024 02:03: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 4TQzZq0DH5z48vP; Fri, 2 Feb 2024 02:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706839411; h=from:from:reply-to:subject:subject: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+eQcpP2lV4rxToUNJTslZGkraSEMCSmhAPqXsBJT6Q=; b=WsIQnTjux/LSMy+FvLE4RZMgjuvE3lrIOtAUdRoBMEIvgeSpbYVRimbsV36XrWTLpdlD/I LEQlnXNwgZmCQaH5FoMTddNE3opu06j09tcyQWZIpTKrnymStJtFaOeFDzzH/y+FhB2zWI DUJw13jmxsq4REl2Faz8DobGojpmvqRDPcF7bsZ5I+4xnc6+Q0JRNSu9tJwKLY+t9PvoRA 0c84vCp+JZz34+YYLdykWg6xH22eO4GoRdCfbmyaTjOTNLXlGnjm3P00mU4CmyCEHIRj9Y ymCGFqPdtFCjmYHiVtqBX0mSLdMeoNE8KQ3gxYc0MYLe5I30RyIqw/FeReKnsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706839411; h=from:from:reply-to:subject:subject: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+eQcpP2lV4rxToUNJTslZGkraSEMCSmhAPqXsBJT6Q=; b=rQJzznlY/1PlaEkOZANjmICBunYME9+A+46vkVxOOYMrAb9nmAsfp9E3wmt/cgqMzf0WmP E87JbbQoMRaJyv1hwSPqEGDwWokjnLAgGCO9KDhCZRnBarvgD5rH9beW9Fhf7qQGhSsjo8 jfONnDfHk5HroHg56Q5cnyF/OAmbxCJNVMMSMSl4kysSEQiEBfoqUv1oclDgvEiabMwD7k oyL+12sEJTlfGXZ/saS+xWFGY3Pde+4+o/FaJAjIC99hDg3grz8W92i1Bunyb+kO7N6msF GMVGzVZ4Moqxa1QA9WTOdBC3sqpmnBqtzdpksrmiPo7Y+XiuPlE9CBcR6/A4GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706839411; a=rsa-sha256; cv=none; b=pLswXmd7g8W54DCcIPz0cF8yOqXIQbjTv0nWzwIEqQRAWlZBU4tTTPESzoRufbGLJD1OYJ r87rpujNySWghUbKNDbYFAYJF1icFBnltHxHXCf250OpAQ49uJbV/um8Hg85586s+pBVog dBO3tu+FIv//rtbMUvWGE4IRrYELfNJJU4HRwvEROWzaxScy27ktJ7sWiQZ5Z3VzpU/x34 dKOv0qKzbMLPtlQ1HgB9RIQ46MWk9HRba6HtIc3dL2sRXgXCLrCUDd1zPUrcFHsBtd42Pw R1a/EVJnHxBb9wWITgHHH7xveJSwqRyBHH65fKn9uhcVlAzINfqCPn386lOxaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TQzZp6Pj9z1Qyc; Fri, 2 Feb 2024 02:03: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 41223Ux7041353; Fri, 2 Feb 2024 02:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41223S7o041348; Fri, 2 Feb 2024 02:03:28 GMT (envelope-from git) Date: Fri, 2 Feb 2024 02:03:28 GMT Message-Id: <202402020203.41223S7o041348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 2723c7ffb7f7 - main - contrib/tzdata: import tzdata 2024a List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2723c7ffb7f729a1d3f7c59e7db48b0edf3d30a6 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=2723c7ffb7f729a1d3f7c59e7db48b0edf3d30a6 commit 2723c7ffb7f729a1d3f7c59e7db48b0edf3d30a6 Merge: 5f047ae0c73b 76e31da7ab27 Author: Philip Paeps AuthorDate: 2024-02-02 02:01:39 +0000 Commit: Philip Paeps CommitDate: 2024-02-02 02:01:39 +0000 contrib/tzdata: import tzdata 2024a Changes: https://github.com/eggert/tz/blob/2024a/NEWS MFC after: 3 days contrib/tzdata/Makefile | 53 ++++-- contrib/tzdata/NEWS | 68 +++++++ contrib/tzdata/africa | 8 +- contrib/tzdata/asia | 174 +++++++++++------- contrib/tzdata/australasia | 14 +- contrib/tzdata/checknow.awk | 2 +- contrib/tzdata/etcetera | 2 +- contrib/tzdata/europe | 29 ++- contrib/tzdata/leap-seconds.list | 373 +++++++++++++-------------------------- contrib/tzdata/leapseconds | 19 +- contrib/tzdata/leapseconds.awk | 11 +- contrib/tzdata/northamerica | 29 +-- contrib/tzdata/southamerica | 5 +- contrib/tzdata/theory.html | 37 ++-- contrib/tzdata/version | 2 +- contrib/tzdata/zishrink.awk | 98 ++++++---- contrib/tzdata/zonenow.tab | 4 +- 17 files changed, 507 insertions(+), 421 deletions(-) diff --cc contrib/tzdata/Makefile index 4e45f93b915c,000000000000..d48354c72df4 mode 100644,000000..100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@@ -1,1330 -1,0 +1,1361 @@@ +# Make and install tzdb code and data. +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. +# Request POSIX conformance; this must be the first non-comment line. +.POSIX: +# On older platforms you may need to scrounge for a POSIX-conforming 'make'. +# For example, on Solaris 10 (2005), use /usr/sfw/bin/gmake or +# /usr/xpg4/bin/make, not /usr/ccs/bin/make. + +# To affect how this Makefile works, you can run a shell script like this: +# +# #!/bin/sh +# make CC='gcc -std=gnu11' "$@" +# +# This example script is appropriate for a pre-2017 GNU/Linux system +# where a non-default setting is needed to support this package's use of C99. +# +# Alternatively, you can simply edit this Makefile to tailor the following +# macro definitions. + +############################################################################### +# Start of macros that one plausibly might want to tailor. + +# Package name for the code distribution. +PACKAGE= tzcode + +# Version number for the distribution, overridden in the 'tarballs' rule below. +VERSION= unknown + +# Email address for bug reports. +BUGEMAIL= tz@iana.org + +# DATAFORM selects the data format. +# Available formats represent essentially the same data, albeit +# possibly with minor discrepancies that users are not likely to notice. +# To get new features and the best data right away, use: +# DATAFORM= vanguard +# To wait a while before using new features, to give downstream users +# time to upgrade zic (the default), use: +# DATAFORM= main +# To wait even longer for new features, use: +# DATAFORM= rearguard +# Rearguard users might also want "ZFLAGS = -b fat"; see below. +DATAFORM= main + +# Change the line below for your timezone (after finding the one you want in +# one of the $(TDATA) source files, or adding it to a source file). +# Alternatively, if you discover you've got the wrong timezone, you can just +# 'zic -l -' to remove it, or 'zic -l rightzone' to change it. +# Use the command +# make zonenames +# to get a list of the values you can use for LOCALTIME. + +LOCALTIME= Factory + - # The POSIXRULES macro controls interpretation of POSIX-like TZ ++# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. +# If POSIXRULES is '-', no template is installed; this is the default. +# Any other value for POSIXRULES is obsolete and should not be relied on, as: +# * It does not work correctly in popular implementations such as GNU/Linux. +# * It does not work even in tzcode, except for historical timestamps +# that precede the last explicit transition in the POSIXRULES file. +# Hence it typically does not work for current and future timestamps. +# If, despite the above, you want a template for handling these settings, +# you can change the line below (after finding the timezone you want in the +# one of the $(TDATA) source files, or adding it to a source file). +# Alternatively, if you discover you've got the wrong timezone, you can just +# 'zic -p -' to remove it, or 'zic -p rightzone' to change it. +# Use the command +# make zonenames +# to get a list of the values you can use for POSIXRULES. + +POSIXRULES= - + +# Also see TZDEFRULESTRING below, which takes effect only +# if POSIXRULES is '-' or if the template file cannot be accessed. + + +# Installation locations. +# +# The defaults are suitable for Debian, except that if REDO is +# posix_right or right_posix then files that Debian puts under +# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead +# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps, +# respectively. Problems with the Debian approach are discussed in +# the commentary for the right_posix rule (below). + +# Destination directory, which can be used for staging. +# 'make DESTDIR=/stage install' installs under /stage (e.g., to +# /stage/etc/localtime instead of to /etc/localtime). Files under +# /stage are not intended to work as-is, but can be copied by hand to +# the root directory later. If DESTDIR is empty, 'make install' does +# not stage, but installs directly into production locations. +DESTDIR = + +# Everything is installed into subdirectories of TOPDIR, and used there. +# TOPDIR should be empty (meaning the root directory), +# or a directory name that does not end in "/". +# TOPDIR should be empty or an absolute name unless you're just testing. +TOPDIR = + +# The default local timezone is taken from the file TZDEFAULT. +TZDEFAULT = $(TOPDIR)/etc/localtime + +# The subdirectory containing installed program and data files, and +# likewise for installed files that can be shared among architectures. +# These should be relative file names. +USRDIR = usr +USRSHAREDIR = $(USRDIR)/share + +# "Compiled" timezone information is placed in the "TZDIR" directory +# (and subdirectories). +# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty. +TZDIR_BASENAME= zoneinfo +TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME) + +# The "tzselect" and (if you do "make INSTALL") "date" commands go in: +BINDIR = $(TOPDIR)/$(USRDIR)/bin + +# The "zdump" command goes in: +ZDUMPDIR = $(BINDIR) + +# The "zic" command goes in: +ZICDIR = $(TOPDIR)/$(USRDIR)/sbin + +# Manual pages go in subdirectories of. . . +MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man + +# Library functions are put in an archive in LIBDIR. +LIBDIR = $(TOPDIR)/$(USRDIR)/lib + + +# Types to try, as an alternative to time_t. +TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL) +TIME_T_ALTERNATIVES_HEAD = int_least64_t +TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t + +# What kind of TZif data files to generate. (TZif is the binary time +# zone data format that zic generates; see Internet RFC 8536.) +# If you want only POSIX time, with time values interpreted as +# seconds since the epoch (not counting leap seconds), use +# REDO= posix_only +# below. If you want only "right" time, with values interpreted +# as seconds since the epoch (counting leap seconds), use +# REDO= right_only +# below. If you want both sets of data available, with leap seconds not +# counted normally, use +# REDO= posix_right +# below. If you want both sets of data available, with leap seconds counted +# normally, use +# REDO= right_posix +# below. POSIX mandates that leap seconds not be counted; for compatibility +# with it, use "posix_only" or "posix_right". Use POSIX time on systems with +# leap smearing; this can work better than unsmeared "right" time with +# applications that are not leap second aware, and is closer to unsmeared +# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error). + +REDO= posix_right + +# Whether to put an "Expires" line in the leapseconds file. +# Use EXPIRES_LINE=1 to put the line in, 0 to omit it. +# The EXPIRES_LINE value matters only if REDO's value contains "right". +# If you change EXPIRES_LINE, remove the leapseconds file before running "make". +# zic's support for the Expires line was introduced in tzdb 2020a, +# and was modified in tzdb 2021b to generate version 4 TZif files. +# EXPIRES_LINE defaults to 0 for now so that the leapseconds file +# can be given to pre-2020a zic implementations and so that TZif files +# built by newer zic implementations can be read by pre-2021b libraries. +EXPIRES_LINE= 0 + +# To install data in text form that has all the information of the TZif data, +# (optionally incorporating leap second information), use +# TZDATA_TEXT= tzdata.zi leapseconds +# To install text data without leap second information (e.g., because +# REDO='posix_only'), use +# TZDATA_TEXT= tzdata.zi +# To avoid installing text data, use +# TZDATA_TEXT= + +TZDATA_TEXT= leapseconds tzdata.zi + +# For backward-compatibility links for old zone names, use +# BACKWARD= backward +# To omit these links, use +# BACKWARD= + +BACKWARD= backward + +# If you want out-of-scope and often-wrong data from the file 'backzone', +# but only for entries listed in the backward-compatibility file zone.tab, use +# PACKRATDATA= backzone +# PACKRATLIST= zone.tab +# If you want all the 'backzone' data, use +# PACKRATDATA= backzone +# PACKRATLIST= +# To omit this data, use +# PACKRATDATA= +# PACKRATLIST= + +PACKRATDATA= +PACKRATLIST= + +# The name of a locale using the UTF-8 encoding, used during self-tests. +# The tests are skipped if the name does not appear to work on this system. + +UTF8_LOCALE= en_US.utf8 + +# Non-default libraries needed to link. +# On some hosts, this should have -lintl unless CFLAGS has -DHAVE_GETTEXT=0. +LDLIBS= + +# Add the following to an uncommented "CFLAGS=" line as needed +# to override defaults specified in the source code or by the system. +# "-DFOO" is equivalent to "-DFOO=1". +# -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime +# formats that generate only the last two digits of year numbers +# -DEPOCH_LOCAL if the 'time' function returns local time not UT +# -DEPOCH_OFFSET=N if the 'time' function returns a value N greater +# than what POSIX specifies, assuming local time is UT. +# For example, N is 252460800 on AmigaOS. +# -DHAVE_DECL_ASCTIME_R=0 if does not declare asctime_r +# -DHAVE_DECL_ENVIRON if declares 'environ' +# -DHAVE_DECL_TIMEGM=0 if does not declare timegm +# -DHAVE_DIRECT_H if mkdir needs (MS-Windows) +# -DHAVE__GENERIC=0 if _Generic does not work* +# -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), +# -DHAVE_GETRANDOM=0 to avoid using getrandom +# -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), +# where LDLIBS also needs to contain -lintl on some hosts; +# -DHAVE_GETTEXT=0 to avoid using gettext +# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares +# ctime_r and asctime_r incompatibly with the POSIX standard +# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). +# -DHAVE_INTTYPES_H=0 if does not work*+ +# -DHAVE_LINK=0 if your system lacks a link function +# -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function +# -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz +# localtime_rz can make zdump significantly faster, but is nonstandard. +# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure. +# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare +# functions like 'link' or variables like 'tzname' required by POSIX +# -DHAVE_SETENV=0 if your system lacks the setenv function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ +# -DHAVE_STDCKDINT_H=0 if neither nor substitutes like +# __builtin_add_overflow work* +# -DHAVE_STDINT_H=0 if does not work*+ +# -DHAVE_STRFTIME_L if declares locale_t and strftime_l +# -DHAVE_STRDUP=0 if your system lacks the strdup function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ +# -DHAVE_SYMLINK=0 if your system lacks the symlink function +# -DHAVE_SYS_STAT_H=0 if does not work* +# -DHAVE_TZSET=0 if your system lacks a tzset function +# -DHAVE_UNISTD_H=0 if does not work* +# -DHAVE_UTMPX_H=0 if does not work* +# -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DPORT_TO_C89 if tzcode should also run on mostly-C89 platforms+ +# Typically it is better to use a later standard. For example, +# with GCC 4.9.4 (2016), prefer '-std=gnu11' to '-DPORT_TO_C89'. +# Even with -DPORT_TO_C89, the code needs at least one C99 +# feature (integers at least 64 bits wide) and maybe more. +# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers +# with external linkage, e.g., applications cannot define 'localtime'. +# -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ +# However, this might trigger latent bugs in C99-or-later callers. +# -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has +# security implications and is not recommended for general use +# -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; +# not needed by the main-program tz code, which is single-threaded. +# Append other compiler flags as needed, e.g., -pthread on GNU/Linux. +# -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t +# This is intended for internal use only; it mangles external names. +# -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" +# -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; +# the default is system-supplied, typically "/usr/lib/locale" +# -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified - # DST transitions for POSIX-style TZ strings lacking them, ++# DST transitions for POSIX.1-2017-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) +# -DUNINIT_TRAP if reading uninitialized storage can cause problems +# other than simply getting garbage data +# -DUSE_LTZ=0 to build zdump with the system time zone library +# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below. +# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and +# similarly for "slim". Fat TZif files work around incompatibilities +# and bugs in some TZif readers, notably older ones that +# ignore or otherwise mishandle 64-bit data in TZif files; +# however, fat TZif files may trigger bugs in newer TZif readers. +# Slim TZif files are more efficient, and are the default. +# -DZIC_MAX_ABBR_LEN_WO_WARN=3 +# (or some other number) to set the maximum time zone abbreviation length +# that zic will accept without a warning (the default is 6) +# -g to generate symbolic debugging info +# -Idir to include from directory 'dir' +# -O0 to disable optimization; other -O options to enable more optimization +# -Uname to remove any definition of the macro 'name' +# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking +# +# * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later, say in the year 2029. +# +# Select instrumentation via "make GCC_INSTRUMENT='whatever'". +GCC_INSTRUMENT = \ + -fsanitize=undefined -fsanitize-address-use-after-scope \ + -fsanitize-undefined-trap-on-error -fstack-protector +# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow. +GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ + $(GCC_INSTRUMENT) \ + -Wall -Wextra \ + -Walloc-size-larger-than=100000 -Warray-bounds=2 \ + -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \ + -Wdeclaration-after-statement -Wdouble-promotion \ + -Wduplicated-branches -Wduplicated-cond \ + -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ + -Wimplicit-fallthrough=5 -Winit-self -Wlogical-op \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wnull-dereference \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ + -Wshadow -Wshift-overflow=2 -Wstrict-overflow \ + -Wstrict-prototypes -Wstringop-overflow=4 \ + -Wstringop-truncation -Wsuggest-attribute=cold \ + -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=malloc \ + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ + -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \ + -Wvariadic-macros -Wvla -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits +# +# If your system has a "GMT offset" field in its "struct tm"s +# (or if you decide to add such a field in your system's "time.h" file), +# add the name to a define such as +# -DTM_GMTOFF=tm_gmtoff +# to the end of the "CFLAGS=" line. If not defined, the code attempts to +# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. +# Similarly, if your system has a "zone abbreviation" field, define +# -DTM_ZONE=tm_zone - # and define NO_TM_ZONE to suppress any guessing. Although these two fields - # not required by POSIX, a future version of POSIX is planned to require them - # and they are widely available on GNU/Linux and BSD systems. ++# and define NO_TM_ZONE to suppress any guessing. ++# Although these two fields are not required by POSIX.1-2017, ++# POSIX 202x/D4 requires them and they are widely available ++# on GNU/Linux and BSD systems. +# +# The next batch of options control support for external variables +# exported by tzcode. In practice these variables are less useful +# than TM_GMTOFF and TM_ZONE. However, most of them are standardized. +# # +# # To omit or support the external variable "tzname", add one of: +# # -DHAVE_TZNAME=0 # do not support "tzname" +# # -DHAVE_TZNAME=1 # support "tzname", which is defined by system library +# # -DHAVE_TZNAME=2 # support and define "tzname" - # # to the "CFLAGS=" line. "tzname" is required by POSIX 1988 and later. ++# # to the "CFLAGS=" line. "tzname" is required by POSIX.1-1988 and later. +# # If not defined, the code attempts to guess HAVE_TZNAME from other macros. +# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause +# # crashes when combined with some platforms' standard libraries, +# # presumably due to memory allocation issues. +# # +# # To omit or support the external variables "timezone" and "daylight", add +# # -DUSG_COMPAT=0 # do not support +# # -DUSG_COMPAT=1 # support, and variables are defined by system library +# # -DUSG_COMPAT=2 # support and define variables - # # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by - # # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later. ++# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by Unix ++# # Systems Group code and are required by POSIX.1-2008 and later (with XSI). +# # If not defined, the code attempts to guess USG_COMPAT from other macros. +# # +# # To support the external variable "altzone", add +# # -DALTZONE=0 # do not support +# # -DALTZONE=1 # support "altzone", which is defined by system library +# # -DALTZONE=2 # support and define "altzone" +# # to the end of the "CFLAGS=" line; although "altzone" appeared in +# # System V Release 3.1 it has not been standardized. +# # If not defined, the code attempts to guess ALTZONE from other macros. +# +# If you want functions that were inspired by early versions of X3J11's work, +# add +# -DSTD_INSPIRED +# to the end of the "CFLAGS=" line. This arranges for the following +# functions to be added to the time conversion library. +# "offtime" is like "gmtime" except that it accepts a second (long) argument +# that gives an offset to add to the time_t when converting it. +# I.e., "offtime" is like calling "localtime_rz" with a fixed-offset zone. +# "timelocal" is nearly equivalent to "mktime". +# "timeoff" is like "timegm" except that it accepts a second (long) argument +# that gives an offset to use when converting to a time_t. +# I.e., "timeoff" is like calling "mktime_z" with a fixed-offset zone. +# "posix2time" and "time2posix" are described in an included manual page. +# X3J11's work does not describe any of these functions. +# These functions may well disappear in future releases of the time +# conversion package. +# +# If you don't want functions that were inspired by NetBSD, add +# -DNETBSD_INSPIRED=0 +# to the end of the "CFLAGS=" line. Otherwise, the functions +# "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the +# time library, and if STD_INSPIRED is also defined to nonzero the functions +# "posix2time_z" and "time2posix_z" are added as well. +# The functions ending in "_z" (or "_rz") are like their unsuffixed +# (or suffixed-by-"_r") counterparts, except with an extra first +# argument of opaque type timezone_t that specifies the timezone. +# "tzalloc" allocates a timezone_t value, and "tzfree" frees it. +# +# If you want to allocate state structures in localtime, add +# -DALL_STATE +# to the end of the "CFLAGS=" line. Storage is obtained by calling malloc. +# +# NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put +# out by the National Institute of Standards and Technology +# which claims to test C and POSIX conformance. If you want to pass PCTS, add +# -DPCTS +# to the end of the "CFLAGS=" line. +# +# If you want strict compliance with XPG4 as of 1994-04-09, add +# -DXPG4_1994_04_09 +# to the end of the "CFLAGS=" line. This causes "strftime" to always return +# 53 as a week number (rather than 52 or 53) for January days before +# January's first Monday when a "%V" format is used and January 1 +# falls on a Friday, Saturday, or Sunday. +# +# POSIX says CFLAGS defaults to "-O 1". +# Uncomment the following line and edit its contents as needed. + +#CFLAGS= -O 1 + + +# The name of a POSIX-like library archiver, its flags, C compiler, +# linker flags, and 'make' utility. Ordinarily the defaults suffice. - # The commented-out values are the defaults specified by POSIX 202x/D3. ++# The commented-out values are the defaults specified by POSIX.1-202x/D4. +#AR = ar +#ARFLAGS = -rv +#CC = c17 +#LDFLAGS = +#MAKE = make + +# For leap seconds, this Makefile uses LEAPSECONDS='-L leapseconds' in +# submake command lines. The default is no leap seconds. + +LEAPSECONDS= + ++# Where to fetch leap-seconds.list from. ++leaplist_URI = \ ++ https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list ++# The file is generated by the IERS Earth Orientation Centre, in Paris. ++leaplist_TZ = Europe/Paris ++ +# The zic command and its arguments. + +zic= ./zic +ZIC= $(zic) $(ZFLAGS) + +# To shrink the size of installed TZif files, +# append "-r @N" to omit data before N-seconds-after-the-Epoch. +# To grow the files and work around bugs in older applications, +# possibly at the expense of introducing bugs in newer ones, +# append "-b fat"; see ZIC_BLOAT_DEFAULT above. +# See the zic man page for more about -b and -r. +ZFLAGS= + +# How to use zic to install TZif files. + +ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS) + +# The name of a POSIX-compliant 'awk' on your system. +# mawk 1.3.3 and Solaris 10 /usr/bin/awk do not work. +# Also, it is better (though not essential) if 'awk' supports UTF-8, +# and unfortunately mawk and busybox awk do not support UTF-8. +# Try AWK=gawk or AWK=nawk if your awk has the abovementioned problems. +AWK= awk + +# The full path name of a POSIX-compliant shell, preferably one that supports +# the Korn shell's 'select' statement as an extension. +# These days, Bash is the most popular. +# It should be OK to set this to /bin/sh, on platforms where /bin/sh +# lacks 'select' or doesn't completely conform to POSIX, but /bin/bash +# is typically nicer if it works. +KSHELL= /bin/bash + - # Name of curl , used for HTML validation. ++# Name of curl , used for HTML validation ++# and to fetch leap-seconds.list from upstream. +CURL= curl + +# Name of GNU Privacy Guard , used to sign distributions. +GPG= gpg + +# This expensive test requires USE_LTZ. +# To suppress it, define this macro to be empty. +CHECK_TIME_T_ALTERNATIVES = check_time_t_alternatives + +# SAFE_CHAR is a regular expression that matches a safe character. +# Some parts of this distribution are limited to safe characters; +# others can use any UTF-8 character. +# For now, the safe characters are a safe subset of ASCII. +# The caller must set the shell variable 'sharp' to the character '#', +# since Makefile macros cannot contain '#'. +# TAB_CHAR is a single tab character, in single quotes. +TAB_CHAR= ' ' +SAFE_CHARSET1= $(TAB_CHAR)' !\"'$$sharp'$$%&'\''()*+,./0123456789:;<=>?@' +SAFE_CHARSET2= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\^_`' +SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' +SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) +SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' + +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ +# Non-ASCII non-letters that OK_CHAR allows, as these characters are +# useful in commentary. +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) + +# Put this in a bracket expression to match spaces. +s = [:space:] + +# OK_CHAR matches any character allowed in the distributed files. +# This is the same as SAFE_CHAR, except that UNUSUAL_OK_CHARSET and +# multibyte letters are also allowed so that commentary can contain a +# few safe symbols and people's names and can quote non-English sources. +# Other non-letters are limited to ASCII renderings for the +# convenience of maintainers using XEmacs 21.5.34, which by default +# mishandles Unicode characters U+0100 and greater. +OK_CHAR= '[][:alpha:]$(UNUSUAL_OK_CHARSET)'$(SAFE_CHARSET)'-]' + +# SAFE_LINE matches a line of safe characters. +# SAFE_SHARP_LINE is similar, except any OK character can follow '#'; +# this is so that comments can contain non-ASCII characters. +# OK_LINE matches a line of OK characters. +SAFE_LINE= '^'$(SAFE_CHAR)'*$$' +SAFE_SHARP_LINE='^'$(SAFE_CHAR)'*('$$sharp$(OK_CHAR)'*)?$$' +OK_LINE= '^'$(OK_CHAR)'*$$' + +# Flags to give 'tar' when making a distribution. +# Try to use flags appropriate for GNU tar. +GNUTARFLAGS= --format=pax --pax-option='delete=atime,delete=ctime' \ + --numeric-owner --owner=0 --group=0 \ + --mode=go+u,go-w --sort=name +TARFLAGS= `if tar $(GNUTARFLAGS) --version >/dev/null 2>&1; \ + then echo $(GNUTARFLAGS); \ + else :; \ + fi` + +# Flags to give 'gzip' when making a distribution. +GZIPFLAGS= -9n + +# When comparing .tzs files, use GNU diff's -F'^TZ=' option if supported. +# This makes it easier to see which Zone has been affected. +DIFF_TZS= diff -u$$(! diff -u -F'^TZ=' - - <>/dev/null >&0 2>&1 \ + || echo ' -F^TZ=') + +# ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. +RANLIB= : + +# POSIX prohibits defining or using SHELL. However, csh users on systems +# that use the user shell for Makefile commands may need to define SHELL. +#SHELL= /bin/sh + +# End of macros that one plausibly might want to tailor. +############################################################################### + + +TZCOBJS= zic.o +TZDOBJS= zdump.o localtime.o asctime.o strftime.o +DATEOBJS= date.o localtime.o strftime.o asctime.o +LIBSRCS= localtime.c asctime.c difftime.c strftime.c +LIBOBJS= localtime.o asctime.o difftime.o strftime.o +HEADERS= tzfile.h private.h +NONLIBSRCS= zic.c zdump.c +NEWUCBSRCS= date.c +SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \ + tzselect.ksh workman.sh +MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \ + tzfile.5 tzselect.8 zic.8 zdump.8 +MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \ + time2posix.3.txt \ + tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \ + date.1.txt +COMMON= calendars CONTRIBUTING LICENSE Makefile \ + NEWS README SECURITY theory.html version +WEB_PAGES= tz-art.html tz-how-to.html tz-link.html +CHECK_WEB_PAGES=check_theory.html check_tz-art.html \ + check_tz-how-to.html check_tz-link.html +DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES) +PRIMARY_YDATA= africa antarctica asia australasia \ + europe northamerica southamerica +YDATA= $(PRIMARY_YDATA) etcetera +NDATA= factory +TDATA_TO_CHECK= $(YDATA) $(NDATA) backward +TDATA= $(YDATA) $(NDATA) $(BACKWARD) +ZONETABLES= zone.tab zone1970.tab zonenow.tab +TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) +LEAP_DEPS= leapseconds.awk leap-seconds.list +TZDATA_ZI_DEPS= ziguard.awk zishrink.awk version $(TDATA) \ + $(PACKRATDATA) $(PACKRATLIST) +DSTDATA_ZI_DEPS= ziguard.awk $(TDATA) $(PACKRATDATA) $(PACKRATLIST) +DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ + leapseconds $(ZONETABLES) +AWK_SCRIPTS= checklinks.awk checknow.awk checktab.awk leapseconds.awk \ + ziguard.awk zishrink.awk +MISC= $(AWK_SCRIPTS) +TZS_YEAR= 2050 +TZS_CUTOFF_FLAG= -c $(TZS_YEAR) +TZS= to$(TZS_YEAR).tzs +TZS_NEW= to$(TZS_YEAR)new.tzs +TZS_DEPS= $(YDATA) asctime.c localtime.c \ + private.h tzfile.h zdump.c zic.c +TZDATA_DIST = $(COMMON) $(DATA) $(MISC) +# EIGHT_YARDS is just a yard short of the whole ENCHILADA. +EIGHT_YARDS = $(TZDATA_DIST) $(DOCS) $(SOURCES) tzdata.zi +ENCHILADA = $(EIGHT_YARDS) $(TZS) + +# Consult these files when deciding whether to rebuild the 'version' file. +# This list is not the same as the output of 'git ls-files', since +# .gitignore is not distributed. +VERSION_DEPS= \ + calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \ + africa antarctica asctime.c asia australasia \ + backward backzone \ + checklinks.awk checknow.awk checktab.awk \ + date.1 date.c difftime.c \ + etcetera europe factory iso3166.tab \ + leap-seconds.list leapseconds.awk localtime.c \ + newctime.3 newstrftime.3 newtzset.3 northamerica \ + private.h southamerica strftime.c theory.html \ + time2posix.3 tz-art.html tz-how-to.html tz-link.html \ + tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ + workman.sh zdump.8 zdump.c zic.8 zic.c \ + ziguard.awk zishrink.awk \ + zone.tab zone1970.tab zonenow.tab + +all: tzselect zic zdump libtz.a $(TABDATA) \ + vanguard.zi main.zi rearguard.zi + +ALL: all date $(ENCHILADA) + +install: all $(DATA) $(REDO) $(MANS) + mkdir -p '$(DESTDIR)$(BINDIR)' \ + '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \ + '$(DESTDIR)$(LIBDIR)' \ + '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \ + '$(DESTDIR)$(MANDIR)/man8' + $(ZIC_INSTALL) -l $(LOCALTIME) \ + `case '$(POSIXRULES)' in ?*) echo '-p';; esac \ + ` $(POSIXRULES) \ + -t '$(DESTDIR)$(TZDEFAULT)' + cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.' + cp tzselect '$(DESTDIR)$(BINDIR)/.' + cp zdump '$(DESTDIR)$(ZDUMPDIR)/.' + cp zic '$(DESTDIR)$(ZICDIR)/.' + cp libtz.a '$(DESTDIR)$(LIBDIR)/.' + $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a' + cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.' + cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.' + cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.' + +INSTALL: ALL install date.1 + mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' + cp date '$(DESTDIR)$(BINDIR)/.' + cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.' + +# Calculate version number from git, if available. +# Otherwise, use $(VERSION) unless it is "unknown" and there is already +# a 'version' file, in which case reuse the existing 'version' contents +# and append "-dirty" if the contents do not already end in "-dirty". +version: $(VERSION_DEPS) + { (type git) >/dev/null 2>&1 && \ + V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ + --abbrev=7 --dirty` || \ + if test '$(VERSION)' = unknown && V=`cat $@`; then \ + case $$V in *-dirty);; *) V=$$V-dirty;; esac; \ + else \ + V='$(VERSION)'; \ + fi; } && \ + printf '%s\n' "$$V" >$@.out + mv $@.out $@ + +# These files can be tailored by setting BACKWARD, PACKRATDATA, PACKRATLIST. +vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS) + $(AWK) \ + -v DATAFORM=`expr $@ : '\(.*\).zi'` \ + -v PACKRATDATA='$(PACKRATDATA)' \ + -v PACKRATLIST='$(PACKRATLIST)' \ + -f ziguard.awk \ + $(TDATA) $(PACKRATDATA) >$@.out + mv $@.out $@ +# This file has a version comment that attempts to capture any tailoring +# via BACKWARD, DATAFORM, PACKRATDATA, PACKRATLIST, and REDO. +tzdata.zi: $(DATAFORM).zi version zishrink.awk + version=`sed 1q version` && \ + LC_ALL=C $(AWK) \ + -v dataform='$(DATAFORM)' \ + -v deps='$(DSTDATA_ZI_DEPS) zishrink.awk' \ + -v redo='$(REDO)' \ + -v version="$$version" \ + -f zishrink.awk \ + $(DATAFORM).zi >$@.out + mv $@.out $@ + +tzdir.h: + printf '%s\n' >$@.out \ + '#ifndef TZDEFAULT' \ + '# define TZDEFAULT "$(TZDEFAULT)" /* default zone */' \ + '#endif' \ + '#ifndef TZDIR' \ + '# define TZDIR "$(TZDIR)" /* TZif directory */' \ + '#endif' + mv $@.out $@ + +version.h: version + VERSION=`cat version` && printf '%s\n' \ + 'static char const PKGVERSION[]="($(PACKAGE)) ";' \ + "static char const TZVERSION[]=\"$$VERSION\";" \ + 'static char const REPORT_BUGS_TO[]="$(BUGEMAIL)";' \ + >$@.out + mv $@.out $@ + +zdump: $(TZDOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) + +zic: $(TZCOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) + +leapseconds: $(LEAP_DEPS) + $(AWK) -v EXPIRES_LINE=$(EXPIRES_LINE) \ + -f leapseconds.awk leap-seconds.list >$@.out + mv $@.out $@ + ++# Awk script to extract a Git-style author from leap-seconds.list comments. ++EXTRACT_AUTHOR = \ ++ author_line { sub(/^.[[:space:]]*/, ""); \ ++ sub(/:[[:space:]]*/, " <"); \ ++ printf "%s>\n", $$0; \ ++ success = 1; \ ++ exit \ ++ } \ ++ /Questions or comments to:/ { author_line = 1 } \ ++ END { exit !success } ++ ++# Fetch leap-seconds.list from upstream. ++fetch-leap-seconds.list: ++ $(CURL) -OR $(leaplist_URI) ++ ++# Fetch leap-seconds.list from upstream and commit it to the local repository. ++commit-leap-seconds.list: fetch-leap-seconds.list ++ author=$$($(AWK) '$(EXTRACT_AUTHOR)' leap-seconds.list) && \ ++ date=$$(TZ=$(leaplist_TZ) stat -c%y leap-seconds.list) && \ ++ git commit --author="$$author" --date="$$date" -m'make $@' \ ++ leap-seconds.list ++ +# Arguments to pass to submakes of install_data. +# They can be overridden by later submake arguments. +INSTALLARGS = \ + BACKWARD='$(BACKWARD)' \ + DESTDIR='$(DESTDIR)' \ + LEAPSECONDS='$(LEAPSECONDS)' \ + PACKRATDATA='$(PACKRATDATA)' \ + PACKRATLIST='$(PACKRATLIST)' \ + TZDEFAULT='$(TZDEFAULT)' \ + TZDIR='$(TZDIR)' \ + ZIC='$(ZIC)' + +INSTALL_DATA_DEPS = zic leapseconds tzdata.zi + +# 'make install_data' installs one set of TZif files. +install_data: $(INSTALL_DATA_DEPS) + $(ZIC_INSTALL) tzdata.zi + +posix_only: $(INSTALL_DATA_DEPS) + $(MAKE) $(INSTALLARGS) LEAPSECONDS= install_data + +right_only: $(INSTALL_DATA_DEPS) + $(MAKE) $(INSTALLARGS) LEAPSECONDS='-L leapseconds' \ + install_data + +# In earlier versions of this makefile, the other two directories were +# subdirectories of $(TZDIR). However, this led to configuration errors. +# For example, with posix_right under the earlier scheme, +# TZ='right/Australia/Adelaide' got you localtime with leap seconds, +# but gmtime without leap seconds, which led to problems with applications +# like sendmail that subtract gmtime from localtime. +# Therefore, the other two directories are now siblings of $(TZDIR). +# You must replace all of $(TZDIR) to switch from not using leap seconds +# to using them, or vice versa. +right_posix: right_only + rm -fr '$(DESTDIR)$(TZDIR)-leaps' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + +posix_right: posix_only + rm -fr '$(DESTDIR)$(TZDIR)-posix' + ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \ + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only + $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only + +zones: $(REDO) + +# dummy.zd is not a real file; it is mentioned here only so that the +# top-level 'make' does not have a syntax error. +ZDS = dummy.zd +# Rule used only by submakes invoked by the $(TZS_NEW) rule. +# It is separate so that GNU 'make -j' can run instances in parallel. +$(ZDS): zdump + ./zdump -i $(TZS_CUTOFF_FLAG) '$(wd)/'$$(expr $@ : '\(.*\).zd') \ + >$@ + +TZS_NEW_DEPS = tzdata.zi zdump zic +$(TZS_NEW): $(TZS_NEW_DEPS) + rm -fr tzs$(TZS_YEAR).dir + mkdir tzs$(TZS_YEAR).dir + $(zic) -d tzs$(TZS_YEAR).dir tzdata.zi + $(AWK) '/^L/{print "Link\t" $$2 "\t" $$3}' \ + tzdata.zi | LC_ALL=C sort >$@.out + wd=`pwd` && \ + x=`$(AWK) '/^Z/{print "tzs$(TZS_YEAR).dir/" $$2 ".zd"}' \ + tzdata.zi \ + | LC_ALL=C sort -t . -k 2,2` && \ + set x $$x && \ + shift && \ + ZDS=$$* && \ + $(MAKE) wd="$$wd" TZS_CUTOFF_FLAG="$(TZS_CUTOFF_FLAG)" \ + ZDS="$$ZDS" $$ZDS && \ + sed 's,^TZ=".*\.dir/,TZ=",' $$ZDS >>$@.out + rm -fr tzs$(TZS_YEAR).dir + mv $@.out $@ + +# If $(TZS) exists but 'make check_tzs' fails, a maintainer should inspect the +# failed output and fix the inconsistency, perhaps by running 'make force_tzs'. +$(TZS): + touch $@ + +force_tzs: $(TZS_NEW) + cp $(TZS_NEW) $(TZS) + +libtz.a: $(LIBOBJS) + rm -f $@ + $(AR) $(ARFLAGS) $@ $(LIBOBJS) + $(RANLIB) $@ + +date: $(DATEOBJS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(DATEOBJS) $(LDLIBS) + +tzselect: tzselect.ksh version + VERSION=`cat version` && sed \ + -e "s'#!/bin/bash'#!"'$(KSHELL)'\' \ + -e s\''\(AWK\)=[^}]*'\''\1=\'\''$(AWK)\'\'\' \ + -e s\''\(PKGVERSION\)=.*'\''\1=\'\''($(PACKAGE)) \'\'\' \ + -e s\''\(REPORT_BUGS_TO\)=.*'\''\1=\'\''$(BUGEMAIL)\'\'\' \ + -e s\''\(TZDIR\)=[^}]*'\''\1=\'\''$(TZDIR)\'\'\' \ + -e s\''\(TZVERSION\)=.*'\''\1=\'"'$$VERSION\\''" \ + <$@.ksh >$@.out + chmod +x $@.out + mv $@.out $@ + +check: check_back check_mild +check_mild: check_character_set check_white_space check_links \ + check_name_lengths check_now \ + check_slashed_abbrs check_sorted \ + check_tables check_web check_ziguard check_zishrink check_tzs + +# True if UTF8_LOCALE does not work; +# otherwise, false but with LC_ALL set to $(UTF8_LOCALE). +UTF8_LOCALE_MISSING = \ + { test ! '$(UTF8_LOCALE)' \ + || ! printf 'A\304\200B\n' \ + | LC_ALL='$(UTF8_LOCALE)' grep -q '^A.B$$' >/dev/null 2>&1 \ + || { LC_ALL='$(UTF8_LOCALE)'; export LC_ALL; false; }; } + +check_character_set: $(ENCHILADA) + $(UTF8_LOCALE_MISSING) || { \ + sharp='#' && \ + ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ + $(MISC) $(SOURCES) $(WEB_PAGES) \ + CONTRIBUTING LICENSE README SECURITY \ + version tzdata.zi && \ + ! grep -Env $(SAFE_LINE)'|^UNUSUAL_OK_'$(OK_CHAR)'*$$' \ + Makefile && \ + ! grep -Env $(SAFE_SHARP_LINE) $(TDATA_TO_CHECK) backzone \ + leapseconds zone.tab && \ + ! grep -Env $(OK_LINE) $(ENCHILADA); \ + } + touch $@ + +check_white_space: $(ENCHILADA) + $(UTF8_LOCALE_MISSING) || { \ + patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \ + ! grep -En "$$pat|[$s]\$$" \ + $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list); \ + } + touch $@ + +PRECEDES_FILE_NAME = ^(Zone|Link[$s]+[^$s]+)[$s]+ +FILE_NAME_COMPONENT_TOO_LONG = $(PRECEDES_FILE_NAME)[^$s]*[^/$s]{15} + +check_name_lengths: $(TDATA_TO_CHECK) backzone + ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \ + $(TDATA_TO_CHECK) backzone + touch $@ + +PRECEDES_STDOFF = ^(Zone[$s]+[^$s]+)?[$s]+ +STDOFF = [-+]?[0-9:.]+ +RULELESS_SAVE = (-|$(STDOFF)[sd]?) +RULELESS_SLASHED_ABBRS = \ + $(PRECEDES_STDOFF)$(STDOFF)[$s]+$(RULELESS_SAVE)[$s]+[^$s]*/ + +check_slashed_abbrs: $(TDATA_TO_CHECK) + ! grep -En '$(RULELESS_SLASHED_ABBRS)' $(TDATA_TO_CHECK) + touch $@ + +CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } + +check_sorted: backward backzone + $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ + backward | LC_ALL=C sort -cu + $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu + touch $@ + +check_back: checklinks.awk $(TDATA_TO_CHECK) + $(AWK) \ + -v DATAFORM=$(DATAFORM) \ + -v backcheck=backward \ + -f checklinks.awk $(TDATA_TO_CHECK) + touch $@ + +check_links: checklinks.awk tzdata.zi + $(AWK) \ + -v DATAFORM=$(DATAFORM) \ + -f checklinks.awk tzdata.zi + touch $@ + +# Check timestamps from now through 28 years from now, to make sure +# that zonenow.tab contains all sequences of planned timestamps, +# without any duplicate sequences. In theory this might require *** 428 LINES SKIPPED *** From nobody Fri Feb 2 05:54:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR4jv16sNz59VTS; Fri, 2 Feb 2024 05:54: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 4TR4jv0NSqz4T3g; Fri, 2 Feb 2024 05:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706853299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BeaSOlzcxADdm/4bMX1SocEY4P2EFttgv+IjV5xHl/A=; b=L0HL4BnmsECDEJPRqfq5WEcA/JRcuweDONH2imR67rcKtbwk32vFQLL/uPH5uuu7BoTXZq c6jZh1NqstIvdPIwdwGiD6nAxvmDq+N7V7CjM5UafOnPtW6LWuexYyagPA2kVASDDOow8U h8vQvYB4nDvsKQ9r8Q0Pl0hkliB8aLg644AKAF8Inq5SW/IVExyhOp/INKO3I5ScHAyI3i YKNgGIipNnz9xmkfNbiFtzYY5VuIcGyn/7rjd38dok2b5ur6OeSjjOpaHkGF121TVgXEiB 0OVpmKFypKs0SydxwcAgd7EWBJJA+ZINGdyv+iA8d8ymS4mZli4X5/0yiiRbtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706853299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BeaSOlzcxADdm/4bMX1SocEY4P2EFttgv+IjV5xHl/A=; b=V6nY1raDRLzgN+RSul5OtWcHWQSape70i0jtIaLc5ST/B5dXDSGfXCNXIn1fcKgPgEALS8 564cFk05M3/l+ZvGFUthjACgJOB7inJq/aX9ui8SmWwn1JLPwM7+jZ8T8JAD1n5HtwnHVk kRc9a9HqJF7gS2W/S34nJZUZJoyIkqUGUYbCx2YeHIgquCm53tfwQjk2TxJEW1CjuVRKs1 gf573QBxg1ixYftE3F2IMf75igvxezeMD4C2GbkaBeYO+e5zidptZrXw519NsHXOmNUXcT 2bMXKbIyPR6jQp3RqzGoxxXto33MAOaM02yA9r7w5wEcXuAOVVHkrvREw7le8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706853299; a=rsa-sha256; cv=none; b=utzcZ7YB3Na9Z+Wg9WC/MFMBDzGpiHz4afNrhiuDwYmI5hJzdQ8GpY+GhK8g65KQnKoFvn GJZzPVcQN4POBdjJcsj8+h2abp+ruZcG8doWCXVoxTovq9EICCpvcFUlKBcSqINeklITWq lLsI7B1fZFdS0PjeUu+oQ1npvQzeb93ID3G3DBi2NAyH8jCEaAh65XGRxH4GdXV1hg2l3h gsKNUfA0WpggIjvl7Rg8a2f28iKCT7YxFyCen/7zVVgrHGMTqDeqDxyU09AiWVPLGalLfc bcDYgO4Ncfe1joHrIiz9Pt7vR+3c8pjv28OMRO2tdwGYJHtdVvBKcydLLr4BiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR4jt6XPBzJRy; Fri, 2 Feb 2024 05:54: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 4125sw5b027783; Fri, 2 Feb 2024 05:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4125swEG027780; Fri, 2 Feb 2024 05:54:58 GMT (envelope-from git) Date: Fri, 2 Feb 2024 05:54:58 GMT Message-Id: <202402020554.4125swEG027780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0949b237bb90 - main - checkstyle9.pl: Add --github to output for github workflows List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0949b237bb901255cc418498b91edfe497131579 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0949b237bb901255cc418498b91edfe497131579 commit 0949b237bb901255cc418498b91edfe497131579 Author: Warner Losh AuthorDate: 2024-02-02 05:50:19 +0000 Commit: Warner Losh CommitDate: 2024-02-02 05:50:19 +0000 checkstyle9.pl: Add --github to output for github workflows If you add "::error file=foo/bar.c:line=123:" before the error message, it will appear inline. Sponsored by: Netflix --- tools/build/checkstyle9.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 8b30baa10fc9..8fe9b9f94da1 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -25,6 +25,7 @@ my $chk_patch = undef; my $chk_branch = undef; my $tst_only; my $emacs = 0; +my $github = 0; my $terse = 0; my $file = undef; my $color = "auto"; @@ -91,6 +92,7 @@ GetOptions( 'patch!' => \$chk_patch, 'branch!' => \$chk_branch, 'emacs!' => \$emacs, + 'github!' => \$github, 'terse!' => \$terse, 'f|file!' => \$file, 'strict!' => \$no_warnings, @@ -1395,6 +1397,8 @@ sub process { #make up the handle for any error we report on this line $prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$linenr: " if ($emacs && !$file); + $prefix = "::error file=$filename:line=$realline:\:" if ($github && $file); + $prefix = "::error file=$realfile:line=$linenr:\:" if ($github && !$file); $here = "#$linenr: " if (!$file); $here = "#$realline: " if ($file); From nobody Fri Feb 2 05:55:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR4jw2cXfz59VWn; Fri, 2 Feb 2024 05:55: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 4TR4jw1bT4z4TMT; Fri, 2 Feb 2024 05:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706853300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZ2LQ331nD/3Je63h4KzW7TKUAGIHEizIOQziZdu+UI=; b=JXVuzrYZ8bYvgN9QUvbhwALPC5LVQabhIBtKd5thfnzkNqtKN/oIYdlSfzh/kboGIFfT2C WAASHi/UKgcpKiM4Fh0LuvWjcUXDcJKmLPEqbh0PdAN983sHegjqYI3payalj1dccik/4N UFd+LGA8BswOx2iMRndTFgz5suKGYBK1N1H2SaAMnaCs0X3gcCR6Hug+etlPcgkWk8fYb6 Kix/w00ygoaY1dm22CilHEzR3auFuya8BvSDWqcv3OCSxKBsSakXat25bsbUVUoXZ/aGC2 wfOjTiuADFxpwztRFS/E1+SB1+1dzxO9tuD5qH0wxuiLOTZOVqOxsuymQIExhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706853300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PZ2LQ331nD/3Je63h4KzW7TKUAGIHEizIOQziZdu+UI=; b=GZLgbvmndsNaawboYULcO97b5z8dKbC8f1gR3WN7eJQAn/mNAIWPSSOH8FiyTSIMB499ug ddiEzEEYZ/qK1+ahfdO5OkzG/t138h+KIujjdSpnFxQxGNMAAXQDqGpY+selGi/djR26ZU LxpvZyHqW5EQGEmeBYium1JcvrWVfb/L91Lh62Mj/Idf1lwck2KzrHZcFERIIYYpMVZWx5 Qd3t1S3BITKFphUum2aoePB54I/5ZOpt/veRjOhCe8spEU++fOoSJrzfaQUVxwsvabpMRV cJCQeGDR4YI8D4rKYBkj/DkRFadJrhJDs7RIDbhpFJiIsftsQEt5ymMq5jvUnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706853300; a=rsa-sha256; cv=none; b=uxiJkRmL4IMHLL7lPjLoNVfEkOKwi2kCPeKWtkLMf0Ie/+C34Q5GC/vZ1JZ2bEhnf+KrQb B5sgn5ySyth3hgxL1o+XSeqHThDEO04hbWD4DP2ityn91I3hUKUNCB12Ty8d9PZXa/0TfH nRbLJqiy6E5Pk0Xyl/f4JMfZuDsHqGQkkma9lQGSSTMzfjJFYPCanyVAsy2wcOYzXAXCVM wFB2XCmF8t+Ah1EOyKHFHu65f3qUzDwUgnlCLntAg9jVDW+6AqRy63PLNhLg9EtfpNwfmT qJ0rel5jErJMrhajpdTnlLwqhl97rbvt48Hi58o/e1EbwRF27iZ1hHvI9kCRyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR4jw0hnRzJTT; Fri, 2 Feb 2024 05:55: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 4125t0sZ027838; Fri, 2 Feb 2024 05:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4125t0Gn027829; Fri, 2 Feb 2024 05:55:00 GMT (envelope-from git) Date: Fri, 2 Feb 2024 05:55:00 GMT Message-Id: <202402020555.4125t0Gn027829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 33326dd5f5ed - main - github: Enable github workflow output from checkstyle9.pl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33326dd5f5ed1585e370ecd5210f03e56cb3f634 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33326dd5f5ed1585e370ecd5210f03e56cb3f634 commit 33326dd5f5ed1585e370ecd5210f03e56cb3f634 Author: Warner Losh AuthorDate: 2024-02-02 05:53:58 +0000 Commit: Warner Losh CommitDate: 2024-02-02 05:53:58 +0000 github: Enable github workflow output from checkstyle9.pl Let's see if we can get the style issues flagged inline. Sponsored by: Netflix --- .github/workflows/style.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 8860a24fe594..08d4242df5ed 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -31,4 +31,4 @@ jobs: - name: Run checker run: | sha=$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) - tools/build/checkstyle9.pl ${sha}..${{ github.event.pull_request.head.sha }} + tools/build/checkstyle9.pl --github ${sha}..${{ github.event.pull_request.head.sha }} From nobody Fri Feb 2 06:16:16 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR5BS2ssJz59X6B; Fri, 2 Feb 2024 06:16: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 4TR5BS24R4z4WlF; Fri, 2 Feb 2024 06:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706854576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CAiu5QIIZGml7mqQtHsqGrfyvpG37pHdqR2jL8kDT8=; b=P9AJLt3zSqGZ2In4ThkOsUs0NlS5HDZNbMCJG+VY2/rWNVpgbu2CQTVp3w7t87DTw1z/xt Xk7RnzwvsccBJ9JQZ3RKk3razDxjiR7x/W4YLNGt2nwthq+J9R7kbiGVUJIQC2ePW1PUkk UsVJKYR5l8xUYvc/DOcU/ncrdxuug6iGzQVw01DnaHUhkfY3Xmk0LW3M4+z4hIJPbMrFJi +mE/1j0i8fNpy8RJX64qkzpmEMjvKb3f/+QVqpa91AXOE9FF1rH8DrqRJvPU5rD0RIXaop KVgRM+9yv1MJnGyW9znHV4P+9TR9/fLewHT0Lohy5LxaZWGYyMx9O0Wk35JJEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706854576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CAiu5QIIZGml7mqQtHsqGrfyvpG37pHdqR2jL8kDT8=; b=iPdrj5MJUozZwHLjgZntsm3BI1zuU4o3n+5PmorilKe1K7rR9EhoHGzpGoExeNaiYX7IwG r33BgQ6feXwUdKJv2RFDM6OM84zF4dDhb++jegnpU4i8XFS9qTzek+VTtNOJz6irg6rQ68 TWHu00s6U6DfygbFYK45qcIi1Kxa9ygcPtjGcfnXYb7Z8qRvv9KFqw629eI6vt28PByQfE FyZODnKH0LcmOBZ6kq4GjzqgWCKdZg/PMEyThFPUsbb2txYQGjSkTT8nNT0z+Chm944S1F Z6furWc2lgI/5O8X+pU9m+sLRSJNVxFfYM/ZsFemKWjYcuyJmj8Upn/caGH8JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706854576; a=rsa-sha256; cv=none; b=HKQL2Gthv/ccVDE2vKvBN6JITT73K5JeDvF18buvNYUZGhtdl/wa5WQLMA1cflP/s+ZlYj 6Q5aho8r3AkSuGCrDTTA5DnB44PJ5QAoj81LQvNsUCIyNWARTERyIxyZ7Z6cPT8qUtMHOX FlEZtPKOE65fn7M3lNl+3f60PFmNYiKerr3G7mQc2E8HcdJ7IWeZ4QVXNR3dG7owbnN5Vo Cbc2yXJ6AqpC7+15XGGQxBw3tSMzYJwb5ArQ85lCrx6qC8A6X14Y1QYnr0b/K+Kr/SPl/D LxVEyR89zWKvlXG9qO/F2z5ck0aXAEr0wjlqGdGNqgzUV0UKDLrh29pVwq/B9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR5BS185SzK9F; Fri, 2 Feb 2024 06:16: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 4126GG2K061308; Fri, 2 Feb 2024 06:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4126GGKl061306; Fri, 2 Feb 2024 06:16:16 GMT (envelope-from git) Date: Fri, 2 Feb 2024 06:16:16 GMT Message-Id: <202402020616.4126GGKl061306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c2f5306c64e7 - main - checkstyle9.pl: Correct github output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2f5306c64e7e44390c6f21179d696bfdea3260b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c2f5306c64e7e44390c6f21179d696bfdea3260b commit c2f5306c64e7e44390c6f21179d696bfdea3260b Author: Warner Losh AuthorDate: 2024-02-02 06:15:13 +0000 Commit: Warner Losh CommitDate: 2024-02-02 06:15:13 +0000 checkstyle9.pl: Correct github output Change the : between file and line to a ,. This should fix this... Sponsored by: Netflix --- tools/build/checkstyle9.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 8fe9b9f94da1..65f13bc1e7f2 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1175,12 +1175,13 @@ sub report { } my $output = ''; - $output .= BOLD if $color; + my $do_color = $color && !$github; + $output .= BOLD if $do_color; $output .= $prefix; - $output .= RED if $color && $level eq 'ERROR'; - $output .= MAGENTA if $color && $level eq 'WARNING'; - $output .= $level . ':'; - $output .= RESET if $color; + $output .= RED if $do_color && $level eq 'ERROR'; + $output .= MAGENTA if $do_color && $level eq 'WARNING'; + $output .= $level . ':' if !$github; + $output .= RESET if $do_color; $output .= ' ' . $msg . "\n"; $output = (split('\n', $output))[0] . "\n" if ($terse); @@ -1397,8 +1398,8 @@ sub process { #make up the handle for any error we report on this line $prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$linenr: " if ($emacs && !$file); - $prefix = "::error file=$filename:line=$realline:\:" if ($github && $file); - $prefix = "::error file=$realfile:line=$linenr:\:" if ($github && !$file); + $prefix = "::error file=$filename,line=$realline:\:" if ($github && $file); + $prefix = "::error file=$realfile,line=$linenr:\:" if ($github && !$file); $here = "#$linenr: " if (!$file); $here = "#$realline: " if ($file); From nobody Fri Feb 2 06:27:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR5Rf74skz584Rn; Fri, 2 Feb 2024 06:27: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 4TR5Rf6Xstz4Xb2; Fri, 2 Feb 2024 06:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706855262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3I4aDyQID8WEySTMB+PNEZu62xMdnK+rZHIhlhWxHI=; b=K7LTBwujukRxHSQPG2cU/FUn1vziePX9YxzXNlSVFQAscY09VJOUiBmiLBNVKGfOfqhUSi zXALj5HTTWZDGrJL459bsu4gSVLOxfD/uMjhqTeDgA6lhnBFrS3zS7ANAwpkkGkuZq5Khn 4XqYPy8HdHgxxpgN9AKoNt/idPbEgnoc0XYIqKMEjyYs6coBoqTpBmepIOTGA/B2VY8FU/ dFeyoB20Hqb7Q9/kyvhhBRjULJhpQg+iwnTt67667vznUhysBDsi1xK1Q5mi8TZFzNMuk6 LjXwfX7HQBRnszdt7SsbioiIAqLh+1mBI0oZq1t2E4DzDynMpYsXejQSHfBGZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706855262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j3I4aDyQID8WEySTMB+PNEZu62xMdnK+rZHIhlhWxHI=; b=dSk3H2XwFaHVLR78E/z2OvKY3ED1AeieXEgO+Eu5Ny0eskw2ZwxD7cYQfcxOl2OJvJfQ1Y iGldlhmph0l3hGvC1cuyCz5fwNBW5Kx+lipBm8SMMgHYvb6ROzcdFJ8bf6xb0ITp5u7T7Y pC550ZsssxgyFaabG/SyO9rZX8Tc1qllrRctn+f9tPaTYukxCl2uH9ZmkoQyMgn7eg61Y6 ic/f08wchdLHUJQvGU8b9KrIiQ+19xEAFh5DrnAwU+Y6++ZiMOOcrJXwNNi26Jyft63PFB gwQh4SDm0WHDEj4sj4d38DEZff4273p61ziPA7Hg0KNdr8fyFtDI3w1wNzHjZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706855262; a=rsa-sha256; cv=none; b=N7all9jSHGWAGhETEau77t5JKyisbz66uDgnAooXg0T1XGE4Vyv0lfFulWG7knbrZgQDFq xHNf1OAb1eKDnNjp7Uj6JdjnTVo/EkIh5ZHDGQDlCE+MkmgQ/Zkz3jkAYbsrfyWzDcomhL NJkdKnjSWkRZ611a+jlP8biwxHrppd+vkw4OpASC+4gqNW6NPgBEZtQ++RncXcTSIHJeOd oqHsFrZiTatgKuUUaesScsF9T+lymVNX6uoGlWMSxRttc5rRTySIsBsXhyyXvHFsiPOXkc vv4K5/u/4yHUIj1KKH1f07os9rlBfC2qx5M1Dgt2cvjGSfcvTgyaCD0x8lxe1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR5Rf5fYxzJyt; Fri, 2 Feb 2024 06:27: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 4126Rgbt078583; Fri, 2 Feb 2024 06:27:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4126Rgw8078580; Fri, 2 Feb 2024 06:27:42 GMT (envelope-from git) Date: Fri, 2 Feb 2024 06:27:42 GMT Message-Id: <202402020627.4126Rgw8078580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ac9abe93e832 - main - checkstyle9.pl: Another correction to github workflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac9abe93e83293cb19827a1e6cd898ff40410f47 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac9abe93e83293cb19827a1e6cd898ff40410f47 commit ac9abe93e83293cb19827a1e6cd898ff40410f47 Author: Warner Losh AuthorDate: 2024-02-02 06:26:38 +0000 Commit: Warner Losh CommitDate: 2024-02-02 06:27:37 +0000 checkstyle9.pl: Another correction to github workflow Remove extra space... Sponsored by: Netflix --- tools/build/checkstyle9.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index 65f13bc1e7f2..dd6eb624e0b4 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1182,7 +1182,8 @@ sub report { $output .= MAGENTA if $do_color && $level eq 'WARNING'; $output .= $level . ':' if !$github; $output .= RESET if $do_color; - $output .= ' ' . $msg . "\n"; + $output .= ' ' if (!$github); + $output .= $msg . "\n"; $output = (split('\n', $output))[0] . "\n" if ($terse); From nobody Fri Feb 2 07:25:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TR6k64Mq0z588wq; Fri, 2 Feb 2024 07:25: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 4TR6k63r30z4cHP; Fri, 2 Feb 2024 07:25:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706858718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WLR6en52YG5+Knl4Cx0qR8xQGNVOrEeBE0gJuLedBtA=; b=NfB6VE0JJZNHwkT/cfCzqpjxPvnyxvsL7+TjiUXKoy1KjxTxCdClcnmhki07u6rp5oC+H4 sRUAWmZAamln6AIgrAt6yfkqUh5pQgQ9wXhWOzZCNxU4cHgmf6Tp49Z/eWGVRoGppYN0y/ tOi3ecsaVlS/DWUB0koWMzgqTu4UF7VyS6HniJftodGoUlELsuGh+jOWQ4lepSo0XAuK0a eDWsyYUAWXYwjCP5E1Ykoasa0YGTQOF4Fo4c4jf9ew8qWXOD9lMcHLhGo62O/Ysm7OQtzT EVi6o8sApkbbckC5Acv6nVNyr+6NdSAW/daFIW1pFdiF5fyMSGnWZ+AYHRpLlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706858718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WLR6en52YG5+Knl4Cx0qR8xQGNVOrEeBE0gJuLedBtA=; b=XYJRxGaQKisJPOXqBBqHfVNAJhoZOzPIVtHOLy69IO1GcyzOWTA5g9Fg5jAO+vTji7Lyji vSxMzAr6ua5BQLnWYhrn6XAvVSnAwwppw7eK1mekzru+H07keyX2D5G4todysx6bWb3lL7 DpzB/vnzwSlQW0wl2T2w2wUu483B5fmZRy6UzWV9jfexaJwiV8KVo8Ysz+R0M/FaZA/w8B 26RhkztQGdR1gEGDzx1UvxHvMZvx4G1hY8iNrTtjErPGV5n+/fUqqYUPHHN/sQ7Az1Hy98 yi/nMLThjqoIbZirHAUa/3ADezmvzgEbcRDpA7eOHTZzda8+/LZLK0U1xXhMZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706858718; a=rsa-sha256; cv=none; b=IAdVZIa7Qpa4kXxAtZUoDYRl0TV53k61KYSET9AwXCn/tpStTuG8ISwFZsCTQdHQzYp4O5 TNw021n7iV8lnlqwxKUkutgV7g462FYLmJu/zjtfIz7Z8iJXlsIb07uEZ3pBf5NDE5IQlz F6cOyxaCd2mEZUUreH2LEuTthq4gVOZ6tphVGbyWuUTOTN/c6/7qHaHlXZKe6p5w8wfHHB PQGpuGHobqiCmYi/UFMQH/AQDju5VJXGOq8eCdiAxpcUuR5LYMI8uw7bgoyg1crUi1ninr Tqm+8MPLr6iFZqiO66q474Ht6GJUu4NhcE6C//D5Gp7sJYeQfIcG6qjEnVNIPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TR6k62w8fzLf4; Fri, 2 Feb 2024 07:25: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 4127PIVx078945; Fri, 2 Feb 2024 07:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4127PIqb078942; Fri, 2 Feb 2024 07:25:18 GMT (envelope-from git) Date: Fri, 2 Feb 2024 07:25:18 GMT Message-Id: <202402020725.4127PIqb078942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 22d12caad69e - main - checkstyle9.pl: Differentiate errors and warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22d12caad69ef2d8e1c76671b44fd5493490acb7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=22d12caad69ef2d8e1c76671b44fd5493490acb7 commit 22d12caad69ef2d8e1c76671b44fd5493490acb7 Author: Warner Losh AuthorDate: 2024-02-02 07:23:43 +0000 Commit: Warner Losh CommitDate: 2024-02-02 07:24:32 +0000 checkstyle9.pl: Differentiate errors and warnings Use ::error and ::warning as appropriate to give better meaning to the messages. Sponsored by: Netflix --- tools/build/checkstyle9.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl index dd6eb624e0b4..df9ec2bbd7c1 100755 --- a/tools/build/checkstyle9.pl +++ b/tools/build/checkstyle9.pl @@ -1177,6 +1177,8 @@ sub report { my $output = ''; my $do_color = $color && !$github; $output .= BOLD if $do_color; + $output .= "::error " if $github && $level eq 'ERROR'; + $output .= "::warning " if $github && $level eq 'WARNING'; $output .= $prefix; $output .= RED if $do_color && $level eq 'ERROR'; $output .= MAGENTA if $do_color && $level eq 'WARNING'; @@ -1399,8 +1401,8 @@ sub process { #make up the handle for any error we report on this line $prefix = "$filename:$realline: " if ($emacs && $file); $prefix = "$filename:$linenr: " if ($emacs && !$file); - $prefix = "::error file=$filename,line=$realline:\:" if ($github && $file); - $prefix = "::error file=$realfile,line=$linenr:\:" if ($github && !$file); + $prefix = "file=$filename,line=$realline:\:" if ($github && $file); + $prefix = "file=$realfile,line=$realline:\:" if ($github && !$file); $here = "#$linenr: " if (!$file); $here = "#$realline: " if ($file); From nobody Fri Feb 2 10:41:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRC490pFKz58Th3; Fri, 2 Feb 2024 10:41: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 4TRC490FZwz4s8V; Fri, 2 Feb 2024 10:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706870473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq6RLAOElvkXo7fQ3U6OAg/j3k4iL2smK96+cwhKoEs=; b=vrer2PQozpkV8t5vkGlK1HdJvvXExzzW81Eb60OWftOomR+umILVASEXejE0o0zfdROoXN lLRJ58oyzQ/Z0Zo2GmwyNae8QTh5eKUdhHB+WPM8YXgfMuCtgmEpRzAKeNnWL1Ao6MRRzY I838zUxsqL4NFxVE67HDPbisF4FJSGBtm4kWcneasx2OVgib08fErXjdCu33jCKWoOljo9 sSHp+pYyhuR55GgvZ5EhJM6fvXLP9TJpqFiXvlI5ScVqrcbm1xg5BhtiD5xvVZal7wZDxa KBZLMtY6U386BuKqPkKUYyUHamtyqqD9I76iCcSsV2Yu+NrY5GwmEaDVaP5zQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706870473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pq6RLAOElvkXo7fQ3U6OAg/j3k4iL2smK96+cwhKoEs=; b=V/rljJ4zNoQMtpeKStDWm4/aM87dIRcZVmraeU2LXZ8nQ2ORdWPTexJ2Tt7AZUrY6N+ZHs pR6rQClA4uPwkDf0WArqhAsraJwmOR/3Vxzwl7FL0JbFgnupGzDgnEoZs8HOx1QCzbS+sc SWe797Jdqk/QNcqDPkIRxoR/Z0BLdRSOXxNdoCuHljy/wh3xlbIArQpgTzGKEOBsHXGucB MamzUSkNEPs2z7Y8pRhT7YeJJJgJiDpruvjQgNJgRCd0kviVJN185ofvW/Jji1havJ/dc7 ul2sYTHA3EMlcNQuF4C8//wSr0sWeXHOnMP4Kef+Vkza+O2WiI8e4N5d4k0sbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706870473; a=rsa-sha256; cv=none; b=S1VnhFv8Pa+Y+3I9WhpgTHphKuZwq2KKnF1wV5/s0vfeS+JjYQ8j2BOqdIXkzGu1EkdWQG Qv1eX5TxetLWcbMra/rPbuhMW922Uo6q44S7DMulH1YWoL8GRGlI6gIpLLNFltmrPi2u7Y Ewmpt4wrBmdZrPq5+jp12pPBG1yPwOhciBYHM/bE6RKQCQ7ImkZuYe3uaQK6rvfqzOz5DA D9ZT/l7MgVyG8OC7aIwOnAicCUSoWzZpW5rtGfZi/FyE2K383v/kWcZYjjfdBN+b/ouD72 xERkn4Qgeox1QhBKCNNQbfpN6VMQprRm6XIZiNS21oPR1upOMat6CYuXJrkWVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRC486QSSzRcK; Fri, 2 Feb 2024 10:41: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 412AfCFe007177; Fri, 2 Feb 2024 10:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412AfCLk007174; Fri, 2 Feb 2024 10:41:12 GMT (envelope-from git) Date: Fri, 2 Feb 2024 10:41:12 GMT Message-Id: <202402021041.412AfCLk007174@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: 9bbe06b004e2 - main - Revert "pkgbase: Create a FreeBSD-dtb package" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bbe06b004e2cadb55a3792c77991ee640bf0f52 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=9bbe06b004e2cadb55a3792c77991ee640bf0f52 commit 9bbe06b004e2cadb55a3792c77991ee640bf0f52 Author: Emmanuel Vadot AuthorDate: 2024-02-02 10:39:51 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-02 10:39:51 +0000 Revert "pkgbase: Create a FreeBSD-dtb package" Somehow this doesn't work iwth make packages due to some kind of a race. The package is first created correctly but later in the process it is overwritten by a badly created empty package. Revert in the mean time so we can have working pkgbase on arm/arm64 This reverts commit a5afd7920d50ff23f91bdbabb1f0fd7ba028ba9e. --- Makefile.inc1 | 28 +--------------------------- release/packages/dtb.ucl | 16 ---------------- release/scripts/mtree-to-plist.awk | 20 ++++++-------------- 3 files changed, 7 insertions(+), 57 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7a9917fd8a74..1e86cda657dd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2178,35 +2178,9 @@ _default_flavor= -default . if ${MK_DEBUG_FILES} != "no" _debug=-dbg . endif - -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 ; \ - awk -F\" ' \ - /name/ { printf("===> Creating %s-", $$2); next } \ - /version/ {print $$2; next } ' \ - ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ - ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ - -o OSVERSION="${SRCRELDATE}" \ - create -f ${PKG_FORMAT} \ - -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ - -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ - -r ${KSTAGEDIR}/${DISTDIR} \ - -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \ - fi - create-kernel-packages: .PHONY . for flavor in "" ${_debug} -create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package +create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ diff --git a/release/packages/dtb.ucl b/release/packages/dtb.ucl deleted file mode 100644 index e4717b9054a2..000000000000 --- a/release/packages/dtb.ucl +++ /dev/null @@ -1,16 +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 = [ BSD2CLAUSE ] -desc = <; Fri, 2 Feb 2024 11:45:53 +0000 (UTC) (envelope-from info@eprofile.info) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRDVm5tpRz3xp2 for ; Fri, 2 Feb 2024 11:45:52 +0000 (UTC) (envelope-from info@eprofile.info) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=eprofile-info.20230601.gappssmtp.com header.s=20230601 header.b=DHjqvIaP; dmarc=none; spf=none (mx1.freebsd.org: domain of info@eprofile.info has no SPF policy when checking 2607:f8b0:4864:20::736) smtp.mailfrom=info@eprofile.info Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-783da8920e5so129118285a.1 for ; Fri, 02 Feb 2024 03:45:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eprofile-info.20230601.gappssmtp.com; s=20230601; t=1706874351; x=1707479151; darn=freebsd.org; h=message-id:date:reply-to:mime-version:to:subject:from:from:to:cc :subject:date:message-id:reply-to; bh=0ysxxebmN3nSnKgXRnhb+BB6nXSt8Rjxh6DCsO6jj6o=; b=DHjqvIaPt3JgrRYtszzsDvt6rSaxx9NAczzrlt2Zu7SOlc2opbTETqU0pE7+hs/sKe +iJNFP+S1P/0VcnyXP4/sHcQdfkJHcygpzm1uLBg2YSVlyHwF5ehyA4DIggZgAKLednf Ga0S8wDP/gnAzAG0hssSeJTLuNHy/BGhC7YfpsxTLofVwh2c0vaHAbRAKRQlhQC+Yohb KvAoKtjHx9VhRFdpG7iK6LIQBJ7HbgqiKVOMLoVKBI/GgDPAdrRTXuOwBM2cHtpkGLdv uzYrLNEkfHZ2WVfHDjMlJcw+NrGyPJINxyzN7/asmKGyi+LVqc+chceEPgVUR7vrSM+2 3zug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706874351; x=1707479151; h=message-id:date:reply-to:mime-version:to:subject:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0ysxxebmN3nSnKgXRnhb+BB6nXSt8Rjxh6DCsO6jj6o=; b=OBhwbpf2Ctib4piyFZ7t4M0zn3bI//aYYEDEFsc57qkY2juZwljQv6PgqKl2Xp9ro8 WNiGgIEZWJbaPOeaoQ8sZfpJe8b4/y5us118WVcj/BSMpt7YQOJlhNFs1DCxrFqHVCgG JAXM6y7nm4a9cYPRUf01JrE89zC/eP89OCrtmGw0R21MikC/HS3GuiJN/wBtf46utWxN nufm+WXaL443SgeGYiTbX63/eAkAtOMtohM++nMg3E1BlMarKXa6sQnm5AkKRTbHiRmg 99K6kmgfgG2h+iuUT0NCfCBinFVSdkOup5bJeegSNtCAGcVB6070L7k1Vd4iVZZyQcIS 8FNg== X-Gm-Message-State: AOJu0Yz55ySy8x+ectFUsN95dbGZjlFL9hs1P3JSY+ycDXqsDHIebfMU Mr8u4NAT87n0kQB9eo0bGLgDwEyAYr3vg8mL9WroiFjZeG90G6xZLbjgGRlQAz2d0SyHIbZH3RP SwW85WGx/ X-Google-Smtp-Source: AGHT+IH64j6we2G+3xAYzplFEeMLJ7ay0yy9uJm8GPOuhDApVgLc4FE9qOxz83sEohnKBZuiTW2bag== X-Received: by 2002:a05:690c:d8d:b0:5f1:2dcc:fe5e with SMTP id da13-20020a05690c0d8d00b005f12dccfe5emr2336970ywb.46.1706873909399; Fri, 02 Feb 2024 03:38:29 -0800 (PST) Received: from SFHVDALROEJUXPQ ([63.133.220.172]) by smtp.gmail.com with ESMTPSA id cr16-20020a05622a429000b003f6ac526568sm738166qtb.39.2024.02.02.03.38.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2024 03:38:29 -0800 (PST) From: "Luis Martinez" Subject: Re: DUE CLAIMS, TREAT URGENTLY. To: Content-Type: multipart/alternative; boundary="l6oJbw8Lq47=_9Ca2Ni5hjqqRLbxj0Q3yk" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Reply-To: Date: Fri, 2 Feb 2024 03:38:29 -0800 Message-Id: <202402020338280AB7F69A4E-CF78119B84@eprofile.info> X-Spamd-Bar: +++ X-Spamd-Result: default: False [3.74 / 15.00]; SUBJ_ALL_CAPS(2.03)[27]; INTRODUCTION(2.00)[]; THREAD_HIJACKING_FROM_INJECTOR(2.00)[]; FAKE_REPLY(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.985]; R_DKIM_ALLOW(-0.20)[eprofile-info.20230601.gappssmtp.com:s=20230601]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; GREYLIST(0.00)[pass,body]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_REPLYTO(0.00)[gmail.com]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[eprofile.info]; ARC_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::736:from]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[eprofile-info.20230601.gappssmtp.com:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MISSING_XM_UA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_REPLYTO(0.00)[luismartinezmfcorp72001@gmail.com] X-Rspamd-Queue-Id: 4TRDVm5tpRz3xp2 This is a multi-part message in MIME format --l6oJbw8Lq47=_9Ca2Ni5hjqqRLbxj0Q3yk Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Dear Friend, (UNCLAIMED EXPENSIVE DIAMOND WRIST WATCHES, GOLD ITEMS & US$ 6,850,000= ) My name is Luis Martinez, former Safe Deposit Vault Manager at now clo= sed Mossack Fonseca Investment Corporation with offices in Panama, Zur= ich Switzerland, Paris, Florida, New York USA and London UK. During my work years at Mossack Fonseca, I supervised many offshore in= vestments and safe deposits for foreign investors who invested and dep= osited their wealth in secret investments and deposits at Mossack Fons= eca Investments and Safe Deposit Corporation. One of the investors that deposited her Diamonds, Gold items and cash = deposit of US$6,850,000 in Safe Deposit Vault at Mossack Fonseca has l= ong died in the Caribbean Island of Martinique while on vacation and t= he Diamonds, Gold and cash she kept with the company for Safe Keep are= yet to be claimed because she has passed on and left no contact detai= ls of any extended family or representative to claim the Diamonds, Gol= d and Cash. I want to present you to Mossack Fonseca Payment Officials as her Heir= Next of Kin Representative so that you can claim these items for us t= o share it accordingly. I have the original copies of the Safe Deposit= Documents which will be required to release the personal items to you= as her heir representative to claim them. All I need from you is maxi= mum secrecy and cooperation while I present you as her representative = so that we can successfully claim the items since I have the original = copies of the safe keeping documents. However, due to series of issues relating to Tax, Mossack Fonseca was = directed by the United States Government and European Union Government= s to stop operations and close their offices and ensure that all inves= ted and deposits at the company are processed and paid out to the resp= ective investors or their heir next of kin representatives (where the = investor has died). The Corporation Payment Officials and their Banker= s, UBS Bank are paying out all funds and deposits as directed. These items will be shipped to your address as soon as we commence the= claim process because I have the original copies of the Deposit Docum= ents which they will require to approve and process the claim. You can read more about Mossack Fonseca via below links: https://www.icij.org/investigations/panama-papers/new-panama-papers-le= ak-reveals-mossack-fonsecas-chaotic-scramble/ List of people named in the Panama Papers - Panama Papers I shall give you further details as you reply. I therefore await your reply to enable us to commence the claim proces= s. Regards, Luis Martinez --l6oJbw8Lq47=_9Ca2Ni5hjqqRLbxj0Q3yk Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable <= META name=3D"format-detection" content=3D"telephone=3Dno"> Re: = DUE CLAIMS, TREAT URGENTLY.

Dear Friend,

(UNCLAIMED EXPENSIVE DIAMOND WRIST WATCHES, GOLD = ITEMS & US$ 6,850,000)

My name is Lu= is Martinez, former Safe Deposit Vault Manager at now closed Mossack F= onseca Investment Corporation with offices in Panama, Zurich Switzerla= nd, Paris, Florida, New York USA and London UK.

During my work years at Mossack Fonseca, I supervised many off= shore investments and safe deposits for foreign investors who invested= and deposited their wealth in secret investments and deposits at Moss= ack Fonseca Investments and Safe Deposit Corporation.

One of the investors that deposited her Diamonds, Gold i= tems and cash deposit of US$6,850,000 in Safe Deposit Vault at Mossack= Fonseca has long died in the Caribbean Island of Martinique while on = vacation and the Diamonds, Gold and cash she kept with the company for= Safe Keep are yet to be claimed because she has passed on and left no= contact details of any extended family or representative to claim the= Diamonds, Gold and Cash.

I want to pres= ent you to Mossack Fonseca Payment Officials as her Heir Next of Kin R= epresentative so that you can claim these items for us to share it acc= ordingly. I have the original copies of the Safe Deposit Documents whi= ch will be required to release the personal items to you as her heir r= epresentative to claim them. All I need from you is maximum secrecy an= d cooperation while I present you as her representative so that we can= successfully claim the items since I have the original copies of the = safe keeping documents.

However, due to = series of issues relating to Tax, Mossack Fonseca was directed by the = United States Government and European Union Governments to stop operat= ions and close their offices and ensure that all invested and deposits= at the company are processed and paid out to the respective investors= or their heir next of kin representatives (where the investor has die= d). The Corporation Payment Officials and their Bankers, UBS Bank are = paying out all funds and deposits as directed.

These items will be shipped to your address as soon as we comme= nce the claim process because I have the original copies of the Deposi= t Documents which they will require to approve and process the claim.<= /FONT>

You can read more about Mossack Fonseca = via below links:
https://www.icij.org/investigations/pa= nama-papers/new-panama-papers-leak-reveals-mossack-fonsecas-chaotic-sc= ramble/
List of people named in the Pan= ama Papers - Panama Papers
 
I shall give you further detai= ls as you reply.
I therefore await your reply to enable us to comme= nce the claim process.

Regards,

Luis Martinez

--l6oJbw8Lq47=_9Ca2Ni5hjqqRLbxj0Q3yk-- From nobody Fri Feb 2 14:50:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRJbr02bNz58t8x; Fri, 2 Feb 2024 14:50: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 4TRJbq631Xz4HXk; Fri, 2 Feb 2024 14:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706885431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QGrHDpdwxA6QzR/g3K4YrDaofG3kZplDTINTJkGOec=; b=fYSESaWiZeMuHl0vmxJDgfqdJGDAPHiTEIOxSJvu/P7BlXOmUA3SoMDLqIBts1sNbUdvsE 1ZIn+wxs6F7JQ7K2oPjvUSDAKSPXL0LPEEge5ul+7g/1sp1wXshA1lsg+0NfaJ3u5svyXE K9Ic27Nj9r3uYnItczh8f9F9ciFQOTOarhNt9lwEi76tMfvLxN9C498CS3OTK/Sf8LjpUg BjHroKqOOCNslaLUCXFfmWP9Tb7zlxXGokp1GEaJcdZGWi055cS4nSd1vUGOjMlJl+a/Me TVw5oFh9kebENTedf8EgLPH0cl0a7LdyFoRvX7wCbOisgg6KYEZ0PrsBdNshag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706885431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QGrHDpdwxA6QzR/g3K4YrDaofG3kZplDTINTJkGOec=; b=px8W/i09LdDqJCN/7OxZNPV8KvpfgufDz8Tumlvt+X/W1hs4jkQZo1RoF1MWeU0ARX3oCl X71kP9a9KjEhFEuDvhwLrXbbnB8CT8gLdMqKD8fw6dlz8+JWVsmhArEgzDQP5rqzkwItzG hW6CX0vOKI4IXg+gkzxCq59c8BIuuEial1XTk3bbu1Hqw6pP5DDzitjkiiEOxyt5vx9AWF Fod0gVCrXmYmYkUKTeIJyF2pHgBiMuVGROpvbePsSn6VSRnPOcWi0BMiXf2b+8MaDUZl9j 1nu81C61vVpARPtUTG9U8HeOh/vBXsDhrlbkETj6rObfKDTwiV3Pka2fscX8QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706885431; a=rsa-sha256; cv=none; b=xjRieyNzeMdw+/lRGabxXMMbg+cES/iLe1682CudeC32U8AggeS1dR7fNzseOvo4n+6/X5 WQ7BO2rfcUtniLTorC6Azrv8ZHEOM2PX95rpsa4LptQyuK5chATXPNzy0DSX2tnG3f8+T6 1FavqBTujjeDZFq80M70LF0VdgryPTJp/9oDyZ1drFI5iUq8zB9qUhXGBXziZOLcqL5Zds qgm/uL+1IT2qr1ij3iW72t+t9YAag+kc/LsJIAFrABRUQ5iUrhShgyG0rNljS05nISdElI JotWhUk0tVP3BztlT7K7ETDS4bsWjDuRnAAU613F9sWL99Oi6btgKtSaeu+oXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRJbq56Yxzb2V; Fri, 2 Feb 2024 14:50: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 412EoVIL026294; Fri, 2 Feb 2024 14:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412EoVO5026291; Fri, 2 Feb 2024 14:50:31 GMT (envelope-from git) Date: Fri, 2 Feb 2024 14:50:31 GMT Message-Id: <202402021450.412EoVO5026291@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: e7951d0b04e6 - main - rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7951d0b04e6464b37264b8166b1e9ce368a9f1d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e7951d0b04e6464b37264b8166b1e9ce368a9f1d commit e7951d0b04e6464b37264b8166b1e9ce368a9f1d Author: Mark Johnston AuthorDate: 2024-02-01 22:43:05 +0000 Commit: Mark Johnston CommitDate: 2024-02-02 14:39:54 +0000 rtld-elf: Avoid unnecessary lock_restart_for_upgrade() calls In order to atomically upgrade the rtld bind lock, load_filtees() may trigger a longjmp back to _rtld_bind() so that the binding can be done with the write lock held. However, the write lock is only needed when filtee objects haven't already been loaded, so move the lock_restart_for_upgrade() call to avoid unnecessary lock upgrades when a filtee is defined. Reviewed by: kib Tested by: brooks MFC after: 1 week Sponsored by: Innovate UK --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 2c4111cc457a..24abc4580f53 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2583,8 +2583,8 @@ static void load_filtees(Obj_Entry *obj, int flags, RtldLockState *lockstate) { - lock_restart_for_upgrade(lockstate); if (!obj->filtees_loaded) { + lock_restart_for_upgrade(lockstate); load_filtee1(obj, obj->needed_filtees, flags, lockstate); load_filtee1(obj, obj->needed_aux_filtees, flags, lockstate); obj->filtees_loaded = true; From nobody Fri Feb 2 15:27:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRKQg05KTz58xVB; Fri, 2 Feb 2024 15:27: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 4TRKQf65DXz4MCq; Fri, 2 Feb 2024 15:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGMyPZSyc6Z4MapJmqiLvGevW8Bhoi/+eKBA9HJwvY0=; b=PGeeCoZAs5bXw9wPAXikjJfT3lpShjdb4RLXyxV4oOp55ZHVMq3BWNLQfWPXzmnn+g7ky/ 6Le3F9pYig/20yWVhnIN8/05IwvnjPZE+kq7r9P17GGszYULyLgPOyAv7MMRlWojzlie5v v/TTpjxA5uE6BvC1Y/gJYRrAjOIIigrhVsaY/1j7a4mkRnr8DPuo/1u1hab2bFk7zkzwvH d8U0OaANR/0gLSW8RDqYnjwd8ostzn5AHWQ2mF1XpPWE2jnoNKd8vd+UlLs3lnuq/l9oq3 rWcNOpcLs2lOtDjIp4UOhO63aLGy0u3jvGAR86EZ7r9Dit+9ICYZM4rhKttuyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGMyPZSyc6Z4MapJmqiLvGevW8Bhoi/+eKBA9HJwvY0=; b=tYDwWM2SaGyt3qQLdN7qthOOnskQynpa2A1DeeoQkPxr9VgUzyAnDWyUxRSOa8Tu74iaRb l/eaht5dua2ECTy8JWznOaTAT28Hhrj4eZWxoVaDaMZp8XM7QzghP8uKPYmqaoLbTZ3v+g sYKEOa480H/Wsa5TCW9pF2sv4OgKyFWhzcp+5//OK9Qp06C2dbVTX8L3FmwyZpWddOjyuo o21+ElVnQWFP+ltyRwrsi27btANu54OqD/OCCUHKVuHOK/of8BLIZJRRiTn2Daoz3UhkCe VxpQ1uP1WMuiQuQ6opHqxT7EiJUcqqO9Tpr+aIzT/2XRj+/Dy7vs/PrkOrcj7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706887658; a=rsa-sha256; cv=none; b=YDx7AxwQ3hBWncvKGxUT+n0tnWO3w55Nxt6GHWndb8O/2eyfYX9DGcDJdcfIAiLyG5seqf Fe7ZXnGhFSmzSM/8YPbzfCrLgSytcYW94FIpN1GSsNkTQFLVqx/8z/xEsV33I48aJvL1SS 54iS6w8foe6JB0cWQgrQnSQChXI7DiFKejmd+JqpIxIntkRz/5FOA/m0z1a9JI2d76dke4 K1apU4ZTIVkORSOXc9xJqvjfc1vrpdKX8BqYr95GT2Zd5jfrOF9CrCi2CKLQkDRc1zLDdc 58vXgxGivn5R0HRz0fmJ+dCnv9eIHdZ46l3mMGbmMUc1YVbduEu3jg8RnipDMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRKQf57tgzc4k; Fri, 2 Feb 2024 15:27: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 412FRcF7084405; Fri, 2 Feb 2024 15:27:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412FRcai084402; Fri, 2 Feb 2024 15:27:38 GMT (envelope-from git) Date: Fri, 2 Feb 2024 15:27:38 GMT Message-Id: <202402021527.412FRcai084402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7edb49a1152e - main - freebsd-tips: freebsd-update fetch, then install List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7edb49a1152eb7c70a0806fabbe7ce3ff0d810a4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7edb49a1152eb7c70a0806fabbe7ce3ff0d810a4 commit 7edb49a1152eb7c70a0806fabbe7ce3ff0d810a4 Author: Graham Perrin AuthorDate: 2024-02-02 15:25:41 +0000 Commit: Warner Losh CommitDate: 2024-02-02 15:25:44 +0000 freebsd-tips: freebsd-update fetch, then install In end of life (EOL) warning cases: freebsd-update fetch install (the two commands, combined) may fetch and patch, but not install. Instead: run the two consecutively. Consistent with installation information in /releases/ areas and with accepted https://reviews.freebsd.org/D42722 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1096 --- usr.bin/fortune/datfiles/freebsd-tips | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips index aed66f2295e2..028a9e9b1430 100644 --- a/usr.bin/fortune/datfiles/freebsd-tips +++ b/usr.bin/fortune/datfiles/freebsd-tips @@ -533,9 +533,10 @@ Run "etcupdate extract" once when your sources match your running system, then r Do you want to do a binary upgrade of your running FreeBSD installation? Use freebsd-update(8). To install updates and patches for the running branch use -# freebsd-update fetch install +# freebsd-update fetch +# freebsd-update install -To upgrade to a newer release use +Then, to upgrade to a newer release use # freebsd-update upgrade -r ${name_of_release} -- Lars Engels From nobody Fri Feb 2 15:31:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRKWF4jy1z58y4h; Fri, 2 Feb 2024 15:31: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 4TRKWF4Xvsz4MZp; Fri, 2 Feb 2024 15:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=omFXdm8/M7Ko/P1ncdwJJL4k2rySYtuo7MuB8kA8Mik=; b=KG23BIONWJBIHNW7oXwAjTEKw8b5PK8bGo97TZJgATIE4wuhEUaGrV9qd+QsJ/h5l19aSq C2UN4N5ry71n3MYJpFWjrIIuIhchm3FrFL3hWO3s0455wyNc00jH5C6siREDAMnqg3q94H tsq823FrMVuxklXvqQN2Z1g6fZ2SOmxmA7h6FDVc4f9pbwHeQqp7asnAMzRvUvQli/dQev Uw+hKXopHebNaObQWPt9zCOVWA8AcQsOxzj57mtdSqpEL/b/OQv6giM1E450SgC+dTDNP1 espf3BcrI6NqovHPPVElfkv3NudCtu9YJfafAsXhWvAt4xwZJihMV3jlYzSe8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=omFXdm8/M7Ko/P1ncdwJJL4k2rySYtuo7MuB8kA8Mik=; b=jwT+YKq5HYpnI4/ELhq7ccBoEIYX0N62ml7mGSbOXmVe0Pedm02etSieRYhx0eBqWwfhWJ cmZc9tMhTHKVFXtk50NDHU/kFxQM4VAhgHLiXPpwZI7y0Q+Fom7xlmY35vlywG1zpWVZLC DCS4SNUGOKik4Qzxo2kINEbJvbSyDai8nxg6TsCC+e9uzO5IP2S/3FsdTgzRzEZuOdd06Z Gfg4tUCEbEa8pQz4b++P1lYS56WUhK/9ve45swdZf2z73fr2qxePuZeZ100KgNgnmn9gIe DM+LtzaN2hXBFecBFCroXtELozKFaLEGCV4wBVnFF1JYzBYznDjXqF5brMXPxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706887897; a=rsa-sha256; cv=none; b=cmSLTwMRIoAJY/aXYs0wQG+00DJ7ZU8pWj8yzPXYeSoaNar7SVTYp1SooXKr50hk/r3LXy PR0t8utQvzntldpjUfvUQnLwoLJj/cDss01ZO648W92e/ftaUnxWYOHEfOJKBwETb1EY/+ CC3quPBBJAq5eqFv9D8SadEPoZfnF+lChggBEJBd6vgHrQMd5jLMVDQTmZ5J6RmlF4Wchd 3ECWeVW/SzPohPpG0OCdI759JvZcfJ+Ibf6awtQUCFaVjaULCa7aWsjV7T0Nnv3teLYPSB KeS8f4bjKsr6nmFUJTAJG4xKQNguHgzZVqEPFMU67QW5badaBPQLiKLPfiz67g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRKWF3d06zbmC; Fri, 2 Feb 2024 15:31: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 412FVbqv097515; Fri, 2 Feb 2024 15:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412FVbxu097512; Fri, 2 Feb 2024 15:31:37 GMT (envelope-from git) Date: Fri, 2 Feb 2024 15:31:37 GMT Message-Id: <202402021531.412FVbxu097512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4339f1e667ff - main - share/examples/IPv6/USAGE: remove List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4339f1e667ffb6e0ed8626cc1ae1cd92c910bde2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4339f1e667ffb6e0ed8626cc1ae1cd92c910bde2 commit 4339f1e667ffb6e0ed8626cc1ae1cd92c910bde2 Author: Lexi Winter AuthorDate: 2024-02-02 15:29:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 15:30:18 +0000 share/examples/IPv6/USAGE: remove This document dates from the KAME days and, among other things, references the 'prefix' command which has not existed for a long time. Since IPv6 configuration is now documented in the Handbook, remove this obsolete file. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1094 --- share/examples/IPv6/USAGE | 528 ---------------------------------------------- share/examples/Makefile | 4 - 2 files changed, 532 deletions(-) diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE deleted file mode 100644 index 83cfb43595c8..000000000000 --- a/share/examples/IPv6/USAGE +++ /dev/null @@ -1,528 +0,0 @@ - USAGE - KAME Project - $KAME: USAGE,v 1.33 2000/11/22 10:22:57 itojun Exp $ - -This is an introduction of how to use the commands provided in the KAME -kit. For more information, please refer to each man page. - - -<<>> - -A link-local address is automatically assigned to each interface, when -the interface becomes up for the first time. Even if you find an interface -without a link-local address, do not panic. The link-local address will be -assigned when it becomes up (with "ifconfig IF up"). - -If you do not see a link-local address assigned to an interface on "ifconfig -up", the interface does not support IPv6 for some reasons - for example, -if the interface does not support link-layer multicast (IFF_MULTICAST is not -set), the interface cannot be used for IPv6. - -Some network drivers allow an interface to become up even without a -hardware address (for example, PCMCIA network cards). In such cases, it is -possible that an interface has no link-local address even if the -interface is up. If you see such situation, please disable the -interface once and then re-enable it (i.e. do `ifconfig IF down; -ifconfig IF up'). - -Pseudo interfaces (like "gif" tunnel device) will borrow IPv6 -interface identifier (lowermost 64bit of the address) from -EUI64/IEEE802 sources, like ethernet cards. Pseudo interfaces will be -able to get an IPv6 link-local address, if you have other "real" -interface configured beforehand. If you have no EUI64/IEEE802 sources -on the node, we have last-resort code in the kernel, which generates -interface identifier from MD5(hostname). MD5(hostname) may not be suitable -for your usage (for example, if you configure same hostname on both sides of -gif tunnel, you will be doomed), and if so, you may need to configure -link-local address manually. -See RFC2472 for more discussion on how to generate an interface ID for -pseudo interfaces. - -If you have a router announcing Router Advertisement, -global addresses will be assigned automatically. So, neither -"ifconfig" nor "prefix" is necessary for your *host* (non-router node). -(Please refer to "sysctl" section for configuring a host to accept -Router Advertisement.) - -If you want to set up a router, you need to assign global addresses -for two or more interfaces by "ifconfig" or "prefix" (prefix command -is described at next section). -If you want to assign a global address by "ifconfig", don't forget to -specify the "alias" argument to keep the link-local address. - -# ifconfig de0 inet6 3ffe:501:808:1:200:f8ff:fe01:6317 prefixlen 64 alias -# ifconfig de0 -de0: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe01:6317%de0 prefixlen 64 scopeid 0x1 - inet 163.221.202.12 netmask 0xffffff00 broadcast 163.221.202.255 - inet6 3ffe:501:808:1:200:f8ff:fe01:6317 prefixlen 64 - ether 00:00:f8:01:63:17 - media: 100baseTX status: active - -See also "/etc/rc.network6" for actual examples. - -<> - -In the IPv6 architecture, an IPv6 address of an interface can be -generated from a prefix assigned to the interface, and a -link-dependent identifier for the interface. So assigning a full IPv6 -address by ifconfig is not necessary anymore, because user can only -take care of prefix, by letting system take care of interface -identifier. - -The newly added "prefix" command enables user to just assign prefixes -for interfaces, and let your system automatically generate IPv6 -addresses. Prefixes added by the "prefix" command is maintained in -the kernel consistently with prefixes assigned by Router -Advertisement (in case of hosts) and with prefixes assigned by Router -Renumbering (in case of routers). Manual assignment of prefixes or -change of prefix properties take precedence over ones assigned by -Router Advertisement or Router Renumbering. - -prefix command works only on routers. - -If you want to assign a prefix (and consequently address) manually, do -as follows: - -# ifconfig de0 -de0: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe01:6317%de0 prefixlen 64 scopeid 0x1 - inet 163.221.202.12 netmask 0xffffff00 broadcast 163.221.202.255 - ether 00:00:f8:01:63:17 - media: 100baseTX status: active -# prefix de0 3ffe:501:808:1:: -# ifconfig de0 -de0: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe01:6317%de0 prefixlen 64 scopeid 0x1 - inet 163.221.202.12 netmask 0xffffff00 broadcast 163.221.202.255 - inet6 3ffe:501:808:1:200:f8ff:fe01:6317 prefixlen 64 - ether 00:00:f8:01:63:17 - media: 100baseTX status: active - -To check assigned prefix, use the "ndp" command (See description of -ndp command about its usage). - -# ndp -p -3ffe:501:808:1::/64 if=de0 - flags=LA, vltime=2592000, pltime=604800, expire=Never, origin=RR - No advertising router - -The "prefix" command also has node internal prefix renumbering -ability. - -If you have multiple prefixes which have 3ffe:501:808:/48 at the top, -and would like to renumber them to 3ffe:501:4819:/48, then use the -"prefix" command with the "matchpr" argument and the "usepr" argument. - -Suppose that current state of before renumbering as follows: - -# ifconfig de0 -de0: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe01:6317%de0 prefixlen 64 scopeid 0x1 - inet 163.221.202.12 netmask 0xffffff00 broadcast 163.221.202.255 - inet6 3ffe:501:808:1:200:f8ff:fe01:6317 prefixlen 64 - ether 00:00:f8:01:63:17 - media: 100baseTX status: active -# ifconfig de1 -de1: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe55:7011%de1 prefixlen 64 scopeid 0x2 - inet 163.221.203.12 netmask 0xffffff00 broadcast 163.221.203.255 - inet6 3ffe:501:808:2:200:f8ff:fe55:7011 prefixlen 64 - ether 00:00:f8:55:70:11 - media: 100baseTX status: active -# ndp -p -3ffe:501:808:1::/64 if=de0 - flags=LA, vltime=2592000, pltime=604800, expire=Never, origin=RR - No advertising router -3ffe:501:808:2::/64 if=de1 - flags=LA, vltime=2592000, pltime=604800, expire=Never, origin=RR - No advertising router - -Then do as follows: - -# prefix -a matchpr 3ffe:501:808:: mp_len 48 usepr 3ffe:501:4819:: up_uselen 48 change - -If command is successful, prefixes and addresses will be renumbered as -follows. - -# ifconfig de0 -de0: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe01:6317%de0 prefixlen 64 scopeid 0x1 - inet 163.221.202.12 netmask 0xffffff00 broadcast 163.221.202.255 - inet6 3ffe:501:4819:1:200:f8ff:fe01:6317 prefixlen 64 - ether 00:00:f8:01:63:17 - media: 100baseTX status: active -# ifconfig de1 -de1: flags=8843 mtu 1500 - inet6 fe80::200:f8ff:fe55:7011%de0 prefixlen 64 scopeid 0x2 - inet 163.221.203.12 netmask 0xffffff00 broadcast 163.221.203.255 - inet6 3ffe:501:4819:2:200:f8ff:fe55:7011 prefixlen 64 - ether 00:00:f8:55:70:11 - media: 100baseTX status: active -# ndp -p -3ffe:501:4819:1::/64 if=de0 - flags=LA, vltime=2592000, pltime=604800, expire=Never, origin=RR - No advertising router -3ffe:501:4819:2::/64 if=de1 - flags=LA, vltime=2592000, pltime=604800, expire=Never, origin=RR - No advertising router - -See also "/etc/rc.network6" for actual examples. - - -<<>> - -If there is a router announcing Router Advertisement on a subnet, -you need not to add a default route for your host by hand -(Please refer to "sysctl" section to accept Router Advertisement). - -If you want to add a default route manually, do like: - -# route add -inet6 default fe80::200:a2ff:fe0e:7543%ed0 - -"default" means ::/0. In other cases, if "prefixlen" is omitted, 64 -is assumed for "prefixlen" to get along with the aggregatable address. - -Note that, in IPv6, a link-local address should be used as gateway -("fe80::200:a2ff:fe0e:7543%ed0" in the above). If you use global addresses, -ICMPv6 redirect will not work properly. Also note that we use a special form -of link-local address as gateway. See Section 1.3 of IMPLEMENTATION for -more details. -For ease of configuration we recommend you to avoid static routes and run -a routing daemon (route6d for example) instead. - - -<<>> - -Reachability can be checked by "ping6". This "ping6" allows multicast -for its argument. - -% ping6 -n -I ed0 ff02::1 - -PING6(56=40+8+8 bytes) fe80::5254:ff:feda:cb7d --> ff02::1%ed0 -56 bytes from fe80::5254:ff:feda:cb7d%lo0, icmp_seq=0 hlim=64 time=0.25 ms -56 bytes from fe80::2a0:c9ff:fe84:ed6c%ed0, icmp_seq=0 hlim=64 time=1.333 ms(DUP!) -56 bytes from fe80::5254:ff:feda:d161%ed0, icmp_seq=0 hlim=64 time=1.459 ms(DUP!) -56 bytes from fe80::260:97ff:fec2:80bf%ed0, icmp_seq=0 hlim=64 time=1.538 ms(DUP!) -56 bytes from 3ffe:501:4819:2000:5054:ff:fedb:aa46, icmp_seq=0 hlim=255 time=1.615 ms(DUP!) - - -<<>> - -Name resolution is possible by ICMPv6 node information query message. -This is very convenient for link-local addresses whose host name cannot be -resolved by DNS. Specify the "-w" option to "ping6". - -% ping6 -n -I ed0 -w ff02::1 - -64 bytes from fe80::5254:ff:feda:cb7d%lo0: fto.kame.net -67 bytes from fe80::5254:ff:feda:d161%ed0: banana.kame.net -69 bytes from fe80::2a0:c9ff:fe84:ebd9%ed0: paradise.kame.net -66 bytes from fe80::260:8ff:fe8b:447f%ed0: taroh.kame.net -66 bytes from fe80::2a0:c9ff:fe84:ed6c%ed0: ayame.kame.net - - -<<>> - -The route for a target host can be checked by "traceroute6". - -% traceroute6 tokyo.v6.wide.ad.jp - -traceroute to tokyo.v6.wide.ad.jp (3ffe:501:0:401:200:e8ff:fed5:8923), 30 hops max, 12 byte packets - 1 nr60.v6.kame.net 1.239 ms 0.924 ms 0.908 ms - 2 otemachi.v6.wide.ad.jp 28.953 ms 31.451 ms 26.567 ms - 3 tokyo.v6.wide.ad.jp 26.549 ms 26.58 ms 26.186 ms - -If the -l option is specified, both address and name are shown in each line. -% traceroute6 -l tokyo.v6.wide.ad.jp - -traceroute to tokyo.v6.wide.ad.jp (3ffe:501:0:401:200:e8ff:fed5:8923), 30 hops max, 12 byte packets - 1 nr60.v6.kame.net (3ffe:501:4819:2000:260:97ff:fec2:80bf) 1.23 ms 0.952 ms 0.92 ms - 2 otemachi.v6.wide.ad.jp (3ffe:501:0:1802:260:97ff:feb6:7ff0) 27.345 ms 26.706 ms 26.563 ms - 3 tokyo.v6.wide.ad.jp (3ffe:501:0:401:200:e8ff:fed5:8923) 26.329 ms 26.36 ms 28.63 ms - - -<<>> - -To display the current Neighbor cache, use "ndp": - -% ndp -a -Neighbor Linklayer Address Netif Expire St Flgs Prbs -nr60.v6.kame.net 0:60:97:c2:80:bf ed0 expired S R -3ffe:501:4819:2000:2c0:cff:fe 0:c0:c:10:3a:53 ed0 permanent R -paradise.v6.kame.net 52:54:0:dc:52:17 ed0 expired S R -fe80::200:eff:fe49:f929%ed0 0:0:e:49:f9:29 ed0 expired S R -fe80::200:86ff:fe05:80da%ed0 0:0:86:5:80:da ed0 expired S -fe80::200:86ff:fe05:c2d8%ed0 0:0:86:5:c2:d8 ed0 9s R - -To flush all of the NDP cache entries, execute the following as root. - -# ndp -c - -To display the prefix list: - -% ndp -p -3ffe:501:4819:2000::/64 if=ed0 - flags=LA, vltime=2592000, pltime=604800, expire=29d23h59m58s, origin=RA - advertised by - fe80::5254:ff:fedc:5217%ed0 (reachable) - fe80::260:97ff:fec2:80bf%ed0 (reachable) - fe80::200:eff:fe49:f929%ed0 (no neighbor state) - -To display the default router list: - -% ndp -r -fe80::260:97ff:fec2:80bf if=ed0, flags=, expire=29m55s -fe80::5254:ff:fedc:5217 if=ed0, flags=, expire=29m7s -fe80::200:eff:fe49:f929 if=ed0, flags=, expire=28m47s - - -<<>> - -To generate a Router Solicitation message right now to get global -addresses, use "rtsol". - -# ifconfig ef0 -ef0: flags=8863 - link type ether 0:a0:24:ab:83:9b mtu 1500 speed 10Mbps - media 10baseT status active - inet6 fe80::2a0:24ff:feab:839b%ef0 prefixlen 64 scopeid 0x2 -# rtsol ef0 -# ifconfig ef0 -ef0: flags=8863 - link type ether 0:a0:24:ab:83:9b mtu 1500 speed 10Mbps - media 10baseT status active - inet6 fe80::2a0:24ff:feab:839b%ef0 prefixlen 64 scopeid 0x2 - inet6 3ffe:501:4819:2000:2a0:24ff:feab:839b prefixlen 64 - - -<<>> - -rtsold is a daemon version of rtsol. If you run KAME IPv6 on a laptop -computer and frequently move with it, the daemon is useful since it watches -the interface and sends router solicitations when the status of the interface -changes. Note, however, that the feature is disabled by default. Please -add -m option when invocation of rtsold. - -rtsold also supports multiple interfaces. For example, you can -invoke the daemon as follows: - -# rtsold -m ep0 cnw0 - - -<<>> - -To see routing table: - -# netstat -nr -# netstat -nrl - long format with Ref and Use. Note that bsdi4 does not support the - -l option. You should use the -O option instead. - - -<<>> - -If "net.inet6.ip6.accept_rtadv" is 1, Router Advertisement is -accepted. This means that global addresses and default route are -automatically set up. Otherwise, the announcement is rejected. The -default value is 0. To set "net.inet6.ip6.accept_rtadv" to 1, execute -as follows: - -# sysctl net.inet6.ip6.accept_rtadv=1 - - -<<>> - -"gif" interface enables you to perform IPv{4,6} over IPv{4,6} -protocol tunneling. To use this interface, you must specify the -outer IPv{4,6} address by using gifconfig, like: - -# gifconfig gif0 163.221.198.61 163.221.11.21 - -"ifconfig gif0" will configure the address pair used for inner -IPv{4,6} header. - -It is not required to configure inner IPv{4,6} address pair. If -you do not configure inner IPv{4,6} address pair, tunnel link is -considered as un-numbered link and the source address of inner -IPv{4,6} address pair will be borrowed from other interfaces. - -The following example configures un-numbered IPv6-over-IPv4 tunnel: -# gifconfig gif0 10.0.0.1 10.0.0.1 netmask 255.255.255.0 - -The following example configures numbered IPv6-over-IPv4 tunnel: -# gifconfig gif0 10.0.0.1 10.0.0.1 netmask 255.255.255.0 -# ifconfig gif0 inet6 3ffe:501:808:5::1 3ffe:501:808:5::2 prefixlen 64 alias - -IPv6 spec allows you to use point-to-point link without global IPv6 -address assigned to the interface. Routing protocol (such as RIPng) -uses link-local addresses only. If you are to configure IPv6-over-IPv4 -tunnel, you need not to configure an address pair for inner IPv6 -header. We suggest you to use the former example (un-numbered -IPv6-over-IPv4 tunnel) to connect to 6bone for simplicity. - -Note that it is so easy to make an infinite routing loop using gif -interface, if you configure a tunnel using the same protocol family -for inner and outer header (i.e. IPv4-over-IPv4). - -Refer to gifconfig(8) for more details. - - -<<<6to4>>> - -WARNING: malicious party can abuse 6to4 relay routers/sites, read through -internet draft draft-itojun-ipv6-transition-abuse-xx.txt before configuring it. - -"stf" interface enables you to perform 6to4 IPv6-over-IPv4 encapsulation, -as documented in draft-ietf-ngtrans-6to4-06.txt. See stf(4) for details. - - -<<>> - -Inetd supports AF_INET and AF_INET6 sockets, with IPsec policy -configuration support. - -Refer to inetd(8) for more details. - - -<<>> - -IPsec requires fairly complex configuration, so here we show transport -mode only. https://www.kame.net/newsletter/ has more comprehensive -examples. - -Let us setup security association to deploy a secure channel between -HOST A (10.2.3.4) and HOST B (10.6.7.8). Here we show a little -complicated example. From HOST A to HOST B, only old AH is used. -From HOST B to HOST A, new AH and new ESP are combined. - -Now we should choose algorithm to be used corresponding to "AH"/"new -AH"/"ESP"/"new ESP". Please refer to the "setkey" man page to know -algorithm names. Our choice is MD5 for AH, new-HMAC-SHA1 for new AH, -and new-DES-expIV with 8 byte IV for new ESP. - -Key length highly depends on each algorithm. For example, key -length must be equal to 16 bytes for MD5, 20 for new-HMAC-SHA1, -and 8 for new-DES-expIV. Now we choose "MYSECRETMYSECRET", -"KAMEKAMEKAMEKAMEKAME", "PASSWORD", respectively. - -OK, let us assign SPI (Security Parameter Index) for each protocol. -Please note that we need 3 SPIs for this secure channel since three -security headers are produced (one for from HOST A to HOST B, two for -from HOST B to HOST A). Please also note that SPI MUST be greater -than or equal to 256. We choose, 1000, 2000, and 3000, respectively. - - - (1) - HOST A ------> HOST B - - (1)PROTO=AH - ALG=MD5(RFC1826) - KEY=MYSECRETMYSECRET - SPI=1000 - - (2.1) - HOST A <------ HOST B - <------ - (2.2) - - (2.1) - PROTO=AH - ALG=new-HMAC-SHA1(new AH) - KEY=KAMEKAMEKAMEKAMEKAME - SPI=2000 - - (2.2) - PROTO=ESP - ALG=new-DES-expIV(new ESP) - IV length = 8 - KEY=PASSWORD - SPI=3000 - -Now, let us setup security association. Execute "setkey" on both HOST -A and B: - -# setkey -c -add 10.2.3.4 10.6.7.8 ah 1000 -m transport -A keyed-md5 "MYSECRETMYSECRET" ; -add 10.6.7.8 10.2.3.4 ah 2000 -m transport -A hmac-sha1 "KAMEKAMEKAMEKAMEKAME" ; -add 10.6.7.8 10.2.3.4 esp 3000 -m transport -E des-cbc "PASSWORD" ; -^D - -Actually, IPsec communication doesn't process until security policy -entries will be defined. In this case, you must setup each host. - -At A: -# setkey -c -spdadd 10.2.3.4 10.6.7.8 any -P out ipsec - ah/transport/10.2.3.4-10.6.7.8/require ; -^D - -At B: -spdadd 10.6.7.8 10.2.3.4 any -P out ipsec - esp/transport//require - ah/transport//require ; -^D - -To utilize the security associations installed into the kernel, you -must set the socket security level by using setsockopt(). -This is per-application (or per-socket) security. For example, -the "ping" command has the -P option with parameter to enable AH and/or ESP. - -For example: -% ping -P "out ipsec \ - ah/transport//use \ - esp/tunnel/10.0.1.1-10.0.1.2/require" 10.0.2.2 - -If there are proper SAs, this policy specification causes ICMP packet -to be AH transport mode inner ESP tunnel mode like below. - - HOST C -----------> GATEWAY D ----------> HOST E - 10.0.1.1 10.0.1.2 10.0.2.1 10.0.2.2 - | | | | - | ======= ESP ======= | - ==================== AH ================== - - -<<>> - -EDNS0 is defined in RFC2671. With EDNS0, the resolver library can tell DNS -server of its receiving buffer size, and permit DNS server to transmit large -reply packet. EDNS0 is necessary to take advantage of larger minimum MTU -in IPv6. KAME libinet6 includes resolver side support for EDNS0. -Server side support for EDNS0 is included in ISC BIND9. - - query packet with EDNS0 - tells receive buffer size -KAME box -----------------------------> BIND9 DNS server -KAME box <----------------------------- BIND9 DNS server - can transmit jumbo reply, since DNS server - knows receive buffer size of KAME box - -How to play with it: -- prepare KAME box and BIND9 DNS server (can be a same node) -- add the following into /etc/resolv.conf on KAME box: - options edns0 <--- enables EDNS0 - nameserver -- run applications compiled with libinet6 (like /usr/local/v6/bin/telnet), - see EDNS0 packet fly on the wire by tcpdump or some other method. - -Caveats: -- BIND 4/8 DNS server will choke with EDNS0 packet, so you must not - turn the option on if you have BIND 4/8 DNS server. If you enable - "options edns0" against BIND 4/8 DNS server, you will never be able - to resolve names. -- If you use IPv6 UDP as DNS transport, path MTU discovery may - affect the traffic. KAME box tries to fragment packet to 1280 - bytes, however, BIND9 may not. -- Some of our platforms do not use our extended resolver code in libinet6. - See COVERAGE for detail. - - -<> - -http://www.netbsd.org/Documentation/network/ipv6/ - Even if you are on non-netbsd operating system, the URL should be - useful. -https://www.kame.net/ - - diff --git a/share/examples/Makefile b/share/examples/Makefile index 06d10a0bc149..504f3d7807dc 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -8,7 +8,6 @@ FILESDIR= ${SHAREDIR}/examples LDIRS= BSD_daemon \ FreeBSD_version \ - IPv6 \ bootforth \ csh \ drivers \ @@ -57,9 +56,6 @@ SE_FREEBSD_VERSION= \ Makefile \ README -SE_DIRS+= IPv6 -SE_IPV6= USAGE - SE_DIRS+= bootforth SE_BOOTFORTH= \ README \ From nobody Fri Feb 2 15:32:43 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRKXW3GYlz58y2m; Fri, 2 Feb 2024 15:32: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 4TRKXW2Qcmz4N0R; Fri, 2 Feb 2024 15:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzFP9uoRb5lpCNDv4N+fO1owvOKzVdZA4o2mk0vADfM=; b=VvnTwa6zsa8sknOSP+f/sI1+YqKRIYJehhKUk+QuLrNugtEAkNmc5jyJ7/GWddEcoKoAxq 2g0RgWEHFRdVUVMiKZsMbbTk88QHdp0MLknYoBthhH/HAfszrCmYaeQ2xcrk9In3IjUKOZ lL+0Wp9N/2X3vuUU6oNqQnc4SNAxJ+JDMxuMobrx1jK0wmLM4ynMyam11C5UkUN2hbhf3N S4Sk5KivMwOC97VHJlD4BmxsTvjDawXZgFcuwJOb11D6cF9S+Ys0XzOilJFUD93unsEzHD 0FQ+rovsUr80fs/UaR9O3QdqHRybLu7LZgE8iWb9ABHaJF6uESVkuYtFxKCDFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706887963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KzFP9uoRb5lpCNDv4N+fO1owvOKzVdZA4o2mk0vADfM=; b=xeXbSqIgZk2HEr1g5+PJvfssgC9EIJb6KOAcfRcLefs28WM+Ye/+gVmMUq+eUuaswiJ1I3 gTiRnVhZuktac5gj/Kn0NSBXEfH2IBneeOHMh8G0yDftz9GlLEeQJhDC4NXgwSOkdrOKey B5n6xtzG8SE+f+L9qS/Y5smM10x2tZR7xvIdv092/hS3kAeQA4if/ntsRB7FeP4T0yMGrc Sy4YP7PViX6FF8VUOySDKP9pICJeOIHJmmBT/RKpWiOX2a0jdrS/py//BEX/sk1gjxpcHr OQbmZL7jSpCQNs8cpACW0f4ivxUolpilV9Qi48UMhmCwYMSv59kf1hTv6rsG3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706887963; a=rsa-sha256; cv=none; b=j0Zu7HDkShmBH5ISESGMsgNdYGiaIYPiKc5Oaul3MyaCzh8lCtq76D5BFwIb6Kz5e16Kla OlAH6gqP7wvDio9T0jHQ6Fy34J7WczyXiJKRF7k40+5MmQY9AzsEXsdI8+SLfJnCmIqFJa WQ8ejwAfy9vuPleoDXO3D3yYqrt5NhTXmsOxM+/ErEQHakcFCtOi7Q2r74xeMtvrjy5LNR amc55oRzM8cl4gtvGUzk+b/X7p0SRr26PJq5qfmy+vDYWqkXd+3AQuG9Zez/3sVmLfR1RM nWQgsatSkrlu5z2E/UQPhAoHoJ+DMLscAL+pOaarmaYEuoHH5UUvkrNmFjX5Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRKXW1TVVzc5H; Fri, 2 Feb 2024 15:32: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 412FWhSX000386; Fri, 2 Feb 2024 15:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412FWhop000383; Fri, 2 Feb 2024 15:32:43 GMT (envelope-from git) Date: Fri, 2 Feb 2024 15:32:43 GMT Message-Id: <202402021532.412FWhop000383@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: 36f0a34ca645 - main - libthr: Force the thr_wake() symbol to be resolved during initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36f0a34ca645d49ec79d60ea7e773374ef0991ea Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=36f0a34ca645d49ec79d60ea7e773374ef0991ea commit 36f0a34ca645d49ec79d60ea7e773374ef0991ea Author: Mark Johnston AuthorDate: 2024-02-02 14:23:53 +0000 Commit: Mark Johnston CommitDate: 2024-02-02 15:32:30 +0000 libthr: Force the thr_wake() symbol to be resolved during initialization Otherwise the lock upgrade performed by rtld's load_filtees() can result in infinite recursion, wherein: 1. _rtld_bind() acquires the bind read lock, 2. the source DSO's filtees haven't been loaded yet, so the lock upgrade in load_filtees() cause rtld to jump to _rtld_bind() and release the bind lock, 3. _thr_rtld_lock_release() calls _thr_ast(), which calls thr_wake(), which hasn't been resolved yet, 4. _rtld_bind() acquires the bind read lock in order to resolve thr_wake(), 5. ... See the linked pull request for an instance of this problem arising with libsys. That particular instance is also worked around by commit e7951d0b04e6. Reported by: brooks Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/908 MFC after: 1 week Sponsored by: Innovate UK --- lib/libthr/thread/thr_rtld.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c index 9026abf941e2..767b4735e1fa 100644 --- a/lib/libthr/thread/thr_rtld.c +++ b/lib/libthr/thread/thr_rtld.c @@ -238,6 +238,7 @@ _thr_rtld_init(void) mprotect(NULL, 0, 0); _rtld_get_stack_prot(); + thr_wake(-1); li.rtli_version = RTLI_VERSION; li.lock_create = _thr_rtld_lock_create; From nobody Fri Feb 2 15:52:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRKzD4Kmrz590lK; Fri, 2 Feb 2024 15:52: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 4TRKzD1gxMz4QGn; Fri, 2 Feb 2024 15:52:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706889144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wraImFdreCiivDNb3PYq0QX5z9aw1YWUvh4Ti4QhGMg=; b=gd4VM1LotvchOBOFFzkwFNKv8zCKMnTk+12bzpqzZePJGHqt8bWao3WdUE1n1Y8endBLs+ XoXMX4aDEn8XwaP1xjoV2uxGkOn/xAyTiMt1zK4bXGTmSeg7JRfpIc16TsLh3CPW+7WIVq HFC/VIgA9Ustj/aCmz0Fc8LgPw/kTs0mLuxQ2Sdj/Z6v4n6qRMdzKv0DZiUTi18Xe/UFGH 6hPFbmF6FTPlAS/Lb8KTpmaQbkgJMPkzS2ED2FoO5rOUNbu88Yks/JHUiqWH36gVNUiMb6 pUTx8xBqa1S492Y5BLrdHHqF836VluJqwIy6zdO/6BiiHb4DhvyVVYSOXhTuLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706889144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wraImFdreCiivDNb3PYq0QX5z9aw1YWUvh4Ti4QhGMg=; b=gwUxrwoAIih8BhJYL7hQq2oZowKhKsq9auF1aONsj3FsTnrxYByIxFy4rBu36rVZdJ8B00 +L42+D7zLGqxpbH2g34pTMXxAI3NrATmDUWsYyvrJsvaZZdWrDz9uLONLcGcmCGsrCwE+n 6gezUbHVyQ5Vln88wZ+9oTh4XjB+OooZYnmSVR2qU3Kt7N7N2cxNZRO8VdYEY/pABQx+fh rPcIzZ1AfQVPrZGhTF4cK2JaBalIgKE3GmHRTvz/gkQHBcwstWL/A7bHp33RjYTwKUs/+g AGw0xoN5+1u0Fb76yitV+0KQH5UeMSWMQV/70fU2bpRDUpfMDVkUB3IPVwmZvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706889144; a=rsa-sha256; cv=none; b=iLcb1eTg81Hh1pnM6wLfLZuXN7W5JS/L1yIYyqD/yDT9endGki8p5rUMwRD0tQgXCzkEq3 FyyBxJtH1w1MaHgWw9hrK5Gn0rzGXS94M7Qu36nLUdIG6WFks/WsmOGJUFo5s5lg1EMvvs 05g2fvSi/gy3UBzc95gZtwWJ8stwetlDSZtNVz+cesyPQH/NDw6ydwtulz0r+5ZsGwdxqv fKnjYukL7FXxXE8EqCnkvuy4LLGW34hgHaOv1LokelYyZl37s/8sM2xL2s+5pA8CF/Klo+ e9b8eSzM2ZNdrnaLpCJtfgN84p4aKGeI5bHlKGrHyvLy9BaABlkDPsvrBFiWRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRKzD0kWjzcfv; Fri, 2 Feb 2024 15:52: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 412FqND2034035; Fri, 2 Feb 2024 15:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412FqN96034033; Fri, 2 Feb 2024 15:52:23 GMT (envelope-from git) Date: Fri, 2 Feb 2024 15:52:23 GMT Message-Id: <202402021552.412FqN96034033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f4613af424cc - main - kldxref: Fix maketempfile function's way of finding the root dir List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4613af424cc93d42f35730fd9862f0c6f964cbd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4613af424cc93d42f35730fd9862f0c6f964cbd commit f4613af424cc93d42f35730fd9862f0c6f964cbd Author: Mina Galić AuthorDate: 2024-02-02 15:35:46 +0000 Commit: Warner Losh CommitDate: 2024-02-02 15:35:49 +0000 kldxref: Fix maketempfile function's way of finding the root dir Rather than assuming that the "root" is passed as directory and will be marked by a trailing slash, we just assume that the directory, which has been checked previously to be a directory, is a directory. This fixes an inconsistency between `kldxref /boot/modules`, which tries to create the temp file in `/boot/`, and `kldxref /boot/modules/`, which tries to create it in `/boot/modules/` itself. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1093 --- usr.sbin/kldxref/kldxref.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index 1f06ad811d91..969d07e5677a 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -717,12 +717,9 @@ read_kld(char *filename, char *kldname) static FILE * maketempfile(char *dest, const char *root) { - char *p; - int n, fd; + int fd; - p = strrchr(root, '/'); - n = p != NULL ? p - root + 1 : 0; - if (snprintf(dest, MAXPATHLEN, "%.*slhint.XXXXXX", n, root) >= + if (snprintf(dest, MAXPATHLEN, "%s/lhint.XXXXXX", root) >= MAXPATHLEN) { errno = ENAMETOOLONG; return (NULL); From nobody Fri Feb 2 16:21:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRLd50SWNz592pW; Fri, 2 Feb 2024 16:21: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 4TRLd501j9z4S05; Fri, 2 Feb 2024 16:21:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706890905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLw2Dshm2RqnlE57vjdsqecE94hUdD/tqPEAkaECm6I=; b=YYIKtuAXkFfly12HU+4mdCODYf0f6rAguPTzhjzPryLN5i1ITVyHDG7PtjzlzY2kIkdY3+ tddZWsQLLrUTYdObxM7hYibV77k1Q5/hYXGOc96OxOMNGKsSVQ1RyVzfV68Mx5FVMnZD2v EHqWDkhlyNQNoppLkOKlwgmuxdBzNf9M69YFCijdx6tiwekO/7twkBhRYL+P7lf/6TZ0Bn f6HLBNMfpTb+nJ1w/3xPTJ1bkCMqwAmZdBu1MP63FpwyL8T+qdUxJyVMcVKWJHm1Zb5BLS wxJ4R5BTGrd27ZQNCLpcsLGZV7cJGHlYauqhlm7vXzv+qkM4mCMcamvLb39koA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706890905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLw2Dshm2RqnlE57vjdsqecE94hUdD/tqPEAkaECm6I=; b=reynllB3usOtrHauZqpTdL82Eao1otBXF+eXWFhgWTzl0qjXi4Q7qBmf5TOovdfCxRskU8 wPkbCLdkd3wayvlb7cFWap3as6mTieU/uNVbazjFFTUcMt7B+icPR9NjJhMEY/f55KtFqv MZAascKFU6LI5wGOsQzsc26fjhjP0QSMJ66WHlmh7vPpxcEJi+jPVw3ALgKysZwYsEENIG DCjTC6YfpGdXGPdV03YEhom6h21Hw4fj+cgGJTUSm7uXOAY65P+WYac7/QqH61V//aBBfc gOohau1BOvnkZdF5+Hzb2FohJ51kPXczXEQVHIB4bbRgEWMA6fJfOA43WybS8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706890905; a=rsa-sha256; cv=none; b=YxYWpgn+eHobIaqBeMkUlQYY4H+gkqZ24/2rNktNtlC6Go9htVGBpTlXcQXeejrBtKLMw1 9RNPn9e9L1amFNOsvF7zYWDKPHoLdLwjZ5BvL4EdoQ29k8RS0C9ZKBTZvqhgAdrIfV5Zkq VuSoZweU2HwmYlpszSw62I2UMnanRHGvlDsSswZM/df1neaP3JS89AtbUTPYDVGlKMG0ap 2X2KowXfjV9SGNpuE2RoUxgtO2Kry6iIcbysuLWC3MrG1oylpt+VDr+4jM7f4SV8Yzj368 crkbfTyrs5SYmFivktW7Oi7jOSwQGhA0C8yoItT6/lkiQKCqc2rUZdJsKYvHEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRLd46B5Nzd2X; Fri, 2 Feb 2024 16:21: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 412GLiRH081071; Fri, 2 Feb 2024 16:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412GLidA081068; Fri, 2 Feb 2024 16:21:44 GMT (envelope-from git) Date: Fri, 2 Feb 2024 16:21:44 GMT Message-Id: <202402021621.412GLidA081068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 93a25ac9f4c0 - main - .gitignore: add sys/*/compile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93a25ac9f4c0812c5d99fa0a34d436e46fae2094 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=93a25ac9f4c0812c5d99fa0a34d436e46fae2094 commit 93a25ac9f4c0812c5d99fa0a34d436e46fae2094 Author: Lexi Winter AuthorDate: 2024-02-02 16:17:19 +0000 Commit: Warner Losh CommitDate: 2024-02-02 16:20:36 +0000 .gitignore: add sys/*/compile Files in sys/*/compile are created when compiling the kernel with config(8). They are never source files and should never be committed to source control, so list this entire directory in .gitignore. While not the official way to build the kernel, it's often useful to debug sys/conf/files* changes when adding new drivers, etc. Reviewed by: imp, meena Pull Request: https://github.com/freebsd/freebsd-src/pull/1082 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 785568271794..3ed711f301ac 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tags .cache .clangd .ccls-cache +sys/*/compile From nobody Fri Feb 2 16:55:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRMND4fZJz595xj; Fri, 2 Feb 2024 16:55: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 4TRMND417fz4VLM; Fri, 2 Feb 2024 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892940; h=from:from:reply-to:subject:subject: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/heGnb5JeuZ0+DtNKm1PKfPcHeA3VuruPmAwGPvRsE=; b=X4EaJ/sYVzeNVUM4bPSGfqWwrfZV3K4o3ClIdjimf0cSr7H33R5sXYivxSZ/PywN1/2pYH hMztcjpEgeOXeKm5aHSKmd8ZrV0a2xaA69OtfNeR46HXpT2VQbqjv2H5SV0rrUejv4pkrN drzTqwQT7JspMzUb4ics2xC12rMvOoqLkQ4BmY2b1Peuq4lpcE7djnx3IHR5mav+SJKcFb fuCKgfIdXiP5I3zC9YGzpz8XQpophJYhE6zWBBcJZrLZ86F7MfUseREopCtGL+XxttjSHn l9BUfXWg+7bJpslphYs8hU7dGrd1yyFi5EP0E+b3ujYY1tuHkP8PMgXNlqnsjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892940; h=from:from:reply-to:subject:subject: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/heGnb5JeuZ0+DtNKm1PKfPcHeA3VuruPmAwGPvRsE=; b=y2oG6uVTM7qVFd6aaRV1RGgktqBOLqVgHKA/huyfBabVUUZfFCHOQ6iN9Xnme+qwsRnbVK pATO953hOzqQLEU/5ZriP+VyRCHq8Z6xSoH94JYOcUOe2aAn7J3TQCipI95hzucqGJXVPx hrBE5EyYqG/rIiA2Q6LOhg8Deiq7sOvKVZSIWQdr7zxpGnaKlVRvk1BQ986udQPQHQm/0D IOCWsrU1BIXeaAOh9k1zgIsit32sRW5ADdirZKrFCVoAs6qWb9uOipM+BCG2bPw2Ceem7w kD5k4gs3i2mXHu6uquHtS61XwZnLUvUCOdFcpkwm2BqzQQzBZ/KMgpEwXeZFzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706892940; a=rsa-sha256; cv=none; b=BfJAfThAL+meUkr2mvy0U/mPB7ku5WcvDAGwG3lCFAsNeju9VK1iigo7MtZePnkdaQak2R B1A3gZ658aLhGj4P+mYoRt7uVReH4Z7qBbq5pAxtSWB5jwCqMNaaPU5DukH+e/vCzMPaLT lSSXocqVzCAlDICgv0h/9BjQQqVs4IcxDwV8R7ybOhCwNWskMKxaYzGENsJ1pc4HRqReJL pMAJ8cnji+yfXWlpvG2Ti2vhdYx57gC0CKRglVVC1p60wgbLQa8OzzyMTbEwQHyJc1tHzZ R3ZzlqcEosld7wHkRQYxkg04nCQPsz0Kus5IVHogkFGStPDYITRHXzHMO7URcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRMND2p6Zzdcb; Fri, 2 Feb 2024 16:55: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 412GteIx034577; Fri, 2 Feb 2024 16:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412GteET034574; Fri, 2 Feb 2024 16:55:40 GMT (envelope-from git) Date: Fri, 2 Feb 2024 16:55:40 GMT Message-Id: <202402021655.412GteET034574@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: b8ef285f6cc6 - main - pf: ensure dummynet gets the correct direction after route-to List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8ef285f6cc6ae733e75488a6ff879e6fb23133d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b8ef285f6cc6ae733e75488a6ff879e6fb23133d commit b8ef285f6cc6ae733e75488a6ff879e6fb23133d Author: Kristof Provost AuthorDate: 2024-02-01 17:59:36 +0000 Commit: Kristof Provost CommitDate: 2024-02-02 16:55:16 +0000 pf: ensure dummynet gets the correct direction after route-to If we apply a route-to to an inbound packet pf_route() may hand that packet over to dummynet. Dummynet may then delay the packet, and later re-inject it. This re-injection (in dummynet_send()) needs to know if the packet was inbound or outbound, to call the correct path for continued processing. That's done based on the pf_pdesc we pass along (through pf_dummynet_route() and pf_pdesc_to_dnflow()). In the case of pf_route() on inbound packets that may be wrong, because we're called in the input path, and didn't update pf_pdesc->dir. This can manifest in issues with fragmented packets. For example, a fragmented packet will be re-fragmented in pf_route(), and if dummynet makes different decisions for some of the fragments (that is, it delays some and allows others to pass through directly) this will break. The packets that pass through dummynet without delay will be transmitted correctly (through the ifp->if_output() call in pf_route()), but the delayed packets will be re-injected in the input path (and not the output path, as they should be). These packets will pass through pf_test(PF_IN) as they're tagged PF_MTAG_FLAG_DUMMYNET. However, this tag is then removed and the packet will be routed and enter pf_test(PF_OUT) where pf_reassemble() will hold them indefinitely (as some fragments have been transmitted directly, and will never hit pf_test(PF_OUT)). The fix is simple: we must update pf_pfdesc->dir to PF_OUT before we pass the packet to dummynet. See also: https://redmine.pfsense.org/issues/15156 Reviewed by: rcm Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 +++++ tests/sys/netpfil/pf/route_to.sh | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 36ff0eac16ad..ec7964a48e6d 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7361,6 +7361,12 @@ 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 small enough for interface, or the interface will take * care of the fragmentation for us, we can just send directly. diff --git a/tests/sys/netpfil/pf/route_to.sh b/tests/sys/netpfil/pf/route_to.sh index 7e8310bceb30..31a47e75c82e 100644 --- a/tests/sys/netpfil/pf/route_to.sh +++ b/tests/sys/netpfil/pf/route_to.sh @@ -407,6 +407,55 @@ ifbound_cleanup() pft_cleanup } +atf_test_case "dummynet_frag" "cleanup" +dummynet_frag_head() +{ + atf_set descr 'Test fragmentation with route-to and dummynet' + atf_set require.user root +} + +dummynet_frag_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 bw 1000Byte/s burst 4500 + jexec alcatraz dnctl pipe 2 config + # This second pipe ensures that the pf_test(PF_OUT) call in pf_route() doesn't + # delay packets in dummynet (by inheriting pipe 1 from the input rule). + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "set reassemble yes" \ + "pass in route-to (${epair_two}a 198.51.100.2) inet proto icmp all icmp-type echoreq dnpipe 1" \ + "pass out dnpipe 2" + + + atf_check -s exit:0 -o ignore ping -c 1 198.51.100.2 + atf_check -s exit:0 -o ignore ping -c 1 -s 4000 198.51.100.2 +} + +dummynet_frag_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4" @@ -416,4 +465,5 @@ atf_init_test_cases() atf_add_test_case "icmp_nat" atf_add_test_case "dummynet" atf_add_test_case "ifbound" + atf_add_test_case "dummynet_frag" } From nobody Fri Feb 2 16:55:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRMNF5dk7z595ry; Fri, 2 Feb 2024 16:55: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 4TRMNF4Xj2z4VPV; Fri, 2 Feb 2024 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVicg6Ye0iWnYxC6JhfN8RpaH+TAzm3l1KFlNdFt7Ds=; b=lHVQ4dPxENfqw4wiJu0BfdsotgX8J8AqZDbzrycGfYEIz7Si5QNy7/izDGoFQcFkh3ugvW STOfBgSyA4ykHQZ9/kBzyBCSU9vaFV8fNd0r+2pSeqt92T+lqJhrJ4R4FxUvryekmXWnyo d2R2Powe/Xt6tW9RMx4vsE+WuNQbGAcgmvm9ZZ5KHLruaGk+dJHoxdzdJLH88rraLY45PM JYZ5yx7eFg4Z7rezTit5dXQrxlgeuf8/cosD4ByZ0nfA7zw6+ACGAQpr/J3PgWGrv4bFp8 YaP7ZzGhqQ9XmMOTH4Y4H6auiKwTCMVRBrd99HWFDFZtud4ACZxCqiygnmBJpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVicg6Ye0iWnYxC6JhfN8RpaH+TAzm3l1KFlNdFt7Ds=; b=Curd6giPmsj8Yo5tykLecy6pu/kCiQ92IpAIdGAqY3MRz53g5djIQG0ICo4QoOjI1ugMie Pz6sCWwTfvkj2CVtcI+Y8DJXYhnheGzPR9Vn3oBdFVPRTcIS/HRSQrJDb1GUBH/I1bRxKE 89OpzjHmKGQp01XEjsVG53JEcjxLFftWeRgzay815/hZnc/+YFhyef9NCjoFqgVNAf2Zig ViH/Y4gIoQ5qgaRMSNVuklvwzyyxMGp2sb2D+SmIVjikUXGlcD7caeEwx3OkbhuB+MXaBC HmCk7ouRpn92XZBDmba0H68jxLNreIKMc1M2KHDIhC5DnsiksM/wIFjd20klmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706892941; a=rsa-sha256; cv=none; b=GofRN5xB2PGVsmwti7kK2Y3ArtyyRYjarqvvhMM0jQYcFpGaRVqf4nb2eWqFKwCL6dpBQj 7CTih5xDEjjrIt0EnX/DZRjtL1jnd1j9+jvml5YsmLISoOwtgqCaXrneaunnSWFSC4JnxT GA9uqkaUgg13L2e4HTsgHigqGRK9yfKfGm2ZSdvjGQoMUfGD/smVN5FHtU0XwuppLJ0WFX hj1pEj9nJ5LSaLJR+BS460z6d45nayOq3Eb3BYc9gBkv/oanIUBsewshWEDA9eVqk1qiBu h4Xw3R9Zx9Nxt63dZNZYWIQeA8vIVDNguX+2cpIJOV8++SaQQ3qM1AKVxupGAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRMNF3d79zfDJ; Fri, 2 Feb 2024 16:55: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 412Gtfwk034619; Fri, 2 Feb 2024 16:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412Gtf2i034616; Fri, 2 Feb 2024 16:55:41 GMT (envelope-from git) Date: Fri, 2 Feb 2024 16:55:41 GMT Message-Id: <202402021655.412Gtf2i034616@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: 777a4702c591 - main - pf: implement addrule via netlink List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 777a4702c591154c5a844d43c32f588f371ae80a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=777a4702c591154c5a844d43c32f588f371ae80a commit 777a4702c591154c5a844d43c32f588f371ae80a Author: Kristof Provost AuthorDate: 2024-01-12 10:54:18 +0000 Commit: Kristof Provost CommitDate: 2024-02-02 16:55:16 +0000 pf: implement addrule via netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 282 ++++++++++++++++++++++++++++++++++++++- lib/libpfctl/libpfctl.h | 3 + sbin/pfctl/pfctl.c | 4 +- sys/net/pfvar.h | 5 +- sys/netlink/netlink_snl.h | 12 ++ sys/netpfil/pf/pf_ioctl.c | 22 ++-- sys/netpfil/pf/pf_nl.c | 312 ++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 14 ++ sys/netpfil/pf/pf_ruleset.c | 68 +++------- 9 files changed, 659 insertions(+), 63 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 2db3f0ede99f..cb9b377f7b6c 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1229,7 +1229,287 @@ pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, anchor_call, false)); } -int pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, +#define _OUT(_field) offsetof(struct pf_addr_wrap, _field) +static const struct snl_attr_parser ap_addr_wrap[] = { + { .type = PF_AT_ADDR, .off = _OUT(v.a.addr), .cb = snl_attr_get_in6_addr }, + { .type = PF_AT_MASK, .off = _OUT(v.a.mask), .cb = snl_attr_get_in6_addr }, + { .type = PF_AT_IFNAME, .off = _OUT(v.ifname), .arg = (void *)IFNAMSIZ,.cb = snl_attr_copy_string }, + { .type = PF_AT_TABLENAME, .off = _OUT(v.tblname), .arg = (void *)PF_TABLE_NAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_AT_TYPE, .off = _OUT(type), .cb = snl_attr_get_uint8 }, + { .type = PF_AT_IFLAGS, .off = _OUT(iflags), .cb = snl_attr_get_uint8 }, + { .type = PF_AT_TBLCNT, .off = _OUT(p.tblcnt), .cb = snl_attr_get_uint32 }, + { .type = PF_AT_DYNCNT, .off = _OUT(p.dyncnt), .cb = snl_attr_get_uint32 }, +}; +SNL_DECLARE_ATTR_PARSER(addr_wrap_parser, ap_addr_wrap); +#undef _OUT + +#define _OUT(_field) offsetof(struct pf_rule_addr, _field) +static struct snl_attr_parser ap_rule_addr[] = { + { .type = PF_RAT_ADDR, .off = _OUT(addr), .arg = &addr_wrap_parser, .cb = snl_attr_get_nested }, + { .type = PF_RAT_SRC_PORT, .off = _OUT(port[0]), .cb = snl_attr_get_uint16 }, + { .type = PF_RAT_DST_PORT, .off = _OUT(port[1]), .cb = snl_attr_get_uint16 }, + { .type = PF_RAT_NEG, .off = _OUT(neg), .cb = snl_attr_get_uint8 }, + { .type = PF_RAT_OP, .off = _OUT(port_op), .cb = snl_attr_get_uint8 }, +}; +#undef _OUT +SNL_DECLARE_ATTR_PARSER(rule_addr_parser, ap_rule_addr); + +struct snl_parsed_labels +{ + char labels[PF_RULE_MAX_LABEL_COUNT][PF_RULE_LABEL_SIZE]; + uint32_t i; +}; + +static bool +snl_attr_get_pf_rule_labels(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) +{ + struct snl_parsed_labels *l = (struct snl_parsed_labels *)target; + bool ret; + + if (l->i >= PF_RULE_MAX_LABEL_COUNT) + return (E2BIG); + + ret = snl_attr_copy_string(ss, nla, (void *)PF_RULE_LABEL_SIZE, + l->labels[l->i]); + if (ret) + l->i++; + + return (ret); +} + +#define _OUT(_field) offsetof(struct nl_parsed_labels, _field) +static const struct snl_attr_parser ap_labels[] = { + { .type = PF_LT_LABEL, .off = 0, .cb = snl_attr_get_pf_rule_labels }, +}; +SNL_DECLARE_ATTR_PARSER(rule_labels_parser, ap_labels); +#undef _OUT + +static bool +snl_attr_get_nested_pf_rule_labels(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) +{ + struct snl_parsed_labels parsed_labels = { }; + bool error; + + /* Assumes target points to the beginning of the structure */ + error = snl_parse_header(ss, NLA_DATA(nla), NLA_DATA_LEN(nla), &rule_labels_parser, &parsed_labels); + if (! error) + return (error); + + memcpy(target, parsed_labels.labels, sizeof(parsed_labels)); + + return (true); +} + +#define _OUT(_field) offsetof(struct pf_mape_portset, _field) +static const struct snl_attr_parser ap_mape_portset[] = { + { .type = PF_MET_OFFSET, .off = _OUT(offset), .cb = snl_attr_get_uint8 }, + { .type = PF_MET_PSID_LEN, .off = _OUT(psidlen), .cb = snl_attr_get_uint8 }, + {. type = PF_MET_PSID, .off = _OUT(psid), .cb = snl_attr_get_uint16 }, +}; +SNL_DECLARE_ATTR_PARSER(mape_portset_parser, ap_mape_portset); +#undef _OUT + +#define _OUT(_field) offsetof(struct pfctl_pool, _field) +static const struct snl_attr_parser ap_pool[] = { + { .type = PF_PT_KEY, .off = _OUT(key), .arg = (void *)sizeof(struct pf_poolhashkey), .cb = snl_attr_get_bytes }, + { .type = PF_PT_COUNTER, .off = _OUT(counter), .cb = snl_attr_get_in6_addr }, + { .type = PF_PT_TBLIDX, .off = _OUT(tblidx), .cb = snl_attr_get_uint32 }, + { .type = PF_PT_PROXY_SRC_PORT, .off = _OUT(proxy_port[0]), .cb = snl_attr_get_uint16 }, + { .type = PF_PT_PROXY_DST_PORT, .off = _OUT(proxy_port[1]), .cb = snl_attr_get_uint16 }, + { .type = PF_PT_OPTS, .off = _OUT(opts), .cb = snl_attr_get_uint8 }, + { .type = PF_PT_MAPE, .off = _OUT(mape), .arg = &mape_portset_parser, .cb = snl_attr_get_nested }, +}; +SNL_DECLARE_ATTR_PARSER(pool_parser, ap_pool); +#undef _OUT + +struct nl_parsed_timeouts +{ + uint32_t timeouts[PFTM_MAX]; + uint32_t i; +}; + +static bool +snl_attr_get_pf_timeout(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) +{ + struct nl_parsed_timeouts *t = (struct nl_parsed_timeouts *)target; + bool ret; + + if (t->i >= PFTM_MAX) + return (E2BIG); + + ret = snl_attr_get_uint32(ss, nla, NULL, &t->timeouts[t->i]); + if (ret) + t->i++; + + return (ret); +} + +#define _OUT(_field) offsetof(struct nl_parsed_timeout, _field) +static const struct snl_attr_parser ap_timeouts[] = { + { .type = PF_TT_TIMEOUT, .off = 0, .cb = snl_attr_get_pf_timeout }, +}; +SNL_DECLARE_ATTR_PARSER(timeout_parser, ap_timeouts); +#undef _OUT + +static bool +snl_attr_get_nested_timeouts(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) +{ + struct nl_parsed_timeouts parsed_timeouts = { }; + bool error; + + /* Assumes target points to the beginning of the structure */ + error = snl_parse_header(ss, NLA_DATA(nla), NLA_DATA_LEN(nla), &timeout_parser, &parsed_timeouts); + if (! error) + return (error); + + memcpy(target, parsed_timeouts.timeouts, sizeof(parsed_timeouts.timeouts)); + + return (true); +} + +#define _OUT(_field) offsetof(struct pf_rule_uid, _field) +static const struct snl_attr_parser ap_rule_uid[] = { + { .type = PF_RUT_UID_LOW, .off = _OUT(uid[0]), .cb = snl_attr_get_uint32 }, + { .type = PF_RUT_UID_HIGH, .off = _OUT(uid[1]), .cb = snl_attr_get_uint32 }, + { .type = PF_RUT_OP, .off = _OUT(op), .cb = snl_attr_get_uint8 }, +}; +SNL_DECLARE_ATTR_PARSER(rule_uid_parser, ap_rule_uid); +#undef _OUT + +struct pfctl_nl_get_rule { + struct pfctl_rule r; + char anchor_call[MAXPATHLEN]; +}; +#define _OUT(_field) offsetof(struct pfctl_nl_get_rule, _field) +static struct snl_attr_parser ap_getrule[] = { + { .type = PF_RT_SRC, .off = _OUT(r.src), .arg = &rule_addr_parser,.cb = snl_attr_get_nested }, + { .type = PF_RT_DST, .off = _OUT(r.dst), .arg = &rule_addr_parser,.cb = snl_attr_get_nested }, + { .type = PF_RT_RIDENTIFIER, .off = _OUT(r.ridentifier), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_LABELS, .off = _OUT(r.label), .arg = &rule_labels_parser,.cb = snl_attr_get_nested_pf_rule_labels }, + { .type = PF_RT_IFNAME, .off = _OUT(r.ifname), .arg = (void *)IFNAMSIZ, .cb = snl_attr_copy_string }, + { .type = PF_RT_QNAME, .off = _OUT(r.qname), .arg = (void *)PF_QNAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_RT_PQNAME, .off = _OUT(r.pqname), .arg = (void *)PF_QNAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_RT_TAGNAME, .off = _OUT(r.tagname), .arg = (void *)PF_TAG_NAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_RT_MATCH_TAGNAME, .off = _OUT(r.match_tagname), .arg = (void *)PF_TAG_NAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_RT_OVERLOAD_TBLNAME, .off = _OUT(r.overload_tblname), .arg = (void *)PF_TABLE_NAME_SIZE, .cb = snl_attr_copy_string }, + { .type = PF_RT_RPOOL, .off = _OUT(r.rpool), .arg = &pool_parser, .cb = snl_attr_get_nested }, + { .type = PF_RT_OS_FINGERPRINT, .off = _OUT(r.os_fingerprint), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_RTABLEID, .off = _OUT(r.rtableid), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_TIMEOUT, .off = _OUT(r.timeout), .arg = &timeout_parser, .cb = snl_attr_get_nested_timeouts }, + { .type = PF_RT_MAX_STATES, .off = _OUT(r.max_states), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_MAX_SRC_NODES, .off = _OUT(r.max_src_nodes), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_MAX_SRC_STATES, .off = _OUT(r.max_src_states), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_MAX_SRC_CONN_RATE_LIMIT, .off = _OUT(r.max_src_conn_rate.limit), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_MAX_SRC_CONN_RATE_SECS, .off = _OUT(r.max_src_conn_rate.seconds), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_DNPIPE, .off = _OUT(r.dnpipe), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_DNRPIPE, .off = _OUT(r.dnrpipe), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_DNFLAGS, .off = _OUT(r.free_flags), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_NR, .off = _OUT(r.nr), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_PROB, .off = _OUT(r.prob), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_CUID, .off = _OUT(r.cuid), .cb = snl_attr_get_uint32 }, + {. type = PF_RT_CPID, .off = _OUT(r.cpid), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_RETURN_ICMP, .off = _OUT(r.return_icmp), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_RETURN_ICMP6, .off = _OUT(r.return_icmp6), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_MAX_MSS, .off = _OUT(r.max_mss), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_SCRUB_FLAGS, .off = _OUT(r.scrub_flags), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_UID, .off = _OUT(r.uid), .arg = &rule_uid_parser, .cb = snl_attr_get_nested }, + { .type = PF_RT_GID, .off = _OUT(r.gid), .arg = &rule_uid_parser, .cb = snl_attr_get_nested }, + { .type = PF_RT_RULE_FLAG, .off = _OUT(r.rule_flag), .cb = snl_attr_get_uint32 }, + { .type = PF_RT_ACTION, .off = _OUT(r.action), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_DIRECTION, .off = _OUT(r.direction), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_LOG, .off = _OUT(r.log), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_LOGIF, .off = _OUT(r.logif), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_QUICK, .off = _OUT(r.quick), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_IF_NOT, .off = _OUT(r.ifnot), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_MATCH_TAG_NOT, .off = _OUT(r.match_tag_not), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_NATPASS, .off = _OUT(r.natpass), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_KEEP_STATE, .off = _OUT(r.keep_state), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_AF, .off = _OUT(r.af), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_PROTO, .off = _OUT(r.proto), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_TYPE, .off = _OUT(r.type), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_CODE, .off = _OUT(r.code), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_FLAGS, .off = _OUT(r.flags), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_FLAGSET, .off = _OUT(r.flagset), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_MIN_TTL, .off = _OUT(r.min_ttl), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_ALLOW_OPTS, .off = _OUT(r.allow_opts), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_RT, .off = _OUT(r.rt), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_RETURN_TTL, .off = _OUT(r.return_ttl), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_TOS, .off = _OUT(r.tos), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_SET_TOS, .off = _OUT(r.set_tos), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_ANCHOR_RELATIVE, .off = _OUT(r.anchor_relative), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_ANCHOR_WILDCARD, .off = _OUT(r.anchor_wildcard), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_FLUSH, .off = _OUT(r.flush), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_PRIO, .off = _OUT(r.prio), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_SET_PRIO, .off = _OUT(r.set_prio[0]), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_SET_PRIO_REPLY, .off = _OUT(r.set_prio[1]), .cb = snl_attr_get_uint8 }, + { .type = PF_RT_DIVERT_ADDRESS, .off = _OUT(r.divert.addr), .cb = snl_attr_get_in6_addr }, + { .type = PF_RT_DIVERT_PORT, .off = _OUT(r.divert.port), .cb = snl_attr_get_uint16 }, + { .type = PF_RT_PACKETS_IN, .off = _OUT(r.packets[0]), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_PACKETS_OUT, .off = _OUT(r.packets[1]), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_BYTES_IN, .off = _OUT(r.bytes[0]), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_BYTES_OUT, .off = _OUT(r.bytes[1]), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_EVALUATIONS, .off = _OUT(r.evaluations), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_TIMESTAMP, .off = _OUT(r.last_active_timestamp), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_STATES_CUR, .off = _OUT(r.states_cur), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_STATES_TOTAL, .off = _OUT(r.states_tot), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_SRC_NODES, .off = _OUT(r.src_nodes), .cb = snl_attr_get_uint64 }, + { .type = PF_RT_ANCHOR_CALL, .off = _OUT(anchor_call), .arg = (void*)MAXPATHLEN, .cb = snl_attr_copy_string }, +}; +static struct snl_field_parser fp_getrule[] = {}; +#undef _OUT +SNL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, fp_getrule, ap_getrule); + +int +pfctl_get_clear_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, + const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, + char *anchor_call, bool clear) +{ + struct pfctl_nl_get_rule attrs = {}; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + struct snl_writer nw; + 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_GETRULE); + hdr->nlmsg_flags |= NLM_F_DUMP; + + snl_add_msg_attr_string(&nw, PF_GR_ANCHOR, anchor); + snl_add_msg_attr_u8(&nw, PF_GR_ACTION, ruleset); + snl_add_msg_attr_u32(&nw, PF_GR_NR, nr); + snl_add_msg_attr_u32(&nw, PF_GR_TICKET, ticket); + snl_add_msg_attr_u8(&nw, PF_GR_CLEAR, clear); + + hdr = snl_finalize_msg(&nw); + if (hdr == NULL) + return (ENOMEM); + + 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) { + if (! snl_parse_nlmsg(&h->ss, hdr, &getrule_parser, &attrs)) + continue; + } + + memcpy(rule, &attrs.r, sizeof(attrs.r)); + strlcpy(anchor_call, attrs.anchor_call, MAXPATHLEN); + + return (e.error); +} + +int +pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call, bool clear) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index cd72d04d6715..f05044a9a985 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -418,6 +418,9 @@ int pfctl_get_rule(int dev, uint32_t nr, uint32_t ticket, int pfctl_get_clear_rule(int dev, uint32_t nr, uint32_t ticket, const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, char *anchor_call, bool clear); +int pfctl_get_clear_rule_h(struct pfctl_handle *h, uint32_t nr, uint32_t ticket, + const char *anchor, uint32_t ruleset, struct pfctl_rule *rule, + char *anchor_call, bool clear); int pfctl_add_rule(int dev, const struct pfctl_rule *r, const char *anchor, const char *anchor_call, uint32_t ticket, uint32_t pool_ticket); diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 217bf31b3301..c583279750f1 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1303,7 +1303,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } for (nr = 0; nr < ri.nr; ++nr) { - if (pfctl_get_clear_rule(dev, nr, ri.ticket, path, PF_SCRUB, + if (pfctl_get_clear_rule_h(pfh, nr, ri.ticket, path, PF_SCRUB, &rule, anchor_call, opts & PF_OPT_CLRRULECTRS)) { warn("DIOCGETRULENV"); goto error; @@ -1334,7 +1334,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, goto error; } for (nr = 0; nr < ri.nr; ++nr) { - if (pfctl_get_clear_rule(dev, nr, ri.ticket, path, PF_PASS, + if (pfctl_get_clear_rule_h(pfh, nr, ri.ticket, path, PF_PASS, &rule, anchor_call, opts & PF_OPT_CLRRULECTRS)) { warn("DIOCGETRULE"); goto error; diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index ff3370bc105e..f3a808f8ad26 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2470,10 +2470,10 @@ void pf_init_kruleset(struct pf_kruleset *); void pf_init_keth(struct pf_keth_ruleset *); int pf_kanchor_setup(struct pf_krule *, const struct pf_kruleset *, const char *); +int pf_kanchor_copyout(const struct pf_kruleset *, + const struct pf_krule *, char *); int pf_kanchor_nvcopyout(const struct pf_kruleset *, const struct pf_krule *, nvlist_t *); -int pf_kanchor_copyout(const struct pf_kruleset *, - const struct pf_krule *, struct pfioc_rule *); void pf_kanchor_remove(struct pf_krule *); void pf_remove_if_empty_kruleset(struct pf_kruleset *); struct pf_kruleset *pf_find_kruleset(const char *); @@ -2501,6 +2501,7 @@ int pf_ioctl_addrule(struct pf_krule *, uint32_t, pid_t); void pf_krule_free(struct pf_krule *); +void pf_krule_clear_counters(struct pf_krule *); #endif /* The fingerprint functions can be linked into userland programs (tcpdump) */ diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 7bdf5424ddf3..6636d53f2353 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -513,6 +513,18 @@ snl_attr_get_flag(struct snl_state *ss __unused, struct nlattr *nla, const void return (false); } +static inline bool +snl_attr_get_bytes(struct snl_state *ss __unused, struct nlattr *nla, const void *arg, + void *target) +{ + if ((size_t)NLA_DATA_LEN(nla) != (size_t)arg) + return (false); + + memcpy(target, NLA_DATA_CONST(nla), (size_t)arg); + + return (true); +} + static inline bool snl_attr_get_uint8(struct snl_state *ss __unused, struct nlattr *nla, const void *arg __unused, void *target) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 7f70321ea560..d83933cd293f 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1867,6 +1867,17 @@ pf_krule_free(struct pf_krule *rule) free(rule, M_PFRULE); } +void +pf_krule_clear_counters(struct pf_krule *rule) +{ + pf_counter_u64_zero(&rule->evaluations); + for (int i = 0; i < 2; i++) { + pf_counter_u64_zero(&rule->packets[i]); + pf_counter_u64_zero(&rule->bytes[i]); + } + counter_u64_zero(rule->states_tot); +} + static void pf_kpooladdr_to_pooladdr(const struct pf_kpooladdr *kpool, struct pf_pooladdr *pool) @@ -3266,14 +3277,9 @@ DIOCADDRULENV_error: ERROUT(ENOSPC); } - if (clear_counter) { - pf_counter_u64_zero(&rule->evaluations); - for (int i = 0; i < 2; i++) { - pf_counter_u64_zero(&rule->packets[i]); - pf_counter_u64_zero(&rule->bytes[i]); - } - counter_u64_zero(rule->states_tot); - } + if (clear_counter) + pf_krule_clear_counters(rule); + PF_RULES_WUNLOCK(); error = copyout(nvlpacked, nv->data, nv->len); diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index e74d4773b1e7..120ce88f8720 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -401,6 +401,42 @@ static const struct nlattr_parser nla_p_addr_wrap[] = { NL_DECLARE_ATTR_PARSER(addr_wrap_parser, nla_p_addr_wrap); #undef _OUT +static bool +nlattr_add_addr_wrap(struct nl_writer *nw, int attrtype, struct pf_addr_wrap *a) +{ + int off = nlattr_add_nested(nw, attrtype); + int num; + + nlattr_add_in6_addr(nw, PF_AT_ADDR, &a->v.a.addr.v6); + nlattr_add_in6_addr(nw, PF_AT_MASK, &a->v.a.mask.v6); + nlattr_add_u8(nw, PF_AT_TYPE, a->type); + nlattr_add_u8(nw, PF_AT_IFLAGS, a->iflags); + + if (a->type == PF_ADDR_DYNIFTL) { + nlattr_add_string(nw, PF_AT_IFNAME, a->v.ifname); + num = 0; + if (a->p.dyn != NULL) + num = a->p.dyn->pfid_acnt4 + a->p.dyn->pfid_acnt6; + nlattr_add_u32(nw, PF_AT_DYNCNT, num); + } else if (a->type == PF_ADDR_TABLE) { + struct pfr_ktable *kt; + + nlattr_add_string(nw, PF_AT_TABLENAME, a->v.tblname); + num = -1; + kt = a->p.tbl; + if ((kt->pfrkt_flags & PFR_TFLAG_ACTIVE) && + kt->pfrkt_root != NULL) + kt = kt->pfrkt_root; + if (kt->pfrkt_flags & PFR_TFLAG_ACTIVE) + num = kt->pfrkt_cnt; + nlattr_add_u32(nw, PF_AT_TBLCNT, num); + } + + nlattr_set_len(nw, off); + + return (true); +} + #define _OUT(_field) offsetof(struct pf_rule_addr, _field) static const struct nlattr_parser nla_p_ruleaddr[] = { { .type = PF_RAT_ADDR, .off = _OUT(addr), .arg = &addr_wrap_parser, .cb = nlattr_get_nested }, @@ -412,6 +448,22 @@ static const struct nlattr_parser nla_p_ruleaddr[] = { NL_DECLARE_ATTR_PARSER(rule_addr_parser, nla_p_ruleaddr); #undef _OUT +static bool +nlattr_add_rule_addr(struct nl_writer *nw, int attrtype, struct pf_rule_addr *r) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add_addr_wrap(nw, PF_RAT_ADDR, &r->addr); + nlattr_add_u16(nw, PF_RAT_SRC_PORT, r->port[0]); + nlattr_add_u16(nw, PF_RAT_DST_PORT, r->port[1]); + nlattr_add_u8(nw, PF_RAT_NEG, r->neg); + nlattr_add_u8(nw, PF_RAT_OP, r->port_op); + + nlattr_set_len(nw, off); + + return (true); +} + #define _OUT(_field) offsetof(struct pf_mape_portset, _field) static const struct nlattr_parser nla_p_mape_portset[] = { { .type = PF_MET_OFFSET, .off = _OUT(offset), .cb = nlattr_get_uint8 }, @@ -421,6 +473,20 @@ static const struct nlattr_parser nla_p_mape_portset[] = { NL_DECLARE_ATTR_PARSER(mape_portset_parser, nla_p_mape_portset); #undef _OUT +static bool +nlattr_add_mape_portset(struct nl_writer *nw, int attrtype, const struct pf_mape_portset *m) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add_u8(nw, PF_MET_OFFSET, m->offset); + nlattr_add_u8(nw, PF_MET_PSID_LEN, m->psidlen); + nlattr_add_u16(nw, PF_MET_PSID, m->psid); + + nlattr_set_len(nw, off); + + return (true); +} + struct nl_parsed_labels { char labels[PF_RULE_MAX_LABEL_COUNT][PF_RULE_LABEL_SIZE]; @@ -468,6 +534,23 @@ nlattr_get_nested_pf_rule_labels(struct nlattr *nla, struct nl_pstate *npt, cons return (0); } +static bool +nlattr_add_labels(struct nl_writer *nw, int attrtype, const struct pf_krule *r) +{ + int off = nlattr_add_nested(nw, attrtype); + int i = 0; + + while (r->label[i][0] != 0 + && i < PF_RULE_MAX_LABEL_COUNT) { + nlattr_add_string(nw, PF_LT_LABEL, r->label[i]); + i++; + } + + nlattr_set_len(nw, off); + + return (true); +} + #define _OUT(_field) offsetof(struct pf_kpool, _field) static const struct nlattr_parser nla_p_pool[] = { { .type = PF_PT_KEY, .off = _OUT(key), .arg = (void *)sizeof(struct pf_poolhashkey), .cb = nlattr_get_bytes }, @@ -481,6 +564,24 @@ static const struct nlattr_parser nla_p_pool[] = { NL_DECLARE_ATTR_PARSER(pool_parser, nla_p_pool); #undef _OUT +static bool +nlattr_add_pool(struct nl_writer *nw, int attrtype, const struct pf_kpool *pool) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add(nw, PF_PT_KEY, sizeof(struct pf_poolhashkey), &pool->key); + nlattr_add_in6_addr(nw, PF_PT_COUNTER, (const struct in6_addr *)&pool->counter); + nlattr_add_u32(nw, PF_PT_TBLIDX, pool->tblidx); + nlattr_add_u16(nw, PF_PT_PROXY_SRC_PORT, pool->proxy_port[0]); + nlattr_add_u16(nw, PF_PT_PROXY_DST_PORT, pool->proxy_port[1]); + nlattr_add_u8(nw, PF_PT_OPTS, pool->opts); + nlattr_add_mape_portset(nw, PF_PT_MAPE, &pool->mape); + + nlattr_set_len(nw, off); + + return (true); +} + #define _OUT(_field) offsetof(struct pf_rule_uid, _field) static const struct nlattr_parser nla_p_rule_uid[] = { { .type = PF_RUT_UID_LOW, .off = _OUT(uid[0]), .cb = nlattr_get_uint32 }, @@ -490,6 +591,20 @@ static const struct nlattr_parser nla_p_rule_uid[] = { NL_DECLARE_ATTR_PARSER(rule_uid_parser, nla_p_rule_uid); #undef _OUT +static bool +nlattr_add_rule_uid(struct nl_writer *nw, int attrtype, const struct pf_rule_uid *u) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add_u32(nw, PF_RUT_UID_LOW, u->uid[0]); + nlattr_add_u32(nw, PF_RUT_UID_HIGH, u->uid[1]); + nlattr_add_u8(nw, PF_RUT_OP, u->op); + + nlattr_set_len(nw, off); + + return (true); +} + struct nl_parsed_timeouts { uint32_t timeouts[PFTM_MAX]; @@ -536,6 +651,19 @@ nlattr_get_nested_timeouts(struct nlattr *nla, struct nl_pstate *npt, const void return (0); } +static bool +nlattr_add_timeout(struct nl_writer *nw, int attrtype, uint32_t *timeout) +{ + int off = nlattr_add_nested(nw, attrtype); + + for (int i = 0; i < PFTM_MAX; i++) + nlattr_add_u32(nw, PF_RT_TIMEOUT, timeout[i]); + + nlattr_set_len(nw, off); + + return (true); +} + #define _OUT(_field) offsetof(struct pf_krule, _field) static const struct nlattr_parser nla_p_rule[] = { { .type = PF_RT_SRC, .off = _OUT(src), .arg = &rule_addr_parser,.cb = nlattr_get_nested }, @@ -654,6 +782,7 @@ static const struct nlattr_parser nla_p_getrules[] = { }; static const struct nlfield_parser nlf_p_getrules[] = { }; +#undef _OUT NL_DECLARE_PARSER(getrules_parser, struct genlmsghdr, nlf_p_getrules, nla_p_getrules); static int @@ -695,6 +824,182 @@ out: return (error); } +struct nl_parsed_get_rule { + char anchor[MAXPATHLEN]; + uint8_t action; + uint32_t nr; + uint32_t ticket; + uint8_t clear; +}; +#define _IN(_field) offsetof(struct genlmsghdr, _field) +#define _OUT(_field) offsetof(struct nl_parsed_get_rule, _field) +static const struct nlattr_parser nla_p_getrule[] = { + { .type = PF_GR_ANCHOR, .off = _OUT(anchor), .arg = (void *)MAXPATHLEN, .cb = nlattr_get_chara }, + { .type = PF_GR_ACTION, .off = _OUT(action), .cb = nlattr_get_uint8 }, + { .type = PF_GR_NR, .off = _OUT(nr), .cb = nlattr_get_uint32 }, + { .type = PF_GR_TICKET, .off = _OUT(ticket), .cb = nlattr_get_uint32 }, + { .type = PF_GR_CLEAR, .off = _OUT(clear), .cb = nlattr_get_uint8 }, +}; +static const struct nlfield_parser nlf_p_getrule[] = { +}; +NL_DECLARE_PARSER(getrule_parser, struct genlmsghdr, nlf_p_getrule, nla_p_getrule); + +static int +pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + char anchor_call[MAXPATHLEN]; + struct nl_parsed_get_rule attrs = {}; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + struct pf_kruleset *ruleset; + struct pf_krule *rule; + int rs_num; + int error; + + error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); + if (error != 0) + return (error); + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) + return (ENOMEM); + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GETRULE; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + PF_RULES_WLOCK(); + ruleset = pf_find_kruleset(attrs.anchor); + if (ruleset == NULL) { + PF_RULES_WUNLOCK(); + error = ENOENT; + goto out; + } + + rs_num = pf_get_ruleset_number(attrs.action); + if (rs_num >= PF_RULESET_MAX) { + PF_RULES_WUNLOCK(); + error = EINVAL; + goto out; + } + + if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + rule = TAILQ_FIRST(ruleset->rules[rs_num].active.ptr); + while ((rule != NULL) && (rule->nr != attrs.nr)) + rule = TAILQ_NEXT(rule, entries); + if (rule == NULL) { + PF_RULES_WUNLOCK(); + error = EBUSY; + goto out; + } + + nlattr_add_rule_addr(nw, PF_RT_SRC, &rule->src); + nlattr_add_rule_addr(nw, PF_RT_DST, &rule->dst); + nlattr_add_u32(nw, PF_RT_RIDENTIFIER, rule->ridentifier); + nlattr_add_labels(nw, PF_RT_LABELS, rule); + nlattr_add_string(nw, PF_RT_IFNAME, rule->ifname); + nlattr_add_string(nw, PF_RT_QNAME, rule->qname); + nlattr_add_string(nw, PF_RT_PQNAME, rule->pqname); + nlattr_add_string(nw, PF_RT_TAGNAME, rule->tagname); + nlattr_add_string(nw, PF_RT_MATCH_TAGNAME, rule->match_tagname); + nlattr_add_string(nw, PF_RT_OVERLOAD_TBLNAME, rule->overload_tblname); + nlattr_add_pool(nw, PF_RT_RPOOL, &rule->rpool); + nlattr_add_u32(nw, PF_RT_OS_FINGERPRINT, rule->os_fingerprint); + nlattr_add_u32(nw, PF_RT_RTABLEID, rule->rtableid); + nlattr_add_timeout(nw, PF_RT_TIMEOUT, rule->timeout); + nlattr_add_u32(nw, PF_RT_MAX_STATES, rule->max_states); + nlattr_add_u32(nw, PF_RT_MAX_SRC_NODES, rule->max_src_nodes); + nlattr_add_u32(nw, PF_RT_MAX_SRC_STATES, rule->max_src_states); + nlattr_add_u32(nw, PF_RT_MAX_SRC_CONN_RATE_LIMIT, rule->max_src_conn_rate.limit); + nlattr_add_u32(nw, PF_RT_MAX_SRC_CONN_RATE_SECS, rule->max_src_conn_rate.seconds); + + nlattr_add_u16(nw, PF_RT_DNPIPE, rule->dnpipe); + nlattr_add_u16(nw, PF_RT_DNRPIPE, rule->dnrpipe); + nlattr_add_u32(nw, PF_RT_DNFLAGS, rule->free_flags); + + nlattr_add_u32(nw, PF_RT_NR, rule->nr); + nlattr_add_u32(nw, PF_RT_PROB, rule->prob); + nlattr_add_u32(nw, PF_RT_CUID, rule->cuid); + nlattr_add_u32(nw, PF_RT_CPID, rule->cpid); + + nlattr_add_u16(nw, PF_RT_RETURN_ICMP, rule->return_icmp); + nlattr_add_u16(nw, PF_RT_RETURN_ICMP6, rule->return_icmp6); + nlattr_add_u16(nw, PF_RT_RETURN_ICMP6, rule->return_icmp6); + nlattr_add_u16(nw, PF_RT_MAX_MSS, rule->max_mss); + nlattr_add_u16(nw, PF_RT_SCRUB_FLAGS, rule->scrub_flags); + + nlattr_add_rule_uid(nw, PF_RT_UID, &rule->uid); + nlattr_add_rule_uid(nw, PF_RT_GID, (const struct pf_rule_uid *)&rule->gid); + + nlattr_add_u32(nw, PF_RT_RULE_FLAG, rule->rule_flag); + nlattr_add_u8(nw, PF_RT_ACTION, rule->action); + nlattr_add_u8(nw, PF_RT_DIRECTION, rule->direction); + nlattr_add_u8(nw, PF_RT_LOG, rule->log); + nlattr_add_u8(nw, PF_RT_LOGIF, rule->logif); + nlattr_add_u8(nw, PF_RT_QUICK, rule->quick); + nlattr_add_u8(nw, PF_RT_IF_NOT, rule->ifnot); + nlattr_add_u8(nw, PF_RT_MATCH_TAG_NOT, rule->match_tag_not); + nlattr_add_u8(nw, PF_RT_NATPASS, rule->natpass); + nlattr_add_u8(nw, PF_RT_KEEP_STATE, rule->keep_state); + + nlattr_add_u8(nw, PF_RT_AF, rule->af); + nlattr_add_u8(nw, PF_RT_PROTO, rule->proto); + nlattr_add_u8(nw, PF_RT_TYPE, rule->type); + nlattr_add_u8(nw, PF_RT_CODE, rule->code); + nlattr_add_u8(nw, PF_RT_FLAGS, rule->flags); + nlattr_add_u8(nw, PF_RT_FLAGSET, rule->flagset); + nlattr_add_u8(nw, PF_RT_MIN_TTL, rule->min_ttl); + nlattr_add_u8(nw, PF_RT_ALLOW_OPTS, rule->allow_opts); + nlattr_add_u8(nw, PF_RT_RT, rule->rt); + nlattr_add_u8(nw, PF_RT_RETURN_TTL, rule->return_ttl); + nlattr_add_u8(nw, PF_RT_TOS, rule->tos); + nlattr_add_u8(nw, PF_RT_SET_TOS, rule->set_tos); + nlattr_add_u8(nw, PF_RT_ANCHOR_RELATIVE, rule->anchor_relative); + nlattr_add_u8(nw, PF_RT_ANCHOR_WILDCARD, rule->anchor_wildcard); + nlattr_add_u8(nw, PF_RT_FLUSH, rule->flush); + nlattr_add_u8(nw, PF_RT_PRIO, rule->prio); + nlattr_add_u8(nw, PF_RT_SET_PRIO, rule->set_prio[0]); + nlattr_add_u8(nw, PF_RT_SET_PRIO_REPLY, rule->set_prio[1]); + + nlattr_add_in6_addr(nw, PF_RT_DIVERT_ADDRESS, &rule->divert.addr.v6); + nlattr_add_u16(nw, PF_RT_DIVERT_PORT, rule->divert.port); + + nlattr_add_u64(nw, PF_RT_PACKETS_IN, pf_counter_u64_fetch(&rule->packets[0])); + nlattr_add_u64(nw, PF_RT_PACKETS_OUT, pf_counter_u64_fetch(&rule->packets[1])); + nlattr_add_u64(nw, PF_RT_BYTES_IN, pf_counter_u64_fetch(&rule->bytes[0])); + nlattr_add_u64(nw, PF_RT_BYTES_OUT, pf_counter_u64_fetch(&rule->bytes[1])); + nlattr_add_u64(nw, PF_RT_EVALUATIONS, pf_counter_u64_fetch(&rule->evaluations)); + nlattr_add_u64(nw, PF_RT_TIMESTAMP, pf_get_timestamp(rule)); + nlattr_add_u64(nw, PF_RT_STATES_CUR, counter_u64_fetch(rule->states_cur)); + nlattr_add_u64(nw, PF_RT_STATES_TOTAL, counter_u64_fetch(rule->states_tot)); + nlattr_add_u64(nw, PF_RT_SRC_NODES, counter_u64_fetch(rule->src_nodes)); + + error = pf_kanchor_copyout(ruleset, rule, anchor_call); + MPASS(error == 0); + + nlattr_add_string(nw, PF_RT_ANCHOR_CALL, anchor_call); + + if (attrs.clear) + pf_krule_clear_counters(rule); + + PF_RULES_WUNLOCK(); + + if (!nlmsg_end(nw)) { + error = ENOMEM; + goto out; + } + + return (0); +out: + nlmsg_abort(nw); + return (error); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -746,6 +1051,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_GETRULE, + .cmd_name = "GETRULE", + .cmd_cb = pf_handle_getrule, + .cmd_flags = GENL_CMD_CAP_DUMP | 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 d8b494a54cf7..51df8b7aece9 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -42,6 +42,7 @@ enum { PFNL_CMD_STOP = 4, PFNL_CMD_ADDRULE = 5, PFNL_CMD_GETRULES = 6, + PFNL_CMD_GETRULE = 7, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -117,6 +118,8 @@ enum pf_addr_type_t { PF_AT_TABLENAME = 4, /* string */ PF_AT_TYPE = 5, /* u8 */ PF_AT_IFLAGS = 6, /* u8 */ + PF_AT_TBLCNT = 7, /* u32 */ + PF_AT_DYNCNT = 8, /* u32 */ }; enum pfrule_addr_type_t { @@ -229,6 +232,16 @@ enum pf_rule_type_t { PF_RT_SET_PRIO_REPLY = 60, /* u8 */ PF_RT_DIVERT_ADDRESS = 61, /* in6_addr */ PF_RT_DIVERT_PORT = 62, /* u16 */ + PF_RT_PACKETS_IN = 63, /* u64 */ + PF_RT_PACKETS_OUT = 64, /* u64 */ + PF_RT_BYTES_IN = 65, /* u64 */ + PF_RT_BYTES_OUT = 66, /* u64 */ + PF_RT_EVALUATIONS = 67, /* u64 */ + PF_RT_TIMESTAMP = 68, /* u64 */ + PF_RT_STATES_CUR = 69, /* u64 */ + PF_RT_STATES_TOTAL = 70, /* u64 */ + PF_RT_SRC_NODES = 71, /* u64 */ + PF_RT_ANCHOR_CALL = 72, /* string */ }; enum pf_addrule_type_t { @@ -246,6 +259,7 @@ enum pf_getrules_type_t { PF_GR_ACTION = 2, /* u8 */ PF_GR_NR = 3, /* u32 */ PF_GR_TICKET = 4, /* u32 */ + PF_GR_CLEAR = 5, /* u8 */ }; #ifdef _KERNEL diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c index bdc205785bd4..38cc1eae419f 100644 --- a/sys/netpfil/pf/pf_ruleset.c +++ b/sys/netpfil/pf/pf_ruleset.c @@ -367,10 +367,10 @@ pf_kanchor_setup(struct pf_krule *r, const struct pf_kruleset *s, } int -pf_kanchor_nvcopyout(const struct pf_kruleset *rs, const struct pf_krule *r, - nvlist_t *nvl) +pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, + char *anchor_call) { - char anchor_call[MAXPATHLEN] = { 0 }; + anchor_call[0] = 0; if (r->anchor == NULL) goto done; @@ -408,11 +408,25 @@ pf_kanchor_nvcopyout(const struct pf_kruleset *rs, const struct pf_krule *r, sizeof(anchor_call)); done: - nvlist_add_string(nvl, "anchor_call", anchor_call); return (0); } +int +pf_kanchor_nvcopyout(const struct pf_kruleset *rs, const struct pf_krule *r, + nvlist_t *nvl) +{ + char anchor_call[MAXPATHLEN] = { 0 }; + int ret; + + ret = pf_kanchor_copyout(rs, r, anchor_call); + MPASS(ret == 0); + + nvlist_add_string(nvl, "anchor_call", anchor_call); + + return (ret); +} + int pf_keth_anchor_nvcopyout(const struct pf_keth_ruleset *rs, const struct pf_keth_rule *r, nvlist_t *nvl) @@ -460,52 +474,6 @@ done: return (0); } -int -pf_kanchor_copyout(const struct pf_kruleset *rs, const struct pf_krule *r, - struct pfioc_rule *pr) -{ - pr->anchor_call[0] = 0; - if (r->anchor == NULL) - return (0); - if (!r->anchor_relative) { - strlcpy(pr->anchor_call, "/", sizeof(pr->anchor_call)); - strlcat(pr->anchor_call, r->anchor->path, - sizeof(pr->anchor_call)); - } else { - char *a, *p; - int i; - - a = (char *)rs_malloc(MAXPATHLEN); - if (a == NULL) - return (1); - if (rs->anchor == NULL) - a[0] = 0; - else - strlcpy(a, rs->anchor->path, MAXPATHLEN); - for (i = 1; i < r->anchor_relative; ++i) { - if ((p = strrchr(a, '/')) == NULL) - p = a; - *p = 0; - strlcat(pr->anchor_call, "../", - sizeof(pr->anchor_call)); - } - if (strncmp(a, r->anchor->path, strlen(a))) { - printf("pf_anchor_copyout: '%s' '%s'\n", a, - r->anchor->path); - rs_free(a); - return (1); - } - if (strlen(r->anchor->path) > strlen(a)) - strlcat(pr->anchor_call, r->anchor->path + (a[0] ? - strlen(a) + 1 : 0), sizeof(pr->anchor_call)); - rs_free(a); - } - if (r->anchor_wildcard) - strlcat(pr->anchor_call, pr->anchor_call[0] ? "/*" : "*", - sizeof(pr->anchor_call)); - return (0); -} - void pf_kanchor_remove(struct pf_krule *r) { From nobody Fri Feb 2 16:55:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRMNG6cw8z595k2; Fri, 2 Feb 2024 16:55: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 4TRMNG5Lptz4VBH; Fri, 2 Feb 2024 16:55:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIO4aeBWqWJq41vJQ3f/Io5XBDM8g+SqCHXGlcW3FdU=; b=fOn1tYGQhfIAiutQcRTpn0z+GHaKSpTMlpK9Hc7t4yg85smT3lEvo0sLDOULDQ19HwSMD2 BIvN91ajpg0bJN7nM5BAwPMhRWMRa5R2i2XAsMZmvS9l4b+KBc5ALSnTuc84d5cKRY1k6Y Uc8mCulu/wLIDuVs/ousKOwCfOsEDlUMR1vIT4t3XYHthyiWKAYx70svqyfw/QjtdcgE9b wOSaOP+eGE8xyo5H0olIQVFiTP8zX7W+67LMIfLrjh+PWs6oYRk7rse4TCjCEkXLmkJ713 VwuXRu3s3rEJwcfDYjHveti/kGqrzZMuad4OOxe2G8PpUMUVvHNczQACm2KeHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706892942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIO4aeBWqWJq41vJQ3f/Io5XBDM8g+SqCHXGlcW3FdU=; b=EgL+rndrbQ7wjNwZJpBQUE9uMmpTwz2tGJXkC2WSLaSiRu7fbdnz0f+ME2GZBg4wcfcXc7 Lpu1cDT2AHa9jZd2qKsfotY69afMmtjkJe7oUMXJ6xHAc/MQLhNrHJzxRssLq4fTOVhYLK e6qyL0b07RH6qhn8wlwsFIVXDZn/K9bkZJfBz3Ksso6VgJ9C6wvcPHxzDlPNrZi0pP41P+ 4f7FIw0ilCOBQJV0ED4iKBY+QUTe92yfxOCHctX+Bj+G+DLn5gFL/facLLuKk76W7J++z1 XzEF+CbNqiL1IsO2Fl4UrNMNoQUiFIp9n6hlmmJizxD2ROdt1HjeUy9QtNfmrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706892942; a=rsa-sha256; cv=none; b=hrBxmB80SVE3L8Y/Tp0GjepX9sfyujT3AoVmK052hezcvOe/x6VIfTrTbB+gyFv7eMNrv2 5AGKtSBpVra+x9xkgdlSuV61YBh3UnxNOGM8D6XNqoMLUjgF18HV8iTXniA+a2TwBMLCxa X8+jLEBc6oCYSunS8lHAi+Tetnrfp6lvhFQKf5xFFXr6jyipGJNJv2FPJDKxOwEyVrxlqq YWmfcHmfQIlgGLbJIf0Y5TGBzSZ4P+ScoajFZTBwnhpuom7eOC6jwfgl7bgSpUPyGYYZdb ooeWWazBHuvmRma5UFpTbD9B6p3c1LMs9zjsqr2qPXAGkZnmUEo7m2Cf1va8zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRMNG4DQMzdsb; Fri, 2 Feb 2024 16:55: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 412GtgDj034663; Fri, 2 Feb 2024 16:55:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412GtgmU034660; Fri, 2 Feb 2024 16:55:42 GMT (envelope-from git) Date: Fri, 2 Feb 2024 16:55:42 GMT Message-Id: <202402021655.412GtgmU034660@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: 306d3fb23d7c - main - libpfct: fix incorrect array check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 306d3fb23d7ccbc327b6038df2088629daff87b4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=306d3fb23d7ccbc327b6038df2088629daff87b4 commit 306d3fb23d7ccbc327b6038df2088629daff87b4 Author: Kristof Provost AuthorDate: 2024-02-01 21:32:32 +0000 Commit: Kristof Provost CommitDate: 2024-02-02 16:55:16 +0000 libpfct: fix incorrect array check Reported by: Coverity Scan CID: 1523771 Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index cb9b377f7b6c..71546c4709c2 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -965,8 +965,8 @@ snl_add_msg_attr_rule_labels(struct snl_writer *nw, uint32_t type, const char la off = snl_add_msg_attr_nested(nw, type); - while (labels[i][0] != 0 && - i < PF_RULE_MAX_LABEL_COUNT) { + while (i < PF_RULE_MAX_LABEL_COUNT && + labels[i][0] != 0) { snl_add_msg_attr_string(nw, PF_LT_LABEL, labels[i]); i++; } From nobody Fri Feb 2 17:10:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRMj66pHRz5970f; Fri, 2 Feb 2024 17:10: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 4TRMj66Kjfz4XCd; Fri, 2 Feb 2024 17:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706893818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GqXHfoPC95r+ESpkudUU+hgQwL0/DGzB8rQkT3Pk/ow=; b=IdauPojJ2ZH0/JaGXhfYT97LT99J+TRe5USEV1bLLXAUhQ3Uhrlh0KERDQOzDgR1DPTom7 PUq2bLU+Ci+Ge/ubAK6Z8MmjroRPqS4IK5ZXeweKGRqHDezS3DFCEquuTrhYbvY4e3ezkN NZGXiHmhIJDdavEvah+IlrCV8mCsdh+xt9E68SoCNDNgM1iFoX70XS+q/LULByHA7hP0uV nA0QsICylggI7he1z6pMkwR7j6UK+1PAaRB6goL8ZOkw9Jq7RuDi/QZoxAvNqG/3ne3SHR g+OaekWHBIKF2+SaO8E+SwGIXD++3n5eEexzy5pKMR9Kq16Pa6hHGUoKo06n1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706893818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GqXHfoPC95r+ESpkudUU+hgQwL0/DGzB8rQkT3Pk/ow=; b=jpDaZfJdk1Nwd9I8Sb52PcAOPGK/gJ7u6/rLe3C/APRzfgMb80Ce83MSVlxa4QLQWkAtMh htdHR4SaeDF8VucFSVcwgYXJR7moGbCnlXcKBixFtK1AxQo+TlEjm2Qvz7dotEEDAc3EUV 0GBCDXV4E/G79jF6mMV7sn1sici47FWbBRvkjJ/3BwU6uTYU9EpmcgDihIP9SkC0zDVgc6 iD88RqjFHj58oqGsEsysOHJZKBcHalZJd1UTuN/Eg6fAIh2ZZ/+6Fm0NLZpmtweiTiGEJA Q6wPF9I75HQypShTk/oQi+Nm/vaxmivR08nFR/LBrBEScArxMlewh8G6q46uoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706893818; a=rsa-sha256; cv=none; b=ixdDj/t3nGeshHHI1uE5v8XvsdQMB/yqQ/4A2SefPvmdHuwF4rdvP8ItWrZ4hkxlvbltTS n5zT1vXGNmYOtla7hk1yWzBviJbecIK/hMqQ5t18wUu60tewSJWwt35d7bmmh+EZpVPi0l JihZEiAqIU3CA49V4ANfkVs3pQlphe+2yUNteeERc1jqXB8Ztuy3P8EI1lLQR2zhTxrZ1z XvE8Trz6VbZvxrIpIR6YagHUzO17JoshTpuE8qISrRkA5fKyJOnfTyOQ/hzkCDOpWI+x0W 9boBVnAiVxr6YIOUZnO2iu8SBR6ouGN1QvI9qOR3/pb/nr/YNn84AHOIKjH+6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRMj65NlGzfT6; Fri, 2 Feb 2024 17:10: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 412HAIWG061497; Fri, 2 Feb 2024 17:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412HAIBP061494; Fri, 2 Feb 2024 17:10:18 GMT (envelope-from git) Date: Fri, 2 Feb 2024 17:10:18 GMT Message-Id: <202402021710.412HAIBP061494@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: 0e867a491156 - main - aarch/SYS.h: implement _SYSCALL_BODY() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e867a49115687398fd486b3af67fbb41f48b8a8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0e867a49115687398fd486b3af67fbb41f48b8a8 commit 0e867a49115687398fd486b3af67fbb41f48b8a8 Author: Brooks Davis AuthorDate: 2024-02-02 17:08:55 +0000 Commit: Brooks Davis CommitDate: 2024-02-02 17:08:55 +0000 aarch/SYS.h: implement _SYSCALL_BODY() macro Add _SYSCALL_BODY() macro which invokes the syscall via _SYCALL() and calls cerror as required. Use to implement PSEUDO() and RSYSCALL(). Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D43058 --- lib/libc/aarch64/SYS.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libc/aarch64/SYS.h b/lib/libc/aarch64/SYS.h index af7f0200a0c7..07d14ab1bb44 100644 --- a/lib/libc/aarch64/SYS.h +++ b/lib/libc/aarch64/SYS.h @@ -40,21 +40,21 @@ * to jump around to use more capable unconditional branch * instruction. */ -#define PSEUDO(name) \ -ENTRY(__sys_##name); \ - WEAK_REFERENCE(__sys_##name, _##name); \ +#define _SYSCALL_BODY(name) \ _SYSCALL(name); \ b.cs 1f; \ ret; \ -1: b cerror; \ +1: b cerror + +#define PSEUDO(name) \ +ENTRY(__sys_##name); \ + WEAK_REFERENCE(__sys_##name, _##name); \ + _SYSCALL_BODY(name); \ END(__sys_##name) #define RSYSCALL(name) \ ENTRY(__sys_##name); \ WEAK_REFERENCE(__sys_##name, name); \ WEAK_REFERENCE(__sys_##name, _##name); \ - _SYSCALL(name); \ - b.cs 1f; \ - ret; \ -1: b cerror; \ + _SYSCALL_BODY(name); \ END(__sys_##name) From nobody Fri Feb 2 18:16:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRPB24Ynrz59CnZ; Fri, 2 Feb 2024 18:16: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 4TRPB241Hjz4flk; Fri, 2 Feb 2024 18:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706897818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mpvuzEQ0iRTO1ME4ecv8KqrSQXbIdPuFHlCNi9Ubw4=; b=UveuaU/Uifw9Jjqem5S+nuZBRK31CdxiP76OV8k/sOLg6mtqAj/s1u5Pj3zqbmf1n8JIQe 4k+KaAMNfvBBjOf1odgzXr4+CVYETYtaJgtZ+3JsgYgiV8fNQ3FnX3FsXR0ipUrn9WvKAD cZoqDaFXa3ouykc/m0UIbWDuw9gA9nVVxKYpRAS2dVCoDmCYNLnPOcF7UAwLi54zYQwMIe Iqx89di3ef2Ct0UnIJwirYAbCWkI6qzY2QzSs3mrr9c2C9rYaN/8qZNr49/Tche1WZousA ZH+iODMcbv/XPvT30LJ1mfGv1okvnpFN1k3xMTolq7D4vYDDrbCG4hSLG4ECpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706897818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mpvuzEQ0iRTO1ME4ecv8KqrSQXbIdPuFHlCNi9Ubw4=; b=dTwqMfISuKxkJfCL7VaUZbVPs34c1AcdN80zOIQuRIaK+CdY6IrXav4nqHTumqDMAWKMQA 6r9tkSXOEzjz1XJXZQlbZ9z6U2ZJvlXqgICYn04IBSNTzUiTA9rMN0QS9G8abEsMR3QpXO Dd/LVs2c90uRSMs7eNuilELqyCNM1XMW/o4XEe9Lb3TDv1ZV2pbfwdANV1tpamxgztqXvg KUFnyPUtW8vhrT6hY5WDFXIIGxwR87ewQ/zgugq7ucX61P9TewPJq1XcefERN58tqEcDc3 5LxHjYzxtf3LPlNPjCicMkrQ67ZlpWpnHkBQwpx1oQePCL8eQPeQs+NOLGW47g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706897818; a=rsa-sha256; cv=none; b=uiC7r30CDB7MJpkNq6SJAlO2xhPtaP7BOeSB3uVhaGpwudQiVHeo7z5PbQIzpKUOJpAQX7 4LAObsHJEyCkT41beyCIC8/+vTBZNQZVLyxwIv+yXbDGKOLU/BI7/peYGqFf8kGOioJp0/ WP3atL6Zr1iEQZmUF/HzYyyX9u2mP7jsf5+3aIWYDBVNs5knBeGCQRr/3TLoE8UHnyzTpb 5AM9tDWqr0P3ictzsL8gPMSsBfhYy8cOf7R2CPYvoYthVcRpriF+65G0VCs97bujzjSv14 t6iYF2rbasllpPO1RwhUul3K2/BiB32DX5iJqJlyIwVmc5DmWdaV8FpG+BohtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRPB2348xzh6q; Fri, 2 Feb 2024 18:16: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 412IGw0Z069962; Fri, 2 Feb 2024 18:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412IGwOP069959; Fri, 2 Feb 2024 18:16:58 GMT (envelope-from git) Date: Fri, 2 Feb 2024 18:16:58 GMT Message-Id: <202402021816.412IGwOP069959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 02b0d4b688cc - main - sys/cdefs.h: add __noexcept and __noexcept_if List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b0d4b688cc4deb14cb6e7534a2a4958e48b753 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=02b0d4b688cc4deb14cb6e7534a2a4958e48b753 commit 02b0d4b688cc4deb14cb6e7534a2a4958e48b753 Author: Lexi Winter AuthorDate: 2024-02-02 16:41:40 +0000 Commit: Warner Losh CommitDate: 2024-02-02 18:11:17 +0000 sys/cdefs.h: add __noexcept and __noexcept_if These macros provide the C++11 noexcept and noexcept(...) keywords if we're compiling in a C++11 environment. Otherwise, they expand to an empty string. This will be used to add the required noexcept specifier to several libc functions as required in C++11. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 --- sys/sys/cdefs.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index fcc90b4d8aee..206cc569c55a 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -358,6 +358,17 @@ #endif #endif +/* + * noexcept keyword added in C++11. + */ +#if defined(__cplusplus) && __cplusplus >= 201103L +#define __noexcept noexcept +#define __noexcept_if(__c) noexcept(__c) +#else +#define __noexcept +#define __noexcept_if(__c) +#endif + /* * We use `__restrict' as a way to define the `restrict' type qualifier * without disturbing older software that is unaware of C99 keywords. From nobody Fri Feb 2 18:16:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRPB35Y4fz59D5r; Fri, 2 Feb 2024 18:16: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 4TRPB34pg1z4fb4; Fri, 2 Feb 2024 18:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706897819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/T5kwJ4Z+eomLF/evriD5TJ4e2t9kOnTTpXB20Xo/FY=; b=JeEr+4SgSy3BjcSGrjco0jPzypb3THvDLYai6bizeCRUsjNVUZd0ASPhTs4XPCFxULNK+Y DGcB06uyMPimUvqm1Rh06qy5pXr82IRGi7dhbk+IjIZ2FvUpR6qXRFLUOsQJ6J+DYh7NgE waWdZ56a0kswBkolwM4bwZy8KxoGhgdln7+hdyJsj0s5R91gBDPa80kLo/AZvyEm93nLGJ 1d1ioKNKLz/en1F19z5/GUnZm5s9COuejGMG9TXpywxuTm6dsobVNbYSadFCHpPUTeGzxa yg0IFV3XVf6gdi5/vi8HA5hFHSDchhz41i6/hGA+3Bk4HHn+NMq/4lpJFg85Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706897819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/T5kwJ4Z+eomLF/evriD5TJ4e2t9kOnTTpXB20Xo/FY=; b=Enqj3HfY1diYgWwrGAnfWbrPcTN4IpwCG7lVbuq83fiDmssBE5W2X9/8zqdnaxZEsa/1vY cL4RfZxkGcduCh3XnTs3a8+4macyq7KYrIXM/g3Zpi5EeG4e5tEcYr5OntGTgBMwoatx03 b1YbhtwIq9QQsfNC3E784NBtut/zk4eyE1PBHz6swXwjH8A3YCtZzacyPVxQBFJfVuRcP2 516qF1prNgTfNYA99C8mSuF6sB9m6fw7SfZDF4WsE7C+JCuAJQg77nlMFL3Kku5Q1oc+2X vP7uFU9MABSIOJJAaKZPe8mDKhRMCDzsq0Wqjfn0XdXnOVsgWcgIG/67WDcKaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706897819; a=rsa-sha256; cv=none; b=umwkEnfLKZ/TAjKauaIvFm+UTBq82xl3KiK/dh+jNfz5YxaE7U0CcfTNMYi+oayYm2VN00 P5wo87XZaXaPpWDKrQblPs1dId7xv5ZamvOU01fXqpeicwTzYJFgY+vzBJKgFCQahzrRtx vq/4ScDjiAj5FvP+ytJ/IPMTqNAQ3m1PCL7eK4rRTxEXOtm41XbasXdpLj/luTtdvbFVUh U4tlak8uqwVnPgPWmf/SsxZpF2UOuvqm9fggFlT/AB/zMt0og+rIslkScY9iJ9hsqjX5hq JLEjLjfnrKTeR07iuIMDsKZf0+b2P/R09Wbo0hG/xR/P8KZAr99+ElNnHGyolg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRPB33vpczh4W; Fri, 2 Feb 2024 18:16: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 412IGxlH070012; Fri, 2 Feb 2024 18:16:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412IGxAl070009; Fri, 2 Feb 2024 18:16:59 GMT (envelope-from git) Date: Fri, 2 Feb 2024 18:16:59 GMT Message-Id: <202402021816.412IGxAl070009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c27a89971805 - main - stdlib.h: add __noexcept to prototypes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c27a89971805b176dcfa5a234f2ea6f6109d0a70 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c27a89971805b176dcfa5a234f2ea6f6109d0a70 commit c27a89971805b176dcfa5a234f2ea6f6109d0a70 Author: Lexi Winter AuthorDate: 2024-02-02 16:41:40 +0000 Commit: Warner Losh CommitDate: 2024-02-02 18:11:17 +0000 stdlib.h: add __noexcept to prototypes The noexcept specifier is required on these functions in C++: _Exit(), atexit(), quick_exit(), at_quick_exit(), abort(). MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 --- include/stdlib.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/stdlib.h b/include/stdlib.h index ff8991d1fa94..f0687f01e6c7 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -84,9 +84,9 @@ extern int __mb_cur_max; extern int ___mb_cur_max(void); #define MB_CUR_MAX ((size_t)___mb_cur_max()) -_Noreturn void abort(void); +_Noreturn void abort(void) __noexcept; int abs(int) __pure2; -int atexit(void (* _Nonnull)(void)); +int atexit(void (* _Nonnull)(void)) __noexcept; double atof(const char *); int atoi(const char *); long atol(const char *); @@ -154,7 +154,7 @@ unsigned long long strtoull(const char * __restrict, char ** __restrict, int); #endif /* __LONG_LONG_SUPPORTED */ -_Noreturn void _Exit(int); +_Noreturn void _Exit(int) __noexcept; #endif /* __ISO_C_VISIBLE >= 1999 */ /* @@ -163,9 +163,9 @@ _Noreturn void _Exit(int); #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); -int at_quick_exit(void (*)(void)); +int at_quick_exit(void (*)(void)) __noexcept; _Noreturn void - quick_exit(int); + quick_exit(int) __noexcept; #endif /* __ISO_C_VISIBLE >= 2011 */ /* * Extensions made by POSIX relative to C. From nobody Fri Feb 2 18:28:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRPR11Vkzz59Dql; Fri, 2 Feb 2024 18:28: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 4TRPR10wWkz4gtx; Fri, 2 Feb 2024 18:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706898493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlY1YF+/Vt5smMl/vLTprrf7OdeTI2STXtSSuV+QX1c=; b=gTe18f6IQcoJWNWQkW6s/v/H19Kmpi/OjXLnX7IkudcHokBqdD2hN6m1vqygGe8eu0Y+0s E2e4MFSeZnvsU/c8gPb4qtEHI031chj5ZrnvfgzWTvke7NaxoWd39PBOD/CuqFYiwD8LA0 ayYRJq3MU1KlhKGMkun989CFlnbEeGPEIS7aIEGpyugBAG3SVL5kqujmhSMGhcrj7EpFi1 sY12UtKr8H5fIh2IWREKuPHI74msXB7xE85u3mwqmCsV1Z12pCPR330YsQPqR+58BCa3yN 7oHHPRoeW8NQXmS5otDXF8zQYHDbtC2eBAfRH/693Qs9CCyxHnBTqQ5Hgwhe8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706898493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WlY1YF+/Vt5smMl/vLTprrf7OdeTI2STXtSSuV+QX1c=; b=X54UdVydA4AWiBUjrzTjRBvQTemy0QSMoynq4DDIKmo9xB16SLRjkrafC0omWR7k76WRft WOY7lg49q6HuosdnhvfKaOe9l5x60dY7VeFlvZ6q5spmiEfrJx59JEYO4xgtNHYJpxwdwv vTjEloN69Kyg0dLD5ODUbhYRGxz+3qFan15+jBgU0eA4mwpXC0IWDBxA/8R6AbSdtzip2P xGU8lIY8iXnRIzyHRuxDa4G0e/dTFJg752wIE10J5KFcDRdFfA23L373jkh8C8iMOL/Rvi O4HPH0BjpyLP0excQti5BMzLlTzMFHIfFLTuVpMKpKgwsxaIgSk2toZewVzJUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706898493; a=rsa-sha256; cv=none; b=nYHhVu2h3YpDDLGE8JWjm+HhOoup2re79r+tE9tooLKRkqdwhKY2vulqo7KxAZcs2hIj9F yVRYQdv1EqFF2X4asUc0rrOSjmWli/ox+ycShFdz90EHXrvjqIR0QsI0jIM0SeGYsI2I1P v0TwXefJ9Mbg4wEPmKw3sDUkiLSOyaTh7ws17OhumPoSBHbXljbcvhdnbX28EeDk23AhXr GOK3nki4I6XQrKD13nIEDQaNDa80eqkTHWcIijW4FFiBYnXMXoeHtDIFm7ZkyB5MBQj+oe hIme8SzHk3VLzhsyEzagIOxmtL4wwnencpwwHl1DRa0doIwcXCdgJ4v+49XhRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRPR074hkzhVj; Fri, 2 Feb 2024 18:28: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 412ISC31086853; Fri, 2 Feb 2024 18:28:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412ISC4g086850; Fri, 2 Feb 2024 18:28:12 GMT (envelope-from git) Date: Fri, 2 Feb 2024 18:28:12 GMT Message-Id: <202402021828.412ISC4g086850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4b1d3a30914e - main - daily/223.backup-zfs: improve daily_backup_zfs_verbose behaviour List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b1d3a30914e176e9fd2c363db81c26124a8ee30 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b1d3a30914e176e9fd2c363db81c26124a8ee30 commit 4b1d3a30914e176e9fd2c363db81c26124a8ee30 Author: Lexi Winter AuthorDate: 2024-02-02 18:18:54 +0000 Commit: Warner Losh CommitDate: 2024-02-02 18:27:05 +0000 daily/223.backup-zfs: improve daily_backup_zfs_verbose behaviour - 223.backup-zfs would previously honour the daily_backup_zfs_verbose flag for zfs/zpool list, but not for the properties list. fix it to show a diff for both of these if requested. - if daily_backup_zfs_verbose was disabled, 223.backup-zfs would still set rc=1 if the backup files changed, which caused periodic(8) to send a useless email even if daily_show_success=NO was set. change this so that it only sets rc=1 if diff output is enabled, i.e. the output is actually useful to the admin. MFC after: 2 weeks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1091 --- usr.sbin/periodic/etc/daily/223.backup-zfs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/223.backup-zfs b/usr.sbin/periodic/etc/daily/223.backup-zfs index a49bbb2eaa04..e76421220a0b 100755 --- a/usr.sbin/periodic/etc/daily/223.backup-zfs +++ b/usr.sbin/periodic/etc/daily/223.backup-zfs @@ -13,6 +13,7 @@ then fi bak_dir=/var/backups +rc=0 rotate() { base_name=$1 @@ -20,12 +21,13 @@ rotate() { file="$bak_dir/$base_name" if [ -f "${file}.bak" ] ; then - rc=0 if cmp -s "${file}.bak" "${file}.tmp"; then rm "${file}.tmp" else - rc=1 - [ -n "$show_diff" ] && diff ${daily_diff_flags} "${file}.bak" "${file}.tmp" + if [ -n "$show_diff" ]; then + rc=1 + diff ${daily_diff_flags} "${file}.bak" "${file}.tmp" + fi mv "${file}.bak" "${file}.bak2" || rc=3 mv "${file}.tmp" "${file}.bak" || rc=3 fi @@ -36,6 +38,7 @@ rotate() { fi } +show="" case "$daily_backup_zfs_verbose" in [Yy][Ee][Ss]) show="YES" esac @@ -43,9 +46,9 @@ esac case "$daily_backup_zfs_enable" in [Yy][Ee][Ss]) - zpools=$(zpool list $daily_backup_zpool_list_flags) + zpools=$(zpool list $daily_backup_zpool_list_flags) - if [ -z "$zpools" ]; then + if [ -z "$zpools" ]; then echo 'daily_backup_zfs_enable is set to YES but no zpools found.' rc=2 else @@ -59,18 +62,17 @@ case "$daily_backup_zfs_enable" in rotate "zfs_list" $show fi ;; - *) rc=0;; esac case "$daily_backup_zfs_props_enable" in - [Yy][Ee][Ss]) + [Yy][Ee][Ss]) - zfs get $daily_backup_zfs_get_flags > "$bak_dir/zfs_props.tmp" - rotate "zfs_props" + zfs get $daily_backup_zfs_get_flags > "$bak_dir/zfs_props.tmp" + rotate "zfs_props" $show - zpool get $daily_backup_zpool_get_flags > "$bak_dir/zpool_props.tmp" - rotate "zpool_props" - ;; + zpool get $daily_backup_zpool_get_flags > "$bak_dir/zpool_props.tmp" + rotate "zpool_props" $show + ;; esac exit $rc From nobody Fri Feb 2 18:28:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRPRq6JNgz59FHj; Fri, 2 Feb 2024 18:28:55 +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 4TRPRq0qXjz4hL4; Fri, 2 Feb 2024 18:28:55 +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.17.1/8.17.1) with ESMTP id 412ISfdP019665; Fri, 2 Feb 2024 20:28:44 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 412ISfdP019665 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 412ISfAb019663; Fri, 2 Feb 2024 20:28:41 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 2 Feb 2024 20:28:41 +0200 From: Konstantin Belousov To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c27a89971805 - main - stdlib.h: add __noexcept to prototypes Message-ID: References: <202402021816.412IGxAl070009@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202402021816.412IGxAl070009@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-Rspamd-Queue-Id: 4TRPRq0qXjz4hL4 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] On Fri, Feb 02, 2024 at 06:16:59PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c27a89971805b176dcfa5a234f2ea6f6109d0a70 > > commit c27a89971805b176dcfa5a234f2ea6f6109d0a70 > Author: Lexi Winter > AuthorDate: 2024-02-02 16:41:40 +0000 > Commit: Warner Losh > CommitDate: 2024-02-02 18:11:17 +0000 > > stdlib.h: add __noexcept to prototypes > > The noexcept specifier is required on these functions in C++: > _Exit(), atexit(), quick_exit(), at_quick_exit(), abort(). > > MFC after: 2 weeks > > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 > --- > include/stdlib.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/stdlib.h b/include/stdlib.h > index ff8991d1fa94..f0687f01e6c7 100644 > --- a/include/stdlib.h > +++ b/include/stdlib.h > @@ -84,9 +84,9 @@ extern int __mb_cur_max; > extern int ___mb_cur_max(void); > #define MB_CUR_MAX ((size_t)___mb_cur_max()) > > -_Noreturn void abort(void); > +_Noreturn void abort(void) __noexcept; > int abs(int) __pure2; > -int atexit(void (* _Nonnull)(void)); > +int atexit(void (* _Nonnull)(void)) __noexcept; > double atof(const char *); > int atoi(const char *); > long atol(const char *); > @@ -154,7 +154,7 @@ unsigned long long > strtoull(const char * __restrict, char ** __restrict, int); > #endif /* __LONG_LONG_SUPPORTED */ > > -_Noreturn void _Exit(int); > +_Noreturn void _Exit(int) __noexcept; > #endif /* __ISO_C_VISIBLE >= 1999 */ > > /* > @@ -163,9 +163,9 @@ _Noreturn void _Exit(int); > #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L > void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) > __alloc_size(2); > -int at_quick_exit(void (*)(void)); > +int at_quick_exit(void (*)(void)) __noexcept; > _Noreturn void > - quick_exit(int); > + quick_exit(int) __noexcept; This is wrong, libc quick_exit() does not provide such guarantees as implemented. More, being part of libc it cannot ever guarantee that ever (and call std::terminate if the requirement is violated). Making it such would require bringing some C++ ABI into libc which I object strongly. > #endif /* __ISO_C_VISIBLE >= 2011 */ > /* > * Extensions made by POSIX relative to C. From nobody Fri Feb 2 18:36:35 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRPcy3wMQz59Fq5 for ; Fri, 2 Feb 2024 18:36:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRPcy2Bmlz4hyy for ; Fri, 2 Feb 2024 18:36:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5600c43caddso398131a12.2 for ; Fri, 02 Feb 2024 10:36:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706899007; x=1707503807; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=47aD4gdEdOcTJBHHdjcWMq/LJwu2uJ4DpCWhYm6q4yY=; b=rC6G2VfKPUtdZfgVf3QJZYbTOGNnj3PF/7I33DURXTW9pdhqZJB2/JRhy9colBK1vM ISgzoJoz4sOUFMMeMB1YAk7adjKOP82ai+8a52bQ+6OgEuXySVNNxeLVynN1xvX/wsTX Jo4IZ1r1hByR/MMnLCRUtMeiQD5283mQlei3fXn48v9d5vIg9sN4EA247UHCI4L4yL1C fTsoG9vKBQhqUXGcZBpvnfnDW31FD8DQMNA+MF6fj40yjjNFdIReqLe8Akw+ipDy3kAN WhXYpwYvg0rb27bNE+EuLQAJ+iGi71k83gknUO4itWybEYmY+R9AgCXdYB0zVkwg5ag+ X8pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706899007; x=1707503807; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=47aD4gdEdOcTJBHHdjcWMq/LJwu2uJ4DpCWhYm6q4yY=; b=JX5CT1tCpDrsad/1bQUJUs8DxkjxXJ2qzj925upkTp4wTD7aDqSfWICSLoYSvDuBjk Ga2eVGjPWW8zirvm/oaxIxY/AtFe6yN6S3MewzIRwaQ4fluQ/bE6JIAnEDt3c7oZ12Cy xDWdyEXgSv178U0enw+ex13vxPtOAWddvOzgwKyre3ArmRBQvnEGiZT4bpTxe8Fs+AJv 5/GgrphTD3GMERS3Abtx6ZD5FGzFkfVKAqZZUKDqhErEVytaNTEpnxedciWYF2DB3sUq TLIpBPp8FtOxvlOiExRVL3TiWJiO8qLZwFG9IRUuNorBE2z7uwspuos951F1UcjIipZw Elhg== X-Gm-Message-State: AOJu0YxL8ZRQebugF8zXkJDx5HeurVOSr1uPn6VDn99vJIJ+vciGHgHo 7qiVrttPvP0tJg21uO3JnxfEpiqOtORF0eFs6o1HIB5XFpoJqhb9pwVvVzUCU6M7TsHmIK0jNJ5 9PKiJhqvAPNPqDWhwdrU1Ac7PF4DFQ2yEUJTXMQ== X-Google-Smtp-Source: AGHT+IHVFbLec/8QVWOsYFP3IGFngyLqN0NWhFcTWEXZ69zqWuwjwLq7+ydS/GsNeg0SZ/5UF3ETzI7kC1gGsa4frX8= X-Received: by 2002:aa7:d890:0:b0:560:799:f802 with SMTP id u16-20020aa7d890000000b005600799f802mr347291edq.21.1706899007419; Fri, 02 Feb 2024 10:36:47 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402021816.412IGxAl070009@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 2 Feb 2024 11:36:35 -0700 Message-ID: Subject: Re: git: c27a89971805 - main - stdlib.h: add __noexcept to prototypes To: Konstantin Belousov Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000000149be06106a659a" X-Rspamd-Queue-Id: 4TRPcy2Bmlz4hyy 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:15169, ipnet:2a00:1450::/32, country:US] --0000000000000149be06106a659a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Feb 2, 2024, 11:28=E2=80=AFAM Konstantin Belousov wrote: > On Fri, Feb 02, 2024 at 06:16:59PM +0000, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc27a89971805b176dcfa5a234f2ea6f= 6109d0a70 > > > > commit c27a89971805b176dcfa5a234f2ea6f6109d0a70 > > Author: Lexi Winter > > AuthorDate: 2024-02-02 16:41:40 +0000 > > Commit: Warner Losh > > CommitDate: 2024-02-02 18:11:17 +0000 > > > > stdlib.h: add __noexcept to prototypes > > > > The noexcept specifier is required on these functions in C++: > > _Exit(), atexit(), quick_exit(), at_quick_exit(), abort(). > > > > MFC after: 2 weeks > > > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 > > --- > > include/stdlib.h | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/include/stdlib.h b/include/stdlib.h > > index ff8991d1fa94..f0687f01e6c7 100644 > > --- a/include/stdlib.h > > +++ b/include/stdlib.h > > @@ -84,9 +84,9 @@ extern int __mb_cur_max; > > extern int ___mb_cur_max(void); > > #define MB_CUR_MAX ((size_t)___mb_cur_max()) > > > > -_Noreturn void abort(void); > > +_Noreturn void abort(void) __noexcept; > > int abs(int) __pure2; > > -int atexit(void (* _Nonnull)(void)); > > +int atexit(void (* _Nonnull)(void)) __noexcept; > > double atof(const char *); > > int atoi(const char *); > > long atol(const char *); > > @@ -154,7 +154,7 @@ unsigned long long > > strtoull(const char * __restrict, char ** __restrict, int); > > #endif /* __LONG_LONG_SUPPORTED */ > > > > -_Noreturn void _Exit(int); > > +_Noreturn void _Exit(int) __noexcept; > > #endif /* __ISO_C_VISIBLE >=3D 1999 */ > > > > /* > > @@ -163,9 +163,9 @@ _Noreturn void _Exit(int); > > #if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L > > void * aligned_alloc(size_t, size_t) __malloc_like > __alloc_align(1) > > __alloc_size(2); > > -int at_quick_exit(void (*)(void)); > > +int at_quick_exit(void (*)(void)) __noexcept; > > _Noreturn void > > - quick_exit(int); > > + quick_exit(int) __noexcept; > This is wrong, libc quick_exit() does not provide such guarantees as > implemented. More, being part of libc it cannot ever guarantee that ever > (and call std::terminate if the requirement is violated). > > Making it such would require bringing some C++ ABI into libc which I > object strongly. > So is this just for quick_exit, or all the functions marked? Warner > > #endif /* __ISO_C_VISIBLE >=3D 2011 */ > > /* > > * Extensions made by POSIX relative to C. > --0000000000000149be06106a659a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Fri, Feb 2, 2024, 11:28=E2=80=AFAM Konstantin Belou= sov <kostikbel@gmail.com> = wrote:
On Fri, Feb 02, 2024 at 06:1= 6:59PM +0000, Warner Losh wrote:
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc27a89971805b176dcfa5a234f2ea6= f6109d0a70
>
> commit c27a89971805b176dcfa5a234f2ea6f6109d0a70
> Author:=C2=A0 =C2=A0 =C2=A0Lexi Winter <lexi@le-Fay.ORG>
> AuthorDate: 2024-02-02 16:41:40 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2024-02-02 18:11:17 +0000
>
>=C2=A0 =C2=A0 =C2=A0stdlib.h: add __noexcept to prototypes
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0The noexcept specifier is required on these functio= ns in C++:
>=C2=A0 =C2=A0 =C2=A0_Exit(), atexit(), quick_exit(), at_quick_exit(), a= bort().
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Reviewed by: imp
>=C2=A0 =C2=A0 =C2=A0Pull Request: htt= ps://github.com/freebsd/freebsd-src/pull/1085
> ---
>=C2=A0 include/stdlib.h | 10 +++++-----
>=C2=A0 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/stdlib.h b/include/stdlib.h
> index ff8991d1fa94..f0687f01e6c7 100644
> --- a/include/stdlib.h
> +++ b/include/stdlib.h
> @@ -84,9 +84,9 @@ extern int __mb_cur_max;
>=C2=A0 extern int ___mb_cur_max(void);
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 MB_CUR_MAX=C2=A0 =C2=A0 =C2=A0 ((siz= e_t)___mb_cur_max())
>=C2=A0
> -_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 abort(void);
> +_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 abort(void) __noexcept;
>=C2=A0 int=C2=A0 =C2=A0abs(int) __pure2;
> -int=C2=A0 =C2=A0atexit(void (* _Nonnull)(void));
> +int=C2=A0 =C2=A0atexit(void (* _Nonnull)(void)) __noexcept;
>=C2=A0 double=C2=A0 =C2=A0 =C2=A0 =C2=A0 atof(const char *);
>=C2=A0 int=C2=A0 =C2=A0atoi(const char *);
>=C2=A0 long=C2=A0 atol(const char *);
> @@ -154,7 +154,7 @@ unsigned long long
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 strtoull(const char * __restrict, char ** _= _restrict, int);
>=C2=A0 #endif /* __LONG_LONG_SUPPORTED */
>=C2=A0
> -_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 _Exit(int);
> +_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 _Exit(int) __noexcept;
>=C2=A0 #endif /* __ISO_C_VISIBLE >=3D 1999 */
>=C2=A0
>=C2=A0 /*
> @@ -163,9 +163,9 @@ _Noreturn void=C2=A0 =C2=A0 =C2=A0_Exit(int);
>=C2=A0 #if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L<= br> >=C2=A0 void *=C2=A0 =C2=A0 =C2=A0 =C2=A0aligned_alloc(size_t, size_t) _= _malloc_like __alloc_align(1)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size(2);
> -int=C2=A0 at_quick_exit(void (*)(void));
> +int=C2=A0 at_quick_exit(void (*)(void)) __noexcept;
>=C2=A0 _Noreturn void
> -=C2=A0 =C2=A0 =C2=A0quick_exit(int);
> +=C2=A0 =C2=A0 =C2=A0quick_exit(int) __noexcept;
This is wrong, libc quick_exit() does not provide such guarantees as
implemented. More, being part of libc it cannot ever guarantee that ever (and call std::terminate if the requirement is violated).

Making it such would require bringing some C++ ABI into libc which I
object strongly.

So is this just for quick_exit, or all the functions marked= ?

Warner=C2=A0


>=C2=A0 #endif /* __ISO_C_VISIBLE >=3D 2011 */
>=C2=A0 /*
>=C2=A0 =C2=A0* Extensions made by POSIX relative to C.
--0000000000000149be06106a659a-- From nobody Fri Feb 2 18:53:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQ014kd0z59GmV; Fri, 2 Feb 2024 18: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 4TRQ014Chtz4k5T; Fri, 2 Feb 2024 18: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=1706900001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VXDRLIMWXrDGazfEZko9EPAsqQfzlMO97LjCzl8TVa0=; b=DLpJyr2gvPIY4RcuY1X4ufjfyq46DTi0jVjrCsXvX7J/vbjUbtEhrON3aRdvCK0eXsHX0W rdHHiKMHpt7WyrV2S9TNfQs8S8r/Xltj9+wHVzvDp6oFE9q8526eVtxQ9RyFQmFw2xkJec sjbeLmoIve89myWDiusCXElcDnqPiIo79UMSxfKrsO9xHyNrhs7ytKxL7Y+g3A3JQ8DIAK 1ZEvQAjjatFH4WE3a9PHGEp1PEjpONGUhwB+1zyceEKhoqICHLdT9y0YzWu3Surgcm3WXp DfWY1+rAPn337aGIOUVIxU8hT7MbsIiyvFfLQtMIK3/YKN9s++2VUMrE28zt9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VXDRLIMWXrDGazfEZko9EPAsqQfzlMO97LjCzl8TVa0=; b=ZnJjisvDLwFqiMcXHggMMTSFGQuyh6naGAbA3Ry5DE5JMIrlGvyjHxFNBpIAkwZ+9TCjOb dCRGhOXK4kSGojJGShT+UsBfkaG4KO3w/nNTF/XO9GuRehWym1HpL5uJZql8dwoY7wl5jy WKYRJOPTUUNKMgGVFWJRSpaW5Ih7Chi2uNzklp+SHt0+CzlQKWzMwCrlwxeli8A2MzZj0O 40iHKoItRaVOI6BcNvcAaDhFdiqDDkJMFVi3tHFI7vGRK2iTCVFY4c6yojANoSQGEsG/3L 1Z9vepYNe6NBU5ztF26KbYeVlUfEgo4ZJas0sFs2NMtdjrTvqfgMqO8hSZtTCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900001; a=rsa-sha256; cv=none; b=oGMCONpeJS80s1l0QPHXMvUQ03aa8oF+eQ2BoZ18qFIyoyfVu9r1gCu5UTRt4q0HU6jkTW ifScYcr5mvcoPgQQY2z3cGGLovuRIfh7y18S+ob6UjjJFwuI4heZK3wNm4h5igrkDlY5To rkl+YhbWEZjn1ONSWoTux0Sh69IJKmynbSTE/a4trXcCvuacUJ1vTNrr1AytFc+EVzO2Fi ulSo9+TLHmScBjKwZneysrPBrxerTAc3fMXexm2TASGowsjPljSHeN+1PC9+jyOA5Cs1Ub IBU4EUNyRo22wS88JhuS5Z9YhNBYgn0MzKt/ZA7cMECwCBICpMu4kYrgcv6iVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQ013GLKzhkl; Fri, 2 Feb 2024 18: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 412IrLLX036254; Fri, 2 Feb 2024 18:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412IrLw7036251; Fri, 2 Feb 2024 18:53:21 GMT (envelope-from git) Date: Fri, 2 Feb 2024 18:53:21 GMT Message-Id: <202402021853.412IrLw7036251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 619f455b8fc9 - main - regex: fix freeing g->charjump in low memory condition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 619f455b8fc9d05b50822387d3203f74c86fcb5c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=619f455b8fc9d05b50822387d3203f74c86fcb5c commit 619f455b8fc9d05b50822387d3203f74c86fcb5c Author: Corinna Vinschen AuthorDate: 2024-02-02 18:30:39 +0000 Commit: Warner Losh CommitDate: 2024-02-02 18:51:54 +0000 regex: fix freeing g->charjump in low memory condition computejumps() moves g->charjump to a position relativ to the value of CHAR_MIN. As such, g->charjump doesn't necessarily point to the address actually allocated. While regfree() takes that into account, the low memory handling in regcomp_internal() doesn't. Fix that by free'ing the actually allocated address, as in regfree(). MFC After: 2 weeks Reviewed by: imp,jrtc27 Pull Request: https://github.com/freebsd/freebsd-src/pull/692 --- lib/libc/regex/regcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 89b96b00fefb..7481d3ecf240 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -321,7 +321,7 @@ regcomp_internal(regex_t * __restrict preg, computejumps(p, g); computematchjumps(p, g); if(g->matchjump == NULL && g->charjump != NULL) { - free(g->charjump); + free(&g->charjump[CHAR_MIN]); g->charjump = NULL; } } From nobody Fri Feb 2 18:59:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQ6t0RR1z59HJ1; Fri, 2 Feb 2024 18:59:18 +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 4TRQ6s5hRpz4kgn; Fri, 2 Feb 2024 18:59:17 +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.17.1/8.17.1) with ESMTP id 412Ix9V0027120; Fri, 2 Feb 2024 20:59:12 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 412Ix9V0027120 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 412Ix9r4027119; Fri, 2 Feb 2024 20:59:09 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 2 Feb 2024 20:59:09 +0200 From: Konstantin Belousov To: Warner Losh Cc: Warner Losh , src-committers , "" , "" Subject: Re: git: c27a89971805 - main - stdlib.h: add __noexcept to prototypes Message-ID: References: <202402021816.412IGxAl070009@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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-Rspamd-Queue-Id: 4TRQ6s5hRpz4kgn 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] On Fri, Feb 02, 2024 at 11:36:35AM -0700, Warner Losh wrote: > On Fri, Feb 2, 2024, 11:28 AM Konstantin Belousov > wrote: > > > On Fri, Feb 02, 2024 at 06:16:59PM +0000, Warner Losh wrote: > > > The branch main has been updated by imp: > > > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=c27a89971805b176dcfa5a234f2ea6f6109d0a70 > > > > > > commit c27a89971805b176dcfa5a234f2ea6f6109d0a70 > > > Author: Lexi Winter > > > AuthorDate: 2024-02-02 16:41:40 +0000 > > > Commit: Warner Losh > > > CommitDate: 2024-02-02 18:11:17 +0000 > > > > > > stdlib.h: add __noexcept to prototypes > > > > > > The noexcept specifier is required on these functions in C++: > > > _Exit(), atexit(), quick_exit(), at_quick_exit(), abort(). > > > > > > MFC after: 2 weeks > > > > > > Reviewed by: imp > > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 > > > --- > > > include/stdlib.h | 10 +++++----- > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > > > diff --git a/include/stdlib.h b/include/stdlib.h > > > index ff8991d1fa94..f0687f01e6c7 100644 > > > --- a/include/stdlib.h > > > +++ b/include/stdlib.h > > > @@ -84,9 +84,9 @@ extern int __mb_cur_max; > > > extern int ___mb_cur_max(void); > > > #define MB_CUR_MAX ((size_t)___mb_cur_max()) > > > > > > -_Noreturn void abort(void); > > > +_Noreturn void abort(void) __noexcept; > > > int abs(int) __pure2; > > > -int atexit(void (* _Nonnull)(void)); > > > +int atexit(void (* _Nonnull)(void)) __noexcept; > > > double atof(const char *); > > > int atoi(const char *); > > > long atol(const char *); > > > @@ -154,7 +154,7 @@ unsigned long long > > > strtoull(const char * __restrict, char ** __restrict, int); > > > #endif /* __LONG_LONG_SUPPORTED */ > > > > > > -_Noreturn void _Exit(int); > > > +_Noreturn void _Exit(int) __noexcept; > > > #endif /* __ISO_C_VISIBLE >= 1999 */ > > > > > > /* > > > @@ -163,9 +163,9 @@ _Noreturn void _Exit(int); > > > #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L > > > void * aligned_alloc(size_t, size_t) __malloc_like > > __alloc_align(1) > > > __alloc_size(2); > > > -int at_quick_exit(void (*)(void)); > > > +int at_quick_exit(void (*)(void)) __noexcept; > > > _Noreturn void > > > - quick_exit(int); > > > + quick_exit(int) __noexcept; > > This is wrong, libc quick_exit() does not provide such guarantees as > > implemented. More, being part of libc it cannot ever guarantee that ever > > (and call std::terminate if the requirement is violated). > > > > Making it such would require bringing some C++ ABI into libc which I > > object strongly. > > > > So is this just for quick_exit, or all the functions marked? Other functions are abort()/_Exit()/atexit(). No functions in this list call a user-provided functions, so they cannot raise exceptions. My objection is only against our quick_exit(). > > Warner > > > > > #endif /* __ISO_C_VISIBLE >= 2011 */ > > > /* > > > * Extensions made by POSIX relative to C. > > From nobody Fri Feb 2 19:01:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQ9C1m9Gz59HRg; Fri, 2 Feb 2024 19:01: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 4TRQ9C1B5Gz4lHr; Fri, 2 Feb 2024 19:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DjEt0Uxq+cd36jaYcq0/0E7H9AcBKgdENWmlFjITGzQ=; b=L0qN03DYyJjQlnwC+0hB2NpWHdBd4Pwc+G0KUahAR77/5G7oUvcKquJ6imQG/yBEqOPXFz Vip1bK4eQn02GuY1VFYS3xrJlhIlj+XJuNLogYATzlOMEe4/t6iw2/tDfVjeUF0HbdWVGF T29ABnMMWTAr0bpVmAHKdLDgwaN5jIfwhcJlAMMgpVWjrSo1LcuvDzspI0YwRWiYwp9fLa ZGLBCa2vbp4rYpb4DkuZMda4cyAZXc7s7XbKns1E5vyxci9ochlGbvCDP/MkynoLfCM1lE jpW6MmA8LwB2xTDa3ylFZMzl+hEhmdTJew+szpv42wgIOFjEEyKLHPFwZzp+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DjEt0Uxq+cd36jaYcq0/0E7H9AcBKgdENWmlFjITGzQ=; b=DXoJw2iPO/hCa/N/Jjf+0R4E3joKNaPIh3j4BEeobw6bE0+b49Tc7PEaBHl9j8DLhDrDI5 L2hS7bl4+LoEypkkaSpcXav8h4WGdhmxs8ypE8RTycsBYD+K159OBXogv12ZyCFCwcqd6f v3DMGUSsrqNEVgYxAqQirSXgx/vkV0ySn6mzqYvb7X1EtQTRDoTlrExC+dKamljERgiWgX SD4T2c3+2xlLJ9nAohtkoPOSwhn9IsM5jdjY+sECQV5/cLxs8Gj8WHo4NqZHn08z3/cMxM c8YMUu4US5NAWMW4SxB95LdAIf13FiLaK75VtwJHsVG2iIsN31yniMGpFdK6Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900479; a=rsa-sha256; cv=none; b=uk+14n5xD/Qiu3KWpbBv6tCAZTl3SaxbFOq5CquC9hPturFGqgUdaHV2u2dd/0xbscw7oz dCBDrwfe5w4oQ8+sJZN74ovdoTtfsH2z8G8QlZZpAmZ/aTnJLj4OXf0vaW4c3FlP18n3G3 UfHh0QjrDT7mSO/bB+aWIsJ3EYRIDGoaw+9E0vKFSXSR41nf49KhDJ8Pu1/wQX5fTjtklJ XvuhC+dAKKsTKgH8YTuxZW0ceXvTsH4uxFjGzV/MjoF2yiDrt+SkQYPjHdQkKZ/3y1sIsR Hdq2gZD7AXXwNveV/8NcCTze3yWNGkpX3IIjYJPLY8jiIWvvg6chHiWabbZclQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQ9C0DQHzjJ4; Fri, 2 Feb 2024 19:01: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 412J1IrQ049069; Fri, 2 Feb 2024 19:01:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J1IjY049066; Fri, 2 Feb 2024 19:01:18 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:01:18 GMT Message-Id: <202402021901.412J1IjY049066@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: 30f8cb812e27 - main - socket: Don't assume m0 != NULL in sbappendcontrol_locked() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30f8cb812e27d8ab40a2c0669ac20a8ee45a7c56 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=30f8cb812e27d8ab40a2c0669ac20a8ee45a7c56 commit 30f8cb812e27d8ab40a2c0669ac20a8ee45a7c56 Author: Mark Johnston AuthorDate: 2024-02-02 18:58:37 +0000 Commit: Mark Johnston CommitDate: 2024-02-02 19:00:37 +0000 socket: Don't assume m0 != NULL in sbappendcontrol_locked() Some callers (e.g., ktls_decrypt()) violate this assumption and thus could trigger a NULL pointer dereference in KMSAN kernels. Reported by: glebius Fixes: ec45f952a232 ("sockbuf: Add KMSAN checks to sbappend*()") MFC after: 1 week --- sys/kern/uipc_sockbuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 2732ee8199ee..6d3050596f23 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -1326,7 +1326,8 @@ sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0, { struct mbuf *m, *mlast; - kmsan_check_mbuf(m0, "sbappend"); + if (m0 != NULL) + kmsan_check_mbuf(m0, "sbappend"); kmsan_check_mbuf(control, "sbappend"); sbm_clrprotoflags(m0, flags); From nobody Fri Feb 2 19:02:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQC047b5z59Hbx for ; Fri, 2 Feb 2024 19:02:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRQC01YZXz4lsk for ; Fri, 2 Feb 2024 19:02:52 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-55fc7f63639so2803330a12.1 for ; Fri, 02 Feb 2024 11:02:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706900570; x=1707505370; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ni3x6CK4tP5Ly/Wz5VZXhdC93Vxu3aFdbnkKP4pgzFo=; b=ua1X6rkozmAg4wslckFIwuEnrKIY7XcDLpvnv1DHe6lqDbfpE96qVQfOkmz5yHBL5B yR6AbPPk6nwtzIb7SzuK3+VuouuCqIeWSoGj6ZQWjUUKdWozfpvcTFC7wHbLPFEjkKsu ZqX1BqwEmLoSwBfJchVOxVdViWnsWG3v+nEE+7W++J8MqlHZzd1wSFfn7Vxo6B0u5OIi 2YiLMRHyBFGHH1Yn7vZGhM8ED1ezdRUbZEnsvyE8kbVjaKBIrbne40UN6kvF9kZyl1Wm pYdF4vxUVvSK9odRRmXfWcj28jFvwVbkuAZiGDr9N31abmVvR6wQlKiVIuYXrZGXSGaV nXeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706900570; x=1707505370; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ni3x6CK4tP5Ly/Wz5VZXhdC93Vxu3aFdbnkKP4pgzFo=; b=uk5spehQxbDnkMT+1crt4DhtINIoqt8jtZRSD/eY8PR43KIoSbTPtI2sP+BhcOu+qk MB/NmrGRBGt/8mi/7aHtvYttbIaxOwhDBOUbSypVZCxwcrQ05/it2QfDvapj+lWPr9T8 MDHkbKiRxGq7OQC3fqNI6u1of35AEe/KXZHEaMUxbUI06QpprAUY77DWzdO7j9CPe6qu hAmZHNWUhrKyvkVj5vefVlyjLaznPcZnFA5g7b6pRAnlaH6EDhG5NHBKNejwsS+xTN/z T5blpqHFlbNFbzy7dkQu2dotl2vGU0CPixuVmSH6VSvbhKkak5BIsTnsycokJ6+eS0yC 6Zbg== X-Gm-Message-State: AOJu0YwpAaQpfn6lKAJxtAK2lqa8v1lDw51TOkLunYKofJBXWx57tv2Q oi2bbUGCt6nlrkyCyWR3L/P3KRM0RaayNdsMyRvELOqRDw+cvVEBuY0dmDXabb3g13jL1f3bW1J yEGGYAZqcaXHN50J84qFA4E1H2OkeDQNaUak9jA== X-Google-Smtp-Source: AGHT+IFqTih9cYxLjaHB474hzESKwWjFkPvrPLD/RT44aEeaB725ow0D239oY8OHsQ7L5nDzQjEyWclxJlHWctnstXI= X-Received: by 2002:aa7:d059:0:b0:55f:f692:90d6 with SMTP id n25-20020aa7d059000000b0055ff69290d6mr397342edo.23.1706900570542; Fri, 02 Feb 2024 11:02:50 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402021816.412IGxAl070009@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Fri, 2 Feb 2024 12:02:39 -0700 Message-ID: Subject: Re: git: c27a89971805 - main - stdlib.h: add __noexcept to prototypes To: Konstantin Belousov Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000002ca5bf06106ac272" X-Rspamd-Queue-Id: 4TRQC01YZXz4lsk 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:15169, ipnet:2a00:1450::/32, country:US] --0000000000002ca5bf06106ac272 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Feb 2, 2024 at 11:59=E2=80=AFAM Konstantin Belousov wrote: > On Fri, Feb 02, 2024 at 11:36:35AM -0700, Warner Losh wrote: > > On Fri, Feb 2, 2024, 11:28=E2=80=AFAM Konstantin Belousov > > wrote: > > > > > On Fri, Feb 02, 2024 at 06:16:59PM +0000, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > > > > > URL: > > > > https://cgit.FreeBSD.org/src/commit/?id=3Dc27a89971805b176dcfa5a234f2ea6f= 6109d0a70 > > > > > > > > commit c27a89971805b176dcfa5a234f2ea6f6109d0a70 > > > > Author: Lexi Winter > > > > AuthorDate: 2024-02-02 16:41:40 +0000 > > > > Commit: Warner Losh > > > > CommitDate: 2024-02-02 18:11:17 +0000 > > > > > > > > stdlib.h: add __noexcept to prototypes > > > > > > > > The noexcept specifier is required on these functions in C++: > > > > _Exit(), atexit(), quick_exit(), at_quick_exit(), abort(). > > > > > > > > MFC after: 2 weeks > > > > > > > > Reviewed by: imp > > > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1085 > > > > --- > > > > include/stdlib.h | 10 +++++----- > > > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > > > > > diff --git a/include/stdlib.h b/include/stdlib.h > > > > index ff8991d1fa94..f0687f01e6c7 100644 > > > > --- a/include/stdlib.h > > > > +++ b/include/stdlib.h > > > > @@ -84,9 +84,9 @@ extern int __mb_cur_max; > > > > extern int ___mb_cur_max(void); > > > > #define MB_CUR_MAX ((size_t)___mb_cur_max()) > > > > > > > > -_Noreturn void abort(void); > > > > +_Noreturn void abort(void) __noexcept; > > > > int abs(int) __pure2; > > > > -int atexit(void (* _Nonnull)(void)); > > > > +int atexit(void (* _Nonnull)(void)) __noexcept; > > > > double atof(const char *); > > > > int atoi(const char *); > > > > long atol(const char *); > > > > @@ -154,7 +154,7 @@ unsigned long long > > > > strtoull(const char * __restrict, char ** __restrict, int); > > > > #endif /* __LONG_LONG_SUPPORTED */ > > > > > > > > -_Noreturn void _Exit(int); > > > > +_Noreturn void _Exit(int) __noexcept; > > > > #endif /* __ISO_C_VISIBLE >=3D 1999 */ > > > > > > > > /* > > > > @@ -163,9 +163,9 @@ _Noreturn void _Exit(int); > > > > #if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L > > > > void * aligned_alloc(size_t, size_t) __malloc_like > > > __alloc_align(1) > > > > __alloc_size(2); > > > > -int at_quick_exit(void (*)(void)); > > > > +int at_quick_exit(void (*)(void)) __noexcept; > > > > _Noreturn void > > > > - quick_exit(int); > > > > + quick_exit(int) __noexcept; > > > This is wrong, libc quick_exit() does not provide such guarantees as > > > implemented. More, being part of libc it cannot ever guarantee that > ever > > > (and call std::terminate if the requirement is violated). > > > > > > Making it such would require bringing some C++ ABI into libc which I > > > object strongly. > > > > > > > So is this just for quick_exit, or all the functions marked? > Other functions are abort()/_Exit()/atexit(). No functions in this list > call a user-provided functions, so they cannot raise exceptions. > > My objection is only against our quick_exit(). > OK. I'll back that one out. Warner --0000000000002ca5bf06106ac272 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Feb 2, 2024 at 11:59=E2=80=AF= AM Konstantin Belousov <kostikbel= @gmail.com> wrote:
On Fri, Feb 02, 2024 at 11:36:35AM -0700, Warner Losh wrote:
> On Fri, Feb 2, 2024, 11:28=E2=80=AFAM Konstantin Belousov <kostikbel@gmail.com&g= t;
> wrote:
>
> > On Fri, Feb 02, 2024 at 06:16:59PM +0000, Warner Losh wrote:
> > > The branch main has been updated by imp:
> > >
> > > URL:
> > https://= cgit.FreeBSD.org/src/commit/?id=3Dc27a89971805b176dcfa5a234f2ea6f6109d0a70<= /a>
> > >
> > > commit c27a89971805b176dcfa5a234f2ea6f6109d0a70
> > > Author:=C2=A0 =C2=A0 =C2=A0Lexi Winter <lexi@le-Fay.ORG&g= t;
> > > AuthorDate: 2024-02-02 16:41:40 +0000
> > > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org&g= t;
> > > CommitDate: 2024-02-02 18:11:17 +0000
> > >
> > >=C2=A0 =C2=A0 =C2=A0stdlib.h: add __noexcept to prototypes > > >
> > >=C2=A0 =C2=A0 =C2=A0The noexcept specifier is required on the= se functions in C++:
> > >=C2=A0 =C2=A0 =C2=A0_Exit(), atexit(), quick_exit(), at_quick= _exit(), abort().
> > >
> > >=C2=A0 =C2=A0 =C2=A0MFC after:=C2=A0 =C2=A0 =C2=A0 2 weeks > > >
> > >=C2=A0 =C2=A0 =C2=A0Reviewed by: imp
> > >=C2=A0 =C2=A0 =C2=A0Pull Request: http= s://github.com/freebsd/freebsd-src/pull/1085
> > > ---
> > >=C2=A0 include/stdlib.h | 10 +++++-----
> > >=C2=A0 1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/include/stdlib.h b/include/stdlib.h
> > > index ff8991d1fa94..f0687f01e6c7 100644
> > > --- a/include/stdlib.h
> > > +++ b/include/stdlib.h
> > > @@ -84,9 +84,9 @@ extern int __mb_cur_max;
> > >=C2=A0 extern int ___mb_cur_max(void);
> > >=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 MB_CUR_MAX=C2=A0 =C2=A0 = =C2=A0 ((size_t)___mb_cur_max())
> > >
> > > -_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 abort(void);
> > > +_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 abort(void) __noe= xcept;
> > >=C2=A0 int=C2=A0 =C2=A0abs(int) __pure2;
> > > -int=C2=A0 =C2=A0atexit(void (* _Nonnull)(void));
> > > +int=C2=A0 =C2=A0atexit(void (* _Nonnull)(void)) __noexcept;=
> > >=C2=A0 double=C2=A0 =C2=A0 =C2=A0 =C2=A0 atof(const char *);<= br> > > >=C2=A0 int=C2=A0 =C2=A0atoi(const char *);
> > >=C2=A0 long=C2=A0 atol(const char *);
> > > @@ -154,7 +154,7 @@ unsigned long long
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 strtoull(const char * __restrict,= char ** __restrict, int);
> > >=C2=A0 #endif /* __LONG_LONG_SUPPORTED */
> > >
> > > -_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 _Exit(int);
> > > +_Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0 _Exit(int) __noex= cept;
> > >=C2=A0 #endif /* __ISO_C_VISIBLE >=3D 1999 */
> > >
> > >=C2=A0 /*
> > > @@ -163,9 +163,9 @@ _Noreturn void=C2=A0 =C2=A0 =C2=A0_Exit(= int);
> > >=C2=A0 #if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >= =3D 201103L
> > >=C2=A0 void *=C2=A0 =C2=A0 =C2=A0 =C2=A0aligned_alloc(size_t,= size_t) __malloc_like
> > __alloc_align(1)
> > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size(2);
> > > -int=C2=A0 at_quick_exit(void (*)(void));
> > > +int=C2=A0 at_quick_exit(void (*)(void)) __noexcept;
> > >=C2=A0 _Noreturn void
> > > -=C2=A0 =C2=A0 =C2=A0quick_exit(int);
> > > +=C2=A0 =C2=A0 =C2=A0quick_exit(int) __noexcept;
> > This is wrong, libc quick_exit() does not provide such guarantees= as
> > implemented. More, being part of libc it cannot ever guarantee th= at ever
> > (and call std::terminate if the requirement is violated).
> >
> > Making it such would require bringing some C++ ABI into libc whic= h I
> > object strongly.
> >
>
> So is this just for quick_exit, or all the functions marked?
Other functions are abort()/_Exit()/atexit(). No functions in this list
call a user-provided functions, so they cannot raise exceptions.

My objection is only against our quick_exit().

OK. I'll back that one out.

Warner=C2= =A0
--0000000000002ca5bf06106ac272-- From nobody Fri Feb 2 19:06:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQGk37cgz59Hh9; Fri, 2 Feb 2024 19:06: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 4TRQGk2DS1z4mMh; Fri, 2 Feb 2024 19:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAb9wZF5UuL3TVIeKf7nM+CoMk/5u/BmdJmmwUGpZO0=; b=cY9g7kPvX2IGcY30pf1+aoTBmpi0IpD9NJ4p2lSRL0Vdzhz525zN+pFYagbktx9jLFSdIa JNpdblkmLV/76T3KMPRP2aWgGf0IzmNeFXRUyoR+AHHgHDnACad/0OBh5tVij9vA9SDjBD myY955dfAp+OuHIJmO10mcZ4H/tXVTtfA6/DRF6lYOd8cgPsbo7Ql1tqonNPyEzyV5KvRx CJLDHw3n8gMU49QVKXPe26rL2SSeBCDXIN5uBgLxnVgyFzNVt4KFhH+EVQeHtR0A2PRkQA 2LqPbrqlnNQwRGBgUALuO6nhF92uddVU/xHRVyNtRnWnDNh1NKkboA8j3gLutg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAb9wZF5UuL3TVIeKf7nM+CoMk/5u/BmdJmmwUGpZO0=; b=PPr0NrR89d1ie+ZBdTHkaXlIzbN2TFElkQqrKDG8TBj+EQvWyYuIVL0T4c8ATgZ20Sfuzd ie26RC3PzwMUFLIvLoV+FFYScUTLVrwy6vCHYVHnAGudCYc+n9YZ+zxT+UgGkWtId471sP wk44Rr/md8onvkBOQ6Ze5apNHCktYelauoqoxwrFAhAD3RhXMuBcsc10hwn5rXwqySQ/Yx RzwbkheRerrsIPHrfyPQhnw1bStX1fJdU63fNvm5UfccjkBfVNmNQFha5eBl41fOTgvccD AiBxgc5RvaibbJamwoi/Rfc183bI+qMb+KzhfDfXFhbNfdn8gFxwk1jKQsnG5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900766; a=rsa-sha256; cv=none; b=yxiSOwLObMSVD18X70tZyuwghKjiV9nJ4W/rsxGiIE7v/98O/Ewxrts5BoEQWd+hPIaSpt +0DA0gtWYxbj7oc0FjK6JyH9c48xmWxfWPoscPyQ+KNToOU/GwX6nqS0rUtZsxM/dXdFjc +M7k/zp36YgsZi1c0gjty9D6lnWmHfb21BKjLar9pWkM79l5qFXuQRuDTjxPE9v8WJ6rVp WQ0G7qI92AAEwuu+6xiNCd2Q6ybn6aSVsbScW+Z0qMChCOW4CQG9Urnfsx06qJ7/vZI+f7 /7QEJO1J/mQpL8GC5gnwirl6agk65U1UxYEIy3yu2m07nGhz2Dhib9qetWCpSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQGk1HnYzj1w; Fri, 2 Feb 2024 19:06: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 412J66nu054858; Fri, 2 Feb 2024 19:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J667P054855; Fri, 2 Feb 2024 19:06:06 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:06 GMT Message-Id: <202402021906.412J667P054855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5fdf01dbeef1 - main - Revert "stand/lua: always allow overriding with local config files" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fdf01dbeef1f64f8c446561498d662702451ac1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5fdf01dbeef1f64f8c446561498d662702451ac1 commit 5fdf01dbeef1f64f8c446561498d662702451ac1 Author: Warner Losh AuthorDate: 2024-02-02 19:01:56 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 Revert "stand/lua: always allow overriding with local config files" This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe. no mail sent out, and the commit message was wrong. Sponsored by: Netflix --- UPDATING | 21 --------------------- stand/defaults/loader.conf | 3 +-- stand/defaults/loader.conf.5 | 32 ++++---------------------------- stand/lua/config.lua | 15 +++------------ stand/lua/config.lua.8 | 8 ++------ 5 files changed, 10 insertions(+), 69 deletions(-) diff --git a/UPDATING b/UPDATING index 33bae2a42b9d..14fae1eb0656 100644 --- a/UPDATING +++ b/UPDATING @@ -27,27 +27,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20240202: - Loader now also read configuration files listed in local_loader_conf_files. - Files listed here are the last ones read. And /boot/loader.conf.local was - moved from loader_conf_files to local_loader_conf_files leaving only - loader.conf and device.hints in loader_conf_files by default. - - The following sequencing is applied: - - 1. Bootstrap: - /boot/defaults/loader.conf - - 2. Read loader_conf_files files: - /boot/device.hints - /boot/loader.conf - - 3. Read loader_conf_dirs files: - /boot/loader.conf.d/*.conf - - 4. And finally, rread local_loader_conf_files files: - /boot/loader.conf.local - 20240201: sendmail 8.18.1 has been imported and merged. This version enforces stricter RFC compliance by default, especially with respect to line diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index a5d27b96b6ba..e0062bbc8149 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -13,9 +13,8 @@ exec="echo Loading /boot/defaults/loader.conf" kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" # Flags to be passed to the kernel -loader_conf_files="/boot/device.hints /boot/loader.conf" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" loader_conf_dirs="/boot/loader.conf.d" -local_loader_conf_files="/boot/loader.conf.local" nextboot_conf="/boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index e38ad865c288..0d82a3dac9b3 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -131,10 +131,6 @@ Space separated list of directories to process for configuration files. The lua-based loader will process files with a .Dq .conf suffix that are placed in these directories. -Files found here are processed after the ones listed in -.Va loader_conf_files -but before the ones found in -.Va local_loader_conf_files . .It Ar loader_conf_files Defines additional configuration files to be processed right after the present file. @@ -142,13 +138,6 @@ present file. should be treated as write-only. One cannot depend on any value remaining in the loader environment or carried over into the kernel environment. -.It Ar local_loader_conf_files -Space separated list of additional configuration files to be processed at last, -i.e., after -.Va loader_conf_files -and -.Va loader_conf_dirs -are processed. .It Ar product_vars When set, must be a space separated list of environment variable names to walk through to guess product information. @@ -285,14 +274,6 @@ default settings can be ignored. The few of them which are important or useful are: .Bl -tag -width bootfile -offset indent -.It Va local_loader_conf_files -.Pq Dq /boot/loader.conf.local -Ensure -.Va loader.conf.local -can always be used to override settings from files found in -.Va loader_conf_files -and -.Va loader_conf_dirs . .It Va bitmap_load .Pq Dq NO If set to @@ -474,18 +455,13 @@ It is not available in the default Forth-based loader. .Sh FILES .Bl -tag -width /boot/defaults/loader.conf -compact .It Pa /boot/defaults/loader.conf -Default settings \(em do not change this file. +default settings \(em do not change this file. .It Pa /boot/loader.conf -User defined settings. +user defined settings. .It Pa /boot/loader.conf.lua -User defined settings written in lua. -.It Pa /boot/loader.conf.d/*.conf -User defined settings split in separate files. -.It Pa /boot/loader.conf.d/*.lua -User defined settings written in lua and split in separate files. +user defined settings written in lua. .It Pa /boot/loader.conf.local -Machine-specific settings for sites with a common loader.conf. Allow to override -settings defined in other files. +machine-specific settings for sites with a common loader.conf. .El .Sh SEE ALSO .Xr kenv 1 , diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 86f5ef6174a2..210bb9338783 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -630,7 +630,8 @@ function config.readConf(file, loaded_files) return end - local top_level = next(loaded_files) == nil -- Are we the top-level readConf? + -- We'll process loader_conf_dirs at the top-level readConf + local load_conf_dirs = next(loaded_files) == nil print("Loading " .. file) -- The final value of loader_conf_files is not important, so just @@ -655,7 +656,7 @@ function config.readConf(file, loaded_files) end end - if top_level then + if load_conf_dirs then local loader_conf_dirs = getEnv("loader_conf_dirs") -- If product_vars is set, it must be a list of environment variable names @@ -681,7 +682,6 @@ function config.readConf(file, loaded_files) end end - -- Process "loader_conf_dirs" extra-directories if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then @@ -700,15 +700,6 @@ function config.readConf(file, loaded_files) ::nextdir:: end end - - -- Always allow overriding with local config files, e.g., - -- /boot/loader.conf.local. - local local_loader_conf_files = getEnv("local_loader_conf_files") - if local_loader_conf_files then - for name in local_loader_conf_files:gmatch("[%w%p]+") do - config.readConf(name, loaded_files) - end - end end end diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index b2b1122285eb..f9896f2aa420 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -64,13 +64,9 @@ as a configuration file .Po e.g., as .Pa loader.conf .Pc -and then process files listed in the +and then processing files listed in .Ev loader_conf_files -variable. Additionnaly, the top-level call to readConf will process files listed in the -.Ev loader_conf_dirs -and -.Ev local_loader_conf_files -variables +variable .Po see .Xr loader.conf 5 .Pc . From nobody Fri Feb 2 19:06:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQGl3VHyz59Hxp; Fri, 2 Feb 2024 19:06: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 4TRQGl30LCz4mG2; Fri, 2 Feb 2024 19:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWsLS5RQnsNesFA6LUB0kqlKQbN/tq2sM0v/kbU7ATI=; b=q3U46E11UYqa5BpiLLPZbSDtCdTbEJTzAxEB/ikH3BzxsE/dvVHfMheuIZX/DdLnbrA11c 4Et8etS+TUSqNhC/R8l/ZZpmtFtT+KovbLut0P/vxUCQGf9uoOh0ucGjkID51xVzulLeOF TlyNKk3DZ0Hsp7cdjAF0VieiXnnF21C6mrgOy3q9wlQ0/FkkuDCLoTngxBKITi+a42M9NT mqgEnRW9cS/V6nb7wx8EF2V+D7iu/yVYrRPqjrVtPRDqqQ9vbwA8W0wSTz2KJ0uL4lPkIi JB6Dxej9CpQ5280ZWI+1PAa3AWtnYAdtF6MtbqpG85qckZr5eCZK1McJEF96Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aWsLS5RQnsNesFA6LUB0kqlKQbN/tq2sM0v/kbU7ATI=; b=vq6arlVrCiavcyXLVV84Q8eRmnfhDl8yZNoKvZggNZA092/Gp19KqrjtINaf/q4xjGSIKG mhRKB4Q7a6nX/6dijEhjfS4QHp4KQNODq/kUEdJ0T7Yo/c5ERc5pCHtgO3H+kc0nxTXfUa Q+rsGikPvAJ103DnEytyFS405Uyis1sbz6y+c5QFrNfWw5isPhAU/3XS49ng4tWJdDNelD gA96cF8Ah4MR1avO/QsAoV5HFI0DKHcqlJd8kGH+dXwIjAiQIrWXWVihYB7tC2mKv68WfY cUw7yE9ABDrEaaqwhzWGKw5M50D0ENcRinUHpiLtQhTabR2iOdcP9fgjIpEjQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900767; a=rsa-sha256; cv=none; b=SXi4PYSzXq7JlQBRb3/NZAgafPwIVvUfP662CetWf5Jmz5kVQP44y/V7CGlaVZ21+QX4g4 G6kA9peVLs/pUcc0lDncqmLqU/XwJCFil6HX1gvZyYhx/Amx8XJvaXr6qBjpOYtZl/CpXl 6HVoCmAe00e9EBZNwYZwDuQibhk4hmwev5t2stkGZ0U633i6VXmSHLP+/IBUSnmv6ptyO1 Wn4gVmuOkiKrg+COh3wl0xDh3YsgHVxJ4LgwKiDBcTLI19oi7JzHbz4L+WNJmZeCblRqlT 4kQtGkl7hqqQQKPP/TwZm7ufDlqvqMrZbcp4yFt33VbazN9bP8MGJihNOYJy5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQGl24RXzjXB; Fri, 2 Feb 2024 19:06: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 412J67Gj054909; Fri, 2 Feb 2024 19:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J67qt054906; Fri, 2 Feb 2024 19:06:07 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:07 GMT Message-Id: <202402021906.412J67qt054906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 994865caf250 - main - Revert "stand/lua: per-product conf if requested via product_vars" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 994865caf250ea2a59b7b842e44680931e8b19f6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=994865caf250ea2a59b7b842e44680931e8b19f6 commit 994865caf250ea2a59b7b842e44680931e8b19f6 Author: Warner Losh AuthorDate: 2024-02-02 19:02:23 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 Revert "stand/lua: per-product conf if requested via product_vars" This reverts commit 754cac4b283eb024a3a6a194130199c860e32ebf. No mail went out and commit message was wrong. Sponsored by: Netflix --- stand/defaults/loader.conf.5 | 34 +--------------------------------- stand/lua/config.lua | 25 ------------------------- 2 files changed, 1 insertion(+), 58 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 0d82a3dac9b3..42e5712d93b8 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" 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. -.Dd February 2, 2024 +.Dd January 10, 2024 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -138,38 +138,6 @@ present file. should be treated as write-only. One cannot depend on any value remaining in the loader environment or carried over into the kernel environment. -.It Ar product_vars -When set, must be a space separated list of environment variable names to walk -through to guess product information. -The order matters as reading a config file override the previously defined -values. -Undefined variables are silently ignored. -.Pp -When product information can be guessed, for each product information found, -append -.Pa /boot/loader.conf.d/PRODUCT -to -.Ar loader_conf_dirs . -It can be typically used as follow: -.Bd -literal -smbios.system.planar.maker="PLANAR_MAKER" -smbios.system.planar.product="PLANAR_PRODUCT" -smbios.system.product="PRODUCT" -uboot.m_product="M_PRODUCT" -product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product" -.Ed -.Pp -to read files found in the following directories, in that order: -.Bl -bullet -compact -.It -.Pa /boot/loader.conf.d/PLANAR_MAKER -.It -.Pa /boot/loader.conf.d/PLANAR_PRODUCT -.It -.Pa /boot/loader.conf.d/PRODUCT -.It -.Pa /boot/loader.conf.d/M_PRODUCT -.El .It Ar kernel Name of the kernel to be loaded. If no kernel name is set, no additional diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 210bb9338783..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -658,37 +658,12 @@ function config.readConf(file, loaded_files) if load_conf_dirs then local loader_conf_dirs = getEnv("loader_conf_dirs") - - -- If product_vars is set, it must be a list of environment variable names - -- to walk through to guess product information. The order matters as - -- reading a config files override the previously defined values. - -- - -- If product information can be guessed, for each product information - -- found, also read config files found in /boot/loader.conf.d/PRODUCT/. - local product_vars = getEnv("product_vars") - if product_vars then - local product_conf_dirs = "" - for var in product_vars:gmatch("%S+") do - local product = getEnv(var) - if product then - product_conf_dirs = product_conf_dirs .. " /boot/loader.conf.d/" .. product - end - end - - if loader_conf_dirs then - loader_conf_dirs = loader_conf_dirs .. product_conf_dirs - else - loader_conf_dirs = product_conf_dirs - end - end - if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then print(MSG_FAILDIR:format(name)) goto nextdir end - for cfile in lfs.dir(name) do if cfile:match(".conf$") then local fpath = name .. "/" .. cfile From nobody Fri Feb 2 19:06:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQGm63Ccz59J17; Fri, 2 Feb 2024 19:06: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 4TRQGm4H0xz4mMr; Fri, 2 Feb 2024 19:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8PEiJpVjA2qFkBIZBVFV/o1nDbwUHpWFKEJikI7IaRg=; b=H1U2Vs/8mq+0YUuHB/JRF6RRxe3tsoMHkrhoTym8cWa3BtmYLkqLQeY/RL1erpvwqmyV8I uyZtYp9c7PxgQ0pm6hC1xwWNl/3Tldb3lTo6FS7FeJbDucIQQiEKBjF4VmHWOnnI2uzXin J+8EH5e4bd3Q1AP9z4SP9m/m8vYXkUoiICm7eiEBkp9SqDDvjZliAhk2x2UjJiUkFRYc9A bgIovBc4TsL7+JowcJ4g1BnOuQOLzzIG0CGkmTI7qsas0kAaHXHdcw51W3+nJwWWtQyOGq CkYf6SuudSY6fSBx4MSce3pA8BKz4C9wYdUELDGY9Qk9L9KrFEbEu0FhFhp8dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8PEiJpVjA2qFkBIZBVFV/o1nDbwUHpWFKEJikI7IaRg=; b=sOmtdf5A8SFa9yqnjioz6F8aMuD67XS5T79F+S7Mmvd5NAfreokoFXVurD0LnJDnZC2DrG 3U5pgWSszsLYfzuzK/85ZzxUtVeoRNXzJZS7cUp6iRiMQ+OpTkxC56HGWRTuwhRcT6lR2k ECNxmw3r+rDXiCOtq07d/fO3ARrHuA98lXnqo9reC6nSJxJCUE40NhMctqaFdhQ0LlMftt OYiJmyV5lq/NHUvHWMxzf4ajRdPGN2ICDsvaJenJcK06e1aXx+TWdtVNk9Rx50cdR8tpEB +olUYuWZLhewhIh5IBklFCSwMt9hxwtoF7/+A7e4rgImp/xVmt8wrbR6tURfJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900768; a=rsa-sha256; cv=none; b=rfok5vTm6L8tlEsCojViUlNaNW3JAUgOdBjr1VstdkBGOeRCJF8G3j0b0ekVrrluj30P81 mNhWJmljpYhL20YM2cWp8pJNDdK9CH1Nmz5pbugZku/tA8UGfQNq3g/odKp/YvMYc7XXpO EfEOmlp3//y3UqRij6bX74cO510PksdYZBDNatao1CIAS3qp/3eBeDdxatjWXcrD6bB25O NEVafvBUOM2QRn+VHVAqDg+g332Prnjaf8GpTyhtCfMr5xutktOjejXSD+dvA7sVf7GnvO E9kLvuqn3RytFgayq4Hpn+yqQ+WzIApQ0Zemj00q2Yeef1ov8pjdf4Xq7wE5zQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQGm3N5lzj1x; Fri, 2 Feb 2024 19:06: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 412J68tR054957; Fri, 2 Feb 2024 19:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J68co054954; Fri, 2 Feb 2024 19:06:08 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:08 GMT Message-Id: <202402021906.412J68co054954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c343eedc6db3 - main - stand/lua: per-product conf if requested via product_vars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c343eedc6db381ac76e489f8ae0304898b71c5db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c343eedc6db381ac76e489f8ae0304898b71c5db commit c343eedc6db381ac76e489f8ae0304898b71c5db Author: Stéphane Rochoy AuthorDate: 2023-05-04 07:23:47 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 stand/lua: per-product conf if requested via product_vars If product_vars is set, it must be a space separated list of environment variable names to walk through to guess the product. Each time a product can be guessed (i.e., the corresponding variable is defined), prepend /boot/loader.conf.d/PRODUCT/ to loader_conf_dirs. It can be typically used as follow: smbios.system.planar.maker="PLANAR_MAKER" smbios.system.planar.product="PLANAR_PRODUCT" smbios.system.product="PRODUCT" uboot.m_product="M_PRODUCT" product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product" to read files found in the following directories, in that order: /boot/loader.conf.d/PLANAR_MAKER /boot/loader.conf.d/PLANAR_PRODUCT /boot/loader.conf.d/PRODUCT /boot/loader.conf.d/M_PRODUCT Reviewed by: imp, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/759 --- stand/defaults/loader.conf.5 | 34 +++++++++++++++++++++++++++++++++- stand/lua/config.lua | 25 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 42e5712d93b8..0d82a3dac9b3 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -21,7 +21,7 @@ .\" 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. -.Dd January 10, 2024 +.Dd February 2, 2024 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -138,6 +138,38 @@ present file. should be treated as write-only. One cannot depend on any value remaining in the loader environment or carried over into the kernel environment. +.It Ar product_vars +When set, must be a space separated list of environment variable names to walk +through to guess product information. +The order matters as reading a config file override the previously defined +values. +Undefined variables are silently ignored. +.Pp +When product information can be guessed, for each product information found, +append +.Pa /boot/loader.conf.d/PRODUCT +to +.Ar loader_conf_dirs . +It can be typically used as follow: +.Bd -literal +smbios.system.planar.maker="PLANAR_MAKER" +smbios.system.planar.product="PLANAR_PRODUCT" +smbios.system.product="PRODUCT" +uboot.m_product="M_PRODUCT" +product_vars="smbios.system.planar.maker smbios.system.planar.product smbios.system.product uboot.m_product" +.Ed +.Pp +to read files found in the following directories, in that order: +.Bl -bullet -compact +.It +.Pa /boot/loader.conf.d/PLANAR_MAKER +.It +.Pa /boot/loader.conf.d/PLANAR_PRODUCT +.It +.Pa /boot/loader.conf.d/PRODUCT +.It +.Pa /boot/loader.conf.d/M_PRODUCT +.El .It Ar kernel Name of the kernel to be loaded. If no kernel name is set, no additional diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 8fdc805ee983..210bb9338783 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -658,12 +658,37 @@ function config.readConf(file, loaded_files) if load_conf_dirs then local loader_conf_dirs = getEnv("loader_conf_dirs") + + -- If product_vars is set, it must be a list of environment variable names + -- to walk through to guess product information. The order matters as + -- reading a config files override the previously defined values. + -- + -- If product information can be guessed, for each product information + -- found, also read config files found in /boot/loader.conf.d/PRODUCT/. + local product_vars = getEnv("product_vars") + if product_vars then + local product_conf_dirs = "" + for var in product_vars:gmatch("%S+") do + local product = getEnv(var) + if product then + product_conf_dirs = product_conf_dirs .. " /boot/loader.conf.d/" .. product + end + end + + if loader_conf_dirs then + loader_conf_dirs = loader_conf_dirs .. product_conf_dirs + else + loader_conf_dirs = product_conf_dirs + end + end + if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then print(MSG_FAILDIR:format(name)) goto nextdir end + for cfile in lfs.dir(name) do if cfile:match(".conf$") then local fpath = name .. "/" .. cfile From nobody Fri Feb 2 19:06:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQGp0qg7z59Hxw; Fri, 2 Feb 2024 19:06: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 4TRQGn5Jv3z4mSk; Fri, 2 Feb 2024 19:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4RyTvoP+QavoVDIzB617Xbg3WAvhELfGOr5QP7ZlWw=; b=mia58DzxrbwvxhsxGk98ugz1+Hkgk/HHdvNSGveMj0qiH/mSuezRuwGYblO+UkX6sqUULB HTiMwXK9IdwtHIPEFOpKUfvUxJuwP8x+MDmcmPR4g47Hd0MS9dIevQtfjN1wF/H/r2rldO h/KRmrTJgYyWKkMGHZvyoNCrk1MhxXKergyVFP/A9B3NOkDuujqw7UVhJIQVtZOu7/pKu+ FynNb+0qNinWXWBb1Pcdy5EdCVcUzqBf88IqUHBjlpCGFr6HpWIKz65m8G/eSMhmAoR3H3 MMzeJrBQqboj9XY5n7CwsTKiMgwKshwV1F6oTCf/mP2cbrSMgHgeH0VooyyTVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706900769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W4RyTvoP+QavoVDIzB617Xbg3WAvhELfGOr5QP7ZlWw=; b=k8rzVMutZ7adZwbVTzXZmz/neQoYdOfdEyr1beSKI+1H4X28zpXbvD4kiOC6kqqAiGJwis 6dnaee04GyVMvd5uNt2WklJQOJUotbusVCc05/9k4aMtC2pNIflZ+OoYoH+UrhE58uoDlh hC5KhUmnA93kHlBSEnW8GqIcrSw7oxqX/GebY7AQxtyyRVv8TQpaCKWlxXEHfnTXwLjLsd jWmMjcWEJoU/o/AP/2ilpI9gxK/00iWXFKYMsO56vnzX5U54yDSlZP2Y6tSn4t/KIQC8Qk 58A7t0+Yj3hai0n2oYxWtEPtRYdqQ3L8tz6ig7cLHd3cDLehAlpedWzDySw8tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706900769; a=rsa-sha256; cv=none; b=t6jBmGEi4umgf0OFMwYPLtCUD4HxVLIdBiY/JkcMf4OZanhRPHxg7+LcNBvzptMeQ/FV/s jpr9s2L6DiD0K+cHX868rqMgVEEMmTbyiIbcFJKomhFrrnxYIEHcmIjT254pGv+6b9ZQ0s +Esuh11ocpOMMeEvyc87x6i8ElZ4TUNVtRi51j/olf3YwLz3SQ6nXPyB7uAKQp6vjGcnyv 5xgWYl9PA/BNe3bD96QG1zjXzqfFVEALSAPdBLVf+KUH6XCg3mWkymDx0roSPEiuCnJcpD GYmqLBbzLOWvgAmG69mzdP4OOhD6DL7WLXV2k92MNGiuRhJBqoolL9Myc38pYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQGn4Q3BzhpQ; Fri, 2 Feb 2024 19:06: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 412J69L5055011; Fri, 2 Feb 2024 19:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412J690h055008; Fri, 2 Feb 2024 19:06:09 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:06:09 GMT Message-Id: <202402021906.412J690h055008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c475e61f66fe - main - stand/lua: always allow overriding with local config files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c475e61f66fe8fe939e18ec7821c2340569f3271 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c475e61f66fe8fe939e18ec7821c2340569f3271 commit c475e61f66fe8fe939e18ec7821c2340569f3271 Author: Stéphane Rochoy AuthorDate: 2023-12-21 14:05:58 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:04:57 +0000 stand/lua: always allow overriding with local config files Loader now also read configuration files listed in local_loader_conf_files. Files listed here are the last ones read. And /boot/loader.conf.local was moved from loader_conf_files to local_loader_conf_files leaving only loader.conf and device.hints in loader_conf_files by default. The idea is to ensure local_loader_conf_files, i.e., /boot/loader.conf.local, can always be used to override other user defined settings. So the sequencing is now as follow: 1. Bootstrap: /boot/defaults/loader.conf 2. Read loader_conf_files files: /boot/device.hints /boot/loader.conf 3. Read loader_conf_dirs files: /boot/loader.conf.d/*.conf 4. And finally, rread local_loader_conf_files files: /boot/loader.conf.local Reviewed by: imp, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/759 --- UPDATING | 21 +++++++++++++++++++++ stand/defaults/loader.conf | 3 ++- stand/defaults/loader.conf.5 | 32 ++++++++++++++++++++++++++++---- stand/lua/config.lua | 15 ++++++++++++--- stand/lua/config.lua.8 | 8 ++++++-- 5 files changed, 69 insertions(+), 10 deletions(-) diff --git a/UPDATING b/UPDATING index 14fae1eb0656..33bae2a42b9d 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20240202: + Loader now also read configuration files listed in local_loader_conf_files. + Files listed here are the last ones read. And /boot/loader.conf.local was + moved from loader_conf_files to local_loader_conf_files leaving only + loader.conf and device.hints in loader_conf_files by default. + + The following sequencing is applied: + + 1. Bootstrap: + /boot/defaults/loader.conf + + 2. Read loader_conf_files files: + /boot/device.hints + /boot/loader.conf + + 3. Read loader_conf_dirs files: + /boot/loader.conf.d/*.conf + + 4. And finally, rread local_loader_conf_files files: + /boot/loader.conf.local + 20240201: sendmail 8.18.1 has been imported and merged. This version enforces stricter RFC compliance by default, especially with respect to line diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index e0062bbc8149..a5d27b96b6ba 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -13,8 +13,9 @@ exec="echo Loading /boot/defaults/loader.conf" kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" # Flags to be passed to the kernel -loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" +loader_conf_files="/boot/device.hints /boot/loader.conf" loader_conf_dirs="/boot/loader.conf.d" +local_loader_conf_files="/boot/loader.conf.local" nextboot_conf="/boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 0d82a3dac9b3..e38ad865c288 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -131,6 +131,10 @@ Space separated list of directories to process for configuration files. The lua-based loader will process files with a .Dq .conf suffix that are placed in these directories. +Files found here are processed after the ones listed in +.Va loader_conf_files +but before the ones found in +.Va local_loader_conf_files . .It Ar loader_conf_files Defines additional configuration files to be processed right after the present file. @@ -138,6 +142,13 @@ present file. should be treated as write-only. One cannot depend on any value remaining in the loader environment or carried over into the kernel environment. +.It Ar local_loader_conf_files +Space separated list of additional configuration files to be processed at last, +i.e., after +.Va loader_conf_files +and +.Va loader_conf_dirs +are processed. .It Ar product_vars When set, must be a space separated list of environment variable names to walk through to guess product information. @@ -274,6 +285,14 @@ default settings can be ignored. The few of them which are important or useful are: .Bl -tag -width bootfile -offset indent +.It Va local_loader_conf_files +.Pq Dq /boot/loader.conf.local +Ensure +.Va loader.conf.local +can always be used to override settings from files found in +.Va loader_conf_files +and +.Va loader_conf_dirs . .It Va bitmap_load .Pq Dq NO If set to @@ -455,13 +474,18 @@ It is not available in the default Forth-based loader. .Sh FILES .Bl -tag -width /boot/defaults/loader.conf -compact .It Pa /boot/defaults/loader.conf -default settings \(em do not change this file. +Default settings \(em do not change this file. .It Pa /boot/loader.conf -user defined settings. +User defined settings. .It Pa /boot/loader.conf.lua -user defined settings written in lua. +User defined settings written in lua. +.It Pa /boot/loader.conf.d/*.conf +User defined settings split in separate files. +.It Pa /boot/loader.conf.d/*.lua +User defined settings written in lua and split in separate files. .It Pa /boot/loader.conf.local -machine-specific settings for sites with a common loader.conf. +Machine-specific settings for sites with a common loader.conf. Allow to override +settings defined in other files. .El .Sh SEE ALSO .Xr kenv 1 , diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 210bb9338783..86f5ef6174a2 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -630,8 +630,7 @@ function config.readConf(file, loaded_files) return end - -- We'll process loader_conf_dirs at the top-level readConf - local load_conf_dirs = next(loaded_files) == nil + local top_level = next(loaded_files) == nil -- Are we the top-level readConf? print("Loading " .. file) -- The final value of loader_conf_files is not important, so just @@ -656,7 +655,7 @@ function config.readConf(file, loaded_files) end end - if load_conf_dirs then + if top_level then local loader_conf_dirs = getEnv("loader_conf_dirs") -- If product_vars is set, it must be a list of environment variable names @@ -682,6 +681,7 @@ function config.readConf(file, loaded_files) end end + -- Process "loader_conf_dirs" extra-directories if loader_conf_dirs ~= nil then for name in loader_conf_dirs:gmatch("[%w%p]+") do if lfs.attributes(name, "mode") ~= "directory" then @@ -700,6 +700,15 @@ function config.readConf(file, loaded_files) ::nextdir:: end end + + -- Always allow overriding with local config files, e.g., + -- /boot/loader.conf.local. + local local_loader_conf_files = getEnv("local_loader_conf_files") + if local_loader_conf_files then + for name in local_loader_conf_files:gmatch("[%w%p]+") do + config.readConf(name, loaded_files) + end + end end end diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index f9896f2aa420..b2b1122285eb 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -64,9 +64,13 @@ as a configuration file .Po e.g., as .Pa loader.conf .Pc -and then processing files listed in +and then process files listed in the .Ev loader_conf_files -variable +variable. Additionnaly, the top-level call to readConf will process files listed in the +.Ev loader_conf_dirs +and +.Ev local_loader_conf_files +variables .Po see .Xr loader.conf 5 .Pc . From nobody Fri Feb 2 19:11:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQPh2vrKz584l5 for ; Fri, 2 Feb 2024 19:12:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRQPf4q1Xz4p44 for ; Fri, 2 Feb 2024 19:12:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d07d74be60so21499851fa.3 for ; Fri, 02 Feb 2024 11:12:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706901124; x=1707505924; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=eap75+kZaLxTdMlPeLc0SsWcCZTB3KfHo2e2WwAZgU4=; b=lp2zX3mKQaqznDX8YSEOiw/OssQNTk9LI8A473GYmtNz3r9zAPJ+R5twKr7CZqz+Xo DmLmwKLORE3XhxN8fV6PZtZpYt+8FTUn4ZdaU3bM1QuTCnKQc17NI4EospSMjTCosw+h w40+3cwXEcnkXlnGnh9jTpGqPlAPC+I5Ex5O0iL7Rd4FsZxh3+YHU54GD9e8UXc44SyE L2I+hd6eFGOycpwT0l/NZtUFO9LSDLKBDUVd2YUJ3GT5m/OSJjeKX8qfbcpboEHLRTbj C4MmGcIBsYAvnqqLRvd2S/yN/Rn9Ehq0rj01wDakPDVUrtq+bTGHB6aNGoZSOcNoERw0 V9ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706901124; x=1707505924; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eap75+kZaLxTdMlPeLc0SsWcCZTB3KfHo2e2WwAZgU4=; b=alqicScpcCCBTs0edzDL+3kZTRT0vOHInMdf4uWXsA/+3bK49tb24YJ6UE6U9ooQPt yD5uloYJwYq2xpd1c7xPcfQ37e7z1302DUWYxT/ZffH9lhPA9/1axOYV4Fl9J9iHBUO6 diDH4Va3y1TPDV+VjlYs7iXWiYOV0QwlMMtbdN8nBSXJ0td/pxW6S1/QcX5e+N3qF3aE 8BBen0c82DSMZaPcXz3h1uc8WmyK5ZcGBIEf/LbCPLmVC+bWLgiA90+5Nh7VGwERR3Me LldsIvyXNy9xYDN1RvB/lallbw9S+/0d+zwEfp7c/WQuc/ljXOclHSRq35ptswKRCIAF fIqQ== X-Gm-Message-State: AOJu0Yzqkhm8fDzAoLbCefR1GOj81Rk4uxFB9aGvLopet5e878mbSXRk l5jssVBtxm4ssMlf2ingFm+y7eeBw32Dxig5Rcj0VcuLWCmJOOwRhmZklbFsCzlIAqKw77MEbCw AVRfM6q/sMksKDwaUUTJBPBSxUN47QaXyScG3Wg== X-Google-Smtp-Source: AGHT+IEIIg+bb/dQHI4a7MzU4+4dOPf7ZEZsQIvo++JOmb0F/9317k24OFZ3dR5nsE+gZcpCyDgg8LsbACVqSt/LmEk= X-Received: by 2002:a2e:b16d:0:b0:2d0:5f57:7442 with SMTP id a13-20020a2eb16d000000b002d05f577442mr2216645ljm.20.1706901124273; Fri, 02 Feb 2024 11:12:04 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402021906.412J667P054855@gitrepo.freebsd.org> In-Reply-To: <202402021906.412J667P054855@gitrepo.freebsd.org> From: Warner Losh Date: Fri, 2 Feb 2024 12:11:53 -0700 Message-ID: Subject: Re: git: 5fdf01dbeef1 - main - Revert "stand/lua: always allow overriding with local config files" To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002e1e9906106ae361" X-Rspamd-Queue-Id: 4TRQPf4q1Xz4p44 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:15169, ipnet:2a00:1450::/32, country:US] --0000000000002e1e9906106ae361 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Feb 2, 2024 at 12:06=E2=80=AFPM Warner Losh wrote= : > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D5fdf01dbeef1f64f8c446561498d662= 702451ac1 > > commit 5fdf01dbeef1f64f8c446561498d662702451ac1 > Author: Warner Losh > AuthorDate: 2024-02-02 19:01:56 +0000 > Commit: Warner Losh > CommitDate: 2024-02-02 19:04:57 +0000 > > Revert "stand/lua: always allow overriding with local config files" > > This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe. no mail > sent out, and the commit message was wrong. > Due to conflicts, my pr landing script didn't rewrite the commit message. This occurred to me in the instant after I hit return on git push. My ^C was too late to prevent the deltas from being transmitted and recorded in the repo, but also cut-short the commit hooks that send out the email. My apologies for this lack of attention to detail. Warner --0000000000002e1e9906106ae361 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Feb 2, 2024 at 12:06=E2=80=AF= PM Warner Losh <imp@freebsd.org&g= t; wrote:
The br= anch main has been updated by imp:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D5fdf01dbeef1f64f8c446561498d662702451ac1
commit 5fdf01dbeef1f64f8c446561498d662702451ac1
Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-02 19:01:56 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-02 19:04:57 +0000

=C2=A0 =C2=A0 Revert "stand/lua: always allow overriding with local co= nfig files"

=C2=A0 =C2=A0 This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe.= no mail
=C2=A0 =C2=A0 sent out, and the commit message was wrong.
<= div>
Due to conflicts, my pr landing script didn't rewrit= e the commit message. This
occurred to me in the instant after I = hit return on git push. My ^C was too late
to prevent the deltas = from being transmitted and=C2=A0 recorded in the repo, but
also c= ut-short the commit hooks that send out the email. My apologies for
this lack of attention to detail.

Warner
<= /div>
--0000000000002e1e9906106ae361-- From nobody Fri Feb 2 19:13:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQR86b8rz584gR; Fri, 2 Feb 2024 19:13: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 4TRQR85zP3z4pND; Fri, 2 Feb 2024 19:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706901204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPKAgeQDsvNSj32fNaH7WJS3Xrq2rTHq0ZNn+mQCUOo=; b=YjpLZjFHljYuF4TEx39uPOE9LH3JfdgRWOZyO+ZuVBkpvbeMhz4g0xzQQde/vokJOk3eSo Q7z5Eql+6EYloyI1Hf97x6xTq8asQkw5bHmADm0hvIH8AsUhOC0ECp1ZeJkfYTGbsB3Ke/ 0QlehlrV2uuZl8DFS2qbGwXHWOhUy+KoZIWU5gitzvo2z6/F39kiLBZ+pKbYg7QrkZ0e/1 A7JejJch/W6GrZB/w3/Khs9CYeEb4nn540ykI4S/0DJVi7g6GNP19U5A/W2wQQq6xivA1e op/DK5XSXpAQc47NYLSkdhb2614SxSZFvNT0OcaFKTYGgq/nCO3ElVnGgpZ+rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706901204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mPKAgeQDsvNSj32fNaH7WJS3Xrq2rTHq0ZNn+mQCUOo=; b=PiSk1LOWiS52ceT4+qilsPZ2YhcbqdvkA+JAr8WeFN4Kt/cvyQGabRLBfGld7eeV0wgHHV a96RXfi3WgtoL++c7/HPfHduDJRs7Yeq2Wyzlaau/qrHuRXzZ2kE393EARWCGix9ryD0sM wkaD6e5I++BSrlJudkAwiwKDeNs7a5OtMJ0m2MCqe+wv3Rud0XyC9vxlxWgSZwvpwlwBAe k2l2JW0avsbUOiRx24FLtpJJJer75yx6rePTnFEVnMzyLaQLWG8Jy2R0IFWVaQXByn9AIq 34KgeJtkIIV5PoENgzjSL9eudi0tCTZ6bVS+AUjyY2WYjDTNoQKQwuFjoLXH8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706901204; a=rsa-sha256; cv=none; b=LAekXVYcGVj/qzY6+3wHz+lDSRij4zqO2Xq3uaXZ2jXcGXIrLFSVxES2gBCyyHgXCvywHj 7M6eocIoWvcCBe2naPegekkpBpdicyKcLTTlHePmEDStXudRhrRmywUH/yZ3Y/+X/jEI6f cPeQ6c9j/A/0HHE5b4kXL5e/z4RcyBCsRNKkvH1cgEoV7S1LiuzykhYlmQq2cTX8T2pejl NMC2TmBSS9z9gn8nZcQRYiUzHF2NyMj7j3Dqds0wk04/BlT+1kBU0ezkP5l4JZj1L7IaNl rj3wTFDSVCwyLF2nhEkl6sQ1msMglJyQ4YC8RyiD+dYB9qpZbhUOKWeODuUaOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQR8514WzhLX; Fri, 2 Feb 2024 19:13: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 412JDOlc071254; Fri, 2 Feb 2024 19:13:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JDO6m071251; Fri, 2 Feb 2024 19:13:24 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:13:24 GMT Message-Id: <202402021913.412JDO6m071251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d56a6f0516a7 - main - stdlib.h: Partially revert c27a89971805 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d56a6f0516a748774673272f227c1862827b46fc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d56a6f0516a748774673272f227c1862827b46fc commit d56a6f0516a748774673272f227c1862827b46fc Author: Warner Losh AuthorDate: 2024-02-02 19:06:25 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:11:50 +0000 stdlib.h: Partially revert c27a89971805 quick_exit() can call other functions, and we don't guarantee it calls std::terminate should those other functions throw exceptions. And to make it do so has ABI complications for libc. Until that's sorted out, revert this noexcept (but leave a comment behind so people will find this commit message) Requested by: kib Sponsored by: Netflix --- include/stdlib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/stdlib.h b/include/stdlib.h index f0687f01e6c7..7a934dfa306d 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -165,7 +165,7 @@ void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); int at_quick_exit(void (*)(void)) __noexcept; _Noreturn void - quick_exit(int) __noexcept; + quick_exit(int) /* __noexcept -- not ready ABI issues? */; #endif /* __ISO_C_VISIBLE >= 2011 */ /* * Extensions made by POSIX relative to C. From nobody Fri Feb 2 19:38:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRQzf4cSvz586qY; Fri, 2 Feb 2024 19: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 4TRQzf4NrNz4rW3; Fri, 2 Feb 2024 19:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706902686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0RGcOpt1ZblBdGBwA09bJEtwixmt8tkIwW4WS1AoVw=; b=hn2V+fameGvcARnQvuYr6xZd+j7d0su4W4XKbJ9M8wabUbrfkbfmcdoTfhtN8rZ0wmRlXE R8+9pMbNmHxrdDg8thLrQ4/8USvRrlH0Ed0IdhrFSAbcr85ckNBrvDlrAmcGrYsx+LFvVi C+6NaSn0C1AR/qAZHJXOJI8DM5XeBx2UEHkvNSvzViGAbskqELBoCCX2Uk0WSB4EmfIXC0 FmFBChrQJ7g34sO+yFuRLIC0mDQzZO+Ukk+47ZlbDjLhURFOfiE9ZvKe7+tHD/rz++HCq6 9Bg4+uZ893B5lRb4lWUxCgBdub/YqE9SdBCxZoTtsfjtynIU3yWABdg4mU2O8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706902686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M0RGcOpt1ZblBdGBwA09bJEtwixmt8tkIwW4WS1AoVw=; b=b2SfX8fFs1hQjVohtfCFVbZS/EjWpxsucOVmT+DFXaDWiQp0AKej5t854pi0MHsed/Q+tW 56G2JHXPyZYDxHA5Nz4KNc4GalE3ZzhU/gpdWB7tdVgyI1y1d+/e1HT76o9ff/R4uTOhdU Y14YetSW3bcv6K1AfG2gEfJYcJwZgTHEeGDMdqqvB16xJKMr2WBkQw6vJxyVC/vyi1bDpa na0bzpjQTUk8a4549ZpP3FslKJMZsjDYpo6RVEiHtujkqukVZZXF9KtlOTz/M463yzpNax Mco3EBZaBWfkN3xyvB0Ki1uLT3JBYJTBs8/Z/dOmwrbTIA0FmN/o83ZnsxhGoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706902686; a=rsa-sha256; cv=none; b=NQfCY7wxCSZUmMY+mIpxB0e1UceWS2fILUV0U3YMnm+qKeNm/5F/Nk5fvIwG9Iv8ydO89Q 0G+WKgkwd4DjMHrx2xXQ0OhBcb8TBLkGSv6DSFzE/NDX0fcWG/iHQUJ6UPiEUNJQ9S7Ox+ LdgzbFaSQM0xUzStUpJiD14IwxYj5Kryq6pllMzVmorWM/K4x5XuRJvHryd47jwNRJOypa S2j9lhmvZjQ27TOKFWAikI0fbh1SiOVko3Fp589DWlBJ9bHZ6cM3F5f8z6NeJm36aSGsOI PyqYp8fhOMlLRJ2kWNwRE9H/E0C+hkvDxsgvsS2L+eesv3mYXJ4zNlEWjgyWAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRQzf3SqSzjtd; Fri, 2 Feb 2024 19:38: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 412Jc61p005043; Fri, 2 Feb 2024 19:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412Jc61x005040; Fri, 2 Feb 2024 19:38:06 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:38:06 GMT Message-Id: <202402021938.412Jc61x005040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 445bed5c4d85 - main - axgbe: Various link stability and module compatibilty improvements List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 445bed5c4d859575951361e432024396b938f863 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=445bed5c4d859575951361e432024396b938f863 commit 445bed5c4d859575951361e432024396b938f863 Author: Stephan de Wit AuthorDate: 2024-02-02 19:17:14 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:21:00 +0000 axgbe: Various link stability and module compatibilty improvements Move the phy_stop() routine to if_detach() to prevent link interruptions when configuring the interface. Accompanying this is a sanity check using phy_started, which was already there but remained unused. We do not move phy_start(), as the logic there is needed for any init routine, be it attach or start. Also bring in the linux PMA_PLL change which addresses the flapping of back-to-back fiber connections. Use miibus for SFP PHYs up to 1G copper. We retry in cases where the PHY is not directly reachable. Set the correct IFM_100_SGMII flag when the phy speed has been set to 100. We remove xgbe_phy_start_aneg() since it's handled by miibus. Add support for 100 and 1000 BASE-BX fiber modules Add support for 25G multirate DACs which are capable of 10G. While here, also fixup the LINK_ERR state. It was impossible to recover from this previously. [[ Note: light style fixes by imp, slight commit message adjustment, and a warning that I don't have the hardware to validate, but the changes do track the commit message and seem otherwise OK ]] Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/768 --- sys/dev/axgbe/if_axgbe_pci.c | 4 +- sys/dev/axgbe/xgbe-common.h | 8 ++ sys/dev/axgbe/xgbe-i2c.c | 5 +- sys/dev/axgbe/xgbe-mdio.c | 12 +- sys/dev/axgbe/xgbe-phy-v2.c | 271 ++++++++++++++++++++++++++++++------------- 5 files changed, 209 insertions(+), 91 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index dcf769d14f75..beb4ff338dc7 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -1534,6 +1534,7 @@ axgbe_if_detach(if_ctx_t ctx) mac_res[0] = pdata->xgmac_res; mac_res[1] = pdata->xpcs_res; + phy_if->phy_stop(pdata); phy_if->phy_exit(pdata); /* Free Interrupts */ @@ -1605,7 +1606,6 @@ axgbe_pci_stop(if_ctx_t ctx) { struct axgbe_if_softc *sc = iflib_get_softc(ctx); struct xgbe_prv_data *pdata = &sc->pdata; - struct xgbe_phy_if *phy_if = &pdata->phy_if; struct xgbe_hw_if *hw_if = &pdata->hw_if; int ret; @@ -1620,8 +1620,6 @@ axgbe_pci_stop(if_ctx_t ctx) hw_if->disable_tx(pdata); hw_if->disable_rx(pdata); - phy_if->phy_stop(pdata); - ret = hw_if->exit(pdata); if (ret) axgbe_error("%s: exit error %d\n", __func__, ret); diff --git a/sys/dev/axgbe/xgbe-common.h b/sys/dev/axgbe/xgbe-common.h index 0f497e53cb6f..4d504682d1af 100644 --- a/sys/dev/axgbe/xgbe-common.h +++ b/sys/dev/axgbe/xgbe-common.h @@ -1363,6 +1363,10 @@ #define MDIO_VEND2_PMA_CDR_CONTROL 0x8056 #endif +#ifndef MDIO_VEND2_PMA_MISC_CTRL0 +#define MDIO_VEND2_PMA_MISC_CTRL0 0x8090 +#endif + #ifndef MDIO_CTRL1_SPEED1G #define MDIO_CTRL1_SPEED1G (MDIO_CTRL1_SPEED10G & ~BMCR_SPEED100) #endif @@ -1415,6 +1419,10 @@ #define XGBE_PMA_CDR_TRACK_EN_OFF 0x00 #define XGBE_PMA_CDR_TRACK_EN_ON 0x01 +#define XGBE_PMA_PLL_CTRL_MASK BIT(15) +#define XGBE_PMA_PLL_CTRL_ENABLE BIT(15) +#define XGBE_PMA_PLL_CTRL_DISABLE 0x0000 + /* Bit setting and getting macros * The get macro will extract the current bit field value from within * the variable diff --git a/sys/dev/axgbe/xgbe-i2c.c b/sys/dev/axgbe/xgbe-i2c.c index 59c767d0efc7..5883e96ed37e 100644 --- a/sys/dev/axgbe/xgbe-i2c.c +++ b/sys/dev/axgbe/xgbe-i2c.c @@ -438,11 +438,10 @@ xgbe_i2c_xfer(struct xgbe_prv_data *pdata, struct xgbe_i2c_op *op) } ret = state->ret; - axgbe_printf(3, "%s: i2c xfer ret %d abrt_source 0x%x \n", __func__, + axgbe_printf(3, "%s: i2c xfer ret %d abrt_source 0x%x\n", __func__, ret, state->tx_abort_source); if (ret) { - - axgbe_error("%s: i2c xfer ret %d abrt_source 0x%x \n", __func__, + axgbe_printf(1, "%s: i2c xfer ret %d abrt_source 0x%x\n", __func__, ret, state->tx_abort_source); if (state->tx_abort_source & IC_TX_ABRT_7B_ADDR_NOACK) ret = -ENOTCONN; diff --git a/sys/dev/axgbe/xgbe-mdio.c b/sys/dev/axgbe/xgbe-mdio.c index 16488055e2c6..a5a9fdd016bc 100644 --- a/sys/dev/axgbe/xgbe-mdio.c +++ b/sys/dev/axgbe/xgbe-mdio.c @@ -734,11 +734,6 @@ xgbe_an37_state_machine(struct xgbe_prv_data *pdata) if (pdata->an_int & XGBE_AN_CL37_INT_CMPLT) { pdata->an_state = XGBE_AN_COMPLETE; pdata->an_int &= ~XGBE_AN_CL37_INT_CMPLT; - - /* If SGMII is enabled, check the link status */ - if ((pdata->an_mode == XGBE_AN_MODE_CL37_SGMII) && - !(pdata->an_status & XGBE_SGMII_AN_LINK_STATUS)) - pdata->an_state = XGBE_AN_NO_LINK; } axgbe_printf(2, "%s: CL37 AN %s\n", __func__, @@ -1364,6 +1359,7 @@ xgbe_phy_status(struct xgbe_prv_data *pdata) if (test_bit(XGBE_LINK_ERR, &pdata->dev_state)) { axgbe_error("%s: LINK_ERR\n", __func__); pdata->phy.link = 0; + clear_bit(XGBE_LINK_ERR, &pdata->dev_state); goto adjust_link; } @@ -1443,7 +1439,10 @@ xgbe_phy_stop(struct xgbe_prv_data *pdata) static int xgbe_phy_start(struct xgbe_prv_data *pdata) { - int ret; + int ret = 0; + + if (pdata->phy_started) + return (ret); DBGPR("-->xgbe_phy_start\n"); @@ -1588,6 +1587,7 @@ xgbe_phy_init(struct xgbe_prv_data *pdata) pdata->phy.duplex = DUPLEX_FULL; } + pdata->phy_started = 0; pdata->phy.link = 0; pdata->phy.pause_autoneg = pdata->pause_autoneg; diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c index 9a057c34c6c9..d8c372cac642 100644 --- a/sys/dev/axgbe/xgbe-phy-v2.c +++ b/sys/dev/axgbe/xgbe-phy-v2.c @@ -150,6 +150,9 @@ struct mtx xgbe_phy_comm_lock; /* RRC frequency during link status check */ #define XGBE_RRC_FREQUENCY 10 +/* SFP port max PHY probe retries */ +#define XGBE_SFP_PHY_RETRY_MAX 5 + enum xgbe_port_mode { XGBE_PORT_MODE_RSVD = 0, XGBE_PORT_MODE_BACKPLANE, @@ -186,10 +189,16 @@ enum xgbe_sfp_cable { enum xgbe_sfp_base { XGBE_SFP_BASE_UNKNOWN = 0, + XGBE_SFP_BASE_PX, + XGBE_SFP_BASE_BX10, + XGBE_SFP_BASE_100_FX, + XGBE_SFP_BASE_100_LX10, + XGBE_SFP_BASE_100_BX, XGBE_SFP_BASE_1000_T, XGBE_SFP_BASE_1000_SX, XGBE_SFP_BASE_1000_LX, XGBE_SFP_BASE_1000_CX, + XGBE_SFP_BASE_1000_BX, XGBE_SFP_BASE_10000_SR, XGBE_SFP_BASE_10000_LR, XGBE_SFP_BASE_10000_LRM, @@ -199,9 +208,11 @@ enum xgbe_sfp_base { enum xgbe_sfp_speed { XGBE_SFP_SPEED_UNKNOWN = 0, + XGBE_SFP_SPEED_100, XGBE_SFP_SPEED_100_1000, XGBE_SFP_SPEED_1000, XGBE_SFP_SPEED_10000, + XGBE_SFP_SPEED_25000, }; /* SFP Serial ID Base ID values relative to an offset of 0 */ @@ -225,16 +236,31 @@ enum xgbe_sfp_speed { #define XGBE_SFP_BASE_1GBE_CC_LX BIT(1) #define XGBE_SFP_BASE_1GBE_CC_CX BIT(2) #define XGBE_SFP_BASE_1GBE_CC_T BIT(3) +#define XGBE_SFP_BASE_100M_CC_LX10 BIT(4) +#define XGBE_SFP_BASE_100M_CC_FX BIT(5) +#define XGBE_SFP_BASE_CC_BX10 BIT(6) +#define XGBE_SFP_BASE_CC_PX BIT(7) #define XGBE_SFP_BASE_CABLE 8 #define XGBE_SFP_BASE_CABLE_PASSIVE BIT(2) #define XGBE_SFP_BASE_CABLE_ACTIVE BIT(3) #define XGBE_SFP_BASE_BR 12 +#define XGBE_SFP_BASE_BR_100M_MIN 0x1 +#define XGBE_SFP_BASE_BR_100M_MAX 0x2 #define XGBE_SFP_BASE_BR_1GBE_MIN 0x0a #define XGBE_SFP_BASE_BR_1GBE_MAX 0x0d #define XGBE_SFP_BASE_BR_10GBE_MIN 0x64 #define XGBE_SFP_BASE_BR_10GBE_MAX 0x68 +#define XGBE_SFP_BASE_BR_25GBE 0xFF + +/* Single mode, length of fiber in units of km */ +#define XGBE_SFP_BASE_SM_LEN_KM 14 +#define XGBE_SFP_BASE_SM_LEN_KM_MIN 0x0A + +/* Single mode, length of fiber in units of 100m */ +#define XGBE_SFP_BASE_SM_LEN_100M 15 +#define XGBE_SFP_BASE_SM_LEN_100M_MIN 0x64 #define XGBE_SFP_BASE_CU_CABLE_LEN 18 @@ -245,6 +271,14 @@ enum xgbe_sfp_speed { #define XGBE_SFP_BASE_VENDOR_REV 56 #define XGBE_SFP_BASE_VENDOR_REV_LEN 4 +/* + * Optical specification compliance - denotes wavelength + * for optical tranceivers + */ +#define XGBE_SFP_BASE_OSC 60 +#define XGBE_SFP_BASE_OSC_LEN 2 +#define XGBE_SFP_BASE_OSC_1310 0x051E + #define XGBE_SFP_BASE_CC 63 /* SFP Serial ID Extended ID values relative to an offset of 64 */ @@ -365,6 +399,7 @@ struct xgbe_phy_data { enum xgbe_mdio_reset mdio_reset; unsigned int mdio_reset_addr; unsigned int mdio_reset_gpio; + int sfp_phy_retries; /* Re-driver support */ unsigned int redrv; @@ -382,6 +417,8 @@ struct xgbe_phy_data { static enum xgbe_an_mode xgbe_phy_an_mode(struct xgbe_prv_data *pdata); static int xgbe_phy_reset(struct xgbe_prv_data *pdata); +static int axgbe_ifmedia_upd(struct ifnet *ifp); +static void axgbe_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static int xgbe_phy_i2c_xfer(struct xgbe_prv_data *pdata, struct xgbe_i2c_op *i2c_op) @@ -756,6 +793,14 @@ xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) } switch (phy_data->sfp_base) { + case XGBE_SFP_BASE_100_FX: + case XGBE_SFP_BASE_100_LX10: + case XGBE_SFP_BASE_100_BX: + pdata->phy.speed = SPEED_100; + pdata->phy.duplex = DUPLEX_FULL; + pdata->phy.autoneg = AUTONEG_DISABLE; + pdata->phy.pause_autoneg = AUTONEG_DISABLE; + break; case XGBE_SFP_BASE_1000_T: case XGBE_SFP_BASE_1000_SX: case XGBE_SFP_BASE_1000_LX: @@ -777,6 +822,13 @@ xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) XGBE_SET_SUP(&pdata->phy, 1000baseX_Full); } break; + case XGBE_SFP_BASE_1000_BX: + case XGBE_SFP_BASE_PX: + pdata->phy.speed = SPEED_1000; + pdata->phy.duplex = DUPLEX_FULL; + pdata->phy.autoneg = AUTONEG_DISABLE; + pdata->phy.pause_autoneg = AUTONEG_DISABLE; + break; case XGBE_SFP_BASE_10000_SR: case XGBE_SFP_BASE_10000_LR: case XGBE_SFP_BASE_10000_LRM: @@ -844,6 +896,10 @@ xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom, sfp_base = sfp_eeprom->base; switch (sfp_speed) { + case XGBE_SFP_SPEED_100: + min = XGBE_SFP_BASE_BR_100M_MIN; + max = XGBE_SFP_BASE_BR_100M_MAX; + break; case XGBE_SFP_SPEED_1000: min = XGBE_SFP_BASE_BR_1GBE_MIN; max = XGBE_SFP_BASE_BR_1GBE_MAX; @@ -852,6 +908,10 @@ xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom, min = XGBE_SFP_BASE_BR_10GBE_MIN; max = XGBE_SFP_BASE_BR_10GBE_MAX; break; + case XGBE_SFP_SPEED_25000: + min = XGBE_SFP_BASE_BR_25GBE; + max = XGBE_SFP_BASE_BR_25GBE; + break; default: return (false); } @@ -867,6 +927,11 @@ xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata) if (phy_data->phydev) phy_data->phydev = 0; + + if (pdata->axgbe_miibus != NULL) { + device_delete_child(pdata->dev, pdata->axgbe_miibus); + pdata->axgbe_miibus = NULL; + } } static bool @@ -1009,49 +1074,6 @@ xgbe_get_phy_id(struct xgbe_prv_data *pdata) return (0); } -static int -xgbe_phy_start_aneg(struct xgbe_prv_data *pdata) -{ - uint16_t ctl = 0; - int changed = 0; - int ret; - - if (AUTONEG_ENABLE != pdata->phy.autoneg) { - if (SPEED_1000 == pdata->phy.speed) - ctl |= BMCR_SPEED1; - else if (SPEED_100 == pdata->phy.speed) - ctl |= BMCR_SPEED100; - - if (DUPLEX_FULL == pdata->phy.duplex) - ctl |= BMCR_FDX; - - ret = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_BMCR); - if (ret) - return (ret); - - ret = xgbe_phy_mii_write(pdata, pdata->mdio_addr, MII_BMCR, - (ret & ~(~(BMCR_LOOP | BMCR_ISO | BMCR_PDOWN))) | ctl); - } - - ctl = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_BMCR); - if (ctl < 0) - return (ctl); - - if (!(ctl & BMCR_AUTOEN) || (ctl & BMCR_ISO)) - changed = 1; - - if (changed > 0) { - ret = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_BMCR); - if (ret) - return (ret); - - ret = xgbe_phy_mii_write(pdata, pdata->mdio_addr, MII_BMCR, - (ret & ~(BMCR_ISO)) | (BMCR_AUTOEN | BMCR_STARTNEG)); - } - - return (0); -} - static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata) { @@ -1102,7 +1124,6 @@ xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata) phy_data->phydev = 1; xgbe_phy_external_phy_quirks(pdata); - xgbe_phy_start_aneg(pdata); return (0); } @@ -1115,7 +1136,7 @@ xgbe_phy_sfp_external_phy(struct xgbe_prv_data *pdata) axgbe_printf(3, "%s: sfp_changed: 0x%x\n", __func__, phy_data->sfp_changed); - if (!phy_data->sfp_changed) + if (!phy_data->sfp_phy_retries && !phy_data->sfp_changed) return; phy_data->sfp_phy_avail = 0; @@ -1126,13 +1147,26 @@ xgbe_phy_sfp_external_phy(struct xgbe_prv_data *pdata) /* Check access to the PHY by reading CTRL1 */ ret = xgbe_phy_i2c_mii_read(pdata, MII_BMCR); if (ret < 0) { - axgbe_error("%s: ext phy fail %d\n", __func__, ret); + phy_data->sfp_phy_retries++; + if (phy_data->sfp_phy_retries >= XGBE_SFP_PHY_RETRY_MAX) + phy_data->sfp_phy_retries = 0; + axgbe_printf(1, "%s: ext phy fail %d. retrying.\n", __func__, ret); return; } /* Successfully accessed the PHY */ phy_data->sfp_phy_avail = 1; axgbe_printf(3, "Successfully accessed External PHY\n"); + + /* Attach external PHY to the miibus */ + ret = mii_attach(pdata->dev, &pdata->axgbe_miibus, pdata->netdev, + (ifm_change_cb_t)axgbe_ifmedia_upd, + (ifm_stat_cb_t)axgbe_ifmedia_sts, BMSR_DEFCAPMASK, + pdata->mdio_addr, MII_OFFSET_ANY, MIIF_FORCEANEG); + + if (ret) { + axgbe_error("mii attach failed with err=(%d)\n", ret); + } } static bool @@ -1187,6 +1221,7 @@ xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) struct xgbe_phy_data *phy_data = pdata->phy_data; struct xgbe_sfp_eeprom *sfp_eeprom = &phy_data->sfp_eeprom; uint8_t *sfp_base; + uint16_t wavelen = 0; sfp_base = sfp_eeprom->base; @@ -1211,14 +1246,19 @@ xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) } else phy_data->sfp_cable = XGBE_SFP_CABLE_ACTIVE; + wavelen = (sfp_base[XGBE_SFP_BASE_OSC] << 8) | sfp_base[XGBE_SFP_BASE_OSC + 1]; + /* * Determine the type of SFP. Certain 10G SFP+ modules read as * 1000BASE-CX. To prevent 10G DAC cables to be recognized as * 1G, we first check if it is a DAC and the bitrate is 10G. + * If it's greater than 10G, we assume the DAC is capable + * of multiple bitrates, set the MAC to 10G and hope for the best. */ if (((sfp_base[XGBE_SFP_BASE_CV] & XGBE_SFP_BASE_CV_CP) || - (phy_data->sfp_cable == XGBE_SFP_CABLE_PASSIVE)) && - xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000)) + (phy_data->sfp_cable == XGBE_SFP_CABLE_PASSIVE)) && + (xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000) || + xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_25000))) phy_data->sfp_base = XGBE_SFP_BASE_10000_CR; else if (sfp_base[XGBE_SFP_BASE_10GBE_CC] & XGBE_SFP_BASE_10GBE_CC_SR) phy_data->sfp_base = XGBE_SFP_BASE_10000_SR; @@ -1236,14 +1276,44 @@ xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) phy_data->sfp_base = XGBE_SFP_BASE_1000_CX; else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_1GBE_CC_T) phy_data->sfp_base = XGBE_SFP_BASE_1000_T; + else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_100M_CC_LX10) + phy_data->sfp_base = XGBE_SFP_BASE_100_LX10; + else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_100M_CC_FX) + phy_data->sfp_base = XGBE_SFP_BASE_100_FX; + else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_CC_BX10) { + /* BX10 can be either 100 or 1000 */ + if (xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_100)) { + phy_data->sfp_base = XGBE_SFP_BASE_100_BX; + } else { + /* default to 1000 */ + phy_data->sfp_base = XGBE_SFP_BASE_1000_BX; + } + } else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_CC_PX) + phy_data->sfp_base = XGBE_SFP_BASE_PX; + else if (xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_1000) + && (sfp_base[XGBE_SFP_BASE_SM_LEN_KM] >= XGBE_SFP_BASE_SM_LEN_KM_MIN + || sfp_base[XGBE_SFP_BASE_SM_LEN_100M] >= XGBE_SFP_BASE_SM_LEN_100M_MIN) + && wavelen >= XGBE_SFP_BASE_OSC_1310) + phy_data->sfp_base = XGBE_SFP_BASE_1000_BX; + else if (xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_100) + && (sfp_base[XGBE_SFP_BASE_SM_LEN_KM] >= XGBE_SFP_BASE_SM_LEN_KM_MIN + || sfp_base[XGBE_SFP_BASE_SM_LEN_100M] >= XGBE_SFP_BASE_SM_LEN_100M_MIN) + && wavelen >= XGBE_SFP_BASE_OSC_1310) + phy_data->sfp_base = XGBE_SFP_BASE_100_BX; switch (phy_data->sfp_base) { + case XGBE_SFP_BASE_100_FX: + case XGBE_SFP_BASE_100_LX10: + case XGBE_SFP_BASE_100_BX: + phy_data->sfp_speed = XGBE_SFP_SPEED_100; case XGBE_SFP_BASE_1000_T: phy_data->sfp_speed = XGBE_SFP_SPEED_100_1000; break; + case XGBE_SFP_BASE_PX: case XGBE_SFP_BASE_1000_SX: case XGBE_SFP_BASE_1000_LX: case XGBE_SFP_BASE_1000_CX: + case XGBE_SFP_BASE_1000_BX: phy_data->sfp_speed = XGBE_SFP_SPEED_1000; break; case XGBE_SFP_BASE_10000_SR: @@ -1269,29 +1339,29 @@ xgbe_phy_sfp_eeprom_info(struct xgbe_prv_data *pdata, struct xgbe_sfp_ascii sfp_ascii; char *sfp_data = (char *)&sfp_ascii; - axgbe_printf(3, "SFP detected:\n"); + axgbe_printf(0, "SFP detected:\n"); memcpy(sfp_data, &sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_NAME], XGBE_SFP_BASE_VENDOR_NAME_LEN); sfp_data[XGBE_SFP_BASE_VENDOR_NAME_LEN] = '\0'; - axgbe_printf(3, " vendor: %s\n", + axgbe_printf(0, " vendor: %s\n", sfp_data); memcpy(sfp_data, &sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_PN], XGBE_SFP_BASE_VENDOR_PN_LEN); sfp_data[XGBE_SFP_BASE_VENDOR_PN_LEN] = '\0'; - axgbe_printf(3, " part number: %s\n", + axgbe_printf(0, " part number: %s\n", sfp_data); memcpy(sfp_data, &sfp_eeprom->base[XGBE_SFP_BASE_VENDOR_REV], XGBE_SFP_BASE_VENDOR_REV_LEN); sfp_data[XGBE_SFP_BASE_VENDOR_REV_LEN] = '\0'; - axgbe_printf(3, " revision level: %s\n", + axgbe_printf(0, " revision level: %s\n", sfp_data); memcpy(sfp_data, &sfp_eeprom->extd[XGBE_SFP_BASE_VENDOR_SN], XGBE_SFP_BASE_VENDOR_SN_LEN); sfp_data[XGBE_SFP_BASE_VENDOR_SN_LEN] = '\0'; - axgbe_printf(3, " serial number: %s\n", + axgbe_printf(0, " serial number: %s\n", sfp_data); } @@ -1337,14 +1407,15 @@ xgbe_phy_sfp_read_eeprom(struct xgbe_prv_data *pdata) &eeprom_addr, sizeof(eeprom_addr), &sfp_eeprom, sizeof(sfp_eeprom)); - eeprom = &sfp_eeprom; - base = eeprom->base; - dump_sfp_eeprom(pdata, base); if (ret) { axgbe_error("I2C error reading SFP EEPROM\n"); goto put; } + eeprom = &sfp_eeprom; + base = eeprom->base; + dump_sfp_eeprom(pdata, base); + /* Validate the contents read */ if (!xgbe_phy_sfp_verify_eeprom(sfp_eeprom.base[XGBE_SFP_BASE_CC], sfp_eeprom.base, sizeof(sfp_eeprom.base) - 1)) { @@ -1610,17 +1681,17 @@ xgbe_phy_an37_sgmii_outcome(struct xgbe_prv_data *pdata) } break; case XGBE_SGMII_AN_LINK_SPEED_1000: + default: + /* Default to 1000 */ if (pdata->an_status & XGBE_SGMII_AN_LINK_DUPLEX) { XGBE_SET_LP_ADV(&pdata->phy, 1000baseT_Full); mode = XGBE_MODE_SGMII_1000; } else { /* Half-duplex not supported */ XGBE_SET_LP_ADV(&pdata->phy, 1000baseT_Half); - mode = XGBE_MODE_UNKNOWN; + mode = XGBE_MODE_SGMII_1000; } break; - default: - mode = XGBE_MODE_UNKNOWN; } return (mode); @@ -1913,7 +1984,6 @@ xgbe_phy_an_config(struct xgbe_prv_data *pdata) if (!phy_data->phydev) return (0); - ret = xgbe_phy_start_aneg(pdata); return (ret); } @@ -2022,6 +2092,16 @@ xgbe_phy_set_redrv_mode(struct xgbe_prv_data *pdata) xgbe_phy_put_comm_ownership(pdata); } +static void +xgbe_phy_pll_ctrl(struct xgbe_prv_data *pdata, bool enable) +{ + XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_VEND2_PMA_MISC_CTRL0, + XGBE_PMA_PLL_CTRL_MASK, + enable ? XGBE_PMA_PLL_CTRL_ENABLE + : XGBE_PMA_PLL_CTRL_DISABLE); + DELAY(200); +} + static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata, unsigned int cmd, unsigned int sub_cmd) @@ -2029,6 +2109,8 @@ xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata, unsigned int cmd, unsigned int s0 = 0; unsigned int wait; + xgbe_phy_pll_ctrl(pdata, false); + /* Log if a previous command did not complete */ if (XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS)) axgbe_error("firmware mailbox not ready for command\n"); @@ -2047,13 +2129,16 @@ xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata, unsigned int cmd, while (wait--) { if (!XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS)) { axgbe_printf(3, "%s: Rate change done\n", __func__); - return; + goto reenable_pll; } DELAY(2000); } axgbe_printf(3, "firmware mailbox command did not complete\n"); + +reenable_pll: + xgbe_phy_pll_ctrl(pdata, true); } static void @@ -2436,7 +2521,7 @@ xgbe_phy_get_type(struct xgbe_prv_data *pdata, struct ifmediareq * ifmr) if(phy_data->port_mode == XGBE_PORT_MODE_NBASE_T) ifmr->ifm_active |= IFM_100_T; else if(phy_data->port_mode == XGBE_PORT_MODE_SFP) - ifmr->ifm_active |= IFM_1000_SGMII; + ifmr->ifm_active |= IFM_100_SGMII; else ifmr->ifm_active |= IFM_OTHER; break; @@ -2631,7 +2716,8 @@ xgbe_phy_valid_speed_sfp_mode(struct xgbe_phy_data *phy_data, int speed) switch (speed) { case SPEED_100: - return (phy_data->sfp_speed == XGBE_SFP_SPEED_100_1000); + return ((phy_data->sfp_speed == XGBE_SFP_SPEED_100) || + (phy_data->sfp_speed == XGBE_SFP_SPEED_100_1000)); case SPEED_1000: return ((phy_data->sfp_speed == XGBE_SFP_SPEED_100_1000) || (phy_data->sfp_speed == XGBE_SFP_SPEED_1000)); @@ -2698,6 +2784,7 @@ xgbe_upd_link(struct xgbe_prv_data *pdata) axgbe_printf(2, "%s: Link %d\n", __func__, pdata->phy.link); reg = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_BMSR); + reg = xgbe_phy_mii_read(pdata, pdata->mdio_addr, MII_BMSR); if (reg < 0) return (reg); @@ -2823,6 +2910,25 @@ xgbe_phy_read_status(struct xgbe_prv_data *pdata) return (0); } +static void +xgbe_rrc(struct xgbe_prv_data *pdata) +{ + struct xgbe_phy_data *phy_data = pdata->phy_data; + int ret; + + if (phy_data->rrc_count++ > XGBE_RRC_FREQUENCY) { + axgbe_printf(1, "ENTERED RRC: rrc_count: %d\n", + phy_data->rrc_count); + phy_data->rrc_count = 0; + if (pdata->link_workaround) { + ret = xgbe_phy_reset(pdata); + if (ret) + axgbe_error("Error resetting phy\n"); + } else + xgbe_phy_rrc(pdata); + } +} + static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) { @@ -2848,16 +2954,28 @@ xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) axgbe_printf(1, "%s: SFP absent 0x%x & sfp_rx_los 0x%x\n", __func__, phy_data->sfp_mod_absent, phy_data->sfp_rx_los); + + if (!phy_data->sfp_mod_absent) { + xgbe_rrc(pdata); + } + return (0); } - } else { + } + + if (phy_data->phydev || phy_data->port_mode != XGBE_PORT_MODE_SFP) { + if (pdata->axgbe_miibus == NULL) { + axgbe_printf(1, "%s: miibus not initialized", __func__); + goto mdio_read; + } + mii = device_get_softc(pdata->axgbe_miibus); mii_tick(mii); - + ret = xgbe_phy_read_status(pdata); if (ret) { - axgbe_printf(2, "Link: Read status returned %d\n", ret); - return (ret); + axgbe_error("Link: Read status returned %d\n", ret); + return (0); } axgbe_printf(2, "%s: link speed %#x duplex %#x media %#x " @@ -2869,9 +2987,14 @@ xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) if ((pdata->phy.autoneg == AUTONEG_ENABLE) && !ret) return (0); - return (pdata->phy.link); + if (pdata->phy.link) + return (1); + + xgbe_rrc(pdata); } +mdio_read: + /* Link status is latched low, so read once to clear * and then read again to get current state */ @@ -2882,17 +3005,7 @@ xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) return (1); /* No link, attempt a receiver reset cycle */ - if (phy_data->rrc_count++ > XGBE_RRC_FREQUENCY) { - axgbe_printf(1, "ENTERED RRC: rrc_count: %d\n", - phy_data->rrc_count); - phy_data->rrc_count = 0; - if (pdata->link_workaround) { - ret = xgbe_phy_reset(pdata); - if (ret) - axgbe_error("Error resetting phy\n"); - } else - xgbe_phy_rrc(pdata); - } + xgbe_rrc(pdata); return (0); } From nobody Fri Feb 2 19:59:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRRS62pZLz588v7; Fri, 2 Feb 2024 19:59: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 4TRRS62JSMz4tBW; Fri, 2 Feb 2024 19:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isWHl14MkQtjjYfzFuqYHKSO3ic3iR4mYz0NP+Lufio=; b=jFmXy7ALg7ApXRiOiNRQxqsci4E/AojYo0z6a5eDEtbUxrYD/GBXae2yUBOSV34jdwICbC LpjpYYuXeWrXGu5AqSQNIsXmtsYqyBymUQoGW27kZDsHxoQyOo+7rYmQV5h1u72J4n+7jA eNBuFDgMLD370zKUH2dEB/IdA+BoAqUUkV8LDwsKsPCqog6ZYY/wQ+yANTXH33IPTMLSZe Mb0SF6CMi8+ARvLCMQU4YdOr1UPlyeAsy1GcHdAdk+Pr0wcqRlhncBO0VF0T6Dpv/SygAY XYq7I9ShMAj6H+PU6Ysym3GXm96wGkAuLXfhRZstZGgFSESMTb/JBXQ2+/144w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isWHl14MkQtjjYfzFuqYHKSO3ic3iR4mYz0NP+Lufio=; b=hUcvFXGtPYFIT6lSy1mtQh5gogrdZ8G7W4iicOb03DcQK48z1kpsp+SrGNqDa1/oOFbBgi lsFsoid2HV0jBdGakkTYi3GagIsd5vHKa+T9TrstaCtAmU+kH3UIMdv/g/s68rITKVUAOA CfIlSNIhk2AJJtozoNU7CxUljyWd1wNig5pVyNwHklJK3y9iFX+c9Bcbe2pFgaMhekQ2EG FGPGNziFOctcXSmzZxUGaKftUjbfMpTD0HLcdm2Zl+zp6J0mAnX7x8F3Kx9bi7zA8jsqDP +4hp8O26ckY6LgJ5d54lD2byprv3GHvRpRubJgu06goWM+Hbfclz47jtMtThGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706903958; a=rsa-sha256; cv=none; b=MKyU/MUSYpY5TlQs5t5R8WqvSKBLCeOV25PsUVSJp243qFYUvNG8prex8VM4K4GvtEcRuW YRAlU5n/30O/2FdCVD8ngX4h22NHoypKppfe/s6BKI+qpo30tkrlLegqIwRPdAZUnT/4lW 7q34gyLJw+LSItnd29jRA8xqWoUtlMOwXe6o3wqMSWqBJrfreFhYcFkc1RUCbakNRQjklC Ym/Y2IdYLZh0CPAHZLynctJsTgLRyN05bNkA1gV0+7VZRtkSxNwbwf/01VsLBFFouvlnbp iaETasVcn0ANpOPyx1ITQm7LAIcVQeCvL3M086+Dg871t6V8SA5BdRLDzFWcYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRRS614dyzkjC; Fri, 2 Feb 2024 19:59: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 412JxH92038241; Fri, 2 Feb 2024 19:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JxH6n038238; Fri, 2 Feb 2024 19:59:17 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:59:17 GMT Message-Id: <202402021959.412JxH6n038238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e32ef17d2223 - main - arm: fix typo in GENERIC-MMCCAM List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32ef17d2223c942dcf9f29eeae2c9758a706747 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e32ef17d2223c942dcf9f29eeae2c9758a706747 commit e32ef17d2223c942dcf9f29eeae2c9758a706747 Author: Mina Galić AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:46:04 +0000 arm: fix typo in GENERIC-MMCCAM Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/arm/conf/GENERIC-MMCCAM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM index a426727caae3..26e19887c800 100644 --- a/sys/arm/conf/GENERIC-MMCCAM +++ b/sys/arm/conf/GENERIC-MMCCAM @@ -1,5 +1,5 @@ # -# GEMERIC-MMCCAM +# GENERIC-MMCCAM # # Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack. # From nobody Fri Feb 2 19:59:19 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRRS73vj4z588hp; Fri, 2 Feb 2024 19:59: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 4TRRS72SQ8z4t8J; Fri, 2 Feb 2024 19:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjjfE6FB9IcpV2cVbWcshTHPLOKcPzRmsgEvXH3Jwg8=; b=aX+D8ch0kOuB3eay8FfO8ClSz0tgRMgxBdgyQe+DJy2JSp6pObgw2XQicqvRLgd5UFN2Aw vtInvxTFKcNlVWrsTtZVh2X/0uSL/d3f/AisxgWI1/+3vyKBx14+iKUMYeQOtM+IArYjNG g1k67STErJ1Jr8qTda37DeI4PtdIGVVAwdC69dSZMZJQPFn4XgRPxIxEe3K1xNGEZVzRzV VXd1HU3wY/ZwRU//I9Wajh6kqBfWrweSYB7SMFKaJKpwetaDUmOV3vl9ar0vt1gHUt3hDS KRHZhoP8jElu8hktWgwuIhPEviR08mrYYWvcJmf/MyMgMY6Mnj4M+FjwfpyQLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MjjfE6FB9IcpV2cVbWcshTHPLOKcPzRmsgEvXH3Jwg8=; b=BitfLuj334WZpsq/SmcnSHQE4Ns4spE2OHbSwoSfR017E/qmhEUfiI/k2spcymREo+doIs CeKYOZTd7F5ha8HilLUvUypXVCELnjFYhLcGpE6bJoFbJomICNPFjkAtCaSBKVHAvTKuKi fZBtRf0BdmZUEJQg9gGMX1uNtzljXFBOOXOJ+REkfY47+1nfS750VD4VgXq7iUpsAF5jWi NO7LbsE1ACdLz92YqBAacPmkRZ7/U0pAV7ll3uhw6tlqivMkViyWYvUmTDgf7LHiwNQkCC QTnHCn9Ra6/0ZuaD87ECoJIKUrQdl+Bs3RjGax5AtMIboBTf17cvX/CN9K2YiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706903959; a=rsa-sha256; cv=none; b=a4wk4OwP65IVh5SPVKRRBWlB6pg9mWJRVOA/40IsGcYsHu0Qdyh6s9wKBcbyL/UdabjevU 4l2k+J523YmDLjNH0IGNxuHYZh3jVW2MbxJu18DxQ9cWRzy94epT1gXODxyjaeQ6eIUH+z UQuhekothCs/88yb6viRX503I9dCIEJw5Wa1+Np5mtQeN/fXttUsPvl9mjQxOl1YT+IA3y 4V1CODrfqkbaVCPnncz+W08PQ9JcFrUsrjEWUKOkHKnNW+Oxf1cEkPQKjDpvFWur4yLjpU d02iZKram2ahnYbEYFkNMTqLo6vndA4tUKZAtyM1CSQOFKL9ADXk1+O/ye+bMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRRS71TzFzjvm; Fri, 2 Feb 2024 19:59: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 412JxJGu038287; Fri, 2 Feb 2024 19:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JxJJj038284; Fri, 2 Feb 2024 19:59:19 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:59:19 GMT Message-Id: <202402021959.412JxJJj038284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ca8fcfcf5ed1 - main - amd64: switch GENERIC-MMCCAM to GENERIC List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 commit ca8fcfcf5ed12459cb83b764fcdab45fa6297d82 Author: Mina Galić AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:46:05 +0000 amd64: switch GENERIC-MMCCAM to GENERIC arm's and arm64's GENERIC-MMCCAM is based on GENERIC. amd64's is based on MINIMAL. For consistency, switch it to GENERIC. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/amd64/conf/GENERIC-MMCCAM | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 7cf1ebdf9458..26e19887c800 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -1,33 +1,23 @@ -# MMCCAM is the kernel config for doing MMC on CAM development -# and testing on bhyve +# +# GENERIC-MMCCAM +# +# Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack. +# #NO_UNIVERSE -include MINIMAL +include GENERIC ident GENERIC-MMCCAM -# Access GPT-formatted and labeled root volume -options GEOM_LABEL - -# UART -- for bhyve console -device uart - -# VirtIO support, needed for bhyve -device virtio # Generic VirtIO bus (required) -device virtio_pci # VirtIO PCI device -device vtnet # VirtIO Ethernet device -device virtio_blk # VirtIO Block device -device virtio_scsi # VirtIO SCSI device -device virtio_balloon # VirtIO Memory Balloon device - -# CAM-specific stuff -device pass -device scbus -device da - options MMCCAM # Add CAMDEBUG stuff options CAMDEBUG options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) + +# pass(4) device +device pass + +nodevice mmc +nodevice mmcsd From nobody Fri Feb 2 19:59:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRRS85shKz588g4; Fri, 2 Feb 2024 19:59: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 4TRRS83jr9z4tKy; Fri, 2 Feb 2024 19:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqF2gDBhkiaM6hXjuKavYO/kXDTTiQ2XZq1z/8Q5aDA=; b=lXymEZLjQUgQepxDzQ+4DE1B+gW5RAD6R3yZ+B0vjLCzCHxCT1A6Q54iaEjAlv8BZFW1Tk EPQIMhXdPBrD8eQRtmrPQdYkTgs0WC6/yJUWh7G33zti9HqMdo5c0/A5MwK1gfh81Yk5bc GSSMlY5bX3ojLwFEqmxUGtGP+gy42sqQIik3MVlVjrZXh4sdwxNkNhuagV2p1qdUrt6Ybt 4j4G3obgKojy7ZmPiOOLSkodVIT1f/kdEh+GrJAmQ8e3rKNQXOvIt9L5eptkb8wKTsd5Ai h6JtJj/hA1juQQ6nx7uplPaXGW+cspfDJ4O8vFETRhog0YIkGY9KSUcOGUPgbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lqF2gDBhkiaM6hXjuKavYO/kXDTTiQ2XZq1z/8Q5aDA=; b=gTFdvGDWk6Fl909tNJLjZg/wVIsStQqU/T9XlNvxfe0MFRS2udzjTG1HIa7fOaUlORdezE 78x18jB7dSfDjpn4fePbq0BNbM6pqCWMhW3Ddf6ptug3lMGIDZSqbdLkev2OMRSI4nW3fq KU7Axf8WY8h+Q2gIQoyc4cxsSqvzsxzG1tACjFdBvSLcy02tLt0EJ1u7Y7IFg4fVEhDIvW OKDVtZN4cWbm2F0TgVZQHg4Az5LCu6cbrEXHFk/eWTzctmVZrN2PG1mymYerSUaaAUau5z Q2kCbZ6pvLJ92qMNlnG6DJZnJlD8VklJ8dP9fRM0Zir9lz8pep6uR9nrTg2pmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706903960; a=rsa-sha256; cv=none; b=m28fmc7u7ryQ+tq3gtYXuzLdgQVvv234k+Td/KgfdNoc+i8GSRNI3apO1K6t41OL8ztHm1 xx5rUNES7AQwtPVDIXFpsd/jqG/sSnyZErFuV6dwQuUyCq1dDLFv+PEPu3XqIax7K1dzza 4VYznzrEIuHIwY9f6t/iCz8F8VZZt4bs0dTJi47SuCUCHCGjavgo1h3ef01KA4DyHBevif UW07H7WqZFz8lZIq38qx9zk/2puv6EVfLwJr1Bf5/HPsKlgZSlVdGYuOPBbg+tTu+vTeOz gqP6CRmH7jFBmODIzLypW8HnU2Yi4Zx5+zIHGsYdcEctpzjmZwnPeE2VykM/lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRRS82QR6zkcd; Fri, 2 Feb 2024 19:59: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 412JxKpA038339; Fri, 2 Feb 2024 19:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JxKop038336; Fri, 2 Feb 2024 19:59:20 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:59:20 GMT Message-Id: <202402021959.412JxKop038336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 834517eff8aa - main - x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 834517eff8aaab46760645619b880d97f23ab61b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=834517eff8aaab46760645619b880d97f23ab61b commit 834517eff8aaab46760645619b880d97f23ab61b Author: Mina Galić AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:51:51 +0000 x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels we leave `options CAMDEBUG` enabled, so that when needed, CAM debugging can be enabled *as needed*, rather than setting a default of everything. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/amd64/conf/GENERIC-MMCCAM | 6 +----- sys/arm/conf/GENERIC-MMCCAM | 6 +----- sys/arm64/conf/GENERIC-MMCCAM | 9 +++------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 26e19887c800..65bada999030 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -12,12 +12,8 @@ ident GENERIC-MMCCAM options MMCCAM -# Add CAMDEBUG stuff +# Allow for CAM debugging options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass nodevice mmc nodevice mmcsd diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM index 26e19887c800..65bada999030 100644 --- a/sys/arm/conf/GENERIC-MMCCAM +++ b/sys/arm/conf/GENERIC-MMCCAM @@ -12,12 +12,8 @@ ident GENERIC-MMCCAM options MMCCAM -# Add CAMDEBUG stuff +# Allow for CAM debugging options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass nodevice mmc nodevice mmcsd diff --git a/sys/arm64/conf/GENERIC-MMCCAM b/sys/arm64/conf/GENERIC-MMCCAM index 471b299ab3c2..77d65d959763 100644 --- a/sys/arm64/conf/GENERIC-MMCCAM +++ b/sys/arm64/conf/GENERIC-MMCCAM @@ -10,13 +10,10 @@ include GENERIC ident GENERIC-MMCCAM -# Add CAMDEBUG stuff -options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass options MMCCAM +# Allow for CAM debugging +options CAMDEBUG + nodevice mmc nodevice mmcsd From nobody Fri Feb 2 20:23:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRRzS4W4Dz58CFV; Fri, 2 Feb 2024 20: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 4TRRzS3YBfz4xtd; Fri, 2 Feb 2024 20: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=1706905380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0kW0VbJPSYs+KQF7bBUezAbkgwiKugXa2lq6luhV7E=; b=i9oHyYVOj+zU1dKGofKUIg12+BGSUKuKTXdq3pZnQ96yjpzEnkh30T9ya8bZhybSiSk1+p uDZVt62Anj3672VGveKoXiiLPabzWAn4kgnSBAPEaXE6HxpP2oaEMS4Mh2IUWa9afQJjZq sGIpGlBarIQXdufhf9FjIhDd53GsRPsM/OIItjGzo09YbRF1IGLsk9QO1JuvPl/aindH+T 4OrpC0uVXzvgmQCdbUm3z4W/mHcMPSNPu9cXW41P0l7U2ft6ONNExsjQnIaB3BXdyYEExo uTihfWCTnoYiqGjKwErPs7fPy/TKLiz1EbGvh8K/XuyeUfToP9xtNfHVubmlFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706905380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m0kW0VbJPSYs+KQF7bBUezAbkgwiKugXa2lq6luhV7E=; b=yGWR5/V/VsUS4QRpTi6lRI0DPvn6mYCUebtNprnzqYJT1B+3Fsy/NoLMJakKHM2x/6UunS Cvq13G/Eav1LnV0NCgn4E4RppkR/KgdWZGPYdydBoF8CTlR0OJ0kviTJUGRm4vps7yuy2g N+/IXkwt1ktF5BOv5f93rSJPGTeE/pABAVaHcVQgo7mETWll26maBuxj9EUq0H+Na410d2 3bylpfPCmn+p3f37aXEVRZCVCN6MWVYYCTaK3HsFuyMhQVgjzuNdsWCts+yQisHC7TcJ3y WKd/z/AnU2dUZwcKlwV2mKm8cTjBLe+QncgyA0EoZi8UZfEkT/LHZJ2nsDhj8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706905380; a=rsa-sha256; cv=none; b=nZceNY3Ln+BA8oY7/ksd54XfGh1hi7MzpLnU0E2MOrKoG9yD+fWjI6DZUcbOnsXU4u4sWI ZfcmP6Hk3LmjvYc0namwU2z73RfKzVvKQezGWK0PAfUDEaAKv+UwT8k7gDuVD/4WsJI2Hz eIxyQXTBbVq1LDYji5iOuWYp/782ap7615YLWE9Xsq1AHg++oOFPlrNhJO/P+SoBI1TGec Q40CXWDO/iP7vAWU9eJFVjyB6d0OmQNq/PnPeqpuA7cLsOl0yDof4uFrTqL+ycFb45k9I8 gJtoQpQ1ZYD73Cb8SEYtz0UFpCOi13gXI8TINI2Cwbc78L+RtqEi2cmDqTtxtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRRzS2Y1bzlC2; Fri, 2 Feb 2024 20:23: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 412KN0uf088505; Fri, 2 Feb 2024 20:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412KN0EU088502; Fri, 2 Feb 2024 20:23:00 GMT (envelope-from git) Date: Fri, 2 Feb 2024 20:23:00 GMT Message-Id: <202402022023.412KN0EU088502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d854370fa86b - main - ls: versort incompatible w/ timesort and sizesort List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d854370fa86b74527e57145955b1fa3ca75643a2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d854370fa86b74527e57145955b1fa3ca75643a2 commit d854370fa86b74527e57145955b1fa3ca75643a2 Author: Alexander Ziaee AuthorDate: 2024-02-02 20:19:07 +0000 Commit: Warner Losh CommitDate: 2024-02-02 20:19:10 +0000 ls: versort incompatible w/ timesort and sizesort ls.1: versort incompatible w/ timesort and sizesort Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/825 --- bin/ls/ls.1 | 6 +++--- bin/ls/ls.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index 4f680d97ea0b..d3daf6e12019 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 18, 2023 +.Dd January 12, 2024 .Dt LS 1 .Os .Sh NAME @@ -457,9 +457,9 @@ options all override each other; the last one specified determines the file time used. .Pp The -.Fl S +.Fl S , t and -.Fl t +.Fl v options override each other; the last one specified determines the sort order used. .Pp diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 6af7715fa5f0..7ebcc5383863 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -313,14 +313,21 @@ main(int argc, char *argv[]) case 'A': f_listdot = 1; break; - /* The -t and -S options override each other. */ + /* The -S, -t and -v options override each other. */ case 'S': f_sizesort = 1; f_timesort = 0; + f_verssort = 0; break; case 't': f_timesort = 1; f_sizesort = 0; + f_verssort = 0; + break; + case 'v': + f_verssort = 1; + f_sizesort = 0; + f_verssort = 0; break; /* Other flags. Please keep alphabetic. */ case ',': @@ -434,9 +441,6 @@ main(int argc, char *argv[]) case 's': f_size = 1; break; - case 'v': - f_verssort = 1; - break; case 'w': f_nonprint = 0; f_octal = 0; From nobody Fri Feb 2 20:38:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSKv2Ngyz58Dcm; Fri, 2 Feb 2024 20:38: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 4TRSKv1tbJz50Dg; Fri, 2 Feb 2024 20:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRX6nfWQekdPEVfx3lPBTIPmevZfeDpn+YsYmNpHELA=; b=oTXpO8IziDGYNrjUhjTeOUjQ+ur835tVdlO3QdaNtsyuLVF0oQ4aAT5Ic4KSa2puHlK4Pf cISzQDL6MzoOvxY7n15LAc1TAXf3orJvuDfjFwQBJdBojRai/3s46dTLwB7qVbRsurou/7 uix1oNFmS4XqPlXMfB3vNKZdNZKOUPVQ1RmKGg8LvNXPNMZWnJsvev+dACV9w0oEMZbNrI i2towP57V8extlZwwIKY41m5jydgDG+sn00yfR2LOUzn8vf+zOysgSkFFkW25i1qCbjQR5 Aet3Q3/7m35vZg/ZDrswfBHsSnD2lVm39EJk90GHJ4SF4kpVQrgo3ba/NzQsaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRX6nfWQekdPEVfx3lPBTIPmevZfeDpn+YsYmNpHELA=; b=qnlpF/YosME3arrA5YiqdDkAVluh/3ULj4uu2V6lffwtv0aLIJsXa1x1EnTtFCZ4/SYaSx TztSu+yRAj6kfpKmJn97S4ruxN6fxHd5bZU2aXculK3dlO2okYUiymetSfwUP4rPrZsomW PdQvhGuCgW3XRRwNOYzKUMS3Pv8Vr+kHeH7EaAB0qHLJmA7B6EXWoVWnu3uWn3ncsRvrKe j3qZ0hFzNLJZH6/7vC1bExeaAdpCojuGchhEdWnmy05asdru85Io7Syo5S0rI02A+pmW1c RiViLsSjS5dXlak4SUFm/6me2JHAKZgwOHBY1EXJxAkamcBIT7lPlRIzZt2Muw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906339; a=rsa-sha256; cv=none; b=GpsPdyQ1Imk70KLKWfa+cIOs0pItgjbsECeupx4KobdDod7r8gaOuuRrCivweYc9DTkIhG VIXWjnS2NGFwEjagbB3xfC0QuIQWFEPhUU4iIQ4DePoUkR8u2F4J80PIk+qw3rSZgxuJCj I+1nUSnpLP21C9z8YGhbMW614lPLDPjAK1F1XaeUQ6A7njwJ9mqsmnOzZTZAqaTA8oZ57L Ajqi+eCvfN5iCw+J+10Gdp1CqQMSCqzI2dXo3mPLf2u0XcFPDzdw7JtlqhT8tIkxu2a6yI OfKtqD8LIpsF0IlNE3pUrzKDx0vXNkPpuxcax36NkzMOPhaQwVQa+nEFmbI1Tg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSKv0jg0zlLh; Fri, 2 Feb 2024 20:38: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 412KcwCO005680; Fri, 2 Feb 2024 20:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412KcwYU005677; Fri, 2 Feb 2024 20:38:58 GMT (envelope-from git) Date: Fri, 2 Feb 2024 20:38:58 GMT Message-Id: <202402022038.412KcwYU005677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a8c1ffca7a59 - main - freebsd-update(8): Explain conflicts in /etc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8c1ffca7a594733a91c1513d0185be174d1115f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c1ffca7a594733a91c1513d0185be174d1115f commit a8c1ffca7a594733a91c1513d0185be174d1115f Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Warner Losh CommitDate: 2024-02-02 20:35:25 +0000 freebsd-update(8): Explain conflicts in /etc Unlike etcupdate(8), freebsd-update only prints the files with conflicts. It doesn't merge. PR: 204549 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 --- usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 0d50ac8822de..1960b0ee95fe 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -264,3 +264,12 @@ required. .Xr nextboot 8 .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org +.Sh BUGS +In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +.Pa /etc/ +will conflict with an available update, then +.Nm +will make no attempt to merge. +Instead: +.Nm +will print a list of affected locally-modified files. From nobody Fri Feb 2 20:39:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSKw36Prz58DRt; Fri, 2 Feb 2024 20:39: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 4TRSKw29Pbz50GV; Fri, 2 Feb 2024 20:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcWd1E8jbwpNiqsjtROkY8hxaPKc/zTDkf6ADiDFCaA=; b=yPabG7u/eWOkD2YTpqwdOh88rmtIzZQiGFfIWl680+ezate9At59T9zWqaapRe/QCjAGM8 U9dJcSERN2f38v3n7iUaDYuw4njS9aCjWugEWbCDohDfSt5jzw0mDgGaW/UbGLwRfIFMnf kIfj9f3eUX5qXWvuB+wdgCI6Hag24+/ajNP9lwh695t0YEAXErgssECIfNnjvY24GWSlbJ zS6SsYPDrotOchLRog6BhzZgeQkfNKQxmOgb44+1+DmW+Ucz0j1h6j6bW10yAfYj2WzdFG EafTRa8Q3yLU+fg8oQzhpXPP1NiA5PjaR/eeRzOO4HdwLND2V23+8R7E4hsrXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FcWd1E8jbwpNiqsjtROkY8hxaPKc/zTDkf6ADiDFCaA=; b=nKdu7Zs2fW7ZgN5ps6pRvz7RYLfifJxMPRzGdMuE3k7o8TMH5onsvQ2qpMwk4docp8XaZn htOI+cxDUxccznXDRBn8Z77mXr8LzR74j/4F+E19kSGRPqgay6ahuA5C2F5N+cIVI39B0z JbLkOUG4bFzBEVtOtl5k3dF2YgiYIt6Fkua0hEscwbDw/voaBFxtSDeFDrLex0xlPhwtTM OQJsWt9U/7veTWh0vL7mmcmqsHJUVAYtvd+0Zgrai8S8rls/oCuC7iZ8SmE3qxkwLK0NL8 GyC9OjKwRgpGh07eDyxbX+CCDBF0YwMIySD7gGA+e3O9lYy0wPmkLgPmOnB6YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906340; a=rsa-sha256; cv=none; b=kMDPAyQuQwnhCNYg+s9uzFxELBWDG3G3JfJjlVVLgvhCcdpLsm4in/SMYqo8dpZWf+VPBY owBbTjinFjI383/H/UrVRy9Vw10CvDUP9BZ0On5KAB/F3Vq/2l/FBjUKe8TRjzVJlRcbCM WuCDo07ik0PzHd2WPzVjTHKaG7KQtNGyLoLdgLpcUOLFA1ac2GwYSbe9baABqYQfpETHU4 BBAMou2kAmrsEh1Jgtvkck4UKuFNWS5ZDe0miNOXjKtuAxEDh9RX2JsvSixwO2lCLXSx5Z omIHls39RMiBS/C8mOAaoQzL2ZBvaF78KJqcujZeD8UBgR6eGdip+I4WM3IANg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSKw1Grmzlbs; Fri, 2 Feb 2024 20:39: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 412Kd0j7005729; Fri, 2 Feb 2024 20:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412Kd0S0005726; Fri, 2 Feb 2024 20:39:00 GMT (envelope-from git) Date: Fri, 2 Feb 2024 20:39:00 GMT Message-Id: <202402022039.412Kd0S0005726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4c1c516c1a07 - main - freebsd-update(8): wrap to 80 columns List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c1c516c1a0760de2c86c073e8e74e297a71b088 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1c516c1a0760de2c86c073e8e74e297a71b088 commit 4c1c516c1a0760de2c86c073e8e74e297a71b088 Author: Graham Perrin AuthorDate: 2023-08-20 10:01:05 +0000 Commit: Warner Losh CommitDate: 2024-02-02 20:36:37 +0000 freebsd-update(8): wrap to 80 columns Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 --- usr.sbin/freebsd-update/freebsd-update.8 | 62 ++++++++++++++------------------ 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 1960b0ee95fe..024185198342 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -82,8 +82,7 @@ e.g.: .Pp In particular, the .Fx -Security Team only builds updates for releases shipped in binary form -by the +Security Team only builds updates for releases shipped in binary form by the .Fx Release Engineering Team. .Sh OPTIONS @@ -149,8 +148,8 @@ from or similar using this flag, see: .Nm Cm cron .It Fl -currently-running Ar release -Do not detect the currently-running release; instead, assume that the -system is running the specified +Do not detect the currently-running release; instead, assume that the system is +running the specified .Ar release . This is most likely to be useful when upgrading jails. .El @@ -160,28 +159,26 @@ The can be any one of the following: .Bl -tag -width "rollback" .It Cm fetch -Based on the currently installed world and the configuration -options set, fetch all available binary updates. +Based on the currently installed world and the configuration options set, fetch +all available binary updates. .It Cm cron -Sleep a random amount of time between 1 and 3600 seconds, -then download updates as if the +Sleep a random amount of time between 1 and 3600 seconds, then download updates +as if the .Cm fetch command was used. -If updates are downloaded, an email will be sent -(to root or a different address if specified via the +If updates are downloaded, an email will be sent (to root or a different +address if specified via the .Fl t option or in the configuration file). -As the name suggests, this command is designed for running -from +As the name suggests, this command is designed for running from .Xr cron 8 ; -the random delay serves to minimize the probability that -a large number of machines will simultaneously attempt to -fetch updates. +the random delay serves to minimize the probability that a large number of +machines will simultaneously attempt to fetch updates. .It Cm upgrade Fetch files necessary for upgrading to a new release. -Before using this command, make sure that you read the -announcement and release notes for the new release in -case there are any special steps needed for upgrading. +Before using this command, make sure that you read the announcement and release +notes for the new release in case there are any special steps needed for +upgrading. Note that this command may require up to 500 MB of space in .Ar workdir depending on which components of the @@ -192,19 +189,15 @@ Check if there are fetched updates ready to install. Returns exit code 2 if there are no updates to install. .It Cm install Install the most recently fetched updates or upgrade. -Returns exit code 2 if there are no updates to install -and the +Returns exit code 2 if there are no updates to install and the .Cm fetch -command wasn't passed as an earlier argument in the same -invocation. +command wasn't passed as an earlier argument in the same invocation. .It Cm rollback Uninstall the most recently installed updates. .It Cm IDS -Compare the system against a "known good" index of the -installed release. +Compare the system against a "known good" index of the installed release. .It Cm showconfig -Show configuration options after parsing conffile and command -line options. +Show configuration options after parsing conffile and command line options. .El .Sh TIPS .Bl -bullet @@ -216,17 +209,15 @@ If your clock is set to local time, adding the line to .Pa /etc/crontab will check for updates every night. -If your clock is set to UTC, please pick a random time -other than 3AM, to avoid overly imposing an uneven load -on the server(s) hosting the updates. +If your clock is set to UTC, please pick a random time other than 3AM, to avoid +overly imposing an uneven load on the server(s) hosting the updates. .It In spite of its name, .Nm -IDS should not be relied upon as an "Intrusion Detection -System", since if the system has been tampered with -it cannot be trusted to operate correctly. -If you intend to use this command for intrusion-detection -purposes, make sure you boot from a secure disk (e.g., a CD). +IDS should not be relied upon as an "Intrusion Detection System", since if the +system has been tampered with it cannot be trusted to operate correctly. +If you intend to use this command for intrusion-detection purposes, make sure +you boot from a secure disk (e.g., a CD). .El .Sh ENVIRONMENT .Bl -tag -width "PAGER" @@ -265,7 +256,8 @@ required. .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org .Sh BUGS -In patch level situations – for example, 13.2-RELEASE-p1 up to 13.2-RELEASE-p2: if any previous modification to a file in +In patch level situations – for example, 13.2-RELEASE-p1 up to +13.2-RELEASE-p2: if any previous modification to a file in .Pa /etc/ will conflict with an available update, then .Nm From nobody Fri Feb 2 20:39:01 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSKx5HWhz58DRv; Fri, 2 Feb 2024 20:39: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 4TRSKx3H3Pz50Q4; Fri, 2 Feb 2024 20:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gc3vFQsApZ3faYK5ANSTpGZ1rYSXP5WNb8nKGY8nm3g=; b=ppJwkRkRJWoJKq/rcwJPZf3A4BrDpZDFVJf91aeBb+kH5T+6UKSK9Y7F/Q8gHBoiHrGLUX 26txWczzQ3EJ4tpWOPmv0j/AaVJ7VfTMvWwKLu3YTphr2upRSJ2sO/o092b6gtydc8d6fS bDLU4D25FYykxDEj4jGGK22AjkTI/etnR0G540Hg2NenWFNc1llJa4F79iYXmDBxh2xfEU Tn0oj8ZkPBIWJTNgXd5/kiZIaoIsuv/H+zEiaFiwcgWnZab/XlZlggBVRwjkgjaNIJrzPF Ox6HkC2qNdiqkQt1M5jp89aiwJ6PbMXyfuK11OUXndvnZZOXI+9qowcuaodKRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706906341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gc3vFQsApZ3faYK5ANSTpGZ1rYSXP5WNb8nKGY8nm3g=; b=CPMfig7XBn0n+p3juzIWX16Xu6RrwxIiLCtW++5CeIpx/wO62dji9hD1Cqodi7LZzCkLAt FVLpR9WkyI/lO9lCz31HBU5Q7AH2uT5EQ4PEAdawB3/qgvEjZ92PuqRP4J7iFUB322QXHF BmKxgf1B8sR69F5u28UfOGZIRpZgSZ45PNXiuR9glBLI6beppNn2mH/0rog9KQF3s89vOi 7tcsoHx4NxZHzs2Gyzp630PjnXaVd+KrErrw8J3sXW+dTdTMWFNBr8uzPl5bNhmiEqyvpk J+JUSUbIcGPvZyJHhS2V8SlDk3QwtJUuch4E2QVZudPcqr6MI605g3AvXIIgpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906341; a=rsa-sha256; cv=none; b=jK5X7FJ+hPjqhpN6cIKXKZYkJtciHjwi30N0OboizqdAOhM0Eh3DD3eNY2VSsF8D3K0KDx zl1gG/biu306Ht8CxxnmtBdFcR/VRYbt+d6/w1IIjVQJSn+L49SDx4tSLr8fZT+4NGtrq+ KrF+MgKGXh+p0jPAu7vvoQhLRS2tbJ21rLLIuG+WHGFAe8jgourpbEKg/bF8q/gyJDLM7G XIm1yt3bmuXNZ2G7IjKa3HsB4nIiGbMP6mtPYEF3msIKfJd4usyElp00MuYpOMgZgIpWHG ZUDy9ZEg0DVm5xlANUs56opiodgk249Cfq81KvjRl6AS8vAbaMU0oaDJzTR0Sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSKx279wzlNP; Fri, 2 Feb 2024 20:39: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 412Kd1B1005765; Fri, 2 Feb 2024 20:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412Kd1Dx005762; Fri, 2 Feb 2024 20:39:01 GMT (envelope-from git) Date: Fri, 2 Feb 2024 20:39:01 GMT Message-Id: <202402022039.412Kd1Dx005762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0b287d19e4ce - main - freebsd-update(8): Update date List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b287d19e4ce555f5ece5f518aaa068dd865af2d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b287d19e4ce555f5ece5f518aaa068dd865af2d commit 0b287d19e4ce555f5ece5f518aaa068dd865af2d Author: Graham Perrin AuthorDate: 2023-08-20 10:05:19 +0000 Commit: Warner Losh CommitDate: 2024-02-02 20:36:50 +0000 freebsd-update(8): Update date Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/826 --- usr.sbin/freebsd-update/freebsd-update.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8 index 024185198342..7524087cb95b 100644 --- a/usr.sbin/freebsd-update/freebsd-update.8 +++ b/usr.sbin/freebsd-update/freebsd-update.8 @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 4, 2023 +.Dd February 2, 2024 .Dt FREEBSD-UPDATE 8 .Os .Sh NAME From nobody Fri Feb 2 21:04:52 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSvm4PlDz58GhY; Fri, 2 Feb 2024 21:04: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 4TRSvm3vckz53gx; Fri, 2 Feb 2024 21:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfW5D5ClLwBUTUeiMLewDh6kx3R9C0ET1v/ZC1CmGCM=; b=AGlCqBZMVx0P08id/bkIekqOCp85McrVnxxrBA/+YyiOlE9xHYXOIfgv31RPZTiD6dtApd 484fiYpl4sjLYoJP9qhfyi6IGFH693ehFectMjfuvemMbdyqnl6/j0o+7lBxKg7kIWirUn /Q/FK0uS7TjmHSFIa6fKDpI1wrFg/6QHgeuFCqhPHnhuIkHl20RziWZuCjqU6H2jAz2DSz hhY1NpbdWAiOAtFVkL1n9r7Ole2lN4SyTGiE1j2r9uLG14DUnMokmdWnpeUyCBm1JI/oZ+ RhgoPmquPJnCfXmouvGqfzaaqbjX5SrsP5hIiSx15PPFtFqn5q2QIBTFhbJ+bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfW5D5ClLwBUTUeiMLewDh6kx3R9C0ET1v/ZC1CmGCM=; b=DWthOX52wmW2HfgeB2aKMD3HUU/0o3/TcXFbg+8sPuYi2kfIFte7dte8MIBZnljEwdcZR6 yn5o0LpK5k37abyPi9/C6gL1w2SF1tYRKHIxbG88Ri2ZNCLP3yec1GXA5PITQaACxM73DC ir/a1R5h1XTFd21dMWFiK69p3nYrRA0MQDWKmjbXk+qqImyg9PMhKkEIACpeULkdFhysqJ tFc90pN/d7XjA952+tzv8XjREQkzsuuRbbu5C7WxK+Cs1B2c7ZUlO/RiJBzc4eLr3QZRkA IZugQQ1hEyIkfVKvuOAA9gANPsf8367om6iriPVrWkqUnKIbsh/KllXiM2e2kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907892; a=rsa-sha256; cv=none; b=ChfAyAEOnVbBCXhARmDdJDU760B/Toy9clImyVC4+OosKDk8SbzIqMz4dcuTUXCI6WYbIu RRe6KuecSH3AH8X6EPphxWgaoObGPMolaCYBtZqr6plqwTtYkQIRZyX/C6mHl7IrlOrcVf 2yW1Aw8G0MdpcK8SmLRsZ4VRjUvq465aE9uhNVsW4GZ1FCQ9yLr+4kLgHPLzZ/nFVgeDVN t/wjASa2pMISvd9ECiHXcTSVz6rkvz9uX+m8Mqqf2AhJq+HXvJSIeQ5UmV1B9FEyteXWia A9Om6v0T4ir0J5C2+XDOX3FI52mxHCW4lNk4ezURJJZqinswmK0VIZDFV6f9Mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSvm2rPCzlml; Fri, 2 Feb 2024 21:04: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 412L4qgT056258; Fri, 2 Feb 2024 21:04:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4qeW056255; Fri, 2 Feb 2024 21:04:52 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:52 GMT Message-Id: <202402022104.412L4qeW056255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7c8b126c1a7b - main - libsa: Move include file creation to the end of the Makefile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c8b126c1a7b30fe690800d7e27b308876711f9d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8b126c1a7b30fe690800d7e27b308876711f9d commit 7c8b126c1a7b30fe690800d7e27b308876711f9d Author: Warner Losh AuthorDate: 2024-01-31 23:42:49 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:03 +0000 libsa: Move include file creation to the end of the Makefile The include file symblic links, etc are out of place where they are. Move them to the end of the file. No functional change intended. Sponsored by: Netflix --- stand/libsa/Makefile | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index a1b9bc32e025..f7d7778d5653 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -108,32 +108,6 @@ SRCS+= ${i} SRCS+= lz4.c CFLAGS.lz4.c+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 -# Create a subset of includes that are safe, as well as adjusting those that aren't -# The lists may drive people nuts, but they are explicitly opt-in -FAKE_DIRS=xlocale arpa -SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h -STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h -OTHER_INC=stdarg.h errno.h stdint.h - -beforedepend: - mkdir -p ${FAKE_DIRS}; \ - for i in ${SAFE_INCS}; do \ - ln -sf ${SRCTOP}/include/$$i $$i; \ - done; \ - ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ - ln -sf ${SYSDIR}/sys/errno.h errno.h; \ - ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ - ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ - ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ - for i in _time.h _strings.h _string.h; do \ - [ -f xlocale/$$i ] || :> xlocale/$$i; \ - done; \ - for i in ${STAND_H_INC}; do \ - ln -sf ${SASRC}/stand.h $$i; \ - done -CLEANDIRS+=${FAKE_DIRS} -CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC} - # io routines SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c mount.c \ fstat.c close.c lseek.c open.c read.c write.c readdir.c preload.c @@ -210,4 +184,30 @@ SRCS+= explicit_bzero.c crc32_libkern.c MAN=libsa.3 .endif +# Create a subset of includes that are safe, as well as adjusting those that aren't +# The lists may drive people nuts, but they are explicitly opt-in +FAKE_DIRS=xlocale arpa +SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h unistd.h uuid.h +STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h +OTHER_INC=stdarg.h errno.h stdint.h + +beforedepend: + mkdir -p ${FAKE_DIRS}; \ + for i in ${SAFE_INCS}; do \ + ln -sf ${SRCTOP}/include/$$i $$i; \ + done; \ + ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \ + ln -sf ${SYSDIR}/sys/errno.h errno.h; \ + ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \ + ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \ + ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \ + for i in _time.h _strings.h _string.h; do \ + [ -f xlocale/$$i ] || :> xlocale/$$i; \ + done; \ + for i in ${STAND_H_INC}; do \ + ln -sf ${SASRC}/stand.h $$i; \ + done +CLEANDIRS+=${FAKE_DIRS} +CLEANFILES+= ${SAFE_INCS} ${STAND_H_INC} ${OTHER_INC} + .include From nobody Fri Feb 2 21:04:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSvp0mlmz58GhZ; Fri, 2 Feb 2024 21:04: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 4TRSvn4nlqz53xb; Fri, 2 Feb 2024 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqIo0PmTHu2S0z7iwdfkm12fQ3tLTli9sVi4g4zCLL0=; b=wNiN6YVb7q18nEB4Ae9GiUb0Iuxe8Z0YsPB017nU1iqispOzlElrx7TVr0Iz+dVUqjagwi 5SviQCoF/Y3RzWoBFMlCvEPfuTvOUxOgpByRoY15fALNm7axr75yTpju2bSvUh/jeIJYtn i/TSWeGDZNpRmYk79GsIWRGuNh0d1x3rK+s3K25Hyq+r+AMy6TPQ+xpMNLCzPnSDMC5TYj SVge/5jjeQpBQObFQlz7eyCrFGj+3OcDAFtYkbIrh75SqrlwLq9Seiifbflz064GC9DWro jo0rtr4HliB6sX6Z+Yqo9fDzVy1oyL8jUyF+yEOcCwVLsLBU541jtM6X9+KbAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqIo0PmTHu2S0z7iwdfkm12fQ3tLTli9sVi4g4zCLL0=; b=q/WZugjcHLZkGXzRanMIV+W0XGHEKKDaUr6e4ZfZhe5kDthrw+SqdnfJeGxFQucVDRT65K YFD4GONq/qPm28yUZTb/GeZDR9eQTSCsKpfaq6koN4//9DOaISsskTi8MzBZXDvxccUimg ft85mb1CqDGEZknpMOIFJ4SVbBAe2P8Q/V0cvWURZbKk47vUXFbQS1HsGuaAL07agfpMe8 09yRyTzBlHpPDhxbV7YNE/FjxDw9UG/I8MrCM4X2jE2w4XPGbIpJk+dWAIqcJQoBjhtskt +oxHSIc9TMiu8QfV/mSpt2eESsvAkwDlbfzolfrfHvVFagY9+/Rdq3+u+nIbsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907893; a=rsa-sha256; cv=none; b=QpxBWoudvcAUqUrGd8AfJ020bVqWStrl/KUclkqEemvWbKWhkMgKaWyajDhvQ6R8Mykizs U2rlxDOi2AA7+K4t/pMQzXckrrI8YpK3t1wj42xVXvirbW+9L9JD0ZgtQOlZkD3apNBdvS /6U9faGgTbujIDxpQE716G7U/Kb6wwXb+hG0I3sm69Hn/iradDwENWhH3ZBvO9b55WCJTf q3DaWDWRUpSt3tSEW7OxJ58xjXzCOs2MGfCt1h2sOcnKTmraJkWbcpHICsRrTEI234AXLf KTlbFp9Q4T5ZUD7wLe+7JpHfv+npzRT6okfFpZ/h+d+sVuATRd70iTn9+BO3wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSvn3qyWzlsd; Fri, 2 Feb 2024 21:04: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 412L4r74056306; Fri, 2 Feb 2024 21:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4rij056303; Fri, 2 Feb 2024 21:04:53 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:53 GMT Message-Id: <202402022104.412L4rij056303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fd577b59b2d7 - main - libsa: Move hash functions up a level List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd577b59b2d78a32f40fdc3847666728d8a897db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd577b59b2d78a32f40fdc3847666728d8a897db commit fd577b59b2d78a32f40fdc3847666728d8a897db Author: Warner Losh AuthorDate: 2024-01-31 23:54:19 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:03 +0000 libsa: Move hash functions up a level This should have no functional change. Move compiling the sha256, sha512 and md5 hash functions up into libsa to allow them to be used elsewhere in the boot loader when geli isn't configured. Since libsa is a .a, these won't wind up in any boot loader that doesn't reference them, so should be a nop. Sponsored by: Netflix --- stand/libsa/Makefile | 9 +++++++++ stand/libsa/geli/Makefile.inc | 11 ----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f7d7778d5653..bc85a3dcb0de 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -180,6 +180,15 @@ SRCS+= explicit_bzero.c crc32_libkern.c .include "${SASRC}/zfs/Makefile.inc" .endif +# Crypto hashing functions +# sha256 and sha512 from sys/crypto +.PATH: ${SYSDIR}/crypto/sha2 +SRCS+= sha256c.c sha512c.c + +# md5 from libmd +.PATH: ${SRCTOP}/lib/libmd +SRCS+= md5c.c + .if ${DO32:U0} == 0 MAN=libsa.3 .endif diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 0d9fcb90bbd8..07600d5287bd 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -5,16 +5,6 @@ # Our password input method SRCS+= pwgets.c -# sha256 and sha512 from sys/crypto -.PATH: ${SYSDIR}/crypto/sha2 -CFLAGS.sha256.c+= -DWEAK_REFS -CFLAGS.sha512.c+= -DWEAK_REFS -SRCS+= sha256c.c sha512c.c - -# md5 from libmd -.PATH: ${SRCTOP}/lib/libmd -SRCS+= md5c.c - # AES implementation from sys/crypto .PATH: ${SYSDIR}/crypto/rijndael .for i in rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c @@ -23,7 +13,6 @@ CFLAGS.${i}+= -DNDEBUG SRCS+= ${i} .endfor - # local GELI Implementation .PATH: ${SYSDIR}/geom/eli .for i in gelidev.c geli_metadata.c From nobody Fri Feb 2 21:04:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSvq1T7Jz58Gkc; Fri, 2 Feb 2024 21:04: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 4TRSvp5vCbz53xm; Fri, 2 Feb 2024 21:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfcXwn6ATdfmeiNiX1z+nsfRYAM/Kv+CpACYAOqvZv8=; b=fCgtFU/NchXOFGXpCZ8kbqCnmX/PtYrjIkeZi9KWfypLrdClqcqQVR23Bepkq45HofXqzr xwVUbaUCr5yZfKmzDIACFZa8NjinmJ8Saa6Wzo2UM2N8i8crI2LfwdXVsCfusbVzyRVpZ5 fsMfxV2FEOzUiRQ6JmHInvRr6gFgVULeG5satQ7oKCPby/7bus9pkCdeIopeaCHTI6r1cd 0d54Pi7/GfZNnaCv6vaNN/Jkj3ry0MsPhezrhbRIl+VDRLYiqf6LRvM6zO7WFpHROtNLK7 tQW8ohSPaUzXmaN0qni0zhvfGXWrSLk5ze4BsOSaGjopDLip9Vy40FKGQTtrRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfcXwn6ATdfmeiNiX1z+nsfRYAM/Kv+CpACYAOqvZv8=; b=ZuaBEKdmS3wf32JH1y6HnU3hxSCd2yWeua8VM8EN8nBzP8Ya3vsCiZXfn9OE7JjCtoura0 gAZLeBYlodnlERaMo3tKMwgRrrZt6THQHKRvI0mCAd9Ynv79voQAb6T7xjcDmOEUPWEVuC ttOEp90e4EDmJBCGzKqobVTkafiN7/vRXcGS8ppS6kEMErZQR7fbc+qnXd/j6yzgYHEcQ2 dnysY7Mp7+Qz9pii3X1fgt/m58TajhXKmA3Vvu0iIP8PfLWyfVRORbDuHL/TuMzjt/ZXuf NcYg9cMWK3xW10IqXpDbaTushuSfJM2Hr7+wBwRMxQTKCRFYZGOEgdVwHoDPqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907894; a=rsa-sha256; cv=none; b=mlhU2eZzmXb0Q+LFh92Vz6m7X5I+wp1W5PWb1+rBEfVc2jtUqheggILBnjyNNMpixEi6qz EXs7M4tAHWxsLuWf/f4WR03b7fQfj+B96JLjxfFoWzNWMiWWDqAPBngNIY09nH/mdVCqUz gMbKpd691Io94PMzzpCARTGLzEND4JP4p81rP48PNCmE+EspvYCTEW2mggKGDPtqnG4pbQ 9eY4lO6vqsvJUZ+5AaKzelzIJe8iozahmexOMvNJVTRLTBuiIZ04GSxL8U2gW07UySHEpQ iyZLmObJQ5UwAOaDPfL+jcOm5LlnoCK7oiaAHrWHX9qkgY6jdkNVOyTYRqZy7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRSvp4lPWzlsf; Fri, 2 Feb 2024 21:04: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 412L4seS056352; Fri, 2 Feb 2024 21:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4sNu056349; Fri, 2 Feb 2024 21:04:54 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:54 GMT Message-Id: <202402022104.412L4sNu056349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 784f925e507f - main - loader: Font module is EFI dependent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 784f925e507f441206279a1e8776629fa7cdd14c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=784f925e507f441206279a1e8776629fa7cdd14c commit 784f925e507f441206279a1e8776629fa7cdd14c Author: Warner Losh AuthorDate: 2024-02-02 01:37:12 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:04 +0000 loader: Font module is EFI dependent The font module is part of the gfx_fb support. Since we share this file between EFI and kboot, we only want to pass the font data to the kernel when we're booting from EFI, not kboot. Sponsored by: Netflix --- stand/efi/loader/bootinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index f47d81e23591..13b6df9c5b06 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -386,10 +386,12 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#ifdef EFI addr = build_font_module(addr); /* Pad to a page boundary. */ addr = roundup(addr, PAGE_SIZE); +#endif /* Copy our environment. */ envp = addr; From nobody Fri Feb 2 21:04:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSvr221Wz58GDP; Fri, 2 Feb 2024 21:04: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 4TRSvq72cmz548v; Fri, 2 Feb 2024 21:04:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIE9/kyOq8gXjth3lb+G429KGajY+YrDi0UkbjgqlJU=; b=gLucwhPObJYfm5BemNR3fFA6hMJW1izLY87dLn2jVrQWcSMjLo7T4dzlPRGJzj9J6MW5+S UmvCCf3ECyAmp3+ZISbvXX+5iby1aTgIAbx+yjNLbEK/B6fXKcb+P+rsbn27NE5LmnoLvJ M+G8gjJjDD33MwnOA1oUPSNaU8Vzxb6lWBUc4sKpBzOAeHnCHAcq71lM5VdgoOk80a6vVV YfEqZFyeeQA7u17SNnkvoOOCpQZiPzeKbdhX2BB6kIITes4Paz5ZA8NJZYxuGSBMR+GuIR trzgDm6vDu8s0gBsGoBLvBA8lZinyxQHcRR/JwdjdWBfSSIaUxr3nAvUorsS3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706907896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIE9/kyOq8gXjth3lb+G429KGajY+YrDi0UkbjgqlJU=; b=AeUfebr89XYihPLksBu+gskhHVUpUCAdRQEMaGgMHiJfphGohrrjIy1dha1/5PyzXO0cyq S2Bw0Vpt+tKhP4VYAXyKJ7qLHQjCIwsGDDSBFUc09H3fDnWEGomWpudGqMSC6Dh8Y/81dN qUNCy2SpPNfUgP0bBEct3TnM7h+sS/aDYUMSPQbkc/0k713lp0zQSFUdX2+5uXjg51quCd emzTtiRylC6Yd/haHoKB/lJgy5Hc6gt9z/0dg/Dd54vG6EgSrisIXat0DXawC8AMDYWfZq lm2NxxBb87AY4rRfUzbNT0oweYFWOtJtLJfwn4R8W0JAgANE566a4MhyJjsfHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706907896; a=rsa-sha256; cv=none; b=D3yzQMw7sEqfqbkmMgPrfepDfBvZjJQ7nanpDSbgdjdGDfwoKldXPvO1a9bSw0F3cBkTVC kUlqUpBIi3ATreylKb6PF4PER7KTdNoFxmdGZ7gLRfiQvn3lgw4IyJ4uGgYlGAjI7MBRrM +yUXnIiPCTIkEtnSAn2cVNXqRpkh3xAHgcizosIoGNv2qCIQHX8vXklv8MsHtC49Vx892l h/Mm+gHHI2XoMR4FfiAS6CJ5C/KgLHluViBH6tjMW/steg63basw3j7H0IOnE22OJF9Tnh eKxb8gyMSRGzHsqiAfmBUjV1xI/PWJhXedr+ezytpa0iePooob/t7Go8OvJI+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 4TRSvq5m8szlsg; Fri, 2 Feb 2024 21:04: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 412L4t3Y056400; Fri, 2 Feb 2024 21:04:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412L4thx056397; Fri, 2 Feb 2024 21:04:55 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:04:55 GMT Message-Id: <202402022104.412L4thx056397@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 18968b8274b5 - main - loader: Move build_font_module to gfx_fb.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18968b8274b56d8b60ab4e0d606e7f53f3a02014 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=18968b8274b56d8b60ab4e0d606e7f53f3a02014 commit 18968b8274b56d8b60ab4e0d606e7f53f3a02014 Author: Warner Losh AuthorDate: 2024-02-02 01:38:18 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:01:04 +0000 loader: Move build_font_module to gfx_fb.c The font module is part and parsel of the gfx_fb support. Move it to gfx_fb.c where it can access the data it needs. Sponsored by: Netflix --- stand/common/gfx_fb.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ stand/common/module.c | 87 ------------------------------------------------- 2 files changed, 89 insertions(+), 87 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index c10d227a5fc8..b61591bf3d45 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -87,6 +87,8 @@ #include #include #include +#include +#include #include #include #include @@ -2917,3 +2919,90 @@ gfx_get_edid_resolution(struct vesa_edid_info *edid, edid_res_list_t *res) } return (!TAILQ_EMPTY(res)); } + +vm_offset_t +build_font_module(vm_offset_t addr) +{ + vt_font_bitmap_data_t *bd; + struct vt_font *fd; + struct preloaded_file *fp; + size_t size; + uint32_t checksum; + int i; + struct font_info fi; + struct fontlist *fl; + uint64_t fontp; + + if (STAILQ_EMPTY(&fonts)) + return (addr); + + /* We can't load first */ + if ((file_findfile(NULL, NULL)) == NULL) { + printf("Can not load font module: %s\n", + "the kernel is not loaded"); + return (addr); + } + + /* helper pointers */ + bd = NULL; + STAILQ_FOREACH(fl, &fonts, font_next) { + if (gfx_state.tg_font.vf_width == fl->font_data->vfbd_width && + gfx_state.tg_font.vf_height == fl->font_data->vfbd_height) { + /* + * Kernel does have better built in font. + */ + if (fl->font_flags == FONT_BUILTIN) + return (addr); + + bd = fl->font_data; + break; + } + } + if (bd == NULL) + return (addr); + fd = bd->vfbd_font; + + fi.fi_width = fd->vf_width; + checksum = fi.fi_width; + fi.fi_height = fd->vf_height; + checksum += fi.fi_height; + fi.fi_bitmap_size = bd->vfbd_uncompressed_size; + checksum += fi.fi_bitmap_size; + + size = roundup2(sizeof (struct font_info), 8); + for (i = 0; i < VFNT_MAPS; i++) { + fi.fi_map_count[i] = fd->vf_map_count[i]; + checksum += fi.fi_map_count[i]; + size += fd->vf_map_count[i] * sizeof (struct vfnt_map); + size += roundup2(size, 8); + } + size += bd->vfbd_uncompressed_size; + + fi.fi_checksum = -checksum; + + fp = file_findfile(NULL, "elf kernel"); + if (fp == NULL) + fp = file_findfile(NULL, "elf64 kernel"); + if (fp == NULL) + panic("can't find kernel file"); + + fontp = addr; + addr += archsw.arch_copyin(&fi, addr, sizeof (struct font_info)); + addr = roundup2(addr, 8); + + /* Copy maps. */ + for (i = 0; i < VFNT_MAPS; i++) { + if (fd->vf_map_count[i] != 0) { + addr += archsw.arch_copyin(fd->vf_map[i], addr, + fd->vf_map_count[i] * sizeof (struct vfnt_map)); + addr = roundup2(addr, 8); + } + } + + /* Copy the bitmap. */ + addr += archsw.arch_copyin(fd->vf_bytes, addr, fi.fi_bitmap_size); + + /* Looks OK so far; populate control structure */ + file_addmetadata(fp, MODINFOMD_FONT, sizeof(fontp), &fontp); + return (addr); +} diff --git a/stand/common/module.c b/stand/common/module.c index 289d174733da..ac0ad466484a 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -640,93 +640,6 @@ file_load_dependencies(struct preloaded_file *base_file) return (error); } -vm_offset_t -build_font_module(vm_offset_t addr) -{ - vt_font_bitmap_data_t *bd; - struct vt_font *fd; - struct preloaded_file *fp; - size_t size; - uint32_t checksum; - int i; - struct font_info fi; - struct fontlist *fl; - uint64_t fontp; - - if (STAILQ_EMPTY(&fonts)) - return (addr); - - /* We can't load first */ - if ((file_findfile(NULL, NULL)) == NULL) { - printf("Can not load font module: %s\n", - "the kernel is not loaded"); - return (addr); - } - - /* helper pointers */ - bd = NULL; - STAILQ_FOREACH(fl, &fonts, font_next) { - if (gfx_state.tg_font.vf_width == fl->font_data->vfbd_width && - gfx_state.tg_font.vf_height == fl->font_data->vfbd_height) { - /* - * Kernel does have better built in font. - */ - if (fl->font_flags == FONT_BUILTIN) - return (addr); - - bd = fl->font_data; - break; - } - } - if (bd == NULL) - return (addr); - fd = bd->vfbd_font; - - fi.fi_width = fd->vf_width; - checksum = fi.fi_width; - fi.fi_height = fd->vf_height; - checksum += fi.fi_height; - fi.fi_bitmap_size = bd->vfbd_uncompressed_size; - checksum += fi.fi_bitmap_size; - - size = roundup2(sizeof (struct font_info), 8); - for (i = 0; i < VFNT_MAPS; i++) { - fi.fi_map_count[i] = fd->vf_map_count[i]; - checksum += fi.fi_map_count[i]; - size += fd->vf_map_count[i] * sizeof (struct vfnt_map); - size += roundup2(size, 8); - } - size += bd->vfbd_uncompressed_size; - - fi.fi_checksum = -checksum; - - fp = file_findfile(NULL, "elf kernel"); - if (fp == NULL) - fp = file_findfile(NULL, "elf64 kernel"); - if (fp == NULL) - panic("can't find kernel file"); - - fontp = addr; - addr += archsw.arch_copyin(&fi, addr, sizeof (struct font_info)); - addr = roundup2(addr, 8); - - /* Copy maps. */ - for (i = 0; i < VFNT_MAPS; i++) { - if (fd->vf_map_count[i] != 0) { - addr += archsw.arch_copyin(fd->vf_map[i], addr, - fd->vf_map_count[i] * sizeof (struct vfnt_map)); - addr = roundup2(addr, 8); - } - } - - /* Copy the bitmap. */ - addr += archsw.arch_copyin(fd->vf_bytes, addr, fi.fi_bitmap_size); - - /* Looks OK so far; populate control structure */ - file_addmetadata(fp, MODINFOMD_FONT, sizeof(fontp), &fontp); - return (addr); -} - #ifdef LOADER_VERIEXEC_VECTX #define VECTX_HANDLE(fd) vctx #else From nobody Fri Feb 2 21:18:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRTC34Hpwz58HKb; Fri, 2 Feb 2024 21:18: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 4TRTC33pM0z575H; Fri, 2 Feb 2024 21:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKAJa4zySd/UvFaxIpAdx5nQ4UuV0m04XJnveYrj/fk=; b=ZyzC9YH4XwoMWjiQVBprOv5nc3UcKgWJnJVMVndAHE3jcKYPg4PodXZT6QkDAv/SwYmwXw f7EuOHAFg+LXAXu9y5ka0xMXjyxi7UG3AaYd4dywwZHaF0QjcgRX7R2yXBKan/3Ve4xRqw C+QLgUZXhOWIKQEutlXukXURi9RBfGZ1lx1xOPUozLALbSwOHlQtV32iNVeYVxhXhyh1lX Kpmm0NFRcU8pG7p2iNQAwJ+sjdDahBdjwDy/Beol2Lr+61mDaAA+zdBommZXPuzitWcOF+ jtIGK+9foI+21hixGczepVVhFrE2oX2o9q1UA29nJ0hXIKKccAzFAq7D/318SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gKAJa4zySd/UvFaxIpAdx5nQ4UuV0m04XJnveYrj/fk=; b=xQM6PQQ9q5czoiRrD850kpHRYnTPfv/spqQgO65TB2OG1P+gnAmnYT4B9dqnSTOSf/srG7 FWTP0v5qgAyDxQsRSFpVcZ0+tj7kseLIVFliWAPQu1jb1N7fBMtvs7OU2NnZ6XbS8VALx1 4mp0BXIDsAtJHSonBeMe2AEGJilQilakgq3SPhgCkFgu/hhq/QIM3HGrLvmfIrnNUn3Qcj gj3M7+P0fMZLqhYKnL4pwIm6JTYoCsCyXre6ywsGQzvX1HlMQIMwNEl1zD3sbXkj9l7dgN 1JZq8i1YfPuJkBOkZdA5GQvaqCohNNg8nyD+q0zoT+6CEXgryeRmicyBD9ir4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706908687; a=rsa-sha256; cv=none; b=Ogj+WYom5EjBVKZ3oMTI1O1C5SkGA0DahDn0Pt16tXT8H5rVZbC2PJa9t6I8q3L2W2fUr5 2sAUOKlChlqNp4vAOP87vfN6sM70jCczK8zUN98UxkYMEn0wvYlS3bTAi/i/PXi3gPO7+1 I6y7KYBw2aVpNxpdIptQtlBgWrZFBt7T9xIuuCUCoSAxQ0AZetgaWQF5yOuZedCVKGAZkw IlDlQ36RVcJCMhvuID4w4hehdnxj26Uu+WpSaBNWi5Q+cYx7cQUk98s22xk6b3qFk8+9LR 2MIhqqhgJeKs/l7OrY03GZdsv2HUZWAvKg+appzGLLqaY11MBXZZLWzh6oqYtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRTC32rjzzmdC; Fri, 2 Feb 2024 21:18: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 412LI7QK073735; Fri, 2 Feb 2024 21:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412LI76x073732; Fri, 2 Feb 2024 21:18:07 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:18:07 GMT Message-Id: <202402022118.412LI76x073732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: fbae308319b7 - main - bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbae308319b7678cd9d879f60b1efd8d4c99b5eb Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=fbae308319b7678cd9d879f60b1efd8d4c99b5eb commit fbae308319b7678cd9d879f60b1efd8d4c99b5eb Author: Jessica Clarke AuthorDate: 2024-02-02 21:17:23 +0000 Commit: Jessica Clarke CommitDate: 2024-02-02 21:17:23 +0000 bsd.subdir.mk: Drop broken optimisation for realinstall parallelisation Not all of the tree is happy for realinstall to be done in parallel. In particular, Makefile.inc1 uses .WAIT to force etc to be installed after earlier subdirectories, since etc calls into share/man's makedb to run makewhatis on the tree and needs all manpages to have been installed. Also, libexec/Makefile doesn't set SUBDIR_PARALLEL, and the link from ld-elf32.1 to ld-elf.1 relies on rtld-elf having been installed before rtld-elf32, otherwise creating the link will fail. In general, core behavioural differences like this between NO_ROOT and "normal" builds are also dangerous and confusing. If this optimisation is deemed important, it should be reintroduced in a more limited and robust manner that doesn't break the above situations. Until then value correctness over slight efficiency gains on high core count machines, the same machines where you're more likely to encounter issues from this optimisation. This reverts commits cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") and b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS."). Found by: CheriBSD Jenkins Reviewed by: bdrewery, brooks Fixes: cd19ecdbdc87 ("Similar to r296013 for NO_ROOT, force SUBDIR_PARALLEL for buildworld WORLDTMP staging.") Fixes: b9c6f3168112 ("Add more STANDALONE_SUBDIR_TARGETS.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43705 --- share/mk/bsd.subdir.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index be623ea37aa6..95a178c04907 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -54,11 +54,6 @@ STANDALONE_SUBDIR_TARGETS+= \ installconfig installdirs installincludes installfiles print-dir \ maninstall manlint obj objlink -# It is safe to install in parallel when staging. -.if defined(NO_ROOT) || !empty(SYSROOT) -STANDALONE_SUBDIR_TARGETS+= realinstall -.endif - .include .if ${MK_META_MODE} == "yes" From nobody Fri Feb 2 21:22:08 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRTHp04RVz58J5C; Fri, 2 Feb 2024 21:22: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 4TRTHn6vlZz57Z6; Fri, 2 Feb 2024 21:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yCasfYPPXsmGesxY/Zc8BXNnAv1g0QybfrrbU8R8q8w=; b=SQjUQMCmWwB0y4T5i49KeV+9i0bcd29mhh9jlYgQXgbW/1/l5019fOSehQBaQqo1WpC7xZ ORsZINLnqlkmyNvUsXzfSmAqklUHEm0p1+C7XpV9x9jstEAM8QNsVug+NS2VIxKscn87Y+ T4d9HwfPcW1ANSHU8FP4Ba38i6wXCnUDWYmN/oe7OOhgzHEAm9+mExl+fzeYi4Jgn/zvpa nVuDUI02KKa/tMaTLIXF3hoybAPUqkgLaylaDQr4JCSN/2EwXnz8AOHr4ac/e+psnhb1Bt 6yr6exTD5aszqYR+0ckrdrqxCLopLhWTvarVHYgAOQ5wMoN6cqiAVmwxLZ61FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706908933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yCasfYPPXsmGesxY/Zc8BXNnAv1g0QybfrrbU8R8q8w=; b=nRtFUm/Gv553HkFI/mlG7nY0KuPMr0Q8Ru1c5W0RycVa3yLuR6bK/yVFr93LEMqgdqWP8O Ub0laBOmhrgkpZarvbyxA4y0l0oSaaeqe8rHlqR6QpQaQ6KguwrFAmu4XtjphKBDPqIdGq DEA9GcTwez5/qU8n7bKdfRUMDF0Fe9nRCycvEFA5BMJ6rVm1KQ8NLpA80VnKdsRPiJLxGh bYvr7YFBukivCuUmXib46svoX62cuFEJjQ/thi+K9VT/Rs01TebW+/0LJt9qW/sYm03lBC Dj/QmVrlsXJeMUHC2c8xYltHHcT27fgF/taBf4E5FZ/Tj0plABE3MOvW3lgLeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706908933; a=rsa-sha256; cv=none; b=uSrvUStEpvqvS80g4d/8q3hU1Q29Hk2eG896poqEcEn3sohnvJPqUqPJuwSnLV+08Cmn5G VZ8gnqErDw5/CV4ir6ViEs0FRqPXqyIjRQ3v7dvubss+i80I2xznxUmYjgJPC8WfKk0+al QDpdDS63xepBOvQUe1/BvXzZVjDM1RzSL8BHPMI52nIrsYuGMPGYQgOJZWjb547X2BDoyZ RLcdBiB/DFEVNyZAMzvWm2ph52NvJ0tBN17IghLhGvrWO3LGr1FxacpCU8zDBE9BR/dlW7 YEStwUBQwiiP4M4/1fGlEtxlLBfVL/HGJbxd4+OeTrgOv+SE+oL/gLnemchIjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRTHn5yKwzmqK; Fri, 2 Feb 2024 21:22: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 412LMDE3088487; Fri, 2 Feb 2024 21:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412LM8E8088467; Fri, 2 Feb 2024 21:22:08 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:22:08 GMT Message-Id: <202402022122.412LM8E8088467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: e0c4386e7e71 - main - OpenSSL: Vendor import of OpenSSL 3.0.13 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c4386e7e71d93b0edc0c8fa156263fc4a8b0b6 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c4386e7e71d93b0edc0c8fa156263fc4a8b0b6 commit e0c4386e7e71d93b0edc0c8fa156263fc4a8b0b6 Merge: fbae308319b7 9dd13e84fa8e Author: Cy Schubert AuthorDate: 2024-02-02 21:10:22 +0000 Commit: Cy Schubert CommitDate: 2024-02-02 21:21:36 +0000 OpenSSL: Vendor import of OpenSSL 3.0.13 * Fixed PKCS12 Decoding crashes ([CVE-2024-0727]) * Fixed Excessive time spent checking invalid RSA public keys ([CVE-2023-6237]) * Fixed POLY1305 MAC implementation corrupting vector registers on PowerPC CPUs which support PowerISA 2.07 ([CVE-2023-6129]) * Fix excessive time spent in DH check / generation with large Q parameter value ([CVE-2023-5678]) Release notes can be found at https://www.openssl.org/news/openssl-3.0-notes.html. Approved by: emaste MFC after: 3 days Merge commit '9dd13e84fa8eca8f3462bd55485aa3da8c37f54a' crypto/openssl/CHANGES.md | 88 + crypto/openssl/CONTRIBUTING.md | 56 +- .../openssl/Configurations/00-base-templates.conf | 141 + crypto/openssl/Configurations/10-main.conf | 1955 + crypto/openssl/Configurations/15-android.conf | 291 + crypto/openssl/Configurations/15-ios.conf | 64 + crypto/openssl/Configurations/50-cppbuilder.conf | 62 + crypto/openssl/Configurations/50-djgpp.conf | 18 + crypto/openssl/Configurations/50-haiku.conf | 35 + crypto/openssl/Configurations/50-masm.conf | 22 + crypto/openssl/Configurations/50-nonstop.conf | 315 + crypto/openssl/Configurations/50-os390.conf | 11 + crypto/openssl/Configurations/50-vms-x86_64.conf | 14 + crypto/openssl/Configurations/50-win-onecore.conf | 138 + crypto/openssl/Configurations/INTERNALS.Configure | 136 + crypto/openssl/Configurations/README-design.md | 604 + crypto/openssl/Configurations/README.md | 667 + crypto/openssl/Configurations/common0.tmpl | 31 + crypto/openssl/Configurations/descrip.mms.tmpl | 1402 + crypto/openssl/Configurations/gentemplate.pm | 556 + crypto/openssl/Configurations/platform.pm | 18 + crypto/openssl/Configurations/platform/AIX.pm | 29 + crypto/openssl/Configurations/platform/BASE.pm | 99 + crypto/openssl/Configurations/platform/Cygwin.pm | 22 + crypto/openssl/Configurations/platform/Unix.pm | 87 + crypto/openssl/Configurations/platform/VMS.pm | 65 + crypto/openssl/Configurations/platform/Windows.pm | 64 + .../Configurations/platform/Windows/MSVC.pm | 44 + .../Configurations/platform/Windows/cppbuilder.pm | 16 + crypto/openssl/Configurations/platform/mingw.pm | 51 + crypto/openssl/Configurations/shared-info.pl | 94 + crypto/openssl/Configurations/unix-Makefile.tmpl | 1996 + crypto/openssl/Configurations/unix-checker.pm | 22 + crypto/openssl/Configurations/windows-checker.pm | 22 + .../openssl/Configurations/windows-makefile.tmpl | 1050 + crypto/openssl/Configure | 37 +- crypto/openssl/NEWS.md | 16 + crypto/openssl/README.md | 2 +- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/VMS/VMSify-conf.pl | 41 + crypto/openssl/VMS/engine.opt | 3 + crypto/openssl/VMS/msg_install.com | 19 + crypto/openssl/VMS/msg_staging.com | 37 + crypto/openssl/VMS/openssl_ivp.com.in | 56 + crypto/openssl/VMS/openssl_shutdown.com.in | 57 + crypto/openssl/VMS/openssl_startup.com.in | 125 + crypto/openssl/VMS/openssl_utils.com.in | 14 + crypto/openssl/VMS/test-includes.com | 28 + crypto/openssl/VMS/translatesyms.pl | 62 + crypto/openssl/apps/cms.c | 15 +- crypto/openssl/apps/demoSRP/srp_verifier.txt | 6 + crypto/openssl/apps/demoSRP/srp_verifier.txt.attr | 1 + crypto/openssl/apps/errstr.c | 2 +- crypto/openssl/apps/lib/opt.c | 7 +- crypto/openssl/apps/list.c | 52 +- crypto/openssl/apps/openssl-vms.cnf | 390 + crypto/openssl/apps/rehash.c | 40 +- crypto/openssl/apps/req.c | 4 +- crypto/openssl/apps/s_server.c | 7 +- crypto/openssl/apps/smime.c | 3 +- crypto/openssl/apps/vms_decc_init.c | 176 + crypto/openssl/appveyor.yml | 82 - crypto/openssl/config.com | 93 + crypto/openssl/crypto/LPdir_nyi.c | 56 + crypto/openssl/crypto/LPdir_vms.c | 207 + crypto/openssl/crypto/LPdir_win.c | 214 + crypto/openssl/crypto/LPdir_win32.c | 41 + crypto/openssl/crypto/LPdir_wince.c | 44 + crypto/openssl/crypto/alphacpuid.pl | 256 + crypto/openssl/crypto/asn1/asn_moid.c | 4 + crypto/openssl/crypto/asn1/asn_mstbl.c | 8 +- crypto/openssl/crypto/asn1/x_algor.c | 6 +- crypto/openssl/crypto/async/arch/async_win.c | 59 + crypto/openssl/crypto/bn/asm/alpha-mont.pl | 327 + crypto/openssl/crypto/bn/bn_exp.c | 21 + crypto/openssl/crypto/bn/bn_gf2m.c | 8 +- crypto/openssl/crypto/bn/bn_mod.c | 10 + crypto/openssl/crypto/bn/bn_nist.c | 126 +- crypto/openssl/crypto/build.info | 4 +- crypto/openssl/crypto/cms/cms_att.c | 24 +- crypto/openssl/crypto/cms/cms_dh.c | 8 +- crypto/openssl/crypto/cms/cms_rsa.c | 35 +- crypto/openssl/crypto/cms/cms_sd.c | 31 +- crypto/openssl/crypto/cms/cms_smime.c | 3 +- crypto/openssl/crypto/conf/conf_err.c | 2 + crypto/openssl/crypto/dh/dh_check.c | 12 + crypto/openssl/crypto/dh/dh_err.c | 3 +- crypto/openssl/crypto/dh/dh_key.c | 12 + crypto/openssl/crypto/dso/dso_vms.c | 489 + crypto/openssl/crypto/dso/dso_win32.c | 671 + crypto/openssl/crypto/ec/ecx_backend.c | 9 +- crypto/openssl/crypto/err/openssl.ec | 81 + crypto/openssl/crypto/err/openssl.txt | 2 + crypto/openssl/crypto/evp/e_aes.c | 16 +- crypto/openssl/crypto/evp/evp_fetch.c | 23 +- crypto/openssl/crypto/http/http_client.c | 8 +- crypto/openssl/crypto/http/http_lib.c | 2 +- crypto/openssl/crypto/mem_sec.c | 12 +- crypto/openssl/crypto/modes/asm/ghash-alpha.pl | 467 + crypto/openssl/crypto/objects/obj_dat.c | 4 +- crypto/openssl/crypto/param_build.c | 8 +- crypto/openssl/crypto/params_from_text.c | 10 +- crypto/openssl/crypto/perlasm/x86_64-xlate.pl | 7 +- crypto/openssl/crypto/pkcs12/p12_add.c | 20 +- crypto/openssl/crypto/pkcs12/p12_mutl.c | 7 +- crypto/openssl/crypto/pkcs12/p12_npas.c | 7 +- crypto/openssl/crypto/pkcs7/pk7_attr.c | 20 +- crypto/openssl/crypto/pkcs7/pk7_mime.c | 9 +- crypto/openssl/crypto/poly1305/asm/poly1305-ppc.pl | 44 +- crypto/openssl/crypto/property/property_parse.c | 50 +- crypto/openssl/crypto/provider_conf.c | 104 +- crypto/openssl/crypto/provider_core.c | 70 +- crypto/openssl/crypto/rsa/rsa_lib.c | 8 + crypto/openssl/crypto/rsa/rsa_sp800_56b_check.c | 10 +- crypto/openssl/crypto/sha/asm/sha1-alpha.pl | 329 + crypto/openssl/crypto/threads_win.c | 263 + crypto/openssl/crypto/x509/t_req.c | 8 +- crypto/openssl/crypto/x509/t_x509.c | 4 +- crypto/openssl/crypto/x509/v3_addr.c | 6 +- crypto/openssl/crypto/x509/v3_asid.c | 24 +- crypto/openssl/crypto/x509/v3_crld.c | 7 +- crypto/openssl/crypto/x509/v3_ist.c | 18 +- crypto/openssl/crypto/x509/v3_san.c | 13 +- crypto/openssl/crypto/x509/v3_sxnet.c | 20 +- crypto/openssl/crypto/x509/x509_att.c | 92 +- crypto/openssl/crypto/x509/x509_req.c | 4 +- crypto/openssl/demos/README.txt | 50 + crypto/openssl/demos/bio/Makefile | 33 + crypto/openssl/demos/bio/README.txt | 6 + crypto/openssl/demos/bio/accept.cnf | 23 + crypto/openssl/demos/bio/client-arg.c | 108 + crypto/openssl/demos/bio/client-conf.c | 117 + crypto/openssl/demos/bio/cmod.cnf | 27 + crypto/openssl/demos/bio/connect.cnf | 15 + crypto/openssl/demos/bio/descrip.mms | 47 + crypto/openssl/demos/bio/intca.pem | 25 + crypto/openssl/demos/bio/root.pem | 28 + crypto/openssl/demos/bio/saccept.c | 121 + crypto/openssl/demos/bio/sconnect.c | 128 + crypto/openssl/demos/bio/server-arg.c | 144 + crypto/openssl/demos/bio/server-cmod.c | 94 + crypto/openssl/demos/bio/server-conf.c | 139 + crypto/openssl/demos/bio/server-ec.pem | 17 + crypto/openssl/demos/bio/server.pem | 79 + crypto/openssl/demos/bio/shared.opt | 2 + crypto/openssl/demos/bio/static.opt | 2 + crypto/openssl/demos/certs/README.txt | 18 + crypto/openssl/demos/certs/apps/apps.cnf | 66 + crypto/openssl/demos/certs/apps/ckey.pem | 27 + crypto/openssl/demos/certs/apps/intkey.pem | 27 + crypto/openssl/demos/certs/apps/mkacerts.sh | 45 + crypto/openssl/demos/certs/apps/mkxcerts.sh | 29 + crypto/openssl/demos/certs/apps/rootkey.pem | 27 + crypto/openssl/demos/certs/apps/skey.pem | 27 + crypto/openssl/demos/certs/apps/skey2.pem | 27 + crypto/openssl/demos/certs/ca.cnf | 82 + crypto/openssl/demos/certs/mkcerts.sh | 96 + crypto/openssl/demos/certs/ocspquery.sh | 21 + crypto/openssl/demos/certs/ocsprun.sh | 14 + crypto/openssl/demos/cipher/Makefile | 27 + crypto/openssl/demos/cipher/aesccm.c | 238 + crypto/openssl/demos/cipher/aesgcm.c | 228 + crypto/openssl/demos/cipher/aeskeywrap.c | 181 + crypto/openssl/demos/cipher/ariacbc.c | 178 + crypto/openssl/demos/cms/cacert.pem | 29 + crypto/openssl/demos/cms/cakey.pem | 39 + crypto/openssl/demos/cms/cms_comp.c | 64 + crypto/openssl/demos/cms/cms_ddec.c | 88 + crypto/openssl/demos/cms/cms_dec.c | 78 + crypto/openssl/demos/cms/cms_denc.c | 97 + crypto/openssl/demos/cms/cms_enc.c | 92 + crypto/openssl/demos/cms/cms_sign.c | 88 + crypto/openssl/demos/cms/cms_sign2.c | 98 + crypto/openssl/demos/cms/cms_uncomp.c | 58 + crypto/openssl/demos/cms/cms_ver.c | 88 + crypto/openssl/demos/cms/comp.txt | 22 + crypto/openssl/demos/cms/encr.txt | 3 + crypto/openssl/demos/cms/sign.txt | 3 + crypto/openssl/demos/cms/signer.pem | 52 + crypto/openssl/demos/cms/signer2.pem | 52 + crypto/openssl/demos/digest/BIO_f_md.c | 122 + crypto/openssl/demos/digest/EVP_MD_demo.c | 183 + crypto/openssl/demos/digest/EVP_MD_stdin.c | 134 + crypto/openssl/demos/digest/EVP_MD_xof.c | 132 + crypto/openssl/demos/digest/Makefile | 23 + crypto/openssl/demos/encode/Makefile | 20 + crypto/openssl/demos/encode/ec_encode.c | 205 + crypto/openssl/demos/encode/rsa_encode.c | 202 + crypto/openssl/demos/kdf/Makefile | 22 + crypto/openssl/demos/kdf/hkdf.c | 104 + crypto/openssl/demos/kdf/pbkdf2.c | 117 + crypto/openssl/demos/kdf/scrypt.c | 120 + crypto/openssl/demos/keyexch/x25519.c | 278 + crypto/openssl/demos/mac/Makefile | 25 + crypto/openssl/demos/mac/cmac-aes256.c | 154 + crypto/openssl/demos/mac/gmac.c | 145 + crypto/openssl/demos/mac/hmac-sha512.c | 166 + crypto/openssl/demos/mac/poly1305.c | 209 + crypto/openssl/demos/mac/siphash.c | 129 + crypto/openssl/demos/pkcs12/pkread.c | 111 + crypto/openssl/demos/pkcs12/pkwrite.c | 53 + crypto/openssl/demos/pkey/EVP_PKEY_DSA_keygen.c | 83 + .../demos/pkey/EVP_PKEY_DSA_paramfromdata.c | 75 + crypto/openssl/demos/pkey/EVP_PKEY_DSA_paramgen.c | 66 + .../demos/pkey/EVP_PKEY_DSA_paramvalidate.c | 202 + crypto/openssl/demos/pkey/EVP_PKEY_EC_keygen.c | 155 + crypto/openssl/demos/pkey/EVP_PKEY_RSA_keygen.c | 289 + crypto/openssl/demos/pkey/Makefile | 37 + crypto/openssl/demos/pkey/dsa.inc | 172 + .../openssl/demos/signature/EVP_Signature_demo.c | 235 + .../openssl/demos/signature/EVP_Signature_demo.h | 76 + crypto/openssl/demos/signature/Makefile | 22 + crypto/openssl/demos/signature/rsa_pss.h | 256 + crypto/openssl/demos/signature/rsa_pss_direct.c | 204 + crypto/openssl/demos/signature/rsa_pss_hash.c | 189 + crypto/openssl/demos/smime/cacert.pem | 29 + crypto/openssl/demos/smime/cakey.pem | 39 + crypto/openssl/demos/smime/encr.txt | 3 + crypto/openssl/demos/smime/sign.txt | 3 + crypto/openssl/demos/smime/signer.pem | 52 + crypto/openssl/demos/smime/signer2.pem | 52 + crypto/openssl/demos/smime/smdec.c | 78 + crypto/openssl/demos/smime/smenc.c | 91 + crypto/openssl/demos/smime/smsign.c | 88 + crypto/openssl/demos/smime/smsign2.c | 96 + crypto/openssl/demos/smime/smver.c | 87 + crypto/openssl/doc/build.info | 30 + .../doc/images/openssl-square-nontransparent.png | Bin 0 -> 78086 bytes crypto/openssl/doc/images/openssl-square.svg | 49 + crypto/openssl/doc/images/openssl.svg | 88 +- crypto/openssl/doc/man1/openssl-pkeyutl.pod.in | 4 +- crypto/openssl/doc/man1/openssl-req.pod.in | 2 +- crypto/openssl/doc/man3/BIO_f_md.pod | 6 +- crypto/openssl/doc/man3/BN_add.pod | 5 + crypto/openssl/doc/man3/BN_mod_inverse.pod | 6 +- crypto/openssl/doc/man3/CMS_signed_get_attr.pod | 214 + crypto/openssl/doc/man3/EVP_EncryptInit.pod | 14 +- crypto/openssl/doc/man3/EVP_MAC.pod | 12 +- crypto/openssl/doc/man3/EVP_PKEY_get_attr.pod | 113 + crypto/openssl/doc/man3/OPENSSL_LH_COMPFUNC.pod | 65 +- crypto/openssl/doc/man3/OSSL_PARAM_int.pod | 2 +- crypto/openssl/doc/man3/PKCS12_create.pod | 14 +- .../doc/man3/SSL_CTX_set_tlsext_ticket_key_cb.pod | 4 +- .../doc/man3/SSL_CTX_set_tmp_dh_callback.pod | 2 +- crypto/openssl/doc/man3/SSL_get_error.pod | 6 +- .../openssl/doc/man3/SSL_get_peer_certificate.pod | 9 +- crypto/openssl/doc/man3/X509_ATTRIBUTE.pod | 263 + crypto/openssl/doc/man3/X509_REQ_get_attr.pod | 111 + .../openssl/doc/man3/X509_REQ_get_extensions.pod | 50 + crypto/openssl/doc/man3/X509_dup.pod | 15 +- crypto/openssl/doc/man7/EVP_CIPHER-AES.pod | 13 + crypto/openssl/doc/man7/EVP_KDF-SS.pod | 6 +- crypto/openssl/doc/man7/EVP_MAC-BLAKE2.pod | 9 +- crypto/openssl/doc/man7/EVP_MAC-CMAC.pod | 2 +- crypto/openssl/doc/man7/EVP_MAC-HMAC.pod | 2 +- crypto/openssl/doc/man7/EVP_MAC-KMAC.pod | 14 +- crypto/openssl/doc/man7/EVP_MD-SHAKE.pod | 21 +- crypto/openssl/doc/man7/EVP_PKEY-RSA.pod | 2 +- crypto/openssl/doc/man7/EVP_RAND-SEED-SRC.pod | 3 +- crypto/openssl/doc/man7/provider-cipher.pod | 10 +- crypto/openssl/doc/man7/provider-keymgmt.pod | 4 +- crypto/openssl/doc/man7/provider-storemgmt.pod | 4 +- crypto/openssl/engines/e_afalg.ec | 3 + crypto/openssl/engines/e_capi.ec | 3 + crypto/openssl/engines/e_dasync.ec | 3 + crypto/openssl/engines/e_loader_attic.ec | 3 + crypto/openssl/engines/e_ossltest.ec | 3 + crypto/openssl/external/perl/Downloaded.txt | 14 + crypto/openssl/external/perl/MODULES.txt | 1 + .../external/perl/Text-Template-1.56/Changes | 301 + .../external/perl/Text-Template-1.56/INSTALL | 31 + .../external/perl/Text-Template-1.56/LICENSE | 379 + .../external/perl/Text-Template-1.56/MANIFEST | 34 + .../external/perl/Text-Template-1.56/META.json | 83 + .../external/perl/Text-Template-1.56/META.yml | 46 + .../external/perl/Text-Template-1.56/Makefile.PL | 71 + .../external/perl/Text-Template-1.56/README | 62 + .../external/perl/Text-Template-1.56/SIGNATURE | 65 + .../perl/Text-Template-1.56/lib/Text/Template.pm | 2363 + .../lib/Text/Template/Preprocess.pm | 157 + .../perl/Text-Template-1.56/t/author-pod-syntax.t | 15 + .../perl/Text-Template-1.56/t/author-signature.t | 21 + .../external/perl/Text-Template-1.56/t/basic.t | 179 + .../external/perl/Text-Template-1.56/t/broken.t | 66 + .../perl/Text-Template-1.56/t/delimiters.t | 83 + .../external/perl/Text-Template-1.56/t/error.t | 34 + .../external/perl/Text-Template-1.56/t/exported.t | 68 + .../external/perl/Text-Template-1.56/t/hash.t | 91 + .../perl/Text-Template-1.56/t/inline-comment.t | 17 + .../perl/Text-Template-1.56/t/nested-tags.t | 26 + .../external/perl/Text-Template-1.56/t/ofh.t | 33 + .../external/perl/Text-Template-1.56/t/out.t | 46 + .../external/perl/Text-Template-1.56/t/prepend.t | 78 + .../perl/Text-Template-1.56/t/preprocess.t | 43 + .../external/perl/Text-Template-1.56/t/rt29928.t | 26 + .../external/perl/Text-Template-1.56/t/safe.t | 135 + .../external/perl/Text-Template-1.56/t/safe2.t | 94 + .../external/perl/Text-Template-1.56/t/safe3.t | 80 + .../external/perl/Text-Template-1.56/t/strict.t | 46 + .../external/perl/Text-Template-1.56/t/taint.t | 112 + .../perl/Text-Template-1.56/t/template-encoding.t | 47 + .../external/perl/Text-Template-1.56/t/warnings.t | 46 + crypto/openssl/fuzz/README.md | 175 + crypto/openssl/fuzz/asn1.c | 375 + crypto/openssl/fuzz/asn1parse.c | 45 + crypto/openssl/fuzz/bignum.c | 109 + crypto/openssl/fuzz/bndiv.c | 131 + crypto/openssl/fuzz/build.info | 146 + crypto/openssl/fuzz/client.c | 108 + crypto/openssl/fuzz/cmp.c | 203 + crypto/openssl/fuzz/cms.c | 55 + crypto/openssl/fuzz/conf.c | 48 + crypto/openssl/fuzz/crl.c | 47 + crypto/openssl/fuzz/ct.c | 51 + crypto/openssl/fuzz/driver.c | 55 + crypto/openssl/fuzz/fuzz_rand.c | 168 + crypto/openssl/fuzz/fuzzer.h | 16 + crypto/openssl/fuzz/helper.py | 52 + crypto/openssl/fuzz/mkfuzzoids.pl | 42 + crypto/openssl/fuzz/oids.txt | 1113 + crypto/openssl/fuzz/server.c | 659 + crypto/openssl/fuzz/test-corpus.c | 104 + crypto/openssl/fuzz/x509.c | 153 + crypto/openssl/include/crypto/dherr.h | 2 +- crypto/openssl/include/crypto/x509.h | 19 +- crypto/openssl/include/internal/ffc.h | 9 +- crypto/openssl/include/internal/refcount.h | 4 +- crypto/openssl/include/openssl/bio.h.in | 2 +- crypto/openssl/include/openssl/conferr.h | 1 + crypto/openssl/include/openssl/dh.h | 6 +- crypto/openssl/include/openssl/dherr.h | 3 +- crypto/openssl/ms/applink.c | 144 + crypto/openssl/ms/cmp.pl | 53 + crypto/openssl/ms/uplink-common.pl | 28 + crypto/openssl/ms/uplink-ia64.pl | 60 + crypto/openssl/ms/uplink-x86.pl | 43 + crypto/openssl/ms/uplink-x86_64.pl | 74 + crypto/openssl/ms/uplink.c | 150 + crypto/openssl/ms/uplink.h | 38 + crypto/openssl/os-dep/haiku.h | 11 + crypto/openssl/providers/fips-sources.checksums | 66 +- crypto/openssl/providers/fips.checksum | 2 +- .../implementations/asymciphers/rsa_enc.c | 1 + .../providers/implementations/ciphers/cipher_aes.h | 3 +- .../ciphers/cipher_aes_cbc_hmac_sha.c | 20 +- .../implementations/ciphers/cipher_aes_ccm.c | 22 +- .../implementations/ciphers/cipher_aes_gcm.c | 17 +- .../ciphers/cipher_aes_hw_s390x.inc | 12 +- .../implementations/ciphers/cipher_aes_ocb.c | 5 +- .../implementations/ciphers/cipher_aes_wrp.c | 23 +- .../implementations/ciphers/cipher_aria_ccm.c | 17 +- .../implementations/ciphers/cipher_aria_gcm.c | 17 +- .../ciphers/cipher_chacha20_poly1305.c | 23 +- .../providers/implementations/ciphers/cipher_des.c | 1 + .../implementations/ciphers/cipher_rc4_hmac_md5.c | 13 +- .../implementations/ciphers/cipher_tdes_common.c | 1 + .../implementations/ciphers/ciphercommon.c | 33 +- .../implementations/ciphers/ciphercommon_ccm.c | 5 +- .../implementations/ciphers/ciphercommon_gcm.c | 7 +- .../implementations/digests/blake2b_prov.c | 6 +- .../implementations/digests/blake2s_prov.c | 6 +- .../implementations/encode_decode/encode_key2any.c | 12 +- .../implementations/include/prov/ciphercommon.h | 1 + .../include/prov/ciphercommon_aead.h | 7 +- .../providers/implementations/kdfs/pbkdf1.c | 8 +- .../providers/implementations/macs/cmac_prov.c | 6 +- .../providers/implementations/signature/rsa_sig.c | 1 + .../providers/implementations/signature/sm2_sig.c | 9 + crypto/openssl/ssl/d1_lib.c | 17 + crypto/openssl/ssl/record/rec_layer_s3.c | 6 +- crypto/openssl/ssl/s3_enc.c | 6 +- crypto/openssl/ssl/s3_lib.c | 4 + crypto/openssl/ssl/ssl_ciph.c | 3 +- crypto/openssl/ssl/ssl_conf.c | 24 +- crypto/openssl/ssl/ssl_lib.c | 30 +- crypto/openssl/ssl/ssl_mcnf.c | 18 +- crypto/openssl/ssl/statem/extensions_cust.c | 7 + crypto/openssl/ssl/statem/statem_dtls.c | 8 +- crypto/openssl/ssl/t1_enc.c | 7 +- crypto/openssl/test/CAtsa.cnf | 164 + crypto/openssl/test/README-dev.md | 160 + crypto/openssl/test/README-external.md | 116 + crypto/openssl/test/README.md | 170 + crypto/openssl/test/README.ssltest.md | 285 + crypto/openssl/test/aborttest.c | 16 + crypto/openssl/test/acvp_test.c | 1502 + crypto/openssl/test/acvp_test.inc | 2035 + crypto/openssl/test/aesgcmtest.c | 136 + crypto/openssl/test/afalgtest.c | 160 + crypto/openssl/test/algorithmid_test.c | 328 + crypto/openssl/test/asn1_decode_test.c | 235 + crypto/openssl/test/asn1_dsa_internal_test.c | 184 + crypto/openssl/test/asn1_encode_test.c | 908 + crypto/openssl/test/asn1_internal_test.c | 200 + crypto/openssl/test/asn1_stable_parse_test.c | 81 + crypto/openssl/test/asn1_string_table_test.c | 77 + crypto/openssl/test/asn1_time_test.c | 418 + crypto/openssl/test/asynciotest.c | 417 + crypto/openssl/test/asynctest.c | 435 + crypto/openssl/test/bad_dtls_test.c | 607 + crypto/openssl/test/bftest.c | 487 + crypto/openssl/test/bio_callback_test.c | 360 + crypto/openssl/test/bio_core_test.c | 119 + crypto/openssl/test/bio_enc_test.c | 266 + crypto/openssl/test/bio_memleak_test.c | 291 + crypto/openssl/test/bio_prefix_text.c | 267 + crypto/openssl/test/bio_readbuffer_test.c | 131 + crypto/openssl/test/bioprinttest.c | 362 + crypto/openssl/test/bn_internal_test.c | 105 + crypto/openssl/test/bn_rand_range.h | 58 + crypto/openssl/test/bntest.c | 3195 + crypto/openssl/test/bntests.pl | 156 + crypto/openssl/test/build.info | 976 + crypto/openssl/test/ca-and-certs.cnf | 89 + crypto/openssl/test/casttest.c | 118 + crypto/openssl/test/certs/alt1-cert.pem | 21 + crypto/openssl/test/certs/alt1-key.pem | 28 + crypto/openssl/test/certs/alt2-cert.pem | 20 + crypto/openssl/test/certs/alt2-key.pem | 28 + crypto/openssl/test/certs/alt3-cert.pem | 21 + crypto/openssl/test/certs/alt3-key.pem | 28 + crypto/openssl/test/certs/bad-othername-cert.pem | 20 + .../test/certs/bad-othername-namec-inter.pem | 17 + .../openssl/test/certs/bad-othername-namec-key.pem | 27 + crypto/openssl/test/certs/bad-othername-namec.pem | 18 + crypto/openssl/test/certs/bad-pc3-cert.pem | 21 + crypto/openssl/test/certs/bad-pc3-key.pem | 28 + crypto/openssl/test/certs/bad-pc4-cert.pem | 21 + crypto/openssl/test/certs/bad-pc4-key.pem | 28 + crypto/openssl/test/certs/bad-pc6-cert.pem | 21 + crypto/openssl/test/certs/bad-pc6-key.pem | 28 + crypto/openssl/test/certs/bad.key | 27 + crypto/openssl/test/certs/bad.pem | 21 + crypto/openssl/test/certs/badalt1-cert.pem | 20 + crypto/openssl/test/certs/badalt1-key.pem | 28 + crypto/openssl/test/certs/badalt10-cert.pem | 21 + crypto/openssl/test/certs/badalt10-key.pem | 28 + crypto/openssl/test/certs/badalt2-cert.pem | 20 + crypto/openssl/test/certs/badalt2-key.pem | 28 + crypto/openssl/test/certs/badalt3-cert.pem | 21 + crypto/openssl/test/certs/badalt3-key.pem | 28 + crypto/openssl/test/certs/badalt4-cert.pem | 21 + crypto/openssl/test/certs/badalt4-key.pem | 28 + crypto/openssl/test/certs/badalt5-cert.pem | 20 + crypto/openssl/test/certs/badalt5-key.pem | 28 + crypto/openssl/test/certs/badalt6-cert.pem | 21 + crypto/openssl/test/certs/badalt6-key.pem | 28 + crypto/openssl/test/certs/badalt7-cert.pem | 22 + crypto/openssl/test/certs/badalt7-key.pem | 28 + crypto/openssl/test/certs/badalt8-cert.pem | 21 + crypto/openssl/test/certs/badalt8-key.pem | 28 + crypto/openssl/test/certs/badalt9-cert.pem | 21 + crypto/openssl/test/certs/badalt9-key.pem | 28 + crypto/openssl/test/certs/badcn1-cert.pem | 20 + crypto/openssl/test/certs/badcn1-key.pem | 28 + crypto/openssl/test/certs/ca+anyEKU.pem | 18 + crypto/openssl/test/certs/ca+clientAuth.pem | 18 + crypto/openssl/test/certs/ca+serverAuth.pem | 18 + crypto/openssl/test/certs/ca-anyEKU.pem | 18 + crypto/openssl/test/certs/ca-cert-768.pem | 15 + crypto/openssl/test/certs/ca-cert-768i.pem | 15 + crypto/openssl/test/certs/ca-cert-ec-explicit.pem | 19 + crypto/openssl/test/certs/ca-cert-ec-named.pem | 14 + crypto/openssl/test/certs/ca-cert-md5-any.pem | 19 + crypto/openssl/test/certs/ca-cert-md5.pem | 18 + crypto/openssl/test/certs/ca-cert.pem | 18 + crypto/openssl/test/certs/ca-cert2.pem | 18 + crypto/openssl/test/certs/ca-clientAuth.pem | 18 + crypto/openssl/test/certs/ca-expired.pem | 18 + crypto/openssl/test/certs/ca-key-768.pem | 13 + crypto/openssl/test/certs/ca-key-ec-explicit.pem | 10 + crypto/openssl/test/certs/ca-key-ec-named.pem | 5 + crypto/openssl/test/certs/ca-key.pem | 28 + crypto/openssl/test/certs/ca-key2.pem | 28 + crypto/openssl/test/certs/ca-name2.pem | 19 + crypto/openssl/test/certs/ca-nonbc.pem | 18 + crypto/openssl/test/certs/ca-nonca.pem | 19 + crypto/openssl/test/certs/ca-pol-cert.pem | 19 + crypto/openssl/test/certs/ca-pss-cert.pem | 21 + crypto/openssl/test/certs/ca-pss-key.pem | 28 + crypto/openssl/test/certs/ca-root2.pem | 18 + crypto/openssl/test/certs/ca-serverAuth.pem | 18 + crypto/openssl/test/certs/cca+anyEKU.pem | 19 + crypto/openssl/test/certs/cca+clientAuth.pem | 19 + crypto/openssl/test/certs/cca+serverAuth.pem | 19 + crypto/openssl/test/certs/cca-anyEKU.pem | 19 + crypto/openssl/test/certs/cca-cert.pem | 19 + crypto/openssl/test/certs/cca-clientAuth.pem | 19 + crypto/openssl/test/certs/cca-serverAuth.pem | 19 + crypto/openssl/test/certs/cert-key-cert.pem | 90 + crypto/openssl/test/certs/client-ed25519-cert.pem | 32 + crypto/openssl/test/certs/client-ed25519-key.pem | 3 + crypto/openssl/test/certs/client-ed448-cert.pem | 15 + crypto/openssl/test/certs/client-ed448-key.pem | 4 + crypto/openssl/test/certs/croot+anyEKU.pem | 19 + crypto/openssl/test/certs/croot+clientAuth.pem | 19 + crypto/openssl/test/certs/croot+serverAuth.pem | 19 + crypto/openssl/test/certs/croot-anyEKU.pem | 19 + crypto/openssl/test/certs/croot-cert.pem | 19 + crypto/openssl/test/certs/croot-clientAuth.pem | 19 + crypto/openssl/test/certs/croot-serverAuth.pem | 19 + crypto/openssl/test/certs/cross-key.pem | 28 + crypto/openssl/test/certs/cross-root.pem | 18 + crypto/openssl/test/certs/ct-server-key-public.pem | 4 + crypto/openssl/test/certs/ct-server-key.pem | 5 + crypto/openssl/test/certs/cyrillic.msb | 79 + crypto/openssl/test/certs/cyrillic.pem | 22 + crypto/openssl/test/certs/cyrillic.utf8 | 79 + crypto/openssl/test/certs/cyrillic_crl.pem | 13 + crypto/openssl/test/certs/cyrillic_crl.utf8 | 40 + crypto/openssl/test/certs/dhk2048.pem | 14 + crypto/openssl/test/certs/dhp2048.pem | 8 + .../openssl/test/certs/ec_privkey_with_chain.pem | 74 + crypto/openssl/test/certs/ee+clientAuth.pem | 20 + crypto/openssl/test/certs/ee+serverAuth.pem | 20 + crypto/openssl/test/certs/ee-cert-1024.pem | 16 + crypto/openssl/test/certs/ee-cert-3072.pem | 22 + crypto/openssl/test/certs/ee-cert-4096.pem | 25 + crypto/openssl/test/certs/ee-cert-768.pem | 16 + crypto/openssl/test/certs/ee-cert-768i.pem | 16 + crypto/openssl/test/certs/ee-cert-8192.pem | 35 + .../test/certs/ee-cert-crit-unknown-ext.pem | 20 + crypto/openssl/test/certs/ee-cert-ec-explicit.pem | 16 + .../test/certs/ee-cert-ec-named-explicit.pem | 11 + .../openssl/test/certs/ee-cert-ec-named-named.pem | 11 + crypto/openssl/test/certs/ee-cert-md5.pem | 19 + .../test/certs/ee-cert-noncrit-unknown-ext.pem | 20 + crypto/openssl/test/certs/ee-cert-ocsp-nocheck.pem | 20 + crypto/openssl/test/certs/ee-cert-policies-bad.pem | 20 + crypto/openssl/test/certs/ee-cert-policies.pem | 20 + crypto/openssl/test/certs/ee-cert.pem | 19 + crypto/openssl/test/certs/ee-cert2.pem | 19 + crypto/openssl/test/certs/ee-client-chain.pem | 37 + crypto/openssl/test/certs/ee-client.pem | 19 + crypto/openssl/test/certs/ee-clientAuth.pem | 20 + .../openssl/test/certs/ee-ecdsa-client-chain.pem | 33 + crypto/openssl/test/certs/ee-ecdsa-key.pem | 5 + crypto/openssl/test/certs/ee-ed25519.pem | 38 + crypto/openssl/test/certs/ee-expired.pem | 19 + crypto/openssl/test/certs/ee-key-1024.pem | 16 + crypto/openssl/test/certs/ee-key-3072.pem | 40 + crypto/openssl/test/certs/ee-key-4096.pem | 52 + crypto/openssl/test/certs/ee-key-768.pem | 13 + crypto/openssl/test/certs/ee-key-8192.pem | 100 + crypto/openssl/test/certs/ee-key-ec-explicit.pem | 10 + .../test/certs/ee-key-ec-named-explicit.pem | 5 + .../openssl/test/certs/ee-key-ec-named-named.pem | 5 + crypto/openssl/test/certs/ee-key.pem | 28 + crypto/openssl/test/certs/ee-name2.pem | 19 + crypto/openssl/test/certs/ee-pathlen.pem | 18 + crypto/openssl/test/certs/ee-pss-cert.pem | 21 + crypto/openssl/test/certs/ee-pss-sha1-cert.pem | 19 + crypto/openssl/test/certs/ee-pss-sha256-cert.pem | 21 + crypto/openssl/test/certs/ee-pss-wrong1.5-cert.pem | 19 + crypto/openssl/test/certs/ee-self-signed.pem | 18 + crypto/openssl/test/certs/ee-serverAuth.pem | 20 + .../openssl/test/certs/ee-ss-with-keyCertSign.pem | 19 + crypto/openssl/test/certs/embeddedSCTs1-key.pem | 27 + crypto/openssl/test/certs/embeddedSCTs1.pem | 24 + crypto/openssl/test/certs/embeddedSCTs1.sct | 12 + crypto/openssl/test/certs/embeddedSCTs1.tlssct | Bin 0 -> 118 bytes .../test/certs/embeddedSCTs1_issuer-key.pem | 27 + crypto/openssl/test/certs/embeddedSCTs1_issuer.pem | 23 + crypto/openssl/test/certs/embeddedSCTs3.pem | 44 + crypto/openssl/test/certs/embeddedSCTs3.sct | 36 + crypto/openssl/test/certs/embeddedSCTs3_issuer.pem | 35 + crypto/openssl/test/certs/ext-check.csr | 18 + crypto/openssl/test/certs/fake-gp.pem | 36 + crypto/openssl/test/certs/goodcn1-cert.pem | 22 + crypto/openssl/test/certs/goodcn1-key.pem | 28 + crypto/openssl/test/certs/goodcn2-cert.pem | 19 + crypto/openssl/test/certs/goodcn2-chain.pem | 40 + crypto/openssl/test/certs/goodcn2-key.pem | 28 + crypto/openssl/test/certs/grfc.pem | 30 + crypto/openssl/test/certs/interCA.key | 27 + crypto/openssl/test/certs/interCA.pem | 21 + crypto/openssl/test/certs/invalid-cert.pem | 19 + crypto/openssl/test/certs/key-pass-12345.pem | 30 + crypto/openssl/test/certs/leaf-chain.pem | 84 + crypto/openssl/test/certs/leaf-encrypted.key | 30 + crypto/openssl/test/certs/leaf.key | 27 + crypto/openssl/test/certs/leaf.pem | 21 + crypto/openssl/test/certs/many-constraints.pem | 292 + crypto/openssl/test/certs/many-names1.pem | 409 + crypto/openssl/test/certs/many-names2.pem | 251 + crypto/openssl/test/certs/many-names3.pem | 571 + crypto/openssl/test/certs/mkcert.sh | 411 + crypto/openssl/test/certs/nca+anyEKU.pem | 19 + crypto/openssl/test/certs/nca+serverAuth.pem | 19 + crypto/openssl/test/certs/ncca-cert.pem | 21 + crypto/openssl/test/certs/ncca-key.pem | 28 + crypto/openssl/test/certs/ncca1-cert.pem | 21 + crypto/openssl/test/certs/ncca1-key.pem | 28 + crypto/openssl/test/certs/ncca2-cert.pem | 20 + crypto/openssl/test/certs/ncca2-key.pem | 28 + crypto/openssl/test/certs/ncca3-cert.pem | 20 + crypto/openssl/test/certs/ncca3-key.pem | 28 + crypto/openssl/test/certs/nccaothername-cert.pem | 20 + crypto/openssl/test/certs/nccaothername-key.pem | 28 + crypto/openssl/test/certs/nroot+anyEKU.pem | 19 + crypto/openssl/test/certs/nroot+serverAuth.pem | 19 + crypto/openssl/test/certs/p256-server-cert.pem | 12 + crypto/openssl/test/certs/p256-server-key.pem | 5 + crypto/openssl/test/certs/p384-root-key.pem | 6 + crypto/openssl/test/certs/p384-root.pem | 12 + crypto/openssl/test/certs/p384-server-cert.pem | 13 + crypto/openssl/test/certs/p384-server-key.pem | 6 + crypto/openssl/test/certs/pathlen.pem | 22 + crypto/openssl/test/certs/pc1-cert.pem | 20 + crypto/openssl/test/certs/pc1-key.pem | 28 + crypto/openssl/test/certs/pc2-cert.pem | 21 + crypto/openssl/test/certs/pc2-key.pem | 28 + crypto/openssl/test/certs/pc5-cert.pem | 21 + crypto/openssl/test/certs/pc5-key.pem | 28 + crypto/openssl/test/certs/pkitsta.pem | 20 + crypto/openssl/test/certs/root+anyEKU.pem | 18 + crypto/openssl/test/certs/root+clientAuth.pem | 19 + crypto/openssl/test/certs/root+serverAuth.pem | 19 + crypto/openssl/test/certs/root-anyEKU.pem | 18 + crypto/openssl/test/certs/root-cert-768.pem | 12 + crypto/openssl/test/certs/root-cert-md5.pem | 19 + crypto/openssl/test/certs/root-cert-rsa2.pem | 18 + crypto/openssl/test/certs/root-cert.pem | 19 + crypto/openssl/test/certs/root-cert2.pem | 19 + crypto/openssl/test/certs/root-clientAuth.pem | 19 + crypto/openssl/test/certs/root-cross-cert.pem | 18 + crypto/openssl/test/certs/root-ed25519.pem | 40 + crypto/openssl/test/certs/root-ed25519.privkey.pem | 3 + crypto/openssl/test/certs/root-ed25519.pubkey.pem | 3 + crypto/openssl/test/certs/root-ed448-cert.pem | 11 + crypto/openssl/test/certs/root-ed448-key.pem | 4 + crypto/openssl/test/certs/root-expired.pem | 19 + crypto/openssl/test/certs/root-key-768.pem | 13 + crypto/openssl/test/certs/root-key.pem | 28 + crypto/openssl/test/certs/root-key2.pem | 28 + crypto/openssl/test/certs/root-name2.pem | 19 + crypto/openssl/test/certs/root-nonca.pem | 19 + crypto/openssl/test/certs/root-noserver.pem | 19 + crypto/openssl/test/certs/root-serverAuth.pem | 19 + crypto/openssl/test/certs/root2+clientAuth.pem | 19 + crypto/openssl/test/certs/root2+serverAuth.pem | 19 + crypto/openssl/test/certs/root2-serverAuth.pem | 19 + crypto/openssl/test/certs/rootCA.key | 27 + crypto/openssl/test/certs/rootCA.pem | 79 + crypto/openssl/test/certs/rootcert.pem | 18 + crypto/openssl/test/certs/rootkey.pem | 28 + crypto/openssl/test/certs/roots.pem | 42 + crypto/openssl/test/certs/sca+anyEKU.pem | 19 + crypto/openssl/test/certs/sca+clientAuth.pem | 19 + crypto/openssl/test/certs/sca+serverAuth.pem | 19 + crypto/openssl/test/certs/sca-anyEKU.pem | 19 + crypto/openssl/test/certs/sca-cert.pem | 19 + crypto/openssl/test/certs/sca-clientAuth.pem | 19 + crypto/openssl/test/certs/sca-serverAuth.pem | 19 + crypto/openssl/test/certs/server-cecdsa-cert.pem | 15 + crypto/openssl/test/certs/server-cecdsa-key.pem | 4 + crypto/openssl/test/certs/server-dsa-cert.pem | 31 + crypto/openssl/test/certs/server-dsa-key.pem | 15 + crypto/openssl/test/certs/server-dsa-pubkey.pem | 20 + .../certs/server-ecdsa-brainpoolP256r1-cert.pem | 16 + .../certs/server-ecdsa-brainpoolP256r1-key.pem | 5 + crypto/openssl/test/certs/server-ecdsa-cert.pem | 15 + crypto/openssl/test/certs/server-ecdsa-key.pem | 5 + crypto/openssl/test/certs/server-ed25519-cert.pem | 14 + crypto/openssl/test/certs/server-ed25519-key.pem | 3 + crypto/openssl/test/certs/server-ed448-cert.pem | 11 + crypto/openssl/test/certs/server-ed448-key.pem | 4 + crypto/openssl/test/certs/server-pss-cert.pem | 19 + crypto/openssl/test/certs/server-pss-key.pem | 28 + .../test/certs/server-pss-restrict-cert.pem | 21 + .../openssl/test/certs/server-pss-restrict-key.pem | 29 + crypto/openssl/test/certs/server-trusted.pem | 20 + crypto/openssl/test/certs/servercert.pem | 19 + crypto/openssl/test/certs/serverkey.pem | 28 + crypto/openssl/test/certs/setup.sh | 448 + crypto/openssl/test/certs/sm2-ca-cert.pem | 14 + crypto/openssl/test/certs/sm2-csr.pem | 9 + crypto/openssl/test/certs/sm2-pub.key | 4 + crypto/openssl/test/certs/sm2-root.crt | 14 + crypto/openssl/test/certs/sm2-root.key | 5 + crypto/openssl/test/certs/sm2.key | 5 + crypto/openssl/test/certs/sm2.pem | 14 + crypto/openssl/test/certs/some-names1.pem | 211 + crypto/openssl/test/certs/some-names2.pem | 133 + crypto/openssl/test/certs/some-names3.pem | 293 + crypto/openssl/test/certs/sroot+anyEKU.pem | 19 + crypto/openssl/test/certs/sroot+clientAuth.pem | 19 + crypto/openssl/test/certs/sroot+serverAuth.pem | 19 + crypto/openssl/test/certs/sroot-anyEKU.pem | 19 + crypto/openssl/test/certs/sroot-cert.pem | 19 + crypto/openssl/test/certs/sroot-clientAuth.pem | 19 + crypto/openssl/test/certs/sroot-serverAuth.pem | 19 + crypto/openssl/test/certs/subinterCA-ss.pem | 21 + crypto/openssl/test/certs/subinterCA.key | 27 + crypto/openssl/test/certs/subinterCA.pem | 21 + crypto/openssl/test/certs/untrusted.pem | 42 + crypto/openssl/test/certs/v3-certs-RC2.p12 | Bin 0 -> 1568 bytes crypto/openssl/test/certs/v3-certs-TDES.p12 | Bin 0 -> 1568 bytes crypto/openssl/test/certs/wrongcert.pem | 19 + crypto/openssl/test/certs/wrongkey.pem | 28 + crypto/openssl/test/certs/x509-check-key.pem | 28 + crypto/openssl/test/certs/x509-check.csr | 15 + crypto/openssl/test/chacha_internal_test.c | 190 + crypto/openssl/test/cipher_overhead_test.c | 62 + crypto/openssl/test/cipherbytes_test.c | 149 + crypto/openssl/test/cipherlist_test.c | 253 + crypto/openssl/test/ciphername_test.c | 470 + crypto/openssl/test/clienthellotest.c | 269 + crypto/openssl/test/cmactest.c | 216 + crypto/openssl/test/cmp_asn_test.c | 136 + crypto/openssl/test/cmp_client_test.c | 555 + crypto/openssl/test/cmp_ctx_test.c | 896 + crypto/openssl/test/cmp_hdr_test.c | 494 + crypto/openssl/test/cmp_msg_test.c | 598 + crypto/openssl/test/cmp_protect_test.c | 621 + crypto/openssl/test/cmp_server_test.c | 172 + crypto/openssl/test/cmp_status_test.c | 112 + crypto/openssl/test/cmp_vfy_test.c | 706 + crypto/openssl/test/cms-examples.pl | 365 + crypto/openssl/test/cmsapitest.c | 412 + crypto/openssl/test/conf_include_test.c | 238 + crypto/openssl/test/confdump.c | 51 + crypto/openssl/test/constant_time_test.c | 414 + crypto/openssl/test/context_internal_test.c | 137 + crypto/openssl/test/crltest.c | 413 + crypto/openssl/test/ct/log_list.cnf | 41 + crypto/openssl/test/ct/tls1.sct | 12 + crypto/openssl/test/ct_test.c | 527 + crypto/openssl/test/ctype_internal_test.c | 90 + crypto/openssl/test/curve448_internal_test.c | 737 + crypto/openssl/test/d2i-tests/bad-cms.der | 1 + crypto/openssl/test/d2i-tests/bad-int-pad0.der | Bin 0 -> 4 bytes .../openssl/test/d2i-tests/bad-int-padminus1.der | 1 + crypto/openssl/test/d2i-tests/bad_bio.der | Bin 0 -> 7 bytes crypto/openssl/test/d2i-tests/bad_cert.der | Bin 0 -> 1007 bytes crypto/openssl/test/d2i-tests/bad_generalname.der | 1 + crypto/openssl/test/d2i-tests/high_tag.der | Bin 0 -> 6 bytes crypto/openssl/test/d2i-tests/int0.der | Bin 0 -> 3 bytes crypto/openssl/test/d2i-tests/int1.der | 1 + crypto/openssl/test/d2i-tests/intminus1.der | 1 + crypto/openssl/test/d2i_test.c | 169 + crypto/openssl/test/dane-cross.in | 113 + crypto/openssl/test/danetest.c | 430 + crypto/openssl/test/danetest.in | 2007 + crypto/openssl/test/danetest.pem | 14 + crypto/openssl/test/data.bin | 4 + crypto/openssl/test/data2.bin | 61 + crypto/openssl/test/default-and-fips.cnf | 16 + crypto/openssl/test/default-and-legacy.cnf | 17 + crypto/openssl/test/default.cnf | 13 + crypto/openssl/test/defltfips_test.c | 108 + crypto/openssl/test/destest.c | 895 + crypto/openssl/test/dhtest.c | 954 + crypto/openssl/test/drbgtest.c | 906 + crypto/openssl/test/dsa_no_digest_size_test.c | 251 + crypto/openssl/test/dsatest.c | 501 + crypto/openssl/test/dtls_mtu_test.c | 242 + crypto/openssl/test/dtlstest.c | 612 + crypto/openssl/test/dtlsv1listentest.c | 357 + crypto/openssl/test/ec_internal_test.c | 462 + crypto/openssl/test/ecdsatest.c | 399 + crypto/openssl/test/ecdsatest.h | 10214 +++ crypto/openssl/test/ecstresstest.c | 156 + crypto/openssl/test/ectest.c | 3044 + crypto/openssl/test/endecode_test.c | 1502 + crypto/openssl/test/endecoder_legacy_test.c | 731 + crypto/openssl/test/enginetest.c | 465 + crypto/openssl/test/errtest.c | 348 + crypto/openssl/test/evp_extra_test.c | 5480 ++ crypto/openssl/test/evp_extra_test2.c | 1295 + crypto/openssl/test/evp_fetch_prov_test.c | 392 + crypto/openssl/test/evp_kdf_test.c | 1738 + crypto/openssl/test/evp_libctx_test.c | 766 + crypto/openssl/test/evp_pkey_ctx_new_from_name.c | 14 + crypto/openssl/test/evp_pkey_dparams_test.c | 324 + crypto/openssl/test/evp_pkey_provided_test.c | 1786 + crypto/openssl/test/evp_test.c | 4174 + crypto/openssl/test/exdatatest.c | 319 + crypto/openssl/test/exptest.c | 337 + crypto/openssl/test/ext_internal_test.c | 105 + crypto/openssl/test/fake_rsaprov.c | 531 + crypto/openssl/test/fake_rsaprov.h | 15 + crypto/openssl/test/fatalerrtest.c | 101 + crypto/openssl/test/ffc_internal_test.c | 711 + crypto/openssl/test/filterprov.c | 238 + crypto/openssl/test/filterprov.h | 14 + crypto/openssl/test/fips-alt.cnf | 16 + crypto/openssl/test/fips-and-base.cnf | 16 + crypto/openssl/test/fips.cnf | 19 + crypto/openssl/test/fips_version_test.c | 78 + crypto/openssl/test/generate_buildtest.pl | 34 + crypto/openssl/test/generate_ssl_tests.pl | 155 + crypto/openssl/test/gmdifftest.c | 67 + crypto/openssl/test/helpers/cmp_testlib.c | 81 + crypto/openssl/test/helpers/cmp_testlib.h | 32 + crypto/openssl/test/helpers/handshake.c | 1750 + crypto/openssl/test/helpers/handshake.h | 98 + crypto/openssl/test/helpers/handshake_srp.c | 87 + crypto/openssl/test/helpers/pkcs12.c | 789 + crypto/openssl/test/helpers/pkcs12.h | 103 + crypto/openssl/test/helpers/predefined_dhparams.c | 194 + crypto/openssl/test/helpers/predefined_dhparams.h | 18 + crypto/openssl/test/helpers/ssl_test_ctx.c | 903 + crypto/openssl/test/helpers/ssl_test_ctx.h | 259 + crypto/openssl/test/helpers/ssltestlib.c | 1184 + crypto/openssl/test/helpers/ssltestlib.h | 62 + crypto/openssl/test/hexstr_test.c | 134 + crypto/openssl/test/hmactest.c | 302 + crypto/openssl/test/http_test.c | 395 + crypto/openssl/test/ideatest.c | 126 + crypto/openssl/test/igetest.c | 462 + crypto/openssl/test/insta.priv.pem | 27 + crypto/openssl/test/insta_ca.cert.pem | 22 + crypto/openssl/test/invalid-x509.cnf | 6 + crypto/openssl/test/keymgmt_internal_test.c | 358 + crypto/openssl/test/legacy.cnf | 13 + crypto/openssl/test/lhash_test.c | 249 + crypto/openssl/test/localetest.c | 136 + crypto/openssl/test/mdc2_internal_test.c | 77 + crypto/openssl/test/mdc2test.c | 95 + crypto/openssl/test/memleaktest.c | 62 + crypto/openssl/test/modes_internal_test.c | 899 + crypto/openssl/test/moduleloadtest.c | 53 + crypto/openssl/test/namemap_internal_test.c | 183 + crypto/openssl/test/nodefltctxtest.c | 60 + crypto/openssl/test/null.cnf | 13 + crypto/openssl/test/ocsp-tests/D1.ors | 32 + crypto/openssl/test/ocsp-tests/D1_Cert_EE.pem | 38 + crypto/openssl/test/ocsp-tests/D1_Issuer_ICA.pem | 27 + crypto/openssl/test/ocsp-tests/D2.ors | 32 + crypto/openssl/test/ocsp-tests/D2_Cert_ICA.pem | 26 + crypto/openssl/test/ocsp-tests/D2_Issuer_Root.pem | 21 + crypto/openssl/test/ocsp-tests/D3.ors | 38 + crypto/openssl/test/ocsp-tests/D3_Cert_EE.pem | 31 + crypto/openssl/test/ocsp-tests/D3_Issuer_Root.pem | 83 + crypto/openssl/test/ocsp-tests/ISDOSC_D1.ors | 32 + crypto/openssl/test/ocsp-tests/ISDOSC_D2.ors | 32 + crypto/openssl/test/ocsp-tests/ISDOSC_D3.ors | 38 + .../openssl/test/ocsp-tests/ISIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/ISIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/ISIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/ISIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/ISIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/ISIC_ND3_Issuer_Root.pem | 25 + crypto/openssl/test/ocsp-tests/ISOP_D1.ors | 32 + crypto/openssl/test/ocsp-tests/ISOP_D2.ors | 32 + crypto/openssl/test/ocsp-tests/ISOP_D3.ors | 38 + crypto/openssl/test/ocsp-tests/ISOP_ND1.ors | 10 + crypto/openssl/test/ocsp-tests/ISOP_ND2.ors | 10 + crypto/openssl/test/ocsp-tests/ISOP_ND3.ors | 10 + crypto/openssl/test/ocsp-tests/ND1.ors | 10 + crypto/openssl/test/ocsp-tests/ND1_Cert_EE.pem | 36 + crypto/openssl/test/ocsp-tests/ND1_Cross_Root.pem | 25 + .../test/ocsp-tests/ND1_Issuer_ICA-Cross.pem | 58 + crypto/openssl/test/ocsp-tests/ND1_Issuer_ICA.pem | 29 + crypto/openssl/test/ocsp-tests/ND2.ors | 10 + crypto/openssl/test/ocsp-tests/ND2_Cert_ICA.pem | 29 + crypto/openssl/test/ocsp-tests/ND2_Issuer_Root.pem | 23 + crypto/openssl/test/ocsp-tests/ND3.ors | 10 + crypto/openssl/test/ocsp-tests/ND3_Cert_EE.pem | 34 + crypto/openssl/test/ocsp-tests/ND3_Issuer_Root.pem | 25 + crypto/openssl/test/ocsp-tests/WIKH_D1.ors | 32 + crypto/openssl/test/ocsp-tests/WIKH_D2.ors | 32 + crypto/openssl/test/ocsp-tests/WIKH_D3.ors | 38 + crypto/openssl/test/ocsp-tests/WIKH_ND1.ors | 10 + crypto/openssl/test/ocsp-tests/WIKH_ND2.ors | 10 + crypto/openssl/test/ocsp-tests/WIKH_ND3.ors | 10 + crypto/openssl/test/ocsp-tests/WINH_D1.ors | 32 + crypto/openssl/test/ocsp-tests/WINH_D2.ors | 32 + crypto/openssl/test/ocsp-tests/WINH_D3.ors | 38 + crypto/openssl/test/ocsp-tests/WINH_ND1.ors | 10 + crypto/openssl/test/ocsp-tests/WINH_ND2.ors | 10 + crypto/openssl/test/ocsp-tests/WINH_ND3.ors | 10 + crypto/openssl/test/ocsp-tests/WKDOSC_D1.ors | 32 + crypto/openssl/test/ocsp-tests/WKDOSC_D2.ors | 32 + crypto/openssl/test/ocsp-tests/WKDOSC_D3.ors | 38 + .../openssl/test/ocsp-tests/WKIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/WKIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/WKIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/WKIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/WKIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/WKIC_ND3_Issuer_Root.pem | 25 + crypto/openssl/test/ocsp-tests/WRID_D1.ors | 32 + crypto/openssl/test/ocsp-tests/WRID_D2.ors | 32 + crypto/openssl/test/ocsp-tests/WRID_D3.ors | 38 + crypto/openssl/test/ocsp-tests/WRID_ND1.ors | 10 + crypto/openssl/test/ocsp-tests/WRID_ND2.ors | 10 + crypto/openssl/test/ocsp-tests/WRID_ND3.ors | 10 + .../test/ocsp-tests/WSNIC_D1_Issuer_ICA.pem | 27 + .../test/ocsp-tests/WSNIC_D2_Issuer_Root.pem | 21 + .../test/ocsp-tests/WSNIC_D3_Issuer_Root.pem | 41 + .../test/ocsp-tests/WSNIC_ND1_Issuer_ICA.pem | 29 + .../test/ocsp-tests/WSNIC_ND2_Issuer_Root.pem | 23 + .../test/ocsp-tests/WSNIC_ND3_Issuer_Root.pem | 25 + crypto/openssl/test/ocspapitest.c | 236 + crypto/openssl/test/ossl_store_test.c | 238 + crypto/openssl/test/p_minimal.c | 24 + crypto/openssl/test/p_test.c | 320 + crypto/openssl/test/packettest.c | 499 + crypto/openssl/test/param_build_test.c | 535 + crypto/openssl/test/params_api_test.c | 714 + crypto/openssl/test/params_conversion_test.c | 368 + crypto/openssl/test/params_test.c | 712 + crypto/openssl/test/pbelutest.c | 50 + crypto/openssl/test/pbetest.c | 167 + crypto/openssl/test/pem_read_depr_test.c | 216 + crypto/openssl/test/pemtest.c | 167 + crypto/openssl/test/pkcs12_format_test.c | 961 + crypto/openssl/test/pkcs7-1.pem | 15 + crypto/openssl/test/pkcs7.pem | 54 + crypto/openssl/test/pkcs7_test.c | 103 + crypto/openssl/test/pkey_meth_kdf_test.c | 204 + crypto/openssl/test/pkey_meth_test.c | 90 + crypto/openssl/test/pkits-test.pl | 905 + crypto/openssl/test/poly1305_internal_test.c | 1575 + crypto/openssl/test/property_test.c | 676 + crypto/openssl/test/prov_config_test.c | 91 + crypto/openssl/test/provfetchtest.c | 297 + crypto/openssl/test/provider_fallback_test.c | 57 + crypto/openssl/test/provider_internal_test.c | 151 + crypto/openssl/test/provider_internal_test.cnf.in | 16 + crypto/openssl/test/provider_pkey_test.c | 308 + crypto/openssl/test/provider_status_test.c | 245 + crypto/openssl/test/provider_test.c | 270 + crypto/openssl/test/proxy.cnf | 60 + crypto/openssl/test/punycode_test.c | 220 + crypto/openssl/test/rand_status_test.c | 27 + crypto/openssl/test/rand_test.c | 53 + crypto/openssl/test/rc2test.c | 74 + crypto/openssl/test/rc4test.c | 134 + crypto/openssl/test/rc5test.c | 243 + crypto/openssl/test/rdrand_sanitytest.c | 122 + .../openssl/test/recipes/00-prep_fipsmodule_cnf.t | 36 + crypto/openssl/test/recipes/01-test_abort.t | 16 + .../openssl/test/recipes/01-test_fipsmodule_cnf.t | 37 + crypto/openssl/test/recipes/01-test_sanity.t | 12 + .../openssl/test/recipes/01-test_symbol_presence.t | 157 + crypto/openssl/test/recipes/01-test_test.t | 12 + crypto/openssl/test/recipes/02-test_errstr.t | 163 + .../test/recipes/02-test_internal_context.t | 16 + .../openssl/test/recipes/02-test_internal_ctype.t | 17 + .../openssl/test/recipes/02-test_internal_exts.t | 15 + .../test/recipes/02-test_internal_keymgmt.t | 21 + .../test/recipes/02-test_internal_provider.t | 19 + crypto/openssl/test/recipes/02-test_lhash.t | 12 + crypto/openssl/test/recipes/02-test_localetest.t | 26 + crypto/openssl/test/recipes/02-test_ordinals.t | 61 + crypto/openssl/test/recipes/02-test_sparse_array.t | 12 + crypto/openssl/test/recipes/02-test_stack.t | 12 + crypto/openssl/test/recipes/03-test_exdata.t | 12 + crypto/openssl/test/recipes/03-test_fipsinstall.t | 310 + .../openssl/test/recipes/03-test_internal_asn1.t | 16 + .../test/recipes/03-test_internal_asn1_dsa.t | 16 + crypto/openssl/test/recipes/03-test_internal_bn.t | 19 + .../openssl/test/recipes/03-test_internal_chacha.t | 16 + .../test/recipes/03-test_internal_curve448.t | 19 + crypto/openssl/test/recipes/03-test_internal_ec.t | 19 + *** 10642 LINES SKIPPED *** From nobody Fri Feb 2 21:50:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRTwF3lHPz58Lvy; Fri, 2 Feb 2024 21:50: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 4TRTwF3FXJz3wwT; Fri, 2 Feb 2024 21:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706910621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zURFpwKyBZyom7UptR10Uo6rDCnhGA0i9ZgJthPfY8=; b=sjAHoybF9KTEOEVOUA/lu74owRXsd1pxXnhlh99OcLX5B5E3pEm10NfKqyc0/AuZNyviQg y8U/IrhlPccCO45bS/J81U0KPgcuRsFRPdNXup1LX8fBknKs2ZsaQVjaGfQZzYZR7so12X yCyi4jQDxZW9ycVG11CQ/DlGVBjvEbRR2e72ONXJcN/KPMb3lO/BeRgsLiPEfrPBWX+t8e eWlsT/zp6b8N0AU9jsX3Tr5dJTKhRJUixcelv2UqXFbFuOLoDfJbkf2PPaB4XRFSG4/mfC Bte+VM6qyB+x5XU9rq382URUeVqRMNKtUO3JSouPIed4Fy/rfHDp99fqlsM9FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706910621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zURFpwKyBZyom7UptR10Uo6rDCnhGA0i9ZgJthPfY8=; b=Kp6HRCIn47vPuos/JH61yIZ4c2OlYgmEthzKTZIiIrVsfmaCkQQZO2yZ3Tn7hHzlRa34LN ffVGw2UT78olFejxcHzMf1kLs7sIHUSMHDyfxuYi+uM4xZy2QofvVnB+KIzbQzGbOTkSwr pOlYdOUYJ3VmTuoyb9Mv5+15SuUKQzcKPcc/TZq8Fk2TWhrnpfB+liEXyNxviO/TB57etz eYLq26Nnr1iVE97hSjb5hktZJnA7rXTbwXEAOvd/egDQznFtAYrwCuEq3rDuVLkece4yek RmWpnbXW8S9b2At74TvdzOwrd40pg2eNbfCLcA+BbpsWCLoEbHCP3qA21Fdj6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706910621; a=rsa-sha256; cv=none; b=LkcREtr5zRrEtS5AkmIGOEOzAIWAfUY6omARX9syfQx0jzf7qAgMBSHzKrhveTs/x5j1nA tkmUD4XzF3rVthzB1nyPguPaj2K/OzR0M9z2fRIKyrXztfA2HLEyMc+jPC4pQq5oV7K0GV /5z3No4s+xm+jJTeDd1PXzHFMvxOpN+mHW60aaxASrDytxWl0/LPMKovE7k6PLg2RASy6w NRAWxichpk6iktjjtlkM2d1tT2Qi5mdsezjn7ae+1rKuZ4/sx6jy5us+hmGDXvXydL/Yd8 bNEx+vBfEOmTuHZSqHwMgahPF5dL/tRwMCCTfEA4tK9Gl2RDO6v3Kssavnl5Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRTwF2JBxznN4; Fri, 2 Feb 2024 21:50: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 412LoLvY033210; Fri, 2 Feb 2024 21:50:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412LoLiw033207; Fri, 2 Feb 2024 21:50:21 GMT (envelope-from git) Date: Fri, 2 Feb 2024 21:50:21 GMT Message-Id: <202402022150.412LoLiw033207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0a49be722fe0 - main - traceroute6: remove -l flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a49be722fe0cf84c55eb148348499bf66de6ae7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0a49be722fe0cf84c55eb148348499bf66de6ae7 commit 0a49be722fe0cf84c55eb148348499bf66de6ae7 Author: Lexi Winter AuthorDate: 2024-02-02 21:46:14 +0000 Commit: Warner Losh CommitDate: 2024-02-02 21:49:13 +0000 traceroute6: remove -l flag The -l flag was used to tell traceroute6(8) to show both hostname and address for each hop. However, traceroute(8) already does this by default, and there's no reason for traceroute6 to behave differently. Make this the default behaviour, and accept -l for backward compatibility as a no-op flag. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1023 --- usr.sbin/traceroute6/traceroute6.8 | 11 ++--------- usr.sbin/traceroute6/traceroute6.c | 6 +----- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8 index 13917eb47c7f..1d71895fcde3 100644 --- a/usr.sbin/traceroute6/traceroute6.8 +++ b/usr.sbin/traceroute6/traceroute6.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 25, 2023 +.Dd February 2, 2024 .Dt TRACEROUTE6 8 .Os .\" @@ -120,14 +120,7 @@ tries to use routing headers. .It Fl I Use ICMP6 ECHO instead of UDP datagrams. .It Fl l -Print both host hostnames and numeric addresses. -Normally -.Nm -prints only hostnames if -.Fl n -is not specified, and only numeric addresses if -.Fl n -is specified. +Ignored for backward compatibility. .It Fl m Ar hoplimit Specify maximum hoplimit, up to 255. The default is the value of the diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 212564415d6c..15aab51ac234 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -339,7 +339,6 @@ static int verbose; static int waittime = 5; /* time to wait for response (in seconds) */ static int nflag; /* print addresses numerically */ static int useproto = IPPROTO_UDP; /* protocol to use to send packet */ -static int lflag; /* print both numerical address & hostname */ static int as_path; /* print as numbers for each hop */ static int ecnflag; /* ECN bleaching detection flag */ static char *as_server = NULL; @@ -462,7 +461,6 @@ main(int argc, char *argv[]) useproto = IPPROTO_ICMPV6; break; case 'l': - lflag++; break; case 'm': ep = NULL; @@ -1584,10 +1582,8 @@ print(struct msghdr *mhdr, int cc) printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6)); if (nflag) printf(" %s", hbuf); - else if (lflag) - printf(" %s (%s)", inetname((struct sockaddr *)from), hbuf); else - printf(" %s", inetname((struct sockaddr *)from)); + printf(" %s (%s)", inetname((struct sockaddr *)from), hbuf); if (verbose) { #ifdef OLDRAWSOCKET From nobody Fri Feb 2 22:45:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRW7d5qnPz58RZd; Fri, 2 Feb 2024 22:45:17 +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 4TRW7d5L5Qz43vP; Fri, 2 Feb 2024 22:45:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706913917; h=from:from:reply-to:subject: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=hMyHYFEMlJOXbcX1Iuob0Crz+j5lG6SVNgp7xpieu7s=; b=PlWbm47LffiORbqVKDpPpE4R+un3N5XsmSGaNlbqHXSdobqzkk1YhxebV2nNYxva+tVBrR 8vv9xKJXCI1wTFB5GSl3b2PS0jvrg8sLAZqzMNVDLGugjxwUZpkIvhV33t2TjKeMzljOW0 CtccgYayBouTene5tbY0EzZoHgX0hG2cP++izXktMG0hzm+6NbNgBs7ct99FQX/KS+haFn kpEka0SeuVXfiQ1MIFHAzPLbNR3F4BxipKibm0N1rbVsdiWUbzphH7rCTAtn0NyzHox/yr FoQbvQvmAlJ9Y5k542vfVYoRPqpXc/G46mfkuVfU4nLEAHBaV69kAhLTgQAD7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706913917; h=from:from:reply-to:subject: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=hMyHYFEMlJOXbcX1Iuob0Crz+j5lG6SVNgp7xpieu7s=; b=ERIZDqju5SBit62WCJSp4ZfLD9h46Na8OUmquJVgK+GxpXmTja2bvpv3lTVoWWvoo5AqaL BRCGA6ykbnkpLIombIhozCk988ISQaEb4dAuWN/h5kIPV0vTxx3jbvHgaufRRFEze6zUKU 58ULNkHQdykOUXOYGYa/OyXnQ29oLi8f0DiZPuBIpy6l+rJKEvw3tApdTIxYtGF3j0ptey pSb3SJktMYvwYwR98V171uMvPDV0cRMsWZ/AiKqfOslp4+5dOH9zN3Z1BDXu+OasBKDPLM Tjl38hgxwElWuIlMDmRxFC6l6XxZ9mzio1iXaD2yurfcnmEI86yzWZaRPo1arQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706913917; a=rsa-sha256; cv=none; b=dPoMcko+DgExCX2SZdVwtktf1d0SJbDFgcXBO+WDAc9yR8g9xG4Ci+T8oIze2JJ+uLPQIe sKIfuBbndg3ouMhylaaLvg9kDeQRgAxmpn5BRaoFnqHARkUPDxekiSVftoKiBYM71qLTbg 1Bkp8oEdfbqCehfQWz5MuXRJYbbBFEN/qICrtWvI1fQzyPgZbrCbLn1p5KKEB1y+1b/2hz SpZzHUq+TS0oFZ33RTnMbqlwNessoHigL1JGP+vpqUrrC5K6OU6gjTx9nWhCtkb4+Hb9YZ VMLonVXoXYJak7blP0HDETAv275odKctf1nuc2eijQ7LwHo+zmZ6iGCU0NVvIg== Received: from [IPV6:2601:644:9381:f410:95:7e4d:225c:f4e3] (unknown [IPv6:2601:644:9381:f410:95:7e4d:225c:f4e3]) (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 4TRW7d1DMGz133x; Fri, 2 Feb 2024 22:45:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Fri, 2 Feb 2024 14:45:15 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 834517eff8aa - main - x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402021959.412JxKop038336@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402021959.412JxKop038336@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/2/24 11:59 AM, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=834517eff8aaab46760645619b880d97f23ab61b > > commit 834517eff8aaab46760645619b880d97f23ab61b > Author: Mina Galić > AuthorDate: 2024-02-02 19:46:01 +0000 > Commit: Warner Losh > CommitDate: 2024-02-02 19:51:51 +0000 > > x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels > > we leave `options CAMDEBUG` enabled, so that when needed, CAM debugging > can be enabled *as needed*, rather than setting a default of everything. > > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/798 > --- Would it make sense to have a sys/conf/std.MMCCAM and the various GENERIC-MMCCAM could just be include GENERIC, ident, include std.MMCCAM? (Related, I wonder if we want to have std.DEBUG and std.NODEBUG for use in GENERIC and GENERIC-*DEBUG.) -- John Baldwin From nobody Fri Feb 2 22:50:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRWG11yCkz58SHp; Fri, 2 Feb 2024 22:50:49 +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 4TRWG11WmPz4435; Fri, 2 Feb 2024 22:50:49 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914249; 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=lipqScqZTzGMvjUeoI1ChYTUpWOKSDsrvYUhgDBJNK4=; b=nL1mG7QMuASWfawjWvWa72DRAkv47jX4owseqqb6jRxIxJPajver/KvF0EhSP59dXAHnfE +zJqB9AEk8Ojjpc24mOl7OeyaqoXq/5G90i20I+HwaeZtn3w6QvbsQTGlhB2cNigWXR3Ar ByTdQAhjT9DT5ePLUZy0VkHAYb+LD6ZoUUtIIYTBelqq+qLb/UCFiLCsGfaainwntiO+Dq AvSD2BeCwCe5HcXscvhKaYduCQ8t2ZhTxsPl5kdBrBYL8iMfH4ArgEnneQBzJf0tYtzZV5 Oa/lyLqVY+uL78VsJMwZvuYLeR6gh31QoqqslJQvU6VJNrijIdbf0pciRYLFbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914249; 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=lipqScqZTzGMvjUeoI1ChYTUpWOKSDsrvYUhgDBJNK4=; b=PMMt5lxJMveBb/QrFX/UPyMVVK+LTOSWeZs0Uk6/0X6mKS4bakZbI/5+I3f4Y6nstjAAEC elZPKqatkmu+83mnqurCK40lgqxJywVM/flvwB+/uMkghVRpUK5gOUKAX7z7ELccKfaOul /3N28+QSPeIfRumN2tl0fVADwTo003r12Wq3/EG4cWaWXZtz+SmqKPsMeSXaNM+FAsZTSC X4Lk3X/lIhKPglTzkwR0HztmAkyp2GVml8laGgb9wZsqxsVjOFYMLSOCgDblrKtOsXTGH1 BrfRnqspl0EwMBHxYlWyCtDWSO1X7hIQyINS0toqKZnb5XK0rqp7EdlvD0CLsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706914249; a=rsa-sha256; cv=none; b=nLiZ580XGJVZ4CForp4gbmju0Kb/ULc3u3K3pkLI1b26ISL/TIpXU+SeYTvYV/m8S7/z9b 73e0XjLbO2JFNQYwB/EhK1x0otaEm9I9De/x6N0FfoRZY3OggixPnAxOx/K0FlENCaEwhB kwz1YQNnwsaI06BYpEzmZuXb22du8vq2hn3/d6DhekEuyA4wvhLsjh92179YlpAPjlWLvi ekM9NsYeUjMp7e6svekDNKzy4TSmqhOgXUIa0puNDsyNh98ZtUtTu+2LDJ5vg8W5ZCfQ2k gMzsjjTvvh9JTN7Ej6a9ECAj3c5xdDyD4LpXZpFwHHLAA3NusJlHMj2FHsDiHg== Received: from [IPV6:2601:644:9381:f410:565:ada1:a562:e4d2] (unknown [IPv6:2601:644:9381:f410:565:ada1:a562:e4d2]) (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 4TRWG04HFcz1349; Fri, 2 Feb 2024 22:50:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <5faea9f0-80f2-4d07-84e5-876ee54c1870@FreeBSD.org> Date: Fri, 2 Feb 2024 14:50:47 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 5fdf01dbeef1 - main - Revert "stand/lua: always allow overriding with local config files" Content-Language: en-US To: Warner Losh , Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202402021906.412J667P054855@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/2/24 11:11 AM, Warner Losh wrote: > On Fri, Feb 2, 2024 at 12:06 PM Warner Losh wrote: > >> The branch main has been updated by imp: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=5fdf01dbeef1f64f8c446561498d662702451ac1 >> >> commit 5fdf01dbeef1f64f8c446561498d662702451ac1 >> Author: Warner Losh >> AuthorDate: 2024-02-02 19:01:56 +0000 >> Commit: Warner Losh >> CommitDate: 2024-02-02 19:04:57 +0000 >> >> Revert "stand/lua: always allow overriding with local config files" >> >> This reverts commit d3d0b735571d9562812ce5b343a6e91f7a795dbe. no mail >> sent out, and the commit message was wrong. >> > > Due to conflicts, my pr landing script didn't rewrite the commit message. > This > occurred to me in the instant after I hit return on git push. My ^C was too > late > to prevent the deltas from being transmitted and recorded in the repo, but > also cut-short the commit hooks that send out the email. My apologies for > this lack of attention to detail. I wonder if we can fix it so that e-mails never get lost btw. A connection could die mid-push for various reasons. Ideally we'd track "somewhere" the last hash that had been sent on each branch and the commit hook would just poke the daemon that sends e-mails and updates the last hash, but the daemon could also just periodically poll the branches in case a poke is missed. -- John Baldwin From nobody Fri Feb 2 22:59:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRWRj5SCjz58T7C; Fri, 2 Feb 2024 22:59: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 4TRWRj4h6cz45Bm; Fri, 2 Feb 2024 22:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay0qwFkZvH3ups14ba7E8p7Az304AjVYO7wvd1LeIuk=; b=l65/zmaMEM1bEd6Nvuwt4iHc02cb8zcBWTf8UM35QIjgvLLnUKi5qx/CDEvl0ohgpKIIdx v8EP1gvmWztzG/cSfP68Q9gYgG+PtYMCezB/jdTr+VzRSD2z9SA/J2EhkNhx16UPD4MxFP 1dY+A6Q7IAgYxTDWQh1CkjAEfy4HLEqkZzvtMoKhcLu358yvoWB9pWuzbAekfM06DvVHYd mXVqoAYMOO67OUrzWNfQI+tbJWf+dUAmEzJhYlhFaLNi0Sw8Qm/XmdZxRx3XljRdS0JW10 TiIT9WJNQIzwyhL3eae0RKNdnJoLyFG59tVDM3kj8A4LGKl/q0DiTwnaJougVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ay0qwFkZvH3ups14ba7E8p7Az304AjVYO7wvd1LeIuk=; b=W+Ay+nak4OK401XoYhCOFFHs/Rf4YqFrxm6UKRs2gyjOJShlNdUkZ77SJqie2rO71jrtpP DP4JA3dNFJx7Z7Iq16j00ovC+U1TbIxnEVDyFPAD0f5elXyVjHhSsYYy2uDR4833w9l4W4 PksQPVq4tUo+Fvfh2C4kr5mSaYu7o1nnriU/vuACPwNf2kc4urNj4bg5ZaQqY220mb2XlD W3cdw650703e9Z1KBmTTlUIPqldDjAdWWGEZ7E/AnXYd/nl5xDqqXcUUpqO1QEm1mVnx8N EMWXmMR5EkwuVQBcfkcrbPHTVo2t1sdDXb5slKVrEAw6RaTu9qoZA3sEUToVWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706914753; a=rsa-sha256; cv=none; b=jjmGCYmCOtKDf7KlIm1PLXGhlwCj5VQWsp+VRBc55nwiKnoGr05KkY/Atg651XJuYPsXxv ZLLWt5u4txEtNdDjT53/YA0kSbUsOKzRvgpNHGtpLrISg/1mjKfRzJNAz7PHg7kOiEFVJ+ 6EOfe69+OuGXZEszO7ivjdi+zVWJ4MZ9u1qcBBzizXDFctrJGZUGCfl17Ll6coMDJ2c7Yf wN7qmqzc54OiW03u+HnvG4wjAaXljT3h4etHpK4VIuJCyXWni4Yd8Ip7JY1KKh8MvhS4bG tTI+z8Gf30MnO/pj7J+n+3PyFAicXb5vPtddCkfJ32PSTYCQJn6SY3aI/H4DNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRWRj3kR0zq5b; Fri, 2 Feb 2024 22:59: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 412MxDnh042401; Fri, 2 Feb 2024 22:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412MxDbQ042398; Fri, 2 Feb 2024 22:59:13 GMT (envelope-from git) Date: Fri, 2 Feb 2024 22:59:13 GMT Message-Id: <202402022259.412MxDbQ042398@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: fd1aa5b3a2a9 - main - x86: Consistently pass true/false to is_pde parameter of pmap_cache_bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd1aa5b3a2a9356bb3716cdea93710969d6c4817 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fd1aa5b3a2a9356bb3716cdea93710969d6c4817 commit fd1aa5b3a2a9356bb3716cdea93710969d6c4817 Author: John Baldwin AuthorDate: 2024-02-02 22:58:30 +0000 Commit: John Baldwin CommitDate: 2024-02-02 22:58:30 +0000 x86: Consistently pass true/false to is_pde parameter of pmap_cache_bits Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43692 --- sys/amd64/amd64/efirt_machdep.c | 2 +- sys/i386/i386/pmap.c | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 0ee8b7b3bb96..5d0106e2aa88 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -235,7 +235,7 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) "attributes unsupported\n", i); mode = VM_MEMATTR_UNCACHEABLE; } - bits = pmap_cache_bits(kernel_pmap, mode, FALSE) | X86_PG_RW | + bits = pmap_cache_bits(kernel_pmap, mode, false) | X86_PG_RW | X86_PG_V; VM_OBJECT_WLOCK(obj_1t1_pt); for (va = p->md_phys, idx = 0; idx < p->md_pages; idx++, diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index fe9b7a0c43df..6552fbbca4d5 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1766,7 +1766,7 @@ pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) pte = vtopte(va); pte_store(pte, pa | PG_RW | PG_V | pmap_cache_bits(kernel_pmap, - mode, 0)); + mode, false)); } /* @@ -1862,7 +1862,7 @@ __CONCAT(PMTYPE, qenter)(vm_offset_t sva, vm_page_t *ma, int count) while (pte < endpte) { m = *ma++; pa = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(kernel_pmap, - m->md.pat_mode, 0); + m->md.pat_mode, false); if ((*pte & (PG_FRAME | PG_PTE_CACHE)) != pa) { oldpte |= *pte; pte_store(pte, pa | pg_nx | PG_RW | PG_V); @@ -3918,8 +3918,8 @@ pmap_enter_4mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot) pd_entry_t newpde; PMAP_LOCK_ASSERT(pmap, MA_OWNED); - newpde = VM_PAGE_TO_PHYS(m) | pmap_cache_bits(pmap, m->md.pat_mode, 1) | - PG_PS | PG_V; + newpde = VM_PAGE_TO_PHYS(m) | + pmap_cache_bits(pmap, m->md.pat_mode, true) | PG_PS | PG_V; if ((m->oflags & VPO_UNMANAGED) == 0) newpde |= PG_MANAGED; #ifdef PMAP_PAE_COMP @@ -4233,7 +4233,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, pmap->pm_stats.resident_count++; newpte = VM_PAGE_TO_PHYS(m) | PG_V | - pmap_cache_bits(pmap, m->md.pat_mode, 0); + pmap_cache_bits(pmap, m->md.pat_mode, false); if ((m->oflags & VPO_UNMANAGED) == 0) newpte |= PG_MANAGED; #ifdef PMAP_PAE_COMP @@ -4339,7 +4339,7 @@ __CONCAT(PMTYPE, object_init_pt)(pmap_t pmap, vm_offset_t addr, * "pa" will not affect the termination of this loop. */ PMAP_LOCK(pmap); - for (pa = ptepa | pmap_cache_bits(pmap, pat_mode, 1); + for (pa = ptepa | pmap_cache_bits(pmap, pat_mode, true); pa < ptepa + size; pa += NBPDR) { pde = pmap_pde(pmap, addr); if (*pde == 0) { @@ -4596,7 +4596,7 @@ __CONCAT(PMTYPE, zero_page)(vm_page_t m) if (*cmap_pte2) panic("pmap_zero_page: CMAP2 busy"); *cmap_pte2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M | - pmap_cache_bits(kernel_pmap, m->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, m->md.pat_mode, false); invlcaddr(pc->pc_cmap_addr2); pagezero(pc->pc_cmap_addr2); *cmap_pte2 = 0; @@ -4627,7 +4627,7 @@ __CONCAT(PMTYPE, zero_page_area)(vm_page_t m, int off, int size) if (*cmap_pte2) panic("pmap_zero_page_area: CMAP2 busy"); *cmap_pte2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M | - pmap_cache_bits(kernel_pmap, m->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, m->md.pat_mode, false); invlcaddr(pc->pc_cmap_addr2); if (off == 0 && size == PAGE_SIZE) pagezero(pc->pc_cmap_addr2); @@ -4657,10 +4657,10 @@ __CONCAT(PMTYPE, copy_page)(vm_page_t src, vm_page_t dst) if (*cmap_pte2) panic("pmap_copy_page: CMAP2 busy"); *cmap_pte1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A | - pmap_cache_bits(kernel_pmap, src->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, src->md.pat_mode, false); invlcaddr(pc->pc_cmap_addr1); *cmap_pte2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M | - pmap_cache_bits(kernel_pmap, dst->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, dst->md.pat_mode, false); invlcaddr(pc->pc_cmap_addr2); bcopy(pc->pc_cmap_addr1, pc->pc_cmap_addr2, PAGE_SIZE); *cmap_pte1 = 0; @@ -4697,10 +4697,11 @@ __CONCAT(PMTYPE, copy_pages)(vm_page_t ma[], vm_offset_t a_offset, b_pg_offset = b_offset & PAGE_MASK; cnt = min(cnt, PAGE_SIZE - b_pg_offset); *cmap_pte1 = PG_V | VM_PAGE_TO_PHYS(a_pg) | PG_A | - pmap_cache_bits(kernel_pmap, a_pg->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, a_pg->md.pat_mode, false); invlcaddr(pc->pc_cmap_addr1); *cmap_pte2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(b_pg) | PG_A | - PG_M | pmap_cache_bits(kernel_pmap, b_pg->md.pat_mode, 0); + PG_M | pmap_cache_bits(kernel_pmap, b_pg->md.pat_mode, + false); invlcaddr(pc->pc_cmap_addr2); a_cp = pc->pc_cmap_addr1 + a_pg_offset; b_cp = pc->pc_cmap_addr2 + b_pg_offset; @@ -5663,7 +5664,7 @@ __CONCAT(PMTYPE, flush_page)(vm_page_t m) panic("pmap_flush_page: CMAP2 busy"); *cmap_pte2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M | pmap_cache_bits(kernel_pmap, m->md.pat_mode, - 0); + false); invlcaddr(pc->pc_cmap_addr2); sva = (vm_offset_t)pc->pc_cmap_addr2; eva = sva + PAGE_SIZE; @@ -5724,8 +5725,8 @@ __CONCAT(PMTYPE, change_attr)(vm_offset_t va, vm_size_t size, int mode) if (base < VM_MIN_KERNEL_ADDRESS) return (EINVAL); - cache_bits_pde = pmap_cache_bits(kernel_pmap, mode, 1); - cache_bits_pte = pmap_cache_bits(kernel_pmap, mode, 0); + cache_bits_pde = pmap_cache_bits(kernel_pmap, mode, true); + cache_bits_pte = pmap_cache_bits(kernel_pmap, mode, false); changed = false; /* @@ -5939,7 +5940,7 @@ __CONCAT(PMTYPE, quick_enter_page)(vm_page_t m) KASSERT(*pte == 0, ("pmap_quick_enter_page: PTE busy %#jx", (uintmax_t)*pte)); *pte = PG_V | PG_RW | VM_PAGE_TO_PHYS(m) | PG_A | PG_M | - pmap_cache_bits(kernel_pmap, pmap_page_get_memattr(m), 0); + pmap_cache_bits(kernel_pmap, pmap_page_get_memattr(m), false); invlpg(qaddr); return (qaddr); @@ -6085,7 +6086,7 @@ __CONCAT(PMTYPE, sf_buf_map)(struct sf_buf *sf) ptep = vtopte(sf->kva); opte = *ptep; *ptep = VM_PAGE_TO_PHYS(sf->m) | PG_RW | PG_V | - pmap_cache_bits(kernel_pmap, sf->m->md.pat_mode, 0); + pmap_cache_bits(kernel_pmap, sf->m->md.pat_mode, false); /* * Avoid unnecessary TLB invalidations: If the sf_buf's old From nobody Fri Feb 2 22:59:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRWRk6LBSz58T4x; Fri, 2 Feb 2024 22:59: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 4TRWRk5TjSz454Z; Fri, 2 Feb 2024 22:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36HdXQBGsskPGhk0sCKyNHnJDFy9UiNDYTMJ7Iy400g=; b=xN4c1OX2V1mo+HiNWmYv5yqW+uPa5+nCJeDKppxcKgf1IAYNw+RJBRGaDWQj4wQPAaEY+f EhVB5VFRDsOwYhNWoCxm136Hs62ckMjG2q1+Ol96z1iu7uxt7X8duDK75mxL007MpTlVt9 JM+MNBrs9Hl41liPKMqUx1dsgErbQohPe/0lKArSl35jbKchi75fWm1vhHhhfYVO0VUW/4 s7yN7CzWnIgHZe6WrHy7mn3Ds+m5uaeiEErDhrUyptsuaC/C9mUCWcV+BS5L8RrZatLcDy YJMbhEr5r4KITqMwy8BpX1YwRf1tKDc9fgnu3RjowtNHzyZXUOPx+CaR0QqQUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=36HdXQBGsskPGhk0sCKyNHnJDFy9UiNDYTMJ7Iy400g=; b=Yp4QiwovEylMnCxui8NblH5z48nIkIpUtSM/Q75tu0vqZaw7Cps0Z4qzAh3911IuWQ7U2p PLzmmFlvBuuVLnyZz0BAAnkvn6ERC/ifOvRYg/VCHZgjArwdqeZT3K3tpAYolUnAYulfYh FKXWvh5oU0pWUEvmYysiVOooW3z3ycQaFegKjiZj3YvRaiVIhN0T+EoesfIK1ZMAXGGyiy rW5u68+RFdR0F5zOPWM4QoMA8MbbOTMXK/wdoLWfW27f48OZWLcD7hqZ4qeE6YGVPFwDrk O2A91nj11N6DYP3OpcgJppUOYI9pGExkZ2MHG8fQjCjQNz7jXQtU6x6whrXvEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706914754; a=rsa-sha256; cv=none; b=GNCzKNBVYvwsUDy863QbNF9s4/x0tCz7IGqW4WTnWNv2WGjPaV/WH5re7WqXP/e9Cvjgar stNGeXuHT2ZYUYOUt3uE2Ux9QrqVgU4Zvghw+Ni3gS44iPFxEbGlLppcwFcr8rkvdv30PX V0/BWBhgZufDf+IZBmssvJlRzIaFtWg7xGGvWaISZkQe3+wzywP0dJFcf21nPrJRzs3Ncb bvk+N20hW6RSWDKVqOQ9ZAd3Q/dpzMdI1a6zTeUED8jvisuh374uyz8fcZ0pK9+Ff7On6U 9BmWwGT8VVDNUi1J7DegAAC+lNtZS/XAdiT56hueGGXB6J1wwCuh3jJ//VLNdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRWRk4V81zpZM; Fri, 2 Feb 2024 22:59: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 412MxEWf042449; Fri, 2 Feb 2024 22:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412MxEHs042446; Fri, 2 Feb 2024 22:59:14 GMT (envelope-from git) Date: Fri, 2 Feb 2024 22:59:14 GMT Message-Id: <202402022259.412MxEHs042446@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: 70539d5da600 - main - amd64: Use bool for booleans in getmemsize List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70539d5da600a65d34c8d965ef2a9d475cbc9c4e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=70539d5da600a65d34c8d965ef2a9d475cbc9c4e commit 70539d5da600a65d34c8d965ef2a9d475cbc9c4e Author: John Baldwin AuthorDate: 2024-02-02 22:58:46 +0000 Commit: John Baldwin CommitDate: 2024-02-02 22:58:46 +0000 amd64: Use bool for booleans in getmemsize Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43693 --- sys/amd64/amd64/machdep.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index e237363f304b..b2120af8e856 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -982,10 +982,11 @@ getmemsize(caddr_t kmdp, u_int64_t first) if (physmap[i + 1] < end) end = trunc_page(physmap[i + 1]); for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) { - int tmp, page_bad, full; int *ptr = (int *)CADDR1; + int tmp; + bool full, page_bad; - full = FALSE; + full = false; /* * block out kernel memory as not available. */ @@ -1000,7 +1001,7 @@ getmemsize(caddr_t kmdp, u_int64_t first) && pa < dcons_addr + dcons_size) goto do_dump_avail; - page_bad = FALSE; + page_bad = false; if (memtest == 0) goto skip_memtest; @@ -1024,25 +1025,25 @@ getmemsize(caddr_t kmdp, u_int64_t first) */ *(volatile int *)ptr = 0xaaaaaaaa; if (*(volatile int *)ptr != 0xaaaaaaaa) - page_bad = TRUE; + page_bad = true; /* * Test for alternating 0's and 1's */ *(volatile int *)ptr = 0x55555555; if (*(volatile int *)ptr != 0x55555555) - page_bad = TRUE; + page_bad = true; /* * Test for all 1's */ *(volatile int *)ptr = 0xffffffff; if (*(volatile int *)ptr != 0xffffffff) - page_bad = TRUE; + page_bad = true; /* * Test for all 0's */ *(volatile int *)ptr = 0x0; if (*(volatile int *)ptr != 0x0) - page_bad = TRUE; + page_bad = true; /* * Restore original value. */ @@ -1052,7 +1053,7 @@ skip_memtest: /* * Adjust array of valid/good pages. */ - if (page_bad == TRUE) + if (page_bad == true) continue; /* * If this good page is a continuation of the @@ -1073,7 +1074,7 @@ skip_memtest: printf( "Too many holes in the physical address space, giving up\n"); pa_indx--; - full = TRUE; + full = true; goto do_dump_avail; } phys_avail[pa_indx++] = pa; /* start */ From nobody Fri Feb 2 22:59:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRWRm1fXcz58Ss1; Fri, 2 Feb 2024 22: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 4TRWRl6hgnz454l; Fri, 2 Feb 2024 22: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=1706914755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ireAl2V1Et3ymMKbx0CzEJU1qAHBva+MSrsOqjC8Pk=; b=FZpfV3XMyz3aV0OEZVamjhLBGrgvfa3C7ehPJSXOR8Mo7bm/GW0ytf6D+cc/ROdbFQydDn +z1pp0tmQuKRaE6wgzOego5sZg8T4z6M4Rm1qskuQkbEOxO/2tjrxQUDwfWHiFy96wNZkw 2hl+VuxU14Xm2rHc+TzBsMsdM4N9pZ983CK615YPd12P54QbdkppjXnOQjdVRm68Qe5M91 ilVHV0qs9Z6vTeGezoNW+X9nM+T3z9ja9F36VAMXHiKvy+TMVL4L9h6geianbZQWPzPfBz rFGV6RH4D0BvFT0v8GK3e1WZWBZ4bMQ5KF7l9TEvVP9eCp7VNP4KDytNaN3rpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706914755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ireAl2V1Et3ymMKbx0CzEJU1qAHBva+MSrsOqjC8Pk=; b=EjpNueQ1cYoHcexTbtMqqTL38PuF9kzL4ZW3jXr9TQ6lhgswtMj8zvh4KtiNEvIRRvXLGV 60jHPJjPh1UXH68HktN6R6TFVR+RbWo4eZGIn5Psrq7KbYH6JD9p/5hVUcwwy0YH5X9fVJ uheCLQW1F6+1+wPjCijxgEgXJQ5Fo+TSESD5Mul88103pJxocnxlCwc6Sk9xGl3ThDdem6 s31gmBloUaXEWNzB361a4iglMVCZZOv1A67XYj7u6+z1RgrhIjBv7yrfNd7PYFCm1nC4WW Pu984uUEvmvUOY2ZWYiS4zP/cnaEP9Jee1lZIlVRH9JRC36JuiZ84My/t7YvxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706914755; a=rsa-sha256; cv=none; b=bU+XJXpOkgnS/BJwxWCXWrerNjCYNKRDyTi6YCujbAe+P8JY0EjtDgv/vv4yiO9oV61XUC M6xmqFe2nPHaU5CNDw4k9iTfzr+11aW4qarboTfdfhVDqiJ+95c6MP0cVhu2HDH+VZvXun zoHkOh6qkzaDovgRStUD0fHPNtpfcGN4cKSo8KQq/4zBYC1DdsF+92y37U+K3xnZ9PdP/W M+gkqXMyMkB/0N/bzgF/HFAi3XMwNw37Pw2emwIobKCIaobt6lY5rbZef5PD8BSw0pvDSO cYwWDMXwixmMIoWyxQuEnve/Xa0cQIqCTIPkz5zRM9rqVjwxj963sO+fPnAIWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRWRl5lS7zpv9; Fri, 2 Feb 2024 22: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 412MxF0C042513; Fri, 2 Feb 2024 22: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 412MxFLq042511; Fri, 2 Feb 2024 22:59:15 GMT (envelope-from git) Date: Fri, 2 Feb 2024 22:59:15 GMT Message-Id: <202402022259.412MxFLq042511@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: afb1a3e30c05 - main - arm: pmap_extract() returns a PA not a boolean value List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afb1a3e30c05a0f69facff7df59547ec82e3531a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=afb1a3e30c05a0f69facff7df59547ec82e3531a commit afb1a3e30c05a0f69facff7df59547ec82e3531a Author: John Baldwin AuthorDate: 2024-02-02 22:59:03 +0000 Commit: John Baldwin CommitDate: 2024-02-02 22:59:03 +0000 arm: pmap_extract() returns a PA not a boolean value Assume a PA of 0 indicates an invalid virtual address. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43694 --- sys/arm/arm/db_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/db_interface.c b/sys/arm/arm/db_interface.c index 5478d9d56f25..8aad6a42316e 100644 --- a/sys/arm/arm/db_interface.c +++ b/sys/arm/arm/db_interface.c @@ -172,7 +172,7 @@ db_validate_address(vm_offset_t addr) else pmap = p->p_vmspace->vm_map.pmap; - return (pmap_extract(pmap, addr) == FALSE); + return (pmap_extract(pmap, addr) == 0); } /* From nobody Fri Feb 2 23:09:03 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRWg344ztz58TZL; Fri, 2 Feb 2024 23:09: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 4TRWg33qQMz46kt; Fri, 2 Feb 2024 23:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706915343; h=from:from:reply-to:subject:subject: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/wfmIWJbkgHo3+qHohTPh8resbS1RD5cIYTKQXzhsc=; b=li+hmIcryQJ5cbp+Pagefj/gi1JODlHAqoiTFt2vGr3h4oVVnyTUkuDgMRO1lZ3wVLbTkl UH/464KksNdAqYLgW+qSlmoIxYONIZJAK+K5A1XoTshhOgvqwPqMlfWO1r9didFdsGIOMu w/GvN5xXVct8kHIaBfAHUQtuf4Jd4bim+MC7oe3ZTWIA1pZUY9QuvMGCchJgBgdVQyULzH mx8zjb5HkMcRIQuq4hIOmfZteo+CCf/dEqC7rQBbMT5MFce0lJmFfBx7WZUfCY1SKWTLf/ 4WrLStb/cHk+PXHwMsmLU4McHAzpapOnWkb3WZwy/32S0EPMab02C1QG5rgEGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706915343; h=from:from:reply-to:subject:subject: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/wfmIWJbkgHo3+qHohTPh8resbS1RD5cIYTKQXzhsc=; b=A5dQzVC7zBVmV33JHJj5L9hD/exQ6RLcNIFVBNYX+KKhgleGNb+jO1Isq3NF3yZd88CcEX PGztfuuqJeV3+tihINGRZvL9zgop6ineZQAhJpfMLLHwNW4ZmnSxcwNhuVx2MVAJ0u9mdY mEyg4/0Dqz6C7Iud1AXX0lXEzhQu/JoyyPWJmel7+/ylEeK5L1cR+v4ealPYaHZRerZiQO tcHcRc4UZwy5+ypS7aDLu7nInxvgQi7i5TymOcdWqs1lPrn2kJ4HWdrcdArEBGEo0NkRSh ZAIRL7ACWk7LF5t6TLwYQFWPU+6mfTwBjKKthcyScTfa0VIEvGPDUngAfkFN3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706915343; a=rsa-sha256; cv=none; b=P6SYZBk6Y9Mv1nBk5QROXelC4XNeJGP1QHRnro/wI93lJTNM9W4t8LTag06TiEzerIuPXx aNGQwzoKV8BdpcMOXT/DOZ3uf474oAaf8VOwIzJzpvQNTZEIeNtuQuzI+nYnlxNE92HzM+ rD1r8IhdwwEw4qtvYAEq5VkQZzRgfhLVmNwjo98HnXUTekJ+3ja/ogaYe/7M1k9bvCpyEl qKVdEmibw02WTXcLMx4u8DEbix0xdkV4YoSAM/aZN9NldH3udozXE6KuF10C5yhJS27NdB vL25wqXbMIj86y2F7cIRGCp128QdfoJL+zV/Nu+65NWlNl2iCIWuhH6CnI6VKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRWg32vFZzq8b; Fri, 2 Feb 2024 23:09: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 412N93CO060251; Fri, 2 Feb 2024 23:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412N93uO060248; Fri, 2 Feb 2024 23:09:03 GMT (envelope-from git) Date: Fri, 2 Feb 2024 23:09:03 GMT Message-Id: <202402022309.412N93uO060248@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: 1027e838a8ee - main - ddb: Use bool for boolean variables in MD code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1027e838a8eedf21682bbc29a636b83e87728b62 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1027e838a8eedf21682bbc29a636b83e87728b62 commit 1027e838a8eedf21682bbc29a636b83e87728b62 Author: John Baldwin AuthorDate: 2024-02-02 23:08:53 +0000 Commit: John Baldwin CommitDate: 2024-02-02 23:08:53 +0000 ddb: Use bool for boolean variables in MD code Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43695 --- sys/amd64/amd64/db_disasm.c | 1184 ++++++++++++++++++++-------------------- sys/amd64/amd64/db_trace.c | 20 +- sys/i386/i386/db_disasm.c | 1052 +++++++++++++++++------------------ sys/powerpc/powerpc/db_trace.c | 10 +- 4 files changed, 1133 insertions(+), 1133 deletions(-) diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c index f42c88794360..bca12894efdf 100644 --- a/sys/amd64/amd64/db_disasm.c +++ b/sys/amd64/amd64/db_disasm.c @@ -105,7 +105,7 @@ struct inst { const char * i_name; /* name */ - short i_has_modrm; /* has regmodrm byte */ + bool i_has_modrm; /* has regmodrm byte */ short i_size; /* operand size */ int i_mode; /* addressing modes */ const void * i_extra; /* pointer to extra opcode table */ @@ -124,43 +124,43 @@ struct finst { }; static const struct inst db_inst_0f388x[] = { -/*80*/ { "", TRUE, SDEP, op2(E, Rq), "invept" }, -/*81*/ { "", TRUE, SDEP, op2(E, Rq), "invvpid" }, -/*82*/ { "", TRUE, SDEP, op2(E, Rq), "invpcid" }, -/*83*/ { "", FALSE, NONE, 0, 0 }, -/*84*/ { "", FALSE, NONE, 0, 0 }, -/*85*/ { "", FALSE, NONE, 0, 0 }, -/*86*/ { "", FALSE, NONE, 0, 0 }, -/*87*/ { "", FALSE, NONE, 0, 0 }, - -/*88*/ { "", FALSE, NONE, 0, 0 }, -/*89*/ { "", FALSE, NONE, 0, 0 }, -/*8a*/ { "", FALSE, NONE, 0, 0 }, -/*8b*/ { "", FALSE, NONE, 0, 0 }, -/*8c*/ { "", FALSE, NONE, 0, 0 }, -/*8d*/ { "", FALSE, NONE, 0, 0 }, -/*8e*/ { "", FALSE, NONE, 0, 0 }, -/*8f*/ { "", FALSE, NONE, 0, 0 }, +/*80*/ { "", true, SDEP, op2(E, Rq), "invept" }, +/*81*/ { "", true, SDEP, op2(E, Rq), "invvpid" }, +/*82*/ { "", true, SDEP, op2(E, Rq), "invpcid" }, +/*83*/ { "", false, NONE, 0, 0 }, +/*84*/ { "", false, NONE, 0, 0 }, +/*85*/ { "", false, NONE, 0, 0 }, +/*86*/ { "", false, NONE, 0, 0 }, +/*87*/ { "", false, NONE, 0, 0 }, + +/*88*/ { "", false, NONE, 0, 0 }, +/*89*/ { "", false, NONE, 0, 0 }, +/*8a*/ { "", false, NONE, 0, 0 }, +/*8b*/ { "", false, NONE, 0, 0 }, +/*8c*/ { "", false, NONE, 0, 0 }, +/*8d*/ { "", false, NONE, 0, 0 }, +/*8e*/ { "", false, NONE, 0, 0 }, +/*8f*/ { "", false, NONE, 0, 0 }, }; static const struct inst db_inst_0f38fx[] = { -/*f0*/ { "crc32b",TRUE, NONE, op2(Eb, R), 0 }, -/*f1*/ { "crc32", TRUE, LONG, op2(E, R), 0 }, -/*f2*/ { "", FALSE, NONE, 0, 0 }, -/*f3*/ { "", FALSE, NONE, 0, 0 }, -/*f4*/ { "", FALSE, NONE, 0, 0 }, -/*f5*/ { "", FALSE, NONE, 0, 0 }, -/*f6*/ { "", FALSE, NONE, 0, 0 }, -/*f7*/ { "", FALSE, NONE, 0, 0 }, - -/*f8*/ { "", FALSE, NONE, 0, 0 }, -/*f9*/ { "", FALSE, NONE, 0, 0 }, -/*fa*/ { "", FALSE, NONE, 0, 0 }, -/*fb*/ { "", FALSE, NONE, 0, 0 }, -/*fc*/ { "", FALSE, NONE, 0, 0 }, -/*fd*/ { "", FALSE, NONE, 0, 0 }, -/*fe*/ { "", FALSE, NONE, 0, 0 }, -/*ff*/ { "", FALSE, NONE, 0, 0 }, +/*f0*/ { "crc32b",true, NONE, op2(Eb, R), 0 }, +/*f1*/ { "crc32", true, LONG, op2(E, R), 0 }, +/*f2*/ { "", false, NONE, 0, 0 }, +/*f3*/ { "", false, NONE, 0, 0 }, +/*f4*/ { "", false, NONE, 0, 0 }, +/*f5*/ { "", false, NONE, 0, 0 }, +/*f6*/ { "", false, NONE, 0, 0 }, +/*f7*/ { "", false, NONE, 0, 0 }, + +/*f8*/ { "", false, NONE, 0, 0 }, +/*f9*/ { "", false, NONE, 0, 0 }, +/*fa*/ { "", false, NONE, 0, 0 }, +/*fb*/ { "", false, NONE, 0, 0 }, +/*fc*/ { "", false, NONE, 0, 0 }, +/*fd*/ { "", false, NONE, 0, 0 }, +/*fe*/ { "", false, NONE, 0, 0 }, +/*ff*/ { "", false, NONE, 0, 0 }, }; static const struct inst * const db_inst_0f38[] = { @@ -249,222 +249,222 @@ static const char * const db_Grp15b[] = { }; static const struct inst db_inst_0f0x[] = { -/*00*/ { "", TRUE, NONE, op1(Ew), db_Grp6 }, -/*01*/ { "", TRUE, NONE, op1(Ew), db_Grp7 }, -/*02*/ { "lar", TRUE, LONG, op2(E,R), 0 }, -/*03*/ { "lsl", TRUE, LONG, op2(E,R), 0 }, -/*04*/ { "", FALSE, NONE, 0, 0 }, -/*05*/ { "syscall",FALSE,NONE, 0, 0 }, -/*06*/ { "clts", FALSE, NONE, 0, 0 }, -/*07*/ { "sysret",FALSE, NONE, 0, 0 }, - -/*08*/ { "invd", FALSE, NONE, 0, 0 }, -/*09*/ { "wbinvd",FALSE, NONE, 0, 0 }, -/*0a*/ { "", FALSE, NONE, 0, 0 }, -/*0b*/ { "", FALSE, NONE, 0, 0 }, -/*0c*/ { "", FALSE, NONE, 0, 0 }, -/*0d*/ { "", FALSE, NONE, 0, 0 }, -/*0e*/ { "", FALSE, NONE, 0, 0 }, -/*0f*/ { "", FALSE, NONE, 0, 0 }, +/*00*/ { "", true, NONE, op1(Ew), db_Grp6 }, +/*01*/ { "", true, NONE, op1(Ew), db_Grp7 }, +/*02*/ { "lar", true, LONG, op2(E,R), 0 }, +/*03*/ { "lsl", true, LONG, op2(E,R), 0 }, +/*04*/ { "", false, NONE, 0, 0 }, +/*05*/ { "syscall",false,NONE, 0, 0 }, +/*06*/ { "clts", false, NONE, 0, 0 }, +/*07*/ { "sysret",false, NONE, 0, 0 }, + +/*08*/ { "invd", false, NONE, 0, 0 }, +/*09*/ { "wbinvd",false, NONE, 0, 0 }, +/*0a*/ { "", false, NONE, 0, 0 }, +/*0b*/ { "", false, NONE, 0, 0 }, +/*0c*/ { "", false, NONE, 0, 0 }, +/*0d*/ { "", false, NONE, 0, 0 }, +/*0e*/ { "", false, NONE, 0, 0 }, +/*0f*/ { "", false, NONE, 0, 0 }, }; static const struct inst db_inst_0f1x[] = { -/*10*/ { "", FALSE, NONE, 0, 0 }, -/*11*/ { "", FALSE, NONE, 0, 0 }, -/*12*/ { "", FALSE, NONE, 0, 0 }, -/*13*/ { "", FALSE, NONE, 0, 0 }, -/*14*/ { "", FALSE, NONE, 0, 0 }, -/*15*/ { "", FALSE, NONE, 0, 0 }, -/*16*/ { "", FALSE, NONE, 0, 0 }, -/*17*/ { "", FALSE, NONE, 0, 0 }, - -/*18*/ { "", FALSE, NONE, 0, 0 }, -/*19*/ { "", FALSE, NONE, 0, 0 }, -/*1a*/ { "", FALSE, NONE, 0, 0 }, -/*1b*/ { "", FALSE, NONE, 0, 0 }, -/*1c*/ { "", FALSE, NONE, 0, 0 }, -/*1d*/ { "", FALSE, NONE, 0, 0 }, -/*1e*/ { "", FALSE, NONE, 0, 0 }, -/*1f*/ { "nopl", TRUE, SDEP, 0, "nopw" }, +/*10*/ { "", false, NONE, 0, 0 }, +/*11*/ { "", false, NONE, 0, 0 }, +/*12*/ { "", false, NONE, 0, 0 }, +/*13*/ { "", false, NONE, 0, 0 }, +/*14*/ { "", false, NONE, 0, 0 }, +/*15*/ { "", false, NONE, 0, 0 }, +/*16*/ { "", false, NONE, 0, 0 }, +/*17*/ { "", false, NONE, 0, 0 }, + +/*18*/ { "", false, NONE, 0, 0 }, +/*19*/ { "", false, NONE, 0, 0 }, +/*1a*/ { "", false, NONE, 0, 0 }, +/*1b*/ { "", false, NONE, 0, 0 }, +/*1c*/ { "", false, NONE, 0, 0 }, +/*1d*/ { "", false, NONE, 0, 0 }, +/*1e*/ { "", false, NONE, 0, 0 }, +/*1f*/ { "nopl", true, SDEP, 0, "nopw" }, }; static const struct inst db_inst_0f2x[] = { -/*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 }, -/*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 }, -/*22*/ { "mov", TRUE, LONG, op2(El,CR), 0 }, -/*23*/ { "mov", TRUE, LONG, op2(El,DR), 0 }, -/*24*/ { "mov", TRUE, LONG, op2(TR,El), 0 }, -/*25*/ { "", FALSE, NONE, 0, 0 }, -/*26*/ { "mov", TRUE, LONG, op2(El,TR), 0 }, -/*27*/ { "", FALSE, NONE, 0, 0 }, - -/*28*/ { "", FALSE, NONE, 0, 0 }, -/*29*/ { "", FALSE, NONE, 0, 0 }, -/*2a*/ { "", FALSE, NONE, 0, 0 }, -/*2b*/ { "", FALSE, NONE, 0, 0 }, -/*2c*/ { "", FALSE, NONE, 0, 0 }, -/*2d*/ { "", FALSE, NONE, 0, 0 }, -/*2e*/ { "", FALSE, NONE, 0, 0 }, -/*2f*/ { "", FALSE, NONE, 0, 0 }, +/*20*/ { "mov", true, LONG, op2(CR,El), 0 }, +/*21*/ { "mov", true, LONG, op2(DR,El), 0 }, +/*22*/ { "mov", true, LONG, op2(El,CR), 0 }, +/*23*/ { "mov", true, LONG, op2(El,DR), 0 }, +/*24*/ { "mov", true, LONG, op2(TR,El), 0 }, +/*25*/ { "", false, NONE, 0, 0 }, +/*26*/ { "mov", true, LONG, op2(El,TR), 0 }, +/*27*/ { "", false, NONE, 0, 0 }, + +/*28*/ { "", false, NONE, 0, 0 }, +/*29*/ { "", false, NONE, 0, 0 }, +/*2a*/ { "", false, NONE, 0, 0 }, +/*2b*/ { "", false, NONE, 0, 0 }, +/*2c*/ { "", false, NONE, 0, 0 }, +/*2d*/ { "", false, NONE, 0, 0 }, +/*2e*/ { "", false, NONE, 0, 0 }, +/*2f*/ { "", false, NONE, 0, 0 }, }; static const struct inst db_inst_0f3x[] = { -/*30*/ { "wrmsr", FALSE, NONE, 0, 0 }, -/*31*/ { "rdtsc", FALSE, NONE, 0, 0 }, -/*32*/ { "rdmsr", FALSE, NONE, 0, 0 }, -/*33*/ { "rdpmc", FALSE, NONE, 0, 0 }, -/*34*/ { "sysenter",FALSE,NONE, 0, 0 }, -/*35*/ { "sysexit",FALSE,NONE, 0, 0 }, -/*36*/ { "", FALSE, NONE, 0, 0 }, -/*37*/ { "getsec",FALSE, NONE, 0, 0 }, - -/*38*/ { "", FALSE, ESC, 0, db_inst_0f38 }, -/*39*/ { "", FALSE, NONE, 0, 0 }, -/*3a*/ { "", FALSE, NONE, 0, 0 }, -/*3b*/ { "", FALSE, NONE, 0, 0 }, -/*3c*/ { "", FALSE, NONE, 0, 0 }, -/*3d*/ { "", FALSE, NONE, 0, 0 }, -/*3e*/ { "", FALSE, NONE, 0, 0 }, -/*3f*/ { "", FALSE, NONE, 0, 0 }, +/*30*/ { "wrmsr", false, NONE, 0, 0 }, +/*31*/ { "rdtsc", false, NONE, 0, 0 }, +/*32*/ { "rdmsr", false, NONE, 0, 0 }, +/*33*/ { "rdpmc", false, NONE, 0, 0 }, +/*34*/ { "sysenter",false,NONE, 0, 0 }, +/*35*/ { "sysexit",false,NONE, 0, 0 }, +/*36*/ { "", false, NONE, 0, 0 }, +/*37*/ { "getsec",false, NONE, 0, 0 }, + +/*38*/ { "", false, ESC, 0, db_inst_0f38 }, +/*39*/ { "", false, NONE, 0, 0 }, +/*3a*/ { "", false, NONE, 0, 0 }, +/*3b*/ { "", false, NONE, 0, 0 }, +/*3c*/ { "", false, NONE, 0, 0 }, +/*3d*/ { "", false, NONE, 0, 0 }, +/*3e*/ { "", false, NONE, 0, 0 }, +/*3f*/ { "", false, NONE, 0, 0 }, }; static const struct inst db_inst_0f4x[] = { -/*40*/ { "cmovo", TRUE, NONE, op2(E, R), 0 }, -/*41*/ { "cmovno", TRUE, NONE, op2(E, R), 0 }, -/*42*/ { "cmovb", TRUE, NONE, op2(E, R), 0 }, -/*43*/ { "cmovnb", TRUE, NONE, op2(E, R), 0 }, -/*44*/ { "cmovz", TRUE, NONE, op2(E, R), 0 }, -/*45*/ { "cmovnz", TRUE, NONE, op2(E, R), 0 }, -/*46*/ { "cmovbe", TRUE, NONE, op2(E, R), 0 }, -/*47*/ { "cmovnbe",TRUE, NONE, op2(E, R), 0 }, - -/*48*/ { "cmovs", TRUE, NONE, op2(E, R), 0 }, -/*49*/ { "cmovns", TRUE, NONE, op2(E, R), 0 }, -/*4a*/ { "cmovp", TRUE, NONE, op2(E, R), 0 }, -/*4b*/ { "cmovnp", TRUE, NONE, op2(E, R), 0 }, -/*4c*/ { "cmovl", TRUE, NONE, op2(E, R), 0 }, -/*4d*/ { "cmovnl", TRUE, NONE, op2(E, R), 0 }, -/*4e*/ { "cmovle", TRUE, NONE, op2(E, R), 0 }, -/*4f*/ { "cmovnle",TRUE, NONE, op2(E, R), 0 }, +/*40*/ { "cmovo", true, NONE, op2(E, R), 0 }, +/*41*/ { "cmovno", true, NONE, op2(E, R), 0 }, +/*42*/ { "cmovb", true, NONE, op2(E, R), 0 }, +/*43*/ { "cmovnb", true, NONE, op2(E, R), 0 }, +/*44*/ { "cmovz", true, NONE, op2(E, R), 0 }, +/*45*/ { "cmovnz", true, NONE, op2(E, R), 0 }, +/*46*/ { "cmovbe", true, NONE, op2(E, R), 0 }, +/*47*/ { "cmovnbe",true, NONE, op2(E, R), 0 }, + +/*48*/ { "cmovs", true, NONE, op2(E, R), 0 }, +/*49*/ { "cmovns", true, NONE, op2(E, R), 0 }, +/*4a*/ { "cmovp", true, NONE, op2(E, R), 0 }, +/*4b*/ { "cmovnp", true, NONE, op2(E, R), 0 }, +/*4c*/ { "cmovl", true, NONE, op2(E, R), 0 }, +/*4d*/ { "cmovnl", true, NONE, op2(E, R), 0 }, +/*4e*/ { "cmovle", true, NONE, op2(E, R), 0 }, +/*4f*/ { "cmovnle",true, NONE, op2(E, R), 0 }, }; static const struct inst db_inst_0f7x[] = { -/*70*/ { "", FALSE, NONE, 0, 0 }, -/*71*/ { "", FALSE, NONE, 0, 0 }, -/*72*/ { "", FALSE, NONE, 0, 0 }, -/*73*/ { "", FALSE, NONE, 0, 0 }, -/*74*/ { "", FALSE, NONE, 0, 0 }, -/*75*/ { "", FALSE, NONE, 0, 0 }, -/*76*/ { "", FALSE, NONE, 0, 0 }, -/*77*/ { "", FALSE, NONE, 0, 0 }, - -/*78*/ { "vmread", TRUE, NONE, op2(Rq, E), 0 }, -/*79*/ { "vmwrite",TRUE, NONE, op2(E, Rq), 0 }, -/*7a*/ { "", FALSE, NONE, 0, 0 }, -/*7b*/ { "", FALSE, NONE, 0, 0 }, -/*7c*/ { "", FALSE, NONE, 0, 0 }, -/*7d*/ { "", FALSE, NONE, 0, 0 }, -/*7e*/ { "", FALSE, NONE, 0, 0 }, -/*7f*/ { "", FALSE, NONE, 0, 0 }, +/*70*/ { "", false, NONE, 0, 0 }, +/*71*/ { "", false, NONE, 0, 0 }, +/*72*/ { "", false, NONE, 0, 0 }, +/*73*/ { "", false, NONE, 0, 0 }, +/*74*/ { "", false, NONE, 0, 0 }, +/*75*/ { "", false, NONE, 0, 0 }, +/*76*/ { "", false, NONE, 0, 0 }, +/*77*/ { "", false, NONE, 0, 0 }, + +/*78*/ { "vmread", true, NONE, op2(Rq, E), 0 }, +/*79*/ { "vmwrite",true, NONE, op2(E, Rq), 0 }, +/*7a*/ { "", false, NONE, 0, 0 }, +/*7b*/ { "", false, NONE, 0, 0 }, +/*7c*/ { "", false, NONE, 0, 0 }, +/*7d*/ { "", false, NONE, 0, 0 }, +/*7e*/ { "", false, NONE, 0, 0 }, +/*7f*/ { "", false, NONE, 0, 0 }, }; static const struct inst db_inst_0f8x[] = { -/*80*/ { "jo", FALSE, NONE, op1(Dl), 0 }, -/*81*/ { "jno", FALSE, NONE, op1(Dl), 0 }, -/*82*/ { "jb", FALSE, NONE, op1(Dl), 0 }, -/*83*/ { "jnb", FALSE, NONE, op1(Dl), 0 }, -/*84*/ { "jz", FALSE, NONE, op1(Dl), 0 }, -/*85*/ { "jnz", FALSE, NONE, op1(Dl), 0 }, -/*86*/ { "jbe", FALSE, NONE, op1(Dl), 0 }, -/*87*/ { "jnbe", FALSE, NONE, op1(Dl), 0 }, - -/*88*/ { "js", FALSE, NONE, op1(Dl), 0 }, -/*89*/ { "jns", FALSE, NONE, op1(Dl), 0 }, -/*8a*/ { "jp", FALSE, NONE, op1(Dl), 0 }, -/*8b*/ { "jnp", FALSE, NONE, op1(Dl), 0 }, -/*8c*/ { "jl", FALSE, NONE, op1(Dl), 0 }, -/*8d*/ { "jnl", FALSE, NONE, op1(Dl), 0 }, -/*8e*/ { "jle", FALSE, NONE, op1(Dl), 0 }, -/*8f*/ { "jnle", FALSE, NONE, op1(Dl), 0 }, +/*80*/ { "jo", false, NONE, op1(Dl), 0 }, +/*81*/ { "jno", false, NONE, op1(Dl), 0 }, +/*82*/ { "jb", false, NONE, op1(Dl), 0 }, +/*83*/ { "jnb", false, NONE, op1(Dl), 0 }, +/*84*/ { "jz", false, NONE, op1(Dl), 0 }, +/*85*/ { "jnz", false, NONE, op1(Dl), 0 }, +/*86*/ { "jbe", false, NONE, op1(Dl), 0 }, +/*87*/ { "jnbe", false, NONE, op1(Dl), 0 }, + +/*88*/ { "js", false, NONE, op1(Dl), 0 }, +/*89*/ { "jns", false, NONE, op1(Dl), 0 }, +/*8a*/ { "jp", false, NONE, op1(Dl), 0 }, +/*8b*/ { "jnp", false, NONE, op1(Dl), 0 }, +/*8c*/ { "jl", false, NONE, op1(Dl), 0 }, +/*8d*/ { "jnl", false, NONE, op1(Dl), 0 }, +/*8e*/ { "jle", false, NONE, op1(Dl), 0 }, +/*8f*/ { "jnle", false, NONE, op1(Dl), 0 }, }; static const struct inst db_inst_0f9x[] = { -/*90*/ { "seto", TRUE, NONE, op1(Eb), 0 }, -/*91*/ { "setno", TRUE, NONE, op1(Eb), 0 }, -/*92*/ { "setb", TRUE, NONE, op1(Eb), 0 }, -/*93*/ { "setnb", TRUE, NONE, op1(Eb), 0 }, -/*94*/ { "setz", TRUE, NONE, op1(Eb), 0 }, -/*95*/ { "setnz", TRUE, NONE, op1(Eb), 0 }, -/*96*/ { "setbe", TRUE, NONE, op1(Eb), 0 }, -/*97*/ { "setnbe",TRUE, NONE, op1(Eb), 0 }, - -/*98*/ { "sets", TRUE, NONE, op1(Eb), 0 }, -/*99*/ { "setns", TRUE, NONE, op1(Eb), 0 }, -/*9a*/ { "setp", TRUE, NONE, op1(Eb), 0 }, -/*9b*/ { "setnp", TRUE, NONE, op1(Eb), 0 }, -/*9c*/ { "setl", TRUE, NONE, op1(Eb), 0 }, -/*9d*/ { "setnl", TRUE, NONE, op1(Eb), 0 }, -/*9e*/ { "setle", TRUE, NONE, op1(Eb), 0 }, -/*9f*/ { "setnle",TRUE, NONE, op1(Eb), 0 }, +/*90*/ { "seto", true, NONE, op1(Eb), 0 }, +/*91*/ { "setno", true, NONE, op1(Eb), 0 }, +/*92*/ { "setb", true, NONE, op1(Eb), 0 }, +/*93*/ { "setnb", true, NONE, op1(Eb), 0 }, +/*94*/ { "setz", true, NONE, op1(Eb), 0 }, +/*95*/ { "setnz", true, NONE, op1(Eb), 0 }, +/*96*/ { "setbe", true, NONE, op1(Eb), 0 }, +/*97*/ { "setnbe",true, NONE, op1(Eb), 0 }, + +/*98*/ { "sets", true, NONE, op1(Eb), 0 }, +/*99*/ { "setns", true, NONE, op1(Eb), 0 }, +/*9a*/ { "setp", true, NONE, op1(Eb), 0 }, +/*9b*/ { "setnp", true, NONE, op1(Eb), 0 }, +/*9c*/ { "setl", true, NONE, op1(Eb), 0 }, +/*9d*/ { "setnl", true, NONE, op1(Eb), 0 }, +/*9e*/ { "setle", true, NONE, op1(Eb), 0 }, +/*9f*/ { "setnle",true, NONE, op1(Eb), 0 }, }; static const struct inst db_inst_0fax[] = { -/*a0*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*a1*/ { "pop", FALSE, NONE, op1(Si), 0 }, -/*a2*/ { "cpuid", FALSE, NONE, 0, 0 }, -/*a3*/ { "bt", TRUE, LONG, op2(R,E), 0 }, -/*a4*/ { "shld", TRUE, LONG, op3(Ib,R,E), 0 }, -/*a5*/ { "shld", TRUE, LONG, op3(CL,R,E), 0 }, -/*a6*/ { "", FALSE, NONE, 0, 0 }, -/*a7*/ { "", FALSE, NONE, 0, 0 }, - -/*a8*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*a9*/ { "pop", FALSE, NONE, op1(Si), 0 }, -/*aa*/ { "rsm", FALSE, NONE, 0, 0 }, -/*ab*/ { "bts", TRUE, LONG, op2(R,E), 0 }, -/*ac*/ { "shrd", TRUE, LONG, op3(Ib,R,E), 0 }, -/*ad*/ { "shrd", TRUE, LONG, op3(CL,R,E), 0 }, -/*ae*/ { "", TRUE, LONG, op1(E), db_Grp15 }, -/*af*/ { "imul", TRUE, LONG, op2(E,R), 0 }, +/*a0*/ { "push", false, NONE, op1(Si), 0 }, +/*a1*/ { "pop", false, NONE, op1(Si), 0 }, +/*a2*/ { "cpuid", false, NONE, 0, 0 }, +/*a3*/ { "bt", true, LONG, op2(R,E), 0 }, +/*a4*/ { "shld", true, LONG, op3(Ib,R,E), 0 }, +/*a5*/ { "shld", true, LONG, op3(CL,R,E), 0 }, +/*a6*/ { "", false, NONE, 0, 0 }, +/*a7*/ { "", false, NONE, 0, 0 }, + +/*a8*/ { "push", false, NONE, op1(Si), 0 }, +/*a9*/ { "pop", false, NONE, op1(Si), 0 }, +/*aa*/ { "rsm", false, NONE, 0, 0 }, +/*ab*/ { "bts", true, LONG, op2(R,E), 0 }, +/*ac*/ { "shrd", true, LONG, op3(Ib,R,E), 0 }, +/*ad*/ { "shrd", true, LONG, op3(CL,R,E), 0 }, +/*ae*/ { "", true, LONG, op1(E), db_Grp15 }, +/*af*/ { "imul", true, LONG, op2(E,R), 0 }, }; static const struct inst db_inst_0fbx[] = { -/*b0*/ { "cmpxchg",TRUE, BYTE, op2(R, E), 0 }, -/*b0*/ { "cmpxchg",TRUE, LONG, op2(R, E), 0 }, -/*b2*/ { "lss", TRUE, LONG, op2(E, R), 0 }, -/*b3*/ { "btr", TRUE, LONG, op2(R, E), 0 }, -/*b4*/ { "lfs", TRUE, LONG, op2(E, R), 0 }, -/*b5*/ { "lgs", TRUE, LONG, op2(E, R), 0 }, -/*b6*/ { "movzb", TRUE, LONG, op2(Eb, R), 0 }, -/*b7*/ { "movzw", TRUE, LONG, op2(Ew, R), 0 }, - -/*b8*/ { "", FALSE, NONE, 0, 0 }, -/*b9*/ { "", FALSE, NONE, 0, 0 }, -/*ba*/ { "", TRUE, LONG, op2(Ib, E), db_Grp8 }, -/*bb*/ { "btc", TRUE, LONG, op2(R, E), 0 }, -/*bc*/ { "bsf", TRUE, LONG, op2(E, R), 0 }, -/*bd*/ { "bsr", TRUE, LONG, op2(E, R), 0 }, -/*be*/ { "movsb", TRUE, LONG, op2(Eb, R), 0 }, -/*bf*/ { "movsw", TRUE, LONG, op2(Ew, R), 0 }, +/*b0*/ { "cmpxchg",true, BYTE, op2(R, E), 0 }, +/*b0*/ { "cmpxchg",true, LONG, op2(R, E), 0 }, +/*b2*/ { "lss", true, LONG, op2(E, R), 0 }, +/*b3*/ { "btr", true, LONG, op2(R, E), 0 }, +/*b4*/ { "lfs", true, LONG, op2(E, R), 0 }, +/*b5*/ { "lgs", true, LONG, op2(E, R), 0 }, +/*b6*/ { "movzb", true, LONG, op2(Eb, R), 0 }, +/*b7*/ { "movzw", true, LONG, op2(Ew, R), 0 }, + +/*b8*/ { "", false, NONE, 0, 0 }, +/*b9*/ { "", false, NONE, 0, 0 }, +/*ba*/ { "", true, LONG, op2(Ib, E), db_Grp8 }, +/*bb*/ { "btc", true, LONG, op2(R, E), 0 }, +/*bc*/ { "bsf", true, LONG, op2(E, R), 0 }, +/*bd*/ { "bsr", true, LONG, op2(E, R), 0 }, +/*be*/ { "movsb", true, LONG, op2(Eb, R), 0 }, +/*bf*/ { "movsw", true, LONG, op2(Ew, R), 0 }, }; static const struct inst db_inst_0fcx[] = { -/*c0*/ { "xadd", TRUE, BYTE, op2(R, E), 0 }, -/*c1*/ { "xadd", TRUE, LONG, op2(R, E), 0 }, -/*c2*/ { "", FALSE, NONE, 0, 0 }, -/*c3*/ { "", FALSE, NONE, 0, 0 }, -/*c4*/ { "", FALSE, NONE, 0, 0 }, -/*c5*/ { "", FALSE, NONE, 0, 0 }, -/*c6*/ { "", FALSE, NONE, 0, 0 }, -/*c7*/ { "", TRUE, NONE, op1(E), db_Grp9 }, -/*c8*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*c9*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*ca*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*cb*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*cc*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*cd*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*ce*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, -/*cf*/ { "bswap", FALSE, LONG, op1(Ril), 0 }, +/*c0*/ { "xadd", true, BYTE, op2(R, E), 0 }, +/*c1*/ { "xadd", true, LONG, op2(R, E), 0 }, +/*c2*/ { "", false, NONE, 0, 0 }, +/*c3*/ { "", false, NONE, 0, 0 }, +/*c4*/ { "", false, NONE, 0, 0 }, +/*c5*/ { "", false, NONE, 0, 0 }, +/*c6*/ { "", false, NONE, 0, 0 }, +/*c7*/ { "", true, NONE, op1(E), db_Grp9 }, +/*c8*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*c9*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*ca*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*cb*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*cc*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*cd*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*ce*/ { "bswap", false, LONG, op1(Ril), 0 }, +/*cf*/ { "bswap", false, LONG, op1(Ril), 0 }, }; static const struct inst * const db_inst_0f[] = { @@ -635,342 +635,342 @@ static const char * const db_Grp2[] = { }; static const struct inst db_Grp3[] = { - { "test", TRUE, NONE, op2(I,E), 0 }, - { "test", TRUE, NONE, op2(I,E), 0 }, - { "not", TRUE, NONE, op1(E), 0 }, - { "neg", TRUE, NONE, op1(E), 0 }, - { "mul", TRUE, NONE, op2(E,A), 0 }, - { "imul", TRUE, NONE, op2(E,A), 0 }, - { "div", TRUE, NONE, op2(E,A), 0 }, - { "idiv", TRUE, NONE, op2(E,A), 0 }, + { "test", true, NONE, op2(I,E), 0 }, + { "test", true, NONE, op2(I,E), 0 }, + { "not", true, NONE, op1(E), 0 }, + { "neg", true, NONE, op1(E), 0 }, + { "mul", true, NONE, op2(E,A), 0 }, + { "imul", true, NONE, op2(E,A), 0 }, + { "div", true, NONE, op2(E,A), 0 }, + { "idiv", true, NONE, op2(E,A), 0 }, }; static const struct inst db_Grp4[] = { - { "inc", TRUE, BYTE, op1(E), 0 }, - { "dec", TRUE, BYTE, op1(E), 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 } + { "inc", true, BYTE, op1(E), 0 }, + { "dec", true, BYTE, op1(E), 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 } }; static const struct inst db_Grp5[] = { - { "inc", TRUE, LONG, op1(E), 0 }, - { "dec", TRUE, LONG, op1(E), 0 }, - { "call", TRUE, LONG, op1(Eind),0 }, - { "lcall", TRUE, LONG, op1(Eind),0 }, - { "jmp", TRUE, LONG, op1(Eind),0 }, - { "ljmp", TRUE, LONG, op1(Eind),0 }, - { "push", TRUE, LONG, op1(E), 0 }, - { "", TRUE, NONE, 0, 0 } + { "inc", true, LONG, op1(E), 0 }, + { "dec", true, LONG, op1(E), 0 }, + { "call", true, LONG, op1(Eind),0 }, + { "lcall", true, LONG, op1(Eind),0 }, + { "jmp", true, LONG, op1(Eind),0 }, + { "ljmp", true, LONG, op1(Eind),0 }, + { "push", true, LONG, op1(E), 0 }, + { "", true, NONE, 0, 0 } }; static const struct inst db_Grp9b[] = { - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "", TRUE, NONE, 0, 0 }, - { "rdrand",TRUE, LONG, op1(Rv), 0 }, - { "rdseed",TRUE, LONG, op1(Rv), 0 } + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "", true, NONE, 0, 0 }, + { "rdrand",true, LONG, op1(Rv), 0 }, + { "rdseed",true, LONG, op1(Rv), 0 } }; static const struct inst db_inst_table[256] = { -/*00*/ { "add", TRUE, BYTE, op2(R, E), 0 }, -/*01*/ { "add", TRUE, LONG, op2(R, E), 0 }, -/*02*/ { "add", TRUE, BYTE, op2(E, R), 0 }, -/*03*/ { "add", TRUE, LONG, op2(E, R), 0 }, -/*04*/ { "add", FALSE, BYTE, op2(I, A), 0 }, -/*05*/ { "add", FALSE, LONG, op2(Is, A), 0 }, -/*06*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*07*/ { "pop", FALSE, NONE, op1(Si), 0 }, - -/*08*/ { "or", TRUE, BYTE, op2(R, E), 0 }, -/*09*/ { "or", TRUE, LONG, op2(R, E), 0 }, -/*0a*/ { "or", TRUE, BYTE, op2(E, R), 0 }, -/*0b*/ { "or", TRUE, LONG, op2(E, R), 0 }, -/*0c*/ { "or", FALSE, BYTE, op2(I, A), 0 }, -/*0d*/ { "or", FALSE, LONG, op2(I, A), 0 }, -/*0e*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*0f*/ { "", FALSE, ESC, 0, db_inst_0f }, - -/*10*/ { "adc", TRUE, BYTE, op2(R, E), 0 }, -/*11*/ { "adc", TRUE, LONG, op2(R, E), 0 }, -/*12*/ { "adc", TRUE, BYTE, op2(E, R), 0 }, -/*13*/ { "adc", TRUE, LONG, op2(E, R), 0 }, -/*14*/ { "adc", FALSE, BYTE, op2(I, A), 0 }, -/*15*/ { "adc", FALSE, LONG, op2(Is, A), 0 }, -/*16*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*17*/ { "pop", FALSE, NONE, op1(Si), 0 }, - -/*18*/ { "sbb", TRUE, BYTE, op2(R, E), 0 }, -/*19*/ { "sbb", TRUE, LONG, op2(R, E), 0 }, -/*1a*/ { "sbb", TRUE, BYTE, op2(E, R), 0 }, -/*1b*/ { "sbb", TRUE, LONG, op2(E, R), 0 }, -/*1c*/ { "sbb", FALSE, BYTE, op2(I, A), 0 }, -/*1d*/ { "sbb", FALSE, LONG, op2(Is, A), 0 }, -/*1e*/ { "push", FALSE, NONE, op1(Si), 0 }, -/*1f*/ { "pop", FALSE, NONE, op1(Si), 0 }, - -/*20*/ { "and", TRUE, BYTE, op2(R, E), 0 }, -/*21*/ { "and", TRUE, LONG, op2(R, E), 0 }, -/*22*/ { "and", TRUE, BYTE, op2(E, R), 0 }, -/*23*/ { "and", TRUE, LONG, op2(E, R), 0 }, -/*24*/ { "and", FALSE, BYTE, op2(I, A), 0 }, -/*25*/ { "and", FALSE, LONG, op2(I, A), 0 }, -/*26*/ { "", FALSE, NONE, 0, 0 }, -/*27*/ { "daa", FALSE, NONE, 0, 0 }, - -/*28*/ { "sub", TRUE, BYTE, op2(R, E), 0 }, -/*29*/ { "sub", TRUE, LONG, op2(R, E), 0 }, -/*2a*/ { "sub", TRUE, BYTE, op2(E, R), 0 }, -/*2b*/ { "sub", TRUE, LONG, op2(E, R), 0 }, -/*2c*/ { "sub", FALSE, BYTE, op2(I, A), 0 }, -/*2d*/ { "sub", FALSE, LONG, op2(Is, A), 0 }, -/*2e*/ { "", FALSE, NONE, 0, 0 }, -/*2f*/ { "das", FALSE, NONE, 0, 0 }, - -/*30*/ { "xor", TRUE, BYTE, op2(R, E), 0 }, -/*31*/ { "xor", TRUE, LONG, op2(R, E), 0 }, -/*32*/ { "xor", TRUE, BYTE, op2(E, R), 0 }, -/*33*/ { "xor", TRUE, LONG, op2(E, R), 0 }, -/*34*/ { "xor", FALSE, BYTE, op2(I, A), 0 }, -/*35*/ { "xor", FALSE, LONG, op2(I, A), 0 }, -/*36*/ { "", FALSE, NONE, 0, 0 }, -/*37*/ { "aaa", FALSE, NONE, 0, 0 }, - -/*38*/ { "cmp", TRUE, BYTE, op2(R, E), 0 }, -/*39*/ { "cmp", TRUE, LONG, op2(R, E), 0 }, -/*3a*/ { "cmp", TRUE, BYTE, op2(E, R), 0 }, -/*3b*/ { "cmp", TRUE, LONG, op2(E, R), 0 }, -/*3c*/ { "cmp", FALSE, BYTE, op2(I, A), 0 }, -/*3d*/ { "cmp", FALSE, LONG, op2(Is, A), 0 }, -/*3e*/ { "", FALSE, NONE, 0, 0 }, -/*3f*/ { "aas", FALSE, NONE, 0, 0 }, - -/*40*/ { "rex", FALSE, NONE, 0, 0 }, -/*41*/ { "rex.b", FALSE, NONE, 0, 0 }, -/*42*/ { "rex.x", FALSE, NONE, 0, 0 }, -/*43*/ { "rex.xb", FALSE, NONE, 0, 0 }, -/*44*/ { "rex.r", FALSE, NONE, 0, 0 }, -/*45*/ { "rex.rb", FALSE, NONE, 0, 0 }, -/*46*/ { "rex.rx", FALSE, NONE, 0, 0 }, -/*47*/ { "rex.rxb", FALSE, NONE, 0, 0 }, - -/*48*/ { "rex.w", FALSE, NONE, 0, 0 }, -/*49*/ { "rex.wb", FALSE, NONE, 0, 0 }, -/*4a*/ { "rex.wx", FALSE, NONE, 0, 0 }, -/*4b*/ { "rex.wxb", FALSE, NONE, 0, 0 }, -/*4c*/ { "rex.wr", FALSE, NONE, 0, 0 }, -/*4d*/ { "rex.wrb", FALSE, NONE, 0, 0 }, -/*4e*/ { "rex.wrx", FALSE, NONE, 0, 0 }, -/*4f*/ { "rex.wrxb", FALSE, NONE, 0, 0 }, - -/*50*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*51*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*52*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*53*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*54*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*55*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*56*/ { "push", FALSE, LONG, op1(Ri), 0 }, -/*57*/ { "push", FALSE, LONG, op1(Ri), 0 }, - -/*58*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*59*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5a*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5b*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5c*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5d*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5e*/ { "pop", FALSE, LONG, op1(Ri), 0 }, -/*5f*/ { "pop", FALSE, LONG, op1(Ri), 0 }, - -/*60*/ { "pusha", FALSE, LONG, 0, 0 }, -/*61*/ { "popa", FALSE, LONG, 0, 0 }, -/*62*/ { "bound", TRUE, LONG, op2(E, R), 0 }, -/*63*/ { "movslq", TRUE, NONE, op2(EL,R), 0 }, - -/*64*/ { "", FALSE, NONE, 0, 0 }, -/*65*/ { "", FALSE, NONE, 0, 0 }, -/*66*/ { "", FALSE, NONE, 0, 0 }, -/*67*/ { "", FALSE, NONE, 0, 0 }, - -/*68*/ { "push", FALSE, LONG, op1(I), 0 }, -/*69*/ { "imul", TRUE, LONG, op3(I,E,R), 0 }, -/*6a*/ { "push", FALSE, LONG, op1(Ibs), 0 }, -/*6b*/ { "imul", TRUE, LONG, op3(Ibs,E,R),0 }, -/*6c*/ { "ins", FALSE, BYTE, op2(DX, DI), 0 }, -/*6d*/ { "ins", FALSE, LONG, op2(DX, DI), 0 }, -/*6e*/ { "outs", FALSE, BYTE, op2(SI, DX), 0 }, -/*6f*/ { "outs", FALSE, LONG, op2(SI, DX), 0 }, - -/*70*/ { "jo", FALSE, NONE, op1(Db), 0 }, -/*71*/ { "jno", FALSE, NONE, op1(Db), 0 }, -/*72*/ { "jb", FALSE, NONE, op1(Db), 0 }, -/*73*/ { "jnb", FALSE, NONE, op1(Db), 0 }, -/*74*/ { "jz", FALSE, NONE, op1(Db), 0 }, -/*75*/ { "jnz", FALSE, NONE, op1(Db), 0 }, -/*76*/ { "jbe", FALSE, NONE, op1(Db), 0 }, -/*77*/ { "jnbe", FALSE, NONE, op1(Db), 0 }, - -/*78*/ { "js", FALSE, NONE, op1(Db), 0 }, -/*79*/ { "jns", FALSE, NONE, op1(Db), 0 }, -/*7a*/ { "jp", FALSE, NONE, op1(Db), 0 }, -/*7b*/ { "jnp", FALSE, NONE, op1(Db), 0 }, -/*7c*/ { "jl", FALSE, NONE, op1(Db), 0 }, -/*7d*/ { "jnl", FALSE, NONE, op1(Db), 0 }, -/*7e*/ { "jle", FALSE, NONE, op1(Db), 0 }, -/*7f*/ { "jnle", FALSE, NONE, op1(Db), 0 }, - -/*80*/ { "", TRUE, BYTE, op2(I, E), db_Grp1 }, -/*81*/ { "", TRUE, LONG, op2(I, E), db_Grp1 }, -/*82*/ { "", TRUE, BYTE, op2(I, E), db_Grp1 }, -/*83*/ { "", TRUE, LONG, op2(Ibs,E), db_Grp1 }, -/*84*/ { "test", TRUE, BYTE, op2(R, E), 0 }, -/*85*/ { "test", TRUE, LONG, op2(R, E), 0 }, -/*86*/ { "xchg", TRUE, BYTE, op2(R, E), 0 }, -/*87*/ { "xchg", TRUE, LONG, op2(R, E), 0 }, - -/*88*/ { "mov", TRUE, BYTE, op2(R, E), 0 }, -/*89*/ { "mov", TRUE, LONG, op2(R, E), 0 }, -/*8a*/ { "mov", TRUE, BYTE, op2(E, R), 0 }, -/*8b*/ { "mov", TRUE, LONG, op2(E, R), 0 }, -/*8c*/ { "mov", TRUE, NONE, op2(S, Ew), 0 }, -/*8d*/ { "lea", TRUE, LONG, op2(E, R), 0 }, -/*8e*/ { "mov", TRUE, NONE, op2(Ew, S), 0 }, -/*8f*/ { "pop", TRUE, LONG, op1(E), 0 }, - -/*90*/ { "nop", FALSE, NONE, 0, 0 }, -/*91*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*92*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*93*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*94*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*95*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*96*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, -/*97*/ { "xchg", FALSE, LONG, op2(A, Ri), 0 }, - -/*98*/ { "cwde", FALSE, SDEP, 0, "cbw" }, -/*99*/ { "cdq", FALSE, SDEP, 0, "cwd" }, -/*9a*/ { "lcall", FALSE, NONE, op1(OS), 0 }, -/*9b*/ { "wait", FALSE, NONE, 0, 0 }, -/*9c*/ { "pushf", FALSE, LONG, 0, 0 }, -/*9d*/ { "popf", FALSE, LONG, 0, 0 }, -/*9e*/ { "sahf", FALSE, NONE, 0, 0 }, -/*9f*/ { "lahf", FALSE, NONE, 0, 0 }, - -/*a0*/ { "mov", FALSE, BYTE, op2(O, A), 0 }, -/*a1*/ { "mov", FALSE, LONG, op2(O, A), 0 }, -/*a2*/ { "mov", FALSE, BYTE, op2(A, O), 0 }, -/*a3*/ { "mov", FALSE, LONG, op2(A, O), 0 }, -/*a4*/ { "movs", FALSE, BYTE, op2(SI,DI), 0 }, -/*a5*/ { "movs", FALSE, LONG, op2(SI,DI), 0 }, -/*a6*/ { "cmps", FALSE, BYTE, op2(SI,DI), 0 }, -/*a7*/ { "cmps", FALSE, LONG, op2(SI,DI), 0 }, - -/*a8*/ { "test", FALSE, BYTE, op2(I, A), 0 }, -/*a9*/ { "test", FALSE, LONG, op2(I, A), 0 }, -/*aa*/ { "stos", FALSE, BYTE, op1(DI), 0 }, -/*ab*/ { "stos", FALSE, LONG, op1(DI), 0 }, -/*ac*/ { "lods", FALSE, BYTE, op1(SI), 0 }, -/*ad*/ { "lods", FALSE, LONG, op1(SI), 0 }, -/*ae*/ { "scas", FALSE, BYTE, op1(SI), 0 }, -/*af*/ { "scas", FALSE, LONG, op1(SI), 0 }, - -/*b0*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b1*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b2*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b3*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b4*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b5*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b6*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b7*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, - -/*b8*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*b9*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*ba*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*bb*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*bc*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*bd*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*be*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, -/*bf*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, - -/*c0*/ { "", TRUE, BYTE, op2(Ib, E), db_Grp2 }, -/*c1*/ { "", TRUE, LONG, op2(Ib, E), db_Grp2 }, -/*c2*/ { "ret", FALSE, NONE, op1(Iw), 0 }, -/*c3*/ { "ret", FALSE, NONE, 0, 0 }, -/*c4*/ { "les", TRUE, LONG, op2(E, R), 0 }, -/*c5*/ { "lds", TRUE, LONG, op2(E, R), 0 }, -/*c6*/ { "mov", TRUE, BYTE, op2(I, E), 0 }, -/*c7*/ { "mov", TRUE, LONG, op2(I, E), 0 }, - -/*c8*/ { "enter", FALSE, NONE, op2(Iw, Ib), 0 }, -/*c9*/ { "leave", FALSE, NONE, 0, 0 }, -/*ca*/ { "lret", FALSE, NONE, op1(Iw), 0 }, -/*cb*/ { "lret", FALSE, NONE, 0, 0 }, -/*cc*/ { "int", FALSE, NONE, op1(o3), 0 }, -/*cd*/ { "int", FALSE, NONE, op1(Ib), 0 }, -/*ce*/ { "into", FALSE, NONE, 0, 0 }, -/*cf*/ { "iret", FALSE, NONE, 0, 0 }, - -/*d0*/ { "", TRUE, BYTE, op2(o1, E), db_Grp2 }, -/*d1*/ { "", TRUE, LONG, op2(o1, E), db_Grp2 }, -/*d2*/ { "", TRUE, BYTE, op2(CL, E), db_Grp2 }, -/*d3*/ { "", TRUE, LONG, op2(CL, E), db_Grp2 }, -/*d4*/ { "aam", FALSE, NONE, op1(Iba), 0 }, -/*d5*/ { "aad", FALSE, NONE, op1(Iba), 0 }, -/*d6*/ { ".byte\t0xd6", FALSE, NONE, 0, 0 }, -/*d7*/ { "xlat", FALSE, BYTE, op1(BX), 0 }, - -/*d8*/ { "", TRUE, NONE, 0, db_Esc8 }, -/*d9*/ { "", TRUE, NONE, 0, db_Esc9 }, -/*da*/ { "", TRUE, NONE, 0, db_Esca }, -/*db*/ { "", TRUE, NONE, 0, db_Escb }, -/*dc*/ { "", TRUE, NONE, 0, db_Escc }, -/*dd*/ { "", TRUE, NONE, 0, db_Escd }, -/*de*/ { "", TRUE, NONE, 0, db_Esce }, -/*df*/ { "", TRUE, NONE, 0, db_Escf }, - -/*e0*/ { "loopne",FALSE, NONE, op1(Db), 0 }, -/*e1*/ { "loope", FALSE, NONE, op1(Db), 0 }, -/*e2*/ { "loop", FALSE, NONE, op1(Db), 0 }, -/*e3*/ { "jrcxz", FALSE, ADEP, op1(Db), "jecxz" }, -/*e4*/ { "in", FALSE, BYTE, op2(Ib, A), 0 }, -/*e5*/ { "in", FALSE, LONG, op2(Ib, A) , 0 }, -/*e6*/ { "out", FALSE, BYTE, op2(A, Ib), 0 }, -/*e7*/ { "out", FALSE, LONG, op2(A, Ib) , 0 }, - -/*e8*/ { "call", FALSE, NONE, op1(Dl), 0 }, -/*e9*/ { "jmp", FALSE, NONE, op1(Dl), 0 }, -/*ea*/ { "ljmp", FALSE, NONE, op1(OS), 0 }, -/*eb*/ { "jmp", FALSE, NONE, op1(Db), 0 }, -/*ec*/ { "in", FALSE, BYTE, op2(DX, A), 0 }, -/*ed*/ { "in", FALSE, LONG, op2(DX, A) , 0 }, -/*ee*/ { "out", FALSE, BYTE, op2(A, DX), 0 }, -/*ef*/ { "out", FALSE, LONG, op2(A, DX) , 0 }, - -/*f0*/ { "", FALSE, NONE, 0, 0 }, -/*f1*/ { ".byte\t0xf1", FALSE, NONE, 0, 0 }, -/*f2*/ { "", FALSE, NONE, 0, 0 }, -/*f3*/ { "", FALSE, NONE, 0, 0 }, -/*f4*/ { "hlt", FALSE, NONE, 0, 0 }, -/*f5*/ { "cmc", FALSE, NONE, 0, 0 }, -/*f6*/ { "", TRUE, BYTE, 0, db_Grp3 }, -/*f7*/ { "", TRUE, LONG, 0, db_Grp3 }, - -/*f8*/ { "clc", FALSE, NONE, 0, 0 }, -/*f9*/ { "stc", FALSE, NONE, 0, 0 }, -/*fa*/ { "cli", FALSE, NONE, 0, 0 }, -/*fb*/ { "sti", FALSE, NONE, 0, 0 }, -/*fc*/ { "cld", FALSE, NONE, 0, 0 }, -/*fd*/ { "std", FALSE, NONE, 0, 0 }, -/*fe*/ { "", TRUE, NONE, 0, db_Grp4 }, -/*ff*/ { "", TRUE, NONE, 0, db_Grp5 }, +/*00*/ { "add", true, BYTE, op2(R, E), 0 }, +/*01*/ { "add", true, LONG, op2(R, E), 0 }, +/*02*/ { "add", true, BYTE, op2(E, R), 0 }, +/*03*/ { "add", true, LONG, op2(E, R), 0 }, +/*04*/ { "add", false, BYTE, op2(I, A), 0 }, +/*05*/ { "add", false, LONG, op2(Is, A), 0 }, +/*06*/ { "push", false, NONE, op1(Si), 0 }, +/*07*/ { "pop", false, NONE, op1(Si), 0 }, + +/*08*/ { "or", true, BYTE, op2(R, E), 0 }, +/*09*/ { "or", true, LONG, op2(R, E), 0 }, +/*0a*/ { "or", true, BYTE, op2(E, R), 0 }, +/*0b*/ { "or", true, LONG, op2(E, R), 0 }, +/*0c*/ { "or", false, BYTE, op2(I, A), 0 }, +/*0d*/ { "or", false, LONG, op2(I, A), 0 }, +/*0e*/ { "push", false, NONE, op1(Si), 0 }, +/*0f*/ { "", false, ESC, 0, db_inst_0f }, + +/*10*/ { "adc", true, BYTE, op2(R, E), 0 }, +/*11*/ { "adc", true, LONG, op2(R, E), 0 }, +/*12*/ { "adc", true, BYTE, op2(E, R), 0 }, +/*13*/ { "adc", true, LONG, op2(E, R), 0 }, +/*14*/ { "adc", false, BYTE, op2(I, A), 0 }, +/*15*/ { "adc", false, LONG, op2(Is, A), 0 }, +/*16*/ { "push", false, NONE, op1(Si), 0 }, +/*17*/ { "pop", false, NONE, op1(Si), 0 }, + +/*18*/ { "sbb", true, BYTE, op2(R, E), 0 }, +/*19*/ { "sbb", true, LONG, op2(R, E), 0 }, +/*1a*/ { "sbb", true, BYTE, op2(E, R), 0 }, +/*1b*/ { "sbb", true, LONG, op2(E, R), 0 }, +/*1c*/ { "sbb", false, BYTE, op2(I, A), 0 }, +/*1d*/ { "sbb", false, LONG, op2(Is, A), 0 }, +/*1e*/ { "push", false, NONE, op1(Si), 0 }, +/*1f*/ { "pop", false, NONE, op1(Si), 0 }, + +/*20*/ { "and", true, BYTE, op2(R, E), 0 }, +/*21*/ { "and", true, LONG, op2(R, E), 0 }, +/*22*/ { "and", true, BYTE, op2(E, R), 0 }, +/*23*/ { "and", true, LONG, op2(E, R), 0 }, +/*24*/ { "and", false, BYTE, op2(I, A), 0 }, +/*25*/ { "and", false, LONG, op2(I, A), 0 }, +/*26*/ { "", false, NONE, 0, 0 }, +/*27*/ { "daa", false, NONE, 0, 0 }, + +/*28*/ { "sub", true, BYTE, op2(R, E), 0 }, +/*29*/ { "sub", true, LONG, op2(R, E), 0 }, +/*2a*/ { "sub", true, BYTE, op2(E, R), 0 }, +/*2b*/ { "sub", true, LONG, op2(E, R), 0 }, +/*2c*/ { "sub", false, BYTE, op2(I, A), 0 }, +/*2d*/ { "sub", false, LONG, op2(Is, A), 0 }, +/*2e*/ { "", false, NONE, 0, 0 }, +/*2f*/ { "das", false, NONE, 0, 0 }, + +/*30*/ { "xor", true, BYTE, op2(R, E), 0 }, +/*31*/ { "xor", true, LONG, op2(R, E), 0 }, +/*32*/ { "xor", true, BYTE, op2(E, R), 0 }, +/*33*/ { "xor", true, LONG, op2(E, R), 0 }, +/*34*/ { "xor", false, BYTE, op2(I, A), 0 }, +/*35*/ { "xor", false, LONG, op2(I, A), 0 }, +/*36*/ { "", false, NONE, 0, 0 }, +/*37*/ { "aaa", false, NONE, 0, 0 }, + +/*38*/ { "cmp", true, BYTE, op2(R, E), 0 }, +/*39*/ { "cmp", true, LONG, op2(R, E), 0 }, +/*3a*/ { "cmp", true, BYTE, op2(E, R), 0 }, +/*3b*/ { "cmp", true, LONG, op2(E, R), 0 }, +/*3c*/ { "cmp", false, BYTE, op2(I, A), 0 }, +/*3d*/ { "cmp", false, LONG, op2(Is, A), 0 }, +/*3e*/ { "", false, NONE, 0, 0 }, +/*3f*/ { "aas", false, NONE, 0, 0 }, + +/*40*/ { "rex", false, NONE, 0, 0 }, +/*41*/ { "rex.b", false, NONE, 0, 0 }, +/*42*/ { "rex.x", false, NONE, 0, 0 }, +/*43*/ { "rex.xb", false, NONE, 0, 0 }, +/*44*/ { "rex.r", false, NONE, 0, 0 }, +/*45*/ { "rex.rb", false, NONE, 0, 0 }, +/*46*/ { "rex.rx", false, NONE, 0, 0 }, +/*47*/ { "rex.rxb", false, NONE, 0, 0 }, + +/*48*/ { "rex.w", false, NONE, 0, 0 }, +/*49*/ { "rex.wb", false, NONE, 0, 0 }, +/*4a*/ { "rex.wx", false, NONE, 0, 0 }, +/*4b*/ { "rex.wxb", false, NONE, 0, 0 }, +/*4c*/ { "rex.wr", false, NONE, 0, 0 }, +/*4d*/ { "rex.wrb", false, NONE, 0, 0 }, +/*4e*/ { "rex.wrx", false, NONE, 0, 0 }, +/*4f*/ { "rex.wrxb", false, NONE, 0, 0 }, + +/*50*/ { "push", false, LONG, op1(Ri), 0 }, +/*51*/ { "push", false, LONG, op1(Ri), 0 }, +/*52*/ { "push", false, LONG, op1(Ri), 0 }, +/*53*/ { "push", false, LONG, op1(Ri), 0 }, +/*54*/ { "push", false, LONG, op1(Ri), 0 }, +/*55*/ { "push", false, LONG, op1(Ri), 0 }, +/*56*/ { "push", false, LONG, op1(Ri), 0 }, *** 1981 LINES SKIPPED *** From nobody Fri Feb 2 23:24:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRX161YHnz58VvF for ; Fri, 2 Feb 2024 23:24:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRX156qghz48tx for ; Fri, 2 Feb 2024 23:24:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40fcf6942bcso91645e9.0 for ; Fri, 02 Feb 2024 15:24:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706916280; x=1707521080; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JutS0ysruJhgxMH9ohXG0xk6TL2kQ4UYUeqolPXzkpY=; b=Xl9c/J9MkXlzTVysqyIW+GCfV0wk/7HUnljkaXfDsSZlUVCf9icxHGsIB6ofH1FFuL H4JCKSgoQbvVd7rBvvdZltPjamEb4MqPpTyBRonjJD853ZSK90AJoH2WS0dAzFw382/i JC2fbWhzbDw0RnhbBwfP/FWqUqVBzMBPa46C/qou+ID4iRhHAm3XXuR8jk1IkFbk/gQY vdYDHS+oNGyE3aDNWK+1ACxGVe/03HpQ+eJIiPxF5jqybN0dOr0GC/2zvWqIGQbmpbsG okE4XJqrBTtSZQv7+Le0F6NCQ6AyBm+C0hIErnk7CuEhfv6zUEGdfh+YHT8/3d/pop1j gnkA== X-Gm-Message-State: AOJu0YzG6d0FUCF9wbD9pk4bMXWRJ7HTqT8AqUowncuUxyTkRFx++zg8 QSZ2M1poJOuAyKoZIKJYFp5DSjEtrQy8dgtMonUjrEpDUCT6zxiUJBit/XnkxSs= X-Google-Smtp-Source: AGHT+IEoxBonMNOjbD4LTrgJAkZ84Lll4rx7Jme9VRTyWicM41+CHflPWNJw7iW5RF+m+Ho+fUfdug== X-Received: by 2002:a05:600c:468c:b0:40e:fb4c:c171 with SMTP id p12-20020a05600c468c00b0040efb4cc171mr46545wmo.11.1706916280208; Fri, 02 Feb 2024 15:24:40 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUGIitibsCjdlT6k+p/KNkqpgpyiWdVUQXOdF1W8xPphDkFtzzbJdU9BrgRVaU7GMapIAUgeKfQVyQFzhDWD6e6aB0QPfvFipVqRGt+Bb97aeuUz9FxqKE4m2yIdljtXAKWZ0vFL2HHDNH9xCSAV+6/f3gFTNShVWdBxM10CxGbsOa2QM1c3VIjL5VXSxo= Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id j17-20020a05600c1c1100b0040fbdd6f69bsm1171618wms.33.2024.02.02.15.24.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2024 15:24:39 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 834517eff8aa - main - x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels From: Jessica Clarke In-Reply-To: Date: Fri, 2 Feb 2024 23:24:29 +0000 Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <76A2B22D-565F-4CC5-B135-291624DA1E1F@freebsd.org> References: <202402021959.412JxKop038336@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TRX156qghz48tx 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:15169, ipnet:209.85.128.0/17, country:US] On 2 Feb 2024, at 22:45, John Baldwin wrote: > On 2/2/24 11:59 AM, Warner Losh wrote: >> The branch main has been updated by imp: >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D834517eff8aaab46760645619b880d97= f23ab61b >> commit 834517eff8aaab46760645619b880d97f23ab61b >> Author: Mina Gali=C4=87 >> AuthorDate: 2024-02-02 19:46:01 +0000 >> Commit: Warner Losh >> CommitDate: 2024-02-02 19:51:51 +0000 >> x86 & arm: remove CAM_DEBUG_FLAGS=3D from MMCCAM kernels >> we leave `options CAMDEBUG` enabled, so that when needed, = CAM debugging >> can be enabled *as needed*, rather than setting a default of = everything. >> Reviewed by: imp >> Pull Request: https://github.com/freebsd/freebsd-src/pull/798 >> --- >=20 > Would it make sense to have a sys/conf/std.MMCCAM and the various = GENERIC-MMCCAM > could just be include GENERIC, ident, include std.MMCCAM? >=20 > (Related, I wonder if we want to have std.DEBUG and std.NODEBUG for = use in > GENERIC and GENERIC-*DEBUG.) We have sys/conf/std.nodebug (not NODEBUG, which slightly bugs me) already. Extending the set of things would be sensible. I=E2=80=99d also = like to see a std.GENERIC that includes all the MI things you expect in a GENERIC kernel, and I guess a std.MINIMAL that=E2=80=99s the core subset = of that. Jess From nobody Fri Feb 2 23:32:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRXBd0tzyz58X22; Fri, 2 Feb 2024 23:32: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 4TRXBd0Ls3z49hs; Fri, 2 Feb 2024 23:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706916777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5i4Zascbu3a23jEdwmyEya+vyms9whFSHpjKSbPmw4=; b=R/qSoTHCeAlwxJe/HtYUVkmGrp53AN5jcLTbiV7ESSDrmYw4zENw0kF4qmxXbh37755/CA sKlvcJQ4BP0axdufz7I2Q41MxUwx2OEIm3aLqacj/HO5mGoxPVN++uPAo1ofUl0248ehS7 jNwYsFi5iJ3vjuu1XC0QlF9Z2Mr+RHnLLzUbzxxiACFNulYkhEUclca58u03RmA6Vx8xqk KZJD8AzgZxSeXK4sScCqqolVKA8fS031LGZnMsQd0zRyXOwhpNzVB6mCXj83Z7t4GeWitQ pVWt85H8AZBUmym09SdgjnyDR4OV2q16l6ywt/Tgu8U0fReHcDuaANU/HT0bSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706916777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5i4Zascbu3a23jEdwmyEya+vyms9whFSHpjKSbPmw4=; b=WlYXLdfJ8zwZhJNNzDaYe3iKZHNIPlxgO/ODQuJ1vHYLiLjtu1bw6lecQL6I/nnv0MHDt0 Me1x2HfLme10CBbUJZK/fOPLf553qeqckGR59l4pYx73oOOPxsf5X9jMALdrBWxfAab2xA EH+xKHa/b3RkoW8kNtc9sqmAqphr7l1k7AurNivzTWIdJWwUKLcQcHydLxFFYz7n6+rvyt 0a81vCsgRlfLj4z9f0F4B4B8HAvao/mo0o1yqkri0GqbpK+5nPvxA8IVTS8ifK36UD6enI wUOV+XZjR0XgTiqQDD08gfcOR2YKMdW/6YTXgKn85+4ZT0l2vaI5+DyI2hU+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706916777; a=rsa-sha256; cv=none; b=hkxt8AZhGbvBF0tl/lmsxx8hq0jZSyVAdZ/IGJxEcYGOEFt6rjfvOttDHf5HkvTb+OyGRG fx61Y3EdPXTuNKavefrJRVjqt71urt40rihTLW/Is1D/Q6kKIiFKSfnxyTMxOMRPjklATR yMXHP30IwFpukd2Af40QI8ItHQwUdt210+HsM4STGRoQlRvPboZex5sVxoP3dQJC9cmw4b qftnlUsTANtv7IMlQ36VPYUtORi0qdfPv7gzWvdua/0ZtKB1vh/jbV9rNnphZIxtJ/I7d8 CbUGd56+LIsyCo/RFbGXT0lWMg7n3n/i6w4A+cgyQ5SZoQNsoYsL+GTpO5An8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRXBc6XDyzqQv; Fri, 2 Feb 2024 23:32: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 412NWuIj009039; Fri, 2 Feb 2024 23:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412NWuL7009036; Fri, 2 Feb 2024 23:32:56 GMT (envelope-from git) Date: Fri, 2 Feb 2024 23:32:56 GMT Message-Id: <202402022332.412NWuL7009036@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: 9eb4e0b42d7c - main - x86 mem: Pass standard bool value to pmap_demote_DMAP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eb4e0b42d7cf490254ccd2d725f2b0f6c396831 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9eb4e0b42d7cf490254ccd2d725f2b0f6c396831 commit 9eb4e0b42d7cf490254ccd2d725f2b0f6c396831 Author: John Baldwin AuthorDate: 2024-02-02 23:32:07 +0000 Commit: John Baldwin CommitDate: 2024-02-02 23:32:44 +0000 x86 mem: Pass standard bool value to pmap_demote_DMAP --- sys/x86/x86/x86_mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/x86_mem.c b/sys/x86/x86/x86_mem.c index c6d1b7a4f126..d350ca22e257 100644 --- a/sys/x86/x86/x86_mem.c +++ b/sys/x86/x86/x86_mem.c @@ -183,7 +183,7 @@ x86_mr_split_dmap(struct mem_range_softc *sc __unused) mrd = sc->mr_desc + i; for (; i < sc->mr_ndesc; i++, mrd++) { if ((mrd->mr_flags & (MDF_ACTIVE | MDF_BOGUS)) == MDF_ACTIVE) - pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, TRUE); + pmap_demote_DMAP(mrd->mr_base, mrd->mr_len, true); } #endif } From nobody Sat Feb 3 00:24:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRYLP370hz58c71; Sat, 3 Feb 2024 00:24:45 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [IPv6:2a01:4f8:13b:240c::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRYLP10jKz4HYR; Sat, 3 Feb 2024 00:24:45 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; none Date: Sat, 3 Feb 2024 01:24:36 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1706919876; bh=k7jYJbDAEv08NejftPMNyFF75Q4OixTsRbwX/727Xj4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=JTfRf6XgoEkJPdR/2Lr+BS6EdJplQBH0mYlizVNhMSZM1YwJFN4nWNKAjyZoYgj2d k7E8LAb17UU/GY32wVMPvPMa2FUcJnN+xne3o8izTcthWxhkGVnHlu9323bbvXw0tv /fTFbF5JwKrqoKz3yKGFTb1CZua4NRfr4TIY9qj23V5dEs1Mf2nKi4KPuCwPewb33x tPwVQs1kp4NuCvZtXv3LGXK7SYDGwhyp2zx5kzJwzaYoHCZugCg1tjXvwDskAWuLjB zAYr9q+7UCP17qHSB9y7tYpwCq7i2EhXdihMK8/ZClSn8dWYbO9UdU72JXosyj7d2D XWkf2XjNQ2Utg== From: "Herbert J. Skuhra" To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e0c4386e7e71 - main - OpenSSL: Vendor import of OpenSSL 3.0.13 Message-ID: References: <202402022122.412LM8E8088467@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202402022122.412LM8E8088467@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4TRYLP10jKz4HYR 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:24940, ipnet:2a01:4f8::/32, country:DE] On Fri, Feb 02, 2024 at 09:22:08PM +0000, Cy Schubert wrote: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e0c4386e7e71d93b0edc0c8fa156263fc4a8b0b6 > > commit e0c4386e7e71d93b0edc0c8fa156263fc4a8b0b6 > Merge: fbae308319b7 9dd13e84fa8e > Author: Cy Schubert > AuthorDate: 2024-02-02 21:10:22 +0000 > Commit: Cy Schubert > CommitDate: 2024-02-02 21:21:36 +0000 > > OpenSSL: Vendor import of OpenSSL 3.0.13 > > * Fixed PKCS12 Decoding crashes ([CVE-2024-0727]) > * Fixed Excessive time spent checking invalid RSA public keys > ([CVE-2023-6237]) > * Fixed POLY1305 MAC implementation corrupting vector registers on > PowerPC CPUs which support PowerISA 2.07 ([CVE-2023-6129]) > * Fix excessive time spent in DH check / generation with large Q > parameter value ([CVE-2023-5678]) > > Release notes can be found at > https://www.openssl.org/news/openssl-3.0-notes.html. > > Approved by: emaste > MFC after: 3 days > > Merge commit '9dd13e84fa8eca8f3462bd55485aa3da8c37f54a' crypto/openssl/include/openssl/opensslv.h was not updated: % openssl version OpenSSL 3.0.12 24 Oct 2023 (Library: OpenSSL 3.0.12 24 Oct 2023 -- Herbert From nobody Sat Feb 3 00:37:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRYcX4nvHz58cyh; Sat, 3 Feb 2024 00:37: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 4TRYcX4HwHz4JrX; Sat, 3 Feb 2024 00:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706920620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgJjTa+WbcmXoa8BXsrhrje+G1OLGy/wWJBx5s1SgeA=; b=LenKnklVUAYwyae7nkNnKAko2hkQAPs20aEHAfPs3mjcCYREQxpTC6okEbqqxvh50QWkyR lXqXwMzUNKwd5aQ3uMfTcPoO59yoaJmO6UEqwbYycGPrfxQ1hjdM8xePFkD5l6+hrabiDA Jj8rul7AaR1DNoZSOC7/GcKTo/pBIXSr9ggN4B3OofGxe5Qr44zJU7oVo/yD0BUjL5CGPc qVnihaL4zI+FSuYAnLb8Q77d6Fj0TLMeLJvB9gim3S0DcTammUKTcMyn6UNK6LRkIQJ9wm ga+Hrcxvs64NOeLVQxZVPPGBRIyvnaWVtEGM1IxVChu9y0rukiPdJc7tOUROvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706920620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgJjTa+WbcmXoa8BXsrhrje+G1OLGy/wWJBx5s1SgeA=; b=p0dX+bAqQAIpZuzuzk7lnw+rCiKLO+trjemlX1I2fH/uIuKE5Lmy7xMuG7wPel/o1x6OSG xlO8k4QVh2/oU9LEEMCWFiQkLX1zucZ3lUPX6cTpdBkBEipQyIkPMCkef50zwX+o2dEA/Y DmOxCFuskeYKsak4xNVGtA9q3kROo2Xdk38dFZ0MErHmp/qvAwhv6BxC6aYlEtW2pth0uB 5qSlQhnPHpDIXan9luXXh0eYF2wNOtTwqnY9uuOSgo0RxqSZpzne08Jx2nWzIGZCgMFaOB Y+oA7uMb8nSPfucLo7vX6EmlRMENdG39UB/6vnbQ7qJnL1D03XjOoYbppn0R6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706920620; a=rsa-sha256; cv=none; b=Egl5rrikTTOW+wN+a5hOr2BYuIm2IMe6cOt0CaN3G9eTB/GTmCbE/k51VFe6MoRCuvytIe KOX9knIPfqmobuwA9iK31vuC87ONPR+Q6cvl0sDPzJsFpGPsONtbNJPX4DW4YkrT+yq/HT vz9D4Hc6AWyNAN0l6LlXAErgeCsAkvTGd/lK/Tp8AfNVN0mx60hn3C90P7mNIDp4PJ/kkm R2Llsfvdxa2Ojps2ox5m0fEqvmBZOTZ70cDzV3Yx+Azz2dZHoyNA3PpDCdfpuQ9FPkn/bC I9zZc/3qxj5MY1+906g+R/X4Cg0pAjVVa7S/EotmjDvP3UzSBzIY2N/UUi78CA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRYcX3M3jzrrV; Sat, 3 Feb 2024 00:37: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 4130b0Df009948; Sat, 3 Feb 2024 00:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4130b0WJ009945; Sat, 3 Feb 2024 00:37:00 GMT (envelope-from git) Date: Sat, 3 Feb 2024 00:37:00 GMT Message-Id: <202402030037.4130b0WJ009945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 74fe298c8299 - main - OpenSSL: Update version strings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74fe298c8299fdb8c8f761728ddd245b0c3fe04a Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=74fe298c8299fdb8c8f761728ddd245b0c3fe04a commit 74fe298c8299fdb8c8f761728ddd245b0c3fe04a Author: Cy Schubert AuthorDate: 2024-02-03 00:34:36 +0000 Commit: Cy Schubert CommitDate: 2024-02-03 00:34:36 +0000 OpenSSL: Update version strings Reported by: "Herbert J. Skuhra" Fixes: 9eb4e0b42d7c MFC after: 3 days --- crypto/openssl/include/openssl/opensslv.h | 8 ++++---- secure/lib/libcrypto/Makefile.inc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 73590b76ca70..b35da9255c44 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 12 +# define OPENSSL_VERSION_PATCH 13 /* * Additional version information @@ -74,8 +74,8 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.12" -# define OPENSSL_FULL_VERSION_STR "3.0.12" +# define OPENSSL_VERSION_STR "3.0.13" +# define OPENSSL_FULL_VERSION_STR "3.0.13" /* * SECTION 3: ADDITIONAL METADATA @@ -88,7 +88,7 @@ extern "C" { * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.13 24 Oct 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 65925f972ba7..de24bfb1038a 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -2,8 +2,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 3.0.12 -OPENSSL_DATE= 2023-10-24 +OPENSSL_VER= 3.0.13 +OPENSSL_DATE= 2024-02-02 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc From nobody Sat Feb 3 01:27:58 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZlc3lqhz58jps for ; Sat, 3 Feb 2024 01:28:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRZlb4K1sz4PF3 for ; Sat, 3 Feb 2024 01:28:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-40e800461baso22976685e9.3 for ; Fri, 02 Feb 2024 17:28:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706923690; x=1707528490; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YGKufzp1YpsMWdrw+o0fb/Ac1n2RAZNAVo1WvPD7SRw=; b=oG5W/UTDKqretEJDvud3CAzPaHr/up/SZVLni0uQPgUlpVam4XXHfOgQRXCwnV5FJf ESCnYsBOEUk9142iq+L4vI12CNJnsiaG5VDSGeERPyWXiXwEQFAu43laDcBL2dMsY0MW 2pqHi0+CmYXvGV/e6U9vysDDW/fuKaJfUOQox8kPlKf7YCT0OyKleSHkHVAgXYIwTHFn mK4qUvzGxa9wkqxvbw07r6CKlZjDVTi9RoB+z3JdAmd5jocIEhlPi93Xc+eZ6nAckIZq ecpEMCblBIp4asAmHE+bZ8WgvyWNSOkZKkmIA2eKFoVzbtMXInk4FCQI+/oUDLr4Q4uL Paew== X-Gm-Message-State: AOJu0YzAdJuvi9yAEDDRnxaxIR2ARKxFXz2mQBwdinTgnEyKYM+xgxRZ pofLqfb5eDmhaEb+p1oQsBZe+pZ8bUqFVuRJeI4ncSzJ02VUJjjEmZu7rJ5RZ44= X-Google-Smtp-Source: AGHT+IFvvQyGuh3xQwKTn0xLvMqIqSS/Gxuddlv6UZdZmHP0PLlp/0iL6NqkXsSfrQ6LxRlYYiOKwQ== X-Received: by 2002:a5d:4f0c:0:b0:33b:274e:af5 with SMTP id c12-20020a5d4f0c000000b0033b274e0af5mr1527495wru.60.1706923689721; Fri, 02 Feb 2024 17:28:09 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX2812Tsv9IQZ7mq86okztVGkCKngChwJGo9CMgUeByYzPhoOG+napVWZAVxdkIWuo1oX2gb9B7a9chzOD+stUczXrJGf/MMl7CJBCtrSM38csBQrUc50bsE+XCQRV41H8PQpp+XQiVUkWo1WYO8EMkag== Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id k6-20020adfe8c6000000b0033af3294417sm2982781wrn.21.2024.02.02.17.28.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2024 17:28:09 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 009d3f66cb5f - main - bsdinstall: separate out dist selection in prep for pkgbase support From: Jessica Clarke In-Reply-To: <1D1F0A7A-C735-4D6F-B333-39920E84CD5D@freebsd.org> Date: Sat, 3 Feb 2024 01:27:58 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> <1D1F0A7A-C735-4D6F-B333-39920E84CD5D@freebsd.org> To: Brad Davis X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.40 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.44:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.44:from] X-Rspamd-Queue-Id: 4TRZlb4K1sz4PF3 On 31 Jan 2024, at 22:15, Jessica Clarke wrote: > On 31 Jan 2024, at 22:05, Brad Davis wrote: >>=20 >> The branch main has been updated by brd: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D009d3f66cb5f0cf3f1d353f311d3a687= 8b2a534e >>=20 >> commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e >> Author: Brad Davis >> AuthorDate: 2024-01-26 17:46:46 +0000 >> Commit: Brad Davis >> CommitDate: 2024-01-31 22:05:27 +0000 >>=20 >> bsdinstall: separate out dist selection in prep for pkgbase support >>=20 >> No functional change intended. >>=20 >> Approved by: asiciliano >> Sponsored by: Rubicon Communications, LLC ("Netgate") >> Differential Revision: https://reviews.freebsd.org/D43621 >> --- >> usr.sbin/bsdinstall/scripts/auto | 40 ++++-------------- >> usr.sbin/bsdinstall/scripts/selectdists | 73 = +++++++++++++++++++++++++++++++++ >> usr.sbin/bsdinstall/startbsdinstall | 1 + >> 3 files changed, 82 insertions(+), 32 deletions(-) >>=20 >> diff --git a/usr.sbin/bsdinstall/scripts/auto = b/usr.sbin/bsdinstall/scripts/auto >> index 9f4b5b52fe5d..c651d654d62e 100755 >> --- a/usr.sbin/bsdinstall/scripts/auto >> +++ b/usr.sbin/bsdinstall/scripts/auto >> @@ -153,36 +153,10 @@ trap true SIGINT # This section is optional >> trap error SIGINT # Catch cntrl-C here >> if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || = error "Set hostname failed"; fi >>=20 >> -export DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >> -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >> - DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print = $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` >> - DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >> - >> - if [ -n "$DISTMENU" ]; then >> - exec 5>&1 >> - EXTRA_DISTS=3D$( eval bsddialog \ >> - --backtitle \"$OSNAME Installer\" \ >> - --title \"Distribution Select\" --nocancel --separate-output \ >> - --checklist \"Choose optional system components to install:\" \ >> - 0 0 0 $DISTMENU \ >> - 2>&1 1>&5 ) >> - for dist in $EXTRA_DISTS; do >> - export DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >> - done >> - fi >> -fi >> - >> -FETCH_DISTRIBUTIONS=3D"" >> -for dist in $DISTRIBUTIONS; do >> - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >> - FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >> - fi >> -done >> - >> -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; = then >> - bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 >> - bsdinstall netconfig || error >> - NETCONFIG_DONE=3Dyes >> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >> + exec 5>&1 >> + export DISTRIBUTIONS=3D$( `dirname $0`/selectdists 2>&1 1>&5 ) >> + exec 5>&- >> fi >>=20 >> rm -f $PATH_FSTAB >> @@ -347,8 +321,10 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then >>=20 >> [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote = distributions" >> fi >> -bsdinstall checksum || error "Distribution checksum failed" >> -bsdinstall distextract || error "Distribution extract failed" >> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >> + bsdinstall checksum || error "Distribution checksum failed" >> + bsdinstall distextract || error "Distribution extract failed" >> +fi >>=20 >> # Set up boot loader >> bsdinstall bootconfig || error "Failed to configure bootloader" >> diff --git a/usr.sbin/bsdinstall/scripts/selectdists = b/usr.sbin/bsdinstall/scripts/selectdists >> new file mode 100644 >> index 000000000000..b548e82a95f8 >> --- /dev/null >> +++ b/usr.sbin/bsdinstall/scripts/selectdists >> @@ -0,0 +1,73 @@ >> +#!/bin/sh >> +#- >> +# Copyright (c) 2011 Nathan Whitehorn >> +# Copyright (c) 2013-2018 Devin Teske >> +# 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. >> +# >> +# >> +############################################################ = INCLUDES >> + >> +BSDCFG_SHARE=3D"/usr/share/bsdconfig" >> +. $BSDCFG_SHARE/common.subr || exit 1 >> + >> +############################################################ = CONFIGURATION >> + >> +# >> +# Default distributions >> +# >> +DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >> + >> +############################################################ MAIN >> + >> +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >> + DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print = $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` >> + DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >> + >> + if [ -n "$DISTMENU" ]; then >> + EXTRA_DISTS=3D$( eval bsddialog \ >> + --backtitle \"$OSNAME Installer\" \ >> + --title \"Distribution Select\" --nocancel --separate-output \ >> + --checklist \"Choose optional system components to install:\" \ >> + 0 0 0 $DISTMENU \ >> + 2>&1 >&3 ) >> + for dist in $EXTRA_DISTS; do >> + DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >> + done >> + fi >> +fi >> + >> +FETCH_DISTRIBUTIONS=3D"" >> +for dist in $DISTRIBUTIONS; do >> + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >> + FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >> + fi >> +done >> + >> +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; = then >> + bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 >> + bsdinstall netconfig || error >> + NETCONFIG_DONE=3Dyes >> +fi >> + >> +echo $DISTRIBUTIONS >&2 >> diff --git a/usr.sbin/bsdinstall/startbsdinstall = b/usr.sbin/bsdinstall/startbsdinstall >> index 63239c969ac6..8d9fb981c11d 100644 >> --- a/usr.sbin/bsdinstall/startbsdinstall >> +++ b/usr.sbin/bsdinstall/startbsdinstall >> @@ -6,6 +6,7 @@ >> : ${BSDDIALOG_EXTRA=3D3} >> : ${BSDDIALOG_ESC=3D5} >> : ${BSDDIALOG_ERROR=3D255} >> +export BSDINSTALL_USE_DISTRIBUTIONS=3Dy >=20 > I said it in the review and I=E2=80=99ll say it again here since you = decided to > just ignore me: this does not belong here. Please remove it and fix = the > default in selectdists. Firstly, ping on this. I still object to the approach taken here. Secondly, this commit was not at all tested. You do not install the new selectdists script, and so the installer falls over (in a rather cryptic way*). I am extremely unimpressed at ignoring reviewer comments and completely breaking the installer, and thus am immediately reverting this commit. It probably works if you install the script, but it=E2=80=99s your job to test that, not mine, so when you have a patch = that actually works please re-seek review and actually engage with the comments. Jess * The checksums script is fed garbage for DISTRIBUTIONS and gives: Error while extracting /usr/libexec/bsdinstall/auto:: Failed to open '/usr/freebsd-dist//usr/libexec/bsdinstall/auto:' since it=E2=80=99s interpreting the shell error message from auto of: /usr/libexec/bsdinstall/auto: /usr/libexec/bsdinstall/selectdists: = not found as a space-separated list of distributions.= From nobody Sat Feb 3 01:31:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZqb1lQ4z58jhV; Sat, 3 Feb 2024 01:31: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 4TRZqb0xFlz4PpC; Sat, 3 Feb 2024 01:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706923899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRRIUeBzZtwYJ6a0WV+Fglu1XFTYT6JLhqWSn5rJqYA=; b=Zj0UdrmG1fM509/Y7CONCOyvfPriAO9+zhF6oKrX8LgegPLrhhS+Q+42/nmKsGWN6iQWns FoMZWg1fssQvSvNNtH6xrRGtMQJol6lu/E5LJUoP5CQNjhu6yP1R9W2dwig8qWEgBVhsAq 0NVlFbLuwbRS2Zt6GWbO8ZKazKdandHAK4cYfYc7emFobbR3C9HK81S8Ve4SWBeEVdbDYJ dxvRKr8VsEklQLUTdZoi9y+WcBsIOWxsy0K/seSduK74eK2lg5Cjh2nILEG8ANJkVbJlIL J3hPB5hoyd8/qSZznx065KSGLoprYHj5arlBcH9RC8r498i8w2y1Hf/n+RJjUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706923899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRRIUeBzZtwYJ6a0WV+Fglu1XFTYT6JLhqWSn5rJqYA=; b=VlEwWayRODrYG3+F4/U+ay7L8yyi02YPryJWAJ+DVcaHOzly/AjpEOzL9EwoC4P6uU181Z M8UaSHidOMj3iOFiys9qfuyp4QgBLh4C2CcbbyNyEWepptt0wseHNIeoDuUNrGSBBxD9Z2 wQMaH6jXBWxDFXk84GYgUzWWhr63MiYWlY5Q7xpKN/UTaUH1tf4HVzkGE8eunLJ/Zj9zaX ST0L9xDD0kB1NVxO95BEWE9vfyLCLTFhQzgPvz4rrAwyWxpvZGjZM6GJG0zkCdMRFZFWB5 r/A2tbvMX+ijmMnfgdUhI6EF1Hm705pnK4hlHLe51vbz9kEk3WKAOWLDw2CSHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706923899; a=rsa-sha256; cv=none; b=X8k5BLlIQprIz4ePHump9os6UQx8orAzPfXu7V1OznB/q5KazfNXphiStCS10fE6hMLX8A YJ35JkcDmFA1nUJLaskLv4fIyPyZD9CZKGR8oAdeMv1nV8nt9nIEqWFB2bi6fH/bxaxeC9 yjBlxS/sTLbjB1JCxqnxZiZUE+RHPXrNw+d3IJuTz0O2tw0TpLEsle4Z8ckZUx5aO3wZt3 PuUn7MKaUD9FqMulN72S7A2S0FNy9A9mZL4/ZGg/q0mLClE13KwHx2MlWC+w1SypqsTbMB AjYG+l/Eez/lq4TfJnhzraRVVXgkFKVF2uqGJpP5Gq1hrNR6S5bNQ7ROnFAaGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZqb00D3ztBJ; Sat, 3 Feb 2024 01:31: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 4131VcKJ009773; Sat, 3 Feb 2024 01:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131Vc04009770; Sat, 3 Feb 2024 01:31:38 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:31:38 GMT Message-Id: <202402030131.4131Vc04009770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 7143521f4cbc - main - Revert "bsdinstall: separate out dist selection in prep for pkgbase support" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7143521f4cbc253884a001e9512920a8fe067837 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7143521f4cbc253884a001e9512920a8fe067837 commit 7143521f4cbc253884a001e9512920a8fe067837 Author: Jessica Clarke AuthorDate: 2024-02-03 01:31:11 +0000 Commit: Jessica Clarke CommitDate: 2024-02-03 01:31:11 +0000 Revert "bsdinstall: separate out dist selection in prep for pkgbase support" Firstly, my review comments were not addressed and instead totally ignored. Secondly, and a more valid justification for the revert, this completely breaks the installer, since selectdists isn't installed. Given the blatant lack of testing, back out this commit until it has actually been tested and review comments taken on board so that the installer actually works. This reverts commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e. --- usr.sbin/bsdinstall/scripts/auto | 40 ++++++++++++++---- usr.sbin/bsdinstall/scripts/selectdists | 73 --------------------------------- usr.sbin/bsdinstall/startbsdinstall | 1 - 3 files changed, 32 insertions(+), 82 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index c651d654d62e..9f4b5b52fe5d 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -153,10 +153,36 @@ trap true SIGINT # This section is optional trap error SIGINT # Catch cntrl-C here if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || error "Set hostname failed"; fi -if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then - exec 5>&1 - export DISTRIBUTIONS=$( `dirname $0`/selectdists 2>&1 1>&5 ) - exec 5>&- +export DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then + DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` + DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" + + if [ -n "$DISTMENU" ]; then + exec 5>&1 + EXTRA_DISTS=$( eval bsddialog \ + --backtitle \"$OSNAME Installer\" \ + --title \"Distribution Select\" --nocancel --separate-output \ + --checklist \"Choose optional system components to install:\" \ + 0 0 0 $DISTMENU \ + 2>&1 1>&5 ) + for dist in $EXTRA_DISTS; do + export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" + done + fi +fi + +FETCH_DISTRIBUTIONS="" +for dist in $DISTRIBUTIONS; do + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then + FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist" + fi +done + +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then + bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 + bsdinstall netconfig || error + NETCONFIG_DONE=yes fi rm -f $PATH_FSTAB @@ -321,10 +347,8 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributions" fi -if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then - bsdinstall checksum || error "Distribution checksum failed" - bsdinstall distextract || error "Distribution extract failed" -fi +bsdinstall checksum || error "Distribution checksum failed" +bsdinstall distextract || error "Distribution extract failed" # Set up boot loader bsdinstall bootconfig || error "Failed to configure bootloader" diff --git a/usr.sbin/bsdinstall/scripts/selectdists b/usr.sbin/bsdinstall/scripts/selectdists deleted file mode 100644 index b548e82a95f8..000000000000 --- a/usr.sbin/bsdinstall/scripts/selectdists +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -#- -# Copyright (c) 2011 Nathan Whitehorn -# Copyright (c) 2013-2018 Devin Teske -# 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. -# -# -############################################################ INCLUDES - -BSDCFG_SHARE="/usr/share/bsdconfig" -. $BSDCFG_SHARE/common.subr || exit 1 - -############################################################ CONFIGURATION - -# -# Default distributions -# -DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" - -############################################################ MAIN - -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then - DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` - DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')" - - if [ -n "$DISTMENU" ]; then - EXTRA_DISTS=$( eval bsddialog \ - --backtitle \"$OSNAME Installer\" \ - --title \"Distribution Select\" --nocancel --separate-output \ - --checklist \"Choose optional system components to install:\" \ - 0 0 0 $DISTMENU \ - 2>&1 >&3 ) - for dist in $EXTRA_DISTS; do - DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz" - done - fi -fi - -FETCH_DISTRIBUTIONS="" -for dist in $DISTRIBUTIONS; do - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then - FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist" - fi -done - -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then - bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 - bsdinstall netconfig || error - NETCONFIG_DONE=yes -fi - -echo $DISTRIBUTIONS >&2 diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index 8d9fb981c11d..63239c969ac6 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -6,7 +6,6 @@ : ${BSDDIALOG_EXTRA=3} : ${BSDDIALOG_ESC=5} : ${BSDDIALOG_ERROR=255} -export BSDINSTALL_USE_DISTRIBUTIONS=y kbdcontrol -d >/dev/null 2>&1 if [ $? -eq 0 ]; then From nobody Sat Feb 3 01:36:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZwz1p6Wz58kBZ; Sat, 3 Feb 2024 01:36: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 4TRZwz1Gd5z4QZ6; Sat, 3 Feb 2024 01:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VR8xeGlIjnI455tJwYOTCQlWleSYNh1gLRWepJ/zxMw=; b=q3Lec0oPH96ozqPc23cLeMKA34d02ci4YJ01+2tvsovwAy7LUeLosAlEWae7D0OYGP14Ht 9liV+4lrt39iqFjog/MW9nMYU6XvbH5OIG4aPsrNZrwWtmFgz8n14Zc0Imwj6LGWGx3J0+ uN2TnBebIlkPgPpjjUUKxGoIYBRCA9iiPaoymZSlJbpPox2xYDA2fuThtxla5el6y0HFL3 09cRag/xehTIkKr1lbXBuztxExVX8NpiHj/i/p6Y1tUKM+J5NVAW0aYH+WTWSiUEZYgfjQ 5ryKYg5mjcMtzmtsVEMtNyOpWnBdVKTIer0P0uoxA1C2Z/sConvS2T8fqX/+Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VR8xeGlIjnI455tJwYOTCQlWleSYNh1gLRWepJ/zxMw=; b=KbIHpCGner38Gw2IOnCZUQMf64jzi31tW1zJ9V8eZhPGJQaG404m/0PFFOCJSssMz4mZ3d CDzpIeI0hz0OM9gPsSiLGaQB/7LcWDBQTPLAyB1BqwlidwNuG08UtW9iTYmJ+La30AkTJ1 Tanw2wvxfIEOOXuf3fxleWcetHwj4jNQccLf96SMQrS1WRsOm1Lql2cF3wFF1pWDdfGKnf YNRn0V7enEl/tL1YAaUFXCW0Q4fmPU44DN1aOibDNbmrxx8c/WV/65RIKU27wJD8Zgh2HO MVTs65x187FAh2OZyI7N1AexZm9KaZ6sTzL8WWebk45WGiFL87Ws2jCa20eSOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924179; a=rsa-sha256; cv=none; b=bwCcJ7ZcN7jRmGBuQIi9eXdetuJszfvyNEiE+qSYz44xGbNfIkf6uaVRZr+6LfTRwDDBZY dVzJf9FunBuMQKi0Q+fsFCfs1cO5akKQ0D6V5d8okJh9aC/RAaK2uydwnLboMOJwowVl9M vGepssuFWgxNcYpY0SB2Z4qfZVepTDAO0ENnifhlDPCR6AKJHedcYwuBMEW4Xkl3zKD2wi ywZgni/CcmSvha1CqcgHre45UKzBEG6Gn24k3SlcDQmYs5uBK+1frCcltOOJ6DY55thAKG Ohk859SB0vBm08c1AOcxZ4flxtj+zTqdA8ou0s9X+CXUAFn0IhvRc9Pw9970tA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZwz0LFFztHB; Sat, 3 Feb 2024 01:36: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 4131aIYd010632; Sat, 3 Feb 2024 01:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aIOj010629; Sat, 3 Feb 2024 01:36:18 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:18 GMT Message-Id: <202402030136.4131aIOj010629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e85a6f8dff96 - main - man: fix redirect for locales and file arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e85a6f8dff96d33e7139a67f5b02dafaace0974c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e85a6f8dff96d33e7139a67f5b02dafaace0974c commit e85a6f8dff96d33e7139a67f5b02dafaace0974c Author: Mohamed Akram AuthorDate: 2024-02-02 23:26:20 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:34:59 +0000 man: fix redirect for locales and file arguments Use the locale-specific path for localized pages and the appropriate parent directory for file arguments when handling redirects. Signed-off-by: Mohamed Akram Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1019 --- usr.bin/man/man.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index 4be38083462c..fd51648757a9 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -297,7 +297,7 @@ manpath_warnings() { fi } -# Usage: man_check_for_so page path +# Usage: man_check_for_so path # Returns: True if able to resolve the file, false if it ended in tears. # Detects the presence of the .so directive and causes the file to be # redirected to another source file. @@ -317,7 +317,7 @@ man_check_for_so() { .so*) trim "${line#.so}" decho "$manpage includes $tstr" # Glob and check for the file. - if ! check_man "$path/$tstr" ""; then + if ! check_man "$1/$tstr" ""; then decho " Unable to find $tstr" return 1 fi @@ -501,7 +501,12 @@ man_find_and_display() { unset use_cat manpage="$1" setup_cattool "$manpage" - if man_check_for_so "$manpage" "$(dirname \"$manpage"")"; then + p=$(cd "$(dirname "$manpage")" && pwd) + case "$(basename "$p")" in + man*|cat*) p=$p/.. ;; + *) p=$p/../.. ;; + esac + if man_check_for_so "$p"; then found_page=yes man_display_page fi @@ -520,7 +525,7 @@ man_find_and_display() { # Check if there is a MACHINE specific manpath. if find_file $p $sect $MACHINE "$1"; then - if man_check_for_so "$manpage" $p; then + if man_check_for_so $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then @@ -534,7 +539,7 @@ man_find_and_display() { # Check if there is a MACHINE_ARCH # specific manpath. if find_file $p $sect $MACHINE_ARCH "$1"; then - if man_check_for_so "$manpage" $p; then + if man_check_for_so $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then @@ -547,7 +552,7 @@ man_find_and_display() { # Check plain old manpath. if find_file $p $sect '' "$1"; then - if man_check_for_so "$manpage" $p; then + if man_check_for_so $p; then found_page=yes man_display_page if [ -n "$aflag" ]; then From nobody Sat Feb 3 01:36:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx0425Dz58kRt; Sat, 3 Feb 2024 01:36: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 4TRZx01xclz4QRn; Sat, 3 Feb 2024 01:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyS0lr5jp+8+pWr3tDgYSvQBIo3R+4F4esl/tZblS+Q=; b=wDOBqolTAsKsdwD6Aty9hDUj78DLqjCsqfrW26O2EojN8xHwLTaHofXoA5ZxcQEYZQE57N NkrvzgzpJsJ7ef7NxFzKYYjYc+kYGIL64HKfGKVavJIqj0gxZ/obIzN6dMK/GtfkLAOtsm mVlKFWPIN9V7WYYRaKgXBQ4V7Rcnd9vlbBnS/Yid3hbauCAVSsOqrpoEsy3TQRBJwGPRvz mWfZORw9rpdXgStwXXCP2jwXFPZvdckTiB3vDevJp+pigkwS7d+l8Rk9GvtHpaqT7Oq3C+ ci4Pc8w3BIFl3WhQVi8UY4p5iMMbr00eYHxXIp5eW3qwAAHmcb9uYdInPGBEKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OyS0lr5jp+8+pWr3tDgYSvQBIo3R+4F4esl/tZblS+Q=; b=vtebYxba8e4C1pz1OERFIpv/42MdamibD8MXI6ClXR4jJq8jXFpu1rkml6GcNv88tQSW8r lA9wH4keip3KBbmDXP3highP0DO1mJKetYEl0vMR3e1mvowsus9zDgWnOY6neKIRhtuJoF sy2q3inDYrx4EM9BZb5qo6cTGESG+cXKOXTHMV9DhsI5JdIuvjXV34ItDEaXO8+BhNK2vs D5D7M3EwIDAzp4WEcDsAQomRV1EzQopm9cse9ZLJNQx5pmjVl+GcZkeTdi9AOGOxsHix0P 46CbwHyXYmP5/hXHflKSnR7ti2tJJXWvBYWrjGP2lUmOxVsy7ze0A7p1iIbg5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924180; a=rsa-sha256; cv=none; b=xIdEK1c/U2PWurLX3E+lNdk9w7FJfqklGoCJny+8lALg+qZvXOw6iZAFxzVkWsif4IT8EU DAmEwT3mjB6SJ657XAWkQg9B88hWiboK5TUj6I/vMOm39KQfNgMpGvrOGVUohIpdsHDUt3 i+bb853WWJshF4J5dx0/6zm+RdZqbfG4XY5teawmJSYM93w85AObQvIVzRCZ4N/zh/+coO A58WTd5/nmm+I6J6U775U5zhHvLo2hB6GalxJQIqfJqZi1e5v0SU/IU94obT172e3AXLQM C+n/IOWiR73YhYZBhN11z2l5YLSfoZsuEaBiYV7ctaj8R2lV1QEcGB+Mck0cKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx00z9fztj2; Sat, 3 Feb 2024 01:36: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 4131aKcj010673; Sat, 3 Feb 2024 01:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aK14010670; Sat, 3 Feb 2024 01:36:20 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:20 GMT Message-Id: <202402030136.4131aK14010670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5ff76402daf1 - main - pkg-stage.sh: add x11/sddm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ff76402daf17b9c36048bf11957dac7556272a6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5ff76402daf17b9c36048bf11957dac7556272a6 commit 5ff76402daf17b9c36048bf11957dac7556272a6 Author: Graham Perrin AuthorDate: 2024-02-02 23:35:42 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:34:59 +0000 pkg-stage.sh: add x11/sddm MFC After: 2 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/996 --- release/scripts/pkg-stage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index e53bd72db249..547ed15894d0 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -32,6 +32,7 @@ www/links x11-drivers/xf86-video-vmware x11/gnome x11/kde5 +x11/sddm x11/xorg" # If NOPORTS is set for the release, do not attempt to build pkg(8). From nobody Sat Feb 3 01:36:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx14q0Jz58kRv; Sat, 3 Feb 2024 01:36: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 4TRZx13F4Vz4QPT; Sat, 3 Feb 2024 01:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN/jKR/Anssirja53WTye2NxTgd8l5regvOeltHDe2c=; b=jihqkkMTjSGYTmU0v709cJzfQtTYzqBo/z9Io0Se5XHVdfek5si2dVJ15K0nMHW0H9SgHP ltNcvaN7J/aF6A7Kpn6B3/c28zznVS8F0vcJlMdyzRywN/ApZbxjoIAsx55A1aYL7Mfvmy I54IC2ybfIAKP+jLKFxMSzN6URW7HkKd/sGrR/kFBzD7GeHTQTS5slHWAn56O0uqia1HpH XDG5BA0sc4wnLPvdF1RL3SLNtpshviD2IIujXhUJJCQgleKaV9UcIKgIj8QMouCAMSkF+m AanTKHFhN9LpT3SH+yhfTpyD26bRUlQDrumkJdsqQV70nfrG45fJksbWwG4IRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bN/jKR/Anssirja53WTye2NxTgd8l5regvOeltHDe2c=; b=A7ayJsu9XyZ6lDMqhom+eayu1W6OtZKLnkjLSViz/hc0ZtZiR+R5wlr19mgcpIjMJ9Nrfa CrQa6mAX+FKij6s5uC8eXbwx0F0UOSIq5wAYsz8eX+uhEa/o5cbX5hY1Nd9s8MT5JFeWKM exeST/bEe65+h9rh8m9Y2EksZdpUcndICsJDaukSGnJw63dY+AIUAdabar5Pq/5aIUcYw/ 5EAWmjuCnXf6vODdREUma5vz/qy4dRgEwppvHuYn1Oep8aCilcwLzE1hhCoHA8Z0bpYq8e LUT/9sBqLXYt1HY2EBGHND+YcE7XJAg6tY8kkIDfWdeH2ocBcli/WiCjeYs1bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924181; a=rsa-sha256; cv=none; b=o1V7j9qk6QRBxnDy95ZfKcvxgp+w/QDQ7i0nJx2hfCUooLv9LoMcNL+nr8KGialssjGxWo l0JnloZkjduVJSdUMj4zb2/4qBwxoFdSfnPGpfzSmemaIjF+jjlrc1jB/KWGFj0IztBMUi bDXSDJsEhJ2Z3SYrE3wGtOkmGniIB+aCONDO3VXD5zDQckzsHuysVP7RdPHcoU0JrUm/2q s9Xl/L8h+MIwj1J7S6LQ8AzYCn5916TnwQGiR/k1mbeVA2e+MnxTuSU73h70u5sE6b5oTX /FC0Bjapf7W6CjvSOlPofzdMyjPfWo7/2z+z/U8DhDB0ENy/iv32nmRYDAWP/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx120Lfztyv; Sat, 3 Feb 2024 01:36: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 4131aLbi010727; Sat, 3 Feb 2024 01:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aL3U010724; Sat, 3 Feb 2024 01:36:21 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:21 GMT Message-Id: <202402030136.4131aL3U010724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8e05c2373efd - main - wc: Do not use st_size if it equals zero List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e05c2373efd43632b1ec410528552fa01b40a3f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8e05c2373efd43632b1ec410528552fa01b40a3f commit 8e05c2373efd43632b1ec410528552fa01b40a3f Author: Ricardo Branco AuthorDate: 2024-02-03 00:05:05 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:34:59 +0000 wc: Do not use st_size if it equals zero Pseudo-filesystems often cannot compute the size of the file correctly and report 0 for the size. Ignore the size when it's zero and fallback to the size unknown code. PR: 276093 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/985 --- usr.bin/wc/wc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 7cb72212d1cb..76b65e5f870d 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -230,7 +230,8 @@ cnt(const char *file) (void)close(fd); return (1); } - if (S_ISREG(sb.st_mode)) { + /* pseudo-filesystems advertize a zero size */ + if (S_ISREG(sb.st_mode) && sb.st_size > 0) { reset_siginfo(); charct = sb.st_size; show_cnt(file, linect, wordct, charct, llct); From nobody Sat Feb 3 01:36:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx24p6Vz58kDh; Sat, 3 Feb 2024 01:36: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 4TRZx23nSPz4QjN; Sat, 3 Feb 2024 01:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ryb6yAtqS/Qjt5jmaEWAddbFmxySR5my4ikWGy+/ISQ=; b=gyeIh95GzGTD2vHng38abAYbwa+3bMa5VzFOSaXXGBRJQhqbPpu6akk13hr73O6sQmgKfR tNvZIWTL+WGlrihTPGQnRjvSRdZ5ZiULkX6oF9cLvmGTX316g67VuD7esuY9qwpMh9ASd9 f0uggP+koqkx4Hba0TAz5WOIMNh77qajom129jJ0ioXPfLhj6zyb5CHrH3UcVylGyLT9+/ J+iRdMXfaOvPjShnBL9BcO0QDb+hXTi8mA1SQGv8bREdeuKiLwVl/8fCBiQZmf8iBp/wTi pD8z02hkqXHFSr8Kqe9lhpLeHRc+i0uBv0hjZ540rpwDEhx9B4k/ZchYHea4iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ryb6yAtqS/Qjt5jmaEWAddbFmxySR5my4ikWGy+/ISQ=; b=crOe5FEOkhEUEGfTvCOarDohjoz90uStZiEUOVI1qngrKegnJv5qAroLgIUyIiIF2u9If6 qXoTDxYSD++aKlsVLpq/L1SkYcOe5sqDeSS5ZbP+mpOVKMHGafi7i9UTOHUHEgEjkttYT/ hJ+jCi7JYWuf8qrANx7xEQ/U315/v0+aZqyHX3F09fA0M432mkaMpoAX9GJmmPmilG6HHK 9EL1K4jouiY9b+QCyozydcgVQHuW22X80SwY0xY3udOjXYLEeGUXFBBubUnNw2rRCaEopi 8ZtC6cyU3CQTf5ldC50jT8tH4IPDCi+mKSuhwXZT2cbwHVtyDrIYtntHrsX0FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924182; a=rsa-sha256; cv=none; b=Kpl03lf7nlmNDlzENEQDjORsgh/ZuMWAmhehudIgezD9lYHuBvtp8tl060XZgd9Bw3QGWp DyOL8wmcN20jstdEugbBhV+65r3064yR5D2j8HPaLdF5J0v1JDFmeHEo+bDyTqU9/Pe5Jx oX/xeYk/94OQjroQP4aNwgGGpVvgcCzfYnqnBZ87w45e6j4nhyudYShGcn4JQSEB96r8NY eph5uHOc8bZI7MyK4TdyGTMgE+M2e2tCLkmtI6GxmjW8AVlYx7y9gGbgGQQZPRDJKdE6d9 tYsmlzshfklgW3+YUiUc4G2IwprofS1RG0QELKL4RKiH2DU67I2MRLAMbKBN2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx22vByztwd; Sat, 3 Feb 2024 01:36: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 4131aMmF010782; Sat, 3 Feb 2024 01:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aMjO010779; Sat, 3 Feb 2024 01:36:22 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:22 GMT Message-Id: <202402030136.4131aMjO010779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 752a340419a7 - main - quot: Use getopt(3) and show usage() if no arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 752a340419a7e2c1d3b624199f35435aecaf5828 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=752a340419a7e2c1d3b624199f35435aecaf5828 commit 752a340419a7e2c1d3b624199f35435aecaf5828 Author: Ricardo Branco AuthorDate: 2024-02-03 00:12:22 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:34:59 +0000 quot: Use getopt(3) and show usage() if no arguments Also update the man page and usage to be a little more accurate with the -a flag. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/983 --- usr.sbin/quot/quot.8 | 4 ++-- usr.sbin/quot/quot.c | 63 ++++++++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/usr.sbin/quot/quot.8 b/usr.sbin/quot/quot.8 index 0338457f6aeb..81abe28b41d5 100644 --- a/usr.sbin/quot/quot.8 +++ b/usr.sbin/quot/quot.8 @@ -35,8 +35,8 @@ .Nd display disk space occupied by each user .Sh SYNOPSIS .Nm -.Op Fl acfhknv -.Op Ar filesystem ... +.Op Fl cfhknv +.Op Fl a | Ar filesystem ... .Sh DESCRIPTION The .Nm diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 99aff61ae934..7ca8110bef76 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -526,9 +526,9 @@ static void usage(void) { #ifdef COMPAT - fprintf(stderr,"usage: quot [-nfcvha] [filesystem ...]\n"); + fprintf(stderr, "usage: quot [-cfhnv] [-a | filesystem ...]\n"); #else /* COMPAT */ - fprintf(stderr,"usage: quot [-acfhknv] [filesystem ...]\n"); + fprintf(stderr, "usage: quot [-cfhknv] [-a | filesystem ...]\n"); #endif /* COMPAT */ exit(1); } @@ -575,42 +575,47 @@ main(int argc, char *argv[]) struct statfs *mp; struct fstab *fs; int cnt; + int ch; func = douser; #ifndef COMPAT header = getbsize(&headerlen,&blocksize); #endif - while (--argc > 0 && **++argv == '-') { - while (*++*argv) { - switch (**argv) { - case 'n': - func = donames; - break; - case 'c': - func = dofsizes; - break; - case 'a': - all = 1; - break; - case 'f': - count = 1; - break; - case 'h': - estimate = 1; - break; + while ((ch = getopt(argc, argv, "acfhknv")) != -1) { + switch (ch) { + case 'a': + all = 1; + break; + case 'c': + func = dofsizes; + break; + case 'f': + count = 1; + break; + case 'h': + estimate = 1; + break; #ifndef COMPAT - case 'k': - blocksize = 1024; - break; + case 'k': + blocksize = 1024; + break; #endif /* COMPAT */ - case 'v': - unused = 1; - break; - default: - usage(); - } + case 'n': + func = donames; + break; + case 'v': + unused = 1; + break; + default: + usage(); } } + argc -= optind; + argv += optind; + + if ((argc == 0 && !all) || (all && argc)) + usage(); + if (all) { cnt = getmntinfo(&mp,MNT_NOWAIT); for (; --cnt >= 0; mp++) { From nobody Sat Feb 3 01:36:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx361H1z58kRx; Sat, 3 Feb 2024 01:36: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 4TRZx34tyqz4QgN; Sat, 3 Feb 2024 01:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOT+upekJL5sFms7Vp8Yw3qkWCmk1btbZ6QnH5ktslo=; b=HwPl1gbYbZO6f0A+17O2vMwFiHeft36Iq6AztXS1lLZsiBwl5t4GnYDJxC/UH8fyD9K4aH j6mAFkvTrNuXHHVGdGn8HoWgyeXCnHM3QOdUMqM8Bc+7TfKPxpGVWLNvqFCcASv5pypb+T Ljm7lUFHjOt6u9nolN/c8upaiRr1Q05rbt5r+Pb7an994ck6V8x4PRplIiwXMRxXcNf3T7 BXHXkUxd9SOAv3HA6pODyctsI9FmtdOspM+KOGYmwOuMS4AyWLmszO43orO1I7KUj1nNz2 JjBGjguRAdl3e5ZcOOuva2F/04liXdjZcBKv3SbICcNjdjLSS20lu24FAD9g5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOT+upekJL5sFms7Vp8Yw3qkWCmk1btbZ6QnH5ktslo=; b=pm14QzJt8ZsFBBYzJFlKtdWjLh06nplAvl2t616MGG+gljD1ARXfXcsmJFId7UPvzjYvP9 L77MpwXoEN6IBVJjDZP6tAsZpmxrtz+o77WCTzfuehr7O0zI7RaUSbocl0TprMrGnXoiLz eqWEolXSNAxMddjVw6smv7bGVT6adeX47zYCUbbf5p9gCw/xwWU2zkBRVIiGeATka26kky InMh81UkkPz/KUnVLup1quMdK/6bDGVtZebwKuWSD/L7fQh/yQoJm/xgvA/5HnKxdLwCZZ FFhe52nWWiW4eyoOC7z/oj6GbDhQbTDoZXU+dJ14kgH4JbCao4mPpXKDuRqvKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924183; a=rsa-sha256; cv=none; b=CCqME3NTdQe+hgGuzRbVXtQ2IBHX4C7qr32OUEvc7tPiGSpk3QMNum4q+kGP/P1F1xSwFt q3pn9WcnrAkER0h8yA2louU8as34GH2RL18/Z0YRBCHhViHNwSgyhFdGflEPO4EES26Muo NWU2s/1Jgay0CuulaZ4cGb/au5d5C8NXkWsjxWM+fjsFizxgVUxJtE1xExDP1tASCKzsp1 +u7gAmiPfAtGnxTpyyLNbgZT9Ge727v7TmWvBiIRPJxnyzo89dPf6A3yL152QwVfo3DwF0 FtYUv8oHWet8+8ugkAYX7gMNZHBGVGUjVwzTaGdE2MORkgsnsrD7/eO/H7tzfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx33jV6ztwf; Sat, 3 Feb 2024 01:36: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 4131aNb1010843; Sat, 3 Feb 2024 01:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aNOH010840; Sat, 3 Feb 2024 01:36:23 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:23 GMT Message-Id: <202402030136.4131aNOH010840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b75fa3a2de0c - main - procfs: Add self & exe symlinks like NetBSD does List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b75fa3a2de0c9c0854ebd9a2adc75ce9e8d39bd4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b75fa3a2de0c9c0854ebd9a2adc75ce9e8d39bd4 commit b75fa3a2de0c9c0854ebd9a2adc75ce9e8d39bd4 Author: Ricardo Branco AuthorDate: 2024-02-03 00:17:52 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:34:59 +0000 procfs: Add self & exe symlinks like NetBSD does NetBSD calls "curproc" "self" and "exe" "file" for proc. Reduce gratuitous differnces by including them as well. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/976 --- share/man/man5/procfs.5 | 4 ++++ sys/fs/procfs/procfs.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/share/man/man5/procfs.5 b/share/man/man5/procfs.5 index d055faadf2c0..5977a8bced81 100644 --- a/share/man/man5/procfs.5 +++ b/share/man/man5/procfs.5 @@ -253,10 +253,14 @@ directory containing process information for process .Pa pid . .It Pa /proc/curproc directory containing process information for the current process +.It Pa /proc/self +directory containing process information for the current process .It Pa /proc/curproc/cmdline the process executable name .It Pa /proc/curproc/etype executable type +.It Pa /proc/curproc/exe +executable image .It Pa /proc/curproc/file executable image .It Pa /proc/curproc/fpregs diff --git a/sys/fs/procfs/procfs.c b/sys/fs/procfs/procfs.c index 97b04fa2bc06..ab60ba47f322 100644 --- a/sys/fs/procfs/procfs.c +++ b/sys/fs/procfs/procfs.c @@ -158,6 +158,8 @@ procfs_init(PFS_INIT_ARGS) pfs_create_link(root, "curproc", procfs_docurproc, NULL, NULL, NULL, 0); + pfs_create_link(root, "self", procfs_docurproc, + NULL, NULL, NULL, 0); dir = pfs_create_dir(root, "pid", procfs_attr_all_rx, NULL, NULL, PFS_PROCDEP); @@ -188,6 +190,8 @@ procfs_init(PFS_INIT_ARGS) pfs_create_link(dir, "file", procfs_doprocfile, NULL, procfs_notsystem, NULL, 0); + pfs_create_link(dir, "exe", procfs_doprocfile, + NULL, procfs_notsystem, NULL, 0); return (0); } From nobody Sat Feb 3 01:36:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx50JDxz58kDm; Sat, 3 Feb 2024 01:36: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 4TRZx45KnCz4Qk4; Sat, 3 Feb 2024 01:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924184; h=from:from:reply-to:subject:subject: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+4l2Dh/XjFKlzpaULJs9f5usHLO98LeP4qsoPeajVs=; b=oKJfZF2ekMbiKrhVfZD2RG3RnEJ5JEDHUmVkogEErAR6iWFDHoQz3Yb6K/c3etbKJH6TW2 kLmoT6aTehCqUMmp7cTSJI1cYSkceXC7ZrZafLvhKGEWVH4YTo9piVRjZLKv5YpSRDod9U KZ6kxuMtYWk0Jjr1If2ppVPKgAzWvyt7rS2nCB0t7MR78BlyUKUuw0PVqMlhj4TO1fbgDw uLy4GJngVYzCYELVFvd8Ma/DSqheAP6vD7pJY5/anVUrWnA80he6CFUVnWA/6285sxrp3I LWdc5KDngwx3141zmqMFer1VefAiJeCeR8ReHT4k3V7iB/yK6d7Gv7j5LEiMTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924184; h=from:from:reply-to:subject:subject: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+4l2Dh/XjFKlzpaULJs9f5usHLO98LeP4qsoPeajVs=; b=Sp9WINpGHS7zdlqNrhUVhqfYHtxL34d5XX2/67Wy9n6AYhyirRcB1VWvwUPb63mF0fnfXY ma0nXg4yJh3bc0frv1dpINLLSlBfQgPiJ9uLig86dxBje6kwcKJX5xdhNLfzzyeCUZZ1un 2eMIW2RooF+HyYKdZOBcjb5J4f4XSEuquMMQ702fmgABMitgTx/TkoHNAgrcNIN0+3OqH0 mKS3txebGrsP1nQ08BgG8zsimvvUleQrYaEttz7izEW1Jxg2hJCHgrBn+FYeg9rEMXXhxH v/8SnyJ/uheC3QXRE569k2GNd2SrJ4Pwbn7yg+aHcWCaJc3Ggt1BZ3PD8LYGmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924184; a=rsa-sha256; cv=none; b=Ac7r5x4vPdrl05zX7Ve/73l8OqEmQNAlPWCLKddWQ7n7RwPO14BugLJ2+LBjGyLoATEPyX TdY7o93JG+Q6GGuQZOHY6SxjX25nFyOuJkDZf7Lw6vIb9jg+bD2+6cgWPUhtFChaddbl7L LyPUav4VnNQMEep6beOXPEN4X4UmQQLNenYiteA8bgaP8ydc2afps4hPb5PWgNF3j3bZcB y/mf5IskvvZyth+NG/8iy2r3PGuxDN/Ui9c2kfHpDu4oocU6PNZe6p22q63J/oyaaDQwCk qMRIN/rRVch61iK0TE56sLWuAzdANd5NqMQacMuqeTwHOpy8iJCfZbnpf5II9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx44QnXztHC; Sat, 3 Feb 2024 01:36: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 4131aOs5010880; Sat, 3 Feb 2024 01:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aOMj010877; Sat, 3 Feb 2024 01:36:24 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:24 GMT Message-Id: <202402030136.4131aOMj010877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5590bacaafd8 - main - sctp: update manpages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5590bacaafd8687bf522bb0413178c177c43f952 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5590bacaafd8687bf522bb0413178c177c43f952 commit 5590bacaafd8687bf522bb0413178c177c43f952 Author: Lexi Winter AuthorDate: 2024-02-03 00:20:57 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 sctp: update manpages Add missing documentation for sctp_sendv(3) and sctp_recvv(3). Add a note that sctp_send(3), sctp_sendx(3) and sctp_recvmsg(3) are deprecated by RFC 6458. Add a STANDARDS section to all functions specified in RFC 6458 to indicate their standards conformance. MFC after: 2 weeks Reviewed by: imp, bcr, kp, tuexen Pull Request: https://github.com/freebsd/freebsd-src/pull/965 --- lib/libc/net/Makefile.inc | 10 ++- lib/libc/net/sctp_bindx.3 | 16 +++- lib/libc/net/sctp_connectx.3 | 16 +++- lib/libc/net/sctp_freepaddrs.3 | 18 +++- lib/libc/net/sctp_getpaddrs.3 | 18 +++- lib/libc/net/sctp_recvmsg.3 | 194 +++++++++++++++++++++++++++++++++++++++-- lib/libc/net/sctp_send.3 | 192 +++++++++++++++++++++++++++++++++++++++- lib/libc/net/sctp_sendmsg.3 | 6 +- lib/libc/sys/sctp_peeloff.2 | 6 +- 9 files changed, 454 insertions(+), 22 deletions(-) diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index 35d88edb3a95..d75d42fb0679 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -110,10 +110,12 @@ MLINKS+=inet.3 addr.3 \ inet.3 inet_pton.3 \ inet.3 network.3 \ inet.3 ntoa.3 -MLINKS+= sctp_send.3 sctp_sendx.3 -MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3 -MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3 -MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3 +MLINKS+=sctp_freepaddrs.3 sctp_freeladdrs.3 +MLINKS+=sctp_getpaddrs.3 sctp_getladdrs.3 +MLINKS+=sctp_recvmsg.3 sctp_recvv.3 +MLINKS+=sctp_sendmsg.3 sctp_sendmsgx.3 +MLINKS+=sctp_send.3 sctp_sendx.3 \ + sctp_send.3 sctp_sendv.3 MLINKS+=inet_net.3 inet_net_ntop.3 \ inet_net.3 inet_net_pton.3 MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ diff --git a/lib/libc/net/sctp_bindx.3 b/lib/libc/net/sctp_bindx.3 index d233a6fa37ce..93a9857ddc86 100644 --- a/lib/libc/net/sctp_bindx.3 +++ b/lib/libc/net/sctp_bindx.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 14, 2015 +.Dd February 2, 2024 .Dt SCTP_BINDX 3 .Os .Sh NAME @@ -105,3 +105,17 @@ is not a socket. .Sh SEE ALSO .Xr bind 2 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The +.Fn sctp_bindx +function conforms to RFC 6458. diff --git a/lib/libc/net/sctp_connectx.3 b/lib/libc/net/sctp_connectx.3 index cd903ddd01ce..c6cbca14006d 100644 --- a/lib/libc/net/sctp_connectx.3 +++ b/lib/libc/net/sctp_connectx.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 19, 2007 +.Dd February 2, 2024 .Dt SCTP_CONNECTX 3 .Os .Sh NAME @@ -98,3 +98,17 @@ is not a socket. .Sh SEE ALSO .Xr connect 2 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The +.Fn sctp_connectx +function conforms to RFC 6458. diff --git a/lib/libc/net/sctp_freepaddrs.3 b/lib/libc/net/sctp_freepaddrs.3 index fb85cae089c8..07d486920125 100644 --- a/lib/libc/net/sctp_freepaddrs.3 +++ b/lib/libc/net/sctp_freepaddrs.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 15, 2006 +.Dd February 2, 2024 .Dt SCTP_FREEPADDRS 3 .Os .Sh NAME @@ -59,3 +59,19 @@ none. .Xr sctp_getladdrs 3 , .Xr sctp_getpaddrs 3 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The +.Fn sctp_freepaddrs +and +.Fn sctp_freeladdrs +functions conform to RFC 6458. diff --git a/lib/libc/net/sctp_getpaddrs.3 b/lib/libc/net/sctp_getpaddrs.3 index efcf3f47efea..0e80e72bbaf6 100644 --- a/lib/libc/net/sctp_getpaddrs.3 +++ b/lib/libc/net/sctp_getpaddrs.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 15, 2006 +.Dd February 2, 2024 .Dt SCTP_GETPADDRS 3 .Os .Sh NAME @@ -91,3 +91,19 @@ is not a socket. .Xr sctp_freeladdrs 3 , .Xr sctp_freepaddrs 3 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The +.Fn sctp_getpaddrs +and +.Fn sctp_getladdrs +functions conform to RFC 6458. diff --git a/lib/libc/net/sctp_recvmsg.3 b/lib/libc/net/sctp_recvmsg.3 index a5f794743f53..53aae5dd2527 100644 --- a/lib/libc/net/sctp_recvmsg.3 +++ b/lib/libc/net/sctp_recvmsg.3 @@ -25,11 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 23, 2015 +.Dd February 2, 2024 .Dt SCTP_RECVMSG 3 .Os .Sh NAME -.Nm sctp_recvmsg +.Nm sctp_recvmsg , +.Nm sctp_recvv .Nd receive a message from an SCTP socket .Sh LIBRARY .Lb libc @@ -42,15 +43,19 @@ .Fa "int s" "void *msg" "size_t len" "struct sockaddr * restrict from" .Fa "socklen_t * restrict fromlen" "struct sctp_sndrcvinfo *sinfo" "int *flags" .Fc +.Ft ssize_t +.Fo sctp_recvv +.Fa "int s" "const struct iovec *iov" "int iovlen" "struct sockaddr *from" +.Fa "socklen_t *fromlen" "void *info" "socklen_t *infolen" +.Fa "unsigned int *infotype" "int *flags" +.Fc .Sh DESCRIPTION The .Fn sctp_recvmsg -system call -is used to receive a message from another SCTP endpoint. -The -.Fn sctp_recvmsg -call is used by one-to-one (SOCK_STREAM) type sockets after a -successful +and +.Fn sctp_recvv +functions are used to receive a message from another SCTP endpoint. +They are used by one-to-one (SOCK_STREAM) type sockets after a successful .Fn connect call or after the application has performed a .Fn listen @@ -58,6 +63,8 @@ followed by a successful .Fn accept . For a one-to-many (SOCK_SEQPACKET) type socket, an endpoint may call .Fn sctp_recvmsg +or +.Fn sctp_recvv after having implicitly started an association via one of the send calls including .Fn sctp_sendmsg , @@ -231,6 +238,159 @@ The .Fa sinfo->info_timetolive field is not used by .Fn sctp_recvmsg . +.Pp +The +.Fn sctp_recvv +function works as +.Fn sctp_recvmsg +with two differences. +Firstly, the receive buffer is passed as an array containing +.Vt iocnt +objects of type +.Vt struct iovec , +where the received data will be scattered in the same manner as +.Xr readv 2 . +Secondly, the +.Fa sinfo +argument is replaced by the tuple +.Fa info , +.Fa infolen , +and +.Fa infotype , +which allow different information to be received based on the socket options. +.Pp +To receive an +.Vt sctp_rcvinfo +structure, set the +.Va SCTP_RECVRCVINFO +socket option, and pass a pointer to a +.Vt struct sctp_rcvinfo +structure in +.Fa info . +The +.Vt sctp_rcvinfo +structure has the following format: +.Bd -literal +struct sctp_rcvinfo { + uint16_t rcv_sid; /* Stream arriving on */ + uint16_t rcv_ssn; /* Stream Sequence Number */ + uint16_t rcv_flags; /* Flags on the incoming message */ + uint32_t rcv_ppid; /* The ppid field */ + uint32_t rcv_tsn; /* The transport sequence number */ + uint32_t rcv_cumtsn; /* The cumulative TSN */ + uint32_t rcv_context; /* Opaque context field */ + sctp_assoc_t rcv_assoc_id; /* Peer association id */ +}; +.Ed +.Pp +These fields have the same meaning as the equivalent fields in +.Vt struct sctp_sndrcvinfo , +defined above. +.Pp +To receive an +.Vt sctp_nxtinfo +structure, set the +.Va SCTP_RECVNXTINFO +socket option, and pass a pointer to a +.Vt struct sctp_nxtinfo +structure in +.Fa info . +The +.Vt struct sctp_nxtinfo +structure has the following format: +.Bd -literal +struct sctp_nxtinfo { + uint16_t nxt_sid; /* Next message's stream number */ + uint16_t nxt_flags; /* Flags (see below) */ + uint32_t nxt_ppid; /* The ppid field */ + uint32_t nxt_length; /* Length of next message */ + sctp_assoc_t nxt_assoc_id; /* Peer association id */ +}; +.Ed +.Pp +The fields +.Va nxt_sid , +.Va nxt_ppid , +and +.Va nxt_assoc_id +have the same meaning as in +.Vt struct sctp_rcvinfo , +except they refer to the next message rather than the message that was +received. +The field +.Va nxt_length +contains the length of the part of the next message currently available in +the socket buffer. +This may not represent the length of the entire message unless the +.Va SCTP_COMPLETE +flag is set in +.Va nxt_flags . +.Pp +The +.Va nxt_flags +field is a bitmask which may contain any of the following values: +.Bl -bullet +.It +.Va SCTP_UNORDERED : +The next message was sent unordered. +.It +.Va SCTP_COMPLETE : +The entirety of the next message has been received in the socket buffer. +In this case, the +.Va nxt_length +field contains the length of the entire message. +.It +.Va SCTP_NOTIFICATION : +The next message is a notification, not a user message. +.El +.Pp +If both the +.Va SCTP_RECVRCVINFO +and +.Va SCTP_RECVNXTINFO +socket options are set, then pass a pointer to a +.Vt struct sctp_recvv_rn +structure in +.Fa info . +This struct has the following format: +.Bd -literal +struct sctp_recvv_rn { + struct sctp_rcvinfo recvv_rcvinfo; + struct sctp_nxtinfo recvv_nxtinfo; +}; +.Ed +.Pp +The value pointed to by +.Fa infolen +should initially contain the length of the structure to which +.Fa info +points. +When the function returns, it will be set to the length of the +returned structure. +Additionally, +.Fa *infotype +will be set to one of the following values depending on what type of info +was returned: +.Bl -bullet +.It +.Va SCTP_RECVV_NOINFO : +no information was returned. +.It +.Va SCTP_RECVV_RCVINFO : +.Fa *info +contains an object of type +.Vt struct sctp_rcvinfo . +.It +.Va SCTP_RECVV_NXTINFO : +.Fa *info +contains an object of type +.Vt struct sctp_nxtinfo . +.It +.Va SCTP_RECVV_RN : +.Fa *info +contains an object of type +.Vt struct sctp_recvv_rn . +.El .Sh RETURN VALUES The call returns the number of bytes received, or -1 if an error occurred. @@ -279,6 +439,12 @@ has been set on the socket). This typically means that the socket is not connected and is a one-to-one style socket. .El +.Sh NOTES +The +.Fn sctp_recvmsg +function is deprecated. +New applications should use +.Fn sctp_recvv . .Sh SEE ALSO .Xr getsockopt 2 , .Xr recv 2 , @@ -290,3 +456,15 @@ is not connected and is a one-to-one style socket. .Xr sctp_send 3 , .Xr sctp_sendmsg 3 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The functions described in this document conform to RFC 6458. diff --git a/lib/libc/net/sctp_send.3 b/lib/libc/net/sctp_send.3 index 32319ac8493c..ce34a2554576 100644 --- a/lib/libc/net/sctp_send.3 +++ b/lib/libc/net/sctp_send.3 @@ -25,12 +25,13 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 15, 2006 +.Dd February 2, 2024 .Dt SCTP_SEND 3 .Os .Sh NAME .Nm sctp_send , -.Nm sctp_sendx +.Nm sctp_sendx , +.Nm sctp_sendv .Nd send a message from an SCTP socket .Sh LIBRARY .Lb libc @@ -48,11 +49,27 @@ .Fa "int sd" "const void *msg" "size_t len" "struct sockaddr *addrs" .Fa "int addrcnt" "const struct sctp_sndrcvinfo *sinfo" "int flags" .Fc +.Ft ssize_t +.Fo sctp_sendv +.Fa "int sd" "const struct iovec *iov" "int iocnt" "struct sockaddr *addrs" +.Fa "int addrcnt" "void *info" "socklen_t infolen" "unsigned int infotype" +.Fa "int flags" +.Fc .Sh DESCRIPTION The .Fn sctp_send system call is used to transmit a message to another SCTP endpoint. +The +.Fn sctp_sendx +function is used to specify multiple peer addresses when creating an implicit +association, as in +.Xr sctp_connectx 3 . +The +.Fn sctp_sendv +function is used to transmit a message whose data is gathered from the +provided I/O buffers. +.Pp .Fn sctp_send may be used to send data to an existing association for both one-to-many (SOCK_SEQPACKET) and one-to-one (SOCK_STREAM) socket types. @@ -253,6 +270,7 @@ and .Fa sinfo->sinfo_cumtsn are used only when receiving messages and are thus ignored by .Fn sctp_send . +.Pp The function .Fn sctp_sendx has the same properties as @@ -281,6 +299,156 @@ the association in place of the association id. If both an address and an association id are specified, the association id has priority. +.Pp +The function +.Fn sctp_sendv +works as +.Fn sctp_sendx , +with two differences. +Firstly, the data to be written is passed as an array containing +.Vt iocnt +objects of type +.Vt struct iovec , +which will be gathered for sending in the same manner as +.Xr writev 2 . +Secondly, the +.Fa info +argument is replaced by the tuple +.Fa sinfo , +.Fa infolen , +.Fa infotype , +where +.Fa sinfo +is a pointer to a struct of size +.Fa infolen +whose type is indicated by the +.Fa infotype +argument. +.Pp +If no information is passed, set +.Fa infotype +to +.Va SCTP_SENDV_NOINFO . +.Fa sinfo +may be a null pointer. +.Pp +If +.Fa sinfo +points to a +.Vt struct sctp_sndinfo , +set +.Fa infotype +to +.Va SCTP_SENDV_SNDINFO . +The +.Vt sctp_sndinfo +structure has the following format: +.Bd -literal +struct sctp_sndinfo { + uint16_t snd_sid; /* stream identifier */ + uint16_t snd_flags; /* Flags */ + uint32_t snd_ppid; /* ppid field */ + uint32_t snd_context; /* context field */ + sctp_assoc_t snd_assoc_id; /* association id */ +}; +.Ed +.Pp +The meaning of these fields is the same as in +.Vt struct sctp_sndrcvinfo , +described above. +.Pp +If +.Fa sinfo +points to a +.Vt struct sctp_authinfo , +set +.Fa infotype +to +.Va SCTP_SENDV_AUTHINFO . +The +.Vt sctp_authinfo +struct has the following format: +.Bd -literal +struct sctp_authinfo { + uint16_t auth_keynumber; /* Shared key identifier */ +}; +.Ed +.Pp +The +.Va auth_keynumber +field specifies the shared key identifier that will be used for sending the +message. +.Pp +If +.Fa sinfo +points to a +.Vt struct sctp_prinfo , +set +.Fa infotype +to +.Va SCTP_SENDV_PRINFO . +The +.Vt sctp_prinfo +structure has the following format: +.Bd -literal +struct sctp_prinfo { + uint16_t pr_policy; /* PR-SCTP policy */ + uint32_t pr_value; /* PR-SCTP Policy option */ +}; +.Ed +.Pp +The +.Va pr_policy +field should be set to either +.Va SCTP_PR_SCTP_NONE +to use reliable transmission (in which case the field +.Va pr_value +is ignored), or +.Va SCTP_PR_SCTP_TTL +to use RFC 3758 timed reliability, in which case the field +.Va pr_value +contains the lifetime in milliseconds. +.Pp +To pass two or more types in +.Fa sinfo , +set +.Fa infotype +to +.Va SCTP_SENDV_SPA +and pass a pointer to a +.Vt struct sctp_sendv_spa +in +.Fa sinfo . +The +.Ft sctp_sendv_spa +structure has the following format: +.Bd -literal +struct sctp_sendv_spa { + uint32_t sendv_flags; + struct sctp_sndinfo sendv_sndinfo; + struct sctp_prinfo sendv_prinfo; + struct sctp_authinfo sendv_authinfo; +}; +.Ed +.Pp +The +.Va sendv_flags +member should be set to the bitwise OR of the flags +.Va SCTP_SEND_SNDINFO_VALID , +.Va SCTP_SEND_PRINFO_VALID , +and +.Va SCTP_SEND_AUTHINFO_VALID +to indicate which fields of the struct contain valid data. +.Pp +If +.Fa infotype +is set to SCTP_SENDV_NOINFO, the +.Fa infolen +argument should be set to zero. +Otherwise, +.Fa infolen +should be set to the length of the data structure pointed to by +.Fa info . .Sh RETURN VALUES The call returns the number of characters sent, or -1 if an error occurred. @@ -329,6 +497,14 @@ has been set on the socket). This typically means that the socket is not connected and is a one-to-one style socket. .El +.Sh NOTES +The functions +.Fn sctp_send +and +.Fn sctp_sendx +are deprecated. +New applications should use +.Fn sctp_sendv . .Sh SEE ALSO .Xr getsockopt 2 , .Xr recv 2 , @@ -340,6 +516,18 @@ is not connected and is a one-to-one style socket. .Xr sctp_recvmsg 3 , .Xr sctp_sendmsg 3 , .Xr sctp 4 +.Rs +.%A R. Stewart +.%A M. Tuexen +.%A K. Poon +.%A P. Lei +.%A V. Yasevich +.%T Sockets API Extensions for the Stream Control Transmission Protocol (SCTP) +.%R RFC 6458 +.%D December 2011 +.Re +.Sh STANDARDS +The functions described in this document conform to RFC 6458. .Sh BUGS Because .Fn sctp_send diff --git a/lib/libc/net/sctp_sendmsg.3 b/lib/libc/net/sctp_sendmsg.3 index dedfc3324cd3..47a7c7db2d8b 100644 --- a/lib/libc/net/sctp_sendmsg.3 +++ b/lib/libc/net/sctp_sendmsg.3 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 15, 2006 +.Dd February 2, 2024 .Dt SCTP_SENDMSG 3 .Os .Sh NAME @@ -96,13 +96,13 @@ is set to the message is not transmitted. .Pp No indication of failure to deliver is implicit in a -.Xr sctp_sendmsg 3 +.Fn sctp_sendmsg call. Locally detected errors are indicated by a return value of -1. .Pp If no space is available at the socket to hold the message to be transmitted, then -.Xr sctp_sendmsg 3 +.Fn sctp_sendmsg normally blocks, unless the socket has been placed in non-blocking I/O mode. The diff --git a/lib/libc/sys/sctp_peeloff.2 b/lib/libc/sys/sctp_peeloff.2 index 5aa246cfa49f..f31282e555db 100644 --- a/lib/libc/sys/sctp_peeloff.2 +++ b/lib/libc/sys/sctp_peeloff.2 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 30, 2007 +.Dd February 2, 2024 .Dt SCTP_PEELOFF 2 .Os .Sh NAME @@ -72,3 +72,7 @@ is not a socket. .El .Sh SEE ALSO .Xr sctp 4 +.Sh STANDARDS +The +.Fn sctp_peeloff +function conforms to RFC 6458. From nobody Sat Feb 3 01:36:25 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx64hD0z58kS2; Sat, 3 Feb 2024 01: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 4TRZx62sHDz4QkH; Sat, 3 Feb 2024 01: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=1706924186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDErnrD6UnyRSFs0M4UdOJ0HNCrLxN3N7E6jXzyDjk4=; b=gd3nS9lcTjjfAXHkJ5/nCNh9PHoRjM9etSNWpGWJmIUs+0F/uXIfZ+wq3iZ1ySlCOhzoAL McfswX4zqbPTBDbZldJIC4/Fc+I6KxnbsKl/6E9nc0+/Ufg3UzW1tjZlXU1o6XPWa/YgNZ cXGc61iTTYJE9tRxEK6TWAXx5sAPhtwkqAszLQaIEP0/BMARdLq2EfHXIbj/qTt0xXgtgm XNcaDy20KIQ/0gqqS7VYtwehJ48bUnEffhfeUQeP87/YdD4ZiBqzzdHSocJnaYMt/gGmbP m4+TuhtMnlKDvHVrz3oxYxM0BsjweSVRvqiO6kmsRF+mS85cgEvnRcJT9Cnd/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uDErnrD6UnyRSFs0M4UdOJ0HNCrLxN3N7E6jXzyDjk4=; b=BZBVAQ/EqxYLH+o0IEk8Ir3lCY4+UP2t0pBw8GQ3xpSLyLsORAqWvPDn/vsXmEk1Oi7/mh vkI0nPNLFzArppsMMXFuU1PfUnfwhxQ8N9zNfbDPJSdSuKX3DcNHrTPAEMRF0w+ssL2/MR N5ETewfaNVUf9H0Nox0cXx9xepuSxbnYyDv/p/Eb/nFY4tdSRzWCgo5bbqLiNlYlbSXTrs TzjArdrJEJSbtV/GvSWbBM9F8llNUrVZqSvJrga3LpWLWSLhqKlVb4S2CqbfC/32HyibL3 nQx4252fJ2zgc5yLigmu71NsaWRb8F7fGCd68blGzFqok78gr2V70BaWuH6Imw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924186; a=rsa-sha256; cv=none; b=HGEZOKylyj3/QuZ6Ro6izqXChowrLLaYzPGd3SbT5Fx0oWvinybSIKrlzM4AXDRUONWbEk +Ur1aD7WFdlMupz3CPGU5NwEzg4jXkPTWUMmpaIXolFX6LHsrNCxMpO6geVbjpSjX/O9YF o2HQyVsv/tzBcNqn2Q7djQqIBzhiFd6bVfRmTXR1JKFwJ2r3NFgZEa6dq9vwW27oIiBao2 9aW1+XRN27hyqmESyPf0Q3mU/uAg+v8BlRf3UeIh3mQ+xDYux7KffNNOJdhlNqM9DkWKbo 0iiHyzK+vA6hu4xwpE4NsGBfCJyoXtwU7cJQ9usX4Xdir0iZbCExZ4+sZ0LiAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx55RKPzttc; Sat, 3 Feb 2024 01: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 4131aPf9010935; Sat, 3 Feb 2024 01: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 4131aP5l010932; Sat, 3 Feb 2024 01:36:25 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:25 GMT Message-Id: <202402030136.4131aP5l010932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 840a802750a4 - main - umount: Add -d option to detach md devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 840a802750a464355c52b314c17fb067b317da8c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=840a802750a464355c52b314c17fb067b317da8c commit 840a802750a464355c52b314c17fb067b317da8c Author: Ricardo Branco AuthorDate: 2024-02-03 00:29:48 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 umount: Add -d option to detach md devices Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/972 --- sbin/umount/umount.8 | 12 ++++++--- sbin/umount/umount.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 78 insertions(+), 8 deletions(-) diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8 index 180572017f6f..086980151d60 100644 --- a/sbin/umount/umount.8 +++ b/sbin/umount/umount.8 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 19, 2020 +.Dd January 16, 2024 .Dt UMOUNT 8 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd unmount file systems .Sh SYNOPSIS .Nm -.Op Fl fNnv +.Op Fl dfNnv .Ar special ... | node ... | fsid ... .Nm .Fl a | A @@ -71,6 +71,11 @@ except for those mounted at .Pa / or .Pa /dev . +.It Fl d +If the filesystem is mounted on an +.Xr md 4 +device (a memory disk), detach it after +.Xr unmount 2 . .It Fl F Ar fstab Specify the .Pa fstab @@ -182,7 +187,8 @@ file system table .Xr unmount 2 , .Xr fstab 5 , .Xr autounmountd 8 , -.Xr mount 8 +.Xr mount 8 , +.Xr mdconfig 8 .Sh HISTORY A .Nm diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index 7db3c5ec39e0..5314f8e0c56f 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -50,10 +50,20 @@ #include "mounttab.h" +/* used by md_detach() */ +#include +#include +#include +#include + +#define DEV_MD _PATH_DEV MD_NAME +#define DEV_MDCTL _PATH_DEV MDCTL_NAME + typedef enum { FIND, REMOVE, CHECKUNIQUE } dowhat; static struct addrinfo *nfshost_ai = NULL; -static int fflag, vflag; +static int dflag, fflag, vflag; +static int all; static char *nfshost; struct statfs *checkmntlist(char *); @@ -70,17 +80,18 @@ int checkname (char *, char **); int umountfs(struct statfs *sfs); void usage (void); int xdr_dir (XDR *, char *); +int md_detach(const char *); int main(int argc, char *argv[]) { - int all, errs, ch, mntsize, error, nfsforce, ret; + int errs, ch, mntsize, error, nfsforce, ret; char **typelist = NULL; struct statfs *mntbuf, *sfs; struct addrinfo hints; nfsforce = all = errs = 0; - while ((ch = getopt(argc, argv, "AaF:fh:Nnt:v")) != -1) + while ((ch = getopt(argc, argv, "AadF:fh:Nnt:v")) != -1) switch (ch) { case 'A': all = 2; @@ -88,6 +99,9 @@ main(int argc, char *argv[]) case 'a': all = 1; break; + case 'd': + dflag = 1; + break; case 'F': setfstab(optarg); break; @@ -455,6 +469,16 @@ umountfs(struct statfs *sfs) clnt_destroy(clp); } free(orignfsdirname); + + if (dflag) { + if (md_detach(sfs->f_mntfromname) == 0) { + if (vflag) + (void)printf("%s: detached\n", + sfs->f_mntfromname); + } else if (!all) + return (-1); + } + return (0); } @@ -637,7 +661,47 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: umount [-fNnv] special ... | node ... | fsid ...", - " umount -a | -A [-F fstab] [-fnv] [-h host] [-t type]"); + "usage: umount [-dfNnv] special ... | node ... | fsid ...", + " umount -a | -A [-F fstab] [-dfnv] [-h host] [-t type]"); exit(1); } + +int +md_detach(const char *device) +{ + struct md_ioctl mdio; + char *eptr; + int fd; + + memset(&mdio, 0, sizeof(mdio)); + + mdio.md_version = MDIOVERSION; + mdio.md_options = fflag ? MD_FORCE : 0; + + if (strncmp(device, DEV_MD, sizeof(DEV_MD) - 1)) { + if (!all) + warnx("invalid md device: %s", device); + return (-1); + } + + mdio.md_unit = strtoul(device + sizeof(DEV_MD) - 1, &eptr, 0); + if (mdio.md_unit == (unsigned)ULONG_MAX || *eptr != '\0') { + warnx("invalid md device: %s", device); + return (-1); + } + + fd = open(DEV_MDCTL, O_RDWR, 0); + if (fd < 0) { + warn("%s", DEV_MDCTL); + return (-1); + } + + if (ioctl(fd, MDIOCDETACH, &mdio) < 0) { + warn("%s", DEV_MD); + close(fd); + return (-1); + } + + close(fd); + return (0); +} From nobody Sat Feb 3 01:36:26 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx72xTNz58kKv; Sat, 3 Feb 2024 01: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 4TRZx70HPkz4QmN; Sat, 3 Feb 2024 01: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=1706924187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfQutLgpNoez0O3iN0VxavizZsazvugdD54YZmoML/w=; b=pVEt+r8CVVqmMfHjPkTjYSBkPV7mdi/VOuUI4ScwG7Zqu1G2zYEPXzG78pa4MSSxJcNoa+ stDvjqircRLG8f706ZGrHElS30BSuSDOdbciiFZR9gohrbQjb2iJnehEpvuB5eJZFoiGc2 RwU2rpS0vA34LnrOvOaTlchitOIwugu0VbEgJTG5fLZhGQTQnspZhPK/8GlIXm+8edRxSB 9wFHqQJjqn8WDgjE6SeGVIq6yRlcndwPz3HVTqWR8dhn0fkxRuVHqrDUdEW0lVrn2ITo++ jD5t23ZeepTUEs2igFPU+zFyP+sZTHxuoS6S9XWzMb3YVIto4Z18hB9gOnojKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WfQutLgpNoez0O3iN0VxavizZsazvugdD54YZmoML/w=; b=Wn9h1M9ibVBFnyr2r9EoCmI9KwnLGTxigp0HYIYVN+3cfExfTy1cTADQCaeWrepJ8lZubn OEpEu/GR5p4x7xzHjHWDj7OhrWgmGk7yUWfNlr2+IsyFO9FZmy/C4kEr+sbXFJzyodBGiH a2ve6UX4SosEITTmWPZnnzqgcnYJnVTfXrRS0/prGH5CD8Wzstxb2p0yO9/3O8KXehkYO+ DQJnLlWD7auOThgeXI3et1p4OIYweODSboaa12ayuOxxd/Hvj6KoRudGjrDi99vgG0v59l /gAB2nwZSbKak23I3wD7lcOYbf9jDN4y+B9vLowgO2C9IuuolwGrzYU+5aTusQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924187; a=rsa-sha256; cv=none; b=Yg12U++Zz+dQclfOYMNY7zcjcMYDUdD8xJytdpstq+9lUSKkFY9cZNMuLpLFtZepzdOmLp wWLgLo5GpeMtrMiTLZCjPEn/RxcSMbKXjapqWNnbrgHBINz57Rqhf8ax1heORJ01RHG5Jr Ra//FpR3QZiQE1+FEHlLDGY3AIml6TROWKb0h/Eh/3rih8zBf4ugVGT13Gkyegjfj5pxrw 1Z13vIEEQW6a/KAiu1WWkW3H0qQyeCMrn1W6AxUjbyVxeBqt3kbeXJLTHROv2P0JqlAAGp uPtZCRlcmNRUqjWA0sZ1niTC2oUKd4HPF1ojB44r5xzl2fBJ1zOT3SsEhZ7WyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx66VwSztyw; Sat, 3 Feb 2024 01:36: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 4131aQnL010983; Sat, 3 Feb 2024 01: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 4131aQIM010980; Sat, 3 Feb 2024 01:36:26 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:26 GMT Message-Id: <202402030136.4131aQIM010980@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce348fe5cfc36c454db860f0e5cd26f094deb09c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce348fe5cfc36c454db860f0e5cd26f094deb09c commit ce348fe5cfc36c454db860f0e5cd26f094deb09c Author: Mina Galić AuthorDate: 2024-02-03 00:35:18 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 amd64 & i386: enable VIMAGE in MINIMAL VNET(9) is very useful, and is not loadable. Enable it in MINIMAL. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/962 --- sys/amd64/conf/MINIMAL | 1 + sys/i386/conf/MINIMAL | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 11f0d5d10c78..fb6d75a2ae1a 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -36,6 +36,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options NUMA # Non-Uniform Memory Architecture support options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_OFFLOAD # TCP offload diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index d8c43d37fbce..e27bb68e31fe 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -41,6 +41,7 @@ makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption +options VIMAGE # Subsystem virtualization, e.g. VNET options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_OFFLOAD # TCP offload From nobody Sat Feb 3 01:36:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx83CZ6z58kPv; Sat, 3 Feb 2024 01: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 4TRZx81BXMz4Qdq; Sat, 3 Feb 2024 01: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=1706924188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmJ6Gzcaa25LvEsy0LK44tDhxomhJW1XcYPYQi17++Q=; b=a68jEvgckKcu5GAQW1M8EIXZR+J9HB3If3jGnRzSZ7MfnbgbnL/K4mjcHyd7tnkQ3yeu1b mSyFDcz4gwuLWOhotNx8+ix8+sQXO5hWkbPmTcbMUZw+296+a+8MnRyAFARkHro3qeOMoV GQW/NojDy+Xm5bl2HJwyTfZGda/jU2s6c1D0B6pn64fe/OK0D0YjjipQ+Vrq8gh1olzUAp iuQ4xT3sVRht22ORgJXuIIHF4bOJfZtJCOMkwVm/GvMUZXyRaU0vXFXEPy8J/mtfZKGOT0 YLcqrERHrx0DmMLdiBosckfU69q0AyXStzbfAzkuOoOau7SkPfQ23W8LHaO8zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmJ6Gzcaa25LvEsy0LK44tDhxomhJW1XcYPYQi17++Q=; b=hCjDwcuSGI/Kmjdg99ugRpOMjkcvlKMLdk2GtFUFiy4md4HsrHTOYt4K7zX1qOXj72rYLl zxjaTuaKtBUW8DOp8TJ0rMeU+fX98uHZozdRMBImahNCpvDSniSWfx/FrgBCkd1tXotN7v ZE4ZfkVu7fc1IEFPotRwISVqfS+jSj/HYl06if7SEJKXd7RRtsHYFygHSSUGqV8I9gE65V 8UcAasdqw87Q6hv3PYP+Q/OnY6h0dtRI0g8Osz36fStJ6zYNYPVDnLJvNvQS2hR3Sga5w5 pGjQ6fY6dW6ce0/cG53wo85yz0eb/KjUmVqLn/grLtrskl4g1+gHbNrNGZmARQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924188; a=rsa-sha256; cv=none; b=rd21snXhBKWFc07zkSJA6HhGNJSzIGHbu+U6pjlrhwmr4jFf4fDdacmC+LRvA9lc6/NQCC c6hOq3J3vqlqL/uH07RvWNM+bkBR7hcEpJMVVpV84gq2OvIWOg1/6bej4LPbjuVrlYmzSQ FoQ64bqplnGidB6j/YT/dSNOMbYWZyiKJ0GLoxmrXSnjTCmf/8NUWsijILTyyM3ixdurf0 Pu0jr20tT2CiyScpkZqcGsIB1B/KJcLxOUQULwGtK8oepZScva9Fo0pzzdEP9TeaNreKdM 7LeVQTwpt7mOJRc0+ADkN+nt0XTlzNJxIBY2zH6oospdi7tFPhxMMmmbtGq6sg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx80Cqmztyx; Sat, 3 Feb 2024 01: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 4131aRCo011025; Sat, 3 Feb 2024 01:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aRBs011022; Sat, 3 Feb 2024 01:36:27 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:27 GMT Message-Id: <202402030136.4131aRBs011022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 05ad376bfc5a - main - libc: Fix typo (triple M) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05ad376bfc5a548813a90936bf4c6e4d7752f777 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05ad376bfc5a548813a90936bf4c6e4d7752f777 commit 05ad376bfc5a548813a90936bf4c6e4d7752f777 Author: Jose Luis Duran AuthorDate: 2024-02-03 00:35:54 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 libc: Fix typo (triple M) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/963 --- lib/libc/xdr/xdr_rec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c index f0690b4089bb..66e11318ea41 100644 --- a/lib/libc/xdr/xdr_rec.c +++ b/lib/libc/xdr/xdr_rec.c @@ -486,7 +486,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 * (output) tcp stream. (This let's the package support batched or - * pipelined procedure calls.) TRUE => immmediate flush to tcp connection. + * pipelined procedure calls.) TRUE => immediate flush to tcp connection. */ bool_t xdrrec_endofrecord(XDR *xdrs, bool_t sendnow) From nobody Sat Feb 3 01:36:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZx94sVdz58kL7; Sat, 3 Feb 2024 01: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 4TRZx92WKLz4Qxh; Sat, 3 Feb 2024 01: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=1706924189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qE/wCy/toGfKrxTFKL3/f0y6cI5Df12BCHooORgVbfE=; b=lJXkCkX7h0YG5dymR6gPMYMOZqkMfmYu6Dfsi9dA18ZMAOLt+YlrBKZmb5NxUZOQ5jPLCw qskv97rYHPSc9AvCNIy1V36clQ2Fo130yBJgym0Q4dmaNtzyI5qT7LcbHOgotIKv658vze 8vFg+FuHVIURbSetTCDArz+Vwz8cn3WESW5yTymvWuwhPDWMYcI2cH+o1kHZDTQ1bc4/UE rYxCCMak7ePkcU2FsQhNUwlBjfE6MsisJ5s1bdDGmGQ+CIAleLRirwr8hW/My+QIv4cssl Q5W6wJRF0BwVkT806mQTxQITNxPqkSTcn1Jz7lKz8fEwD1dHLnhisNQdxR1G4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qE/wCy/toGfKrxTFKL3/f0y6cI5Df12BCHooORgVbfE=; b=xWXpA4Id+aE9cq3RqlfU1LhcHKhsRD3cKFmbIdFhbiCE1N2Ve2psVy7CNKL5t0sY5s4d7j fLC/Rp3RfTDLObmUOtQfl+vwWnc1edn9eL3ihjMVjEkQ3A+/n7gb1+NHUrtVORyc7MUzWi ojMltbscL49dGmDMR0FIpqWXm3VyRrJ8r6jE9shlMCnTB9etqLSRS4kEf4/Aa30wdf3G4n Ze+4C5XkLEBTd2ZpmGDqoXN4d+CVR6qtJVrRwFzOr+rrsIEYeWO+7U3xE5cVIC03Hd9+zR KzKZ8Y8JBFDSQiKecnGpAdBErb7jOiDq3ypWdlyGaFEDsnOvpmTHfvmOxaKGcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924189; a=rsa-sha256; cv=none; b=buxdj+TjDqydsvXL24PA8JRIZoPzWgvHuBQLdb37x2atPJOQhmlBcCokUhCuNh2ntxHFT6 tEL8Cz/20O/woyZa1JJtWBd3uVYrNygP+gKkmqg5/0HQ5tuMMmkEznLRTLsEUmfhjiO5v+ brjtkG3GlEtGltDDJeME/C1XQoRCUMRZRtWvBVVIUkMAy/PndDqDcmEZ67dRF/NoCdNmSF f6MUK4m9vOuOvbI/8IMp/yHfJwEBhPXSMX/IBKUvZxZFTqf73r1JE8R6a9VTMJO2CY3ev8 f2rHrXO5fXAs6W+osZf+XpnNmJ11spL3hzRXKBrr/qKZH83sLvAx6vzPMCVkXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZx91d2yztWw; Sat, 3 Feb 2024 01: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 4131aT0u011070; Sat, 3 Feb 2024 01: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 4131aTSa011067; Sat, 3 Feb 2024 01:36:29 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:29 GMT Message-Id: <202402030136.4131aTSa011067@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 328df6da9ef2 - main - ath: Fix typo (triple M) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 328df6da9ef20fefed1749c05d4f19d47dfb7803 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=328df6da9ef20fefed1749c05d4f19d47dfb7803 commit 328df6da9ef20fefed1749c05d4f19d47dfb7803 Author: Jose Luis Duran AuthorDate: 2024-02-03 00:35:54 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 ath: Fix typo (triple M) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/963 --- sys/dev/ath/ath_hal/ar5416/ar5416_attach.c | 2 +- sys/dev/ath/ath_hal/ar9001/ar9160_attach.c | 2 +- sys/dev/ath/ath_hal/ar9002/ar9280_attach.c | 2 +- sys/dev/ath/ath_hal/ar9002/ar9285_attach.c | 2 +- sys/dev/ath/ath_hal/ar9002/ar9287_attach.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c index b5b1dd18fea9..05b2cdd5e30b 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c @@ -59,7 +59,7 @@ ar5416AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: disable ANI noise immmunity for reliable RIFS rx */ + /* NB: disable ANI noise immunity for reliable RIFS rx */ AH5416(ah)->ah_ani_function &= ~(1 << HAL_ANI_NOISE_IMMUNITY_LEVEL); ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); } diff --git a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c index 00fa6e3d5297..f09f62b6f61a 100644 --- a/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c +++ b/sys/dev/ath/ath_hal/ar9001/ar9160_attach.c @@ -81,7 +81,7 @@ ar9160AniSetup(struct ath_hal *ah) .period = 100, }; - /* NB: disable ANI noise immmunity for reliable RIFS rx */ + /* NB: disable ANI noise immunity for reliable RIFS rx */ AH5416(ah)->ah_ani_function &= ~(1 << HAL_ANI_NOISE_IMMUNITY_LEVEL); ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); } diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c index c9d1d572cb80..adb9116e6fde 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c @@ -94,7 +94,7 @@ ar9280AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: disable ANI noise immmunity for reliable RIFS rx */ + /* NB: disable ANI noise immunity for reliable RIFS rx */ AH5416(ah)->ah_ani_function &= ~(1 << HAL_ANI_NOISE_IMMUNITY_LEVEL); /* NB: ANI is not enabled yet */ diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c index 1a665d55add3..b1c0f53a24fc 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c @@ -99,7 +99,7 @@ ar9285AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: disable ANI noise immmunity for reliable RIFS rx */ + /* NB: disable ANI noise immunity for reliable RIFS rx */ AH5416(ah)->ah_ani_function &= ~(1 << HAL_ANI_NOISE_IMMUNITY_LEVEL); ar5416AniAttach(ah, &aniparams, &aniparams, AH_TRUE); diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c index 694550e7f75f..b3abf2baed49 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c @@ -98,7 +98,7 @@ ar9287AniSetup(struct ath_hal *ah) .rssiThrLow = 7, .period = 100, }; - /* NB: disable ANI noise immmunity for reliable RIFS rx */ + /* NB: disable ANI noise immunity for reliable RIFS rx */ AH5416(ah)->ah_ani_function &= ~ HAL_ANI_NOISE_IMMUNITY_LEVEL; /* NB: ANI is not enabled yet */ From nobody Sat Feb 3 01:36:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxB5RSVz58kHj; Sat, 3 Feb 2024 01: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 4TRZxB3jCfz4Qxp; Sat, 3 Feb 2024 01: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=1706924190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dS4iwp5eWf+QxWa3/RQE3OklPaY0QotHGfOiPFPZ5JA=; b=sYglTatOgPW9n09FHTrw07ZiZL5jPJd4ezpOmYNU4M2CR4w3lwAeL2vcQDPycN2dohwAk1 nFWEfiZAEl1D+DZXRrMvuozj2uZwuwedmwZsO+Ymaq7zK9rNomPNN6KQMAkztOnaPdKbyY ehyO44TJnYJGoRZ70fBNpMWnl2T1+f23i84y7+dfIf3bUpL9k8rwj2xpEMsLj/1NU87yl+ cygOcu+FVVHRadgfrG8hfObWIJyCUC6238A8bUUBoOw83xeMOVp0bZgBY3/8dIOt1J0j2a 5swd7O2sAbCLAtAoFrB3f8jP5zTYXfERevjsBMU6ABnk5S0xNasg52a9yfDggA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dS4iwp5eWf+QxWa3/RQE3OklPaY0QotHGfOiPFPZ5JA=; b=xtLkx/GEqqHUyz38VmNDiVtAMU6FEqAw3Pa9qTECpVmH04/km0//G8PvLgGTGItn7qLFwd ep0kJ0olkQ0sJVnmjKqEur12gG+4xB/l9n5eDm0FlXdZk4z0Z49WloGhAv4KsJP2dfWl7A sU6T7MhFsJSUAbxcBQeeJLOLI30Dm0yvtBGHYOqsd1XqrTsk7K9sxiEugL8mpm3hXd1v0V qKNXfBdYAoF04e+VZj7TNjecmejZJa4eo6ARTEn8CjW27dlxhTZTDIdp2u2wGWex5wvhxB Rdpe7kpuWX8ZHlTI1VRMeE08VKxty1L3sxyhSq7Bij+0HiOBl2YmoDjPpq76Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924190; a=rsa-sha256; cv=none; b=yhCjvCyAG7sh9dCslncXYQUi5ZujeQ2ofYvkZ/tE2xSmGlNXZAb2AKkWe/ICY7yTPusdxR pMu6dIKxDg+Q+g4wEGQ9oY/+5enMfxCyq6410KLletj8tmu5Y2MRJ9R6SQG9fTgS8dq4S6 EoqkXyx8zCWImpZyMNzCOcVxZSSySyR0zW7OpFdHoNQXa6XLsxH69zCh4+dCBKH0PNipkA EsNWXB/Jbztg59r4XCrtrnVouEs5MHNdb14+0DypEY0JBuhDUmTG+pZ7M0z6g/3nrCGCmV PY8c+etXWxFV387okmy7RUkfxi+hF9/OzgVSEHcDP1KEQOf/jtu1LFPCEeXVtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxB2pDZztwg; Sat, 3 Feb 2024 01: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 4131aUOk011113; Sat, 3 Feb 2024 01: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 4131aU35011110; Sat, 3 Feb 2024 01:36:30 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:30 GMT Message-Id: <202402030136.4131aU35011110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 44bb80b0adec - main - qlnx: Fix typo (triple M) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44bb80b0adec2faafc8c4b0381595121863655ff Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=44bb80b0adec2faafc8c4b0381595121863655ff commit 44bb80b0adec2faafc8c4b0381595121863655ff Author: Jose Luis Duran AuthorDate: 2024-02-03 00:35:54 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 qlnx: Fix typo (triple M) Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/963 --- sys/dev/qlnx/qlnxe/iscsi_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/iscsi_common.h b/sys/dev/qlnx/qlnxe/iscsi_common.h index 964735a9df83..772b2241072f 100644 --- a/sys/dev/qlnx/qlnxe/iscsi_common.h +++ b/sys/dev/qlnx/qlnxe/iscsi_common.h @@ -1404,7 +1404,7 @@ struct iscsi_conn_update_ramrod_params __le32 max_recv_pdu_length /* Maximum PDU size. Valid for the RX */; __le32 first_seq_length /* Initial sequence length */; __le32 exp_stat_sn /* ExpStatSn - Option1 Only */; - union dif_configuration_params dif_on_imme_params /* dif on immmediate params - Target mode Only */; + union dif_configuration_params dif_on_imme_params /* dif on immediate params - Target mode Only */; }; /* From nobody Sat Feb 3 01:36:31 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxC5lwDz58kSB; Sat, 3 Feb 2024 01:36: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 4TRZxC4sGLz4Qvf; Sat, 3 Feb 2024 01:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oOx90oTDxOfAseHr+shmxw/57IWdhZ7Bo+XX1vh+FxQ=; b=pW2bi5ZKN6Ozsiqxk1//vB1BHORTLH+gcmogi2CenmI6AmUw9Wy5dSVUhCj/j5SCy20yVM BcGOzp0Rlg+EufwiWsvYNzUJHk2Zs8nWCmoja9DizssMZcS1Bin54wEfUdQYNm2ws1DWKm 4sezLHPjpjpf8Qszya0k4+q0VNAzr/tHjpsPLwjtsccDjj8vmBFtULpQMcI2jXHqm2giKh NydXG9sPBXbc8z0TMU8lP4KRa044jLD70gOpN25f558SJXVrM8277UkrEzWN9INTgv/v1g b8L/7sQVdvuFzKga8RF9AtY3cY0RzEA+tpcXijnD9DmTzlFQlfn2q+elyPZtag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oOx90oTDxOfAseHr+shmxw/57IWdhZ7Bo+XX1vh+FxQ=; b=wU/y3d7o6CrAn51iKhucDuD1jwo5DfFhlvp6jL9nj0gAc2pvhtVIt7tEhVOTJpKlateHjz alGb/4ZAtrPA+qgkS9aeJMKN/7EolmMnDFwElU2v51UpFpUQSeLZYjzKgk4ylzqA4ZK9ZL xHi+560wgM+ZS7K0qClozek6gLt/dr1WEHfustWKLkRc+8y+QHKZlkRKxlVdvPo1/GiADp QyUeXUbICukuDb8mgoIpCw8IC6db3lbIAaZfIlgfA1vh5mCxwq2cEWRkf9x7habXC6nxO+ ilGfWJNZVgDoovFwhNJeUaiqew+cecReU+PsQ+RtRge5uR82N2qPkwRSr87wFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924191; a=rsa-sha256; cv=none; b=OoR6zqh+3wziEsA4ibn6Qk6m9tG8J/q3OJxp+p8R6qvg19SAriy+AF52f0CurInlDxRgx9 8N/aVsB/f6vK3XuEj/03/olCg8VzqL32bB9F80JhWoMwABxWceHwA72XYF9taWBGKDiQqu gCBb5WBKtdKN8YXUOHPOaQeUnfjx1k0N7guNcqI3Bo5Y4gxGKqr1MaGuQlX3MQcNugtl36 o57eTuKl0KPMGYInuGwxwDgrIyhXDVCO+Ng4f/Vz9pDoOso+LydmBgLkRbWOuVx+OxNuVc xDYfVkaXQBP6n/8rYUm7z9tMgFIdgoALWkfxK0jzZx28g9HW3LBXXxYJy4K5+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxC3ymgztwh; Sat, 3 Feb 2024 01:36: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 4131aVot011161; Sat, 3 Feb 2024 01:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aV4K011158; Sat, 3 Feb 2024 01:36:31 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:31 GMT Message-Id: <202402030136.4131aV4K011158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f61554272c9d - main - sys/dev/iicbus/pmic/rockchip/rk8xx.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f61554272c9dd3725aecf43a5b6570149a4301b3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f61554272c9dd3725aecf43a5b6570149a4301b3 commit f61554272c9dd3725aecf43a5b6570149a4301b3 Author: rilysh AuthorDate: 2024-02-03 00:38:12 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 sys/dev/iicbus/pmic/rockchip/rk8xx.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/dev/iicbus/pmic/rockchip/rk8xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx.c b/sys/dev/iicbus/pmic/rockchip/rk8xx.c index 9d4cb2cf454c..9e29c62f95bd 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx.c @@ -122,7 +122,7 @@ rk8xx_poweroff(void *arg, int howto) device_printf(sc->dev, "Powercycle PMIC\n"); } - val |= sc->dev_ctrl.pwr_rst_mask;; + val |= sc->dev_ctrl.pwr_rst_mask; } else { /* Poweroff PMIC that can't powercycle */ val |= sc->dev_ctrl.pwr_off_mask; From nobody Sat Feb 3 01:36:32 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxF1wvKz58kHt; Sat, 3 Feb 2024 01:36: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 4TRZxD5xX1z4QqZ; Sat, 3 Feb 2024 01:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7g5Aq5A+gPB3xdbUWnV/du0eEpp3c882j1XoJFEAzQQ=; b=MWujxtrqryW5wW85OUsZ6K7j8Mar10K/d7QgzT4k77d2nTnAu6TaTm1ORNEPoRfnsK2Eft U8fmTXypD/Z7obGndSzDI0hRblWIHkpM2WkeYWUsK+rkDN34r1AewZPJ64tTbuEfKeq5l7 aGtpHlOxT8dEdylEGLOGQ4Ez8+Y4Xo4vZaXWBSQevmEcX45uUO31nB0vRBL/pLpYsUTIAh xHtX8iKQuFdo/nfP6xv+pp2VQ7DMjKcNaVDX6yFZyBr9pp2fM+YZONfJAh01n9rG0oB+Ea aYH5itK5F4yIQBsLwN377j8EDDS9NqEJxQyShg5h1tXtV0rqxnpwGufNoep45w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7g5Aq5A+gPB3xdbUWnV/du0eEpp3c882j1XoJFEAzQQ=; b=JRIzotFdK5LD7SUmP/JieaUq6A1LEJ4tangL5OzOlwIb/qqP3o9khebISvaHyay7p/i8Ig Ih6wh68ZHVEbzg1WC7LRq+oaAaI34VRyLlgW4NMR1FzSFFN2tpJ7C79M1mucCCA+0hSo1f DyX0FpuOZFSJCcy6JKzcKKue39B5us4GsMilmVmUO9aPfd6OYnE1K5pcAU4+bV9IYWLyDZ bWcmIl/efaU+HiKouHlJmL8mp4IRNKq0FRiiBiyXJppELsAwrR6e8gMmN96FX+1KLY/PVW HKziTw169J8anKj0bREZPLBxyVKHFixHFIG65kkfrQjHcgWt3KBMKAH9RyWRKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924192; a=rsa-sha256; cv=none; b=qLN7XQz+3tDZ8X1IN/DyymzrrM7ZauN7v4SogbUcqJLTxVvJuGFtRdu+A61udYEmxWFaGr H3WhQCOCa0eSgCno/Ksm2QNWX0DYdHXE14yu2k1ewNjILx3lk+8xNdCbY4cNyc17v6pU22 WEa+36ilHVAtp+KY9/4l+M2cDDVop9o5HGN+ANSb7LCmjdBkHupqmoEoNtV6NV/zKWYrRn 9+XNr31qWp+oUgCunyk4ytvLQYRXg78fofoUiDZqY8CCxpW/ZsEFckd8YWjJnVIrf+TDDG u1UdPFjU9R1+3DD5vAzbkk67/h0QfCNt6sy5s/BqK73Q28lxtdETcWuKIucueA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxD521vzttd; Sat, 3 Feb 2024 01:36: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 4131aWck011203; Sat, 3 Feb 2024 01:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aWXY011200; Sat, 3 Feb 2024 01:36:32 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:32 GMT Message-Id: <202402030136.4131aWXY011200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: abd9758fe2d2 - main - sys/dev/mii/mcommphy.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abd9758fe2d2dc39e6bbbf4c00af81f26328cb61 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=abd9758fe2d2dc39e6bbbf4c00af81f26328cb61 commit abd9758fe2d2dc39e6bbbf4c00af81f26328cb61 Author: rilysh AuthorDate: 2024-02-03 00:38:12 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:00 +0000 sys/dev/mii/mcommphy.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/dev/mii/mcommphy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mii/mcommphy.c b/sys/dev/mii/mcommphy.c index 17ed294ff223..a8a16c00bade 100644 --- a/sys/dev/mii/mcommphy.c +++ b/sys/dev/mii/mcommphy.c @@ -130,7 +130,7 @@ mcommphy_attach(device_t dev) PHY_WRITE(sc, EXT_REG_ADDR, PHY_CLOCK_GATING_REG); data = PHY_READ(sc, EXT_REG_DATA); data &= ~CLK_25M_SEL; - data |= SHIFTIN(CLK_25M_SEL_125M, CLK_25M_SEL);; + data |= SHIFTIN(CLK_25M_SEL_125M, CLK_25M_SEL); if (sc->mii_flags & MIIF_RX_DELAY) { data |= RX_CLK_DELAY_EN; } else { From nobody Sat Feb 3 01:36:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxG1G3fz58kC1; Sat, 3 Feb 2024 01:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRZxF6zDwz4R6H; Sat, 3 Feb 2024 01:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rx2YhXzBau7rwRM0B+Gnv3Xgs1QaJFJ9thHRAnGVzFA=; b=qg0yOPu112lm5Dn2wt72sAVw/aVccPwYLKVVWbGTsN36hze2Vm0+VKB6kAHicV9MBbuL9J 94/KmwQMZZRouBaR1Awg9SQaeeiZFCXMewSZZDu9e2lOAS5d7IDpeL05oZg/lR5Oc8sWfZ V5ECS+3s9Y2AmjRrT5JaEmljaydoO+SMtM7pvnmMNSOcLBfDfxqR9jP+3FfA73/Kj/LLa+ g1Ieu1F1guznJZi18ZQAm5GGH6Uy+PeCUAIIpeIryJmU9JGjVKGXhjdg5x7JDLNX4JgGU7 9rkdRobKVnriOSs52PYhtoldQCJ9KTsqHe1xFkpknzcyqf57DmFNBpYEj+5Hzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rx2YhXzBau7rwRM0B+Gnv3Xgs1QaJFJ9thHRAnGVzFA=; b=GAtVfUqdanhcKtVVX7ICU5fz9Bo47FP5g8Hy4ZH+jsk52Ys3DS8pQNPzAP9qFvJmUgr2IN htuplrx2DOnhX02lE8DY8M4bSWbh6DPPk4Hg3Yy6rjWOBtiEZcPe58exDjR0rQytdbg81+ AZfFJizQFtePI7PgvW8LPlH7CCQn4Wnp1qHGBoxwocf9Vl+5SwvGdkFAzHnU17ZmkUEVX9 Ho5v6z6ikxtMHdjFYpVib9B0vzjSA60gL/oAKkR+j7VoTO329L/7nIRGqhJcbNgXJJrSM+ +Rd8VvFpc7t6hMSJXQdsBWDJQyZZY2/X7jzI5sadaM7pc47s6guOjdEIr3i6eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924194; a=rsa-sha256; cv=none; b=exTxrQRK5vt3Xj/h3LD74Vt4Uy/Vq4wkBpBemKX50im1uFWmsYrMmkn4lsEKAFUE3U1lp5 HZnAsfVYJVq0tEHr3Nj60MlaRFwtGE1zDR0BVUH6CXifS9pPa0LeSmuVM/EqaGzIUhcB+e aq/x+hftPHdtLK9VWJWpX26uUmo6kzn9yB4BtjHf4ffkmT4AVuo6wjoI1ItiOKq9H3Z+Fq KPBhjDuYVyAITXkZS8QQSxTHTbfzfENFp6TqFUYsE/niI9VNqVLMZFS48ovr2pIwDmFISC 74gB6axYzPzHanDE0jPjybe3rOYW0pDvfxhQcPkp2Eoxudvdp8cuY1PZ2Sw7cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxF63fbztWx; Sat, 3 Feb 2024 01:36: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 4131aX4d011248; Sat, 3 Feb 2024 01:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aXds011245; Sat, 3 Feb 2024 01:36:33 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:33 GMT Message-Id: <202402030136.4131aXds011245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f830db48c131 - main - sys/dev/enic/if_enic.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f830db48c131064bfb534efff92e37653d6f05c4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f830db48c131064bfb534efff92e37653d6f05c4 commit f830db48c131064bfb534efff92e37653d6f05c4 Author: rilysh AuthorDate: 2024-02-03 00:38:12 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/dev/enic/if_enic.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/dev/enic/if_enic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index 154eedfd0a19..dc0c0d028e20 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -1587,7 +1587,7 @@ enic_setup_finish(struct enic *enic) softc->multicast = 0; softc->broadcast = 1; softc->promisc = 0; - softc->allmulti = 1;; + softc->allmulti = 1; enic_update_packet_filter(enic); return 0; From nobody Sat Feb 3 01:36:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxH3DtVz58kHy; Sat, 3 Feb 2024 01:36: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 4TRZxH15cDz4R8V; Sat, 3 Feb 2024 01:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQeOJEoQCK6XfvMxSNK3R4yEOjZdnP5VbT80uJz3Mrc=; b=ZdPeoLSAMKObkjElhiUZplSe02LYD6Cta0tISUykE9KqNuqmtaqekKyTW6Rqtq8dBasMlH e3dsNVXrDFTuUGDoQxZ3n8+lIHt8rsIUlHLZ68LQaPJOqtJ2Skqg6CXfkRjVhutUPvbzAI mvDFYfAKMzmn5NUN2VCIi2PBU1zd75R1yJH0AsXOYibRTgH3qqLc1NgbqGuVIjcWJq93CQ KSTzqgl3f0q8CJeVLDAf1q0Rau0ow0OoZR1g1PLxFa0nxyyiWGbU3D8DujPdi8Lpo0dd8i C4P+h9Fpj1EUm1z27Apd2AXYTt43tjGmpcUKS7JF7Uy9/s30M043XwNQoLXGMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQeOJEoQCK6XfvMxSNK3R4yEOjZdnP5VbT80uJz3Mrc=; b=mcRQfFVg8cgaH1N8qBlC/ZG6C40mATqn8X9vYwW8ftDfAnXkhDdH6R3qaRT0KKj/70Worw ZyjPx7QH0qMPlpQk/gln9wxOBfcn3cYECMZprhyDGtjR6Br4q22OcUfrEEOQxYG3fuPiGk rMXgzKxT/kw3Pw2ey8n1Wvt0NtAvJutaV5owDvgPa919zs0GYX4LtjkcqP1UaQuZju1Cw3 Ah0KKE2zwdrTSVAKtvb2+FJSmyphQ0QNt+Pl4pDg841qWpT6PTHD4LtIhwuY78jxjdookZ chQgT2fol/FSV5EsKMOIVXiGnGY/aSys/94cMot/ypNt8Oidv4UICm4/w3+VHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924195; a=rsa-sha256; cv=none; b=kZE0U95s6+slF8WaY/vDZkVT340Wv2SX/1JGmQEp9ducazSYqz+jAbsfjpczUxbtYEUzAb cpPn+yvf7JZmawAHqcw5nkXX7etuaS3LLR1wn180fNBSlc0kRo+UYRKpw1aWLhTQac99ks EwLCuqJ3FmJBC8tm5P9wanQK0Wxo7MvBgEJA+q/cAc0oiPGSTbNVgFg/YhTWG9NHr8GpCz SmGKSPlGPTmySBEfq0Lk672tzEIxL5APmIsZh2qHTZ3mnGG72jtmLHRJe6v4WSW9uXV+lP f7glm2pR9BoSI0BctFVBPSIKH6tKlAnxAn5s923XxiGhSTMM3RyWpVnxmCH58A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxH0CccztWy; Sat, 3 Feb 2024 01:36: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 4131aYqY011290; Sat, 3 Feb 2024 01:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aYWJ011287; Sat, 3 Feb 2024 01:36:34 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:34 GMT Message-Id: <202402030136.4131aYWJ011287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c07087988b48 - main - sys/netpfil/pf/pf.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c07087988b48ad0fba8ca099b34849147fb85316 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c07087988b48ad0fba8ca099b34849147fb85316 commit c07087988b48ad0fba8ca099b34849147fb85316 Author: rilysh AuthorDate: 2024-02-03 00:38:12 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/netpfil/pf/pf.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ec7964a48e6d..11dba9c3b7ae 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -3136,7 +3136,7 @@ pf_send_sctp_abort(sa_family_t af, struct pf_pdesc *pd, off += sizeof(*chunk); m->m_pkthdr.len = m->m_len = off; - pf_sctp_checksum(m, off - sizeof(*hdr) - sizeof(*chunk));; + pf_sctp_checksum(m, off - sizeof(*hdr) - sizeof(*chunk)); if (rtableid >= 0) M_SETFIB(m, rtableid); From nobody Sat Feb 3 01:36:36 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxJ41D4z58kVl; Sat, 3 Feb 2024 01:36: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 4TRZxJ2Gjbz4R8k; Sat, 3 Feb 2024 01:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmmJqON+HY1VD3q59uME3sVZ91LyGIl5aOInc7sRSxU=; b=AHfFwEKfjqVul5xkUKu5ZlXzVxwHEh/zMVJemVgIa+bgOmKCEfPz3BK1GuWUQO1RqIZsQK 9fnROpufDRgrRWZ6Di/dgKRs76FN6qLFjbz8PIExH8dr0FGn2jGFxPLgRu8DzkuSOgn+BV CKFZay1en7cUpl3Ctxh2dgqbxnHNpx8M7KDWT5OkPtcMSxDTwB/uLwgXgOlkXAPBzTTGIG X5REqVISvqnhzcbC5Ughs+BeY05cypqRenNARiQGm33zUqbVtMJ5rUrAsbpBfAby7gajAO vwg7u/ip0vSMsP1LW3tjHhPVp1+u7JwKBiMhp+bad23jOKN7J0Kyaw0YXA54aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmmJqON+HY1VD3q59uME3sVZ91LyGIl5aOInc7sRSxU=; b=OxxTnnt31Pe44suXLrXZApBtMx6XFhUuyYcn8lFOrvcuUWMvwMARTV9sWnTQGRGcHSOllr sly0B55NChn6zGL8kted97f3gRlMifEHk6aTPPuK3s4XDKBb5qGEnYFVl6Wf4lzbg3s0GM l+FlGzcz0BhFhH7pvYsbfC1U9GRAvm1MfDvGlzQOleBu0dXZCryISgEqDGf1D2Yvxo1t0e ybrKOkXmAhXle4qXnl8ULdTVS6QdzibKonim0PDdS5dT+T/0TcTnXsiztM40wAi5tOSrRz XU/XTFc59aD4OYj7iS8REe2+R4KnAW5EDg/fzoXQ1Zt8wG+bvBunc1UqD27mxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924196; a=rsa-sha256; cv=none; b=Fn9dTXRq1lnHsLtGsA3cQ8d2v2L+tFwBjHD8JyxAD8Mwtnd6A8RXbw/ikpcY8nemMxhG15 9B3grwA+L93yrKz+Tc9L+ri8zdK7u6UU1UwIfF9aYcgTZEMsSWTCWyxU3nHNVo+atACSpx K/SThdZEak8Yj2NoUSTIRrwNyiITx5TgM8L6tOcawII0U0uJYfFWzjx+JD+QKHHSHrXjjC oez3y27fccRacr/m/cGexTEAbgQ65iRJtWEj6obP7V7TUoS7kf0MlU+t763k7+SDtmcKWy CUYgyVEAR+vZA3Ugjv6RO3izZYoTCYtb8GLEsjZjVU6I9NX6n+327ZANQJlJfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxJ1LWcztX0; Sat, 3 Feb 2024 01:36: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 4131aa02011335; Sat, 3 Feb 2024 01:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aaWw011332; Sat, 3 Feb 2024 01:36:36 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:36 GMT Message-Id: <202402030136.4131aaWw011332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 11ff3552fd08 - main - sys/netpfil/pf/pf.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11ff3552fd08ccd4a1fb504e1b202d17366e2b88 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=11ff3552fd08ccd4a1fb504e1b202d17366e2b88 commit 11ff3552fd08ccd4a1fb504e1b202d17366e2b88 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/netpfil/pf/pf.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 11dba9c3b7ae..9f2c07c614b3 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6123,7 +6123,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, { struct pf_sctp_multihome_job *j, *tmp; struct pf_sctp_source *i; - int ret __unused;; + int ret __unused; struct pf_kstate *sm = NULL; struct pf_krule *ra = NULL; struct pf_krule *r = &V_pf_default_rule; From nobody Sat Feb 3 01:36:37 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxK5pHyz58kLZ; Sat, 3 Feb 2024 01:36: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 4TRZxK2vYfz4RFG; Sat, 3 Feb 2024 01:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wOWi1k1YCjrhtzPvIJVn2ynrTh5CWqDSZYM7yeuZBU=; b=gM5VslLkd3VnjopKmdkF1bhuuYcZY93q6JLrpnM32Lnh/egmLhMsA2//bJTnyWabfF8KdI A/g/vk+6fOBvGwpT2oECrGQZwcngasiRVOrznL8/2d8cpjs8zkyzSts7UGkcS+XlgHLiJE vqbIAtXyJQw5u3+NNAJtLbloMxfHDgbTJQE8Zh1csu+qxMPBrNsdNUUANldxVrg89mxrfT s3nKWfERGKvKu+qA04oj6B2aW+roCf/bo9IghCBq6dELwHSeH2GLMWBPm73HdcX82Kkd3M MEyTHUHAZtQiR+hpYwuEclRk2h2uoRYwbmd6i30T2NHnZ0s/D+BbeEWz+v0gEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wOWi1k1YCjrhtzPvIJVn2ynrTh5CWqDSZYM7yeuZBU=; b=VOcG1BvW73+14ngHI9IdXv7HimMuKPHv9cco3GJM67Rl+uth4Flj7EeZzE/TH1ZtasaeHX wiBx98PEfS7Zwjc4uK2vhYXot3P9dUXshpvExJf1aFf3Hc8YYGo/ImB27KhAoC/nMGdCLi OiFWRlHCwvD9PyAbuIDrwXV4fTKmZkVMi9w5geuWqKhvB0a5732IvEtqso6LyovTBOnSqc lZTjho5p7HU3rvqsPZIvFw9GHn2JRiMIVNc0MiEMcGkF7zgL1OIU9sBPmLxsEzQ9NT+m+a CGymPVHRYq8PX4cWGLNlkYiny/Eb0wI6ZeDdb7dKeEamQeQrSz+azXjgX3satA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924197; a=rsa-sha256; cv=none; b=a+t6eJsENnoW4jkxd3QRrzAI1NJ+XhWGYpLRy6fjHqssljDB3SVKM4gGu2+ZQhFVdQt+UO X8wFA3SPODcsXkSHArZ6TxnL7Dexm6bZtia1dy+dQDyLLxtxnF/7fMM3P5RBrqThIibVl1 Q6mu5VFxww8gnCRhXvJVUo3/Xhtd0DnkPPCdC1tS0m8ttzkTAIOJdvUrIix7rw5v4PUdxy eU03iFL6qzYER7r9Nbk79Wmd9F+XNKIdr07LmDswyoWNPLB7pVxzP97ecE3R2T8POzweIn UwkzFOsYYFzHAUMwdb8BCxrTR4nc4IxSPWVXoD+ADUhzpnaHQLHkOR4JZKEsbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxK21ryzttf; Sat, 3 Feb 2024 01:36: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 4131abIK011383; Sat, 3 Feb 2024 01:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131abLo011380; Sat, 3 Feb 2024 01:36:37 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:37 GMT Message-Id: <202402030136.4131abLo011380@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3221c44d8009 - main - sys/compat/linux/linux_misc.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3221c44d8009ef24f024d670113d53aa3877bc6c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3221c44d8009ef24f024d670113d53aa3877bc6c commit 3221c44d8009ef24f024d670113d53aa3877bc6c Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/compat/linux/linux_misc.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/compat/linux/linux_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b87c05322e16..cb62b0e70c0d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1975,7 +1975,7 @@ linux_sched_setaffinity(struct thread *td, PROC_UNLOCK(tdt->td_proc); len = min(args->len, sizeof(cpuset_t)); - mask = malloc(sizeof(cpuset_t), M_TEMP, M_WAITOK | M_ZERO);; + mask = malloc(sizeof(cpuset_t), M_TEMP, M_WAITOK | M_ZERO); error = copyin(args->user_mask_ptr, mask, len); if (error != 0) goto out; From nobody Sat Feb 3 01:36:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxM0Fbfz58kMs; Sat, 3 Feb 2024 01:36: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 4TRZxL4K7fz4R5d; Sat, 3 Feb 2024 01:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE9ODsBb+fKRBeWU9BaV8AeFuaRgS/nrot0/emfsMEU=; b=QY8gpKEessBlJfBn4HvPEWGS/Fv3Rfms0YJkjEGlGfm2IyzWhdW5/Rg9dfpidLbkWa8v4r PR1Qq9xTXnCeHTwfs5KqodbR/DcRFyXec1CsEkvYgyFX5Ygm7DKpcDcjFjT/us4RBj6fSb 1OSW+xS+rJwCdtg2JOJHZDi2HStwkxcdo+98DBBpaOwHFLZnvmFSFWVFxKEYtVOLNsOebz Il0OqCbSz7zPnsSJYMa9NKsqgbjgDnNos9RBNUOMyzUZeGQ9B7QejZPgpcFSatzGW7itC1 xyMaNMq8M9eo9GG2/uqq8FAEd2rlnQ+nD4DC/cbkumdzY/kiCMwEjWkOrbObiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE9ODsBb+fKRBeWU9BaV8AeFuaRgS/nrot0/emfsMEU=; b=hx13D2mncuusZJhLjvd6ds+NTLwAUf2fJT5vv7R6c/aBqxLceEQXCmht6PvysReCw1FKyc Ju4otHuu49vFZeBi5azZvhrjffXbgvLyW4zYXQbYseAtZF4zOP33fyA2HKHKg9UoeuTBRJ WVA86f4SnM4yoOtB3c34+Mdc0GRVpvnQEEb6oMp3wVnwaex+nQcJsaESfefDDP6bP7ZFAX iuC9sfCkRMmI5fE2r+cLWI/umARk1G1JP8JHMGCdr9HZ7FQlwsB7kna/gmJJSmAWE81gs+ PqjW5rOgYYLKSTKJ2rZM65RMuS7UIp84uQC/ZmQxhVDd3bLqj9oXKIZKy5FsUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924198; a=rsa-sha256; cv=none; b=r8Vwn1UA1rQW6JjV1Yfk4JdHUSIDV3KJgDwBFX1EjGoKrcKOZ3PpxVv2DsVd+iJ7Mi5hPe eODDTRGxDdiMMYgQsVuZGuLMM+RbpGfLk7fcYAU4L2ZNPTzYwbKd9uvZrcjm6x8p1IVAH/ YHHBKMZf5ML2xo+vxcL/5SJfiKZTX06/Vbd/47+YqBwrA42uQhoi4MCnN0DY9BSpz0PI+N tPMRuGVQRkINZ7N/KYDPsqBMN4bA/iXhmEzwLs9RHEC7vE4+FLwzsl5bAwiYwXiemDeTHB bkJdX+nf2JeV3i+QKRFJdd2o/q8IMo9XDthxoKSgUbROAV+fgI7zYeK5Ya/7Hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxL3QHqztHD; Sat, 3 Feb 2024 01:36: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 4131acwN011427; Sat, 3 Feb 2024 01:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131acpJ011424; Sat, 3 Feb 2024 01:36:38 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:38 GMT Message-Id: <202402030136.4131acpJ011424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 552581e75d83 - main - sys/fs/unionfs/union_vnops.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 552581e75d83c92682c1b2b2c11748a4b1bb2f77 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=552581e75d83c92682c1b2b2c11748a4b1bb2f77 commit 552581e75d83c92682c1b2b2c11748a4b1bb2f77 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/fs/unionfs/union_vnops.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/fs/unionfs/union_vnops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ae85c5b3f3c6..150fbffe0a4a 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -601,7 +601,7 @@ unionfs_close(struct vop_close_args *ap) struct vnode *vp; struct vnode *ovp; int error; - enum unionfs_lkupgrade lkstatus;; + enum unionfs_lkupgrade lkstatus; UNIONFS_INTERNAL_DEBUG("unionfs_close: enter\n"); From nobody Sat Feb 3 01:36:39 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxN0Ym4z58kSM; Sat, 3 Feb 2024 01:36: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 4TRZxM574Yz4Qx7; Sat, 3 Feb 2024 01:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXo8SAAS6UTT43OegRW2EfG9bmpwVrfpqXYm6AtAruI=; b=tVAlOZUAxF5VXG+woOmmKTMKw9WXCufF4zomxQnOxuo81HhwvoKVIuONP6zyUJRaA7YWOL AG/CklK3xazabn1pln2X+hgmCn5WxWu4ljIpVVnG8wDeNJm51HqX4yt3pGc9JyABh1iNTN e5UORTVVKZKCjOYHUb01wrVI8elVGAMUvCzxFZU2Elv05Q53nPkQBHpNg7NxPuQzSCfhZH fGv2I1ZXxk0kBeVcLRLrboqm7/Yz90HysZvId6Pd/2v3ir+LnDGmT3OoZy5INDyWZ7EGox POC9uKx+dwGGjJxMovaDIK1H7ULCjKQEq/gqweOc5IS5Rp7wSacXHVpiiaUSyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PXo8SAAS6UTT43OegRW2EfG9bmpwVrfpqXYm6AtAruI=; b=M1cKh2qsUIomAOsGYEJXhjauuuLzY1jPyRU1RNDa93/vxUP86vlRibweO/mjgBW8pP/AA8 cSPxp0bGriV73KF0TTroAb8lXlq83ynjCTflqe0kBRogxOMJ/LqkwrabA9Bub2OJI+wYtC a8enJhWDCePu9B1UBF5B4p9qVLLpERjlc61wTphS/s1voYl6dI/W2pkS71maAd7xUsDBfG ogl1dcml6i5EArps+qwf84BgPJ8B9xkJhTHR+3FmGWnxCth7DUQcxTSjyj31ympjujHDqK HjZUNNKzEh1ff/Y0bIIC3C9TlYR/cmjcaF5LX17HgcWryhbtR6IzaPiNHY+n5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924199; a=rsa-sha256; cv=none; b=ryZMKfBIw6QyLiq6B2WYKidTL04StpmxsFGxR8viPMQ8R/DNABqFGeaeuCHv9GUZjTBSNo o80eFKC53QE8znNj4UvJxQoo5VQvIJk6wwoV3TKJLvUV4Ei/qustNmsL25voPEQZs5ilDY XVFx4zXeAcCB6EWxRulte9u7T5qKZX8lh+aa8QrAm1vUHQZwEZiFP4oHRyDr8yDS2pUOfB FKq5G7q2OreYUXVA825uTYuLmnlCh3JVYlTBByMCOoCgfpt93A+I29wea2swIv2MJS9UEZ 3YUtWHrPs5xeQx7vyezbMudT/8XxYFWuPDmreFbLu7CrBXOTefDrbMKHM4oOXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxM4Db0ztwj; Sat, 3 Feb 2024 01:36: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 4131adlI011470; Sat, 3 Feb 2024 01:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131adae011467; Sat, 3 Feb 2024 01:36:39 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:39 GMT Message-Id: <202402030136.4131adae011467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2d146764cd05 - main - sys/netlink/route/iface.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d146764cd050c41f6f4a6c6c6a3e24eff6ee74e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2d146764cd050c41f6f4a6c6c6a3e24eff6ee74e commit 2d146764cd050c41f6f4a6c6c6a3e24eff6ee74e Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/netlink/route/iface.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/netlink/route/iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 0587b478431e..19da6aea5f31 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -864,7 +864,7 @@ get_sa_plen(const struct sockaddr *sa) #ifdef INET case AF_INET: paddr = &(((const struct sockaddr_in *)sa)->sin_addr); - return bitcount32(paddr->s_addr);; + return bitcount32(paddr->s_addr); #endif #ifdef INET6 case AF_INET6: From nobody Sat Feb 3 01:36:40 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxP0shHz58kC5; Sat, 3 Feb 2024 01:36: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 4TRZxN6N2Yz4R9d; Sat, 3 Feb 2024 01:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Kn1es3uJGSQjBI6DmDgFvalnnBpdJF68IJLGFwgATI=; b=EiRs5jGkQq/E8FTljuK+wb+o5ZynZMeFITq9bLcW/p2AbKW44MX2BQCWVOb76ZbC7DHgw7 4JNvJqsz2xjUtiIP1C+vOc4BTKd+CQHlBkqUEUt/GXbuQFvteNnaCXOaqKo9AC8nde6Nmh VrKFGOX0itvDhPX88WvroB6f1tJBsJHh5Zfid3oncyI4vo2k/8u71TP4YUXNXqyc47Y5ay 4wubIDZPZ9ChwBNHawRflwHQ7Nmn7Hcs//5ZGjYgIYl27N90sVuFa/cNcKfnKr20kNHlum oSHG68bYVklFAG+LbJfvxzazMARq+ZSjg/INKjJ8kdadRVUkeLCmRDRpJV9nMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Kn1es3uJGSQjBI6DmDgFvalnnBpdJF68IJLGFwgATI=; b=GK4radrASakCX3Vq5e1wTf+Fp3rXVD/Bc2KQhlOl3C43fvXrLvm9T5BSfQyTXPtRLaYg4V orqdMbux150ZPpV6mWu8WX5zCz85xRz5ANYjGd2eC7Nsl1e3WKbYtAZZBOauG8ZRzmn6gQ J4rC2MGPsXtwr5bnuukGNuIbFWeFsBH66X+9UKZmvK8+f9F9h/w0+rB11Hq5H/AJ6H8We+ jFNC9YS+zVYc9XoSf3geHNTtGq0uXxu4YxlwvpMKSAZ+vSO0P8wUBaaL/qG/SS3bxxSVRK iPJ11vkto8zuGD1dUa5ovmfuxLzZTEnDr5nz7aBH97H5ecqmjyLObu/ovtE/Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924200; a=rsa-sha256; cv=none; b=gdSW5Qud86MZU4IzICqnrXrCZIaOHYeKF9CoTVPKJQW2qsE50HazSMDFA7VIGxif8zWDBV /Ln08z+YHwM1pgOYr/Bt/GCt38lqBTFk4UFFIiliiDpT+0yTCsZuw2KvnzDrlV9wZyuY9J gKn12tEWqL68o2HZieHSIt2MG1QOPpxYvY915dpfu3CGa3fQZqhZ0IPglBtaD9VnqfCWrF ADyOYd7W91nUdciGJNjPRAquXCQuPSFmhV19IbM8b/+/FUk58GYANXl2Wsf0k0AyR/tmMp x853NGx5b21PjlEpqcOd3ELIfedNnklZ0V/hbu5cArFAJ4Qu4nuqnmMnREjRtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxN5V08ztkP; Sat, 3 Feb 2024 01:36: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 4131ae82011513; Sat, 3 Feb 2024 01:36:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131aepr011510; Sat, 3 Feb 2024 01:36:40 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:40 GMT Message-Id: <202402030136.4131aepr011510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cba889e63caa - main - sys/arm64/rockchip/rk_gpio.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cba889e63caaeceacc5dbb11cbc8756e85c7fa18 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cba889e63caaeceacc5dbb11cbc8756e85c7fa18 commit cba889e63caaeceacc5dbb11cbc8756e85c7fa18 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 sys/arm64/rockchip/rk_gpio.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- sys/arm64/rockchip/rk_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index 2d3b4a03fe19..6a7ae95d4e8a 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -204,7 +204,7 @@ rk_gpio_write_4(struct rk_gpio_softc *sc, int reg, uint32_t value) static int rk_gpio_intr(void *arg) { - struct rk_gpio_softc *sc = (struct rk_gpio_softc *)arg;; + struct rk_gpio_softc *sc = (struct rk_gpio_softc *)arg; struct trapframe *tf = curthread->td_intr_frame; uint32_t status; From nobody Sat Feb 3 01:36:41 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxQ45rCz58kLk; Sat, 3 Feb 2024 01:36: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 4TRZxQ0W4Hz4RLb; Sat, 3 Feb 2024 01:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6X9qKDjJFyHeWE/MSiLe/fzmzvyJzQl4StoMXHVUwI=; b=yI3Ng/YTcICs6sSW4JJZsynamYP6JFAj9ej042e1mKBYeC19rjUfaV+JCydRUALpCzEkI1 xN76Q8pqO7ysYLLQf0wiEYV3QxdKe7FNaT9NM8rDpjfutJUv93K8ABaj7QuLGQmIZBwwDC ktvXLFjgbbHDYSGwF0S7SQy0xYCAFYJC692eIrYQtzo2txm1Sa3XwWhHHQ0jOFV1dQqd50 kBg1iF09fw+3LUWZsoYw/ScaVDM4MBewL2zgv9YO0fJj4RrZm8OTQwdI3PiazTtZ+r8Bjv YKNqHjNFQtJ7ykHQjgTn7pNTdXW23MskqaxT2XXf8C2UCFMix4tuKPfgvF0csQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6X9qKDjJFyHeWE/MSiLe/fzmzvyJzQl4StoMXHVUwI=; b=OPZpmHcNjQrDxh0ZVoX0QGjjhcQWeTCL/mJRXoyzho7PMvOJA6L5NON68taNTvLugVDsss pCdkhkM271z3ow+kMBw+dI15Y9KVcItCBn26pDzuA5UoH2l7zYn6IleIiYwp1vSfHHJEOy P8Nm6K9kd451vj/jM3zKCc4Ww7WN5m9ap5W+jrCKQfHyKe92KUdoc9A+0DMu0ujVxw3FAz Mab+hmHNQiIVrJ52wbGk3QmLEZk+6FYSZPGfQA6pI0Pvx5zsm5Fuy6vf3d4my/fRFTspTD oMqykhZsIqPM8Y+KqEVZpnDvk4+q+C1lhatKiixWeF6bphDwDGvP7DiVbc2OKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924202; a=rsa-sha256; cv=none; b=FfrGVMa7GUHO7RHwwcQwHjPIcjEdEYxcMWGpHeWq5MfqtGZP27Z94OWI0WfULUG1/mTdjJ kvXqSofaMmsg6VgCMK92qX4rP9DZutZecvYfrG33cVMxh73Csg5HdjJG5CH35/eiONMSY/ StlG77rTNvrYm5Y8xaoH/YozpQPBpKMk4yavICYtRHECqv8G2Fj0/ReEv/nngCBWTTbdqn GZOp4oHWz9JTmJegB8mWVwxJZ87dQoakynxe6HC8m7l3WLS0OFrFuSeMPbmsXrESlOuKRn k8bzNSSVMffH+tK+G2hGICZZvJ+GWr4VrG6tCdwJzxCbV3lH+qYRZD29KBH4Jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxP6k4Vzt2s; Sat, 3 Feb 2024 01:36: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 4131afcO011557; Sat, 3 Feb 2024 01:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131afV1011554; Sat, 3 Feb 2024 01:36:41 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:41 GMT Message-Id: <202402030136.4131afV1011554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e9b261f297ca - main - lib/libvgl/main.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9b261f297cac146f0c9f895c16debe1c4cf8978 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e9b261f297cac146f0c9f895c16debe1c4cf8978 commit e9b261f297cac146f0c9f895c16debe1c4cf8978 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:01 +0000 lib/libvgl/main.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- lib/libvgl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c index b98e59ff801f..13e376c48417 100644 --- a/lib/libvgl/main.c +++ b/lib/libvgl/main.c @@ -91,7 +91,7 @@ struct vt_mode smode; if (VGLOldModeInfo.vi_flags & V_INFO_GRAPHICS) { size[0] = VGLOldVInfo.mv_csz; size[1] = VGLOldVInfo.mv_rsz; - size[2] = VGLOldVInfo.font_size;; + size[2] = VGLOldVInfo.font_size; ioctl(0, KDRASTER, size); } if (VGLModeInfo.vi_mem_model != V_INFO_MM_DIRECT) From nobody Sat Feb 3 01:36:42 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxR3hR1z58kFT; Sat, 3 Feb 2024 01:36: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 4TRZxR1b52z4RBK; Sat, 3 Feb 2024 01:36:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdrVKZ/l4odCrFCjJKZTRv3V83ak8Ks42OQoEX4cIgQ=; b=yeCzeWwL+PL+r13ijSYrBMpU1JWznJgvrgX+SfW0eQeFr9E5pXC2duE8+jQMOpJ8QJ+LvC +sYHCiH3mZDipLLA5XdC2CbofjzInzYnYYHLuuYVhXo3Y7Qf0qJ6zp/fYZLJo9uEdhITp/ +QAYAaogG2XSLHJsNYji831YHrgJYDjZ8cU+ljptBClL3zy+N0rRmYZPIy4rpugqKUrn+f VvBxREmm2Bw2wu1teFO0dKAYSTOmsTBF+5w9eoUfTobiStS+7RkoZUhbpzKULgf2xONhp7 qgN55KYtPQBhg2GwRzjnIV+sOYdtiUSlmdyykicwuzmSvcIj0PA9cM3ljIKnkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdrVKZ/l4odCrFCjJKZTRv3V83ak8Ks42OQoEX4cIgQ=; b=SE7I4rE4G7f5j5NyMAOI3Qt9bsxAuq4R7T86FPEcIwxEPW2YJGh65+PAK2QQnodfBFKp06 bRSONBCCArqFj+alHqHZW9Cu2gBc4e55k04t5YJ6Lt944KC2jjDMSA3rbj2n4F1D0Kp4FU 7OhWqrYFbcUy5SrCyO7ArKCsYEtOI91IZrYuzX3zOH8MyEap9Oq06VLGGuWjJ9sRzaFLi6 Q+zcYgwjTifRHlCc8cy5TCZm0LOmvPqNqn95yQsRPCvZ7RcUW18bi46WlozYG0TBFevyE1 oaFx4+otjy6vUPdoyMWIbrFNQHFAZrj3bZFmkqURKp2rAJORPPAELEAcrjp81A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924203; a=rsa-sha256; cv=none; b=eX4cPEr254t1e3p4RZ3MovfTAxOU+bvUibvbUIMSMyAJP3YpzJgxuCkF8z38za5Q3PKWgo zMONJkO1tgeC/TS+k/5vMFZmoYuWys56sBZP0gTIpg6of5aDmNLbB3bA00vZX0RZdMKbvy ZeHoAse/huNfqk40i6lLlisEKskAALpKPtlPztUIQoXxeOEjjBtlW0UFvhc+lgr1o8zpMw xIClSBmiTBY7/2tknCSqQ2jD78vDwSD2ovAPCWKWFR9lS6lBrUaeBlkWD3iwEIpTcbDouw GRx+o6umVYaZFMB1o1GkaVw3MGA6TwyIak8xmTN4o6cLmJLbMAni2jANGHcp0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxR0hxVzt2t; Sat, 3 Feb 2024 01:36: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 4131ahDv011603; Sat, 3 Feb 2024 01:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131agXB011600; Sat, 3 Feb 2024 01:36:42 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:42 GMT Message-Id: <202402030136.4131agXB011600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b139f2ee9939 - main - lib/libbe/be.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b139f2ee9939b5a93afb904942f67123c3985dc7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b139f2ee9939b5a93afb904942f67123c3985dc7 commit b139f2ee9939b5a93afb904942f67123c3985dc7 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:02 +0000 lib/libbe/be.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- lib/libbe/be.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index e61cfc9d68ae..62563a33d975 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -1167,7 +1167,7 @@ be_create_child_noent(libbe_handle_t *lbh, const char *active, static int be_create_child_cloned(libbe_handle_t *lbh, const char *active) { - char buf[BE_MAXPATHLEN], tmp[BE_MAXPATHLEN];; + char buf[BE_MAXPATHLEN], tmp[BE_MAXPATHLEN]; zfs_handle_t *zfs; int err; From nobody Sat Feb 3 01:36:44 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRZxS3fDwz58kFW; Sat, 3 Feb 2024 01:36: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 4TRZxS2TnWz4RJr; Sat, 3 Feb 2024 01:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwLXg8hGzdee2sIaQ+2Cx4UeEl9spymxoiEnOxZ97XQ=; b=ZyvmMCkQSLQZrIJ/v8bw7g1aKfX7rnmL9GZs8notTphNfwsFxixI77ZOa26NYQNjqUKE6a NWcJVQ08ksiLLpUVuzbrUOCh59tGWO5WOhignRVFwg4JDZNHRuj2FeTQAv2bJx+yLEsEq2 B3gJg9VQnbIEkWHeUqoas8ZeNBfCzoNZgZ0TzIKvl5R5lSu3QF5DjFFUQhk79pGDeS97ys JVGswtcE78odsd6Vhr666TgM7ZA/rnM6Amxo4juPVtNelFxH35wZ2V4ephm7hSzydnDGWC hHXzfvHGvFgnJnCjTB7N4syGaJPffw3lrRZR7YkzmBydLbRxVpB74OrQ5Lha8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706924204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwLXg8hGzdee2sIaQ+2Cx4UeEl9spymxoiEnOxZ97XQ=; b=uXP6G29Sc0aMHJNHZnJpP21djXmF4wT69l6WcYQYC5pXBIsPVbc86HqhW5nP0QZgdYczlg MmDLSi3/y2y92Q1fZliJKy1EmxjoIQCpnbgZ+ggGb9Hhdjb+cygncx5juXsVp5CAh4KbaY npAAZ7CVO2y/t3VMgnXkm1Lj2Md4VnEGtHI0dIDQ8ecT+QWznthxVzQxk0y2E1h7ICNwuy UgU/GeZcHVzWpEbMprgD82GO7U+H1b+92h+6Rb+ndaCmTFPGHGEVCi5J3tWnFZeafCciED dNgsE5ctqntOLGoH1V1lorjumPqNl2NUfiL0PsQ7ZNV2mFmgSegsAOco915B3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706924204; a=rsa-sha256; cv=none; b=AqdbN9DSyvs4SZPMQvazclid6QvICW0fSflT8Cp/kuXUogXWzrww8BYhJQ10uuOyEHIsTr XlX3Rean5LxyHwLrkmSlnOHANEEZXzSfjJz8MPu0BVR6dqJ5uSDz7u3zrdFb2MchUFyk/D 1TWBMFyCXzSbvDz07sxvmiFQ8o4NEOIftgbeEoFdgRzZ3ZLl+rqrvzqssQGMQ8kFLWIRVc TBV04seRqVt9q7/LTrgF6aIIDVYtcc0ni9JRMjMLBRsXLDQpCUFr0UxagaaUGn9qq96aKd WvQ+GzB/3dhCVs88QMgP+9SdsVwy0Etqe7v21EdH7OckaMjmT2Blwf3PYckaUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRZxS1Zldztj3; Sat, 3 Feb 2024 01:36: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 4131aiik011645; Sat, 3 Feb 2024 01:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4131ai7L011642; Sat, 3 Feb 2024 01:36:44 GMT (envelope-from git) Date: Sat, 3 Feb 2024 01:36:44 GMT Message-Id: <202402030136.4131ai7L011642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fb3dc55a5c22 - main - lib/libfetch/common.c: remove an extra semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb3dc55a5c22a619686ce667bcbe8a4c84a3ce34 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3dc55a5c22a619686ce667bcbe8a4c84a3ce34 commit fb3dc55a5c22a619686ce667bcbe8a4c84a3ce34 Author: rilysh AuthorDate: 2024-02-03 00:38:13 +0000 Commit: Warner Losh CommitDate: 2024-02-03 01:35:02 +0000 lib/libfetch/common.c: remove an extra semicolon Signed-off-by: rilysh Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/959 --- lib/libfetch/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c index 4191ee4ed8b7..0d85ed468284 100644 --- a/lib/libfetch/common.c +++ b/lib/libfetch/common.c @@ -1356,7 +1356,7 @@ fetch_read(conn_t *conn, char *buf, size_t len) } timersub(&timeout, &now, &delta); deltams = delta.tv_sec * 1000 + - delta.tv_usec / 1000;; + delta.tv_usec / 1000; } errno = 0; pfd.revents = 0; From nobody Sat Feb 3 02:00:33 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRbSx6c65z58mC6; Sat, 3 Feb 2024 02:00: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 4TRbSx64fcz4b4f; Sat, 3 Feb 2024 02:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706925633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsoiLNfZxvbpB6U7zAPBZW5XnWv+a13YhBwPliu+xpA=; b=Gwq1lfEMeTx1GQaTFhMssy6Jxp6BrXKa6AU5fHbrpBjPYeikILNas14waIgmpgkdvTa+W/ uMqbF4h0tNonjeReErx5f5hJYJaecD+bPjIsY7gudbqi554Nh51U/OoDDPMQkFGMWhZav2 8gpsZG4TYz89cQJ1g+Dq0qoIFfE38pP8F6puug3ouyJJ+SONYqSRPPiV3XXwa9Ei1eNQuV tZy60u4I+nCkvjhHf9NIlRMj2tC189Gzw79vbJJJcSKz4QEjot3EclsmSQ5a9DKxLPvFdl 689lF7ujugbww08bgYdtWyc+EF4W1ZpOUmJChznjb/bOAmyDMT/10RA8GWn2VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706925633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsoiLNfZxvbpB6U7zAPBZW5XnWv+a13YhBwPliu+xpA=; b=rTBPSxunji5EKAdZ50XsoFMWwZbG7iJXnNkU6WtcOgib8c0is6FCxHoHv7/znNSmPiMMay Wst5jXOinGNbJ6nS61CEAC7aoLuIxw6cGsn4kvqxQLns/aV5/rsZcMliTb914nKEQpkqJr J/vw7rakZyBQN9y6XT1L6czSxd2/kdmvQ4KCLi+Xx80lH3BvgELIENZGdJLSSwkm94zCi8 lPXnCoF/q77A1qS6XfnbAN55+bDm3vdelsDBd022Ca4rxkmVvokR56j+DIBnkhhgvgBAWg G1XokgpuJja9ca1yFJkwWQtNGpAridDQju6vGF5pi7RVGp2I3gqUMV6sy4oJlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706925633; a=rsa-sha256; cv=none; b=v684CEcn9kLZ1WBH5GiAPdKa85Zhk6Rf9PbUOp5q8ZLd/MiHKW4a+l9FNoJ6cd5gTjdvJs VwJWS4RXMEJcMPNqnlopP7rNd+C0/HYtnAZOOxDZ5D2D9Gw20US1dFbA6bSWCiZmm9p96m hPu64S1Xn6ffsE2ry3B3/UBJ6amqgZ79pJIwHkQNrYH9vWtFZp2g3aWR7XJfRWnxFTj11P 52LtAZBsHtCmEFrHmo3Xx0CEkR7px3Ogyi4l6U0x/LR+BIA8frXphWMIEtcQxKDH+itpzQ gMUTr+E+CMF/LqWEzI3gqPjV2GWi+gpIlHy/M8tZrAMI2ryhjNvbppR8Otg/QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRbSx56wxzvHh; Sat, 3 Feb 2024 02:00: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 41320Xxj054539; Sat, 3 Feb 2024 02:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41320XZ4054536; Sat, 3 Feb 2024 02:00:33 GMT (envelope-from git) Date: Sat, 3 Feb 2024 02:00:33 GMT Message-Id: <202402030200.41320XZ4054536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: b809c7d6a269 - main - bsdinstall: Fix netconfig script when no interfaces are present List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b809c7d6a26924ac351e49a15011da718cc3feec Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b809c7d6a26924ac351e49a15011da718cc3feec commit b809c7d6a26924ac351e49a15011da718cc3feec Author: Jessica Clarke AuthorDate: 2024-02-03 01:52:37 +0000 Commit: Jessica Clarke CommitDate: 2024-02-03 01:52:37 +0000 bsdinstall: Fix netconfig script when no interfaces are present The script uses [ -z "$INTERFACES" ] to check if the list of interfaces is empty and will exit early if so, but INTERFACES always contains at least a space due to the way it appends the list of wireless devices. Fix this by only adding the space when there are devices to append, mirroring the behaviour for non-wireless devices above (both will result in a redundant leading space when the list is non-empty, but that one is harmless). Fixes: 159ca5c844cd ("Adapt to new wireless scheme where base wlan interfaces do not show up in ifconfig anymore.") MFC after: 1 week --- usr.sbin/bsdinstall/scripts/netconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index addf5cb527d6..a370d455e211 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -49,7 +49,8 @@ for IF in `ifconfig -l`; do INTERFACES="$INTERFACES $IF" done -INTERFACES="$INTERFACES $(sysctl -in net.wlan.devices)" +WIRELESS_INTERFACES="$(sysctl -in net.wlan.devices)" +INTERFACES="$INTERFACES${WIRELESS_INTERFACES:+ }$WIRELESS_INTERFACES" is_wireless_if() { for IF in $(sysctl -in net.wlan.devices); do if [ $IF = $1 ]; then From nobody Sat Feb 3 02:00:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRbSz0nKdz58m8Z; Sat, 3 Feb 2024 02:00: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 4TRbSz000gz4Znv; Sat, 3 Feb 2024 02:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706925635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sr58M8XfpP0mO+HAGuVqGGgbDwo8hTwgixntT8QZZi4=; b=TBjs44R4dSayx9Ir5cjPBGiAXc3ld5r5B6jDGcHqHl//GPqa3DXgh0CxxN0gI4Bnu2fUgS WHr/Al1DuorM22Y0y561Sut9Wfcq+eVtdGLAJEbXilhYgF2OgbgHr4ibBqH2E2/5JFQCLH /q1VX8Ypd3+obPu18S1xhtMefghCyLuQDh2ApiLqkqCXNYdmktWC+RofgYre/pECnoYTvj QmMG6hIgQHcgdBWtnGFw5nzr4pdTcbGEu1KAhOWL6PwAFoCRDFScra+oVj+KukdMexm7f/ OTETI3mEna91Wbn3QByCMZLtOOGldm57YPyYO6c8gCdRnR3PJQ/kIHFZNJvwKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706925635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sr58M8XfpP0mO+HAGuVqGGgbDwo8hTwgixntT8QZZi4=; b=yeV/rpXyAHoqwhdtiAxALyv2iwOPB4bsOUjO/FrUmFGOYZI8UjKPPCfRWaOsq8EVdbUarB Fmu5TrafeXv1sX5vIIAmjjLqfwUKoW1fn1kmpc9Zkr3d+15cKcoh8jVsYq+VhqMp5GAf6d 6JHK/7zGY8zOt7yjUewkuXytWp6R1INEmKgDnVeqx6P6e3z3Ct1PhIdxsmrBWLqfDYu+Bh Bhgl15T1pWn0nZ7zVpPZG+DlNgpFQ/W/f+LGgBDr6dxcUiOi0bhV5hxrJIjVKe64xKf1z7 WmBUFvO0KLH7gQ5aclgFHymktVK6Vil0b56YifNvflJj5WHoopWnI2vd0UcECg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706925635; a=rsa-sha256; cv=none; b=E0j9BGYwLPd1GnVPmRBee8VRaIU3HkzjT5U1MdtZnm3RmqgJsi0Oil9rLgyZidGdH8MI9B Mz2TVACzt1jxo8w91ifmvYZZzUmbxbnEKjKGn/F1u6Hux84P44yXJtZ36t4y18z6RB0L3g hWlcDtWFalQY6F5QDIssEXbry9uy+xGI8TJRX3AkH4FuplvM0KmmR5Z7d5ZOj0B0O7Ou9v ENL7D+M4ye2ZzDc2pH8PM0BKheNEm6A4NiwwCGNmByE0CWZRFs9uZTBcAZlqxX2sg7GGsf bnOdikx4JW3IOWtQ6j09tzkd3RUa28DvgTFAMy3lcdDm3P05uZlA93tAgCqHDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRbSy69mczvTZ; Sat, 3 Feb 2024 02:00: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 41320YEq054596; Sat, 3 Feb 2024 02:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41320Y3v054593; Sat, 3 Feb 2024 02:00:34 GMT (envelope-from git) Date: Sat, 3 Feb 2024 02:00:34 GMT Message-Id: <202402030200.41320Y3v054593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 7414d14bd51d - main - bsdinstall: Drop Error from title in netconfig no interfaces dialog List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7414d14bd51d8378057bbe952c2715b9f32d1d3e Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=7414d14bd51d8378057bbe952c2715b9f32d1d3e commit 7414d14bd51d8378057bbe952c2715b9f32d1d3e Author: Jessica Clarke AuthorDate: 2024-02-03 01:52:53 +0000 Commit: Jessica Clarke CommitDate: 2024-02-03 01:52:53 +0000 bsdinstall: Drop Error from title in netconfig no interfaces dialog This isn't inherently an error. It is if you're attempting to download dist tarballs or later install packages, but a FreeBSD system with no NIC is a reasonable setup to have, especially in a throwaway VM setting, so we shouldn't say it is one. Leaving the exit code as 1 is still fine, since auto will ignore it, and avoids breaking other uses. MFC after: 1 week --- usr.sbin/bsdinstall/scripts/netconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index a370d455e211..58fbe1883d40 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -67,7 +67,7 @@ done if [ -z "$INTERFACES" ]; then bsddialog --backtitle "$OSNAME Installer" \ - --title 'Network Configuration Error' \ + --title 'Network Configuration' \ --msgbox 'No network interfaces present to configure.' 0 0 exit 1 fi From nobody Sat Feb 3 04:08:04 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJ4694pz58yMk; Sat, 3 Feb 2024 04:08: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 4TRfJ45fl0z4nXB; Sat, 3 Feb 2024 04:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xUUXLHpFl6SKp5UFNCWKF8z+L/8m/xNz9miSlsTx+vM=; b=DKVhXZIvJFslVUuvfKrb8LThHI1k0TVvbzG5wowzNUa8HvmANCtdXdtrVhKSFzpMla1U3V CKKmodyoT8AJ8gCnOSn7oBcvJGgDC7m8e+yFzYryEijHP0QOypUQYXbww4eG232Cc1t7lG R6O/+lCr4BplF+7a100t6+NEY6dQsJKyWscIWr6tgbDY1t+1yM3dqaI/hx93cZ6dCGMwF0 g4Ky+1VW46u6e+ptt0TyYrZysLw6qVhsgGk2AY2Msa7IDIenITx3snF/q3UYkG6U1SrlQq +tVLCy19kjIZEKMI9zBlPKSHTDQAeETzkk3shEBuz3VrP24aDZkccGITQOvl/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xUUXLHpFl6SKp5UFNCWKF8z+L/8m/xNz9miSlsTx+vM=; b=NFa545C/ihREqe2b+92suURFw13AnMr3b3TfPSLT86sPSi9gGkAiVq6DeoxTcooCY50g/j Vm9/RauuXt+VazE5NNZUMXueCM6cnZDKBIxT/pGyij3/y35/htFOAvIqJjTre9S67jiJUR +HOZaUKptWHFyV3CX2Mon+xYLOBl0zz7dclFgkGM2B4Stpwyhdfz70R7qQk+hMqZwLGAsV JiExWajBmzHuMCVYupak0moZGaVnezQDj0EZtPNUmQQG/F69+LU9bQQE8NEWG/TqhP7Oct ckCH6I7omjxaRkqeqhinBJ69pT6LYMG/L5euoLlo+x2kToO8QkyHkMKLuSUXmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933284; a=rsa-sha256; cv=none; b=soqCEhHfQEwNPaib7PNoKLHMV6vb7YLSi6RnSj/hYpdyEYszjiMnoFlWeqKEQ4oVyZs1BM 80yp6M7mLxKU6tjy7yaZ4a6+JmzQA+ysA0dzA0i2r+oJz5xKMgRppBbma4ZpD5GdEME+kY lgo0AlOlO1qSTDmT55w+afAFm3llvIYSnJLwuaUwL9HZYGPXrXJUtJqt6EChfaYB2hhDNm pRvXLNtAv/XWAfj06pVKbmEsvFGYcS/PmfWRgKxrnVJn2xmVhMbOc2rCtwpLewTanpevuz pIOR/l73xg9T+EFteqOdoOwicYkm00n5j9KG0VwAX3LGCdN6SiCY8ykLWfzShQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJ44kLdzyJ3; Sat, 3 Feb 2024 04:08: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 413484Xv065406; Sat, 3 Feb 2024 04:08:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413484DZ065403; Sat, 3 Feb 2024 04:08:04 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:04 GMT Message-Id: <202402030408.413484DZ065403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: af87ba65223f - main - traceroute: Silence compiler warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af87ba65223f05e14590a2564e8c7b4eec7b53a7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af87ba65223f05e14590a2564e8c7b4eec7b53a7 commit af87ba65223f05e14590a2564e8c7b4eec7b53a7 Author: Jose Luis Duran AuthorDate: 2023-11-17 16:15:27 +0000 Commit: Warner Losh CommitDate: 2024-02-03 03:14:09 +0000 traceroute: Silence compiler warning Silence the warning: argument to 'sizeof' in 'strncpy' call is the same expression as the source; did you mean to use the size of the destination?" by using strlcpy() and the size of the destination (device). No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/901 --- contrib/traceroute/ifaddrlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/traceroute/ifaddrlist.c b/contrib/traceroute/ifaddrlist.c index f9a72b28d4a7..0523a47ce61d 100644 --- a/contrib/traceroute/ifaddrlist.c +++ b/contrib/traceroute/ifaddrlist.c @@ -141,8 +141,7 @@ ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) continue; - (void)strncpy(device, ifr.ifr_name, sizeof(ifr.ifr_name)); - device[sizeof(device) - 1] = '\0'; + (void)strlcpy(device, ifr.ifr_name, sizeof(device)); #ifdef sun /* Ignore sun virtual interfaces */ if (strchr(device, ':') != NULL) From nobody Sat Feb 3 04:08:05 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJ609R3z58xxp; Sat, 3 Feb 2024 04:08: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 4TRfJ56bhjz4nV0; Sat, 3 Feb 2024 04:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jon4sM3xkuNx92OJE4SsXWn1zVMHks62D5c2g1nYYZ0=; b=fMSPaosmcqCWXCLo8WoO+T0uc+Vgz9whS9NxGD0B2g2RsGZW/b6bM/DlkxJkBFl8MprTbM YzP3jbLIx8Spwk7iGZV67Bv2AdZ6vRmYHzMjVRX9eYZzSqE12tipVlBBkQwYBezSnTeyIx W2nOf3BaAyidowr87htPRruCV6y0Y9vXwSwxHEfDfK+QVHg36FQSAYBH/PpxCamv1Oqzql rdKB3k0/smwqXlYo/RsogTQU4CyaiRVbL2S49UavZvQ1wPEl9QsRRCQM4wBCTYYFyANAc4 N9wfUgppQ0LrCncs2be1q/QgTBIhH7hvGNjByN25UTAEE7GflnaQT4+3KylhAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jon4sM3xkuNx92OJE4SsXWn1zVMHks62D5c2g1nYYZ0=; b=c/SB1wwjJjda9P8VVcoEbkr1g3ICDIcQIk2uFCuV2w1ZpWP3vZ+X2Ls3LwYo3XwdwdqXYp oIIQT2/rF8Suvaczjhj+llWpnomLwjpmp8wzPFR6Sma/pIuWJWevDU+f/a9K7r3HH8FJ+v M94D31pMNzWZ+cJSwjTu6hVBUNDJFRUncRy7PalRX2gxPVLjIg6T9/Jm+4svpDMF/WwigT lCtJnqUidSU5XEls6ptAckUE6MEEfNrXPpGRyoDipLfPWU+nHDyeYaSoNa+M1+im0YOoSh TZrsQSm9VFas/aANUsyohiPazGXh5TzudY4gSsEi5uwvxgQbPgK/rRACV5JJrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933285; a=rsa-sha256; cv=none; b=xjGHWcCotmrEJiO2dh0lWgtBQaXS105I3ddl2JBhgt4mkl/0S5kbfQv7Rqw6GpXBP2BYXe mVbHcDXBpFFocofxs+hIgyeL9D9HAweRbODxi0hLejeJ6TwhwsF+/FZG6A8Xc37oxLZxzn zbwjJ8O8aPh5rWR/MS5ePqhXrPL/FsJEqm0TXgKxYuSIz1JX++H6cAv/5zUAHuqUCgzZUp CeRjo9fwoE9pE6fQLrIIkz+HNG24X0icjZrOJtc5y1PcZHVf8ksyzkXvQLbN64p9zu1tdv dA6ihACtOyATbxnYRj1NmRX/bhTGv/uvGrRcIFY/BTh0NatRpssHGujPWTHvjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJ55hL4zydZ; Sat, 3 Feb 2024 04:08: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 413485Yf065454; Sat, 3 Feb 2024 04:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413485jL065452; Sat, 3 Feb 2024 04:08:05 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:05 GMT Message-Id: <202402030408.413485jL065452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 00aa6353374c - main - traceroute: Update values in examples List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00aa6353374c7a343e54e07894b018cd755f8bec Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=00aa6353374c7a343e54e07894b018cd755f8bec commit 00aa6353374c7a343e54e07894b018cd755f8bec Author: Jose Luis Duran AuthorDate: 2023-11-05 17:57:25 +0000 Commit: Warner Losh CommitDate: 2024-02-03 03:14:09 +0000 traceroute: Update values in examples Standardize the documentation and update it to reflect the current values. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/901 --- contrib/traceroute/traceroute.8 | 4 ++-- contrib/traceroute/traceroute.c | 6 +++--- usr.sbin/traceroute6/traceroute6.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8 index 804306a11ca6..e19fb23f43b9 100644 --- a/contrib/traceroute/traceroute.8 +++ b/contrib/traceroute/traceroute.8 @@ -241,7 +241,7 @@ flag). A sample use and output might be: .Bd -literal -offset 4n % traceroute nis.nsf.net. -traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 38 byte packet +traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 40 byte packets 1 helios.ee.lbl.gov (128.3.112.1) 19 ms 19 ms 0 ms 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms @@ -265,7 +265,7 @@ doesn't supply address-to-name translations for its NSSes. A more interesting example is: .Bd -literal -offset 4n % traceroute allspice.lcs.mit.edu. -traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max +traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max, 40 byte packets 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 19 ms 19 ms 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 19 ms diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c index 03135e39837f..144b6fd80928 100644 --- a/contrib/traceroute/traceroute.c +++ b/contrib/traceroute/traceroute.c @@ -57,7 +57,7 @@ static const char rcsid[] = * A sample use might be: * * [yak 71]% traceroute nis.nsf.net. - * traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 56 byte packet + * traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 40 byte packets * 1 helios.ee.lbl.gov (128.3.112.1) 19 ms 19 ms 0 ms * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms @@ -77,7 +77,7 @@ static const char rcsid[] = * A more interesting example is: * * [yak 72]% traceroute allspice.lcs.mit.edu. - * traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max + * traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max, 40 byte packets * 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 19 ms 19 ms * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 19 ms @@ -157,7 +157,7 @@ static const char rcsid[] = * This program requires a kernel mod that does not appear in any * system available from Berkeley: A raw ip socket using proto * IPPROTO_RAW must interpret the data sent as an ip datagram (as - * opposed to data to be wrapped in a ip datagram). See the README + * opposed to data to be wrapped in an ip datagram). See the README * file that came with the source to this program for a description * of the mods I made to /sys/netinet/raw_ip.c. Your mileage may * vary. But, again, ANY 4.x (x < 4) BSD KERNEL WILL HAVE TO BE diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 15aab51ac234..f5e5f341e19a 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -72,9 +72,9 @@ * icmp "time exceeded" reply from a gateway. We start our probes * with a ttl of one and increase by one until we get an icmp "port * unreachable" (which means we got to "host") or hit a max (which - * defaults to 30 hops & can be changed with the -m flag). Three - * probes (change with -q flag) are sent at each ttl setting and a - * line is printed showing the ttl, address of the gateway and + * defaults to net.inet.ip.ttl hops & can be changed with the -m flag). + * Three probes (change with -q flag) are sent at each ttl setting and + * a line is printed showing the ttl, address of the gateway and * round trip time of each probe. If the probe answers come from * different gateways, the address of each responding system will * be printed. If there is no response within a 5 sec. timeout @@ -89,7 +89,7 @@ * A sample use might be: * * [yak 71]% traceroute nis.nsf.net. - * traceroute to nis.nsf.net (35.1.1.48), 30 hops max, 56 byte packet + * traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 40 byte packets * 1 helios.ee.lbl.gov (128.3.112.1) 19 ms 19 ms 0 ms * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms @@ -109,7 +109,7 @@ * A more interesting example is: * * [yak 72]% traceroute allspice.lcs.mit.edu. - * traceroute to allspice.lcs.mit.edu (18.26.0.115), 30 hops max + * traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max, 40 byte packets * 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 19 ms 19 ms * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 19 ms @@ -230,7 +230,7 @@ * back to yourself. Unfortunately, SO many gateways botch source * routing, the thing is almost worthless. Maybe one day... * - * -- Van Jacobson (van@helios.ee.lbl.gov) + * -- Van Jacobson (van@ee.lbl.gov) * Tue Dec 20 03:50:13 PST 1988 */ From nobody Sat Feb 3 04:08:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJ73116z58yMn; Sat, 3 Feb 2024 04:08: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 4TRfJ70RnPz4ncx; Sat, 3 Feb 2024 04:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmcBT9SOULNv2YFrWLwfftVNjYTBGSUgEtvIQzEiGTM=; b=JmKgBUeFNBHF+7i+4mPnPPq6MSBTN7AGYDUNLJBWJ7B+ACOa2LtHIR7wGa04ITjLf/IrcU rBVNoGThnusk0vtaP3DQssX0xRNDU9/fqgSi+K5xS6iDxCGhg+uQvb/Wt462TmYfwSCLKy lYcNH6IjYM1s+qyvtD5gkubDdbYMuMYih+kv6uXNyLR1gqlbTOPJ/EUMxX6N2DR+V50WtY 5Yv6yh2KgTFYLyzRMHYeqMuLQK92anidaZVfMAvzPZ9VONJB/E2a3IYZnAqh7JQgcnGX6k cXfSCuzpUDRyATq7Ddf2mh+EMF9PvSySiy7ACDK6YJmVmGkYXupWptNiDU2C5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dmcBT9SOULNv2YFrWLwfftVNjYTBGSUgEtvIQzEiGTM=; b=erFAk+zZciMwN5+ELzADjwxD8j2cSceUEW/cpOQlzk5lur4QkXskLRFEb7ny3aOcZP2sbD gFXcD60MQWLYdcHCc+sn4eJNWtWHs8brkDe4LAQLydRZYjr82cjHRiH6NbMRa1mh4GksdN 0H7c5xdMO3Kv99/i2h3iO/M69wEOYKMzLjUohfMG0stjgoHZ4OxvFyqWDeLkGUWlgZf3LE 35pYn6wVg1gzRb/Q5QBBqAlVgV+g0L8lHOhM11yjVq+5JP/HwCuxDrvL0/NyxSclR5V8IX 1oUCTLJsbbtcbIyJJGjOGgyL3fZkkHXf6x5K9lLeaHf+56/dEa/HB6YWlMPg4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933287; a=rsa-sha256; cv=none; b=Zv3LxyFADuNEQki1w5KBLsL6i9oMFCaAdezOm2XioXiNr9GXMgaQBIrQppAMxxvcOf+xQ/ jeQ6ux6W49TacOeqNJvP+Gwyc6jgRm88UILw2mJyDnW8OLRCJ6yiY2JQLymWb2MJTIjWQe O3AOCl+6rpAIBGhMsHdgoECWesXYKrB5yB6KjBKZMC/u8lq+1VwwGnlscetmbsnxNfsde8 tksLN/PbIkY5wxFaenaX18yLosqqBDxnZeixIisXCpHMQV9XhbrDxlDODrQw+YFITSg4Be applHWb0uySRSG8Gnzqk7mhPcfclg/25QbWt9WCkkNVuLfcNXzKw0e9lrlDE6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJ66g3Gzy4b; Sat, 3 Feb 2024 04:08: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 4134865D065494; Sat, 3 Feb 2024 04:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413486Nv065491; Sat, 3 Feb 2024 04:08:06 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:06 GMT Message-Id: <202402030408.413486Nv065491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ba09352b7323 - main - traceroute: Standardize usage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba09352b73238bb4f1ca8586aab95cb2d9544bdc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba09352b73238bb4f1ca8586aab95cb2d9544bdc commit ba09352b73238bb4f1ca8586aab95cb2d9544bdc Author: Jose Luis Duran AuthorDate: 2023-11-05 18:35:23 +0000 Commit: Warner Losh CommitDate: 2024-02-03 03:14:09 +0000 traceroute: Standardize usage Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/901 --- contrib/traceroute/traceroute.8 | 55 +++++++++++++++++++------------------- contrib/traceroute/traceroute.c | 7 ++--- usr.sbin/traceroute6/traceroute6.8 | 6 ++--- usr.sbin/traceroute6/traceroute6.c | 7 +++-- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8 index e19fb23f43b9..1ba11b75e37d 100644 --- a/contrib/traceroute/traceroute.8 +++ b/contrib/traceroute/traceroute.8 @@ -25,17 +25,18 @@ .Nm .Bk -words .Op Fl adDeEFISnrvx +.Op Fl A Ar as_server .Op Fl f Ar first_ttl .Op Fl g Ar gateway -.Op Fl M Ar first_ttl +.Op Fl i Ar iface .Op Fl m Ar max_ttl -.Op Fl P Ar proto +.Op Fl M Ar first_ttl .Op Fl p Ar port +.Op Fl P Ar proto .Op Fl q Ar nprobes .Op Fl s Ar src_addr .Op Fl t Ar tos .Op Fl w Ar waittime -.Op Fl A Ar as_server .Op Fl z Ar pausemsecs .Ar host .Op Ar packetlen @@ -62,6 +63,19 @@ Turn on AS# lookups for each hop encountered. .It Fl A Ar as_server Turn on AS# lookups and use the given server instead of the default. +.It Fl d +Enable socket level debugging. +.It Fl D +When an ICMP response to our probe datagram is received, +print the differences between the transmitted packet and +the packet quoted by the ICMP response. +A key showing the location of fields within the transmitted packet is printed, +followed by the original packet in hex, +followed by the quoted packet in hex. +Bytes that are unchanged in the quoted packet are shown as underscores. +Note, +the IP checksum and the TTL of the quoted packet are not expected to match. +By default, only one probe per hop is sent with this option. .It Fl e Firewall evasion mode. Use fixed destination ports for UDP, UDP-Lite, TCP and SCTP probes. @@ -86,19 +100,6 @@ is also specified, the corresponding ECN bits will be replaced. Set the initial time-to-live used in the first outgoing probe packet. .It Fl F Set the "don't fragment" bit. -.It Fl d -Enable socket level debugging. -.It Fl D -When an ICMP response to our probe datagram is received, -print the differences between the transmitted packet and -the packet quoted by the ICMP response. -A key showing the location of fields within the transmitted packet is printed, -followed by the original packet in hex, -followed by the quoted packet in hex. -Bytes that are unchanged in the quoted packet are shown as underscores. -Note, -the IP checksum and the TTL of the quoted packet are not expected to match. -By default, only one probe per hop is sent with this option. .It Fl g Ar gateway Specify a loose source route gateway (8 maximum). .It Fl i Ar iface @@ -109,9 +110,6 @@ host. (See the flag for another way to do this.) .It Fl I Use ICMP ECHO instead of UDP datagrams. (A synonym for "-P icmp"). -.It Fl M Ar first_ttl -Set the initial time-to-live value used in outgoing probe packets. -The default is 1, i.e., start with the first hop. .It Fl m Ar max_ttl Set the max time-to-live (max number of hops) used in outgoing probe packets. The default is the value of the @@ -119,18 +117,13 @@ packets. The default is the value of the .Xr sysctl 8 (the same default used for TCP connections). +.It Fl M Ar first_ttl +Set the initial time-to-live value used in outgoing probe packets. +The default is 1, i.e., start with the first hop. .It Fl n Print hop addresses numerically rather than symbolically and numerically (saves a nameserver address-to-name lookup for each gateway found on the path). -.It Fl P Ar proto -Send packets of specified IP protocol. The currently supported protocols -are: UDP, UDP-Lite, TCP, SCTP, GRE and ICMP. Other protocols may also be -specified (either by name or by number), though -.Nm -does not implement any special knowledge of their packet formats. This -option is useful for determining which router along a path may be -blocking packets based on IP protocol number. But see BUGS below. .It Fl p Ar port Protocol specific. For UDP, UDP-Lite, TCP and SCTP, sets the base @@ -147,6 +140,14 @@ at the destination host (so an ICMP PORT_UNREACHABLE message will be returned to terminate the route tracing). If something is listening on a port in the default range, this option can be used to pick an unused port range. +.It Fl P Ar proto +Send packets of specified IP protocol. The currently supported protocols +are: UDP, UDP-Lite, TCP, SCTP, GRE and ICMP. Other protocols may also be +specified (either by name or by number), though +.Nm +does not implement any special knowledge of their packet formats. This +option is useful for determining which router along a path may be +blocking packets based on IP protocol number. But see BUGS below. .It Fl q Ar nprobes Set the number of probes per hop (default is 3, unless diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c index 144b6fd80928..ab744c47bed6 100644 --- a/contrib/traceroute/traceroute.c +++ b/contrib/traceroute/traceroute.c @@ -2152,8 +2152,9 @@ usage(void) Fprintf(stderr, "Version %s\n", version); Fprintf(stderr, - "Usage: %s [-adDeEFInrSvx] [-f first_ttl] [-g gateway] [-i iface]\n" - "\t[-m max_ttl] [-p port] [-P proto] [-q nqueries] [-s src_addr]\n" - "\t[-t tos] [-w waittime] [-A as_server] [-z pausemsecs] host [packetlen]\n", prog); + "Usage: %s [-adDeEFInrSvx] [-A as_server] [-f first_ttl] [-g gateway]\n" + "\t[-i iface] [-m max_ttl] [-M first_ttl] [-p port] [-P proto]\n" + "\t[-q nprobes] [-s src_addr] [-t tos] [-w waittime]\n" + "\t[-z pausemsecs] host [packetlen]\n", prog); exit(1); } diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8 index 1d71895fcde3..5abd4ba01c5b 100644 --- a/usr.sbin/traceroute6/traceroute6.8 +++ b/usr.sbin/traceroute6/traceroute6.8 @@ -41,6 +41,9 @@ .Op Fl adEIlnNrSTUv .Ek .Bk -words +.Op Fl A Ar as_server +.Ek +.Bk -words .Op Fl f Ar firsthop .Ek .Bk -words @@ -65,9 +68,6 @@ .Op Fl w Ar waittime .Ek .Bk -words -.Op Fl A Ar as_server -.Ek -.Bk -words .Ar target .Op Ar datalen .Ek diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index f5e5f341e19a..dfe1d9565b94 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -1818,10 +1818,9 @@ tcp_chksum(struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void usage(void) { - fprintf(stderr, -"usage: traceroute6 [-adEIlnNrSTUv] [-A as_server] [-f firsthop] [-g gateway]\n" -" [-m hoplimit] [-p port] [-q probes] [-s src] [-w waittime] target\n" -" [datalen]\n"); +"Usage: traceroute6 [-adEIlnNrSTUv] [-A as_server] [-f firsthop] [-g gateway]\n" +"\t[-m hoplimit] [-p port] [-q probes] [-s src] [-t tclass]\n" +"\t[-w waittime] target [datalen]\n"); exit(1); } From nobody Sat Feb 3 04:08:07 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJ85KzFz58yMq; Sat, 3 Feb 2024 04:08: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 4TRfJ81FMwz4nVM; Sat, 3 Feb 2024 04:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alBpss21PLe1IGw9CYqcjwuT+hDGArSfsK8PLXAroAI=; b=R6+ZfrkE8qD21p2Ql0hS7WPpeFM2kFjHBOxSaYnFIShYA9rkzRSs4fS/A98jbvs7oLruDu 7HQui/tV7LJsiszR0n3KBcink1rS/DFAxri6QKl4B6FBcx2lO7AjDs57zvUZmoUfdsUuK2 brc9U4YeOOwvyyCJE8DlJdbX5NZhmlr35P99ROzMHftm7bSTb77feWQOHBDqKV0aPrvstq A5C1XfY1xuDQHCVxf1lkyd9PDtEDzev0DfRtyMQqWrR69Rq+yBU0nHmMQtAl6xlkTNLLzk /wuHRGioVEaxnXMT5FVDdHWgmB8i8maHfD5yOz6+zvNymHP9YzyzwRS9W8WkIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alBpss21PLe1IGw9CYqcjwuT+hDGArSfsK8PLXAroAI=; b=eEqUOoLRWEGDd4KphR2AxWiIV09KAeuOcwEuYNMuT7t61eCNWXILCFdTr/Fsr811zH8PqN zGglPeNNHqFmFwWyN9cIaGX9jt53GnAKaNSztODR3AybDobFyzXshETDopW+NUMvLl4IyX sRGpr5z352vqlqXJowneIes6rvIbLbIWaWlx52yEpUTsGGm6ueV3Jrf5YKqVapdh4WOt2W NXTTIPStM2pFodCcdlnu6GPZG3zryUCVo+JzPYQ8yz/hbcpXoexDqlSHGqi8E/kj3pVF9V N7AUM2oNbpl6PaXY5Q1XUktuAi0YWuLNJGUU+7wcrWnJ7B+576/ISQvQiYQNyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933288; a=rsa-sha256; cv=none; b=ld3HdagVkEGG7XCVUcNXf/dY9w1BBdiz3VxteEQFObm+Ayn0ruADXeA6CkLYPQyXO5aQrT Xq6uMmD4LKuLaokanA7iDHguh1ePhzjkvTSjXQNkqryvQq1yAUkm+WwwP0A5BdCcfYxKde JtImh4TDPp4XKOahbzSKbe1aJkmy9AsgbFog7VEg3x/l1eIi0AYn5J/YalR9ZmPGlgk/Ec MgbfZHDz/UQA4yxSmFhfP5it4Vg2T/PHwBimZN6syaMxqXLw1nQfHV2f7yL+zkBFfQHcaF ONUFRodjJUSdqdeCijXW/glXarNQFdPzUWWh7Mhny/RhQheeQ32mjZQCmBEJ5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJ802c9zy4c; Sat, 3 Feb 2024 04:08: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 413487LG065530; Sat, 3 Feb 2024 04:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413487MW065527; Sat, 3 Feb 2024 04:08:07 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:07 GMT Message-Id: <202402030408.413487MW065527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5eb1aebf8d80 - main - traceroute: Lint manuals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eb1aebf8d80ccdd34f5680618c3c958af5606cb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb1aebf8d80ccdd34f5680618c3c958af5606cb commit 5eb1aebf8d80ccdd34f5680618c3c958af5606cb Author: Jose Luis Duran AuthorDate: 2023-11-17 16:41:24 +0000 Commit: Warner Losh CommitDate: 2024-02-03 03:14:09 +0000 traceroute: Lint manuals Fix a number of warning mandoc -Tlint and igor turned up. No changes intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/901 --- contrib/traceroute/traceroute.8 | 279 ++++++++++++++++++------------------- usr.sbin/traceroute6/traceroute6.8 | 46 +++--- 2 files changed, 160 insertions(+), 165 deletions(-) diff --git a/contrib/traceroute/traceroute.8 b/contrib/traceroute/traceroute.8 index 1ba11b75e37d..203b743fb408 100644 --- a/contrib/traceroute/traceroute.8 +++ b/contrib/traceroute/traceroute.8 @@ -15,7 +15,7 @@ .\" .\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $ .\" -.Dd October 25, 2023 +.Dd November 17, 2023 .Dt TRACEROUTE 8 .Os .Sh NAME @@ -42,39 +42,34 @@ .Op Ar packetlen .Ek .Sh DESCRIPTION -The Internet is a large and complex aggregation of -network hardware, connected together by gateways. -Tracking the route one's packets follow (or finding the miscreant -gateway that's discarding your packets) can be difficult. +The Internet is a large and complex aggregation of network hardware, connected +together by gateways. +Tracking the route one's packets follow (or finding the miscreant gateway +that's discarding your packets) can be difficult. .Nm -utilizes the IP protocol `time to live' field and attempts to elicit an -ICMP TIME_EXCEEDED response from each gateway along the path to some -host. +utilizes the IP protocol `time to live' field and attempts to elicit an ICMP +TIME_EXCEEDED response from each gateway along the path to some host. .Pp The only mandatory parameter is the destination host name or IP number. -The default probe datagram length is 40 bytes, but this may be increased -by specifying a packet length (in bytes) after the destination host -name. +The default probe datagram length is 40 bytes, but this may be increased by +specifying a packet length (in bytes) after the destination host name. .Pp Other options are: .Bl -tag -width Ds .It Fl a Turn on AS# lookups for each hop encountered. .It Fl A Ar as_server -Turn on AS# lookups and use the given server instead of the -default. +Turn on AS# lookups and use the given server instead of the default. .It Fl d Enable socket level debugging. .It Fl D -When an ICMP response to our probe datagram is received, -print the differences between the transmitted packet and -the packet quoted by the ICMP response. +When an ICMP response to our probe datagram is received, print the differences +between the transmitted packet and the packet quoted by the ICMP response. A key showing the location of fields within the transmitted packet is printed, -followed by the original packet in hex, -followed by the quoted packet in hex. +followed by the original packet in hex, followed by the quoted packet in hex. Bytes that are unchanged in the quoted packet are shown as underscores. -Note, -the IP checksum and the TTL of the quoted packet are not expected to match. +Note, the IP checksum and the TTL of the quoted packet are not expected to +match. By default, only one probe per hop is sent with this option. .It Fl e Firewall evasion mode. @@ -103,30 +98,30 @@ Set the "don't fragment" bit. .It Fl g Ar gateway Specify a loose source route gateway (8 maximum). .It Fl i Ar iface -Specify a network interface to obtain the source IP address for -outgoing probe packets. This is normally only useful on a multi-homed -host. (See the +Specify a network interface to obtain the source IP address for outgoing probe +packets. +This is normally only useful on a multi-homed host. +(See the .Fl s -flag for another way to do this.) +flag for another way to do this). .It Fl I -Use ICMP ECHO instead of UDP datagrams. (A synonym for "-P icmp"). +Use ICMP ECHO instead of UDP datagrams. +(A synonym for "-P icmp"). .It Fl m Ar max_ttl -Set the max time-to-live (max number of hops) used in outgoing probe -packets. The default is the value of the +Set the max time-to-live (max number of hops) used in outgoing probe packets. +The default is the value of the .Va net.inet.ip.ttl .Xr sysctl 8 -(the same default used for TCP -connections). +(the same default used for TCP connections). .It Fl M Ar first_ttl Set the initial time-to-live value used in outgoing probe packets. The default is 1, i.e., start with the first hop. .It Fl n Print hop addresses numerically rather than symbolically and numerically -(saves a nameserver address-to-name lookup for each gateway found on the -path). +(saves a nameserver address-to-name lookup for each gateway found on the path). .It Fl p Ar port -Protocol specific. For UDP, UDP-Lite, TCP and SCTP, sets -the base +Protocol specific. +For UDP, UDP-Lite, TCP and SCTP, sets the base .Ar port number used in probes (default is 33434). Traceroute hopes that nothing is listening on UDP ports (or UDP-Lite ports @@ -136,106 +131,106 @@ and supported by the peer) .Em port + 1 to .Em port + (max_ttl - first_ttl + 1) * nprobes -at the destination host (so an ICMP PORT_UNREACHABLE message will -be returned to terminate the route tracing). If something is -listening on a port in the default range, this option can be used -to pick an unused port range. +at the destination host (so an ICMP PORT_UNREACHABLE message will be returned +to terminate the route tracing). +If something is listening on a port in the default range, this option can be +used to pick an unused port range. .It Fl P Ar proto -Send packets of specified IP protocol. The currently supported protocols -are: UDP, UDP-Lite, TCP, SCTP, GRE and ICMP. Other protocols may also be -specified (either by name or by number), though +Send packets of specified IP protocol. +The currently supported protocols +are: UDP, UDP-Lite, TCP, SCTP, GRE and ICMP. +Other protocols may also be specified (either by name or by number), though .Nm -does not implement any special knowledge of their packet formats. This -option is useful for determining which router along a path may be -blocking packets based on IP protocol number. But see BUGS below. +does not implement any special knowledge of their packet formats. +This option is useful for determining which router along a path may be blocking +packets based on IP protocol number. +But see BUGS below. .It Fl q Ar nprobes -Set the number of probes per hop (default is 3, -unless +Set the number of probes per hop (default is 3, unless .Fl D is specified, when it is 1). .It Fl r Bypass the normal routing tables and send directly to a host on an attached network. -If the host is not on a directly-attached network, -an error is returned. -This option can be used to ping a local host through an interface -that has no route through it (e.g., after the interface was dropped by +If the host is not on a directly-attached network, an error is returned. +This option can be used to ping a local host through an interface that has no +route through it (e.g., after the interface was dropped by .Xr routed 8 . .It Fl s Ar src_addr -Use the following IP address (which usually is given as an IP number, not -a hostname) as the source address in outgoing probe packets. On -multi-homed hosts (those with more than one IP -address), this option can be used to -force the source address to be something other than the IP address -of the interface the probe packet is sent on. If the IP address -is not one of this machine's interface addresses, an error is -returned and nothing is sent. (See the +Use the following IP address (which usually is given as an IP number, not a +hostname) as the source address in outgoing probe packets. +On multi-homed hosts (those with more than one IP address), this option can be +used to force the source address to be something other than the IP address of +the interface the probe packet is sent on. +If the IP address is not one of this machine's interface addresses, an error is +returned and nothing is sent. +(See the .Fl i -flag for another way to do this.) +flag for another way to do this). .It Fl S Print a summary of how many probes were not answered for each hop. .It Fl t Ar tos Set the .Em type-of-service -in probe packets to the following value (default zero). The value must be -a decimal integer in the range 0 to 255. This option can be used to -see if different types-of-service result in different paths. The upper six -bits are the Differentiated Services Codepoint (RFC4594). The lower two -bits are the Explicit Congestion Notification field (RFC3168). +in probe packets to the following value (default zero). +The value must be a decimal integer in the range 0 to 255. +This option can be used to see if different types-of-service result in +different paths. +The upper six bits are the Differentiated Services Codepoint (RFC4594). +The lower two bits are the Explicit Congestion Notification field (RFC3168). .It Fl v -Verbose output. Received ICMP packets other than +Verbose output. +Received ICMP packets other than .Dv TIME_EXCEEDED and .Dv UNREACHABLE Ns s are listed. .It Fl w Ar waittime -Set the time (in seconds) to wait for a response to a probe (default 5 -sec.). +Set the time (in seconds) to wait for a response to a probe (default 5 sec.). .It Fl x -Toggle ip checksums. Normally, this prevents traceroute from calculating -ip checksums. In some cases, the operating system can overwrite parts of -the outgoing packet but not recalculate the checksum (so in some cases -the default is to not calculate checksums and using +Toggle ip checksums. +Normally, this prevents traceroute from calculating ip checksums. +In some cases, the operating system can overwrite parts of the outgoing packet +but not recalculate the checksum (so in some cases the default is to not +calculate checksums and using .Fl x -causes them to be calculated). Note that checksums are usually required -for the last hop when using ICMP ECHO probes +causes them to be calculated). +Note that checksums are usually required for the last hop when using ICMP ECHO +probes .Pq Fl I . So they are always calculated when using ICMP. .It Fl z Ar pausemsecs Set the time (in milliseconds) to pause between probes (default 0). -Some systems such as Solaris and routers such as Ciscos rate limit -icmp messages. A good value to use with this this is 500 (e.g. 1/2 second). +Some systems such as Solaris and routers such as Ciscos rate limit ICMP +messages. +A good value to use with this is 500 (e.g., 1/2 second). .El .Pp This program attempts to trace the route an IP packet would follow to some -internet host by launching UDP probe -packets with a small ttl (time to live) then listening for an -ICMP "time exceeded" reply from a gateway. We start our probes -with a ttl of one and increase by one until we get an ICMP "port -unreachable" (which means we got to "host") or hit a max (which -defaults to the amount of hops specified by the +internet host by launching UDP probe packets with a small TTL (time to live) +then listening for an ICMP "time exceeded" reply from a gateway. +We start our probes with a TTL of one and increase by one until we get an ICMP +"port unreachable" (which means we got to "host") or hit a max (which defaults +to the amount of hops specified by the .Va net.inet.ip.ttl .Xr sysctl 8 and can be changed with the .Fl m -flag). Three -probes (change with +flag). +Three probes (change with .Fl q -flag) are sent at each ttl setting and a -line is printed showing the ttl, address of the gateway and -round trip time of each probe. If the probe answers come from -different gateways, the address of each responding system will -be printed. If there is no response within a 5 sec. timeout -interval (changed with the +flag) are sent at each TTL setting and a line is printed showing the TTL, +address of the gateway and round trip time of each probe. +If the probe answers come from different gateways, the address of each +responding system will be printed. +If there is no response within a 5 sec. timeout interval (changed with the .Fl w -flag), a "*" is printed for that -probe. +flag), a "*" is printed for that probe. .Pp -We don't want the destination -host to process the UDP probe packets so the destination port is set to an -unlikely value (if some clod on the destination is using that -value, it can be changed with the +We don't want the destination host to process the UDP probe packets so the +destination port is set to an unlikely value (if some clod on the destination +is using that value, it can be changed with the .Fl p flag). .Pp @@ -256,12 +251,13 @@ traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 40 byte packets 11 nic.merit.edu (35.1.1.48) 239 ms 239 ms 239 ms .Ed .Pp -Note that lines 2 & 3 are the same. This is due to a buggy -kernel on the 2nd hop system \- lilac-dmc.Berkeley.EDU \- that forwards -packets with a zero ttl (a bug in the distributed version -of 4.3BSD). Note that you have to guess what path -the packets are taking cross-country since the NSFNet (129.140) -doesn't supply address-to-name translations for its NSSes. +Note that lines 2 & 3 are the same. +This is due to a buggy kernel on the 2nd hop system \- lilac-dmc.Berkeley.EDU \- +that forwards packets with a zero TTL (a bug in the distributed version of +4.3BSD). +Note that you have to guess what path the packets are taking cross-country +since the NSFNet (129.140) doesn't supply address-to-name translations for its +NSSes. .Pp A more interesting example is: .Bd -literal -offset 4n @@ -287,19 +283,18 @@ traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max, 40 byte packets 18 ALLSPICE.LCS.MIT.EDU (18.26.0.115) 339 ms 279 ms 279 ms .Ed .Pp -Note that the gateways 12, 14, 15, 16 & 17 hops away -either don't send ICMP "time exceeded" messages or send them -with a ttl too small to reach us. 14 \- 17 are running the -MIT C Gateway code that doesn't send "time exceeded"s. God -only knows what's going on with 12. +Note that the gateways 12, 14, 15, 16 & 17 hops away either don't send ICMP +"time exceeded" messages or send them with a TTL too small to reach us. +14 \- 17 are running the MIT C Gateway code that doesn't send "time exceeded"s. +God only knows what's going on with 12. .Pp -The silent gateway 12 in the above may be the result of a bug in -the 4.[23]BSD network code (and its derivatives): 4.x (x <= 3) -sends an unreachable message using whatever ttl remains in the -original datagram. Since, for gateways, the remaining ttl is -zero, the ICMP "time exceeded" is guaranteed to not make it back -to us. The behavior of this bug is slightly more interesting -when it appears on the destination system: +The silent gateway 12 in the above may be the result of a bug in the 4.[23]BSD +network code (and its derivatives): 4.x (x <= 3) sends an unreachable message +using whatever TTL remains in the original datagram. +Since, for gateways, the remaining TTL is zero, the ICMP "time exceeded" is +guaranteed to not make it back to us. +The behavior of this bug is slightly more interesting when it appears on the +destination system: .Bd -literal -offset 4n 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 39 ms @@ -316,24 +311,24 @@ when it appears on the destination system: 13 rip.Berkeley.EDU (128.32.131.22) 59 ms ! 39 ms ! 39 ms ! .Ed .Pp -Notice that there are 12 "gateways" (13 is the final -destination) and exactly the last half of them are "missing". -What's really happening is that rip (a Sun-3 running Sun OS3.5) -is using the ttl from our arriving datagram as the ttl in its -ICMP reply. So, the reply will time out on the return path -(with no notice sent to anyone since ICMP's aren't sent for -ICMP's) until we probe with a ttl that's at least twice the path -length. I.e., rip is really only 7 hops away. A reply that -returns with a ttl of 1 is a clue this problem exists. -Traceroute prints a "!" after the time if the ttl is <= 1. +Notice that there are 12 "gateways" (13 is the final destination) and exactly +the last half of them are "missing". +What's really happening is that rip (a Sun-3 running Sun OS3.5) is using the +TTL from our arriving datagram as the TTL in its ICMP reply. +So, the reply will time out on the return path (with no notice sent to anyone +since ICMP's aren't sent for ICMP's) until we probe with a TTL that's at least +twice the path length. +I.e., rip is really only 7 hops away. +A reply that returns with a TTL of 1 is a clue this problem exists. +.Nm +prints a "!" after the time if the TTL is <= 1. Since vendors ship a lot of obsolete -.Pf ( Tn DEC Ns \'s +.Pf ( DEC Ns \'s Ultrix, Sun 3.x) or non-standard -.Pq Tn HP-UX -software, expect to see this problem -frequently and/or take care picking the target host of your -probes. +.Pq HP-UX +software, expect to see this problem frequently and/or take care picking the +target host of your probes. .Pp Other possible annotations after the time are: .Bl -hang -offset indent -width 12n @@ -377,8 +372,8 @@ If almost all the probes result in some kind of unreachable, .Nm will give up and exit. .Pp -This program is intended for use in network testing, measurement -and management. +This program is intended for use in network testing, measurement and +management. It should be used primarily for manual fault isolation. Because of the load it could impose on the network, it is unwise to use .Nm @@ -386,21 +381,23 @@ during normal operations or from automated scripts. .Sh SEE ALSO .Xr netstat 1 , .Xr ping 8 , -.Xr traceroute6 8 . +.Xr traceroute6 8 .Sh AUTHORS -Implemented by Van Jacobson from a suggestion by Steve Deering. Debugged -by a cast of thousands with particularly cogent suggestions or fixes from -C. Philip Wood, Tim Seaver and Ken Adelman. +Implemented by +.An Van Jacobson +from a suggestion by Steve Deering. +Debugged by a cast of thousands with particularly cogent suggestions or fixes +from C. Philip Wood, Tim Seaver and Ken Adelman. .Sh BUGS When using protocols other than UDP, functionality is reduced. -In particular, the last packet will often appear to be lost, because -even though it reaches the destination host, there's no way to know -that because no ICMP message is sent back. +In particular, the last packet will often appear to be lost, because even +though it reaches the destination host, there's no way to know that because no +ICMP message is sent back. In the TCP case, .Nm -should listen for a RST from the destination host (or an intermediate -router that's filtering packets), but this is not implemented yet. +should listen for a RST from the destination host (or an intermediate router +that's filtering packets), but this is not implemented yet. .Pp -The AS number capability reports information that may sometimes be -inaccurate due to discrepancies between the contents of the -routing database server and the current state of the Internet. +The AS number capability reports information that may sometimes be inaccurate +due to discrepancies between the contents of the routing database server and +the current state of the Internet. diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8 index 5abd4ba01c5b..f185b8087411 100644 --- a/usr.sbin/traceroute6/traceroute6.8 +++ b/usr.sbin/traceroute6/traceroute6.8 @@ -75,16 +75,14 @@ .Sh DESCRIPTION The .Nm -utility -uses the IPv6 protocol hop limit field to elicit an ICMPv6 TIME_EXCEEDED -response from each gateway along the path to some host. +utility uses the IPv6 protocol hop limit field to elicit an ICMPv6 +TIME_EXCEEDED response from each gateway along the path to some host. .Pp The only mandatory parameter is the destination host name or IPv6 address. -The default probe datagram carries 20 bytes of payload, -in addition to the IPv6 header. -The size of the payload can be specified by giving a length -(in bytes) -after the destination host name. +The default probe datagram carries 20 bytes of payload, in addition to the IPv6 +header. +The size of the payload can be specified by giving a length (in bytes) after +the destination host name. .Pp Other options are: .Bl -tag -width Ds @@ -130,8 +128,8 @@ The default is the value of the .It Fl n Do not resolve numeric address to hostname. .It Fl N -Use a packet with no upper layer header for the probes, -instead of UDP datagrams. +Use a packet with no upper layer header for the probes, instead of UDP +datagrams. .It Fl p Ar port Set SCTP/TCP/UDP port number to .Ar port . @@ -139,16 +137,15 @@ Set SCTP/TCP/UDP port number to Set the number of probe per hop count to .Ar probes . .It Fl r -Bypass the normal routing tables and send directly to a host -on an attached network. +Bypass the normal routing tables and send directly to a host on an attached +network. If the host is not on a directly-connected network, an error is returned. This option corresponds to the .Dv SO_DONTROUTE -socket option; -it can be used to ping a local host through an interface -that has no route through it -(e.g., after the interface was dropped by a routing daemon). +socket option; it can be used to ping a local host through an interface that +has no route through it (e.g., after the interface was dropped by a routing +daemon). .It Fl s Ar src .Ar Src specifies the source IPv6 address to be used. @@ -178,10 +175,11 @@ Be verbose. Specify the delay time between probes. .El .Pp -This program prints the route to the given destination and the round-trip -time to each gateway, in the same manner as traceroute. +This program prints the route to the given destination and the round-trip time +to each gateway, in the same manner as traceroute. .Pp -Here is a list of possible annotations after the round-trip time for each gateway: +Here is a list of possible annotations after the round-trip time for each +gateway: .Bl -hang -offset indent .It !N Destination Unreachable - No Route to Host. @@ -195,11 +193,11 @@ Destination Unreachable - Address Unreachable. Parameter Problem - Unrecognized Next Header Type. .It !\& This is printed if the hop limit is <= 1 on a port unreachable message. -This means that the packet got to the destination, -but that the reply had a hop limit that was just large enough to -allow it to get back to the source of the traceroute6. -This was more interesting in the IPv4 case, -where some IP stack bugs could be identified by this behaviour. +This means that the packet got to the destination, but that the reply had a hop +limit that was just large enough to allow it to get back to the source of the +traceroute6. +This was more interesting in the IPv4 case, where some IP stack bugs could be +identified by this behaviour. .El .\" .Sh EXIT STATUS From nobody Sat Feb 3 04:08:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJ931lRz58ySh; Sat, 3 Feb 2024 04:08: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 4TRfJ92BR2z4ngZ; Sat, 3 Feb 2024 04:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sMZ1KW1xOzioRxK4Wsce+TCxKEf2dKNkeK2YDj5NiQ8=; b=ZrQvwji6DxPaGB8v6cM9TiHD9xmd9S3b7hos0MAvwz4MG8eif9ekpYxnko7vC859nIm+t9 XN42+i1/B0qTiIblSFGMiC7lL/m9gj8KEQOzlZnWldDkHzUaUXBewu8xZyVkW5XyAS4Dye ktkzp00DLMwwMalZPREjWkNpcOxVhQx22DEmqlKXeCvlk4pbxxmwXg8ZNATqt9Mo/KKdP+ 2E1cK1oxeax4isJsgr6DaqfuwSIGIuxKv3kIZBhgUF+QWjSHWGX9FGojsR3quQ16pjIcmF MiLL0knbE5iqsx4VV29lPtEcniH3TM3fCPH8/FohRqn4CFr2Xdf3px1YIH+FmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sMZ1KW1xOzioRxK4Wsce+TCxKEf2dKNkeK2YDj5NiQ8=; b=iWx7VAflt/baTzr4jEDu6ascCbyZKQh7MP6m5IU7ls87+j3w/adPdWDVIt9AaCkkBVSv8n NCyqET+/1DdpahMKeYxmn2TmRnuKJcyno25dmHCHtxOccTdVnA9KUEgtJTRYKP1O9ut/Lx ee8gq0cVHkm+Q+munjVsoMi17/kvvYa3FlQZcOEnI02sl3tBeBdZ+9L8Futig39cjc/rBH DicM8FmMPo/fTJwo5zDA92YzKdhMgy/k9u76/D47cApVXTFCqbJ9VPxkbBIOTarBBfzNHr 6g+SvsiQQAM2oMWDS4D6uOETH1Z0mn4CDF1+R5wPeHxmZuhQYHXqO3gypbNVcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933289; a=rsa-sha256; cv=none; b=T0/tDx/ZfhV8OnPM09DPdD1az9N5x7/UfzVjf9UEetLUmv4MbrVXMOdbV1aHIUmqp64mxX L4fq9HwRRDv7ML+i6BPgQBuUJ9k2PwAppjqM9SuJ+u9rFqFtBZqHuE5ti/G+ydDtwke1RH vT4MVD4XoDjmCB7lHJt1FPNWV5lCtKwa+rHNMK9/6LiO1lV+RdLhGJwWAKDDTM/jxZ9aW5 5rGQwPtvfU0XCsXQQ3qVLZhXCylOm+gal7busH2+knYRy+YPGAAF5Rj3qcG9i99hNN7j5O eoWFFrWUcJOrF7xucd+KW4Qx7G5eU3RPvPl3nU8hud6wllhlb9c1q9NshfFIEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJ91GsRzxy8; Sat, 3 Feb 2024 04:08: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 413489SZ065572; Sat, 3 Feb 2024 04:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413489Q3065569; Sat, 3 Feb 2024 04:08:09 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:09 GMT Message-Id: <202402030408.413489Q3065569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 864780bca09d - main - traceroute: Remove $FreeBSD$ rcsid tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 864780bca09dc022e985b54c17ef1606217a8f2b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=864780bca09dc022e985b54c17ef1606217a8f2b commit 864780bca09dc022e985b54c17ef1606217a8f2b Author: Jose Luis Duran AuthorDate: 2023-11-17 18:36:30 +0000 Commit: Warner Losh CommitDate: 2024-02-03 03:14:09 +0000 traceroute: Remove $FreeBSD$ rcsid tags Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/901 --- contrib/traceroute/FREEBSD-upgrade | 2 -- contrib/traceroute/as.c | 1 - contrib/traceroute/as.h | 1 - contrib/traceroute/traceroute.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/contrib/traceroute/FREEBSD-upgrade b/contrib/traceroute/FREEBSD-upgrade index bc4918eb146f..4ed42321d26e 100644 --- a/contrib/traceroute/FREEBSD-upgrade +++ b/contrib/traceroute/FREEBSD-upgrade @@ -1,5 +1,3 @@ -$FreeBSD$ - This directory contains virgin copies of the original distribution files on a "vendor" branch. Do not, under any circumstances, attempt to upgrade the files in this directory via patches and a cvs commit. diff --git a/contrib/traceroute/as.c b/contrib/traceroute/as.c index fd2f96100101..7fb952ed3da1 100644 --- a/contrib/traceroute/as.c +++ b/contrib/traceroute/as.c @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* diff --git a/contrib/traceroute/as.h b/contrib/traceroute/as.h index ce10b4b50098..f5a5dae2acec 100644 --- a/contrib/traceroute/as.h +++ b/contrib/traceroute/as.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* $NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* diff --git a/contrib/traceroute/traceroute.c b/contrib/traceroute/traceroute.c index ab744c47bed6..643caedc4c34 100644 --- a/contrib/traceroute/traceroute.c +++ b/contrib/traceroute/traceroute.c @@ -27,8 +27,6 @@ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] = "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* From nobody Sat Feb 3 04:08:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJB52l9z58yVs; Sat, 3 Feb 2024 04:08: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 4TRfJB3Rr6z4ndW; Sat, 3 Feb 2024 04:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dowH0hzQeeDfL+Ezm74OmsM6eUUwIv3todwwSMa2dvg=; b=UjBzdDbpb6MQYKzxf06TUdQYGj6Z+4Kmf2ZXEPdgpEXtT1C5iU15x5h7imuT6S0f47CaBF OICIu17CxILlpfDVYReEUs2IvBfki6/8fKneDm9IlEGx6qrB5jS4wB0u9GOl8lEgAyAMuz psS77cFv5ny37fE3vYPpbb0JWYChkSLo5XFoiJHr7+AbVZiBEbsOIuLD+v4psJtA/DXP8Z HX6x+8oHCUgjCYLkfmJe358hjqOjLZ0EjgXusM5I5BPKj1UwD971V75qQ3yI/P0SyQsCRh Dk5IIoo+0S1O2ayBXJwybO8eyw0sY6CfMUwWSv9fujP4zqBaw3YkC/CsPodHvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dowH0hzQeeDfL+Ezm74OmsM6eUUwIv3todwwSMa2dvg=; b=GvsOwCmjoOYpxTymlrdBFTVILQPsKbGRanzd1ZXJRcbviMLdd9YkTEojZvjXdwbJPYui1j bdRz/0AqufFgdOtk3msx+cVIw6rka/TO6u5wiN9cXMdsXL/b2pbKvEylQEeuylTskrc3+d 8UqlM2Tr9j/23VtkjGtolrOjXJcUSE6ppUuksHBMcQFe12GpYi/uh/WehMlOWamHhOsB5S uKPULMJew9O/cJ+lndsXr62mExHDKStMZ8+bZmxsLS+YKpILbl6D46wZR5V8JltrlSEq8i DNbh8u4e9+usBu5YUhmC8Jy+8Ibo5x68eDxinng8zb8vSn4RRFE39dO1lMNqaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933290; a=rsa-sha256; cv=none; b=BiRTCOiTJ60Ucvp5fwqTW9nRnz0tsu+kwGNa8MCAUjZNxFN5oHJ4Ti13MrkwPzvxPBfcJd E+ldKximQdD/p6qclcnaDCv9AYhQSnkeG+V5WmSe6LWTnogA5sQVXiHeDmn7l4dxKfEYSw 00Qu6QzX+laZN1ShMNKbwWu2Uj8XXSeoDskJGTITuipvjaEMrkRLET87h5j3quC9cudSOg r/zH85y2LU47Df6LbAKUb9P0ks+1yveoWUKxTaXXP+PDpzYP0Rq4Am7HyIz+PlF8kFkrEU KKZv9ZaDzfNha0DAtI2LxGEat2nMpE6ojSmLBnpvsPq4bmkdkDpaCJGkm9hXAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJB2JJ2zyJ4; Sat, 3 Feb 2024 04:08: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 41348ATT065617; Sat, 3 Feb 2024 04:08:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348A2B065614; Sat, 3 Feb 2024 04:08:10 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:10 GMT Message-Id: <202402030408.41348A2B065614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 521013e7e89e - main - urndis(4): retrospective, address for hselasky List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 521013e7e89e2856d2f8dd2b1361249ea90d6ac9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=521013e7e89e2856d2f8dd2b1361249ea90d6ac9 commit 521013e7e89e2856d2f8dd2b1361249ea90d6ac9 Author: Graham Perrin AuthorDate: 2023-09-02 18:25:52 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:26 +0000 urndis(4): retrospective, address for hselasky PR: 273530 Fixes: 08c9016bc61b Add a manpage for the urndis driver. Signed-off-by: Graham Perrin Reviewed-by: imp, zlei Pull-request: https://github.com/freebsd/freebsd-src/pull/834 --- share/man/man4/urndis.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/urndis.4 b/share/man/man4/urndis.4 index d340af1905da..88e312d6370e 100644 --- a/share/man/man4/urndis.4 +++ b/share/man/man4/urndis.4 @@ -103,4 +103,4 @@ and It was ported to .Fx by -.An Hans Petter Selasky Aq Mt hps@FreeBSD.org . +.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org . From nobody Sat Feb 3 04:08:11 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJC66Fsz58yFl; Sat, 3 Feb 2024 04:08: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 4TRfJC46y3z4nm3; Sat, 3 Feb 2024 04:08:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9IgfP/KoLSseD6EiFqJPWM7J4n0vGNUfygOE1c1qo3o=; b=LgW9+f4uerAnvRv7nk6F3QiiStVEHb/mNvG3OZRiQz7lJn5tTmu1Q7Cn+Cuv0FBv+AvRIN AFW5OGtb5oUAWN0/yKWIqUSvFHHKVdrLrNyU+IPFUZawekLAlUrfWrHqQyuy1D7CiThUHB fkZ5+5S4oLd/f0KOZjE6purtKaCdGWbVsk1P08535NMQ2TZ5qWhBoCJ5M88hTG7PcswJD+ NgFwblOs6YGjPr514O+f6Q8oXdOCuBvaeAkf4fIk8dMu1LZqMo1N+RRvJ5rsn71Jf0Sf7T vBkkudmFl2DQBu4oAUIWHmT5UZxr0p3lr5vXS1kKnvVOxmMa9KoIZkY4QPbKxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9IgfP/KoLSseD6EiFqJPWM7J4n0vGNUfygOE1c1qo3o=; b=CgSBB3WeQBCL2P++J6QCD9x3ijPNk+9R+Lmre4l2aoKesPpSQO+gbs4QtZj/fZoQiW6bl6 X/DFjqg2tgBF0C3JBDK6GDowOqxF8xHuQ05+K45Z/izoSdBEIkVqdKOFF0/EXhX/oMuFew 247JmCYbCkpGzCBZUtQ9jwXhp8DSnnTeIl813ACLezuDudRKjFC4I5Wes8a0vCIgwspGsW P/4si0lXeYvGjALZ5WFqdyZVjLc3AINDGcGKOK7U9WpQcnvtdWyD6xeylTWALho7taPVIl D1cpPaQOgEPcPgZiquVlwTtneZOEZV9r4+s/1PHC9gRIDLLOWnJH+Pf9Zz9MJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933291; a=rsa-sha256; cv=none; b=f07N83FCTeF/hRK76DGSXIEcngyxJI90WZAjlaVkA/kASCAZ9XXrmyjKlbNRZb9DZ7ehZ7 998zgdh1FnN4Hy0r6Y82mj/sl3FLwqbUtEP1sZ3x0UUfZRsU52aH7bi7aEoEQweT0Se5c6 22gNXnfkqPMI+H6X6iJVYtdLqO6Msr0zCmryEcVWplsR+dw8c95XazJQzPD7hsJKS/GysI oFvlzvy7IZfOCH+vmTw5HYCveiywGQBT2CTFU3pWYb6EopGJgX8YlK0LUYr0Jcg4KdfWj7 ljO2g7r+fl4W6rygIBwCN5AT1LoiSkg80C1aC7yNpuleIAwE+LMG4KLfpw0JTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJC3DCXzyJ5; Sat, 3 Feb 2024 04:08: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 41348BZD065677; Sat, 3 Feb 2024 04:08:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348BrB065674; Sat, 3 Feb 2024 04:08:11 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:11 GMT Message-Id: <202402030408.41348BrB065674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0fa637ffee21 - main - release: Allow sudo -g anyone and sudo -u anyone -g anytwo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fa637ffee21af6c638148cd047f735d91d50d32 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0fa637ffee21af6c638148cd047f735d91d50d32 commit 0fa637ffee21af6c638148cd047f735d91d50d32 Author: Jose Luis Duran AuthorDate: 2023-09-04 16:45:52 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:49 +0000 release: Allow sudo -g anyone and sudo -u anyone -g anytwo When only the user (ALL) is specified explicitly, and the group is implied, only sudo -u works. Specifying both the user and group, like (ALL:ALL), is required to: 1. Use sudo -g by itself (with no -u user) 2. Use sudo -u and -g together, with a -g group that is different from the -u user's primary group Obtained from: https://github.com/sudo-project/sudo/commit/1d13533ea3cda05ec666c45c6c533b614fdd97aa Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/835 --- release/tools/vagrant.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 5a4aa7d3ba79..814a2892bb31 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -50,7 +50,7 @@ vagrant_common () { usermod root -h 0 # Configure sudo to allow the vagrant user - echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers + echo 'vagrant ALL=(ALL:ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers # Configure the vagrant ssh key mkdir ${DESTDIR}/home/vagrant/.ssh From nobody Sat Feb 3 04:08:12 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJD6D8zz58yVw; Sat, 3 Feb 2024 04:08: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 4TRfJD5NsJz4nmF; Sat, 3 Feb 2024 04:08:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7oMltrVZYond/25QzEGsOUxkyCVNASSHvEWs6LI+Z1s=; b=QTn335ZEnWVxvayNU8k9mSUiELoldLqGEfsccUbf7KBKGlrsrJ0CYPUQOIFWNaxg1RVgMZ H2MkxZ6NKMrEPa4B5wI0wdB5dOg7UZw5bwEnzcn9BsZ5pst7kTBi+yUOf7IDNXRs8nuYI8 r7ERjp8o+L7RV+HV5FXFyOki1qOp9ZlYpENHgz+F2YtjvVh2flT8y5824Uc84fG4JkUAXV KrY9YSTmeG8H6kaXK2JdAB8zE/bmuKPwyDlh2FYXfm5YQlTM4C5YvkguoPty96A0msWVfz qxsAgosbOjqQbxCUilEe3kKLbRNeV3T3tvZDJxPhtiYEXtx98Xwo0oIfHM5blA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7oMltrVZYond/25QzEGsOUxkyCVNASSHvEWs6LI+Z1s=; b=U0cMfJ7/+DobVJsw9ii7Ky9Z0VK6HIh+T+JN4+inLsrpXiTUzMG5ZvfKXCqAxToxHTMsU5 vqKzRDelnD1XrRjFc7Y6MQGPhAprToGELm0POjOmzWODM2TQLq5qZo8bOakZALlDOdnb1D 4fUW+Gq9/3nZKThMvs8wOPkjTPzgm7EBJq0MtYBE0HUpWr31DpW14rBbMHwlWA/Z8physt M+qCOTqj3qq+HKItMQ12doRRcNUBSXJACbUX1VoSTZn2shzT6Rg/415VKp2dLKEsAWfL1L DNoHnYuYghZuxauThLknYcImm/Uhh0m3TAYSOCExwaZ1TLMpjANif0oo4TMDeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933292; a=rsa-sha256; cv=none; b=JSNEwZMLJpt0OnEZZq3ipLteQMEnvtADQij8zWvXzvusjcqpWBHfKTaFVrH+0koRbu/YQw fla31QNROBxQd4cjJHSFYN+eNmRPQP4Rvv/wg8ZEVrqLz9veTF4zkvzWzKCA2Lwe4VdzR4 F971hNgXr0QCTgXoDsSreeeG4Mcy1cfHwUH6MO4tnobRrKgKBdTR9u64IwJn/bdx+03Hf4 io6xcRELttDt7p7T/4IMUZKpuQE8G6MddJJhlMk6vYmWw9nHE36xcbwiUD9TnQVoAmLwH1 8pMPCCSVnEZDv3VizdCEPFrjvr2gjnpEmVrCQNehSlDXqOJtrbmX48ompGJjwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJD4DSdzyGH; Sat, 3 Feb 2024 04:08: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 41348CxE065731; Sat, 3 Feb 2024 04:08:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348CHW065728; Sat, 3 Feb 2024 04:08:12 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:12 GMT Message-Id: <202402030408.41348CHW065728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ef35e5eaee9c - main - release: Add the Ed25519 vagrant insecure key List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef35e5eaee9ca3ab4ecdec180d5e2ba594759e13 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef35e5eaee9ca3ab4ecdec180d5e2ba594759e13 commit ef35e5eaee9ca3ab4ecdec180d5e2ba594759e13 Author: Jose Luis Duran AuthorDate: 2023-11-04 00:17:19 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:49 +0000 release: Add the Ed25519 vagrant insecure key Both insecure keys, RSA and Ed25519, are required. Obtained from: https://github.com/hashicorp/vagrant/commit/b40f6e5fdae1113518e9c92f96dfcd364b646ff9 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/835 --- release/tools/vagrant.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 814a2892bb31..83a72b8e8aac 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -52,10 +52,11 @@ vagrant_common () { # Configure sudo to allow the vagrant user echo 'vagrant ALL=(ALL:ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers - # Configure the vagrant ssh key + # Configure the vagrant ssh keys mkdir ${DESTDIR}/home/vagrant/.ssh chmod 700 ${DESTDIR}/home/vagrant/.ssh echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys + echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1YdxBpNlzxDqfJyw/QKow1F+wvG9hXGoqiysfJOn5Y vagrant insecure public key" >> ${DESTDIR}/home/vagrant/.ssh/authorized_keys chown -R 1001 ${DESTDIR}/home/vagrant/.ssh chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys From nobody Sat Feb 3 04:08:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJG2LXwz58ySw; Sat, 3 Feb 2024 04:08: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 4TRfJF6J60z4nhQ; Sat, 3 Feb 2024 04:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eEcsQc55s2xW9UgXsuMXO+Ozh179328J9Yofqh1BK/g=; b=QPAmnc5qmGRQh2PyrscC57iukKNT+/+/jLPM89HkdY821h5IwkUwzS7URLT9Meyj4rdEE0 6knuZTaTSc2kVBTBJDWj02WVSSfHEMF3liJBUe7uDAYfXgSEJy/wisMj4pAex6K8Vn7UEv 6fFz66HxcXLHro/0EuP1rZ52Nm+C2CP584mDZs0kREKRiOAulvEyC0RsWQrcdQy/+LB8oJ rNiAU25CvLnUoI0sIH44pOwGkRSxreOTvM4IcfZGTePWQpVdarSlW6ABsyWRX9tY+VM6WT V4/Ho1E67u3u8wdqUY5I9zzlQFMphFCgkCy4IVXqnLAmQtrvhSnXktbyRskCjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eEcsQc55s2xW9UgXsuMXO+Ozh179328J9Yofqh1BK/g=; b=A1Z0EgKR94eSmeFQw49BeD6ga+p8rQzhGhYUYISjC5DXwrYH0AyHqi1qkEcYG+dZhO1d8B FIAj1FB1BfTQEizkgi+WkvPBhjbYaioeulLbsP5sWohi2AWrz6Cs8kl5wt3RNcmCpMpQeS gkXlfIm4QbDkKRrETEnf7L5p8EuZng418xt2lq++as2jsbyrKTf+LMjS7+GMV14jla1jFn frX0EVupOl77HZ2YEFALM+eqQaEdDG0SpixWUabYPe3vP9ZHfQG0NkOkCBC7ihAOKaHmKV n0YIw+WireLaSeNfGe86UspBU8vsecTHwehksIhnmYPXBFdgsxzz+S7RtaXm5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933293; a=rsa-sha256; cv=none; b=LgM8HqlR689qzgxk+yyWjMu07QGTUvRGUxYqNi6MMKg6ngSDB8pyX27O1jSrvEOU6gUhRB JGKOE3/i+v3cPR4JptJkvrcERKCw3gr83aRUaUgWgY8CTBD9SlIcIMh0SrGGtlw3hMyjYs 6AmurtnVqLHdbdhcEIL5dPzqh46FigwWprtzacGFni904HsKcVuCF9UN7dCOzlmbpJFJUv 9uV+s4TqvCRhAcF3dYhDarxe6A/b58jO9oJlx/r3FlrFFzSZomq6gFFZA32tN6OWPsBtZ5 hUQDhEvysMSSBlUBAyU5aJC87tTS/5mpTaFwYi+csTcYwntSTBQq1folpqrDdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJF5Dd6zyJ6; Sat, 3 Feb 2024 04:08: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 41348Dw2065773; Sat, 3 Feb 2024 04:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348DJt065770; Sat, 3 Feb 2024 04:08:13 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:13 GMT Message-Id: <202402030408.41348DJt065770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4309f9f2347e - main - include/math.h: fix warning with -Wconversion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4309f9f2347e05bf995dad89d7c21b0149d35b54 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4309f9f2347e05bf995dad89d7c21b0149d35b54 commit 4309f9f2347e05bf995dad89d7c21b0149d35b54 Author: Martin Oliveira AuthorDate: 2023-09-12 20:31:00 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:49 +0000 include/math.h: fix warning with -Wconversion The way the __fp_type_select macro uses the _Generic expression causes gcc to throw a warning on valid code if the -Wconversion flag is used. For example, consider the following program: #include int main() { double x = 1.0; isnan(x); return 0; } which throws a warning: $ gcc -Wconversion a.c a.c:5:15: warning: conversion from 'double' to 'float' may change value [-Wfloat-conversion] 5 | isnan(x); | ^ This happens because the functions are invoked inside of the _Generic. Looking at the example of _Generic in the C11 specification, one sees that the parameters are outside of the _Generic expression (see page 79 here: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf). Reference: https://stackoverflow.com/a/68309379 Signed-off-by: Martin Oliveira Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/841 --- lib/msun/src/math.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h index 0e09fca72ea3..5fc359ead158 100644 --- a/lib/msun/src/math.h +++ b/lib/msun/src/math.h @@ -76,9 +76,9 @@ extern const union __nan_un { #if __STDC_VERSION__ >= 201112L || __has_extension(c_generic_selections) #define __fp_type_select(x, f, d, ld) __extension__ _Generic((x), \ - float: f(x), \ - double: d(x), \ - long double: ld(x)) + float: f, \ + double: d, \ + long double: ld)(x) #elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus) #define __fp_type_select(x, f, d, ld) __builtin_choose_expr( \ __builtin_types_compatible_p(__typeof(x), long double), ld(x), \ From nobody Sat Feb 3 04:08:14 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJH2FtHz58yQD; Sat, 3 Feb 2024 04:08: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 4TRfJG6rSYz4nmc; Sat, 3 Feb 2024 04:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+6RZT4SKlrTD/pvvz/JlJaLSEQ6gi6sZ/HYUzBCskI=; b=JZga7fMhDkXZgNPxYLSyuD/Zv9IPavO+sh8zUx/7EUYZTrjKmB4PG1UWCzdcJOr7V20HL6 xUA3i6yfgZ9+1eFuyNUzW1qLeD4DgY4zi8FcdjfhBoMWIcqZ1yCSHiZH9aWPvjY1stbSGo m7QYAOVOTomonwB14CAx3dtFw5yGXf4Q0ctTmids45TNcZ8znXR+bl4EW6kUi5TgtWHdZ4 Ccyg0qDnsv8QJytmP/6JBBEaoYUKfNRJWIfakZ1BookClU7RQbLQhhTq4i4ZDN3CfUDTh9 LmGpr5PLPa+gkCz6InN1JJm1iszHYQNkRSjrfGG1cwSucjbZQKeXc+8JXVyXcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+6RZT4SKlrTD/pvvz/JlJaLSEQ6gi6sZ/HYUzBCskI=; b=I3ZND9R6RMDY5Dnzqb4GBLALFfAr3/MbctuycWzz1hweeRZmg75AoJgimEamc4CJrkLT3r UHgJOErKf0YQBFL9v8LD3MqVP5nRW5Vts0EY1kyNXJxIl38eVvC/0/v/fc8NwBhUOeWHj2 df4wDdA7OhNpRbaZPH6nShgMs1Iw8D08qugRw6j5+8xwuo28y/8zbrvvU/5h6tWCNrRHFj pz/Y2H6IqR1HALYmKIdr5gA8AKfmbzzjOEaZMUce4vCDdBbtNEdp105RCQ02D1Nmaujip+ z7qhnMJ7OSwIKvHuzC4MnsEW33I4d4t1MZXao6CBqKDSEF9qMWLwoiAecz8SCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933295; a=rsa-sha256; cv=none; b=SVyLHBfj9ldeCuZwzPqQV0cGYjswYFyx0gn+ECyJkieWWTDENwyevpLD0jypXmeOBoWeD1 Zs7K8aJnAFfX7toWVvx9UJMIYV/0T+iYdSfAWiJsoYY7qDEYDCzZGzTuMfpmSLsTlPE4mw lX5cW3eqfdGkNZjnFxYdCp0qYJX0em/DRr6aiVf/vs539lTwO8PFdyFwKUlEk9Qw0cE3mz dNar/m78geB6d8vqzQa0U/8ovgWOXus5UMDAQmUg5Ah03cmPgVjuyGMs0C3qPcnM4DhqaJ I36NT80u8VWYk/xXyyQRG2F882g8Dk3jgyi6LoQqwfOAEyBQwuPunOib8265Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJG5xhNzyJ7; Sat, 3 Feb 2024 04:08: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 41348EJU065809; Sat, 3 Feb 2024 04:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348EbT065806; Sat, 3 Feb 2024 04:08:14 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:14 GMT Message-Id: <202402030408.41348EbT065806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f81301744e10 - main - .github: Build stable/14 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f81301744e10789705fce10da47fd98bb5bc3af6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f81301744e10789705fce10da47fd98bb5bc3af6 commit f81301744e10789705fce10da47fd98bb5bc3af6 Author: Andrew Turner AuthorDate: 2023-10-27 16:26:15 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:49 +0000 .github: Build stable/14 Sponsored by: Arm Ltd Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/878 --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index ddfcb467126e..192249eff9a3 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -2,7 +2,7 @@ name: Cross-build Kernel on: push: - branches: [ main, 'stable/13' ] + branches: [ main, 'stable/14', 'stable/13' ] pull_request: branches: [ main ] From nobody Sat Feb 3 04:08:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfJJ3QJ6z58yN3; Sat, 3 Feb 2024 04:08: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 4TRfJJ0qRSz4nq5; Sat, 3 Feb 2024 04:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RTSroQtJF4nlrCA8xV1OWGgfr1ykQ1lpBcom/8wHTw=; b=oOvxy2wNFKH3O/NH5ZJAtmHSXHzObqAOvc4szQg4m1ITG4U30FP2HD6e+ekfU/HyoG0CB6 vrCFnLM9eFjJ8KD+cqmNpO0cwmncTo5NCOGxd1wCPmEVcAI03sim06YiWaGodKytlHTtzX pYjgoquxjYJmx2ozB8+PGvpBjDVs96y4p8SPTeqC+v6ozjsIs15o7NDPi6qVYuY4Cbw+4u dcKQ1nvTc63j0rMzW86KV/KgbK+Z6TBTjcjqaIUv0vHUVjZnM0HdG1KJwz9XpMLVta12L+ sR1S/sjjuhuBtourIojzdhcc21c6uLdhuYlux0UcX5DmLirkfS5wIWTsrddtaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706933296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RTSroQtJF4nlrCA8xV1OWGgfr1ykQ1lpBcom/8wHTw=; b=F2Qm1SacPFBWSYFoL4CW1Hd8OvJdpY9LcX4xukVnpc/UX6F8AF2iZhs26PFiEQ+5ThzwD4 eMW9SEXpJKSgGNB40YczhudgMsVHTSY/9I4fI76lq2tHiEn3suPqFzqov0qkH5DEn26PxS nqtXVvYKKD4VklsLVPWyMR27Izp8A3oHqQKBnj+C+APyohSpKYbcaHbIqEg7BY2iB0Ixwe OJrmf/fm/RMtLK25q0NrPcp+HqybI1RUh52JCEhBTcxbG+9m9JCUIo9Yg2EbCursr2qjGE lStgsT+r21W8cOuEgJ6rc7IAqRvhFCf1d5IRzUALNNlLjxV4g8CszFQZNDwe4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706933296; a=rsa-sha256; cv=none; b=i9NL9SykTF0uPQU+KpF3r4HTggO3tu6Sqdqv8EN5fLRyCfm9rv0ewypk8Z7FHnqIsY/FBo B3MvK0EF5mbYJZwFXzgObh/MkC5irSY8/TeE3mFKPcSfND/YxoGhuGzm3TyPQDKFqLDbfq YiZkGh9QSGOgmuTLvYXly6LJpkA4VHqS6/VUMXdUZhX6Pa7KJ0EPZQ4eVbR/cCoNj4aHiC rS0Y3KPbCQhTtmU7Yu0Lfgt1omGzXMg9gwAY/+VaegR4v/JtLH4sCJxwOZnUF2jQUie73S B7C6E0lacrrUlTL1UIn+CXvkPeO2BjMrnYo7oyITK7+cJT8VYvZN/aZ43i9Qjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfJH72xlzy4d; Sat, 3 Feb 2024 04:08: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 41348FTn065854; Sat, 3 Feb 2024 04:08:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41348FP4065851; Sat, 3 Feb 2024 04:08:15 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:08:15 GMT Message-Id: <202402030408.41348FP4065851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 78cc45712350 - main - .github: Enable manually running github actions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78cc45712350d81d848706a77f28f90cc51ebfaf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=78cc45712350d81d848706a77f28f90cc51ebfaf commit 78cc45712350d81d848706a77f28f90cc51ebfaf Author: Andrew Turner AuthorDate: 2023-10-27 16:02:55 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:05:49 +0000 .github: Enable manually running github actions Sponsored by: Arm Ltd Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/878 --- .github/workflows/cross-bootstrap-tools.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index 192249eff9a3..d2dcf2aaa6f3 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -5,6 +5,7 @@ on: branches: [ main, 'stable/14', 'stable/13' ] pull_request: branches: [ main ] + workflow_dispatch: permissions: contents: read From nobody Sat Feb 3 04:22:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfdG1nz7z590p0; Sat, 3 Feb 2024 04:22: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 4TRfdG1JMrz4vTN; Sat, 3 Feb 2024 04:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706934178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewSiQlCsVdevUANJBCKGVK40eKjzT4Nc/SpklrlIBjk=; b=k4Lb9+0hWq6Zw7efz/AgbPrhtYnfvUQgK2Hj1lk06iQtJkJc3MbNcRW7Mg/dTDx57oj6DL /3M1Lg5ROIYXo5OfiCep1HyHjt0Uu9sBQIFQWRJhUygqWBCbHdUHkb/moEemhubkjNI6M3 KHwQqRLE8rur2hVQmxUmdalsgodzRre7miJop/PCjfeca5Eh75Wx+AkxxqMYmY3BDe46nH Lhp7AAIHjcwrb3B+NaPSDVpyOWMZahqDEsenUtAdP9FDVsO5MhSM7a/3UCstbhC3hcKr3i WsbexUd4tkKz1E0AhQCHZ3fzqVSUbQXzXGwr5lrditjyklHwzPvNKcGP6Ob7IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706934178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ewSiQlCsVdevUANJBCKGVK40eKjzT4Nc/SpklrlIBjk=; b=kaZVKB3CyuIHSMagRha9/T8dZHrKfdGoUmIcUxQ8SHRWtxLJHYWiYNq5EER18FYa741Coq bGjoYIOBPPp60+L37D6HOmfxqb5AvIYiVG0emmoJyDO/shtJf+tU6Q9b3wbhydWaPquyUZ NxMHQLjrlq9e4891osfpQE0YCxgjnajjRWDv3r91G7vXK40GrdysV5xbEDG7YdqJcipDH8 2BJn2ead8BXHF+uH92ELM89T8fZ/mMFgAMq7M5RTiNIC0lwumYn8b3jyM7N5gJ6VPEO0q+ XsaOIMHmQhX4SOycYe0kN3VV1uZo36TLM5dBCjbWLl2Yl4w6uCVzfHsvnj7WSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706934178; a=rsa-sha256; cv=none; b=TPj6Tc+4naNGwXdO6k8B8HAKYaO2GoOJoUPdW9berCUxwHW7ydLSEuLywHEtTIlOXXIbK3 hDYdpaRPY5GNgODqZLA3KMQd14D1WGpvWsvvfLsbazbSkJhyKVrtb/DS639HEYBQZVKO9B gull/Ri6Nr+Zk0XZ+4IST2/yQQE4LUUdlQj23a0iNhfTwHhpld+KtiKvfMbAhjXiBIFn1i anALmS7r13XXySOBFk1xD++ymr/M5xxcSNqWT0nsQQmdCbc/ZGCX4MWgwxbwIfZ+RaZoHn z23cOHWO+dIdruDQXM5pQm6cu+Fr/yNgPZd93IOz4EAFFHDB8izVmvD8NJqHlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfdG0MyWz108h; Sat, 3 Feb 2024 04:22: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 4134Mve6099462; Sat, 3 Feb 2024 04:22:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4134MvVP099459; Sat, 3 Feb 2024 04:22:57 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:22:57 GMT Message-Id: <202402030422.4134MvVP099459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7bd6cbbf69c7 - main - vt.4: explain console fonts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bd6cbbf69c7a9b952ebed096625a4a4a6b7bbfd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7bd6cbbf69c7a9b952ebed096625a4a4a6b7bbfd commit 7bd6cbbf69c7a9b952ebed096625a4a4a6b7bbfd Author: Alexander Ziaee AuthorDate: 2024-01-15 19:54:20 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:21:45 +0000 vt.4: explain console fonts Add explaination about console fonts, how to convert them, which subset of things support them and how to use them. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1063 --- share/man/man4/vt.4 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 2876d1ca8d84..ed4da98df673 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -47,6 +47,7 @@ In .Cd kern.vt.color..rgb="" .Cd kern.vt.fb.default_mode="x" .Cd kern.vt.fb.modes.="x" +.Cd screen.font="x" .Pp In .Xr loader.conf 5 or @@ -257,6 +258,11 @@ It will contain a list of connectors and their associated tunables. This is currently only supported by the .Cm vt_fb backend when it is paired with a KMS video driver. +.It Va screen.font +Set this value to the base name of the desired font file located in +.Pa /boot/fonts . +Fonts can be converted for use with +.Xr vtfontcvt 8 . .El .Sh KEYBOARD SYSCTL TUNABLES These settings control whether certain special key combinations are enabled or @@ -358,6 +364,14 @@ To set black and white colors of console palette .Pp .Dl kern.vt.color.0.rgb="10,10,10" .Dl kern.vt.color.15.rgb="#f0f0f0" +.Pp +Load the 8x16 font in +.Xr loader.conf 5 +from +.Pa /boot/fonts/*.fnt[.gz] +at boot: +.Pp +.Dl screen.font="8x16" .Sh SEE ALSO .Xr kbdcontrol 1 , .Xr login 1 , @@ -371,6 +385,7 @@ To set black and white colors of console palette .Xr syscons 4 , .Xr ukbd 4 , .Xr kbdmap 5 , +.Xr loader.conf 5 , .Xr rc.conf 5 , .Xr ttys 5 , .Xr config 8 , From nobody Sat Feb 3 04:37:38 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfyB603Yz591g2; Sat, 3 Feb 2024 04:37: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 4TRfyB58kZz3xfh; Sat, 3 Feb 2024 04:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706935058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2kTkbMzaBGplganq0wtlcs0nNMUy3dCYi4IJ09vSS+0=; b=qiphabMJ/cPwwwTS2RH+KKT033i4C8cXeuXQuzEaFXGK6zL4IfBjq3hE+vF5J6lznhhRVm V6WCynuTijPuivJ7TpxHajs1AOq1lDfsWOlXaLXT1Dj1i3yFxEg9p7WIHC8H1MZCYMHVsX gQK5RTwAj82uLEUcu42LxWtM0h8feULKQqu7ajqopwuGDafALgN57M8kGIT7oxR3z9aUO6 JH1BY1LirqTQ4UepxjuV4NFuVXQ+aRoVhcBJ/b1wBX7/+MfPTQfd4o7ueAyqAAuONAa7oW srCQrz0reQxOYQOGDjgMecqfxYE2kXWxpMjJYW98OtvPRjMo11LOozUouPhO5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706935058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2kTkbMzaBGplganq0wtlcs0nNMUy3dCYi4IJ09vSS+0=; b=tSKoNbP+fW+y8SZUXBGDWP35+cpRuVNehOAIu8iGuzBEVImwGJNwH5A5XwniCfVHdoBFyo 82CfSmS6h4gIPBOtX7h8R/prMltSacCIN3oOw7MQJQAhiWmm44k5jNCTTQuEJ5GQVJsC4u MKjJqurxDZxqBUiZQYDI7Dy2pBUO26/n9EpVna2buryt/6IRL/xDpaDHefDqpPfW8pWad3 j1tYwySVnxtcS7KsYXpDV000CJ0r+1/2cdQwOa0dtzx4t6Drr4goGs3OcgyehHDfeKrqpC rm4qQZ+miTfizSR3jFM1TDPTtsEBFj21amdk0BXN+D+3+BtFtZkveHRBgXI+Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706935058; a=rsa-sha256; cv=none; b=rxLE+DNN/Ay3MOOS365DPUn6NubVriPCYJpxXeXhIBAc+UGljqzBU7Vm4YLTHGvSKi5V99 dIdcAus9WSx1Kh/gRqPK6bZS1FkyMHzlHPN4m9bwHVkNHDT7nZOAt2AaG5whS++1M4Iuil CMj52LyX3dCour7v3WwirFqQwvTtY6ogikhkmkWS+VZUlUkCjOwfweMx+r7nCr9+e2it04 soZDqNcUsaCCsU32yeKCb4E5Vxlw+VdqnOnHlcO8JIFkI2+2gYvnj9USKF+4Q7ftzBsivw u0N9X1nTPAIRVrWwvPH5DfRuenYUlkxe2Pi4AAExsxIQuaqbSLPwil4pGicZfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRfyB4Dyyz10H9; Sat, 3 Feb 2024 04:37: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 4134bc4p016966; Sat, 3 Feb 2024 04:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4134bcYx016963; Sat, 3 Feb 2024 04:37:38 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:37:38 GMT Message-Id: <202402030437.4134bcYx016963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c1f6704bf810 - main - ipf: Fix some typos List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1f6704bf810bc28b2af6cb0d0e60cb8f5a9b44b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1f6704bf810bc28b2af6cb0d0e60cb8f5a9b44b commit c1f6704bf810bc28b2af6cb0d0e60cb8f5a9b44b Author: Elyes Haouas AuthorDate: 2023-10-15 16:03:11 +0000 Commit: Warner Losh CommitDate: 2024-02-03 04:36:27 +0000 ipf: Fix some typos Signed-off-by: Elyes Haouas --- sbin/ipf/ipf/ipf.5 | 26 +++++++++++++------------- sbin/ipf/ipf/ipfilter.4 | 2 +- sbin/ipf/ipfstat/ipfstat.c | 2 +- sbin/ipf/ipnat/ipnat.5 | 16 ++++++++-------- sbin/ipf/ipscan/ipscan.5 | 2 +- sbin/ipf/libipf/interror.c | 2 +- sbin/ipf/libipf/parseipfexpr.c | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sbin/ipf/ipf/ipf.5 b/sbin/ipf/ipf/ipf.5 index 79e6b2c45b05..7fbba17594ba 100644 --- a/sbin/ipf/ipf/ipf.5 +++ b/sbin/ipf/ipf/ipf.5 @@ -31,7 +31,7 @@ address patterns or "all" to match any address information .SS Long lines .PP For rules lines that are particularly long, it is possible to split -them over multiple lines implicity like this: +them over multiple lines implicitly like this: .PP .nf pass in on bgeo proto tcp from 1.1.1.1 port > 1000 @@ -536,7 +536,7 @@ URG - this bit is set to indicate that the packet contains urgent data .HP R RST - this bit is set only in packets that are a reply to another -that has been received but is not targetted at any open port +that has been received but is not targeted at any open port .HP C CWN @@ -686,7 +686,7 @@ Once a TCP connection has reached the established state, the default timeout allows for it to be idle for 5 days before it is removed from the state table. The timeouts for the other TCP connection states vary from 240 seconds to 30 seconds. -Both UDP and ICMP state entries have asymetric timeouts where the timeout +Both UDP and ICMP state entries have asymmetric timeouts where the timeout set upon seeing packets in the forward direction is much larger than for the reverse direction. For UDP the default timeouts are 120 and 12 seconds, for ICMP 60 and 6 seconds. This is a reflection of the @@ -890,8 +890,8 @@ construction of filter rules easier, it is possible to place them in groups. A rule can be both a member of a group and the head of a new group. .PP Using filter groups requires at least two rules: one to be in the group -one one to send matchign packets to the group. If a packet matches a -filtre rule that is a group head but does not match any of the rules +one one to send matching packets to the group. If a packet matches a +filter rule that is a group head but does not match any of the rules in that group, then the packet is considered to have matched the head rule. .PP @@ -1037,7 +1037,7 @@ pass in on bge0 to bge1:1.1.1.1 reply-to hme1:2.1.1.2 \\ .PP The design for IPv4 allows for the header to be upto 64 bytes long, however most traffic only uses the basic header which is 20 bytes long. -The other 44 bytes can be uesd to store IP options. These options are +The other 44 bytes can be used to store IP options. These options are generally not necessary for proper interaction and function on the Internet today. For most people it is sufficient to block and drop all packets that have any options set. This can be achieved with this @@ -1090,7 +1090,7 @@ some of the nodes the packet must go through, with the ssrr option, every next hop router must be specified. .PP The complete list of IPv4 options that can be matched on is: -addext (Address Extention), +addext (Address Extension), cipso (Classical IP Security Option), dps (Dynamic Packet State), e-sec (Extended Security), @@ -1357,7 +1357,7 @@ A list of the currently available variables inside IPFilter that may be tuned from ipf.conf are as follows: .HP active -set through -s command line switch of ipf(8). See ipf(8) for detals. +set through -s command line switch of ipf(8). See ipf(8) for details. .HP chksrc when set, enables reverse path verification on source addresses and @@ -1430,7 +1430,7 @@ sets the size of the in-kernel log buffer in bytes. log_suppress when set, IPFilter will check to see if the packet it is logging is similar to the one it previously logged and if so, increases -the occurance count for that packet. The previously logged packet +the occurrence count for that packet. The previously logged packet must not have yet been read by ipmon(8). .HP min_ttl @@ -1467,8 +1467,8 @@ when the fill percentage of the NAT table exceeds this mark, more aggressive flushing is enabled. .HP nat_table_wm_low -this sets the percentage at which the NAT table's agressive flushing -will turn itself off at. +this sets the percentage at which the NAT table's aggressive flushing +will turn itself off. .HP rdr_rules_size size of the hash table to store rdr rules. @@ -1492,7 +1492,7 @@ state_size size of the hash table used for stateful filtering .HP state_wm_freq -this controls how often the agressive flushing should be run once the +this controls how often the aggressive flushing should be run once the state table exceeds state_wm_high in percentage full. .HP state_wm_high @@ -1500,7 +1500,7 @@ when the fill percentage of the state table exceeds this mark, more aggressive flushing is enabled. .HP state_wm_low -this sets the percentage at which the state table's agressive flushing +this sets the percentage at which the state table's aggressive flushing will turn itself off at. .HP tcp_close_wait diff --git a/sbin/ipf/ipf/ipfilter.4 b/sbin/ipf/ipf/ipfilter.4 index f262f711b8ff..39676e3c1dae 100644 --- a/sbin/ipf/ipf/ipfilter.4 +++ b/sbin/ipf/ipf/ipfilter.4 @@ -123,7 +123,7 @@ file syslog .PP ipsend(1) -generates arbitary IP packets for ethernet connected machines. +generates arbitrary IP packets for ethernet connected machines. .PP ipresend(1) reads in a data file of saved IP packets (ie diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c index ba9556f5421c..fd0ac83097a0 100644 --- a/sbin/ipf/ipfstat/ipfstat.c +++ b/sbin/ipf/ipfstat/ipfstat.c @@ -323,7 +323,7 @@ int main(int argc, char *argv[]) case 'm' : filter = parseipfexpr(optarg, NULL); if (filter == NULL) { - fprintf(stderr, "Error parseing '%s'\n", + fprintf(stderr, "Error parsing '%s'\n", optarg); exit(1); } diff --git a/sbin/ipf/ipnat/ipnat.5 b/sbin/ipf/ipnat/ipnat.5 index 01931c6be4f4..b01892f9749d 100644 --- a/sbin/ipf/ipnat/ipnat.5 +++ b/sbin/ipf/ipnat/ipnat.5 @@ -149,7 +149,7 @@ For TCP connections exiting a connection such as PPPoE where the MTU is slightly smaller than normal ethernet, it can be useful to reduce the Maximum Segment Size (MSS) offered by the internal machines to match, reducing the liklihood that the either end will attempt to send packets -that are too big and result in fragmentation. This is acheived using the +that are too big and result in fragmentation. This is achieved using the .B mssclamp option with TCP .B map @@ -220,7 +220,7 @@ that requires the destination port number to be 21 if this rule is to be activated. The word "ftp" is the proxy identifier that the kernel will try and resolve internally, "tcp" the protocol that packets must match. .PP -See below for a list of proxies and their relative staus. +See below for a list of proxies and their relative status. .PP To associate NAT rules with filtering rules, it is possible to set and match tags during either inbound or outbound processing. At present the @@ -355,7 +355,7 @@ rdr le0 from 1.1.0.0/16 to any -> 192.168.1.3 rdr le0 ! from 1.1.0.0/16 to any -> 192.168.1.4 .fi .PP -If there is a consective set of addresses you wish to spread the packets +If there is a consecutive set of addresses you wish to spread the packets over, then this can be done in one of two ways, the word "range" optional to preserve: .nf @@ -382,9 +382,9 @@ rdr le0 0/0 -> 192.168.1.5,192.168.1.7 round-robin rdr le0 0/0 -> 192.168.1.9 round-robin .fi .PP -If there are a large number of redirect rules and hosts being targetted +If there are a large number of redirect rules and hosts being targeted then it may be desirable to have all those from a single source address -be targetted at the same destination address. To achieve this, the +be targeted at the same destination address. To achieve this, the word .B sticky is appended to the rule like this: @@ -399,9 +399,9 @@ The .B sticky feature can only be combined with .B round-robin -and the use of comma. +and the use of a comma. .PP -For TCP and UDP packets, it is possible to both match on the destiantion +For TCP and UDP packets, it is possible to both match on the destination port number and to modify it. For example, to change the destination port from 80 to 3128, we would use a rule like this: .nf @@ -572,7 +572,7 @@ On the LHS is a normal set of matching capabilities but on the RHS it is a requirement to specify both the source and destination addresses and ports. .PP -As this feature is intended to be used with targetting packets at sockets +As this feature is intended to be used with targeting packets at sockets and not IPFilter running on other systems, there is no rule provided to \fIundivert\fR packets. .TP diff --git a/sbin/ipf/ipscan/ipscan.5 b/sbin/ipf/ipscan/ipscan.5 index 345561f9bb91..72b3f92a25a0 100644 --- a/sbin/ipf/ipscan/ipscan.5 +++ b/sbin/ipf/ipscan/ipscan.5 @@ -20,7 +20,7 @@ match-char ::= "*" | "?" | "." .fi .PP In this example an ip-address is a dotted-quad IPv4 address and a port-number -is a number betwee 1 and 65535, inclusive. The match string is must be of +is a number between 1 and 65535, inclusive. The match string is must be of same length as the literal string that it is matching (literal). The length of either string is limited to 16 bytes. .PP diff --git a/sbin/ipf/libipf/interror.c b/sbin/ipf/libipf/interror.c index a4c0b1c56b8e..981823ca6bb9 100644 --- a/sbin/ipf/libipf/interror.c +++ b/sbin/ipf/libipf/interror.c @@ -144,7 +144,7 @@ static ipf_error_entry_t ipf_errors[IPF_NUM_ERRORS] = { { 116, "error copying in match array" }, { 117, "match array type is not IPFOBJ_IPFEXPR" }, { 118, "bad size for match array" }, - { 119, "cannot allocate memory for match aray" }, + { 119, "cannot allocate memory for match array" }, { 120, "error copying in match array" }, { 121, "error verifying contents of match array" }, { 122, "need write permissions to set ipf lock status" }, diff --git a/sbin/ipf/libipf/parseipfexpr.c b/sbin/ipf/libipf/parseipfexpr.c index 880258e5dd66..be86456e143b 100644 --- a/sbin/ipf/libipf/parseipfexpr.c +++ b/sbin/ipf/libipf/parseipfexpr.c @@ -75,7 +75,7 @@ parseipfexpr(char *line, char **errorptr) for (ops = strtok(temp, ";"); ops != NULL; ops = strtok(NULL, ";")) { arg = strchr(ops, '='); if ((arg < ops + 2) || (arg == NULL)) { - error = "bad 'arg' vlaue"; + error = "bad 'arg' value"; goto parseerror; } From nobody Sat Feb 3 05:09:24 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRgfr6Qhfz58Kbv; Sat, 3 Feb 2024 05:09: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 4TRgfr5sN2z41vn; Sat, 3 Feb 2024 05:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706936964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2QleK3RdM86sWzPP/NLk3dX6S66GQiPdafUy73nTrg=; b=Qm83WlVHQuxXeoMVhjM9nIVNKMnH9UoaSaLC+OUrZWYDu2mKyBCtjZHYAPxtfNkg+hvP3f Z13HSVLO/33nQzNiJgAGComVdiw4MqZGvd1GcISkwIPJL8PAxo/xrGAi+Gq4M4mXQeBLpO NRwjVLmrDpJQO/ozVxQhDXs/uS7i+krb+BMd9xZ+rQC3TKx1nUk38QHAF8zheojUkNjvcU J6gBMpAeq1HxKM475GejnMaRN4V1RtF6lfEf2MDlQVRsrhilLAcAqcwsfmha6CY8oNmhiY aI+KbijJmc/OJahTrCT7DmnNaZpw3+xwUikbXDkVukGQ7hvvZahZKzm8d8E50w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706936964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i2QleK3RdM86sWzPP/NLk3dX6S66GQiPdafUy73nTrg=; b=MAte9zytvukJrSzaQ+iVa5oH5pn30r3odcJrHFfLZoEEJnSpVlWhN+StobmjPRQqz1l8v9 PulRIVBumLILfy/AdBTyofu4COOJubKDTFTsDOO2nSEzPNLlTK6Lli1b+Q7N8UZJk9Mp6B 32v+CvI59+5Vsxa7x1h0rHAqQGDIDGbCNsMX/UtRYHszecphNFFOllSaLcim61OsAI/kX2 OB+DYbVa4lS0WjhAOa/2Rj8mV5PYKiWHUTqXd+VKBFyO2cIZJTI9eKJBV8zQKdZVy3FVZO xPAIjf8Qb433wBRfpcdimoaAITR5DOUb9tGPPBy3NJlaYur/T8z7XDuRp8X6uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706936964; a=rsa-sha256; cv=none; b=NukjJvP77mCzEVA8kI/4aEdXtU3K9rMU76Q4308iDDYyGGBMKH6JoQqR+o08hHD0yVYZmI JSDS+GTDM8F2+PKcQGEi793KQon9rOg2Z0/x9LveZs7Y5QtrHRjYcmH92Qp/NcUHfLVzYm i4H6LaY8ABxh/JgGG82QmmsctunBtrJOIGuPmiwh0FDS/eGPxeYEWswZh3PwSIK7lKz8wD vhPtXsWgLmkCsB19VLAteyzz/DLvRxCquOKUt21bgibIja0LfsSbvNLyiYPBRKqhLbH4aJ R4s0Ll0YGsogm+/ClHFT4/FpRiqtIDWjfo5ttZadzHAMY6OS3g6p6szmO0eS2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRgfr4k94z11DG; Sat, 3 Feb 2024 05:09: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 41359Oxx068122; Sat, 3 Feb 2024 05:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41359OlJ068120; Sat, 3 Feb 2024 05:09:24 GMT (envelope-from git) Date: Sat, 3 Feb 2024 05:09:24 GMT Message-Id: <202402030509.41359OlJ068120@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: 70f5c6e34ffd - main - tests/netinet: push variable 'sin' into function scope List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70f5c6e34ffd21c5dd41e35c72dc1b0e84d67a21 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=70f5c6e34ffd21c5dd41e35c72dc1b0e84d67a21 commit 70f5c6e34ffd21c5dd41e35c72dc1b0e84d67a21 Author: Gleb Smirnoff AuthorDate: 2024-02-03 05:08:16 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-03 05:09:02 +0000 tests/netinet: push variable 'sin' into function scope This should fix build with GCC 13. Fixes: 861274c9f8cf2a5c00ded9580ea91b22def683f7 --- tests/sys/netinet/tcp_implied_connect.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/sys/netinet/tcp_implied_connect.c b/tests/sys/netinet/tcp_implied_connect.c index 2961626d5e5b..6e8cb0606a0a 100644 --- a/tests/sys/netinet/tcp_implied_connect.c +++ b/tests/sys/netinet/tcp_implied_connect.c @@ -33,17 +33,15 @@ #include -static struct sockaddr_in sin = { - .sin_family = AF_INET, - .sin_len = sizeof(sin), -}; - -static const char buf[] = "hello"; -static char repl[sizeof(buf)]; - ATF_TC_WITHOUT_HEAD(tcp_implied_connect); ATF_TC_BODY(tcp_implied_connect, tc) { + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(sin), + }; + const char buf[] = "hello"; + char repl[sizeof(buf)]; socklen_t len; int s, c, a; From nobody Sat Feb 3 05:24:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRh0J2Hwlz58M4M; Sat, 3 Feb 2024 05:24:32 +0000 (UTC) (envelope-from glebius@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 4TRh0J1hnGz43Pd; Sat, 3 Feb 2024 05:24:32 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706937872; 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=N/4ug4wiPRJfYv3mBUfV5IpUfhgaASQPbd0sBSLsuGY=; b=T7S4Sr5BELCGTu3JhD17YeVFbDmZko0GY4DAbHEXxHdyyvhBvsXbwlguk8xxIMSaXkp06f JMIHP9A6W/RgF7u7vzxS94CgYjIMgWi+8vGCgEAPomxKD18hzj6jE5/q62SsfYemMiSh4C snBi8hShNd/j43jPwIjgAmuhD03sFmIC/sJpWfVU8CNhVaMwLvDx9NYMtPEqYxEbu+2zxR A8ad6XkX9TZUEyAJ5uQ3JQ8hzyCGqN3hMv3pOwuZS268fmkD7kyuJSqqzZvoZ6Gtt3WW9F tQ8hImqND0lZJkOykQcudXBa6TUpcM0P6pRpGfUtoi2s3glD7vlX3JUcMI7F8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706937872; 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=N/4ug4wiPRJfYv3mBUfV5IpUfhgaASQPbd0sBSLsuGY=; b=Yz3fXsZ9Vf4EXfbehC7AgYkdo4GcsUpQgS444fqGIItOXFnBPlKvydFko6KhYcY1wun2py gQRdTMdRSiTlbs+kRtWiIqVPy56jtEK13kINdrYa0Mi5NNvMkO8K/Gm2HORmfbZ3hwsFrC nSnIZzR8JTV0ZnUIGcfe3bYkUILTxXojU42+nbYOAIWQ5wyy0QEEBR+ClYmJTrWCFMTuDu fLTTAvUcKDDk+ofawhQt3CpAPlhRbliX7d1IQxlwJ+RgTHjuD9oBMa1RgpbQinaB2Wyx6E RqoHuRi6FOoyaXq6oXyBnydidFzvexDZgWuENVkrR9AWwIsErFApkrbDdt2KAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706937872; a=rsa-sha256; cv=none; b=PrJheYPJzbm7BECOOLxj3Z8ZZo2bzUW/3JX5bVPooFxbkSNkHkFoKWD4acK061StwKbGmV mo1xTZ2TXsLdSaloJRxRDDcv/+paJGVEYYnQvDnwy3Y2vaHApWMbR4Oa1ZxTVxnxxaY5F6 zPj0IhObS/LKvuet0ehLU0/rX6gSGDuTep+rFDKOew/oCWKiFEIrjcZT8rI1GXYCsSrNeF X37JYeRfiuXeyathCbT8ptmOG7bgernCTYihrlBFLQ2/wh+HxQWOetyc9C9RSdhvMM0g+u Zm8ZuFy0e3fZLR3HHPyNziZjPt2Wodc/txl+czHG6tEKf/anauR4IRnicxDCMQ== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_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: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TRh0H1jyPz17cm; Sat, 3 Feb 2024 05:24:31 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Fri, 2 Feb 2024 21:24:27 -0800 From: Gleb Smirnoff To: Mina =?utf-8?B?R2FsacSH?= Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL Message-ID: References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202402030136.4131aQIM010980@gitrepo.freebsd.org> Mina, On Sat, Feb 03, 2024 at 01:36:26AM +0000, Warner Losh wrote: W> commit ce348fe5cfc36c454db860f0e5cd26f094deb09c W> Author: Mina Galić W> AuthorDate: 2024-02-03 00:35:18 +0000 W> Commit: Warner Losh W> CommitDate: 2024-02-03 01:35:00 +0000 W> W> amd64 & i386: enable VIMAGE in MINIMAL W> W> VNET(9) is very useful, and is not loadable. W> Enable it in MINIMAL. W> W> Reviewed by: imp W> Pull Request: https://github.com/freebsd/freebsd-src/pull/962 To be fair, it totally disagree with this change. The TL;DR version of my comment would be: if you start adding everything very useful into MINIMAL it stops being minimal. A longer version would be that VIMAGE actually allocates extra memory and adds a bit of extra CPU cycles. Even its introduction to GENERIC was met with a lot of criticism, check out the archives. Back then I asked if anybody is going to provide gdb scripts to deal with complexity of access to all global network variables. Nobody provided them of course. Now dealing with every network stack bug report is a challenge. Raise your hands those who can print me out list of interfaces in kgdb for a VIMAGE kernel! Anybody? Good, now keep your hand up if you can do that without spening some time reading vnet.h! I don't doubt usefulness of VIMAGE but I will also assert usefullness of a supported kernel configuration without VIMAGE. There are many people who intentionally run without it in production. Now if I build all kernels in sys/amd64/conf I want even notice that non-VIMAGE build had been broken. Such changes, I believe, should go through phabricator, where you would put #network into reviewers, not via github. -- Gleb Smirnoff From nobody Sat Feb 3 08:49:23 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRmXh3T3Kz58wXD; Sat, 3 Feb 2024 08:49: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 4TRmXh1NP7z4Qjc; Sat, 3 Feb 2024 08:49:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706950164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Czw2WVb5147922BsvPICFFNrhy4Ecf8Kf+zIvOyDQdw=; b=EQnDXgyGN2E1KSEL7ipeNztxXIsPmrXCSQrAYkvpvFvzB/M/VcZYM6B2LLKqmQjuU0FpLm FxEJDFp0OnHALX/ATkdfw0Hhmvov4UXoEpjnj5yLnC3ovC7WCo/Ww5Yg2orEB/AZ68Dpbr l2TqQlLqBWgBWjFHW8fHSYx5ndA/DAPhAIb6Q/62Zv1v0/0rhLlQbxScvKcEoxvdG0Td/x p3vFl1aQ99wUcM/B21zTEfdEfLw2RFmBttjN8ga6xGq129QK8F9H49dPuIGcd9MsP5YKRn MIMv3uqo1Lb5ow+3ajE5PrgWEDKFvwBhnHwV5N+l49dSFueka7TNkAz4Dsc9nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706950164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Czw2WVb5147922BsvPICFFNrhy4Ecf8Kf+zIvOyDQdw=; b=qEHmjvaaSVh3gyUci+KC1q9VCbMkUycSutYX7qsDRE9jqzHMTDw64+FpQC2qpOnGx+PSRV Ma3kgneDWOFjwWfboe9LuBD+Ep+10oj0tqtVJLcG6S8GU1S/lT0CghLZowvL9btEVZxFXj VojomxiMIQJNMTBOb0EIURAMvofVH2yh0iWSow7iGGVyauViOASR1vNWwhT+tpo2hYhgfO FJ9Cv7PF2HB50Lhtknialihec4dYZ77qERkKuHHFW6/eCi5g2E3kE1XFmDqTMEG7Ulu5Yx +5MFY70geK+sbQXtHNJ4fQFk1/o9fHt/6EumKW7xroWh1yTlKgqGak2MGWuzuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706950164; a=rsa-sha256; cv=none; b=L638i06RaulCZxJnlFUkmiDjaRGl1DBQsTEOuhCwmMjyWwjS7tXOnq6zJj7kJcJW2l4E0l By+zMbsiqZrU1R2d4ytEEpRVYB6q639nRvEuS4Xl8xJIaPNhoKDPYNo6zILwuqk5KC5YT5 oznivy78icn8KNMrpPU4PDnJJAlk7bVlo1eabL3NsKlYU8WqCZdoqqwVIOsolFvt59/3YL eBxIBmOJtamGCj7BA9Q6ShyGRNNTINnN3ZyelT9FHH3jBMOL49RWOEjamDI1O5GE7RA1DR Vmb6oXwYUAyhfAc21TUUP0bd3HnhrO4WAw7IdmnxMM8NHMHhLDU0Of1qLI3ehQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRmXg6zBnz16Hn; Sat, 3 Feb 2024 08:49: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 4138nN7H036860; Sat, 3 Feb 2024 08:49:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4138nN69036857; Sat, 3 Feb 2024 08:49:23 GMT (envelope-from git) Date: Sat, 3 Feb 2024 08:49:23 GMT Message-Id: <202402030849.4138nN69036857@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: b6e9a7a2e251 - main - Reapply "pkgbase: Create a FreeBSD-dtb package" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a commit b6e9a7a2e2517fb9cb560fbd9b1d6171645df24a Author: Emmanuel Vadot AuthorDate: 2024-02-02 18:25:55 +0000 Commit: Emmanuel Vadot CommitDate: 2024-02-03 08:49:12 +0000 Reapply "pkgbase: Create a FreeBSD-dtb package" This reverts commit 9bbe06b004e2cadb55a3792c77991ee640bf0f52. Before that dtbs where included in each kernel packages which prevents us to install multiple kernels. Fix mtree-to-plist.awk to only generate a dtb.plist when we create the kernel one (because dtb are installed during make installkernel). Sponsored by: Beckhoff Automation GmbH & Co. KG --- Makefile.inc1 | 28 +++++++++++++++++++++++++++- release/packages/dtb.ucl | 16 ++++++++++++++++ release/scripts/mtree-to-plist.awk | 20 ++++++++++++++------ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1e86cda657dd..7a9917fd8a74 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2178,9 +2178,35 @@ _default_flavor= -default . if ${MK_DEBUG_FILES} != "no" _debug=-dbg . endif + +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 ; \ + awk -F\" ' \ + /name/ { printf("===> Creating %s-", $$2); next } \ + /version/ {print $$2; next } ' \ + ${KSTAGEDIR}/${DISTDIR}/dtb.ucl ; \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ + -o OSVERSION="${SRCRELDATE}" \ + create -f ${PKG_FORMAT} \ + -M ${KSTAGEDIR}/${DISTDIR}/dtb.ucl \ + -p ${KSTAGEDIR}/${DISTDIR}/dtb.plist \ + -r ${KSTAGEDIR}/${DISTDIR} \ + -o ${REPODIR}/${PKG_ABI}/${PKG_OUTPUT_DIR} ; \ + fi + create-kernel-packages: .PHONY . for flavor in "" ${_debug} -create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} +create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-dtb-package create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ ${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \ diff --git a/release/packages/dtb.ucl b/release/packages/dtb.ucl new file mode 100644 index 000000000000..e4717b9054a2 --- /dev/null +++ b/release/packages/dtb.ucl @@ -0,0 +1,16 @@ +# +# + +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 = < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 828ce22f079d - main - LinuxKPI: 802.11: fix field order in ieee80211_key_conf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 828ce22f079df77b3bf52c4cf296959ea66bdc11 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=828ce22f079df77b3bf52c4cf296959ea66bdc11 commit 828ce22f079df77b3bf52c4cf296959ea66bdc11 Author: Bjoern A. Zeeb AuthorDate: 2024-01-28 00:51:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:28:25 +0000 LinuxKPI: 802.11: fix field order in ieee80211_key_conf When adding the new field link_id to struct ieee80211_key_conf, it was erroneously placed at the end of the struct; the zero-length (variable sized) array for the key always needs to stay last. Resort fields and add hopefully helpful comment to avoid the problem in the future. Fixes: adff403fe7a87 MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43635 --- sys/compat/linuxkpi/common/include/net/mac80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index c4d001b3a7e8..293b6868cd50 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -510,9 +510,9 @@ struct ieee80211_key_conf { uint8_t hw_key_idx; /* Set by drv. */ uint8_t keyidx; uint16_t flags; - uint8_t keylen; - uint8_t key[0]; int8_t link_id; /* signed! */ + uint8_t keylen; + uint8_t key[0]; /* Must stay last! */ }; struct ieee80211_key_seq { From nobody Sat Feb 3 13:32:47 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRtqh20f9z59PKc; Sat, 3 Feb 2024 13:32: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 4TRtqh127Vz41xP; Sat, 3 Feb 2024 13:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPYwl+F68WJPwkJQ+v4PxDSGd9wWm/yNngXS70cvHF0=; b=v/gNASGHFyl8m2pdnrOQ1rL8zYUgZl244+7UraLzCJjYG/6G6j5KfUie8UyF9OCaphf0XP ywh6UzVA2dmN03RF3Bvyo3HdvDzF8v8DbM5RcbhZ7DWqz0EcbUYq35WwEaIq///UJDDCFu 09ItGOOhWBMtvWgAwwOSDwUF0+cU/NfLQ3IVKv6dAIjD25ULTceNVnH1Crbgkag8QrbUPU 2zT/HP48SaoKoaLYBv+t16MT4iQdf+hDR5D0Q2VphGKEouqGnUpKw4UgJOHG1NN46aE+4i nj66ej/cQXHIW70BOp68HPCWJDq72SK1JwAt6ejzzUlL32n4Ppxrezjip2NzpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPYwl+F68WJPwkJQ+v4PxDSGd9wWm/yNngXS70cvHF0=; b=gT5CmBdlFJDwToFJ1Y3TG4sRVUAj1RrFtmdONX/uCF881lZHLGK2keaX6jTQ52+6KmZff1 7DKOC5gwggEQUcjxdQ29/Xi7zeOmKju9RBbcxG2v/ZnKSHTbLvIqYwpBarG+epLnZyckpZ lly+CaflwmuNfHZYQ3qAHE+NudXkXGGj6wjsrEvatZZLU/yCBea8sQiUzZDwCqkWRtkKVd elXUeejFeHMHdRkmtV6SxtwOMh5roZQKn01nF4nKUAzOFIVUfYSp6d4BTlVNXMSTPlH8OR AEyDbPfxyYFB7kCRt9bcccu1bst8Cz5kDwPA9QnoBmiHiSIu9Cx8fznY4IZ/0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706967168; a=rsa-sha256; cv=none; b=g2rVqpxGkQchJcB8zhgy1fZQ4887b30dAxWxUBIPIsSJKDdwRmRLT3HOo7Rz+j143EjsrG VW68EV7DAwf3oMtBNJAj3yQQIXo8aygRMJKOPQlzE30LEX88ndB+3v+x4PyFp4fEMz63j4 tarO0VemUuWE0XMcNqtKovQyFsB4n/2QJ0Dhaq6A6rQ6RoTMXI+Ho42UIDAeLTIqe44AeY 0DXwFn9sPU8rixc6KZsOrNcLUgGWB7Y9eCWipT095EncxUe33Lxyw4Cysr0vwCMcknpMML ioNJR5peGIfDAyBxCe3iMB4alod4Ir/IHEs7FZo4KPwnaEJCVlyOlXuto095eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRtqh04mXzFkB; Sat, 3 Feb 2024 13:32: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 413DWlIj022652; Sat, 3 Feb 2024 13:32:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DWl0A022649; Sat, 3 Feb 2024 13:32:47 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:32:47 GMT Message-Id: <202402031332.413DWl0A022649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2f029bf911e2 - main - LinuxKPI: 802.11: extend ieee80211_key_seq and WLAN_KEY_LEN_* defines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f029bf911e29dc46c32ea142daba4f26a2078f4 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f029bf911e29dc46c32ea142daba4f26a2078f4 commit 2f029bf911e29dc46c32ea142daba4f26a2078f4 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:21:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:31:50 +0000 LinuxKPI: 802.11: extend ieee80211_key_seq and WLAN_KEY_LEN_* defines For iwlwifi(4) d3.c we need another struct in struct ieee80211_key_seq and related WLAN_KEY_LEN_* defines in. MFC after: 3 days Reviewed by: cc, emaste Differential Revision: https://reviews.freebsd.org/D43646 --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++++ sys/compat/linuxkpi/common/include/net/mac80211.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 5c18bb9fe3d9..09487a318811 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -133,7 +133,11 @@ enum wlan_ht_cap_sm_ps { #define WLAN_KEY_LEN_TKIP 32 #define WLAN_KEY_LEN_CCMP 16 #define WLAN_KEY_LEN_GCMP 16 +#define WLAN_KEY_LEN_AES_CMAC 16 #define WLAN_KEY_LEN_GCMP_256 32 +#define WLAN_KEY_LEN_BIP_CMAC_256 32 +#define WLAN_KEY_LEN_BIP_GMAC_128 16 +#define WLAN_KEY_LEN_BIP_GMAC_256 32 /* 802.11-2020, 9.4.2.55.3, Table 9-185 Subfields of the A-MPDU Parameters field */ enum ieee80211_min_mpdu_start_spacing { diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 293b6868cd50..fc9d7829dae3 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -528,6 +528,9 @@ struct ieee80211_key_seq { struct { uint8_t pn[IEEE80211_CCMP_PN_LEN]; } aes_cmac; + struct { + uint8_t pn[IEEE80211_CCMP_PN_LEN]; + } aes_gmac; struct { uint32_t iv32; uint16_t iv16; From nobody Sat Feb 3 13:44:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRv5k2gcPz59QdM; Sat, 3 Feb 2024 13:44:58 +0000 (UTC) (envelope-from bz@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 4TRv5k29Ghz43Bj; Sat, 3 Feb 2024 13:44:58 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967898; 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=hGDXgH5tatrbIr+d//AA1kW2Vyyq/86lljchT5auOdw=; b=bC1WiBp/6c93wdQrm4hnVcXdRNwA3giWk42PpWZMB1bt25xF7Yu1HaWGBKr5bkZlOGdklo vgBGGHzykazJZY5em/x7Blb8J/eUwdUMs29vmh2DWZlXOj2D71cu2PkX/bjXk4MKtz/lAA BEy3Gjlm0Ud6ex2JDMPoTcGsTg3C4Dld3HWjCott6q8mfb/oe9w2l9gSTKU0zFB/JmgyFR XfhLp05lECrgcyFW961byR1Jg40+DOLC6rKugfBn1VVepbsPdH1dUba0fEHlLNH2R6YWFd fwH6cglsIAh5Rri5psgxFXwQyruPbuKB5e5FLZvsZKx2EJV065pohEPW77vOBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706967898; 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=hGDXgH5tatrbIr+d//AA1kW2Vyyq/86lljchT5auOdw=; b=Jjv5882nC/HBiG+hGI40qZixuSKZAHqi+KSawUPmdasYjzskC+xt2SFOYWB4d+b3xIT8Jx lMSv6WOJiJ6NkmD2Ik/6QphP84Nf9BzG7TxJAkzrfvAWEj5udD42MrHH2CnUHB2KK47VHO +PiXtEds2yBS0VcBOHDNu/Jve3IimhRm4gwYy0FUBoY2pcxzNcO7kxiY3W8cQhJVEQ7EB9 e55JXrKrUFsfl3Fmgfrnl8Fj59UdZHTRiEjRQbuiHLvRLloPauCR33BgDes1BoaymYoLMH dXSkVSrwyHUqFqWUkxVsL/ml1gSZxr91ZAZB0MbViHg+mP1KRQuGOoEYdqZmzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706967898; a=rsa-sha256; cv=none; b=aIFgANGBXFRB4CJ7rNybo5buEF4i+z71QDPtEkSImRZlhv/WlF4SlJo3LnRjP9DqDfeV0c R3jZ0a77CfrQ6CF+UKqToZEoglX0/JzDYCSn2OBhoS0UL3UUjy5KQHAzypadFm9zW8yUVy psEfMnz9BfHQZWaoq2WjiYJqEZ67bDTuJSwWztjBBJz+9UcKdGN3k1+ADSB7FzeB6MTxy+ RdjOITQ3oB8YqHpfkibRFT0wsrFrXcP/xTENsz+oQpwNBab/nQgwabQaOZ/B2dPGPxnAIx XD+CbQWBY3EeQaRJagqidrWl6/PUuWducqeCkTpnnEv8W/i0up3BSEiwEA1rKQ== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TRv5k0VcJz1LNq; Sat, 3 Feb 2024 13:44:58 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 6EB5D8D4A15D; Sat, 3 Feb 2024 13:44:56 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id D761F2D029D2; Sat, 3 Feb 2024 13:44:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id CLZBtalhVAAc; Sat, 3 Feb 2024 13:44:55 +0000 (UTC) Received: from strong-aiccu0.sbone.de (strong-aiccu0.sbone.de [IPv6:fde9:577b:c1a9:f491::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 617C62D029D7; Sat, 3 Feb 2024 13:44:54 +0000 (UTC) Date: Sat, 3 Feb 2024 13:44:53 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: =?UTF-8?Q?Mina_Gali=C4=87?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL In-Reply-To: Message-ID: <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-760779814-1706967894=:2837" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-760779814-1706967894=:2837 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Fri, 2 Feb 2024, Gleb Smirnoff wrote: > Mina, > > On Sat, Feb 03, 2024 at 01:36:26AM +0000, Warner Losh wrote: > W> commit ce348fe5cfc36c454db860f0e5cd26f094deb09c > W> Author: Mina Galić > W> AuthorDate: 2024-02-03 00:35:18 +0000 > W> Commit: Warner Losh > W> CommitDate: 2024-02-03 01:35:00 +0000 > W> > W> amd64 & i386: enable VIMAGE in MINIMAL > W> > W> VNET(9) is very useful, and is not loadable. > W> Enable it in MINIMAL. > W> > W> Reviewed by: imp > W> Pull Request: https://github.com/freebsd/freebsd-src/pull/962 > > To be fair, it totally disagree with this change. For different reasons I second that. VIMAGE definitively does not belong in MINMAL for comfort. I think a solution is something which was in the re@ inbox for a long time and someone said he'd do but it simply never happened. About a decade+ ago we did want to publish more than one kernel on a release to avoid all these problems. I assume with pkgbase it would be super-easy by now (ignoring build time and someone patching the installer). I'd love to have a VIMAGE kernel (GENERIC+VNET) and I'd love to have a NOIP4 (GENERIC without INET); these were the initial reasons for the above request. Would people thinkg this would be a better solution (at least for the X86 world) -- still ahving to deal with arm64 and others then. -- Bjoern A. Zeeb r15:7 --1098556516-760779814-1706967894=:2837-- From nobody Sat Feb 3 13:49:20 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRvBn17vGz59Qyr; Sat, 3 Feb 2024 13:49: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 4TRvBn0B7Fz43V0; Sat, 3 Feb 2024 13:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968161; h=from:from:reply-to:subject:subject: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+m6FpSKXwp+JguPPhFiJwwfqInYJjmp8LUevfEYRTI=; b=iQpC+lKSyFtnUUqom3FtR1OPLa7miUwLnqukiGhjbsOnq+qm4D4OcEfbfM/yNFNg34ZCTp V6bnWnKMmBHRCbBaKCf0vpB1MEb008PjmluQLD5JmhDm9UHwsY3l5vYU7paz2letGtFNE0 L+SIsChr82b99hfEjJaAUjFr1pFojOTATRHNqPmHa0nttqFrWP9PICKyASR6NriRmxV7vj wkn4vcbcn3a/2kQ6eGsqNJhjrBRUdGlcJKprcFzo/Sl16lEiQqBB0kI5GHMYYbCejgKHQ0 gxnwWb1etFr8Z16PDEWynlk8M5ziK1M/SZ5cOt7hYJCrCkY2jm8nuwSNXzsUvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968161; h=from:from:reply-to:subject:subject: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+m6FpSKXwp+JguPPhFiJwwfqInYJjmp8LUevfEYRTI=; b=OeU87FrQXdGrvm7y2+eFRPXDq/IqbpX0Q3ysy3fT5p64Qz0MARKHsfVU9FWJB8EV830XJY tsUZazTa//thHxUCodFpqfGW20Rd8U/v6fkKEt9EA0Xn23ocmWfiGcjqiVDUF03Ppwqc5g 2316m02RTJD4jBHK9O3KUcv1RCxJrxsjuUAnpCyLjOqjuEIDyUD5H6FbaX7Zv7Gs7uEvGT W22i8Sp0xRRmW0bcjEeBUioDdmQVtqIlv/45VV1rhEUf87BXw7Ft6Ao2ivUK+/3LRsgVBu 7rRllHlLM1A9esWCJTSXg5KOSvQtLfSKp0tE1pcexV5QLbjZfBs1CqW1dK8gEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968161; a=rsa-sha256; cv=none; b=pLm51KNyLziWKWL8fkeMfiAFVNduXzo5OdTynpy3iN7eQe7Urv/mS3zJK3mz2VxJhUMz9B Gpo9grgbEd2O6C0uXwEyyo+KMkBrEW1K2B853ofRn6jaRp30RA3DrkwiPNpJSFIbUKMuSJ r9dpUMapImSkQ3monLimhCc1wviDdlo5kCGT0ZUt/IJQ13rTzUWe9y7jz3ByCMiKzpGBJY uEXKx4J5GO4MUoQXocTEGidWF7frG37zFmLqBRtPuqY72P0KDiTo2aqgq8cn0GygzHhI/T 66Ku6Le9pVCtqUhP5cDmwd8ZFLnG4rU7G+6Z3HUBA+k7hooWtExLMiemkK4vpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRvBm6LmtzGS7; Sat, 3 Feb 2024 13:49: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 413DnKpb039723; Sat, 3 Feb 2024 13:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DnKNm039720; Sat, 3 Feb 2024 13:49:20 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:49:20 GMT Message-Id: <202402031349.413DnKNm039720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e1d31d0685f0 - main - iwlwifi: adjust to make d3.c compile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1d31d0685f0b430f385023b7de49f47be6c7de0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e1d31d0685f0b430f385023b7de49f47be6c7de0 commit e1d31d0685f0b430f385023b7de49f47be6c7de0 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:23:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:47:34 +0000 iwlwifi: adjust to make d3.c compile struct iwl_mvm_wep_key_cmd ends in a variable sized array but later is included in another struct followed by the actual struct iwl_mvm_wep_key in d3.c. Make the array[0] instead of [] to avoid the warning about it being a GNU-extension. Also include string.h explicitly for memset_after(). MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 --- sys/contrib/dev/iwlwifi/fw/api/sta.h | 4 ++++ sys/contrib/dev/iwlwifi/mvm/d3.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/fw/api/sta.h b/sys/contrib/dev/iwlwifi/fw/api/sta.h index d62fed543276..18f9470db301 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/sta.h +++ b/sys/contrib/dev/iwlwifi/fw/api/sta.h @@ -477,7 +477,11 @@ struct iwl_mvm_wep_key_cmd { u8 decryption_type; u8 flags; u8 reserved; +#if defined(__linux__) struct iwl_mvm_wep_key wep_key[]; +#elif defined(__FreeBSD__) + struct iwl_mvm_wep_key wep_key[0]; +#endif } __packed; /* SEC_CURR_WEP_KEY_CMD_API_S_VER_2 */ /** diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c index f6488b4bbe68..17d74a771d13 100644 --- a/sys/contrib/dev/iwlwifi/mvm/d3.c +++ b/sys/contrib/dev/iwlwifi/mvm/d3.c @@ -7,6 +7,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include From nobody Sat Feb 3 13:49:21 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRvBp1LTpz59Qp0; Sat, 3 Feb 2024 13:49: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 4TRvBp0p3Yz43V1; Sat, 3 Feb 2024 13:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+nANbSKfomf1pjYRy3vFxOURI6e5FBq1cKlW1gWlFs=; b=Mg9Wr16vOe2f6J/kDvlBmX7U4d1JlBPQxPABrz9ND1PX6TSv6rfJ1XMExbVNTbUAN1Csjd V7tDrwcgFJqyNxl4rzVjpyhMlAS21e6by+u897Afhnl3rzVDFYC7847at2+6ZkJZvXGqnx t3+pW0W+fAwoOINDNgKqOKEKZ5yDcr8gOOE0+w4H0c7WKpW2up9SzF2x1hUfGs7CFLQtYa U+JXnf81/LfcJP8HnqaINVKZtYftZu6Gslv3K4gGxIsU9XFdJ4JJfCGcHuYCjew3B68ttz rc2RQVJcUDtkmNE5nuv6kkyMpA6pSRzdeKUSNQKHcCKrSBhv5jt7ZKErd1hfGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u+nANbSKfomf1pjYRy3vFxOURI6e5FBq1cKlW1gWlFs=; b=ur5LiFvlApgLscQVMlkKBh2bZZA0IRpyFMt874AzT9de2TchxBr7RDRewmie/s8qT95Eek 4Yw8M1yg5abaUETevB8tCJY0s0OSHmXPiRkXYJfLYJcFr5foyWcodf00uAieunY6Rjbj5p PKIMmc5SB56dHUdV5EUWxn3SONSVNMWrYohMyj3bQjDs0a6kqTj1rPAENnoEhaAV/kQqDs 3Ccr7MK6RaBzklKIHnBiKv71ZaM9U9EzOeCndg9In1xUv+AO/QptYSdd9vKCICU+lQ8HlF joNKX8depHPMJBX9+Fd0LFS8BXBxC2AWd5HA9PIwExVAc3tmkheb6p8SbSQxjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968162; a=rsa-sha256; cv=none; b=XJfVYqVvQlEs/PCc9CrAhuKMdoun/am2BEsFPmDpQPE22YugpvhmofOY2z9EgKXnYK28Qv AQSA1lnJK6IjKQ36bvqczokVBiZYU6FXSd/jmkTuCnecCmqfYvFxtgoVQ5jxIPmW3rhGrO I63IdOpQmJ/LrhCliqikoC5E1JAVjDJyDkS0hi64Wz2UPjPZAbp7M0KlG+VNlBrPELFagx nSyDGqWZD/npqQ4sicFpd6caeeXM3edPKkOT5aBpCtA7DW/AbPJBig21ULgZuZvTLP1luS cFmWXsIpQ/IL8ExiD2COEEZL1Jvfkii13uxU15Fpt+Fec0FX4dtpAUGQg7xoJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRvBn6zW0zG9k; Sat, 3 Feb 2024 13:49: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 413DnLRB039783; Sat, 3 Feb 2024 13:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DnLGK039780; Sat, 3 Feb 2024 13:49:21 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:49:21 GMT Message-Id: <202402031349.413DnLGK039780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8f7c32a41a6a - main - iwlwifi: add the d3 (PM) bits to the Makefile (disabled) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f7c32a41a6a6d88e36ce2f588489274193c2c9a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7c32a41a6a6d88e36ce2f588489274193c2c9a commit 8f7c32a41a6a6d88e36ce2f588489274193c2c9a Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 12:51:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:48:27 +0000 iwlwifi: add the d3 (PM) bits to the Makefile (disabled) Add the logic to conditionally enable PM for iwlwifi. This should help suspend/resume in the future. For now leave it disabled until other preconditional problems are sorted. Sponsored by: The FreeBSD Foundation (2023) MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 --- sys/modules/iwlwifi/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 679490fdf774..256e08282ad7 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -3,6 +3,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} +WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 KMOD= if_iwlwifi @@ -36,6 +37,11 @@ SRCS+= fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS=${WITH_DEBUGFS} CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} .endif +.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 +SRCS+= mvm/d3.c +CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +CFLAGS+= -DCONFIG_PM_SLEEP=${WITH_CONFIG_PM} +.endif SRCS+= iwl-devtrace.c @@ -61,8 +67,6 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEBUG=1 CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1 #CFLAGS+= -DCONFIG_LOCKDEP=1 #CFLAGS+= -DCONFIG_NL80211_TESTMODE=1 -#CFLAGS+= -DCONFIG_PM=1 -#CFLAGS+= -DCONFIG_PM_SLEEP=1 #CFLAGS+= -DCONFIG_THERMAL=1 #CFLAGS+= -DCONFIG_EFI=1 From nobody Sat Feb 3 13:51:06 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRvDq1Nzlz59R05; Sat, 3 Feb 2024 13:51: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 4TRvDq0mFgz44PM; Sat, 3 Feb 2024 13:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwKRvYH/bZNBquin1Jmcqc1j3etlu5ZyyyD5jLty7M8=; b=i1nwDSIBh5ETvsv0hVHmIWZgVuZ0jnejgLasLIUtvskssI9AtVLJpzE7tcqEu0rKKH+jgf SlGjRme0aRG0sVFcRrBb6qcg5UGsCglxfzPrhkDuVQSPZl3ou4yYnhv9t+bKU8GQpvYRHR PIar4rAjpeUjsrFeojSG2UTxJWHTnUh1ysxtdOnQwrWtmzOdcVWxsQymZ8SDMFediRr84U K9TTpreg1DR6Vf43YxEtbDwMm/EUztBc/pfPyj9NPr/z+nLUzm4Lxr3BnUU/rbLPJ4nu80 GvaCBYBMVrx4FwEuIgn3G0Y0t6WCmRSClx7DqzSq4nUQm5V9gwk1A8ex9vTv2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SwKRvYH/bZNBquin1Jmcqc1j3etlu5ZyyyD5jLty7M8=; b=hQYZvqLz9WaBAhWmvOp4Rfp+xmvcfR9ND7OVYxTCK8aqms8xCI9/tl8UYmiPCBcm6wIrze ZO2oUYSioilS7nlGQFUwS7us9VQN++oVWZVIXb9wKsTcdYZWKOr9ezAFCBxyxIC2kynYkP EyjO6FxhqMAt6K3rAFi4ja7VbMWGMrWNfLfel3qnNPodlQxJMtVjb1YMYF8GxdVizvw9LK xIWHv7cEHCExnHetNMP4qq6HfbcshGUdXfUGitdnhZPDv5tLm2fT7hxRTfcg6U0jmlXNhj 332c/430i2Sj1xJvSKfBGcsQw3yOBz5ptFhrUkvzcN30TkfMk5a2BR52fBDZDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968267; a=rsa-sha256; cv=none; b=coS+8XOLQz/QMnAMomOhg5+gE95AVzzafyUi6hYYZaegZ7NiYoPpAvhZ2e6wuI9TQ7klJ9 7ThU5Fjtab8P0jnRGuj3BZIm77NA3qdJNVRwT6u6+w87jbmNqv6xdt9Yo+Kuun1egZQwQZ QctywQj9TLMe0+qQv6uAzZ2ya8GDs++S2CnhP0HdbJrRsncpwphxioX0nhmblLeSl+trjA ZAz1AyJBVKwnr5sVkuP6CXSj5olJnUnmetUon4xV0yGaImZCRozHK9D3QliHLsLg7nHa5+ d5IfJntjBV1xNtt8GNkwKglwAlLt3vIqTLkGhWf0GX3CgZW/GWziE8KZpv9o0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRvDp6sbqzGh5; Sat, 3 Feb 2024 13:51: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 413Dp6rJ048707; Sat, 3 Feb 2024 13:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413Dp6uh048704; Sat, 3 Feb 2024 13:51:06 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:51:06 GMT Message-Id: <202402031351.413Dp6uh048704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2d9d35837d8e - main - LinuxKPI: implement memset_after() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d9d35837d8ea3ee7d7447d63a8755d45ec2fd96 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2d9d35837d8ea3ee7d7447d63a8755d45ec2fd96 commit 2d9d35837d8ea3ee7d7447d63a8755d45ec2fd96 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:19:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:50:32 +0000 LinuxKPI: implement memset_after() memset_after() is needed by iwlwifi d3.c. MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43644 --- sys/compat/linuxkpi/common/include/linux/string.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index 1d9b7af5d9d5..f745c2f6d343 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -265,4 +265,12 @@ memcpy_and_pad(void *dst, size_t dstlen, const void *src, size_t len, int ch) memset(_ptr + _o, _c, sizeof(*(ptr)) - _o); \ }) +#define memset_after(ptr, bytepat, smember) \ +({ \ + uint8_t *_ptr = (uint8_t *)(ptr); \ + int _c = (int)(bytepat); \ + size_t _o = offsetofend(typeof(*(ptr)), smember); \ + memset(_ptr + _o, _c, sizeof(*(ptr)) - _o); \ +}) + #endif /* _LINUXKPI_LINUX_STRING_H_ */ From nobody Sat Feb 3 13:54:00 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRvJ91CQlz59R1K; Sat, 3 Feb 2024 13:54: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 4TRvJ86lNjz452x; Sat, 3 Feb 2024 13:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968440; h=from:from:reply-to:subject:subject: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/WMzj9QfR7mwdnIyuFAh/ltCs0gHBmxAg7UKCv8g4Q=; b=fXxBBmOFv5L7oN7MXYp+7GfHTqSsG+oplpQZQK+V46wj4lG9FozZxXB6cxqe9xfh67T+tZ a2IloXVsaj9AznuU7s7e5RiLyh3os+/SrSb8T6/Q81VS7zDq9X9T6VsZYaGVju3Po5ei9x dFYEP2Ib7bnAOhlqoBsRQRXVXjXgGVPYXuI+C9cYcxUnrsp4IV2TYnsz1H4OmKH+JW8yXT BsxwmQrb0TpM7t5y2umQWDiSc5CajBuxW14wxT8RGe5K22ci7JT7bShem3bvQs07z1hirJ 7dDvaZIhYSjomNbqSeO11uOSBL/kO8DD8TYg5ETTO4NETqfe+L865GdGYStWgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968440; h=from:from:reply-to:subject:subject: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/WMzj9QfR7mwdnIyuFAh/ltCs0gHBmxAg7UKCv8g4Q=; b=XfHm5NuVXVDZ002kQjb6zID27IYeJEt739XpfRqKEfpC29E+FNdzss9PgEMFHOwprnssNr E057PI78unBgNg4QA+eaiUlnjpsuU9Kwz6FqDJFcMNOa8CKix3Bh0UJAAQhK7VLzxFsZjV cdtXSM+ra2h6BFYyjBKpi+p4Ypa9QcrO2ODcHoyVguR5S3MZfsTjtYNmfooHhsg25B9XjR fEeVoMZmE1tus25rRKt5G/Or1qqNNNsahuXQZsvH3SC6SZx9EpptoYoFBFHYeu1r+/DAEr ii6CpgwRUb1q2PFQH8MQ3uVJriuCpjBBiJG+eRwLCUlJ5blNMKyCgPqZvyKH5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968440; a=rsa-sha256; cv=none; b=LP86HPdrEwLK5zwUskrIT4FWdeLl+enT3sTrNUlilcgdCZIHId/5xsvWmXrX9EIbL/GGoq LgOb80d2ZPpbqAo3z45WpZzZjezioUE4gc5QOPOzBXkpFtnSiPjFj9yLC4mnS76QaePEH6 2jHJ6jBPgLmDvT0UBkMglbCo5XVCmxy1pSsbjg47FsiliWdmqWC7u76oyMIL0tPbas/PDl CnHHNBVIhmY1tBAFdi64qpt8qTGYpoHNDT/qMoKD6Jh5GFemmm8HB5TPCtJyItlcJA/1u5 OlIk/gmSwSLf8SStWgWnZ3yJhgfGcL/trdXcNlLW7cdHYJ4RnEjJJIXOqtLogA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRvJ85nVpzGl7; Sat, 3 Feb 2024 13:54: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 413Ds03x055936; Sat, 3 Feb 2024 13:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413Ds0Ak055934; Sat, 3 Feb 2024 13:54:00 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:54:00 GMT Message-Id: <202402031354.413Ds0Ak055934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 8a5a3e3d0436 - main - net80211: fix a NULL deref in ieee80211_sta_join1() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a5a3e3d0436a2de9dc5c2c10bd9a471b6338233 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8a5a3e3d0436a2de9dc5c2c10bd9a471b6338233 commit 8a5a3e3d0436a2de9dc5c2c10bd9a471b6338233 Author: Bjoern A. Zeeb AuthorDate: 2024-01-16 18:53:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:52:33 +0000 net80211: fix a NULL deref in ieee80211_sta_join1() When ieee80211_sta_join1() gets an obss without ni_nt trying to lock that will cause a NULL pointer deref. Check for the table to be valid and deal with the obss node accordingly. This can happen if sta_newstate() calls ieee80211_reset_bss() for nstate == INIT and ostate != INIT. ieee80211_reset_bss() itself calls ieee80211_node_table_reset() which calls node_reclaim() which ends up in ieee80211_del_node_nt() which does remove the node from the table and sets ni_table to NULL. That node (former iv_bss) can then be returned as obss in the (*iv_update_bss)() call in join1(). MFC after: 3 days Reviewed by: adrian, cc Differential Revision: https://reviews.freebsd.org/D43469 --- sys/net80211/ieee80211_node.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 123da34ad3f1..f6bb4245f543 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -867,11 +867,14 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) struct ieee80211_node_table *nt = obss->ni_table; copy_bss(selbs, obss); - ieee80211_node_decref(obss); /* iv_bss reference */ - - IEEE80211_NODE_LOCK(nt); - node_reclaim(nt, obss); /* station table reference */ - IEEE80211_NODE_UNLOCK(nt); + if (nt != NULL) { + ieee80211_node_decref(obss); /* iv_bss reference */ + IEEE80211_NODE_LOCK(nt); + node_reclaim(nt, obss); /* station table reference */ + IEEE80211_NODE_UNLOCK(nt); + } else { + ieee80211_free_node(obss); /* iv_bss reference */ + } obss = NULL; /* NB: guard against later use */ } From nobody Sat Feb 3 13:56:22 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRvLv1nbMz59RQT; Sat, 3 Feb 2024 13:56: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 4TRvLv1HbWz45J5; Sat, 3 Feb 2024 13:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPvP1qG5Pq31wH3ETdREf0u5+pf3KkJSGXEEoQj/It0=; b=sWpcA0faK0DIPdYL0bPLKaqRMxftGYYw7c+m6SkVbe4nzzUv089iBlGnTBhvFyNKDSHNQj YruqdNMPRGOG/Ugjq9hVpcw035B6sPCBoV6U9Z1opJnbrVWEJKaee8P8h0mfKvKrT9Go3R jOe/H/lv4aEa5Et9kPaWPPaRNJafCcQT4p8pOyNRYpAFzndZSDCVDpGjiiW87dn7ETyNIQ WkJPTma2Ri39leIiy610dZnYNYPGLau/KE0I5Jt1luTlet6WhEUvLA0sPvfh6gPPE/O85H 3IfvUkbtqMxn+4SO57B/jvNU35Nnt1KGFXhkRtBiPxULSdsORo3h0SQDBhhqUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPvP1qG5Pq31wH3ETdREf0u5+pf3KkJSGXEEoQj/It0=; b=IDtJP7hMd7f5Tc0C9oeohX+Q+izXFbfmzYwgz239WjGy8UqprhjDDew9ox/ngjJ0dKkz3l b/fudz6D9wf2gFsnHWZl5vmlygrF5fLGIapFkz0GchQDYvds8gSmVdIQTPvHp+DOY0vYxk ZjwbKUHHcr+9cH00LbZu22Y5LKkflAaJWFSYneBDbPM+EkmEDGRbSmddRBg0SpUXG1FIhG P/a8hWxpIt+TQc9wXrxyHX8TjxJh0wcsxm/ix2pNKcQ6PPIUb2T0r3PttxEUZU0wRX+/8R qvG5cyo89GK0KDYFMM+E0KWuo4YjmxydgZ4PLuYjt70r25Qy2LTBPfMuFAb0jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968583; a=rsa-sha256; cv=none; b=oTZt63kkAZFzB5LubExmWuTOHrgEJAWGLjW+HOG+j5u/qpyUwa0aNq3vUdmVNpNSVuG7Zq q2zn91NQUFkIl1zMGRkMqGSZICh237oR7/yvX1M01MQNfTweKuAM0yHih2EU/LHQJ7bqql Sa1MA+11EzG+qA+Q//AQsVyTz70KeOfKjxaK7t09L+7uW652ReJBhd1hMbf50VN0mpQLZj JUXmuhQvjin3pamJH4VmQF6eIU8kmpY7A1S3GVq7RnSEaiDYxgJFqYi1HDGCFbsnjwMHXt 3Bzmd3juwXKRVHSUPtXAwXCJ6amobxoZ1O1FRvT6p9NWtyTcL/cc5nJMGf1sYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TRvLv0MDMzGWl; Sat, 3 Feb 2024 13:56: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 413DuM4l056392; Sat, 3 Feb 2024 13:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DuMJk056390; Sat, 3 Feb 2024 13:56:22 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:56:22 GMT Message-Id: <202402031356.413DuMJk056390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 49619f73151a - main - net80211: make sure calls to (*iv_update_bss)() are locked List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49619f73151aeaca4cef5adf631253da04a46e19 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=49619f73151aeaca4cef5adf631253da04a46e19 commit 49619f73151aeaca4cef5adf631253da04a46e19 Author: Bjoern A. Zeeb AuthorDate: 2024-01-19 14:52:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:55:29 +0000 net80211: make sure calls to (*iv_update_bss)() are locked It turned out thare various calls into (*iv_update_bss)(), that is direct changes to vap->iv_bss in the old days, happened without synchronisation. Use locking assertions to document the requirement or status quo at some callers given ic locking will eventually have to be dealt with. MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43512 --- sys/net80211/ieee80211_node.c | 15 +++++++++++++++ sys/net80211/ieee80211_proto.c | 2 ++ 2 files changed, 17 insertions(+) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index f6bb4245f543..8f8dc5f378b8 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -171,6 +171,10 @@ ieee80211_node_vattach(struct ieee80211vap *vap) void ieee80211_node_latevattach(struct ieee80211vap *vap) { + + /* XXX should ieee80211_vap_attach(), our only caller hold the lock? */ + IEEE80211_UNLOCK_ASSERT(vap->iv_ic); + if (vap->iv_opmode == IEEE80211_M_HOSTAP) { /* XXX should we allow max aid to be zero? */ if (vap->iv_max_aid < IEEE80211_AID_MIN) { @@ -191,7 +195,9 @@ ieee80211_node_latevattach(struct ieee80211vap *vap) } } + IEEE80211_LOCK(vap->iv_ic); ieee80211_reset_bss(vap); + IEEE80211_UNLOCK(vap->iv_ic); vap->iv_auth = ieee80211_authenticator_get(vap->iv_bss->ni_authmode); } @@ -201,11 +207,16 @@ ieee80211_node_vdetach(struct ieee80211vap *vap) { struct ieee80211com *ic = vap->iv_ic; + /* XXX should ieee80211_vap_detach(), our only caller hold the lock? */ + IEEE80211_UNLOCK_ASSERT(vap->iv_ic); + ieee80211_node_table_reset(&ic->ic_sta, vap); + IEEE80211_LOCK(ic); if (vap->iv_bss != NULL) { ieee80211_free_node(vap->iv_bss); vap->iv_update_bss(vap, NULL); } + IEEE80211_UNLOCK(ic); if (vap->iv_aid_bitmap != NULL) { IEEE80211_FREE(vap->iv_aid_bitmap, M_80211_NODE); vap->iv_aid_bitmap = NULL; @@ -455,6 +466,8 @@ ieee80211_reset_bss(struct ieee80211vap *vap) struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni, *obss; + IEEE80211_LOCK_ASSERT(ic); + ieee80211_node_table_reset(&ic->ic_sta, vap); /* XXX multi-bss: wrong */ ieee80211_vap_reset_erp(vap); @@ -854,7 +867,9 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) /* * Committed to selbs, setup state. */ + IEEE80211_LOCK(ic); /* XXX may recurse here, check callers. */ obss = vap->iv_update_bss(vap, selbs); /* NB: caller assumed to bump refcnt */ + IEEE80211_UNLOCK(ic); /* * Check if old+new node have the same address in which * case we can reassociate when operating in sta mode. diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index a3a2e6a5d027..c0f24344a982 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -826,6 +826,8 @@ vap_update_bss(struct ieee80211vap *vap, struct ieee80211_node *ni) { struct ieee80211_node *obss; + IEEE80211_LOCK_ASSERT(vap->iv_ic); + obss = vap->iv_bss; vap->iv_bss = ni; From nobody Sat Feb 3 15:59:46 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRy5T5q40z59d7q for ; Sat, 3 Feb 2024 15:59:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRy5S5wV8z4LZn for ; Sat, 3 Feb 2024 15:59:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-55fb4b22da8so3354842a12.2 for ; Sat, 03 Feb 2024 07:59:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706975995; x=1707580795; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=IDm8kgMJP5K+07fGbCkSfU64OY7vUMi4U6UBLXWrUFM=; b=k+9xfV7F7cTEsY7Nl9tgqr6q6OHsuq1H7SJJJA7zZdhZOe0oOYUKK4qA2Boi1XYS1M G36h9U4PLJX1M3beELIsOMo3BnTB6cBNuKvXAuIvXQA6SZbugPAz5DSP9IV8DZIjQc2i IcpkkrPqhrBNt+FgtpoXI0kfv63AkOmmOocCuJTdqoeAqJOnN/y+XCVHHjSJyhlSOM2h EDFS0ce+bdOWZcaZlGXa8rRcshSuW+rS3EQOl5VVrqG6SWCL6l+xF3pKB2nQxzORxr2X Dvs4NNmkchUhqDzysowB3od/FzY/0AN+tNbwlK0qSKmIKglD6qw1RpDIsAShOt1Fd7Ue qTXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706975995; x=1707580795; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IDm8kgMJP5K+07fGbCkSfU64OY7vUMi4U6UBLXWrUFM=; b=vAcSCMd1NprNoXZy4DSiZYTjhtplhOHuU1YN+RK07MdL9QtkAnOJ0wUmBbXBQQkBVr DT4ygCXefdSkq0+FJyif+ypGbIMwYxZROsJW2adrgoRWrkf1HF0HfNyu9MdXAqrOHI6U MwIBjnvfdYmqRxSAX/UCuAowC171UmsjjXw46MXskTqSCYKc9wXJ8C1zFzKGhCM4430O dtwR7PPuKBMncBhF6uUFBnRpZ6uq+B0xO/CrM20o5VQdlog3kDKW+dU+qSU+XuKxmOcC 0AA7KYDYKK06DL7S9fJYjqtraCvK8+Sv0kHrh6YCMM/cOtOcAe3aJtE3t8ZLSUFKpCWT KREQ== X-Forwarded-Encrypted: i=0; AJvYcCWQI1Rm1MbHK7dQKVWhDlS573SRqdfUY387Ypsv7noFOHhyRQW+6dbWA9+jOhPtl34FOgH14hEDsMZuyPLJT+91DzUJI4sKofzoThaBQ7qGjQ== X-Gm-Message-State: AOJu0YzFqnC0s0H4WrcG5GTtjRTx3sUZZg01tCRtGuLsHEGo5/tg61PJ ShMOPMfidHqArQ73yhBthtSylM2XHSBc4NNL8RdTRdBtCc2/K1sjMqgWAPuBBgunwJ0V+V72OM9 LW3ZSaZE8zJwYuUkXWcsvgs198rtt83hV8AUYrQ== X-Google-Smtp-Source: AGHT+IFl04e6lv3s+hOL/4dTMeLPuHrWjg7g3yZYN48pCs5jadB9iB05AT9mA8S/ktJxHFTaNl+f2fIHGpJ9oy5f9J8= X-Received: by 2002:aa7:d6cc:0:b0:55f:fb25:47d9 with SMTP id x12-20020aa7d6cc000000b0055ffb2547d9mr1907134edr.8.1706975994657; Sat, 03 Feb 2024 07:59:54 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> In-Reply-To: <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> From: Warner Losh Date: Sat, 3 Feb 2024 08:59:46 -0700 Message-ID: Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL To: "Bjoern A. Zeeb" Cc: Gleb Smirnoff , =?UTF-8?Q?Mina_Gali=C4=87?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, "freebsd-arch@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000cd4fa806107c5182" X-Rspamd-Queue-Id: 4TRy5S5wV8z4LZn 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:15169, ipnet:2a00:1450::/32, country:US] --000000000000cd4fa806107c5182 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable [[ moved this to arch@ ]] On Sat, Feb 3, 2024 at 6:44=E2=80=AFAM Bjoern A. Zeeb wrot= e: > On Fri, 2 Feb 2024, Gleb Smirnoff wrote: > > To be fair, it totally disagree with this change. > > For different reasons I second that. > VIMAGE definitively does not belong in MINMAL for comfort. > I too had reservations about this change when it was submitted. Allow me to explain my reasoning. Years ago I did a study on the Unix kernel size over time. It was doubling every 3 years or so going back to 1970. I'll skip all the details, but this was an unsustainable trend. So I embarked on the project to reduce GENERIC to its core parts, and load the rest. This idea dated back to when I committed devd to the tree, though it was almost an afterthought with the nomatch events there. I wrote devmatch and decorated all the PNP tables in the tree (with much help) so that we could load all the drivers on demand automatically. As part of this work I created the MINIMAL kernel. A name I now regret, but the theory of the kernel was "everything you need to boot, but everything else will be dynamically loaded". There are (still?) some things in it that could be loaded, like serial drivers, because we can't (couldn't? I haven't rechecked in years) have the console be in a kld, it had to be in the base kernel. ufs was in this list for a while, but it moved to a module and removed from MINIMAL some time ago. Manu even did some good work in the boot loader to parse the linker.hints file so that fdt drivers could be loaded there (we still need PCI and ACPI). But common root filesystem devices were retained. So this kernel has always had the charter of the GENERIC minus everything you could load after mountroot early in boot, with an eye towards pushing more out when the boot loader grew better pci support and could automatically load cam.ko. In time, I'd hoped the default kernel would become MINIMAL and nobody (or almost nobody) would notice. So when this pull request came in, my initial reaction was 'yuck, why do you need it?' I too thought it was too much for MINIMAL. However, VIMAGE falls under the 'can't load it later' exception. And it's not exactly a trivial piece of infrastructure that we can just ignore. It provides useful functionality when paired with jails. It was also in GENERIC. These reasons coupled together let the idea grow on me. It ticked all my boxes: Can it be loaded? no. Is it widely used? yes. Will I need it if I wanted to make MINIMAL the new GENERIC? yes. Based on that, I approved and committed the pull request. It was well within the remit of MINIMAL based on the historic creation and change criteria I've tried to apply to it. Now, I totally get the desire to have a minimal kernel that doesn't have any baggage in it. I totally support that notion. Maybe we need another kernel in the tree to do that. Maybe it should be called MINIMAL since that 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 name that connotes the same things that MINIMAL seems to inspire in people (since the name evokes notions not quite compatible with my original charter for it). I have nothing on good names, though. All the ones I thought of have other issues, though maybe staking out a charter for what's in this config (the absolute smallest that will boot? Or are there a few additional things that are needed). One problem, as noted on irc, is that we need to have slightly better partitioning of the config files, so that we have a MI std.generic and std.minimal that the MD versions of these kernels can pull in and flavor. That's possible, with effort, with config(8). But it isn't super pleasant. I think, as a separate project, we should consider modernizing the config language to properly account for the subtle differences between 'requires' and 'depends-on'. The former concept is 'bring in this dependency when this item is included' (we don't have this) vs the latter 'don't include this item if the dependency is absent (we have this). But that's a whole other discussion that's happened a few times, but never produced any useful results. Having better tools here might be helpful, but it's the new sysinstall in many ways. I also love the idea of having a few more kernels that test unusual combinations. That's also a good goal. But MINIMAL's charter isn't to fulfill that goal. How we balance that with increased 'universe' times is also something that requires some careful thought. We've just recently managed to get the number of 32-bit arm kernels under control by making a generic there and also marking some kernels as not to be built in universe (they are for the convenience of our users, not for CI driven testing). Warner --000000000000cd4fa806107c5182 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

[[ moved this to arch@ ]]
On Sat,= Feb 3, 2024 at 6:44=E2=80=AFAM Bjoern A. Zeeb <bz@freebsd.org> wrote:
On Fri, 2 Feb 2024, Gleb Smirnoff wrote:
> To be fair, it totally disagree with this change.

For different reasons I second that.
VIMAGE definitively does not belong in MINMAL for comfort.
=

I too had reservations about this change when it was su= bmitted. Allow me to explain my reasoning.

Years a= go I did a study on the Unix kernel size over time. It was doubling every 3= years or so going back to 1970. I'll skip all the details, but this wa= s an unsustainable trend.

So I embarked on the pro= ject to reduce GENERIC to its core parts, and load the rest. This idea date= d back to when I committed devd to the tree, though it was almost an aftert= hought with the nomatch events there. I wrote devmatch and decorated all th= e PNP tables in the tree (with much help) so that we could load all the dri= vers on demand automatically. As part of this work I created the MINIMAL ke= rnel. A name I now regret, but the theory of the kernel was "everythin= g you need to boot, but everything else will be dynamically loaded". T= here are (still?) some things in it that could be loaded, like serial drive= rs, because we can't (couldn't? I haven't rechecked in years) h= ave the console be=C2=A0 in a kld, it had to be in the base kernel. ufs was= in this list for a while, but it moved to a module and removed from MINIMA= L some time ago. Manu even did some good work in the boot loader to parse t= he linker.hints file so that fdt drivers could be loaded there (we still ne= ed PCI and ACPI). But common root filesystem devices were retained. So this= kernel has always had the charter of the GENERIC minus everything you coul= d load after mountroot early in boot, with an eye towards pushing more out = when the boot loader grew better pci support and could automatically load c= am.ko. In time, I'd hoped the default kernel would become MINIMAL and n= obody (or almost nobody) would notice.

So when= this pull request came in, my initial reaction was 'yuck, why do you n= eed it?' I too thought it was too much for MINIMAL. However, VIMAGE fal= ls under the 'can't load it later' exception. And it's not = exactly a trivial piece of infrastructure that we can just ignore. It provi= des useful functionality when paired with jails. It was also in GENERIC. Th= ese reasons coupled together let the idea grow on me. It ticked all my boxe= s: Can it be loaded? no. Is it widely used? yes. Will I need it if I wanted= to make MINIMAL the new GENERIC? yes. Based on that, I approved and commit= ted the pull request. It was well within the remit of MINIMAL based on the = historic creation and change criteria I've tried to apply to it.
<= div>
Now, I totally get the desire to have a minimal kernel t= hat doesn't have any baggage in it. I totally support that notion. Mayb= e we need another kernel in the tree to do that. Maybe it should be called = MINIMAL since that name makes sense and one of two renamings happen: Either= we rename GENERIC to GENERIC-STATIC and MINIMAL to GENERIC, or we rename M= INIMAL to MODULAR and have it (eventually) become the new default. Or we ne= ed to create a new name that connotes the same things that MINIMAL seems to= inspire in people (since the name evokes notions not quite compatible with= my original charter for it). I have nothing on good names, though. All the= ones I thought of have other issues, though maybe staking out a charter fo= r what's in this config (the absolute smallest that will boot? Or are t= here a few additional things that are needed).

One problem, as noted on irc, is that we need to have slightly better part= itioning of the config files, so that we have a MI std.generic and std.mini= mal that the MD versions of these kernels can pull in and flavor. That'= s possible, with effort, with config(8). But it isn't super pleasant. I= think, as a separate project, we should consider modernizing the config la= nguage to properly account for the subtle differences between 'requires= ' and 'depends-on'. The former concept is 'bring in this de= pendency when this item is included' (we don't have this) vs the la= tter 'don't include this item if the dependency is absent (we have = this). But that's a whole other discussion that's happened a few ti= mes, but never produced any useful results. Having better tools here might = be helpful, but it's the new sysinstall in many ways.
I also love the idea of having a few more kernels that test unu= sual combinations. That's also a good goal. But MINIMAL's charter i= sn't to fulfill that goal. How we balance that with increased 'univ= erse' times is also something that requires some careful thought. We= 9;ve just recently managed to get the number of 32-bit arm kernels under co= ntrol by making a generic there and also marking some kernels as not to be = built in universe (they are for the convenience of our users, not for CI dr= iven testing).

Warner
--000000000000cd4fa806107c5182-- From nobody Sat Feb 3 17:35:18 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS0Cm5Qscz59mdt for ; Sat, 3 Feb 2024 17:35:32 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TS0Cm37f7z4dqv for ; Sat, 3 Feb 2024 17:35:32 +0000 (UTC) (envelope-from bakul@iitbombay.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1d51ba18e1bso28789935ad.0 for ; Sat, 03 Feb 2024 09:35:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20230601.gappssmtp.com; s=20230601; t=1706981730; x=1707586530; darn=freebsd.org; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=8LoWfGnikkMdtmqOLEXyw5/SwW8pFdXjL24iXIWjq2E=; b=kAS0K24qqo/fmNTqGgfY/vMigKGUijLvilqw6skXTIMhN47KbNEEoIIe33/ePE9UbE iijZSTSFZ51Ow2ONxvvwQD7qFH8K1+91pA9gmJiZu3pbZOI5hPrK8th8PEEAE/ygmCVI YOok17UFrZNfWddrAypPFsASf+AbPVSau+oBua+BtIXmjaPO4oo3n70EvM6OX2QprNKV Rz4u/5tPKp8G3R9oyw8t7to9tJdLwzp4xGftItIdkZyTqf8IOmFI/Lwj8RTX6Rc2hqWC imTHQD/DuPhq0UqtSPJdGWBNMrbK16u4+/AzcHinptHNV2te75eH/IrziSkUfqSRgvoh mHRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706981730; x=1707586530; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8LoWfGnikkMdtmqOLEXyw5/SwW8pFdXjL24iXIWjq2E=; b=MvDIPvZdUpU07M8iHh1RU72DWpxpWvfFKFu9fPhMEcCqHS6MjKLceN8IL3mHlbtOfF Mjyv0ac4lrzi91y5rQAiSCbd6TFyrP2nGfowyXQSS5cNHSJEg/dRLeiCHChOAQd60Zra d1VmpcdMo2dI2u7iDtqeF/UOYKu9vpdi2MStcMxAp46g9t+BYMLOhcH9CNoVK2zYXgjN AxMwV562gUCRIX/SPZtUFNP3oc+ZWnOLtDZT0xEDAydHcyzAqqpB3DBbQxlVwlcaO9J5 dLGAqW+ssUM76RCuwlCnUMFrWTZYPKp4/7fygQH3T56iPL2MgW9X3UwliHqCvLPJWSo9 lRtQ== X-Gm-Message-State: AOJu0YxO8wvCFw6FTAEXxaq+LaJGdxz9NbjhsHmadGF+J+o/mespwWFs 28RehMaf5ZWhjhxG/1LtymvaydT9jCjd7N/BpgvQEjCLA6G4YWavDKIKbSzOW3+/WB2KgT0ougM = X-Google-Smtp-Source: AGHT+IFuvimh8QO2IULNGzdaORyx4EfGkxd0g/L6XGBKCtwnH9dznrtZnWKsqcqUcbQ2vET88c75ZA== X-Received: by 2002:a17:902:db11:b0:1d7:8541:f914 with SMTP id m17-20020a170902db1100b001d78541f914mr7679102plx.26.1706981730410; Sat, 03 Feb 2024 09:35:30 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVtjwFElQZTt3G4SvjhHciHxjRoaNrpDFhE09I/dBNx0iZlBt9x6zSR5OsOMXTS4XVWNfokFdxgXBaVEL9Nd5tLS6/B2H6UeGwhCtPHCUQzS++DlNWuouGqGJfp2v9y28wktK9IDI4aKLjpsV8SUBJ7EpEIx1b2vh4KvwyDi5UsaMEVjOuTz+Z8dLyl3EOwKx4WeUSWGaXz56HYvnaCmKFOv6Tu90frFTu7DNHGLqNcxSb9lM63PEE5cW/xFuVKSSKW7N39EYCtGNTexrxbwTjagaN+cV1ToqKfb1DmKpwZVQ== Received: from smtpclient.apple (107-215-223-229.lightspeed.sntcca.sbcglobal.net. [107.215.223.229]) by smtp.gmail.com with ESMTPSA id kk3-20020a170903070300b001d7492d9890sm3489922plb.146.2024.02.03.09.35.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Feb 2024 09:35:29 -0800 (PST) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable From: Bakul Shah List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL Date: Sat, 3 Feb 2024 09:35:18 -0800 Message-Id: <78927545-B1BB-42B5-8EF4-B904E7D180CD@iitbombay.org> References: Cc: "Bjoern A. Zeeb" , Gleb Smirnoff , =?utf-8?Q?Mina_Gali=C4=87?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, freebsd-arch@freebsd.org In-Reply-To: To: Warner Losh X-Mailer: iPad Mail (20H307) X-Rspamd-Queue-Id: 4TS0Cm37f7z4dqv 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:15169, ipnet:2607:f8b0::/32, country:US] > On Feb 3, 2024, at 8:00 AM, Warner Losh wrote: >=20 > Now, I totally get the desire to have a minimal kernel that doesn't have a= ny baggage in it. I totally support that notion. Maybe we need another kerne= l in the tree to do that. Maybe it should be called MINIMAL since that name m= akes sense and one of two renamings happen: Either we rename GENERIC to GENE= RIC-STATIC and MINIMAL to GENERIC, or we rename MINIMAL to MODULAR and have i= t (eventually) become the new default. Suggestion for a new name: BASE, on which further modules may be added.= From nobody Sat Feb 3 17:58:49 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS0kj3BMsz585LQ; Sat, 3 Feb 2024 17:58:53 +0000 (UTC) (envelope-from glebius@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 4TS0kj2f1Yz4hK2; Sat, 3 Feb 2024 17:58:53 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706983133; 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=MhHQfEBekOsatIVJQaLOZYMv5dw+CEZVj8oaUXwf37s=; b=PRUoMSxMy8mT8iDFrj51XoGDbaj/B8Y3avG6KCrE0E1PMaqFHz9IVloXJIFLhQR+YysiXG iQDU1XKXwFqiIPK3NkNrMbYcwVsukfT+JAJFyqqDLBIcptBcUrCziWqIfQYIw0QGkfOBTW ieLLnk50zEOsxLlvaJlDhtcughPumC5FbftE3L45s+GFj6Av2SwL7Tk1ltYQOstLd9wN2T 97zLp0jeN1oC37Oq6h3R4d7/U7ttDPOE+xLBsa4RdnkZ7+Y+2VcwFzw4GCleHSVpj/MsPz vInbaPZLi/2EiwdXpNIWsvqbfxSVlWDWdKezY8hgUUAOq11D40MrOvInY8mxBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706983133; 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=MhHQfEBekOsatIVJQaLOZYMv5dw+CEZVj8oaUXwf37s=; b=MnNSt0EBjcRvq9I4aiz8Rx2xC2ks7DTv48O5sJ+R9SfRIf4XjDtSOIlG8ZUAh2R6iecurF YJFxZN8G2NIT7xWSphPu4zpL17EMaZ5ekIdsy+1SWZXUryYmM21grZZ5wnQ7hGNvvZv7bO VwH5jg0Z9xne9qUyyAeN4EbLsUyWr1sir3UkMd8pM2mkVIBzmAdstrcvd6C11gV81Ay44s +vmEmmI9FaI+peT3dB6kEGENxTt/9Rrh7RbylrXT3zGBKippDdVsgID++QLo38brKV3ACB VtQPEv5AVSOleslxCJ88o/ky50BWDZ4VcQFkn1Y8rS9MVTEj6opKZbKGdAv0kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706983133; a=rsa-sha256; cv=none; b=l+kVDYIAfnDQ0csEqgrwpu7d1hQEHbBxbJW4g3o90DWpil5BvtZsrd9DKsifKFQCmvrD9C 7OXJRddgxgtNEtxX8pGEFMLLhtTn4q2N/lRbOwzqggiwdXm4lBrF4EgkQstBidW8Mlp+VZ qAUmHrOB2jTwF13HuQYTI9ma473NT0u/h/WT5XcZ7wc8NRmd8d4GvSMlgLtyeGE+oPnz6E 2W04Eh94OFAKHVqtfolhkOJVpNb5AjKHgwA2+6BfRWVacbJAPDBAW+9LVRkinLOI2OLHjh GgU7RwwEyKA8nd1cqm43/tFG5SdpNIbeGVIBecZA/XeKRP+4mIqVRIYlGqlFTA== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_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: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TS0kh1Htnz1NQT; Sat, 3 Feb 2024 17:58:52 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Sat, 3 Feb 2024 09:58:49 -0800 From: Gleb Smirnoff To: Warner Losh Cc: "Bjoern A. Zeeb" , Mina =?utf-8?B?R2FsacSH?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, "freebsd-arch@freebsd.org" Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL Message-ID: References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Sat, Feb 03, 2024 at 08:59:46AM -0700, Warner Losh wrote: W> Now, I totally get the desire to have a minimal kernel that doesn't have W> any baggage in it. I totally support that notion. Maybe we need another W> kernel in the tree to do that. Maybe it should be called MINIMAL since that W> name makes sense and one of two renamings happen: Either we rename GENERIC W> to GENERIC-STATIC and MINIMAL to GENERIC, or we rename MINIMAL to MODULAR W> and have it (eventually) become the new default. Or we need to create a new W> name that connotes the same things that MINIMAL seems to inspire in people W> (since the name evokes notions not quite compatible with my original W> charter for it). I have nothing on good names, though. All the ones I W> thought of have other issues, though maybe staking out a charter for what's W> in this config (the absolute smallest that will boot? Or are there a few W> additional things that are needed). I'd be happy with either plan: 1) GENERIC -> GENERIC-STATIC or STATIC, MINIMAL -> GENERIC, create new MINIMAL 2) MINIMAL -> MODULAR, create new MINIMAL We just need at least one supported working kernel without VIMAGE (and probably other useful stuff, that is not useful to everyone). -- Gleb Smirnoff From nobody Sat Feb 3 19:06:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS2FL4Zkkz58Ccd; Sat, 3 Feb 2024 19:07:02 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TS2FL2ZyBz3wpF; Sat, 3 Feb 2024 19:07:02 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987222; 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=xXuldtK0vUo7s87bny1EMn0QALh6iGT8dhhSy+LPex8=; b=ynT0fWDrVlVuk31yKUfZuFGsWygtL8n8+yR5N/aiHyhzwCH5MnBlz5Qh5NzEWfv1qSNfQt rYakg1HjZhz1dzTkjL8LV3lu6Jd/JngkdR+tB9DjZUNPvnuo/uscSnQvA3QYBcsNsLgmy9 9hJ/aQiipZ+cM8UgIrd9UtQju4NrQjhTQj579EQMla0lHYyfwD1LG0VLcTcLl8tGH0Dye0 YryrTGz63aDfldIEplm3DcXOJeH2Jb8aP83TDs2TdLgLNT+yxpdpDOOI2OfhqrAJ5bvmKs k78kE45tpGnw2fnQVpMPwj0yLOQhLYQLQ0xoRgjC3cZkpDNh4FbRzYs7sC7NEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987222; 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=xXuldtK0vUo7s87bny1EMn0QALh6iGT8dhhSy+LPex8=; b=YUfZOsBOw1KH8qqJ9k1iTzBQj8AYQr3zy08F0X3s+CBvwfjX6MeLhYGZ7JsL2+FRz4T9eA rYIoCURm8h+j4hq9rieEohID1LT7+6k3s7ErLDN5kuKDwZG1huqtEOuypxUhE1hZyH309F R5heSW6jKFKOQyp3MWJAZaiVHb4y/uuw9rVLoA60lz09vpQO0DHtUCsA3d9Y+Rxilix8PP Y5yomm56eX8PI05LXRe9zareYvgj/YvtPNeYqzg5jWX0jQTbplhgPocWuJcsztZQwy35tR NR8tys2s1KweMqsLD7R0Xidebf0gr5Q0VeYnCoq4uHmPEPwuWb1BpOCgw/PSeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706987222; a=rsa-sha256; cv=none; b=pPdS3CJTciUN/Rb/wA9viMxNqKUg8B21L0QP5CvL79WHJUlf+eUubnUiaucF/6ADjyTG8E N8MyoTyioeMSaMFspJTa/eRsnt+x+gKNhdFvPXoFb3Pc0Q4FYSPtJrw+z3f2UEouDuLIGu kE4S+OyXhZKO3V3GGHEYWxtMLjBJ2JV/MUT6to5aXuHLuPqN1wG9qr3L59lGw4vcrkUXoO Mx18j1798Ka23C3EMMk89QHfZ3Lp0haSeM9MviKHxI5QzRTZ2/Pk4N0Eu8QJM0uQfzTY8G P8sEHmXXHvghMq2JL4oY9bDASGyvywLtOlSAoZqgxvIaWarI+zKO94WI5EFCqQ== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TS2FL0rntz1RXF; Sat, 3 Feb 2024 19:07:02 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id CB8FA3A0EF; Sat, 3 Feb 2024 20:06:58 +0100 (CET) From: Kristof Provost To: Gleb Smirnoff Cc: Warner Losh , "Bjoern A. Zeeb" , =?utf-8?q?Mina_Gali=C4=87?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, freebsd-arch@freebsd.org Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL Date: Sat, 03 Feb 2024 13:06:57 -0600 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 3 Feb 2024, at 11:58, Gleb Smirnoff wrote: > We just need at least one supported working kernel without VIMAGE (and > probably other useful stuff, that is not useful to everyone). > Strong agree on this point. There are enough users out there who do not want VIMAGE (well, at least o= ne, but it=E2=80=99s enough of one to care), so we need to ensure it keep= s building. It=E2=80=99s very easy to forget about the non-VIMAGE case, a= nd if we don=E2=80=99t have any kernel configs without we=E2=80=99re goin= g to keep breaking it and not noticing until you run into it. That was even raised in the GitHub review. Best regards, Kristof From nobody Sat Feb 3 19:10:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS2Jy0yCsz58DKR; Sat, 3 Feb 2024 19:10: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 4TS2Jy0T9tz3xDt; Sat, 3 Feb 2024 19:10:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aX4HTpvoaXb+RtFAYDJnpNo2Z5UzfxRQ2fC6dxLOago=; b=Wq+kOMOZt4tdBDu7ePEdeyxrySn+7cC7NQuHpA+JLXImhSr4ItiUqnBe06dCHuuxEiVWPW 0E0rfcEGW+RrQh+3RHeFvOLC1Cfc2kY1A1Dv+jBXhiUBzporz6mVQuFBFEaX3mQtlGb8ch 7Pcmtd/iw0OGrPS21tbXUV1DKMHuqOL7BHsF5ek7BMcEG6IumK+fERLTBlJsDmldpPNzSJ F+qN2wI5YA5Y0sWsiOMGbJ7Stpz0CMy5eA+4rsBhh8MBeVQjo2OMuue3FZJkGawPXqAVsm S2LvEViG7y8+DaLB1Ua9/pWAQIjcFf2+UbGMtg+6KIZpo9vcCRiwA2x74NQtgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aX4HTpvoaXb+RtFAYDJnpNo2Z5UzfxRQ2fC6dxLOago=; b=TjP93aY+Ic8ws5SY7U7Bh2wEsw86yntfTKikB0Xfkp92bUPEYMlLmwEiy0TDF/UFYLp3Mj 6S3ZoOHNlmmE5szS5H/9XtaMs7ZfEp8kzrRpfY4Ou5MqsQnvmRM6XLh9zZcY38QLlOi/Nr n5okhW2iRnKVbwbXmxrvybk6tvSrl/HbkkLy6zaxM+bscAKSn1/rzXM0vyDkUa38Wnx158 KN864NkYtNSRWgx3pPrvvu5Ox9iD8xFVj5sq4N95AQjKpVCM5F5BLsD4g4tDN3XdK+icxR 6JODYurcWyP1EK6s+K3EaTIw9dU3gRJO7VnDsu8tlIyHpwqA+2OcATVoDIbFXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706987410; a=rsa-sha256; cv=none; b=vjFwRiHTRQ7Ac25s2NybBFwsIScqrt2NHOFdsIkJxmsA0/BbWChXfrBozx+TCqYLPfTcq4 1yhbopv9daH61713I6l9Ir/fJWHwmCW9EY1g3GX6qcsMCG09M7nT6JSJEQj8SLOi4aqXWI AOqdGD7fcVYg5BU3cS2shw/IMwNSiyiD6G95hq1H5R3wmMtbZdrEirxJFhb4/zuwcY9KnX ILBE9UaGwjYm90TonZT3NULkK5Rykpu3Vze/h53s6L1HMxPUnME3OQisPre6i8bs3FLeCU JJWBVyUtKQaZPv7yRGvtyaV9YSuKz8OrzTKCle9TElCgsMABsSHv3r3VMt2lTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS2Jx6dkszQ3g; Sat, 3 Feb 2024 19:10: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 413JA9DI083454; Sat, 3 Feb 2024 19:10:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413JA946083444; Sat, 3 Feb 2024 19:10:09 GMT (envelope-from git) Date: Sat, 3 Feb 2024 19:10:09 GMT Message-Id: <202402031910.413JA946083444@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: f846c5b346b0 - main - pmap: Reflect commit 1f1b228 in man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f846c5b346b0ef7a31748fa8b7217adb42b80412 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f846c5b346b0ef7a31748fa8b7217adb42b80412 commit f846c5b346b0ef7a31748fa8b7217adb42b80412 Author: Minsoo Choo AuthorDate: 2024-02-03 18:41:22 +0000 Commit: Mark Johnston CommitDate: 2024-02-03 19:07:44 +0000 pmap: Reflect commit 1f1b228 in man page Reviewed by: mhorne Fixes: 1f1b2286fd5a ("pmap: Convert boolean_t to bool.") Differential Revision: https://reviews.freebsd.org/D43722 --- share/man/man9/pmap_is_modified.9 | 2 +- share/man/man9/pmap_is_prefaultable.9 | 2 +- share/man/man9/pmap_page_exists_quick.9 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9 index d4e19d6d6097..4f6a15b8ba3a 100644 --- a/share/man/man9/pmap_is_modified.9 +++ b/share/man/man9/pmap_is_modified.9 @@ -34,7 +34,7 @@ .In sys/param.h .In vm/vm.h .In vm/pmap.h -.Ft boolean_t +.Ft bool .Fn pmap_is_modified "vm_page_t m" .Ft int .Fn pmap_ts_referenced "vm_page_t m" diff --git a/share/man/man9/pmap_is_prefaultable.9 b/share/man/man9/pmap_is_prefaultable.9 index 7d852f1552b0..eb8bd54c2953 100644 --- a/share/man/man9/pmap_is_prefaultable.9 +++ b/share/man/man9/pmap_is_prefaultable.9 @@ -33,7 +33,7 @@ .In sys/param.h .In vm/vm.h .In vm/pmap.h -.Ft boolean_t +.Ft bool .Fn pmap_is_prefaultable "pmap_t pmap" "vm_offset_t va" .Sh DESCRIPTION The diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9 index b42ecf0426f5..7d4c12353aeb 100644 --- a/share/man/man9/pmap_page_exists_quick.9 +++ b/share/man/man9/pmap_page_exists_quick.9 @@ -33,7 +33,7 @@ .In sys/param.h .In vm/vm.h .In vm/pmap.h -.Ft boolean_t +.Ft bool .Fn pmap_page_exists_quick "pmap_t pmap" "vm_page_t m" .Sh DESCRIPTION The From nobody Sat Feb 3 19:10:10 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS2Jz2vvSz58D7t; Sat, 3 Feb 2024 19:10: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 4TS2Jz1BfLz3xYF; Sat, 3 Feb 2024 19:10:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69l+XFlzLxlTPZlPDbaSBIlu4YtBRi0NraVpIR0kgNE=; b=NcCGe/69lBI4FHYTbcSE1kQP61BvZ+R15ns757Kg9RosTz0Nju9PEHeVDqYzIMyHOsdHXM yeUKK5ghyLfKpe5glOenyn7QuetZ5FghBn2ClRqkCVZCLbKLe6wHJEnJiVFxTMH4IgAMKw 6m/0XPIn6xEXXTb3CRV1xv/mUDfelyEa3mv+45DFjW4OLb+/axra1Q/jYYr/Y+pG8B2I0x ZIaExcaiN/Cmqj5kqN78aC10gjVjodHYQMk6fYsBLRXkW8KOP8L/Bh6tBzQR9g1LYbaSoF 4+nFsDhyhlZqlnojLH9LDZMaq39qpE22g4yB1i0e1EFVFaEL2bWTmwmQc7Johw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706987411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=69l+XFlzLxlTPZlPDbaSBIlu4YtBRi0NraVpIR0kgNE=; b=X0b9x0Q5mw73Ef6nicABu+asAcA1ZV8KN4buu/jUJY6jV454ZBeXnDz5zUCyFw8i62Q1q/ jo2Q4M5jNUvPabIbqYI1SMMyM3CFcyAq6XdAuFoPXlQOlZhvrEKpgNsfVYFW0kG9WBZ5AK qi0ee1eUyea5iRWOFzpZ6UNYcpEYo6U88GLIV++Jh13MMCf5QWTmRGkLjE2ubRJA0O0lie +Lr/7vLAvT0qyo03lt334PJ9JXOB0UBg+Q05Df9ftdGfzGfsF1uVo22aJOnA2SUgtzs65O Zc82ZynT4rYrW94FOec5Xz9CdnZsLDzWMNtXyaZOEMrahoTdJ2r8Wxy4GrFrGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706987411; a=rsa-sha256; cv=none; b=KWO9B+W6jK29TzH9uubvuXODHmdKYP38O9LfeWP8fExK4splFJj2hH0Fa5lPmRRgRB0iYo tUfrLVvYG1V0ydZQZC8Yadx61iOniRO9uX6+kV+5eCLMI8JDKj3Rnx9TsFb/RoZYb53BT0 iOA4pv2Jo1CcJQtQxDG84Y/vaREtmxcNdmLcmUx7m2LW6tNq+fSllKQY3JpTuw4veIFj+L yaf9w6+89wRYpwl7x4lY8d85RC9KCw3VUJXKFB8l+x9qN1Z5gmeLyMrX6pHJOyv9Rp4sRc 38Br96lVlggcUCsCpsv1rvjbLi7koPBvPb7ItgSB6UMJgFqs6XcIIyxS+3wngw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS2Jz0GxyzQPP; Sat, 3 Feb 2024 19:10: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 413JAAjM084139; Sat, 3 Feb 2024 19:10:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413JAAP9084130; Sat, 3 Feb 2024 19:10:10 GMT (envelope-from git) Date: Sat, 3 Feb 2024 19:10:10 GMT Message-Id: <202402031910.413JAAP9084130@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: f73124b077d8 - main - ctfmerge: Remove function cast of strcompare() for qsort() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f73124b077d867990cbcb4d903b48be2ca55e4ca Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f73124b077d867990cbcb4d903b48be2ca55e4ca commit f73124b077d867990cbcb4d903b48be2ca55e4ca Author: Minsoo Choo AuthorDate: 2024-02-03 19:06:49 +0000 Commit: Mark Johnston CommitDate: 2024-02-03 19:09:52 +0000 ctfmerge: Remove function cast of strcompare() for qsort() Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43715 --- cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c index 161927cf0663..27aa4d01b03d 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c @@ -886,7 +886,7 @@ main(int argc, char **argv) for (i = 0; i < nifiles; i++) tifiles[i] = argv[optind + i]; - qsort(tifiles, nifiles, sizeof (char *), (int (*)())strcompare); + qsort(tifiles, nifiles, sizeof (char *), strcompare); ifiles[0] = tifiles[0]; for (idx = 0, tidx = 1; tidx < nifiles; tidx++) { From nobody Sat Feb 3 19:23:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS2ct4Xszz58GNh; Sat, 3 Feb 2024 19:23: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 4TS2ct1cxwz42T9; Sat, 3 Feb 2024 19:23:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706988238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Bg9bmFx+PvBM2Bez9L3BRpuU5Las+SRmQJDXGwlSOc=; b=hBAiO6kP3ibcKpLbs0FKOD1gsQJXxdZPqUNuzXXEhpLvbyG9oJPfQhUoY/0fRV7T3ctG3J x6cIL2cGkuNuNUism9Rxp8lsndBDhOWmDP1k/FSUN4nyyM8J+GYyLMb6xNL6wmt/gdF+Xr uvT8gawuU6oPlFrFpHQpHDtopvVpTjE5I9HiEEOzjJIBC2vqI3wZ6z9CU8F3aT6xR1+yrL DChWEd/X16mNbZXKBTUxAga6/RNIvJX88wslmEXPiR8l8pMck1dOv74ciqfLg02/6m7QUV v0L+o1+po5LtWt650aIdKetFXyDavZmia3jHq2Z+cYfd3sB7QqTKw1rpsHUuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706988238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5Bg9bmFx+PvBM2Bez9L3BRpuU5Las+SRmQJDXGwlSOc=; b=XOJ5RWAosObuRXDAzZadllBxkLQFyO2tgMtlMMn4TrNHNbo1uLzL8uNBMpUJ1SzwZjjkdM KjdXF1U4Ze15yAdWShplyMY+PXcypHcDDBRMtDgKC2VhmTTMBzYL2TLgnSGorjotceSxG4 eNk5geAPxxF65xFkVPUBVPJ9K6P3Go6RfDe94RScdG/pJ805A5JiAho5vN9joxhrvHHzZ0 sxtfq9MSObtpo/sXJRnsJ/cFF9C2HcIcPJsnSkHIiw4iBF3JJ/2a4nfamOrC1XOPuSyWba A2tugOC5fiYFxQmo5itGuMPjhVqn91lmG1D1EoskFBYVm3Hx2pOioKvm6UVq+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706988238; a=rsa-sha256; cv=none; b=kNed2/oI6pUX4FcN64GQf6am8UhOyQb1BgK/QZL7NPR4hMY98aHfGPNqPQHMzWz1EAC6v9 HdU6k2eGE2Ag+3vWp+6wBVgTLsw0uZENs40pALImDC4mKQX78IZQCTVo1bHKleJ3CzHnCb n9vqfUqbsVpEIneiKp2O+XXgyaGqnnaSOwBYKskaYN3FPHOlHsbx9vCwWs2G7YmOYagPZ7 R4OErrkbyMGDSqMbYwXKnpjrmh3SNRc9FS/pq7v+BIS1Idqf9ftspuGp/wOH+wK+d4I3DM vq6YiXlTihnFrIeSnj/UAV4pN6huT4JrV37wZTBD9BVvKUKOnSEUfR6AJrjMEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS2ct0YY4zQvr; Sat, 3 Feb 2024 19:23: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 413JNvDp012354; Sat, 3 Feb 2024 19:23:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413JNvV5012351; Sat, 3 Feb 2024 19:23:57 GMT (envelope-from git) Date: Sat, 3 Feb 2024 19:23:57 GMT Message-Id: <202402031923.413JNvV5012351@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: 9ed713d97b3d - main - cdefs: Introduce __result_use_or_ignore_check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ed713d97b3d0376747c9ad1842864bebf08f823 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ed713d97b3d0376747c9ad1842864bebf08f823 commit 9ed713d97b3d0376747c9ad1842864bebf08f823 Author: Mark Johnston AuthorDate: 2024-02-03 19:16:50 +0000 Commit: Mark Johnston CommitDate: 2024-02-03 19:16:50 +0000 cdefs: Introduce __result_use_or_ignore_check Try to paper over inconsistent semantics for __warn_unused_result__ between clang and gcc. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 for a spirited discussion of these semantics. Introduce __result_use_or_ignore_check, which allows callers to explicitly ignore the return value with a cast to void. Use that to restore some checking for copyout() and friends, previously removed in commit d07acc58d898 ("systm: Relax __result_use_check annotations"). Reviewed by: olce, rpokala, kib, emaste MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43426 --- sys/sys/cdefs.h | 11 +++++++++++ sys/sys/systm.h | 17 +++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 206cc569c55a..e47a7072e1f1 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -326,6 +326,17 @@ #if __GNUC_PREREQ__(3, 4) #define __fastcall __attribute__((__fastcall__)) #define __result_use_check __attribute__((__warn_unused_result__)) +#ifdef __clang__ +/* + * clang and gcc have different semantics for __warn_unused_result__: the latter + * does not permit the use of a void cast to suppress the warning. Use + * __result_use_or_ignore_check in places where a void cast is acceptable. + * This can be implemented by [[nodiscard]] from C23. + */ +#define __result_use_or_ignore_check __result_use_check +#else +#define __result_use_or_ignore_check +#endif /* !__clang__ */ #else #define __fastcall #define __result_use_check diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 29c8bfc3c768..376a35e7e8e2 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -299,10 +299,11 @@ int __result_use_check copyin(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); int __result_use_check copyin_nofault(const void * __restrict udaddr, void * _Nonnull __restrict kaddr, size_t len); -int copyout(const void * _Nonnull __restrict kaddr, - void * __restrict udaddr, size_t len); -int copyout_nofault(const void * _Nonnull __restrict kaddr, +int __result_use_or_ignore_check copyout(const void * _Nonnull __restrict kaddr, void * __restrict udaddr, size_t len); +int __result_use_or_ignore_check copyout_nofault( + const void * _Nonnull __restrict kaddr, void * __restrict udaddr, + size_t len); #ifdef SAN_NEEDS_INTERCEPTORS int SAN_INTERCEPTOR(copyin)(const void *, void *, size_t); @@ -323,11 +324,11 @@ int64_t fuword64(volatile const void *base); int __result_use_check fueword(volatile const void *base, long *val); int __result_use_check fueword32(volatile const void *base, int32_t *val); int __result_use_check fueword64(volatile const void *base, int64_t *val); -int subyte(volatile void *base, int byte); -int suword(volatile void *base, long word); -int suword16(volatile void *base, int word); -int suword32(volatile void *base, int32_t word); -int suword64(volatile void *base, int64_t word); +int __result_use_or_ignore_check subyte(volatile void *base, int byte); +int __result_use_or_ignore_check suword(volatile void *base, long word); +int __result_use_or_ignore_check suword16(volatile void *base, int word); +int __result_use_or_ignore_check suword32(volatile void *base, int32_t word); +int __result_use_or_ignore_check suword64(volatile void *base, int64_t word); uint32_t casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval); u_long casuword(volatile u_long *p, u_long oldval, u_long newval); int casueword32(volatile uint32_t *base, uint32_t oldval, uint32_t *oldvalp, From nobody Sat Feb 3 20:02:13 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS3Tl0Tpcz58KHg for ; Sat, 3 Feb 2024 20:02:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TS3Tk0vW5z45J1 for ; Sat, 3 Feb 2024 20:02:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-55faa1e3822so4056034a12.1 for ; Sat, 03 Feb 2024 12:02:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1706990568; x=1707595368; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=RsFzUx/8EjB01Ton6l+Ru7UwUTCGVVCdFkAgQYtXhCM=; b=MptXhQ0vmArOUAIKjv2vspdzXwMzf5lddoNKEtzxF0X5NWC1z42XG5P+OKc28Hujok 0poMlENJgHgyx7fVrbkC0bO6XE7oM5D2UVf3irk76jgFP8QDjZX0bRb7yqLY6jpAA5RX 8fF6z0Ca78QzbJQ7fVeiv/7HcWDSwRF/xwsE8aG721P39USJUHh/ry5GW80Wh2wJOSTs N4V4gBOtVH5z15QEvOHl/pAb0O5//eFcWBVp8zOGoUKCRTFEMqxHDNKaZU6YiCNEDlkm z2Q1XLne6+ldqmagURe52aQrEJLWWG3DSq2RRK4Vl6QRI3thQFNUlgwbQCYOeQUNf3v6 UBTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706990568; x=1707595368; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RsFzUx/8EjB01Ton6l+Ru7UwUTCGVVCdFkAgQYtXhCM=; b=BZdVBs8tnus5Y9Z4747CbgDlM7CzbUby2R6n2CqSYdi43RjEp5jXLGQwFaQwMF0U+U uCHHobElp8W05S47+rBbqEwKwkLtF2fxTezXN5ibqr/xtOJ3xHtF/u7KhFRsO9cd63Ik CijvQh+J5L1GpfVQgiJPAqv5R7MkFibdt87wgYMvl9ogfejYaLaFIohaxJRNuSNDIbB4 SQDoj0wi01Ot+L2FNUnD6mJraK9khbyljgjstVzKrA0NNRkmXSANeMcV2KXtGzZ4Yazr biELc3iBgDldmG6mtp5+cLtVLwSa/2pekHzLLgA5UKjXSyV7Emal7buUS1/eeCklSlX1 eQEQ== X-Gm-Message-State: AOJu0Yw0m9CJbT90LIJAEGw1KVnxSWSBP4n7SDiU5NpeRMjtGZO8U1Cl IJkkcCvU82wSMG9UFlshmpynZRlOCtsmaROaLO+wv7vonzHe1CeTF1NxCN4Eus74X7vOduw82rX FQzTNpEJ65dUYSBcBrJZAxxjECvLMRXdgFmSR2Q== X-Google-Smtp-Source: AGHT+IGSqu3XQTZ/GE4dYS2oyFadPQtcMdclt5+ezu5OlcjtS6z2UpLxvMSaq8FboI1FatEy/xSJq+tlgLBUFGxs/20= X-Received: by 2002:a05:6402:896:b0:55f:f13b:d372 with SMTP id e22-20020a056402089600b0055ff13bd372mr2000153edy.21.1706990568508; Sat, 03 Feb 2024 12:02:48 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402030136.4131aQIM010980@gitrepo.freebsd.org> <70o6oo0s-r8nn-7r92-5s6r-6so586rpo1o1@SerrOFQ.bet> In-Reply-To: From: Warner Losh Date: Sat, 3 Feb 2024 13:02:13 -0700 Message-ID: Subject: Re: git: ce348fe5cfc3 - main - amd64 & i386: enable VIMAGE in MINIMAL To: Kristof Provost Cc: Gleb Smirnoff , "Bjoern A. Zeeb" , =?UTF-8?Q?Mina_Gali=C4=87?= , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, freebsd-arch@freebsd.org Content-Type: multipart/alternative; boundary="00000000000078abad06107fb69b" X-Rspamd-Queue-Id: 4TS3Tk0vW5z45J1 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:15169, ipnet:2a00:1450::/32, country:US] --00000000000078abad06107fb69b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Feb 3, 2024 at 12:07=E2=80=AFPM Kristof Provost wr= ote: > On 3 Feb 2024, at 11:58, Gleb Smirnoff wrote: > > We just need at least one supported working kernel without VIMAGE (and > > probably other useful stuff, that is not useful to everyone). > > > Strong agree on this point. > > There are enough users out there who do not want VIMAGE (well, at least > one, but it=E2=80=99s enough of one to care), so we need to ensure it kee= ps > building. It=E2=80=99s very easy to forget about the non-VIMAGE case, and= if we > don=E2=80=99t have any kernel configs without we=E2=80=99re going to keep= breaking it and > not noticing until you run into it. > > That was even raised in the GitHub review. > MINIMAL is not a CI image to test things. It's a replacement for GENERIC that loads what one can. Its contents need to reflect that. That's why I did not give the issue weight. However,we likely need at a minimum LINT-NOVIMAGE like we have LINT-NOINET today. That's easy enough to arrange, and I'm happy to do it to cover the CI aspects of things. It kinda shows, though, that we may want to have more kernels with carefully thought out options to account for the different needs. I'll try to write up my thoughts on what they should be. I'm leaning to have an vm vs embedded vs server split as well as a load-it-all vs compile-it-in split, regardless of what they are named. And there's some base for all three and then extensions from there (vm and embedded may be the same, and server may be a superset of those two). So I'll take an action item to come up with a concrete proposal for these things, along with good definitions so people enhancing the system in the future have good guidance on wher to do that. Warner --00000000000078abad06107fb69b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Feb 3, 2024 at 12:07=E2=80=AF= PM Kristof Provost <kp@freebsd.org= > wrote:
On 3= Feb 2024, at 11:58, Gleb Smirnoff wrote:
> We just need at least one supported working kernel without VIMAGE (and=
> probably other useful stuff, that is not useful to everyone).
>
Strong agree on this point.

There are enough users out there who do not want VIMAGE (well, at least one= , but it=E2=80=99s enough of one to care), so we need to ensure it keeps bu= ilding. It=E2=80=99s very easy to forget about the non-VIMAGE case, and if = we don=E2=80=99t have any kernel configs without we=E2=80=99re going to kee= p breaking it and not noticing until you run into it.

That was even raised in the GitHub review.

MINIMAL is not a CI i= mage to test things. It's a replacement for GENERIC that loads what one= can. Its contents need to reflect that. That's why I did not give the = issue weight. However,we likely need at a minimum LINT-NOVIMAGE like we hav= e LINT-NOINET today. That's easy enough to arrange, and I'm happy t= o do it to cover the CI aspects of things.

It kinda shows, though, that we may want to have mo= re kernels with carefully thought out options to account for the different = needs.=C2=A0 I'll try to write up my thoughts on what they should be. I= 'm leaning to have an vm vs embedded vs server split as well as a load-= it-all vs compile-it-in split, regardless of what they are named. And there= 's some base for all three and then extensions from there (vm and embed= ded may be the same, and server may be a superset of those two). So I'l= l take an action item to come up with a concrete proposal for these things,= along with good definitions so people enhancing the system in the future h= ave good guidance on wher to do that.

Warner
--00000000000078abad06107fb69b-- From nobody Sat Feb 3 21:10:54 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS50H2218z58RFn; Sat, 3 Feb 2024 21:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TS50H1YmMz4CVm; Sat, 3 Feb 2024 21:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706994655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpYd9UuhU7WztUWTEJhi18grFmghzDwR+X8c5jowKQ0=; b=INsjdLGiYGKd1A7pWZFOb121b93q2MUAoF8ftMlAPYV6peZLq/89eh/xku1eHe6EjWbaoR U9kOiS6XmrHRs5ypKYkqfwqwYCgcC2NrLNEhnl3ln7XZCTOf+2gfMaGUdEw/DlZRFKjkxk MwSnNvXsalIMUYME02i+rB0QP/J/OZIA6fRlLkEM0hcuh4F9mWrL/lv0L8kuraGH56wnWF aUK7YGpCqT3g4aZ+MzlSe/o0H+X/MK4j1PS7oARYJNI55D/UxvsqTF89WL9lh6qcwLCuIV SyehrN2QlUqY1exDc5YOsLwwIxRc0S5JEvJc6Wt6ORr3m0ODuAuAkIG4yU0N8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706994655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpYd9UuhU7WztUWTEJhi18grFmghzDwR+X8c5jowKQ0=; b=oS8Kx/Z5hljO9yeKxVP9LYVwF+oxfIlbR/ZyVIGHRj5XQfmJP0QrWhPfSYYi65OVJEsOPm N3DNrUp/MFw7i6euQfCASAtQNwPb8uwWeaSsvJz0ShACpPmpYjAWJUT3xkRX+16+K587zn v1BhYjIa9SnNgtjEiI9q6zo0f43YtSjp2UYDezItqLOvNRqbXaiXPPBcvfMasY169JahLM 8cukcPJ4McDyAeizhWthsLgholBa2GeejBRlZocV9Xhr8kGdh2Ag0tkrXbTJqi1V85NH/F 1bSr2s7sG/OwAFPuMZFdF+u7Egryyegyt5pXurX4aCAI/B6Ii+w4eAJXPmV9NA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706994655; a=rsa-sha256; cv=none; b=bu+5lWMmFxe2H7J5yHy4H0214+uav86kRssTwuUL9vZ7XckcrCxIEr+EKuDavEx2tpN3IO 18HyHzcRzH0BOnXl52Iq35igVpSjDHMpjnLjTMXUfkMkANgwMhrxw6XeyLHecaOk0OWTN9 jOIbcq7JiKlGTA1RqRzHkCU5NUKpjU2I+hymLxtYkIDMp674LezXx83IPb5+iEQ0YMRRd+ 6QIQ4n1KVly49tKGEv8o6HByDT+Sy9cKIbvuKEDDhZAs3kheGp01T1HmHyK6npJ1aYzxjA 3FwrwZYkztL9RJD+ps+O6JzqsrCE3CKInsxWhadGenNL1KphAgDbrFWwpuIZqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS50H0XMRzSyv; Sat, 3 Feb 2024 21:10:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 413LAsr8093266; Sat, 3 Feb 2024 21:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413LAsEU093263; Sat, 3 Feb 2024 21:10:54 GMT (envelope-from git) Date: Sat, 3 Feb 2024 21:10:54 GMT Message-Id: <202402032110.413LAsEU093263@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: ce69e37369aa - main - Revert "sockets: retire sorflush()" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce69e37369aa44a96113387253aadc5e49246928 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ce69e37369aa44a96113387253aadc5e49246928 commit ce69e37369aa44a96113387253aadc5e49246928 Author: Gleb Smirnoff AuthorDate: 2024-02-03 21:08:41 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-03 21:08:41 +0000 Revert "sockets: retire sorflush()" Provide a comment in sorflush() why the socket I/O sx(9) lock is actually important. This reverts commit 507f87a799cf0811ce30f0ae7f10ba19b2fd3db3. --- sys/kern/uipc_socket.c | 42 +++++++++++++++++++++++++++++++++++++++--- sys/net/rtsock.c | 6 ++---- sys/netinet/raw_ip.c | 6 ++---- sys/netinet/sctp_usrreq.c | 6 +++++- sys/netinet/tcp_usrreq.c | 6 ++---- sys/netinet/udp_usrreq.c | 6 ++---- sys/netinet6/raw_ip6.c | 6 ++---- sys/sys/socketvar.h | 1 + 8 files changed, 55 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5e5e7d2cd058..b647766cf258 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -95,9 +95,9 @@ * * NOTE: With regard to VNETs the general rule is that callers do not set * curvnet. Exceptions to this rule include soabort(), sodisconnect(), - * sofree() (and with that sorele(), sotryfree()), as well as sonewconn(), - * which are usually called from a pre-set VNET context. sopoll() currently - * does not need a VNET context to be set. + * sofree(), sorele(), sonewconn() and sorflush(), which are usually called + * from a pre-set VNET context. sopoll() currently does not need a VNET + * context to be set. */ #include @@ -2964,6 +2964,42 @@ soshutdown(struct socket *so, enum shutdown_how how) return (error); } +/* + * Used by several pr_shutdown implementations that use generic socket buffers. + */ +void +sorflush(struct socket *so) +{ + int error; + + VNET_SO_ASSERT(so); + + /* + * Dislodge threads currently blocked in receive and wait to acquire + * a lock against other simultaneous readers before clearing the + * socket buffer. Don't let our acquire be interrupted by a signal + * despite any existing socket disposition on interruptable waiting. + * + * The SOCK_IO_RECV_LOCK() is important here as there some pr_soreceive + * methods that read the top of the socket buffer without acquisition + * of the socket buffer mutex, assuming that top of the buffer + * exclusively belongs to the read(2) syscall. This is handy when + * performing MSG_PEEK. + */ + socantrcvmore(so); + + error = SOCK_IO_RECV_LOCK(so, SBL_WAIT | SBL_NOINTR); + if (error != 0) { + KASSERT(SOLISTENING(so), + ("%s: soiolock(%p) failed", __func__, so)); + return; + } + + sbrelease(so, SO_RCV); + SOCK_IO_RECV_UNLOCK(so); + +} + /* * Wrapper for Socket established helper hook. * Parameters: socket, context of the hook point, hook id. diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index e4183232700e..e0411ed0c1d0 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -457,12 +457,10 @@ rts_shutdown(struct socket *so, enum shutdown_how how) */ switch (how) { case SHUT_RD: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); break; case SHUT_RDWR: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); /* FALLTHROUGH */ case SHUT_WR: socantsendmore(so); diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 004aaea01bfa..a6bef1c7e275 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -994,12 +994,10 @@ rip_shutdown(struct socket *so, enum shutdown_how how) switch (how) { case SHUT_RD: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); break; case SHUT_RDWR: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); /* FALLTHROUGH */ case SHUT_WR: socantsendmore(so); diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index b847271a7bd3..70fe021be766 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -868,7 +868,11 @@ sctp_shutdown(struct socket *so, enum shutdown_how how) SCTP_TCB_UNLOCK(stcb); } SCTP_INP_WUNLOCK(inp); - socantrcvmore(so); + /* + * XXXGL: does SCTP need sorflush()? This is what old + * soshutdown() used to do for all kinds of sockets. + */ + sorflush(so); if (how == SHUT_RD) break; /* FALLTHROUGH */ diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 7c8e3d7e72db..ccd6a6149dae 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -824,12 +824,10 @@ tcp_usr_shutdown(struct socket *so, enum shutdown_how how) switch (how) { case SHUT_RD: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); break; case SHUT_RDWR: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); /* FALLTHROUGH */ case SHUT_WR: /* diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 24bc3403b0f7..9dad79e95b04 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1722,12 +1722,10 @@ udp_shutdown(struct socket *so, enum shutdown_how how) switch (how) { case SHUT_RD: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); break; case SHUT_RDWR: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); /* FALLTHROUGH */ case SHUT_WR: socantsendmore(so); diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 5b31a84f31eb..3264de331817 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -839,12 +839,10 @@ rip6_shutdown(struct socket *so, enum shutdown_how how) switch (how) { case SHUT_RD: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); break; case SHUT_RDWR: - socantrcvmore(so); - sbrelease(so, SO_RCV); + sorflush(so); /* FALLTHROUGH */ case SHUT_WR: socantsendmore(so); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 030087cbc17c..cba7dd655aa0 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -501,6 +501,7 @@ int soreceive_generic(struct socket *so, struct sockaddr **paddr, void sorele_locked(struct socket *so); void sodealloc(struct socket *); int soreserve(struct socket *so, u_long sndcc, u_long rcvcc); +void sorflush(struct socket *so); int sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, struct thread *td); From nobody Sat Feb 3 21:10:56 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS50J2f2Mz58RFp; Sat, 3 Feb 2024 21:10: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 4TS50J20pJz4CTM; Sat, 3 Feb 2024 21:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706994656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VsGKWoNtRpOlPj0DEyCt8ga7VaeWNJKQ0xEU8CcVCto=; b=Lbcu0ybQPxUCAy+JJ/b6FONOvk8GG0MX7I6Oq5XCxL3OuhGVOF9DOwqCoJ2gSGheQUwL0n 5hcxj3AO9QhusFWGg5HorAjHJa0tlIizmVhfqK9HYhD53uAxAnWEmv3LObzEUUsUChEwPZ hZkueEhzHErpwgirHNoNqVzJOpDddD6fLddkrCzu0yAUU/FdOBypkOVXfocJgW/C4X5tlR TqSy/Nf/L3OwwaV1ltU6S1a2KLwyjQ9CsLzIHAyhhR7O4jkn97UPTCrMad6DjjgK9gwASD zPRs0NZKemvd9F/755+iLWgIMRmJ7HFP86tQRaWdULNB6O0R6CJs5GY9ud90zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706994656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VsGKWoNtRpOlPj0DEyCt8ga7VaeWNJKQ0xEU8CcVCto=; b=rn7XScUbakhQAHlKHsNntuhEfGhGJT+6TNXht5o4l8w4xMs5mcfj4p/7a+y/jleK5ugGo8 NnGuqPBrdmXZi/MGgYfymMke1jCnWKomVjv00eon68zhA03D0Lf0x/Ghpj0oGB1rPuM4Df R39S3TrhSiZ5HPF/CY53lxSWuZ74wZqd0bttX4modQ8u4YJh/Qgh0K1MyomIUd4ON9OJ6o +Id1FyhVc4VwUQ+1uy4OkzpWHRH6YUFJQUn3zUlmKiR+gTJHODb+LYlnEaJFd5ouYoX+gK p6BEaIo6oNY067MeD8aldqnrXcxDZ2Os9TudYEdcO4M8zRw8qL5ce3xlOz1cLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706994656; a=rsa-sha256; cv=none; b=eNfG7n9ytxiPxyjoHo91xwK1vWpwNlMFuHbp51mz4MWK4nBvsr5DYDZZLl/0fHWLgvvfk+ l7ZFpBEIIm6Vq/FDYiMfnAuSq/b1yISsDY47NMKljNcjo0Vwqv4oozGLCeWyXBtdMZ17xn FGQeNzq6ur3t15q9q0er79K2yqQZPbzqfTmHGp8dWG2ksk5GQPH3Kcg1TjpFaCSc5rp7nK vdixwZjSDRxFxaR90DHiQRce+yfdzI9QsPyiG36cKzGTVp0ghXRphVID/csHnWnB1oKvrS RuzQ9fP35PpvO7t99Wds3aN5fAPY+oPzGJ02rF5kWRBUTj6TakwR8ta3xTnumw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS50J15dLzTFZ; Sat, 3 Feb 2024 21:10: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 413LAuxV093308; Sat, 3 Feb 2024 21:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413LAuoa093305; Sat, 3 Feb 2024 21:10:56 GMT (envelope-from git) Date: Sat, 3 Feb 2024 21:10:56 GMT Message-Id: <202402032110.413LAuoa093305@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: d682c1eaa598 - main - unix: synchronize shutdown(2) with read(2) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d682c1eaa598a6bb4b9b81ba80e8e1202a0c9611 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d682c1eaa598a6bb4b9b81ba80e8e1202a0c9611 commit d682c1eaa598a6bb4b9b81ba80e8e1202a0c9611 Author: Gleb Smirnoff AuthorDate: 2024-02-03 21:08:41 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-03 21:08:41 +0000 unix: synchronize shutdown(2) with read(2) unp_dispose() is called on shutdown(2) and thus needs to acquire socket I/O receive sx(9) to synchronize with read(2) that may read top of the buffer without socket buffer mutex. Notice in the last chunk of the diff that the function used to be called with the lock already acquired in the past. --- sys/kern/uipc_usrreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 976490dbe2d8..a9a7dd3a1189 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3217,6 +3217,7 @@ unp_dispose(struct socket *so) struct sockbuf *sb; struct unpcb *unp; struct mbuf *m; + int error __diagused; MPASS(!SOLISTENING(so)); @@ -3228,6 +3229,8 @@ unp_dispose(struct socket *so) /* * Grab our special mbufs before calling sbrelease(). */ + error = SOCK_IO_RECV_LOCK(so, SBL_WAIT | SBL_NOINTR); + MPASS(!error); SOCK_RECVBUF_LOCK(so); switch (so->so_type) { case SOCK_DGRAM: @@ -3279,8 +3282,7 @@ unp_dispose(struct socket *so) break; } SOCK_RECVBUF_UNLOCK(so); - if (SOCK_IO_RECV_OWNED(so)) - SOCK_IO_RECV_UNLOCK(so); + SOCK_IO_RECV_UNLOCK(so); if (m != NULL) { unp_scan(m, unp_freerights); From nobody Sat Feb 3 23:11:55 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TS7gv5Gfjz58dRp; Sat, 3 Feb 2024 23:11: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 4TS7gv4nkSz4NHd; Sat, 3 Feb 2024 23:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707001915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=swQTjj0whC2OBjNWSJ0qcNmc32gv6cO3kIQAMgQXEVI=; b=X3hTMVZLvw69yljEYUwyjCx/wUfBDdnsTjpv3NlX70+TPKygBO021EapqU1d+IWyA0yASl DLnDvETTbBPBO6y3m5QVl6kJ3/5DYy7xlXjx44eE5n7vqM2eLkyZx/IjGeLVaK6BtdmKvR NAcMHbR6L9AOntVhna8rXQHlrV60IO0DdPCiW57mojjAuuTyVVcb2nnS7bYVdE6/V0FVio AX8aMn/Fp/LJh2bxjxCiEiAsPyxt5p1aV7uj+NfGiI4JiBkHzD2Sy1Aoiw/GsT3bAnNkE5 EketdYeYmuN1O9mzjzlLmnZQvTXmPhuBk41nQPTPr0H9/nkg0jzOoLmyzJPONA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707001915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=swQTjj0whC2OBjNWSJ0qcNmc32gv6cO3kIQAMgQXEVI=; b=Jhjqm8r2QcpBtkXDFr9LgCv9WIsCH+bIel33JFRSeClINqs4lNb9fVGBGheVcgH9icSaDi yCiPRYZUv/YOzmZ4be4rVYYhsoOawFOUEfPdetp9R7TeL6PWzz+xSwpN693QXZOqLSwNBL 64FLG1DJLeEnOJ1k1a0eieAX20JUnHxWxINhdlz51xzotC2Wspoj1gS4/7vkSVgSmvE12S zcIpjt7KVetZc3IVFyxSt6VFmcKrkKr1q3CZlr22nZIlfWoIPuCElYNlDqgJT8WSO+Hj6V 6qCE8v66Y+nONghAN08I+02GjKr7soSA55VMsJ6WQfmcvozF0Zd4sRg8tTlLPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707001915; a=rsa-sha256; cv=none; b=S5XSrdSNzE5iGIwjuzYrr1Bh/YOpctfnF7a39lf3W56S+AWQ9KSCo+xgrIqMIBCwQ095Jz ugj5ZIhCqD2/ScIdJ2Caw3YWWRAfb7CAd1lIIDdODlGU6Plz13VgZ5EXZDeI92KSSjCgE+ z5aaj59c0xT+HoXBrhvCL+HXGzaEV+q5pjDO4e+b2Zne+fiYSpQuEp+bF2nIVQOe676iJa STG5P8lMhP28MMNny2AOZYlMHa+EEiq6oYoIbj0+G7Nq+c7pML4m6dU4LLZxF/KTmebsEz /4ZTzDzCd4WrRMQqNGAJFrIRT2Ht3EER6HjxOc6dZyA76/HkDzmI6to7PwzjjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TS7gv3qnpzYxb; Sat, 3 Feb 2024 23:11: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 413NBt5B095279; Sat, 3 Feb 2024 23:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413NBt9l095276; Sat, 3 Feb 2024 23:11:55 GMT (envelope-from git) Date: Sat, 3 Feb 2024 23:11:55 GMT Message-Id: <202402032311.413NBt9l095276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1e75e61d5c2c - main - bsdinstall: Fix broken netconfig persistence for installed system List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e75e61d5c2c34ddaf7bfbdba02e00670f9bf231 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1e75e61d5c2c34ddaf7bfbdba02e00670f9bf231 commit 1e75e61d5c2c34ddaf7bfbdba02e00670f9bf231 Author: Jessica Clarke AuthorDate: 2024-02-03 22:50:47 +0000 Commit: Jessica Clarke CommitDate: 2024-02-03 22:50:47 +0000 bsdinstall: Fix broken netconfig persistence for installed system The replacement of echo >> with sysrc -f used sysrc key value, which means "read variables key and value" and thus did nothing useful (and in fact emitted errors to the log about neither existing). Instead use the correct sysrc key=value form so the installed system comes back up with working networking. Fixes: 60b37735f305 ("bsdinstall netconfig: avoid duplicate entries in rc.conf") --- usr.sbin/bsdinstall/scripts/netconfig | 4 ++-- usr.sbin/bsdinstall/scripts/netconfig_ipv4 | 2 +- usr.sbin/bsdinstall/scripts/netconfig_ipv6 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig index 58fbe1883d40..77b71867eb4a 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig +++ b/usr.sbin/bsdinstall/scripts/netconfig @@ -82,7 +82,7 @@ exec 5>&- IFCONFIG_PREFIX="" if is_wireless_if $INTERFACE; then NEXT_WLAN_IFACE=wlan0 # XXX - sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net wlans_$INTERFACE "$NEXT_WLAN_IFACE" + sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net wlans_$INTERFACE="$NEXT_WLAN_IFACE" IFCONFIG_PREFIX="WPA " if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE @@ -116,7 +116,7 @@ fi # In case wlanconfig left an option and we do not support IPv4 we need to write # it out on its own. We cannot write it out with IPv6 as that suffix. if [ ${IPV4_AVAIL} -eq 0 -a -n ${IFCONFIG_PREFIX} ]; then - sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE "${IFCONFIG_PREFIX}" + sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE="${IFCONFIG_PREFIX}" fi if [ ${IPV6_AVAIL} -eq 1 ]; then bsddialog --backtitle "$OSNAME Installer" --title 'Network Configuration' \ diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 index 9097a1f9617c..8f747a9d0162 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 +++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4 @@ -63,7 +63,7 @@ if [ $? -eq $BSDDIALOG_OK ]; then exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}" fi fi - sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE "${IFCONFIG_PREFIX}DHCP" + sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_$INTERFACE="${IFCONFIG_PREFIX}DHCP" exit 0 fi diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 b/usr.sbin/bsdinstall/scripts/netconfig_ipv6 index 99ec379197fb..b851069eee14 100755 --- a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 +++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv6 @@ -73,7 +73,7 @@ while : ; do continue fi fi - sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_${INTERFACE}_ipv6 "inet6 accept_rtadv" + sysrc -f $BSDINSTALL_TMPETC/._rc.conf.net ifconfig_${INTERFACE}_ipv6="inet6 accept_rtadv" exit 0 else break From nobody Sun Feb 4 01:53:29 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSCGK6y6Mz58v63; Sun, 4 Feb 2024 01:53: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 4TSCGK5hLyz4fyx; Sun, 4 Feb 2024 01:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707011609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7DjRqUgJ4Q5QY103HDD9wcxKvrQ8q6Tr2rhKA4s+HM=; b=yUCyS/pOv2m/0gRaezS05Lo7AZKGqYKTwNEOFbqdtSaM9QzlKsljw6t+zrCyBAIPS1gQDT jUcvg4b3SJpFx8mjrh6V5M0xXD7ZybdXb2Ak7B6+cFM8F5oPRvvt34yq+5iw53E6FKItzs 3crgChG4CdNghKkBZMVoC6YvXjR8qDrTNJllKJUp84OO+DJUU6EBcrAsbxamxQWrysHPFg 2ZGd4NKrRgwb2BjHWW+6VkEAO8HylY+8IZ4oJsC6W+QG/GD6grrod0Tw3naLKdSAfkpdbF HrKm/9WT3pZhz1CDStGYQ4bc6pVtIu7hokOzZwcCL89LfiD5qM05ZL9eFyEeng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707011609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x7DjRqUgJ4Q5QY103HDD9wcxKvrQ8q6Tr2rhKA4s+HM=; b=Yhqoftuy2uYHsjsaA4TmkiSKsp8ViUxvg6E936pMbkiYQ9mT/AhqTNmOkP+vamyuIFuwmw c17ozVcP8njHh/T3Uif59Wne6xH7xmvltZoQa1RG+Nu84G1cDJ3G7mzxGjGseHnDruqquS GaZwXESujACCRuix7WMwII3tyPFSjPxojotIjCqZZWenw6NEyu1lmJafxLDyA+eAlHyL/1 IixlL4Bnx91gtNBe/0rFBlHSphRg4WqOT9UWmcprLRwlEwwlj+UUYZoIvLOFkGykSDLz2G P5IlXjyzmO4f/gRhK+xxfX9TzPCkOXcJnw/ZfC4s5kb186D0IwE/1gwRWOM1fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707011609; a=rsa-sha256; cv=none; b=ZRZRR20Irn6+pHX5KHkQRVhPVvAyCBOObMn/0MHvZdtZ9w15X/updFz8mbU24TKsBaI5/9 P5pUPmjOCrleyDJObKL+Nj95tfdTfuLyXJ+HSZwITsk86XzaUrAPO9hiD/0zjC/Rrvquux MhOzYUaneRH3RSc0HgslS0S4yyqtMqbFf5pSqc7QshjnA5Vkr8cs0NMnzZf/8sNEqfrEm6 P+vFBtepRbO83RT2+wFjfZDs4mlYiQabe6zDGs/gS9huVwYSuRJrwlmfTyk8CDLpQL1WAA LM1phgPzI0akKOAjV+UT8sSIQQGeYtI59CmP56EZtGZSc4/SxV8+7jfCa788rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSCGK4lrPzdTQ; Sun, 4 Feb 2024 01:53: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 4141rTUI066218; Sun, 4 Feb 2024 01:53:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4141rTA1066215; Sun, 4 Feb 2024 01:53:29 GMT (envelope-from git) Date: Sun, 4 Feb 2024 01:53:29 GMT Message-Id: <202402040153.4141rTA1066215@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: 6bd60e15b148 - main - libc: Specify parameter types for function pointer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6bd60e15b1484c6a3f5a87469e42a8e6ad9ab733 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd60e15b1484c6a3f5a87469e42a8e6ad9ab733 commit 6bd60e15b1484c6a3f5a87469e42a8e6ad9ab733 Author: Minsoo Choo AuthorDate: 2024-02-04 01:07:18 +0000 Commit: Mark Johnston CommitDate: 2024-02-04 01:08:59 +0000 libc: Specify parameter types for function pointer Reviewed by: dab MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43726 --- lib/libc/yp/yplib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c index d222200ed728..95ed526b2e75 100644 --- a/lib/libc/yp/yplib.c +++ b/lib/libc/yp/yplib.c @@ -91,7 +91,7 @@ struct dom_binding { bool_t xdr_ypresp_all_seq(XDR *xdrs, u_long *objp); -int (*ypresp_allfn)(); +int (*ypresp_allfn)(unsigned long, char *, int, char *, int, void *); void *ypresp_data; static void _yp_unbind(struct dom_binding *); From nobody Sun Feb 4 01:53:30 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSCGM1pjhz58vbm; Sun, 4 Feb 2024 01:53: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 4TSCGL6h3Sz4frT; Sun, 4 Feb 2024 01:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707011610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTW44rhua8A3wgWa0ZrHJKFeSelrCAuqnIuNyEZ2/Kg=; b=IO1agWJMwsntI1qYTxEnlMcd0PqCr9mdWGqY17sEbVS9nzUyvL1NO28/zXNDlCEA0Mm9sJ CBBiC4BXcaORyZOPYpTJ1cBx6U7LK7Ty+3GFKzTa0whDhncDHDJwkyccMQapLtAMaczLHc az6lhf1dn0KPmIVjEgFdtBr+gSxSDzLvLbfdKrTnsRNt4fpLYVQ24g+qI1THp7bfAkrBaG pRbLP2HbASapFyxt1DgcWCZQEXg0zF5Pm/lladTACvAdMvyTbJ/JUVTYmk9n8M5VpQhOf5 f9g4Mt3zl70oZXGai5lUn4Df8dW8dckVSJiQTqZYd7lJrd1+VM1tB7LTEnXa1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707011610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LTW44rhua8A3wgWa0ZrHJKFeSelrCAuqnIuNyEZ2/Kg=; b=OhJlJ12p+7kBbhZDZePZLUF9dt/SlfJ425Y8VGL/aHYgDfStRMA3Nq4LUqOqyFAfQwVwUD zL95aLScaG+u264IsLpNJuPY5jB+REFjTOge/l8fYyGLelSWXI3YVGUA9E9j8Y14ybm6LB 04YDdydb/fI2iVPRnEQmIbGKbGaMEC+2Bavx9vdz5XU81KgteqR/mVoWNDGEk6aSciWEMZ 0SKliwiachUkMmMMVT9Cz/gHO5RPNHa59xp16mMdYq2mqHMRKKKb8C21UjfabPspk9U8Kg JqSuKNuhr0ybWPByVdJtmhG+3oCq8uXUZIf+MNpPDvIc5L+sEDpQ0GOaDsaCzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707011610; a=rsa-sha256; cv=none; b=F8xnNpbrGZeM+nLbsbkBO7TP/b4WYZmNquCV8kQztndIT6+2R3P4H3f7vxEm3nLoUn9NE8 vzz+BzkZX1A95Ij3G1tREmv4UBeeE2fLfRgas0hGxharBK05MX5xlbg+M0FI60LGt+0QQp oMy7nxAFeAAXzW7qQNEDKpkfYx/csVADofZhaofAbnmkCUSwO1v6AGnY1E2arKTcM/yRTg P9ntw54hoPW2gJXyDn2pvWzKagJEVh4taDwaeTe/rNMs13G1pRNKWyt4n1SQPm94nCLXlx qgjVC3/2o5Slfb0QQKdUOTYTJDVURXeTFQO0E9hR3URYStPHw2I4zk/CDABjuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSCGL5lbxzdTR; Sun, 4 Feb 2024 01:53: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 4141rUd5066263; Sun, 4 Feb 2024 01:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4141rUvU066260; Sun, 4 Feb 2024 01:53:30 GMT (envelope-from git) Date: Sun, 4 Feb 2024 01:53:30 GMT Message-Id: <202402040153.4141rUvU066260@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: a67e5e7c9832 - main - pmap: Reflect 1f1b228 in man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a67e5e7c9832a4017e97495ec9ff1d6d4f392ca6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a67e5e7c9832a4017e97495ec9ff1d6d4f392ca6 commit a67e5e7c9832a4017e97495ec9ff1d6d4f392ca6 Author: Minsoo Choo AuthorDate: 2024-02-04 01:10:16 +0000 Commit: Mark Johnston CommitDate: 2024-02-04 01:10:22 +0000 pmap: Reflect 1f1b228 in man page Fixes: 1f1b2286fd5a ("pmap: Convert boolean_t to bool.") Differential Revision: https://reviews.freebsd.org/D43729 --- share/man/man9/pmap_page_exists_quick.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9 index 7d4c12353aeb..030d0e1fdddd 100644 --- a/share/man/man9/pmap_page_exists_quick.9 +++ b/share/man/man9/pmap_page_exists_quick.9 @@ -46,13 +46,13 @@ It is typically called from the VM paging code. .Sh IMPLEMENTATION NOTES The PV count used above may be changed upwards or downwards in future; it is only necessary that -.Dv TRUE +.Dv true be returned for a small subset of pmaps for proper page aging. .Sh RETURN VALUES The .Fn pmap_page_exists_quick returns -.Dv TRUE +.Dv true only if the PV entry for the physical map .Fa pmap is one of the first 16 PVs linked from the page From nobody Sun Feb 4 11:51:59 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSSXw1jGQz59dZV; Sun, 4 Feb 2024 11:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TSSXw17rKz4NJx; Sun, 4 Feb 2024 11:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707047520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3N/6jy1p243hQfcWwae6YwVO1aNpNcsUJSYjcAo7CE=; b=dSP83FGEneGpbZVym/3OvL2ITsy5YuL7qnAQzWl2pW9SljeI2rVvfQOBhZBRy15u2gLMUg 3QJ0RlzFWpQXZl42CgaDfK5IcmdcWw5kANxwKwJ1zBCmVZwXI3owlFp/egoDBzUhGoIFlv Y6qEOvSE8qgDERNWLV0U9B+e59ghv6bpqUgkntgGTzZWU6u0CKC95dSQdJPS/hbaW5nOlm 5TVcnTfY9c1nArXizzhV9WrtYkE0qz4GTM6AGUBN4Y6GbxX8RMKZ+L8hXgW7TrDfCre/s6 BeGdH+ht7PX4SmtcNqbTdCnUZ3RZ6UMWKYWjBnBO9uNcjMUtAxBtlcBFLen2tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707047520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i3N/6jy1p243hQfcWwae6YwVO1aNpNcsUJSYjcAo7CE=; b=Cy/dTeosASS63Vpvzvbv/yP7D1H6G/JVECKqd54RJkl7YS8B9q7YgHAbupcx0gAVspr/Ay 8RFknncUMWHxfe5czsep1IeSvV4oihFvvrdB2LTmebv2Ph7kRb8rCv+4y+kVL3FvjJwcfA rh6Z6ObimBLT+OXMT8s3/6vTGPvAkYComlv6Wtq5O8xBqngBoZResAfsGK8IyeCyw96ArJ oF7RuwryWP9+Sv7sfTmdGMsME8GrVTUpcP72QGeIzRKmsLihoI2hDkFmPglEKMZ0klbPB/ qnnUKyq+P6eWGg8RzjxnyC27QSYITktCxYAoiZ6XTckDRMmFCqm8lLssHI1Eeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707047520; a=rsa-sha256; cv=none; b=sSLb+NgEvO1+qlHppzRwORLHFs6NEv12FyA786FQaYxsSZgrXiPrc01uL07+6iZmBJ33oD w/tvE6NQhWXXWchs8X04mB8msLEM7NKDP87hE5CEEuM5uaR8hiqsZ6axT/LNceTOh9iUOG fJKRmEYiTKL+oY0Y18YNunZ+jjqzuu9XZcLUsbM5D8+GvdwKVqiw4BWctE1IsYgrdxVDqy otJxPU0niVtd9NhLRASQ6z3IxNvUbJ/JK8YT5uJPtSevDnUMkaMsRsinqXlzzF5Aa/43UO 3yFbDaa35RMGddHqQneTyeHgY4jp2cLcRtuM1QBJd/ckMHW0sLl9w4RT0Pmyww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSSXw02kmzwDX; Sun, 4 Feb 2024 11:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 414Bpx00074318; Sun, 4 Feb 2024 11: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 414Bpxg7074315; Sun, 4 Feb 2024 11:51:59 GMT (envelope-from git) Date: Sun, 4 Feb 2024 11:51:59 GMT Message-Id: <202402041151.414Bpxg7074315@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: a03f768612ad - main - libstdthreads: destroy mutexattr in mtx_init() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a03f768612ad98a886458197c531a0b92203bf84 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a03f768612ad98a886458197c531a0b92203bf84 commit a03f768612ad98a886458197c531a0b92203bf84 Author: Hodong AuthorDate: 2024-02-04 10:14:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-04 11:50:56 +0000 libstdthreads: destroy mutexattr in mtx_init() PR: 276818 MFC after: 1 week --- lib/libstdthreads/mtx.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/libstdthreads/mtx.c b/lib/libstdthreads/mtx.c index 719ba6486e41..3027a4e48c8d 100644 --- a/lib/libstdthreads/mtx.c +++ b/lib/libstdthreads/mtx.c @@ -43,7 +43,7 @@ int mtx_init(mtx_t *mtx, int type) { pthread_mutexattr_t attr; - int mt; + int mt, res; switch (type) { case mtx_plain: @@ -60,11 +60,12 @@ mtx_init(mtx_t *mtx, int type) if (pthread_mutexattr_init(&attr) != 0) return (thrd_error); - if (pthread_mutexattr_settype(&attr, mt) != 0) - return (thrd_error); - if (pthread_mutex_init(mtx, &attr) != 0) - return (thrd_error); - return (thrd_success); + res = thrd_success; + if (pthread_mutexattr_settype(&attr, mt) != 0 || + pthread_mutex_init(mtx, &attr) != 0) + res = thrd_error; + pthread_mutexattr_destroy(&attr); + return (res); } int From nobody Sun Feb 4 11:59:15 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSSjJ30ZQz59dsw; Sun, 4 Feb 2024 11: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 4TSSjJ0sdgz4NlC; Sun, 4 Feb 2024 11: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=1707047956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eWPFcxzvs17QQjVfyHMEsC6r11jsgK43gGcViKT43Y=; b=Y2OxQQuK/eMslrOv2AZPuv7t+FQJolAlZruKT7lfZ+tDeb98XLAdiykixjLOcHoxOiPKKI 3+eHHaKz9AIfmfto6dCFmvbWLV+3mpCn0ep+ZEa+0hJj+lp0zV7iIKUoUx8oqg0uLmovtv KkLZRVEVkdxrW9jEI6XcwySfQ/7XAgi1uAfM2dZnY/loWCBpRCq2dX/+DGEy6+FG+pJzcQ 8GQFQBVqnv/foUCCC8eucYttU5fp91XMazxgc75xTjbJIKfMFdl+lOPqNH9lFXa2Ls7TWV ldZbs1VY/JHzY0R5NuNNgty/zVT1JJa1v9xUBwsAAwidCJ+BzeXgl+f5bQ0+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707047956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4eWPFcxzvs17QQjVfyHMEsC6r11jsgK43gGcViKT43Y=; b=w5sGlG+/rLcVAxKK28n1jcLvoefiNAdjfmVbIOLcNZeeQGxkeB7mXwPmmIV/CpFAeFyMWK cBKmqSAEHMC/hCZCt0DdZUwTiFtFBNvaDJHjfQOlDZm0xuabwBVTzxfI8JmVSqqj/2bU/5 9EtKVqSXfGMRKTDYMlhEWASrlVhys3mJOMTlUa3p2+gfE6TmvHPgxcMiBpyC9N5pbh/INn jsPnjDcVyhgL07n9iKzEdqgZc9Y1ZwfktJeG9J24eappPEg7NBBBPRDRoNyGLXV0SuyHsT kccldnNqa06CWlxPOQGSzwu++wRgY/GDrI/qsFs0hSUUJ3yPv4LTWjZA45wR8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707047956; a=rsa-sha256; cv=none; b=lZ+o/tf36fSMZxRjRP7PeuMsRjBHelCGm4V3465p4oWV9xptFbQ2dTaup8P5Msryso13Iz kwuxgsGR9exVXNBkPQCNl8JgvNdg+VOVK4PajzWfZJvgegYSZEh1vv4wFta9j7zFqEkODg xyOV8ng16VsqBgZrxctEeejV76hkFao+yM01Cprsn9bNffi1QqxVnfMXNfT3F9luAY8k4g x2NLtVKCqB8v4qIYn7FH7eNAXRS+dsCxakn6UIqLfL4bFIGxqNvdpWcaFonoTLsFh8DcD4 usqx4d03cysaA+iry2SAslAmfb/I7Gyq9lpCarnfb8ehNbQ0X75mysge+bNi3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSSjH72Y1zwjP; Sun, 4 Feb 2024 11: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 414BxFRR075483; Sun, 4 Feb 2024 11: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 414BxFBX075480; Sun, 4 Feb 2024 11:59:15 GMT (envelope-from git) Date: Sun, 4 Feb 2024 11:59:15 GMT Message-Id: <202402041159.414BxFBX075480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: cd724c25928d - main - bsdinstall: complete whitelabeling the installer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd724c25928d0d30761d118690b4ac75ca931b63 Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=cd724c25928d0d30761d118690b4ac75ca931b63 commit cd724c25928d0d30761d118690b4ac75ca931b63 Author: Mariusz Zaborski AuthorDate: 2024-02-04 11:59:07 +0000 Commit: Mariusz Zaborski CommitDate: 2024-02-04 12:01:08 +0000 bsdinstall: complete whitelabeling the installer The commit 147585b4893bc38698aaa971af336b241477eac3 introduces whitlabeling. This commit addresses couple more places where the os name was missed. Reviewed by: imp, asiciliano, brd Differential Revision: https://reviews.freebsd.org/D43638 --- usr.sbin/bsdinstall/partedit/part_wizard.c | 6 +++--- usr.sbin/bsdinstall/partedit/partedit.c | 4 ++-- usr.sbin/bsdinstall/startbsdinstall | 15 +++++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index a3c5cb43ec51..44d9a08b0c78 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -66,7 +66,7 @@ startwizard: if (error != 0) return (1); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); disk = boot_disk_select(&mesh); if (disk == NULL) { geom_deletetree(&mesh); @@ -74,7 +74,7 @@ startwizard: } bsddialog_clear(0); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); schemeroot = wizard_partition(&mesh, disk); free(disk); geom_deletetree(&mesh); @@ -82,7 +82,7 @@ startwizard: return (1); bsddialog_clear(0); - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); error = geom_gettree(&mesh); if (error != 0) { free(schemeroot); diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 74606a2ef8f3..148cb74edc75 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -125,7 +125,7 @@ main(int argc, const char **argv) while (prompt != NULL) { bsddialog_clear(0); if (!sade_mode) - bsddialog_backtitle(&conf, "FreeBSD Installer"); + bsddialog_backtitle(&conf, OSNAME " Installer"); error = geom_gettree(&mesh); if (error == 0) @@ -137,7 +137,7 @@ main(int argc, const char **argv) "installation menu.", 0, 0); break; } - + get_mount_points(items, nitems); if (i >= nitems) diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall index 63239c969ac6..ab78c2941256 100644 --- a/usr.sbin/bsdinstall/startbsdinstall +++ b/usr.sbin/bsdinstall/startbsdinstall @@ -1,5 +1,8 @@ #!/bin/sh +BSDCFG_SHARE="/usr/share/bsdconfig" +. $BSDCFG_SHARE/common.subr || exit 1 + : ${BSDDIALOG_OK=0} : ${BSDDIALOG_CANCEL=1} : ${BSDDIALOG_HELP=2} @@ -27,7 +30,7 @@ if [ $? -eq 0 ]; then else # Serial or other console echo - echo "Welcome to FreeBSD!" + echo "Welcome to ${OSNAME}!" echo echo "Please choose the appropriate terminal type for your system." echo "Common console types are:" @@ -46,18 +49,18 @@ resizewin -z if [ -f /etc/installerconfig ]; then if [ "$1" != "primary" ]; then - bsddialog --backtitle "FreeBSD Installer" --title "Installing" --msgbox "FreeBSD is being installed from a script; please use the primary console." 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Installing" --msgbox "${OSNAME} is being installed from a script; please use the primary console." 0 0 . "$0" elif bsdinstall script /etc/installerconfig; then - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 + bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of ${OSNAME} complete! Rebooting in 10 seconds" 10 30 10 reboot else - bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 fi exit fi -bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live system?" 0 0 +bsddialog --backtitle "${OSNAME} Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to ${OSNAME}! Would you like to begin an installation or use the live system?" 0 0 case $? in $BSDDIALOG_OK) # Install @@ -70,7 +73,7 @@ $BSDDIALOG_OK) # Install trap true SIGINT # Ignore cntrl-C here bsdinstall if [ $? -eq 0 ]; then - bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 + bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of ${OSNAME} complete! Would you like to reboot into the installed system now?" 0 0 case $? in $BSDDIALOG_OK) # Reboot From nobody Sun Feb 4 16:41:34 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSZzS278nz58LWF; Sun, 4 Feb 2024 16:41:56 +0000 (UTC) (envelope-from brd@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 4TSZzS1bhYz4lYG; Sun, 4 Feb 2024 16:41:56 +0000 (UTC) (envelope-from brd@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707064916; 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=AMdSdyrbKfzBFJqKn/AvcfzthHDPc44OSb6U5MqJLhk=; b=LSp7/BLOQzcbfy91tsvyZBf27icR+X6mI0qCDPi3wvQPnOy7dsRfPf3+8l9Z6KAPeAFmQL DPPwGw897tQFCqK3sqN28nql3eYTqkqd4atsWzOFEfrYcJxnRKRVcOthyOAKv2ky27c4in XrmyjksF8KVxyWN4V5C5C4Y7qzLvyONWUkpi0snhUNjwjr0a/Uo/02K4qcpfYKyHhkL2Z0 KRact3fFQ0Vf2NHsECgvvaMf0XuQuLpQiNGSr3mN2XNGfF21M9kIYWJERUJ5oCDyKuUENb dojReBlRmV38TLzYK8FfeRqjMgcm9EO0BYZ7sjE6M5wUS5txsosxK1FV1HA12Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707064916; 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=AMdSdyrbKfzBFJqKn/AvcfzthHDPc44OSb6U5MqJLhk=; b=Tufg0CaRT1DU25brJakrhlxau33TR5MlN1agx6jxokdUII4x5MQ7sqFh4Bk77zQqQum3NU hlTD/2u+BZKeNuVKB2yQtAA314YaYn6SpQtaAGD2LkLtRxrijNWhJRqbMv28VLnTZ9BbbL RxHyqgYJvz6ZOvhtzKJBDYFQi6sg5Pp9SncKjAaXF+ZjOkMT62GDO2e2bdnCDlOKIi+h27 pCg+YVimt8t4L/+MEMVMC7QLU+VNroI8LSeid2tNqe0psieMGsvstT4gzYyJsa/VfN1TOi oiPR6+HDslgWsWcgs+PSlhtH4OJ859s5eXbsn7BGER02zU9NhzFNx7fWBHIAGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707064916; a=rsa-sha256; cv=none; b=Rl1CET2XIy2U4BBW5vm4uOd0t9tLkAUPgmqTZNnbi+42MI1Jmk7FoDdDPhtVMShGDobw1q ZKTKqRhpM1sX/ezHhqwUPItE6psQ+7fp9MCfsnNx8P1DG+MwECmHpfByNe13xs13c+wbBQ dQCCtqb2tQtbhSTLLM9VDQ/lNdQcBwG498nus6gHDs2Ccc9xN9OVIUOImzlYRhUbJvRm1l CIqAzsfYOkpnSyLDsrAQj8xlcHFHUuBy6Sa/4zVr18D39hl4NVcrxP20EA3+HaqeF6kepo kWaajyUAQ+ydOshn7VRI+VNaAFLLXKj4JKs6YCokTsGjB0gW/9JnvK9x1Fo9ng== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.3 with cipher TLS_AES_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: brd/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TSZzR5sJTzbx8; Sun, 4 Feb 2024 16:41:55 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailauth.nyi.internal (Postfix) with ESMTP id F1D9F27C005B; Sun, 4 Feb 2024 11:41:54 -0500 (EST) Received: from imap48 ([10.202.2.98]) by compute1.internal (MEProxy); Sun, 04 Feb 2024 11:41:54 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedukedgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvvefutgfgse htqhertderreejnecuhfhrohhmpedfuehrrgguucffrghvihhsfdcuoegsrhgusefhrhgv vgeuufffrdhorhhgqeenucggtffrrghtthgvrhhnpeegjeeikeehgfffteelveefgfdtke ehleffieduffevheevveegjedtkedtleetveenucffohhmrghinhepfhhrvggvsghsugdr ohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe gsrhgrugdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqjedtjeeifedvfedv qddukedtieelieekkedqsghrugeppefhrhgvvgeuufffrdhorhhgsegsrhgruggurghvih hsrdhioh X-ME-Proxy: Feedback-ID: if7394599:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id AF15D31A0066; Sun, 4 Feb 2024 11:41:54 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-144-ge5821d614e-fm-20240125.002-ge5821d61 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Message-Id: <49467837-dadd-4252-bfa7-169b0630bb41@app.fastmail.com> In-Reply-To: References: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> <1D1F0A7A-C735-4D6F-B333-39920E84CD5D@freebsd.org> Date: Sun, 04 Feb 2024 09:41:34 -0700 From: "Brad Davis" To: "Jessica Clarke" Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 009d3f66cb5f - main - bsdinstall: separate out dist selection in prep for pkgbase support Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable On Fri, Feb 2, 2024, at 6:27 PM, Jessica Clarke wrote: > On 31 Jan 2024, at 22:15, Jessica Clarke wrote: >> On 31 Jan 2024, at 22:05, Brad Davis wrote: >>>=20 >>> The branch main has been updated by brd: >>>=20 >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D009d3f66cb5f0cf3f1d35= 3f311d3a6878b2a534e >>>=20 >>> commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e >>> Author: Brad Davis >>> AuthorDate: 2024-01-26 17:46:46 +0000 >>> Commit: Brad Davis >>> CommitDate: 2024-01-31 22:05:27 +0000 >>>=20 >>> bsdinstall: separate out dist selection in prep for pkgbase support >>>=20 >>> No functional change intended. >>>=20 >>> Approved by: asiciliano >>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>> Differential Revision: https://reviews.freebsd.org/D43621 >>> --- >>> usr.sbin/bsdinstall/scripts/auto | 40 ++++-------------- >>> usr.sbin/bsdinstall/scripts/selectdists | 73 +++++++++++++++++++++++= ++++++++++ >>> usr.sbin/bsdinstall/startbsdinstall | 1 + >>> 3 files changed, 82 insertions(+), 32 deletions(-) >>>=20 >>> diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/= scripts/auto >>> index 9f4b5b52fe5d..c651d654d62e 100755 >>> --- a/usr.sbin/bsdinstall/scripts/auto >>> +++ b/usr.sbin/bsdinstall/scripts/auto >>> @@ -153,36 +153,10 @@ trap true SIGINT # This section is optional >>> trap error SIGINT # Catch cntrl-C here >>> if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || e= rror "Set hostname failed"; fi >>>=20 >>> -export DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >>> -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >>> - DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6= }' $BSDINSTALL_DISTDIR/MANIFEST` >>> - DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >>> - >>> - if [ -n "$DISTMENU" ]; then >>> - exec 5>&1 >>> - EXTRA_DISTS=3D$( eval bsddialog \ >>> - --backtitle \"$OSNAME Installer\" \ >>> - --title \"Distribution Select\" --nocancel --separate-output \ >>> - --checklist \"Choose optional system components to install:\" \ >>> - 0 0 0 $DISTMENU \ >>> - 2>&1 1>&5 ) >>> - for dist in $EXTRA_DISTS; do >>> - export DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >>> - done >>> - fi >>> -fi >>> - >>> -FETCH_DISTRIBUTIONS=3D"" >>> -for dist in $DISTRIBUTIONS; do >>> - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >>> - FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >>> - fi >>> -done >>> - >>> -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ];= then >>> - bsddialog --backtitle "$OSNAME Installer" --title "Network Install= ation" --msgbox "Some installation files were not found on the boot volu= me. The next few screens will allow you to configure networking so that = they can be downloaded from the Internet." 0 0 >>> - bsdinstall netconfig || error >>> - NETCONFIG_DONE=3Dyes >>> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >>> + exec 5>&1 >>> + export DISTRIBUTIONS=3D$( `dirname $0`/selectdists 2>&1 1>&5 ) >>> + exec 5>&- >>> fi >>>=20 >>> rm -f $PATH_FSTAB >>> @@ -347,8 +321,10 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then >>>=20 >>> [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote distributio= ns" >>> fi >>> -bsdinstall checksum || error "Distribution checksum failed" >>> -bsdinstall distextract || error "Distribution extract failed" >>> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >>> + bsdinstall checksum || error "Distribution checksum failed" >>> + bsdinstall distextract || error "Distribution extract failed" >>> +fi >>>=20 >>> # Set up boot loader >>> bsdinstall bootconfig || error "Failed to configure bootloader" >>> diff --git a/usr.sbin/bsdinstall/scripts/selectdists b/usr.sbin/bsdi= nstall/scripts/selectdists >>> new file mode 100644 >>> index 000000000000..b548e82a95f8 >>> --- /dev/null >>> +++ b/usr.sbin/bsdinstall/scripts/selectdists >>> @@ -0,0 +1,73 @@ >>> +#!/bin/sh >>> +#- >>> +# Copyright (c) 2011 Nathan Whitehorn >>> +# Copyright (c) 2013-2018 Devin Teske >>> +# 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 copyri= ght >>> +# notice, this list of conditions and the following disclaimer i= n the >>> +# documentation and/or other materials provided with the distrib= ution. >>> +# >>> +# 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 PARTICULA= R PURPOSE >>> +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE >>> +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONS= EQUENTIAL >>> +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE= GOODS >>> +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPT= ION) >>> +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRAC= T, STRICT >>> +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN= ANY WAY >>> +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILI= TY OF >>> +# SUCH DAMAGE. >>> +# >>> +# >>> +############################################################ INCLUD= ES >>> + >>> +BSDCFG_SHARE=3D"/usr/share/bsdconfig" >>> +. $BSDCFG_SHARE/common.subr || exit 1 >>> + >>> +############################################################ CONFIG= URATION >>> + >>> +# >>> +# Default distributions >>> +# >>> +DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >>> + >>> +############################################################ MAIN >>> + >>> +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >>> + DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6= }' $BSDINSTALL_DISTDIR/MANIFEST` >>> + DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >>> + >>> + if [ -n "$DISTMENU" ]; then >>> + EXTRA_DISTS=3D$( eval bsddialog \ >>> + --backtitle \"$OSNAME Installer\" \ >>> + --title \"Distribution Select\" --nocancel --separate-output \ >>> + --checklist \"Choose optional system components to install:\" \ >>> + 0 0 0 $DISTMENU \ >>> + 2>&1 >&3 ) >>> + for dist in $EXTRA_DISTS; do >>> + DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >>> + done >>> + fi >>> +fi >>> + >>> +FETCH_DISTRIBUTIONS=3D"" >>> +for dist in $DISTRIBUTIONS; do >>> + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >>> + FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >>> + fi >>> +done >>> + >>> +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ];= then >>> + bsddialog --backtitle "$OSNAME Installer" --title "Network Install= ation" --msgbox "Some installation files were not found on the boot volu= me. The next few screens will allow you to configure networking so that = they can be downloaded from the Internet." 0 0 >>> + bsdinstall netconfig || error >>> + NETCONFIG_DONE=3Dyes >>> +fi >>> + >>> +echo $DISTRIBUTIONS >&2 >>> diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinsta= ll/startbsdinstall >>> index 63239c969ac6..8d9fb981c11d 100644 >>> --- a/usr.sbin/bsdinstall/startbsdinstall >>> +++ b/usr.sbin/bsdinstall/startbsdinstall >>> @@ -6,6 +6,7 @@ >>> : ${BSDDIALOG_EXTRA=3D3} >>> : ${BSDDIALOG_ESC=3D5} >>> : ${BSDDIALOG_ERROR=3D255} >>> +export BSDINSTALL_USE_DISTRIBUTIONS=3Dy >>=20 >> I said it in the review and I=E2=80=99ll say it again here since you = decided to >> just ignore me: this does not belong here. Please remove it and fix t= he >> default in selectdists. > > Firstly, ping on this. I still object to the approach taken here. > > Secondly, this commit was not at all tested. You do not install the new > selectdists script, and so the installer falls over (in a rather > cryptic way*). I am extremely unimpressed at ignoring reviewer comments > and completely breaking the installer, and thus am immediately > reverting this commit. It probably works if you install the script, but > it=E2=80=99s your job to test that, not mine, so when you have a patch= that > actually works please re-seek review and actually engage with the > comments. I appreciate your feedback, but I explained why I did it that way and th= at wasn't good enough for you. Sorry for the breakage. I tested by rebuilding the memstick image over = and over and installing a bhyve VM: sudo make -C release clean && sudo make -C release memstick NOPORTS=3Dy = NOPKG=3Dy NOSRC=3Dy WITHOUT_DEBUG=3Dy # ls -al /usr/libexec/bsdinstall/selectdists=20 -r-xr-xr-x 1 root wheel 2882 Jan 31 21:37 /usr/libexec/bsdinstall/selec= tdists So I am not sure how it worked for me. Regards, Brad Davis From nobody Sun Feb 4 17:15:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSbk25fVSz58PMM for ; Sun, 4 Feb 2024 17:15:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TSbk23xvvz4px4 for ; Sun, 4 Feb 2024 17:15:22 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3394ca0c874so2497780f8f.2 for ; Sun, 04 Feb 2024 09:15:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707066921; x=1707671721; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oIAcfcgTkeiBFtvr8VTJ0O5Jy586/TX+edXsey3JODo=; b=uFxBHzEy7cxU7tCHusZerxMvVx1g5GGjgx3BSIoOPjvqTShoAH99B55R3+W36KP+QP f7sSJVG5DqaxGaJh4tFVieakDjqN69losdtOqTMicPK4Swck2WkJpTM+dmR9Mjyiw9xB 6gjcj6GQ86qV2LuEk+OVgJA0e0u33ksTW9WfAJEKX0/wDn9vZTOPjq9RfeqOtCZD6UZl 95XDxWBY6hyJfOIiC5K19q4KhuSLCktJxtx5LUTZ1N3nhVHZv2XIT7HPIZ1Aq6vKqpzG AcB1oNNtaBhU2aulxaFmk/nBmbkonRE3JkInRbsev+GIkX3Y9eKFf6dZRBFy0fNKtzgt R5/g== X-Gm-Message-State: AOJu0YylQZU/kfBcO0WSDAHK7GBBcMKrm/X7G8iypZUW1sBGM+X2+4mj OshUzNQiAsx7jWQkpiPEFY30kWlcpAD6EDjtiGndOEleoSpkX/XR7pWTAuUyjlY= X-Google-Smtp-Source: AGHT+IHLfICq/w19DW3GnNGhgeAEuqUy9RwjTdtj2tVaWyBmfludadpbp4XCItbucC02YKrDR+bYQA== X-Received: by 2002:a05:6000:184c:b0:33b:3d7b:9df5 with SMTP id c12-20020a056000184c00b0033b3d7b9df5mr147643wri.3.1707066920675; Sun, 04 Feb 2024 09:15:20 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXR7AS+G/o/SvKSk7UWN+7UAgaaE3/CzZiAL4OAFYiLrJAK4h2GvhNBXz+8dvqW8L/xHr73DJxpGRW0DssPi8PeocqWkK5vqMCklNqV4VbseuDGIJiQg7gU15KEJtq5skv7bJcsUxu+Wpnralv+aD2IRw== Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id u7-20020adff887000000b0033b2221d938sm5555622wrp.76.2024.02.04.09.15.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Feb 2024 09:15:20 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 009d3f66cb5f - main - bsdinstall: separate out dist selection in prep for pkgbase support From: Jessica Clarke In-Reply-To: <49467837-dadd-4252-bfa7-169b0630bb41@app.fastmail.com> Date: Sun, 4 Feb 2024 17:15:09 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1BF97C99-2AB2-44C5-B0C7-8FC441735748@freebsd.org> References: <202401312205.40VM5dQS018685@gitrepo.freebsd.org> <1D1F0A7A-C735-4D6F-B333-39920E84CD5D@freebsd.org> <49467837-dadd-4252-bfa7-169b0630bb41@app.fastmail.com> To: Brad Davis X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Rspamd-Queue-Id: 4TSbk23xvvz4px4 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:15169, ipnet:209.85.128.0/17, country:US] On 4 Feb 2024, at 16:41, Brad Davis wrote: > On Fri, Feb 2, 2024, at 6:27 PM, Jessica Clarke wrote: >> On 31 Jan 2024, at 22:15, Jessica Clarke wrote: >>> On 31 Jan 2024, at 22:05, Brad Davis wrote: >>>>=20 >>>> The branch main has been updated by brd: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D009d3f66cb5f0cf3f1d353f311d3a687= 8b2a534e >>>>=20 >>>> commit 009d3f66cb5f0cf3f1d353f311d3a6878b2a534e >>>> Author: Brad Davis >>>> AuthorDate: 2024-01-26 17:46:46 +0000 >>>> Commit: Brad Davis >>>> CommitDate: 2024-01-31 22:05:27 +0000 >>>>=20 >>>> bsdinstall: separate out dist selection in prep for pkgbase = support >>>>=20 >>>> No functional change intended. >>>>=20 >>>> Approved by: asiciliano >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>>> Differential Revision: https://reviews.freebsd.org/D43621 >>>> --- >>>> usr.sbin/bsdinstall/scripts/auto | 40 ++++-------------- >>>> usr.sbin/bsdinstall/scripts/selectdists | 73 = +++++++++++++++++++++++++++++++++ >>>> usr.sbin/bsdinstall/startbsdinstall | 1 + >>>> 3 files changed, 82 insertions(+), 32 deletions(-) >>>>=20 >>>> diff --git a/usr.sbin/bsdinstall/scripts/auto = b/usr.sbin/bsdinstall/scripts/auto >>>> index 9f4b5b52fe5d..c651d654d62e 100755 >>>> --- a/usr.sbin/bsdinstall/scripts/auto >>>> +++ b/usr.sbin/bsdinstall/scripts/auto >>>> @@ -153,36 +153,10 @@ trap true SIGINT # This section is optional >>>> trap error SIGINT # Catch cntrl-C here >>>> if [ -z "$BSDINSTALL_SKIP_HOSTNAME" ]; then bsdinstall hostname || = error "Set hostname failed"; fi >>>>=20 >>>> -export DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >>>> -if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >>>> - DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print = $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` >>>> - DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >>>> - >>>> - if [ -n "$DISTMENU" ]; then >>>> - exec 5>&1 >>>> - EXTRA_DISTS=3D$( eval bsddialog \ >>>> - --backtitle \"$OSNAME Installer\" \ >>>> - --title \"Distribution Select\" --nocancel --separate-output \ >>>> - --checklist \"Choose optional system components to install:\" = \ >>>> - 0 0 0 $DISTMENU \ >>>> - 2>&1 1>&5 ) >>>> - for dist in $EXTRA_DISTS; do >>>> - export DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >>>> - done >>>> - fi >>>> -fi >>>> - >>>> -FETCH_DISTRIBUTIONS=3D"" >>>> -for dist in $DISTRIBUTIONS; do >>>> - if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >>>> - FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >>>> - fi >>>> -done >>>> - >>>> -if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" = ]; then >>>> - bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 >>>> - bsdinstall netconfig || error >>>> - NETCONFIG_DONE=3Dyes >>>> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >>>> + exec 5>&1 >>>> + export DISTRIBUTIONS=3D$( `dirname $0`/selectdists 2>&1 1>&5 ) >>>> + exec 5>&- >>>> fi >>>>=20 >>>> rm -f $PATH_FSTAB >>>> @@ -347,8 +321,10 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then >>>>=20 >>>> [ $FETCH_RESULT -ne 0 ] && error "Could not fetch remote = distributions" >>>> fi >>>> -bsdinstall checksum || error "Distribution checksum failed" >>>> -bsdinstall distextract || error "Distribution extract failed" >>>> +if [ -n "$BSDINSTALL_USE_DISTRIBUTIONS" ]; then >>>> + bsdinstall checksum || error "Distribution checksum failed" >>>> + bsdinstall distextract || error "Distribution extract failed" >>>> +fi >>>>=20 >>>> # Set up boot loader >>>> bsdinstall bootconfig || error "Failed to configure bootloader" >>>> diff --git a/usr.sbin/bsdinstall/scripts/selectdists = b/usr.sbin/bsdinstall/scripts/selectdists >>>> new file mode 100644 >>>> index 000000000000..b548e82a95f8 >>>> --- /dev/null >>>> +++ b/usr.sbin/bsdinstall/scripts/selectdists >>>> @@ -0,0 +1,73 @@ >>>> +#!/bin/sh >>>> +#- >>>> +# Copyright (c) 2011 Nathan Whitehorn >>>> +# Copyright (c) 2013-2018 Devin Teske >>>> +# 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. >>>> +# >>>> +# >>>> +############################################################ = INCLUDES >>>> + >>>> +BSDCFG_SHARE=3D"/usr/share/bsdconfig" >>>> +. $BSDCFG_SHARE/common.subr || exit 1 >>>> + >>>> +############################################################ = CONFIGURATION >>>> + >>>> +# >>>> +# Default distributions >>>> +# >>>> +DISTRIBUTIONS=3D"${DISTRIBUTIONS:-base.txz kernel.txz}" >>>> + >>>> +############################################################ MAIN >>>> + >>>> +if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then >>>> + DISTMENU=3D`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print = $1,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST` >>>> + DISTMENU=3D"$(echo ${DISTMENU} | sed -E 's/\.txz//g')" >>>> + >>>> + if [ -n "$DISTMENU" ]; then >>>> + EXTRA_DISTS=3D$( eval bsddialog \ >>>> + --backtitle \"$OSNAME Installer\" \ >>>> + --title \"Distribution Select\" --nocancel --separate-output \ >>>> + --checklist \"Choose optional system components to install:\" \ >>>> + 0 0 0 $DISTMENU \ >>>> + 2>&1 >&3 ) >>>> + for dist in $EXTRA_DISTS; do >>>> + DISTRIBUTIONS=3D"$DISTRIBUTIONS $dist.txz" >>>> + done >>>> + fi >>>> +fi >>>> + >>>> +FETCH_DISTRIBUTIONS=3D"" >>>> +for dist in $DISTRIBUTIONS; do >>>> + if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then >>>> + FETCH_DISTRIBUTIONS=3D"$FETCH_DISTRIBUTIONS $dist" >>>> + fi >>>> +done >>>> + >>>> +if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" = ]; then >>>> + bsddialog --backtitle "$OSNAME Installer" --title "Network = Installation" --msgbox "Some installation files were not found on the = boot volume. The next few screens will allow you to configure networking = so that they can be downloaded from the Internet." 0 0 >>>> + bsdinstall netconfig || error >>>> + NETCONFIG_DONE=3Dyes >>>> +fi >>>> + >>>> +echo $DISTRIBUTIONS >&2 >>>> diff --git a/usr.sbin/bsdinstall/startbsdinstall = b/usr.sbin/bsdinstall/startbsdinstall >>>> index 63239c969ac6..8d9fb981c11d 100644 >>>> --- a/usr.sbin/bsdinstall/startbsdinstall >>>> +++ b/usr.sbin/bsdinstall/startbsdinstall >>>> @@ -6,6 +6,7 @@ >>>> : ${BSDDIALOG_EXTRA=3D3} >>>> : ${BSDDIALOG_ESC=3D5} >>>> : ${BSDDIALOG_ERROR=3D255} >>>> +export BSDINSTALL_USE_DISTRIBUTIONS=3Dy >>>=20 >>> I said it in the review and I=E2=80=99ll say it again here since you = decided to >>> just ignore me: this does not belong here. Please remove it and fix = the >>> default in selectdists. >>=20 >> Firstly, ping on this. I still object to the approach taken here. >>=20 >> Secondly, this commit was not at all tested. You do not install the = new >> selectdists script, and so the installer falls over (in a rather >> cryptic way*). I am extremely unimpressed at ignoring reviewer = comments >> and completely breaking the installer, and thus am immediately >> reverting this commit. It probably works if you install the script, = but >> it=E2=80=99s your job to test that, not mine, so when you have a = patch that >> actually works please re-seek review and actually engage with the >> comments. >=20 > I appreciate your feedback, but I explained why I did it that way and = that wasn't good enough for you. That=E2=80=99s a rather misleading characterisation of what was a = discussion: jrtc27: This seems pretty strange to do here. Why isn't it the default? brd: Because in the near future it won't be the default jrtc27: Then change the default when the default should change? This doesn't belong here. Besides, I'd expect a transitional period where there's a menu asking which you'd like; pkgbase is coming along but it still seems like it isn't quite battle-tested enough to be the only way to install FreeBSD. emaste: What I'd like to do is have a menu in the boot loader that sets a variable for experimental features, so that it can be available in snapshots but still somewhat hidden jrtc27: That seems reasonable. But that still doesn't make this line belong here. That was the limit of your explanation, with no response to the more detailed follow-ups refuting that explanation. If you want more of a technical justification that just what is in my view an ugly design, startbsdinstall is meant to just be a wrapper around bsdinstall that provides the install media-specific behaviour, with bsdinstall itself being usable standalone as a program you can just run. Therefore any default settings like this one need to be set inside bsdinstall, not startbsdinstall. > Sorry for the breakage. I tested by rebuilding the memstick image = over and over and installing a bhyve VM: >=20 > sudo make -C release clean && sudo make -C release memstick NOPORTS=3Dy = NOPKG=3Dy NOSRC=3Dy WITHOUT_DEBUG=3Dy >=20 > # ls -al /usr/libexec/bsdinstall/selectdists=20 > -r-xr-xr-x 1 root wheel 2882 Jan 31 21:37 = /usr/libexec/bsdinstall/selectdists >=20 > So I am not sure how it worked for me. Who knows. Maybe you forgot to stage one hunk (though you likely still missed OptionalObsoleteFiles.inc, which is often forgotten). But arc doesn=E2=80=99t normally let you run arc diff in that case... Jess From nobody Sun Feb 4 21:02:53 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TShmY6CpVz58nn1; Sun, 4 Feb 2024 21:02: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 4TShmY5l33z4Nfp; Sun, 4 Feb 2024 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707080573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CgfO5OkIToc4rrrKyjRR34kXM1YotvHkqC/ppoIIueM=; b=dx1OC3TkS6AtJVcLx5ZMcJXKjz1MWP/RlmUBS0taEPEW3W3iE0UBquBsIBAEtasmbU4sDy oxIB58MRPDPaWGD5L+T4TWXK9WyjOhiPJCXAfWHN8OwhU0Ibptb8xdMOc2MVwE/D40rfai iD53weFWlcsa358DWaVyLcfcxfUaEmzK5Awq4RRnpPo3OMf8WRq0W6PK4VGSGMcNcOjiF1 K+LRBLHoDQ4prKmgz1hW9BtVRXg/GnV0o7lNGKKSFB1UZBTUIQITupNSDl82OPMPtH+54J i+43doS52GvKodzcE3apjbGcXQhReLJzsCqARgbzSMSHIO6tfjeFbRzydlmAiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707080573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CgfO5OkIToc4rrrKyjRR34kXM1YotvHkqC/ppoIIueM=; b=doDDfuSkcFaoKRoAaS62N47Pe7NGQY+YKGJw/nZNrLKpkibMQarnDqPFvFcTDfAKwVL58l u43YSznCLrvh1ZRmZ9UAL0sO3D1DDE07nKLC7XgMsnS8O1KowhUkqQr+Es0fVvuhb+HLPw 1JhshCerLOEhN/zUvvxIKVQtZuAC3ZcStjZKipcmQAIBx2cdIOdEtpAenrq15Colbujau2 vxP4xsLMInRWxl7zVuPfx9N5YDwlz+i5vX9eKOAYzuLuuvcAXS2uLa3PISyR/JVRNsA/KV xFPm9fREI/PM31O0Q1m84TYLtsPo6/AFvvtdVl+K3I+OAQpfdIknnru0GEwmpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707080573; a=rsa-sha256; cv=none; b=K9dIxnJX29xrOUzzKPip1+LxeHbvJxpRHhOJYyGgN8PIApKo5vmff6FH5+8EYhjWAV+9bv lQn5KmDnvkKMoAcneafThTIN2RyMW9eIiSS7kBeVSrA8OayLen3GKV1MfFJxlnKPIo1Sr0 paKmhrhMqX4d8aKZebPNMqe3bUayyS+7KbiU5baShLQbskgFpO98GG2NQ1kN4OVOYXfdJM AAxi6gSff5JeyscJkKotBfxrRDKLTki0tzM/4SaNRbcfywtXcyIx219c/wOrkHpBP6xXYY 3uaMSsk67l3CXwucS/cmYlOOdmiWlqJqoUGuieMFeb/hTtmLOMdxmKpeqwBTHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TShmY4nXqz1C2q; Sun, 4 Feb 2024 21:02: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 414L2ra7000241; Sun, 4 Feb 2024 21:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414L2rCw000238; Sun, 4 Feb 2024 21:02:53 GMT (envelope-from git) Date: Sun, 4 Feb 2024 21:02:53 GMT Message-Id: <202402042102.414L2rCw000238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 55b80e2ca52c - main - fusefs: fix invalid value for st_birthtime.tv_nsec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55b80e2ca52c4b27c4920d372a6e71ac9ab7da9e Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=55b80e2ca52c4b27c4920d372a6e71ac9ab7da9e commit 55b80e2ca52c4b27c4920d372a6e71ac9ab7da9e Author: Alan Somers AuthorDate: 2024-01-25 15:19:37 +0000 Commit: Alan Somers CommitDate: 2024-02-04 21:01:06 +0000 fusefs: fix invalid value for st_birthtime.tv_nsec If a file system's on-disk format does not support st_birthtime, it isn't clear what value it should return in stat(2). Neither our man page nor the OpenGroup specifies. But our convention for UFS and msdosfs is to return { .tv_sec = -1, .tv_nsec = 0 }. fusefs is different. It returns { .tv_sec = -1, .tv_nsec = -1 }. It's done that ever since the initial import in SVN r241519. Most software apparently handles this just fine. It must, because we've had no complaints. But the Rust standard library will panic when reading such a timestamp during std::fs::metadata, even if the caller doesn't care about that particular value. That's a separate bug, and should be fixed. Change our invalid value to match msdosfs and ufs, pacifying the Rust standard library. PR: 276602 MFC after: 1 week Sponsored by: Axcient Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43590 --- sys/fs/fuse/fuse_internal.c | 1 - sys/fs/fuse/fuse_node.c | 7 +++++++ tests/sys/fs/fusefs/getattr.cc | 15 +++++++++------ tests/sys/fs/fusefs/lookup.cc | 15 +++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index f4a2e7efc908..ffbf1f9bcc40 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -325,7 +325,6 @@ fuse_internal_cache_attrs(struct vnode *vp, struct fuse_attr *attr, else return; - vattr_null(vp_cache_at); vp_cache_at->va_fsid = mp->mnt_stat.f_fsid.val[0]; vp_cache_at->va_fileid = attr->ino; vp_cache_at->va_mode = attr->mode & ~S_IFMT; diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index ecff94cf6dd9..13c2b59c7c97 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -155,7 +155,14 @@ fuse_vnode_init(struct vnode *vp, struct fuse_vnode_data *fvdat, { fvdat->nid = nodeid; LIST_INIT(&fvdat->handles); + vattr_null(&fvdat->cached_attrs); + fvdat->cached_attrs.va_birthtime.tv_sec = -1; + fvdat->cached_attrs.va_birthtime.tv_nsec = 0; + fvdat->cached_attrs.va_fsid = VNOVAL; + fvdat->cached_attrs.va_gen = 0; + fvdat->cached_attrs.va_rdev = NODEV; + if (nodeid == FUSE_ROOT_ID) { vp->v_vflag |= VV_ROOT; } diff --git a/tests/sys/fs/fusefs/getattr.cc b/tests/sys/fs/fusefs/getattr.cc index 1795f29a5d76..98a757fdff94 100644 --- a/tests/sys/fs/fusefs/getattr.cc +++ b/tests/sys/fs/fusefs/getattr.cc @@ -246,12 +246,15 @@ TEST_F(Getattr, ok) EXPECT_EQ(ino, sb.st_ino); EXPECT_EQ(S_IFREG | 0644, sb.st_mode); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* diff --git a/tests/sys/fs/fusefs/lookup.cc b/tests/sys/fs/fusefs/lookup.cc index 549df0369fa7..6d506c1ab700 100644 --- a/tests/sys/fs/fusefs/lookup.cc +++ b/tests/sys/fs/fusefs/lookup.cc @@ -112,12 +112,15 @@ TEST_F(Lookup, attr_cache) // fuse(4) does not _yet_ support inode generations //EXPECT_EQ(generation, sb.st_gen); - //st_birthtim and st_flags are not supported by protocol 7.8. They're - //only supported as OS-specific extensions to OSX. - //EXPECT_EQ(, sb.st_birthtim); - //EXPECT_EQ(, sb.st_flags); - - //FUSE can't set st_blksize until protocol 7.9 + /* + * st_birthtim and st_flags are not supported by the fuse protocol. + * They're only supported as OS-specific extensions to OSX. For + * birthtime, the convention for "not supported" is "negative one + * second". + */ + EXPECT_EQ(-1, sb.st_birthtim.tv_sec); + EXPECT_EQ(0, sb.st_birthtim.tv_nsec); + EXPECT_EQ(0u, sb.st_flags); } /* From nobody Sun Feb 4 21:12:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TShzb5hYrz58pqs; Sun, 4 Feb 2024 21:12: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 4TShzb5GXxz4PY9; Sun, 4 Feb 2024 21:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707081147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8LnBMTSyzOWtY5uYExFqmqpdNlSSqfYbrPZfA4UwV0=; b=OxF3SkuzNx5Kf6QnyQaQTuHdxtT0Zn3CMZFSS07pzlrbVoeZYKMhgH1w1QZW0tKAFQE45F sjiJ6mUMVwdbMDOCpPoGEIX+WbOUjZgDU6dsdsrAGWhM2YXJ8ewq2sXVxGOn2W0yKHmpzO FMMfcGXyV7NAQ+rDdTHx0NE/jtJKoPO0WKSnqQTH6prxQMb+rpB2/Nzwvl5kp7g6iD8Nl9 TBLblGi/01PXa/m2nYyKxsWQamcs7iu9DC0QYPHTtEx7hBZ+fvqy9MfdqJZh+2dScTsFR8 Arf0DNk27wlkVbPUAjOJywc8dFXQ4U/8tSR0sNyhEVOM8EKIqbsHZpJ4OWgRDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707081147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r8LnBMTSyzOWtY5uYExFqmqpdNlSSqfYbrPZfA4UwV0=; b=PaP2+03Lps0cKOlb8w0w8plO20iT50NZVe+VLOW6SVCTdpM4hQzb+2e0UxFp5T41vLsxnn vS0ySxBOwm41Fc7jvi32W8DGlHLB65+wcUn8OyEv1g+x2Ea4sGZyOXOXAfBPCmW1ouBcID ORN5YmZVHZaDDoPmS34K58DnzfFwbQiR0cUStrMwjYCtP8YjTIZRPtYzGj9VI3Xic6/Pjq +j2fjENhmYLWYNx5oP3I2QsM2Crhg+iTPEr1Ky1ERkwAhKSxx2sRT5VilxD+XLaz2ElFQE +yNH6ndEv8oieX+wdqLnG52aMIQhivkJI/PX62w6Iopv3E0egQqm/ZdF8vkGNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707081147; a=rsa-sha256; cv=none; b=OSzMeEABICVuIt9UoZZEGaod5rBGLU70NScHOd/Yy6o9XPILSKZZIrycJ4Fng/W/rLUJD8 CelrcX3GqhCb+bLEdQBxMnCwsDGHG1ebYoFwwXW93XeLh1PEY87VWcFWqkZ8l03JH/G2Fh 77XPoBMdmvXccQRgm0Lb53jHWT7zuRJ/7T0QDQpkwQkjSYKIxRReC/VJrv+6WccJbQ2XzI ZOW0S1Zb0hMc9As4BiLlHqqOTG7FbbKN4HKVhovaUgYqeOhExiTSrLpnN1NCJiIh2I/Uq2 Pw47/U2JA0zvkqyZdRJZKhCuKMR/9KLbEvCwGjsUmPP0z27y2Unya1x5l5UeBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TShzb4KxCz1CgY; Sun, 4 Feb 2024 21:12: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 414LCRHH017307; Sun, 4 Feb 2024 21:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414LCRkR017304; Sun, 4 Feb 2024 21:12:27 GMT (envelope-from git) Date: Sun, 4 Feb 2024 21:12:27 GMT Message-Id: <202402042112.414LCRkR017304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 064fa628ce37 - main - loader: For EFI, if we don't have ConOut, try ConIn List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 064fa628ce375028f2510182f4edbafa7f469ecb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=064fa628ce375028f2510182f4edbafa7f469ecb commit 064fa628ce375028f2510182f4edbafa7f469ecb Author: Warner Losh AuthorDate: 2024-02-04 21:09:48 +0000 Commit: Warner Losh CommitDate: 2024-02-04 21:09:48 +0000 loader: For EFI, if we don't have ConOut, try ConIn Try ConIn if we don't have a ConOut variable. ConIn will contain HID devices and/or serial devices. We currently just search for serial devices and will use them instead of video with the current code. While ConIn w/o ConOut is fairly common on laptops, is kinda rare on servers. Some refinement may be needed in the future if servers come to light. This is also minimal to allow possible integration into 13.3 release. MFC After: 1 week Sponsored by: Netflix Reviewed by: dab, tsoome Differential Revision: https://reviews.freebsd.org/D43714 --- stand/efi/loader/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 23894d832e5e..d7cffe5f6df9 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -722,7 +722,10 @@ setenv_int(const char *key, int val) * Parse ConOut (the list of consoles active) and see if we can find a * serial port and/or a video port. It would be nice to also walk the * ACPI name space to map the UID for the serial port to a port. The - * latter is especially hard. + * latter is especially hard. Also check for ConIn as well. This will + * be enough to determine if we have serial, and if we don't, we default + * to video. If there's a dual-console situation with ConIn, this will + * currently fail. */ int parse_uefi_con_out(void) @@ -741,6 +744,8 @@ parse_uefi_con_out(void) rv = efi_global_getenv("ConOut", buf, &sz); if (rv != EFI_SUCCESS) rv = efi_global_getenv("ConOutDev", buf, &sz); + if (rv != EFI_SUCCESS) + rv = efi_global_getenv("ConIn", buf, &sz); if (rv != EFI_SUCCESS) { /* * If we don't have any ConOut default to both. If we have GOP From nobody Sun Feb 4 22:53:09 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TSlCn5KvBz590B1; Sun, 4 Feb 2024 22: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 4TSlCn2dybz4Ybb; Sun, 4 Feb 2024 22: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=1707087189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26PUn/PkRZ39SZ1tuKa3+V6pb0AIHiH+IG4hs5BkT3s=; b=Q7aMILb/RX8u64iFHjqytPJ9526bvGAG6eGA50jyfBg8u3cUc7mxchHB8tMHXd5ACXbE8F R10RV7V0ciwmXY3exLk02ULECejPkV2T/o1vZWclq4WfJcTw65qAzdjI/umPGJWIqjVQQ3 Uir6dMc5VhZTpbYi3L7JWgiwabwmd9xk/D+x+I0ZoQ/EAhUM/SEA0tE5mUC1h8Y9lissT8 Rgtoi4EubrfUFZRaj5C2j23+2oHsd3A0L9KrG6wN7+AjXd0VSItW/vhrc3LTIvCXe7tm7y FibeQRC205oLlEmNyvn5n0UNZU5qRrvGB6HSf6/l+jFh128L/bZ5xb9q86J/tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707087189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26PUn/PkRZ39SZ1tuKa3+V6pb0AIHiH+IG4hs5BkT3s=; b=vK0gclcMab18B/W+vpoqh0hFc/QexI1BNM2wdLGHftG1z66EDhuBGLFK8uoRlrk60jDP49 Pg0nuSLE0aByGOVcEupfRywqXGXM+AmnaYBJic65EE+cMnxnkrujcDU5mcHFHFSZvKnRX5 WBsQI3OQWH+3zVwvRYkDhwYJLKzJ0+x/Z//bGRbyKzSfeIuwK8lZv0QNsxsiJ8rGceXYia sof7ygDqePdfMsXCfzlieLGuQ8SLMr2oa3lB3HHCl9Qe8WzdDN2+cjKaJFaa2DZkePNWYr ebCwGFrR8R10IlVuH2AMjn4qh1a5DzgLb+zI7dC+9D+S3R1Lcx8xc58YIu9d1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707087189; a=rsa-sha256; cv=none; b=ArX3Sw5B6nKaOafOAxg3bKzyXOtP4uEfqleaxLfafYKEOaYCKePCHKAhWiRv+mPZMAC3Dw E6WHT+hDDAs/gc7uE3DZYHKPY07Ghu4ZS2Fa6HfywcMwaO3nxRhrlps2QeYx34a/YnhGco johHLjC0BvufDcn8t96iI/I+6o+ytxMtL+ADjYKyR3Uu5KYr1zz6tvmZTlnhOEw1x5vsXK S/z3aEo5T+4fy50eDEs+kIF41UoZJIWzA7wuYDyoY6ijP5CmZD1s8IhhlujYwp2HDTbziw mEXcyDXDlCcv80zWAEbMLC4wNRmUiXjIdbYETY7qdiifyq2YpmKhj4EONFT7kA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TSlCn1j7dzGg0; Sun, 4 Feb 2024 22: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 414Mr97b084956; Sun, 4 Feb 2024 22: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 414Mr9bt084953; Sun, 4 Feb 2024 22:53:09 GMT (envelope-from git) Date: Sun, 4 Feb 2024 22:53:09 GMT Message-Id: <202402042253.414Mr9bt084953@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: dfabf3efaa79 - main - libjail: Guard against programmer error in jailparam_export() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5 commit dfabf3efaa795e657f3858b7e2d0b11f8a51ecb5 Author: Mark Johnston AuthorDate: 2024-02-04 02:22:09 +0000 Commit: Mark Johnston CommitDate: 2024-02-04 22:52:30 +0000 libjail: Guard against programmer error in jailparam_export() If the caller didn't use jailparam_import() to fetch the parameter value, an attempt to export it will trigger a segfault. Make it a bit easier to figure out what's happening in this situation. PR: 276809 Reviewed by: jamie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43732 --- lib/libjail/jail.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c index 864c6981db2b..8e5b420d677b 100644 --- a/lib/libjail/jail.c +++ b/lib/libjail/jail.c @@ -737,6 +737,12 @@ jailparam_export(struct jailparam *jp) int i, nval, ival; char valbuf[INET6_ADDRSTRLEN]; + if (jp->jp_value == NULL) { + snprintf(jail_errmsg, JAIL_ERRMSGLEN, + "parameter %s was not imported", jp->jp_name); + errno = EINVAL; + return (NULL); + } if ((jp->jp_ctltype & CTLTYPE) == CTLTYPE_STRING) { value = strdup(jp->jp_value); if (value == NULL)