From nobody Sun Oct 15 02:13:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7P0j33R4z4xXcL; Sun, 15 Oct 2023 02:13: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 4S7P0j2YYwz3bFf; Sun, 15 Oct 2023 02:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697335989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IesMAGKIJivX4fHqnhncz720k/4B/qXW5Xslfv4KUM0=; b=F5W8CC97RO8sYdM400s0z9/NfEC0KTE/YbKAviB0XLrWXlzdndNw9fFbGSFtJgLhFTRfNe c6u4+o4UU/RLMrEwZnwysyC9xY1NaNvzxIjlOUlIcYWzLNXAzQiexdKU0BJmtlRBSVsQpO vOQnCeyWiVPxXIogz2yJgsH7wLCqBGRrwSVF4kqdp1JVG1s3EHYu9dniFuUzHEdiY1Wjee 1oAFwYLe7aKHgLJ/CtZjbqIl2cHu8o1eXQg/T54ZrLBGqRHjp6p5wPjQV/169FDOBfgSN0 LHRbNOjB6BDTdHgHe01Vi4n3dibuWcZHMeN9ThwhDCfIFqXNUwgGStBdL7JiFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697335989; a=rsa-sha256; cv=none; b=ugPIc7H+Ni6cclFntr4CeucyoS8HBtry6htIdbZbgfI35jS5cEZenlkrBSL2VxtYGhLDoD RJL/CQCEkStKqC3DML/bgcbZ3YNpxy9c6Fu1tbTH4vd3Hxr0PQAa40tUiEXs6hJWXu6aEl J+a7EENa7Vj/ix8itrYivwNkAO490rBqMiQv1CLzdUYFPrhcQaZEZsPxhkxgyANHj2+e7s DRET4YhS27/PFy1s5yElyy4iW8Z64F6xyFiT/eCeRJTCGIF2Npft7vvrQuKMFJbzdvZjQI 6LVpQ8HOco7hUg2ZsVZ3QEqs8atk3msYV5gXOpdKdDlG4YNv4U12XLtcLwbNWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697335989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IesMAGKIJivX4fHqnhncz720k/4B/qXW5Xslfv4KUM0=; b=Ht5+UOjgtlwJ225b+TeJps7/QxlfNUkGoPIFyOkqhN5Znrq2R/SnAlOUr9PbE+Yi1neUMj 0sbivSOiBxu3xt/rRa5HdxHVGoYC2XklrcD1jHhTr7YRkOqK0Ychh+3Z4VuQxFaKkrluiM iCXM7cjJn8x+mq2ahj65ySYBQ9mFObDKACb8relx0jW2/f2rlvqG9z+4vPTUTT2O5Gmkt1 KrSb7GsVsm4caOjkKl662SQuiGqICnZq7H2HNUohPYLb6Shky1BMO9+umExPO6dHMtu+ST i8Z1q46BOjw84dhZE6dmKRkFX0HBJci/Q+46GyhcY16F1V6Bpu8IH+80ifYPgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7P0j1cdLzvcW; Sun, 15 Oct 2023 02:13: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 39F2D9b3059475; Sun, 15 Oct 2023 02:13:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39F2D9vl059472; Sun, 15 Oct 2023 02:13:09 GMT (envelope-from git) Date: Sun, 15 Oct 2023 02:13:09 GMT Message-Id: <202310150213.39F2D9vl059472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 0022bd418e6c - releng/14.0 - fusefs: sanitize FUSE_READLINK results for embedded NULs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0022bd418e6c0c7c767a296a3e0d3782e5137dce Auto-Submitted: auto-generated The branch releng/14.0 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=0022bd418e6c0c7c767a296a3e0d3782e5137dce commit 0022bd418e6c0c7c767a296a3e0d3782e5137dce Author: Alan Somers AuthorDate: 2023-10-04 18:48:01 +0000 Commit: Alan Somers CommitDate: 2023-10-15 02:13:05 +0000 fusefs: sanitize FUSE_READLINK results for embedded NULs If VOP_READLINK returns a path that contains a NUL, it will trigger an assertion in vfs_lookup. Sanitize such paths in fusefs, rejecting any and warning the user about the misbehaving server. PR: 274268 Sponsored by: Axcient Approved by: gjb (re) Reviewed by: mjg, markj Differential Revision: https://reviews.freebsd.org/D42081 (cherry picked from commit 662ec2f781521c36b76af748d74bb0a3c2e27a76) (cherry picked from commit 8fca98f6881fdd68a786f4366c345159ab0df408) --- sys/fs/fuse/fuse_ipc.h | 1 + sys/fs/fuse/fuse_vnops.c | 7 +++++++ tests/sys/fs/fusefs/readlink.cc | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 27f3662741c5..0ec556138be0 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -239,6 +239,7 @@ struct fuse_data { #define FSESS_WARN_CACHE_INCOHERENT 0x200000 /* Read cache incoherent */ #define FSESS_WARN_WB_CACHE_INCOHERENT 0x400000 /* WB cache incoherent */ #define FSESS_WARN_ILLEGAL_INODE 0x800000 /* Illegal inode for new file */ +#define FSESS_WARN_READLINK_EMBEDDED_NUL 0x1000000 /* corrupt READLINK output */ #define FSESS_MNTOPTS_MASK ( \ FSESS_DAEMON_CAN_SPY | FSESS_PUSH_SYMLINKS_IN | \ FSESS_DEFAULT_PERMISSIONS | FSESS_INTR) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 21ee378b24c6..3249e5988801 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2007,6 +2007,13 @@ fuse_vnop_readlink(struct vop_readlink_args *ap) if (err) { goto out; } + if (strnlen(fdi.answ, fdi.iosize) + 1 < fdi.iosize) { + struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp)); + fuse_warn(data, FSESS_WARN_READLINK_EMBEDDED_NUL, + "Returned an embedded NUL from FUSE_READLINK."); + err = EIO; + goto out; + } if (((char *)fdi.answ)[0] == '/' && fuse_get_mpdata(vnode_mount(vp))->dataflags & FSESS_PUSH_SYMLINKS_IN) { char *mpth = vnode_mount(vp)->mnt_stat.f_mntonname; diff --git a/tests/sys/fs/fusefs/readlink.cc b/tests/sys/fs/fusefs/readlink.cc index ff9aa08f6fae..30815f2cd4b6 100644 --- a/tests/sys/fs/fusefs/readlink.cc +++ b/tests/sys/fs/fusefs/readlink.cc @@ -79,6 +79,45 @@ TEST_F(Readlink, eloop) EXPECT_EQ(ELOOP, errno); } +/* + * If a malicious or buggy server returns a NUL in the FUSE_READLINK result, it + * should be handled gracefully. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274268 + */ +TEST_F(Readlink, embedded_nul) +{ + const char FULLPATH[] = "mountpoint/src"; + const char RELPATH[] = "src"; + const char dst[] = "dst\0stuff"; + char buf[80]; + const uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = S_IFLNK | 0777; + out.body.entry.nodeid = ino; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = UINT64_MAX; + }))); + + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_READLINK && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + memcpy(out.body.str, dst, sizeof(dst)); + out.header.len = sizeof(out.header) + sizeof(dst) + 1; + }))); + + EXPECT_EQ(-1, readlink(FULLPATH, buf, sizeof(buf))); + EXPECT_EQ(EIO, errno); + EXPECT_EQ(-1, access(FULLPATH, R_OK)); + EXPECT_EQ(EIO, errno); +} + TEST_F(Readlink, ok) { const char FULLPATH[] = "mountpoint/src"; From nobody Sun Oct 15 09:58:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7bKB2pcpz4wjDZ for ; Sun, 15 Oct 2023 09:58: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 4S7bKB22j2z4djD; Sun, 15 Oct 2023 09:58:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697363886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqRjJPqk/Kg3Orf6CZCMD8xhv9I9NvyegkXsLW5Aq1k=; b=LG8PWNiMj2PX/cd+HRn8y2aSsj/Xkq0UrkAbWBnYMTtIUoPIMPslCepnSAYItPXz77//9p 1g2Qzaw+nqD9DycTeEGKBYwtG9UTLz2hJFUPZ3Ryg+drKxA4ZVYMzjIIND6t+Keb5gDz6y dNpHjKDC+npU3RcKYgAx1zdOwd5U1rhI0utIBL1HZKrqK1UDY+OlXJfkAPkBEWfo+YNi8C znipe+y/Ys4cdltr1PsbwdPWqYoyWxDXpGaD/SYw9Qtc8mo9+YsLL0Nq1HaAaw4Dn0w1ZU G7L3ShRPqZtKRDTO1TkyxYKfKRPpgQ0f8CRuB0ICFABT0jDUI9Zfpk3VBfhUmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697363886; a=rsa-sha256; cv=none; b=J/ibTPZ16/FsX5TiPOvFDIYGjWodFDaz/pXY9GoJXoAOSbW6S5Grrb92RdqaFuor/ZML1X 1fEp1z699QbqW0aH36TrUWI+fc9jXzt5934hU09mFBhRXlsM3TESsmAh1qSnsV3jp7i8xF s4TmLF2or53jJIct/V8t3O13r4d4JfCq5zcXjmpwCCizKMtlzbKpb7AFra23++RDs4O1hh 4DZQGeRVklD00ejNU3/pf2lsoXrd4nAVZksk/zK4fGta+dQhGOEXMkA9FAGFe8ePYsGO4h EqJ+dmGQRBnYIryDHO09Pb1ynMpN8+SS02hImrxTxKeMF5TPikCFmhSEaL0G5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697363886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HqRjJPqk/Kg3Orf6CZCMD8xhv9I9NvyegkXsLW5Aq1k=; b=HZGQ4kz1K01YQNs6d7GS8fL1fqcR60oSAJv1QNpegMbT95HsgJm06s34uJoOVvQJRvTd5c B1tf910vcRpHdVwyh/3PzKx/dy2ay6ognCKzzN3kGNwTz/O+Rjw8JICYmFwmf+ywZ+TTYJ sBvYsn8zrSl5jUge7OUPrNM1EFO8OKhlWcMzSpJBrEF1CrZQ+ItF7sP7CqUY3+qxUCvMar ZJLwCmgf0YYoycvyQmSYr9rnaAm0aZmJsZKs+go+OS63/sBAoDAm8uISnsNCD/69VnGO1g MSlCu9AGuPqG2BAyCnVV6f+LTjHK7ZeKTmlHH19g2SToFj397wUD5c1l+30V8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7bKB0znVz16yt; Sun, 15 Oct 2023 09:58: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 39F9w6rv026130; Sun, 15 Oct 2023 09:58:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39F9w5Vo026127; Sun, 15 Oct 2023 09:58:05 GMT (envelope-from git) Date: Sun, 15 Oct 2023 09:58:05 GMT Message-Id: <202310150958.39F9w5Vo026127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: f082e0e87a01 - internal/admin - Safekeep bdragon's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: f082e0e87a01dc38c67b73217ef465e69a0153f1 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=f082e0e87a01dc38c67b73217ef465e69a0153f1 commit f082e0e87a01dc38c67b73217ef465e69a0153f1 Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-15 09:56:32 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-15 09:56:32 +0000 Safekeep bdragon's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 9bbdae3e7628..01a272b1abf6 100644 --- a/access +++ b/access @@ -31,7 +31,6 @@ avatar avg bapt bcran -bdragon bdrewery br brd From nobody Sun Oct 15 10:00:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7bNF1Kpjz4wjcB for ; Sun, 15 Oct 2023 10:00: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 4S7bND72snz4fHZ; Sun, 15 Oct 2023 10:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Io4X3Ka1OkmSaIRtMWXuo8yeV3d1WArYxRWLcrtTv2E=; b=bBZgDzAowTeJHDrP6YzGaLmdQ9s2KAKf6bOYja/nLARKubN98mKWhsBkH/4Uu9iCBGxtnQ 079Wq5J85u9yRgR8eB6xdaiWsNileYeXgBoQ6oQfbNV3fBr5cOeNfm1kcrMF0XTi5IKa5G EROpXvEPRvxMbzP+IEtWXvDiRIdWmEpvFpYo7oEsiBH4Wg86S7NHGpGXJDsDvSgzcvQ1ik zF2dqfpjTwtoe8AoRbmpujz+fe6kU6g2TPh3DHfUayvYMpoNgh2ui/cfkRiJRMyl2li2M5 xPrnxWwpDyG+uSxHaB+knqSe5c2/4fvQWY4BbHgwbI5KPn3XZnSTSZ0t8GPGUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697364045; a=rsa-sha256; cv=none; b=HqTa3mjs0KxKBvHzE8GdyJH+70uewg/zCW1NcGPj9MLKdeaIHa7mrX7ldhrlkp8zDECj3I J78cJvK5y8jPahU9GhQDnfjfohCvCIRCtp7N4PRMZdFCEuZA9aHOBR/zyA6B7pbuYGxH1Q XB3Nqg8LjNy22YD3L1+v/C8NeK3tyscFcRqfr81FqvfSLPW2+li7qXomclHGqlXY4M+DFP +0Bjq09OCmBr+ewXiMTlKGEwP06ukgrPp7eSLI1eRoyYXgqlMb5GExQC5hRMnGnhdc3sIc WKcCXSh3Dx3ZtjsBH91WiwP3bae7b/KHzviIQGNySr+7ZdQFPJ0sTIGQuUP1xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Io4X3Ka1OkmSaIRtMWXuo8yeV3d1WArYxRWLcrtTv2E=; b=Ga3/8/JCEDfsxhnoJ9HIB869V9nI+39HyMhxYeWaqAZ6uqFY9xf0anOrxgWKrXRmGUz0Vm gWbz4Mo1pyKqnUz7bb2olaE/vGXNFScXTDRUHuxTWpxkAlT7r859c6LxZLbzAkq7tLdDQH U3B42hhBE6bBzdbPnAkXQGnFqXwXrPvvdLkGj5byVN6zr70dGFZ7epW0+vZFAJpAReqcMV 4dWccR74S4i9AY4PF9JbgB/JX7AYdbW8ZO+WqgwnkslTv48DfyAI1U+4Nwj16YWu8s3pHC nhtJ2qQIryc1DrvSiXu10v8g6Btw3bPv6gNt/JvqJkIaSPNUnlSscLXv7p90DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7bND6975z1700; Sun, 15 Oct 2023 10:00: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 39FA0iVg036175; Sun, 15 Oct 2023 10:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FA0ikD036172; Sun, 15 Oct 2023 10:00:44 GMT (envelope-from git) Date: Sun, 15 Oct 2023 10:00:44 GMT Message-Id: <202310151000.39FA0ikD036172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 4a02c334062e - internal/admin - Safekeep lstewart's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 4a02c334062eaca0c2b15ce8c5b693db94ef6171 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=4a02c334062eaca0c2b15ce8c5b693db94ef6171 commit 4a02c334062eaca0c2b15ce8c5b693db94ef6171 Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-15 10:00:28 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-15 10:00:28 +0000 Safekeep lstewart's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 01a272b1abf6..bc76135f00b5 100644 --- a/access +++ b/access @@ -95,7 +95,6 @@ kevlo khng kib kp -lstewart luporl lwhsu manu From nobody Sun Oct 15 10:02:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7bQk6yB1z4wkF9 for ; Sun, 15 Oct 2023 10:02: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 4S7bQk55D6z3Bnh; Sun, 15 Oct 2023 10:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILebX0hsiRXyFwSYJt88K7S9Qof7c1vQBsad91Bhfu4=; b=YI+G4LT4WRwb2RtZq9o2dKBVA3UmkSxeTXNhGeD1dKc1qHI/eiFq8MA/9/2r6RPsWdLMwh 5piBwNlvu51/3yXEjnCUsAxwlyerYOx3JtxIasR5ZSw8dy02KCa8nXASorMQpkWDG8Ysev 2YGNaAkIv3dXDyYE2dHaPCMP8XPte1VEgOj8QXVavdBt+dLXGhVy2W4yLcceQMZWoUFD/7 K1jA+aP2Jz/C+6o/qmnxE7Kl+URdpB29K5ng9VdxM3AEXMX14qEVp8FWv7lklfewo+FYGu b5hz4A1jykcrHbftY8tGflpSZ2liJbFJIJq5dd5doKgAzq9qSrFZh0Jt6u7D7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697364174; a=rsa-sha256; cv=none; b=jEQDelg+Yypf4H0Y/NXqN+a6xfgEv6Ycr+IVTSotnBUVrqZnC4oo+tucUJ2f+5C3Bi/KC3 nsy0/irQMBfp/3cwZpzm+jIbgslHNhCKf9C0bbvqKb8KtHH6Stx9YNsvGz/258KNzL6JsB +lwWQLPpgcjCyLHlCwOtmwAIWzpgpYiL3XdD20yv1oW1TdYE5XtQA+jUd660LelnUf//R9 337dJkl1Bi8dGpyg10CwBKBzhIFs7XUQlHvHY0Hc6qTeP7ex+9BjvYq/JQAu4QyNDhr64c 49vs3SUaB90TKELc34urVAvwO98qb1DB9TASy87Ocd5EVMd14ImFXPjED1WfzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILebX0hsiRXyFwSYJt88K7S9Qof7c1vQBsad91Bhfu4=; b=uOP0Q0vszMn/Lnf+Pj2uEhVcObZ97rFV5V/gCZG8S6AId/U3uYT4xSAJxzMuoZzgtv05HI sUr4ZRvONrKLAbjjD7Vpeqsg0IV28dH615dhAWXf44MMxW5rHO5IWMqID0sRKxQY6UHoYo Lh4dDdMx+/KI+tl261ARXAUO6TIsaD3IU1g+IYVzHDv6Y19MEFcTxA+R5pkMaH9y41OnNh Z3+5DD9pwvhDXfyS6LGsoU/CpLpe/CyGvHW/qE2O/y2HYJSHoJugwIKLx1GIjI8aqbsayt bvPWggHtCg4qyLzJ/ReO/0k8b0RucIV9CxSWYGMrg99K9bOVnmo/h3ZTqvY+aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7bQk2wnrz17lP; Sun, 15 Oct 2023 10:02: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 39FA2sNe042690; Sun, 15 Oct 2023 10:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FA2sm6042687; Sun, 15 Oct 2023 10:02:54 GMT (envelope-from git) Date: Sun, 15 Oct 2023 10:02:54 GMT Message-Id: <202310151002.39FA2sm6042687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: ca7a657dc465 - internal/admin - Safekeep dteske's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: ca7a657dc4657e7a4f5236891d5f7d5a6fa993d2 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=ca7a657dc4657e7a4f5236891d5f7d5a6fa993d2 commit ca7a657dc4657e7a4f5236891d5f7d5a6fa993d2 Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-15 10:02:36 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-15 10:02:36 +0000 Safekeep dteske's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index bc76135f00b5..cd43a8e0fba0 100644 --- a/access +++ b/access @@ -56,7 +56,6 @@ dim donner dougm dsl -dteske emaste erj eugen From nobody Sun Oct 15 10:05:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7bTV5qmhz4wjws for ; Sun, 15 Oct 2023 10:05: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 4S7bTV5JQSz3CDH; Sun, 15 Oct 2023 10:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7KgDs4gogqeDObsjfwZjArOUk86p1xuicq71GNDwnLU=; b=nHYbUy5gV+zZL9mTY1WQYx5rMjMPqXNNohdc1viDLbM1G3AHR8bCrvBOiTtL1JqeEJtYhJ OqV/SRn+h006fWXEad/udgQQKJ32jEpHxhHSqvZyFnPYrEu4vZeHdhf8KqDofgIMuGjqd+ IC3NGEzqB+GcMZu2FUNIKUaMMBxmO9YV9NwP76GOvNbqVor1kaWLiy1aLj80v2IjBIEl8d kvzvUkP3bn2MatBUiPHWF36OQM+5iqH53xaYAekdIQwfAjnrd41oUUS6eFUKYLTS+k8ynH tP10tRHohpgZUfuCALbZTq+qBoVsHCuuE4Nu1CP4mAUKAzkOnBsIHCKG2EuNag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697364318; a=rsa-sha256; cv=none; b=XWOwsyqYKznMkJAaLmc1d3DzehC2o6lpM1ZCHyywcDz/qegeDhTaxRtAkR8ADJgKK63HU0 YKM9iN8GF4y+s8J2vb+iOxRZVmua3IZCTxcMfbXMsqBU9LbWaa2k9Qm+Vx/KFp8n/sdiZ1 pFf0UL0bxzkaXmWrx41w1EOoyhg9MQXvQswwmCTBLjmCe9bbtpmOf7Cq8q3RU6wVImtm3w QoduuQnvX9uHlQ4fXiaKC5dYjJvl3EImhmxyna23ktxZroHb+peRLNPRLp5PIm6ij+hxmI shGZ6ocpLYwvIJq2UBHR8dGU5yb2rwUZNQUDxdTqD044WpXlxh8YJwkG+CdzLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697364318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7KgDs4gogqeDObsjfwZjArOUk86p1xuicq71GNDwnLU=; b=Bppf+FsvYJxbGWTjNL8e6VEQNONI0AsCMmq+ml+Jjzg2Lrd0JrN2VJ0suYnTt3HWi8TmUH ShSrC3FqGFmi2n+UB2vOpKXuZ9FwnXm91iX33fQGBOmluNjrrHuleHMiTcLZbX+WDDsOFy N88O0vk3pYO6xMXYiUEY2gttIabad1ZrIdGyXVXitXXZG/WNC37srJ562Cdf2F2ZtuM36j Fxf7byQCYd6Wuha2IT6ygqUKl4LnXyF88PYu8ZCj/Tgy7iIQdXQI0+HNM0xXlwSw4wb6We KZllthNLo6nk7BBMt/n4XUSUWKBGLc9K1M1Z0Qc1IXQbftTMVkpTYRX6PMvzbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7bTV4GQJz17fB; Sun, 15 Oct 2023 10:05: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 39FA5IO3043159; Sun, 15 Oct 2023 10:05:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FA5ICf043156; Sun, 15 Oct 2023 10:05:18 GMT (envelope-from git) Date: Sun, 15 Oct 2023 10:05:18 GMT Message-Id: <202310151005.39FA5ICf043156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: b352e74b642d - internal/admin - Safekeep mp's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: b352e74b642dfb1087cb565b1c207f187cac4c4b Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=b352e74b642dfb1087cb565b1c207f187cac4c4b commit b352e74b642dfb1087cb565b1c207f187cac4c4b Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-15 10:05:03 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-15 10:05:03 +0000 Safekeep mp's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index cd43a8e0fba0..60d9d2003456 100644 --- a/access +++ b/access @@ -109,7 +109,6 @@ mizhka mjg mm mmel -mp mr mw netchild From nobody Sun Oct 15 12:09:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7fFJ3tPQz4wrv3; Sun, 15 Oct 2023 12:09: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 4S7fFJ3LVwz3NFw; Sun, 15 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697371796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMi5KUh3o3n71xKVa0x/V3hcNbh4wubtTREwkaGdmTc=; b=ItnGYY97UHD66xTjZmk2b7QUC01Y/nYslMi1vXJMRkvLou7yapf5Ep5wPuYyKK+Q6g81V5 3Y14gLlX7m/btP6cq6k0MndcSU+YASLRBS9f8PdI0mF+Gb3Fj3fQlf+ng2qJU+gkizhQJw 0GOfhRn1rQ6wh3/NABDN3Yqscr0yQwTNHZ4lwlO/PGYDH7CK5wAT5GH4JLArI3sR8hMb4T 7dx9QKQeVICAR2Q2kH8zCsMA5pKw3hPymuBDli2Oqk6TXBAWHYVfLP3VbyK6/XFh9RnULy zzcE2xIcl/yzbFKLn1kXGuduV0SAsztkpRLpx0zw8s7hm96FWCW9amDcqIV/tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697371796; a=rsa-sha256; cv=none; b=tsIHl4fB7F6VTMu3Sk3gMNrjgwie85MV1YngEGM27WqmkJdKi11TnYmqWJkQNOrFr3HNrQ wEnrWF2CF7n/U1gZIDc3u9+MoERZ7+zQIaM1ZggDkyixM/sBB/lpQK/8ygEs2ugTwHvQaH 5hHyEfvA4y+LoFB2c2W6zM0GLDPyoE8Qt38/ZQyMNyhs47q0A5UBfeWG8VZo+Hye0hX4OW d8DpxUBbA60oW0/PsVlHWuTylzpWPjNbwwr1yxhtzisyjI5V0Tge3Niqv4W+ebv8nOWJZ2 UqFDPoV3/MbnQ8+uuSrHLBYOkx0LzJyAYgJDwuDEwbi73CfH6fOSXSQnce5mAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697371796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JMi5KUh3o3n71xKVa0x/V3hcNbh4wubtTREwkaGdmTc=; b=iFYTkfNX6bF3NgcQi8657dN90G/Uw6AdnK2GaKb2CJS0gcPn9bsCWsnpCrMJBXGBGxDbol GjhadhSyqnEDNDm4MGyt5Rt9T1+gGz2+PqNALvVBPy8UmXTBOvq8n8SE3jTSr3jkf30Dqz 6PfLFVduhHCkeuvkLuRTDR7Ozo6BMjEtIQh3B+jnlAG0RuANI+u3IlaheWRy/NYNAjO5Wb AiJAwL+5rOW3IkdK+sWaYOXM5j/Pb/zIAQRo4AwpvrHpBC0UMVbC4oj+zMX3TIhwiAuOAn 3rkn93IxdR4cB4k1I2aWzHZPUm0KkfFKQHtpgjtIxOcRmaYl+a/ILnU4IK0hUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7fFJ2DVNz1BQS; Sun, 15 Oct 2023 12:09: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 39FC9utW043614; Sun, 15 Oct 2023 12:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FC9uoF043611; Sun, 15 Oct 2023 12:09:56 GMT (envelope-from git) Date: Sun, 15 Oct 2023 12:09:56 GMT Message-Id: <202310151209.39FC9uoF043611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: fc9f1d2c6391 - main - uma.h: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 commit fc9f1d2c6391b1a4b133aab56ace625b72c9ea85 Author: Gordon Bergling AuthorDate: 2023-10-15 12:09:21 +0000 Commit: Gordon Bergling CommitDate: 2023-10-15 12:09:21 +0000 uma.h: Fix a typo in a source code comment - s/setable/settable/ MFC after: 3 days --- sys/vm/uma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 31f8dba33081..76f30efc94d1 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -637,7 +637,7 @@ void uma_zone_set_smr(uma_zone_t zone, smr_t smr); smr_t uma_zone_get_smr(uma_zone_t zone); /* - * These flags are setable in the allocf and visible in the freef. + * These flags are settable in the allocf and visible in the freef. */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kmem */ From nobody Sun Oct 15 13:16:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7gjx6Wdfz4wwd7; Sun, 15 Oct 2023 13:16: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 4S7gjx5lmqz3T3K; Sun, 15 Oct 2023 13:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697375781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K3O6WXam/aHMYL8ZMCAwDAxG9odkmJnHx87c/ZnyJB4=; b=nKsktBGGJDqYZVeY8kziko7lYQymOae4t5ZrPDLg8WDgJJxKP8dQDxd7GO4S7IMqKXtNbj cRK8mF0fSCbp7gV7va4AN3CJtx5G0Gq814ouDf3T4SHfELlphPASVtvt5HAw+RlGJC00Sl L08pR7WdfGD/k4IDIB75Eb07i0i7ya0Ij8W0pfw15p1ojLOh/ddnZHtWleoQA1FsV+KyDA SQ0S+IGdedIdeZpXSX7I58dY0OlMnolSSfW/f0tEEXlCip9xrLHFRkhxpQ9rLA4+fdSQRq FvPDhE3ekAQfdeJtld/vxIDZ50cN2DgBt1HMD2Wc+NyPP7fdQbH02l8CKnB+9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697375781; a=rsa-sha256; cv=none; b=vomSJ0cl9cauNtgr6MKffcB/4xeGm1/z9F3PbctK3bFmvsULiBUZKVp1JtIe+elaKsAmwU f8p8ZnPbJgQyUA6ZdHhnBPXjHjifvrjWgxDVl/6cxLWzk0p22zzxzpuhaurJ6Nvoa11cmo kjL7tSbE9b0RunUoMYl16uT1y+r4X0t32wOOUCJigYOt4wByoAqonY6lSWwVka16x55M1J AfDhs3dM7WM2vt0d7DvA0xuUOYjgXd2tugmColrhaedW5xDkvO2LeVLdtcAvWTEvpIQtYA GOo+wvH7L2/EKGH0NHagkux9lwOekQBNhkqDoWW0i906MXY5MZnvTBTBo3zdiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697375781; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K3O6WXam/aHMYL8ZMCAwDAxG9odkmJnHx87c/ZnyJB4=; b=lW6C33E5UJiGVMzZ2VmSxWFsGCY93TQatNhe0bUp8fVin7EjG/Gs79dTwCfWaedCm480x+ H7X0vJ4uSSDyIgEmnAJTzqTp0cyLGTmUjgYNS/MFAkzkblUyqwhtLKwbM1O2Nxp8sfywoS IvrhrS9iIicPpEMl9m95rAIp76ldqCiYa5US0wI4cEIEM25EaCfI9wIDib4xhmGsL/GpdJ tIjMCnN+kKvDuTOKxtLdIrqRIp6XB0loS1P+EJ4zJEyEw+4C+iABzNV28NGKsRHE6kAhKu s+WzovGsH5jwYIysaYwiSgssZqVxNF9z4dTtrd2SmAMlc7N/Qu9n91eJ0MYv8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7gjx4p8zz1CxB; Sun, 15 Oct 2023 13:16: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 39FDGL3C059449; Sun, 15 Oct 2023 13:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FDGLsa059446; Sun, 15 Oct 2023 13:16:21 GMT (envelope-from git) Date: Sun, 15 Oct 2023 13:16:21 GMT Message-Id: <202310151316.39FDGLsa059446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 630daf68d5bd - releng/14.0 - mrsas: Fix callout locking in mrsas_complete_cmd() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 630daf68d5bd73136e981610449bf094ca00a4a3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=630daf68d5bd73136e981610449bf094ca00a4a3 commit 630daf68d5bd73136e981610449bf094ca00a4a3 Author: Mark Johnston AuthorDate: 2023-10-07 00:31:03 +0000 Commit: Mark Johnston CommitDate: 2023-10-15 13:16:12 +0000 mrsas: Fix callout locking in mrsas_complete_cmd() callout_stop() requires the associated lock to be held. This is a bit hacky, but I believe it's safe since the subsequent mrsas_cmd_done() call will also acquire the SIM lock to stop a different callout. Approved by: re (gjb) PR: 265484 Reviewed by: imp Tested by: Jérémie Jourdin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39559 (cherry picked from commit 4640df1b0a49697840b81f6bcd269a483514c6aa) (cherry picked from commit 29de7af6ee47a3a251763e4220203a0d960ea532) --- sys/dev/mrsas/mrsas.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mrsas/mrsas.c b/sys/dev/mrsas/mrsas.c index 1241f44761c4..e362d4b455fc 100644 --- a/sys/dev/mrsas/mrsas.c +++ b/sys/dev/mrsas/mrsas.c @@ -1732,11 +1732,13 @@ mrsas_complete_cmd(struct mrsas_softc *sc, u_int32_t MSIxIndex) data_length = r1_cmd->io_request->DataLength; sense = r1_cmd->sense; } + mtx_lock(&sc->sim_lock); r1_cmd->ccb_ptr = NULL; if (r1_cmd->callout_owner) { callout_stop(&r1_cmd->cm_callout); r1_cmd->callout_owner = false; } + mtx_unlock(&sc->sim_lock); mrsas_release_mpt_cmd(r1_cmd); mrsas_atomic_dec(&sc->fw_outstanding); mrsas_map_mpt_cmd_status(cmd_mpt, cmd_mpt->ccb_ptr, status, From nobody Sun Oct 15 13:19:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7gnS1nsCz4wwkW; Sun, 15 Oct 2023 13:19: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 4S7gnS1MCXz3TKq; Sun, 15 Oct 2023 13:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697375964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhtpQh32UVpRtYhggTOLdnw1vOCP4XT3V6fNW4tXYos=; b=BXwGWUPy8ZAbeXuBkamCW9uuUek1BrLFFGCjJIbKrl7R/yUyKDZYyLBZnvz71XaS5JdSid CzJIk1WQOutpyPr4fBzIq36Wdvv+Rqs507efMyGq+XjjWOzD7sGpvjMXehiqGNNwdGWcnI Ajb5E5sxzn5Tk7DwqKTljc6yrjoLVlea78A99g+Xs6IrhmkfllKpNx9clUb4fxP9pzP+/1 g8t3vWzTcHhRGeq7CHNVgQkIh8AFmjZdUB9l+qkE+OHrF2/xJYZ+ApqCh5qN4uD9Mv8uJq fRdmjQ+9z1CblZPHyGLqgJR66P3EwBrrDvcvIKIFgCysNH+H5DTk9l2Su/D1kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697375964; a=rsa-sha256; cv=none; b=kadHk5h2+815VkcOwKlr8/Vb+wDk3RSvU2iDrLgIRSNFzDQu3gxyaTFGuulTDdS5JmHCi0 pq/h1S03R+/XwBEmkPhBakI4MF2isaoXhknltSnWf9hnOjX3O3oNI6P/IN5AmGKAxi1cJF cpLY1qORHOKrnLVsyW7Mn2wtPRORdqSn9+GT/0MD5vINJXbpEjwBkm4O/YIw6qIgLWAUlP X4TSrg7H1URpST/L97Huq+7X7q4Da7pa/hplC/JEyn+zRHFXPsyYtjNdS2XGfNyUpfpskB kQ7z1BRS82u1D1LeRLPePi7oQp9qqFPFS4b5jHEf+QCz8KNSfG3dKvZoClHJog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697375964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhtpQh32UVpRtYhggTOLdnw1vOCP4XT3V6fNW4tXYos=; b=SMlqKps8zrBKmWOMx0assb3K3Omcgal4qIqdXInn6o7W2dvgtQHnszp3SPxutvnAOJ9XfP p1mux8hv7c3Yc6AGBeymBXCSB5cXXIOqElOIsTU1PL6fHbrS9HAtuBK04U7kAgMwy71ILQ 1EcfWFIU6LgvnvHW/D+YPoAuBBrcrDEd14/EkDDXyCYcnUs/SMhqzIEZv2ciOiDIpg1dT6 F4f/CbV8YsZLq5y8M8BLMDd+n/0/pmkED+vcqcqTY4BoWn0FfrFejN1mQJQlHkoNtWdKJP eD4VJe92oCeFQ5vWOvHRftsASsZVRaIBMNIsGdW9+85NpW4/OBm6pfnQMi/6uQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7gnS0Jt2z1Crb; Sun, 15 Oct 2023 13:19: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 39FDJNrR060064; Sun, 15 Oct 2023 13:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FDJNSW060061; Sun, 15 Oct 2023 13:19:23 GMT (envelope-from git) Date: Sun, 15 Oct 2023 13:19:23 GMT Message-Id: <202310151319.39FDJNSW060061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: ec3864cc6861 - stable/13 - fusefs: sanitize FUSE_READLINK results for embedded NULs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec3864cc68617edb106724a6d423b47ec455e31b Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ec3864cc68617edb106724a6d423b47ec455e31b commit ec3864cc68617edb106724a6d423b47ec455e31b Author: Alan Somers AuthorDate: 2023-10-04 18:48:01 +0000 Commit: Alan Somers CommitDate: 2023-10-15 13:02:07 +0000 fusefs: sanitize FUSE_READLINK results for embedded NULs If VOP_READLINK returns a path that contains a NUL, it will trigger an assertion in vfs_lookup. Sanitize such paths in fusefs, rejecting any and warning the user about the misbehaving server. PR: 274268 Sponsored by: Axcient Reviewed by: mjg, markj Differential Revision: https://reviews.freebsd.org/D42081 (cherry picked from commit 662ec2f781521c36b76af748d74bb0a3c2e27a76) --- sys/fs/fuse/fuse_ipc.h | 1 + sys/fs/fuse/fuse_vnops.c | 7 +++++++ tests/sys/fs/fusefs/readlink.cc | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/sys/fs/fuse/fuse_ipc.h b/sys/fs/fuse/fuse_ipc.h index 27f3662741c5..0ec556138be0 100644 --- a/sys/fs/fuse/fuse_ipc.h +++ b/sys/fs/fuse/fuse_ipc.h @@ -239,6 +239,7 @@ struct fuse_data { #define FSESS_WARN_CACHE_INCOHERENT 0x200000 /* Read cache incoherent */ #define FSESS_WARN_WB_CACHE_INCOHERENT 0x400000 /* WB cache incoherent */ #define FSESS_WARN_ILLEGAL_INODE 0x800000 /* Illegal inode for new file */ +#define FSESS_WARN_READLINK_EMBEDDED_NUL 0x1000000 /* corrupt READLINK output */ #define FSESS_MNTOPTS_MASK ( \ FSESS_DAEMON_CAN_SPY | FSESS_PUSH_SYMLINKS_IN | \ FSESS_DEFAULT_PERMISSIONS | FSESS_INTR) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 8fa60ff95d4c..988e7aa3278e 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -2022,6 +2022,13 @@ fuse_vnop_readlink(struct vop_readlink_args *ap) if (err) { goto out; } + if (strnlen(fdi.answ, fdi.iosize) + 1 < fdi.iosize) { + struct fuse_data *data = fuse_get_mpdata(vnode_mount(vp)); + fuse_warn(data, FSESS_WARN_READLINK_EMBEDDED_NUL, + "Returned an embedded NUL from FUSE_READLINK."); + err = EIO; + goto out; + } if (((char *)fdi.answ)[0] == '/' && fuse_get_mpdata(vnode_mount(vp))->dataflags & FSESS_PUSH_SYMLINKS_IN) { char *mpth = vnode_mount(vp)->mnt_stat.f_mntonname; diff --git a/tests/sys/fs/fusefs/readlink.cc b/tests/sys/fs/fusefs/readlink.cc index ff9aa08f6fae..30815f2cd4b6 100644 --- a/tests/sys/fs/fusefs/readlink.cc +++ b/tests/sys/fs/fusefs/readlink.cc @@ -79,6 +79,45 @@ TEST_F(Readlink, eloop) EXPECT_EQ(ELOOP, errno); } +/* + * If a malicious or buggy server returns a NUL in the FUSE_READLINK result, it + * should be handled gracefully. + * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274268 + */ +TEST_F(Readlink, embedded_nul) +{ + const char FULLPATH[] = "mountpoint/src"; + const char RELPATH[] = "src"; + const char dst[] = "dst\0stuff"; + char buf[80]; + const uint64_t ino = 42; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = S_IFLNK | 0777; + out.body.entry.nodeid = ino; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = UINT64_MAX; + }))); + + EXPECT_CALL(*m_mock, process( + ResultOf([=](auto in) { + return (in.header.opcode == FUSE_READLINK && + in.header.nodeid == ino); + }, Eq(true)), + _) + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + memcpy(out.body.str, dst, sizeof(dst)); + out.header.len = sizeof(out.header) + sizeof(dst) + 1; + }))); + + EXPECT_EQ(-1, readlink(FULLPATH, buf, sizeof(buf))); + EXPECT_EQ(EIO, errno); + EXPECT_EQ(-1, access(FULLPATH, R_OK)); + EXPECT_EQ(EIO, errno); +} + TEST_F(Readlink, ok) { const char FULLPATH[] = "mountpoint/src"; From nobody Sun Oct 15 14:30:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7jMp1gBXz4x1Zp; Sun, 15 Oct 2023 14:30: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 4S7jMp1BBFz3crW; Sun, 15 Oct 2023 14:30:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697380246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty7EEuJrXmuXoay3DZ6nFORgQDp0oFmU7CVZ4Hqqa28=; b=hYXlw0yqS5yq4z4ApclzdgCSOe51sPaMHqa0pYQi6YrE1Lz72NgHLZJqfGU4mOdMWVUoYa Z2FGO0WpkyWWqIAxS4hhmqLeBPE59MzZIgCvneZtw+8tthd6HUBExAGtLLfvz/pJ8JUWd9 RmrvAQjKYqF7Q4VoVC4otbqiOLM8OXXTtSvNNfNfkt/7OPxIJSbvwSi6xi/JC0JvZM8+EQ n1dUjWqt5jyhOCJ+nKbr8uysyFozgUD5y8ata1eTcuIwxXarRheQXBsTcoFDw9w4I4mnJX aM4utNI84AJgu35OtG4K9WOLM0wZayn3b/MVRRqBtsXux0otSrqcLez2HyNL9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697380246; a=rsa-sha256; cv=none; b=x+Ef3f181qLa/RyfnQZ/AOIiBs85Lg+FrqOydOlGjylrn84BfLrGJS5UOruurBrA/fJ1qG SzokIkeViJhHCDp443h0IoIHRLsK0RRRXtOZNm0vCs3qQq5zTorwyzp4sjEc+xCbG0nG6V 3QswgHAKJy8QWIJrvXivavznDdkDqA34k97/8/vfIDIyaaMap47XroIISUlcncvdLOta2y haufNjr/WhqFm3O+knYIllge9FqA6g9pSO+9IToWNR+Ec8NteHy/YAItOi/FWSoxSU4e1y wZJUMIYWxL4Bi0oK80O5kSxXdJnoXH2uo5Vrklbxa9XM7P+sIrZ7jM0ftz2nOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697380246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ty7EEuJrXmuXoay3DZ6nFORgQDp0oFmU7CVZ4Hqqa28=; b=KC2bONXwPjjwDlXbGbh9kloges8i7NrtUnSC5k5QcOHMPPrOnMxpoF6qvc5wkGT6Gkv61+ sJ9/i2Ug+f/HgLxtKAFm15L8DcQUbSJwl9ahirvNbP/1D31tJfDvH5EorVuZ3yByjyjQz/ LyjHpS1DLdouZMuMoi73Em6eC3NZHfjJlpK1jzZaM0IQheG68hKA/T04Ig4VdBTYeEWyST zwiEMA4/ZEdZaWpxgZ1FstCZ0xk/9hzGdSMBLGrbq3ggTZt4JA4GtesNdtftfDLIjonVhi E7QtbwvIs71lHnbs7RSYIRYbxexYMFc6ScgaP/2Sy1j5XOvqCsEWYLR1CVFF+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 4S7jMp0F43z1Fpl; Sun, 15 Oct 2023 14:30: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 39FEUjZD086685; Sun, 15 Oct 2023 14:30:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FEUjx5086682; Sun, 15 Oct 2023 14:30:45 GMT (envelope-from git) Date: Sun, 15 Oct 2023 14:30:45 GMT Message-Id: <202310151430.39FEUjx5086682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f34c9c4e3bdc - main - veriexec: Correctly export symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f commit f34c9c4e3bdc2b8bffae4ac26897e0e847e9f76f Author: Zhenlei Huang AuthorDate: 2023-10-15 14:29:18 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-15 14:29:18 +0000 veriexec: Correctly export symbols There's no symbol named 'mac_veriexec_get_executable_flags', the right one should be the function 'mac_veriexec_metadata_get_executable_flags()'. Reviewed by: stevek MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42133 --- sys/modules/mac_veriexec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index a165daeec043..82cf468fec50 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -18,7 +18,7 @@ SRCS += \ EXPORT_SYMS+= ve_mutex \ mac_veriexec_in_state \ - mac_veriexec_get_executable_flags + mac_veriexec_metadata_get_executable_flags .if defined(KERNBUILDDIR) MKDEP= -include ${KERNBUILDDIR}/opt_global.h From nobody Sun Oct 15 16:23:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7lsj2bsJz4x7cl; Sun, 15 Oct 2023 16:23: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 4S7lsj1bT7z4QG7; Sun, 15 Oct 2023 16:23:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697387001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=TYtEKFSAA0UaEDwR/Wm1/O12dq0V4wm09eCs49fMFanmX9gyGxa6UjmWIJ/fDR4I6Wk3lJ vwBkHB3+YBZVLfAVTSfIWCK9bSI8+o8gKnMIWTcZ7ZKhtX20SE+fGO4e3AHBsuB66VfUCs q/c1tlPS5LA7EmMnjFDFLyGtF6IG0gl83v5CDaYXjN/fX+tsU2GVEi+7F8N1ApSuiythfD ivn5G1DZZgPdPXlDYkCJ5szEoGE/fBVjghOa6dqAAu4EXpg5xH+MTuE2S5F2DNaIclyHAZ 5+u7Qn+ASYlwieIAmH+uCCZR2tTHsJDgC0ePAy7T4W7SzwLgNVz4ucTxsRrEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697387001; a=rsa-sha256; cv=none; b=rZFPV5/WTO+MqGJDgJumnUlRucK89w/VlohTVrGytLVFyeqKdFpHWW4cIEExs4tiXw+mPm BO8sTwh0ubrwS245guzKHeO4QS4BaluMQyoVMoBKt65BXDLlLYEM+FGBYIs56vyMjkD0FY niLkwdRGxepJskioyYWi2QlF2OfNxd0liV9YvKtQbfC57utuymyyGyG4HN/TEdI5LM+q2Q o9r/Ht9IdgJe7gdiD/s7dm8ZaMGwHLEAeOyARxbnfkfbLWYfxaBVYM0LJlkXm/Ph5Luu27 8NHT4KVNTfm0OXid5lXlYgQUZ+cI5CXamiL8Wxlbf9pdnmGCDdUorUHuWCr4Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697387001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1L9BcWkE+wzs7q/A1yC53dFmSiurA8LN6MtNu6Fx7Q=; b=uAXRoJtMhr4+a0M61bhXzfKsEikFKg3gTBJn4xqp0gqV0T1oby2qmThHM8FhVSuy8QN+Jr FLtgmybsiZb/hgSO9ugzURbTwTSadVEcUMPuzd3uV0jiEfgssb8W1UozGC0LkUpidXYaxC by1XPYvDshV0PeBPprH3G6ofcMQYbI/znTQ5cInJHlpSjhqr5R2dTpWybMviCyWuPiTlOa kLa28J9L1LMigAvPXFJYGvfUj+FAYz77RkU/9WROFwuKQPwk1HkkWuUQzWj7qv/KgmTCCL aqQ1jUUW1EBt7ryhKjlXBW197uS5HAbzU9pgGPsym94ynqUowgK5vuvGdRBSyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7lsj0fCfz1J1D; Sun, 15 Oct 2023 16:23: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 39FGNKvo075822; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FGNKhO075819; Sun, 15 Oct 2023 16:23:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 16:23:20 GMT Message-Id: <202310151623.39FGNKhO075819@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: 6ace92326f3c - main - ifconfig: add static bridge addresses for vlan 0, not 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ace92326f3cc4bbee9b74f6b656cb13699a78a2 commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2 Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-15 14:21:53 +0000 ifconfig: add static bridge addresses for vlan 0, not 1 Since fd7edfcdc3 ("bridge: fix lookup for untagged packets in bridge_transmit()") and b0e38a1373 ("bridge: distinguish no vlan and vlan 1") we do a better job of distinguishing between untagged and VLAN 1 traffic. However, ifconfig still defaulted to adding addresses for VLAN 1, rather than for untagged traffic. Change this to be the most common (i.e. untagged) option. Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 --- sbin/ifconfig/ifbridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 9b499b404946..2d0af1255a73 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -402,7 +402,7 @@ setbridge_static(if_ctx *ctx, const char *val, const char *mac) memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 1; /* XXX allow user to specify */ + req.ifba_vlan = 0; /* XXX allow user to specify */ if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) err(1, "BRDGSADDR %s", val); From nobody Sun Oct 15 17:15:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7n1x4LhRz4xB8B; Sun, 15 Oct 2023 17:15: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 4S7n1x3r5Mz4WcB; Sun, 15 Oct 2023 17:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6JVHwEkWci3UCFxUuzBnVVXS3YqQwRwTqF88YD/80EI=; b=NDuQI0/xIWEpBGQ8fBekDutjJxnpmUq5jKKqc3oVYjIGrCFPvoYDhay1FxXWw9xQYSVdOT GHWZ5nAoEGbV4rwGURa/SXh9+dadfoFP8sqMUCiK6MK+vvbMqbQWViNkeU+sjRGW7L7A69 FT+dJem6JmB9AWwEOpw8VmAaC+vSSwDTyeSa3o6GQA6GddXqqAiCQ64PezN6+RDEt/zW+7 1J9Ly7ygcLqRDsL5WcLh+RZqUKb/g5+2LR91TaowsNTJydpP8ogsyijIukFmzAT47rn+s9 2/7QP8rTv0vivc2kqxcjEv6wKrf0MFagvWIHrz3zJm+0YI7jW/PSvcJZGjT8uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697390133; a=rsa-sha256; cv=none; b=F4XwPZUpEfM3LTqX/vHcWEkdFLGvjwAX38e7mmE3WNpgLsi1ngicee2ESB9fjRPLbPDGoJ 9Ay311VlEMNWaS+2dJDYcccXc/qPbxxBWTr7uCQERQDS8Ghs32PYAOIj8d7oJwMguJUvqw RhFhiXJ4Jhe7YFkdLKk/mREA9DgPnGDCmNoOjfQSPFlPx9lO2AnYGAVOSyY7RuL49H6Tlf rNWaM8lijmoYlyr52Wk1vyjTVu8bz7Q7Vw0S/vFAKva28vU35bFvgtLzUNhwBNmo2SvhaC 8TL0z9lMiQLsWa5DfBX/WbfBhsp9772jGoIWl2JkdcY72kLGuYArVkEk7JaK5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6JVHwEkWci3UCFxUuzBnVVXS3YqQwRwTqF88YD/80EI=; b=jEkvYnEc1IiVPDBAgLhbx8Ksn6Q4RU9Mymd+Unqs3V72fhzsm6S9XaApZIqeiLANn6VuVj Rzl4sOJtnQt4PEYG0+/tJ1cM9LI68Vcmx6nD3TacSHrzzwodRluZdLJbXEaqZcKLDuPid0 p9HMuxGE4+T/QU68GYph0YinTeOMMspUAOBbTaW5FkacD9vywcckR1eBKhHiW/3upfIgBp w8u5QynJ1Y8UekhaSod0ILMWLWoVVAvcB8EZKUqsqw8XMxzIFnOAAy4YpQggfndWhC6EIs C2kxJmoz5qY4iVR1Z9EOL3gsmKmrEvpz2L6QznwOa/Cn717PoXWx2yYoV55QPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7n1x2wGQz1KmL; Sun, 15 Oct 2023 17:15: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 39FHFXCL059574; Sun, 15 Oct 2023 17:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FHFXsO059572; Sun, 15 Oct 2023 17:15:33 GMT (envelope-from git) Date: Sun, 15 Oct 2023 17:15:33 GMT Message-Id: <202310151715.39FHFXsO059572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 80496f42b6a9 - stable/14 - releng-azure: Use port name to install Azure CLI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 80496f42b6a9c13664f6228602fd21bf7a4500a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=80496f42b6a9c13664f6228602fd21bf7a4500a5 commit 80496f42b6a9c13664f6228602fd21bf7a4500a5 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:39:11 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-15 17:14:49 +0000 releng-azure: Use port name to install Azure CLI To overcome package name changing on default Python version updates. Approved by: gjb (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41453 (cherry picked from commit 0fe6998d8ad0bf54c237c8f513bf00cab547b561) --- release/Makefile.azure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index ba996bc15ac6..528371ad076e 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -38,7 +38,7 @@ azure-check-depends: . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif - env ASSUME_ALWAYS_YES=yes pkg install -y py38-azure-cli + env ASSUME_ALWAYS_YES=yes pkg install -y sysutils/py-azure-cli . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/sysutils/py-azure-cli BATCH=1 all install clean . endif From nobody Sun Oct 15 17:15:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7n1y56yVz4xB8H; Sun, 15 Oct 2023 17:15: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 4S7n1y4hV4z4WsP; Sun, 15 Oct 2023 17:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yADFmQzaKyAb8wCZKGxRarLfGFjXTLj8LJK+t+3w+Y=; b=I12jtKs73HN6VAYU8OQDkriBmxCxc+aLPxNuAP3xs0yIqIa+Yrqr4NsKSHhqnJ0Xd71yCy KvsYRxc9MjPM8LZAbP5UXLYJP0VQPMVodpr13j77oIP8w1CtK3SiR14x/oO6fhZNr3f23x ajf9SftnijFdXy1iM9GV1V9nLkP/9UODWY2QhVGjzth81yMA6sLniV2JF3ZoMwj6yKDBLu 9ZWGjm9eMEAEZNWW6foAUB88noNIi6hO40bZh3gq2AkQa1bBYNnPhwb1c/VBrPJcPjkrPn HxHfaUCE7CSTzEB8Ky1lJi2nxewgiGUGadBlA6w9tTksYTJXnygJOH6oUjQHIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697390134; a=rsa-sha256; cv=none; b=NNdiX/v8IJzA1blAr2kU7EG5Bf2x+9SjgfrS7dCH7uxCb/NZki4kL5Ynq2ZRbHZNTe8jF4 CLr889QTSqLI88blbLu42uDisKUr4c1Bcvtno0fm3W4jyCjIQJ62kc8KXdxChZDLxqkQ5R rKGHcVO1F0vBGbbWyiHk5SpPMP5F1XYVgJxNhosXzk0rkkDlPDSeaSpNQbf/kf04i4/9qo 1uiWN0p186YUSOaa2mFOWiZ3L+ionZvEVJ0ErBPoVDGs/Aw+05yA48sYdHq3eqKw89cQzj kpOHwcQSHTP08SRsmfTfgMziHUJdGKCZHRErSriV6+w+cFVy6TNmNlMh15dGHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4yADFmQzaKyAb8wCZKGxRarLfGFjXTLj8LJK+t+3w+Y=; b=AGVq30TveSKm8Fxw667Y4ZtMWkI169rAkWofNJvrdqHpjzcmNVwGV1r9PEB0koNL6VzCft U5wDYdjPtJ+wR8mBIDmNbsq88snyEh5zilxvN7T5RhclEHMnadUGkPNZ99ZN18/c8RzPpb JiEkXjyR9qF//uOlmdnA5SnXzAeOqki/Zmml5ds7RjTrsqJKqPGWe1lYH6+1QPEt2FgcFC 7Xf9gYLgJf1VH7/KLDJQylvOhYvCHqoC1PwQCVVJNgeCMkXIBw/1mDIM77Rs0yygNEg9al qZu9YBOBATpGbIdHlqN6tfRsxg1YWSsp8SP/MBi8bKL7ms1QLOTiFxfwf6OKXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7n1y3mQNz1KpZ; Sun, 15 Oct 2023 17:15: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 39FHFYZ2059633; Sun, 15 Oct 2023 17:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FHFYFo059630; Sun, 15 Oct 2023 17:15:34 GMT (envelope-from git) Date: Sun, 15 Oct 2023 17:15:34 GMT Message-Id: <202310151715.39FHFYFo059630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 1e7218e33974 - stable/14 - releng-azure: Add ZFS support to Azure image buliding and uploading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e7218e33974089234841420bb69777a29a91c61 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1e7218e33974089234841420bb69777a29a91c61 commit 1e7218e33974089234841420bb69777a29a91c61 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:40:39 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-15 17:14:56 +0000 releng-azure: Add ZFS support to Azure image buliding and uploading Approved by: gjb (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41454 (cherry picked from commit 78f901dcbd84ccad3849a8029f2320cf97079856) --- release/Makefile.azure | 18 +++++++++++------- release/Makefile.vm | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 528371ad076e..a8f59282a09c 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -4,7 +4,6 @@ # Makefile for uploading Microsoft Azure disk images. # -AZURE_IMG?= ${.OBJDIR}/azure.vhdf AZURE_UPLOAD_TGTS= azure-check-depends \ azure-do-upload CLEANFILES+= ${AZURE_UPLOAD_TGTS} @@ -19,8 +18,6 @@ AZURE${VAR}!= grep -E '^AZURE${VAR}' ${AZURE_UPLOAD_CONF} | awk -F ' ' '{print $ SNAPSHOT_DATE!= date +-${BUILDDATE} .endif -AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} - START_DATE!= date -v-1d -I -u EXPIRY_DATE!= date -v+1m -I -u @@ -44,14 +41,18 @@ azure-check-depends: . endif .endif -azure-do-upload: +.for _FS in ${AZURE_FSLIST} +AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhdf +AZURE_TARGET_${_FS}= ${OSRELEASE}-${_FS}${SNAPSHOT_DATE} + +azure-do-upload-${_FS}: /usr/local/bin/az storage blob upload \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --container-name ${AZURE_STORAGE} --type page \ - --file ${AZURE_IMG} --name ${AZURE_TARGET}.vhd + --file ${AZURE_IMG_${_FS}} --name ${AZURE_TARGET_${_FS}}.vhd @echo "The disk access URL with shared access signature is:" @echo - @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET}.vhd? + @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET_${_FS}}.vhd? @/usr/local/bin/az storage container generate-sas \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --name ${AZURE_STORAGE} \ @@ -67,5 +68,8 @@ azure-do-upload: @echo @echo /usr/local/bin/az storage blob delete \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ - --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET}.vhd + --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET_${_FS}}.vhd @echo +.endfor + +azure-do-upload: azure-do-upload-${VMFS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 09e31e3c0b6f..e1bba5271a4c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -23,7 +23,7 @@ CLOUDWARE_TYPES?= BASIC-CI \ OCI \ VAGRANT AZURE_FORMAT= vhdf -AZURE_FSLIST= ufs +AZURE_FSLIST= ufs zfs AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST= ufs From nobody Sun Oct 15 17:15:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7n1z63kNz4xBTg; Sun, 15 Oct 2023 17:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7n1z5b2Mz4Wll; Sun, 15 Oct 2023 17:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeWOxtYde6RzI7w8aHm1yBYeUnApzzvAIsFfHdvDnBQ=; b=a754Iuj4NJjavXMozsoZJGpXCcHtXk7A1GywaIJYvHzZvTFKXHZBX/BfpP3v/JFqZ+ryz/ +2fIpaq2srMMvfj/Pn8lnlCcOyLvOD3FeNNPDQsLIn+K02GKrMJWqM5JgdXDVeMxxIg3Or GDrUPwPJXJJ8xqwN7soNTZmW4vGTYrsT4CA4yr+tuEs0T+FqSu/H1uOYftwVt08v7iyvmM +PrfHGvVZ1AgnTlDoxLru6/jMVLMLrU5iRinLcWSccRg0Ohp19p0cfPCajulIPjPZJH0Ni FPZcaHE0easNhSJM141aUlaP38lnd8xrtGxbZsv3N394+8tIVkeOy4+H3Pr2qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697390135; a=rsa-sha256; cv=none; b=gw6cX6uGp3qetT/22M/rLAfW+48Iay6vHi1/OM+O/3foggpdekiyfExkYRzxD2uyYb94Gp mywWItwYF2syel/+6gM4EswZpXj/sr2zfgA/EYsHtqMh0tzZyXGBKeU57EOFjiJvptFzqe nIP3V+scgxxZTYQKJPfMznMzeWAwMbF67JYtImfEdPBoscCvDUvD9do/FLRGivu35Q73eL Gbia64qt69CG5KdFxO7bSVZ+Ux+Ku8GoG4qn7es1jl/wpFVcxCnpH9fiRvTQN30Rn+RGUq qFNeIGbgWGjxlkzkcoOjeDTsEIPjXmc3BH5eptZipIbnDbuJZxPXHaIcnP5nYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697390135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeWOxtYde6RzI7w8aHm1yBYeUnApzzvAIsFfHdvDnBQ=; b=U817kUpCxKisz+FOWdemrJ7zp+ZmvGBHO7KbScF3Cmdh6SRjPZhZkRjh32U26JJHO/4Wy9 JWEq0ofpFSzaUZdkKVKHOlqiMwcNXd1RCwy5TUrgSXW4GdClMflZ7NNpD1V3rtNU4UI4HV UAKlxamaiC6DPNmyFViVz+MgzOU831TC/yhqvbQC8FXZ/tcCTWhRyouTFgZno8njpko0Jj YzxLygmJrf6lOyNqvLIN8z7JQAKUQSPobo8ttgZJHaQcpIqKVlVlEj8ybgKkX/fC4fsgai Kp7k2J6IN8EmbkzwmNRVfGB8+13QgLho2D2yJqkzVgVGUuj6ISzDK9jwCzo1yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7n1z4htvz1L2V; Sun, 15 Oct 2023 17:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FHFZD1059699; Sun, 15 Oct 2023 17:15:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FHFZMg059696; Sun, 15 Oct 2023 17:15:35 GMT (envelope-from git) Date: Sun, 15 Oct 2023 17:15:35 GMT Message-Id: <202310151715.39FHFZMg059696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: c892a9af7187 - stable/14 - releng-gce: Add ZFS support to GCE image buliding and uploading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c892a9af7187e94f8dd6f720609e84d79c9e7d1f Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=c892a9af7187e94f8dd6f720609e84d79c9e7d1f commit c892a9af7187e94f8dd6f720609e84d79c9e7d1f Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:41:43 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-15 17:14:59 +0000 releng-gce: Add ZFS support to GCE image buliding and uploading Approved by: delphij (re), gjb (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41527 (cherry picked from commit 1b10bdf0e2fa80a485980b783469687623d3f1c3) --- release/Makefile.gce | 38 +++++++++++++++++++++----------------- release/Makefile.vm | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index bdf7b31ba302..f7fb0d8dc419 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -4,7 +4,6 @@ # Makefile for uploading Google Compute Engine disk images. # -GCE_IMG?= ${.OBJDIR}/gce.raw GCE_UPLOAD_TGTS= gce-check-depends \ gce-do-package \ gce-do-upload @@ -27,10 +26,6 @@ SNAPSHOT_DATE= -v${BUILDDATE} GCE_FAMILY_SUFX= -snap .endif -# Really? Uppercase characters are not allowed? Sigh... -# And don't even get me started on the '.'. -GCE_TARGET:= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}${SNAPSHOT_DATE} - gce-upload: ${GCE_UPLOAD_TGTS} gce-check-depends: @@ -53,25 +48,34 @@ gce-check-depends: . endif .endif -gce-do-package: - @# Yes, really... Sigh. - cd ${.OBJDIR} && mv gce.raw disk.raw - cd ${.OBJDIR} && tar --format=gnutar -zcf \ - ${GCE_TARGET:S,${.OBJDIR}/,,}.tar.gz disk.raw - cd ${.OBJDIR} && mv disk.raw gce.raw - touch ${.OBJDIR}/${.TARGET} - gce-do-login: @echo "This requires human interaction, which is not yet supported." @true -gce-do-upload: +.for _FS in ${GCE_FSLIST} +GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +# Really? Uppercase characters are not allowed? Sigh... +# And don't even get me started on the '.'. +GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} + +gce-do-package-${_FS}: + @# Yes, really... Sigh. + cd ${.OBJDIR} && mv ${GCE_IMG_${_FS}} disk.raw + cd ${.OBJDIR} && tar --format=gnutar -zcf \ + ${GCE_TARGET_${_FS}:S,${.OBJDIR}/,,}.tar.gz disk.raw + cd ${.OBJDIR} && mv disk.raw ${GCE_IMG_${_FS}} + touch ${.OBJDIR}/${.TARGET} + +gce-do-upload-${_FS}: @# Fallthrough in case the bucket already exists. /usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true - /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ + /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ - /usr/local/bin/gcloud compute images create ${GCE_TARGET} \ + /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ - --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz + --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} +.endfor +gce-do-package: gce-do-package-${VMFS} +gce-do-upload: gce-do-upload-${VMFS} diff --git a/release/Makefile.vm b/release/Makefile.vm index e1bba5271a4c..1a58a548b9f4 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -34,7 +34,7 @@ EC2_FLAVOURS= BASE CLOUD-INIT EC2-BASE_DESC= Amazon EC2 image EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image GCE_FORMAT= raw -GCE_FSLIST= ufs +GCE_FSLIST= ufs zfs GCE_DESC= Google Compute Engine image OCI_FORMAT= qcow2 OCI_FSLIST= ufs From nobody Sun Oct 15 18:32:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7pl53LPgz4xGCY; Sun, 15 Oct 2023 18:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S7pl52spSz4fpC; Sun, 15 Oct 2023 18:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697394769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0i79WigNih31uKQHOcfaFS07IYUnuS8cEisZgrVIq9w=; b=Lrd1RYX4VhYZhh5qCXIDmQXj+EHjJHqD4HS2hfRhAEfD1/PJByyMPc0r+k9wVeFQ2GY8Sx WVu6DoEVXaL4MeqvhHMj2+vnhHtN1In2TPYlV5WiS0AzetegZO1x8AhohKVP1gs7/Hp9vE c8XKXWkIu8DwNpj/mFG6ImUiqRS6C5ziI35M7EY2iygVZ4lIPdOdngcjnFnnmjt7DB8bFQ NEJqh+TwlQ/B3fubl5c5T/qCOtEktfEjBOBBkTeNyQVJ9iP56QNnuvJ6NKpH/Z1KpFEtgz e4sfQJY/HRreWJMCbgyu+dtqLNItuAhbxs9VbNk5u7xyIcQpxQ283lmmLYn6kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697394769; a=rsa-sha256; cv=none; b=LDnrmeePFR+RcjiIz/Y4NgSvrFqu811O7Btf7U/2Bsufv/jVa+KpEGZBOftB818QXH476V CqsH4tAli68F1+8RoLsSmj6bduAyq4l4Na6IJylymKOHHMgchkT0YfLv2q52iza4cbTQ/y j8eX1WrVOPAhh4nA+V7At5s/cpkRBPRxzoWMXY+VK1qc84c9e2NlI+qdXimCoWn/0g0o9n Cc1IOUbehRrINRxl4QaL6nvXu9NSszM2vYZTyd7l/EM77rwkR35H/puebaoJnRQ3ZAUsy4 SmvliIwADGEYSMghzoxq11bew3S+n0/Vtjc6s4TDfl4tWCJaJ68h1Egm9JT27Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697394769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0i79WigNih31uKQHOcfaFS07IYUnuS8cEisZgrVIq9w=; b=krFN67ZNMfNunDleNRsFRdT6gMp2GWU6R8LuD7ixWYtJzBB2OvVQ1uQ2U8xeGmnXvk2dh0 t7W0d4/0LmIFV4Ah+FVsDj1yqsnuVIzrxK7GD1VYZWgDD0pnnlw4AxiF+ga/7YySGqk2mO FSSIhsOfM6bwN3ca29U0fKDL8kCcS7aWlOZDGFVxlnRrWHPdW1DxDJ23K5kUN4ZJa8+XCV CfczguK0wxfZ4E5jhyeF8QQNtnl0WHMFLyN68w/YEdJE/rypaavT7vysmvC+w+s4vzTfGE RJrIZKVzu2WnHVw/AvPrZwXsuW3Z3Urm+uFdbRMKBisaB1WleZFNxuZZBDUO1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7pl51xRNz1MLS; Sun, 15 Oct 2023 18:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39FIWnqG092552; Sun, 15 Oct 2023 18:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FIWnb5092549; Sun, 15 Oct 2023 18:32:49 GMT (envelope-from git) Date: Sun, 15 Oct 2023 18:32:49 GMT Message-Id: <202310151832.39FIWnb5092549@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: c08ba4a588d5 - main - efibootmgr: provide explicit error message if run as non-root List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c08ba4a588d517e3c5fe00cee0927294d2490993 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c08ba4a588d517e3c5fe00cee0927294d2490993 commit c08ba4a588d517e3c5fe00cee0927294d2490993 Author: Ed Maste AuthorDate: 2023-10-15 17:21:52 +0000 Commit: Ed Maste CommitDate: 2023-10-15 18:31:51 +0000 efibootmgr: provide explicit error message if run as non-root This should be less confusing for new users. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42213 --- usr.sbin/efibootmgr/efibootmgr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index b0d023e3539c..8dcf9876486d 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -1101,8 +1101,11 @@ main(int argc, char *argv[]) /* * find_dev can operate without any efi variables */ - if (!efi_variables_supported() && !opts.find_dev) - errx(1, "efi variables not supported on this system. root? kldload efirt?"); + if (!efi_variables_supported() && !opts.find_dev) { + if (errno == EACCES && geteuid() != 0) + errx(1, "must be run as root"); + errx(1, "efi variables not supported on this system. kldload efirt?"); + } read_vars(); From nobody Sun Oct 15 19:31:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2b3k4qz4xJY3; Sun, 15 Oct 2023 19:31: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 4S7r2Z55Rdz4km9; Sun, 15 Oct 2023 19:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nc7aOsMfbu3EjzfsI7ZbVs/E1hoYj/Saalf5oaG4C6E=; b=CTen2TnEdfAqNemKylLvD24RouxxX3xdeoQCEDUGCRTIe6AluVblICOrW41Eu2kTf9rfaQ Kc7/JsDMKeC4dcFrznlm7gfcad6m1GYH5kYDZfMHrmmB073ABWGkxRuc7amYtcoP7L8XVd int3bhCTunF/teKi9eh+ieAwGfMzvG83qUa4O0yJCfUzTCTreHv9Mth5hUYSlWC+R3/IVh 70q7q0ZNBKy7b0RBtYquxBg8aCDQWG6ro9OWqp3mpk6AUyrKERHIcIYuy3X8Uu6Cen5Ic+ XhTENqnm2MjplXwxz65r351sdi8C48IydpQyJ3djuTG4mxtBYUja/NCXVQG3Xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398278; a=rsa-sha256; cv=none; b=kHidAvyzZQ0aP0M/xJC/sHsjXs7GWhsUfJMlGAxlq4oTPPdLMTbucBKOQNXtw1uFj5ea9D B5oCwaQeD0TDK02rqOmBhIgM3rZywspJdTpCgc7E+SNW5NLqh5NnATVmb8/aKkk2QmEYpS BGiVAxuXIzD5sUyXq+9OrQJTIk0yTFGHQRbEBP28RufRPtrch4Y26YDAHkzB5OvDSg95S6 05E3fpWBGWgrRYpT3ec91rjDZHNhuJUg4vhjPgv4tr1vjEgvKtrobCEHroEsMEMJChUX2n 4zml94eF1fVjefwniCOiRAYm48CxLl+Eiaq/iArzzUMGd72ka+XKNqLSD3g90A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nc7aOsMfbu3EjzfsI7ZbVs/E1hoYj/Saalf5oaG4C6E=; b=ZHwhjpdFa1eeecDwzbSfT0qrd0I+ZX/YsWCRCNAKyaCd6aV6UeW7Tp5N0pKxDXgbWQVM5Y pSHs3ov+Ynf2NVLcLyWFztbey6Z1QQOuw0z6bQVkairO3EQ5rJsaySoat9r/9ZETxVdyeE /rak1O8LF0uuiR7LkujZxcUC2WsWcgHJLPTcfgXqiTiVfHw0XAWlFWmSFp1+uz71kVNIgV Q9o772X9PlUJzw04l0OZ0V2D48NtxQdf1fm/KQHd7tr9PblbouLW3/Em0b0tpRCMbwWy68 BBrUkoRdBmtusm1TmspJCkZuxPiHsfHZfeOmN5Fw9s4ZzAFazJUhhNjMjeVLjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2Z48mZz1PWv; Sun, 15 Oct 2023 19:31: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 39FJVIBt088764; Sun, 15 Oct 2023 19:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVIpF088761; Sun, 15 Oct 2023 19:31:18 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:18 GMT Message-Id: <202310151931.39FJVIpF088761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 76c2b331bcd9 - main - lib/libc/amd64/string: add timingsafe_bcmp(3) scalar, baseline implementations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a commit 76c2b331bcd9f73c5c8c43a06e328fa0c7b8c39a Author: Robert Clausecker AuthorDate: 2023-08-30 15:37:26 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:19:04 +0000 lib/libc/amd64/string: add timingsafe_bcmp(3) scalar, baseline implementations Very straightforward and similar to memcmp(3). The code has been written to use only instructions specified as having data operand independent timing by Intel. Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41673 --- lib/libc/amd64/string/Makefile.inc | 3 +- lib/libc/amd64/string/timingsafe_bcmp.S | 232 ++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 73973a6d69de..fc420de0450e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -15,4 +15,5 @@ MDSRCS+= \ strcspn.S \ strlen.S \ strnlen.c \ - strspn.S + strspn.S \ + timingsafe_bcmp.S diff --git a/lib/libc/amd64/string/timingsafe_bcmp.S b/lib/libc/amd64/string/timingsafe_bcmp.S new file mode 100644 index 000000000000..c003da2ea9a7 --- /dev/null +++ b/lib/libc/amd64/string/timingsafe_bcmp.S @@ -0,0 +1,232 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * 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 "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +ARCHFUNCS(timingsafe_bcmp) + ARCHFUNC(timingsafe_bcmp, scalar) + ARCHFUNC(timingsafe_bcmp, baseline) +ENDARCHFUNCS(timingsafe_bcmp) + +ARCHENTRY(timingsafe_bcmp, scalar) + cmp $16, %rdx # at least 17 bytes to process? + ja .Lgt16 + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916 + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508 + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304 + + test %edx, %edx # buffer empty? + jnz .L0102 + + xor %eax, %eax # empty buffer always matches + ret + +.L0102: movzbl (%rdi), %eax # load 1--2 bytes from first buffer + movzbl -1(%rdi, %rdx, 1), %ecx + xor (%rsi), %al # xor in second buffer + xor -1(%rsi, %rdx, 1), %cl + or %ecx, %eax # mismatch in any of the two? + ret + +.L0304: movzwl (%rdi), %eax + movzwl -2(%rdi, %rdx, 1), %ecx + xor (%rsi), %ax + xor -2(%rsi, %rdx, 1), %cx + or %ecx, %eax + ret + +.L0508: mov (%rdi), %eax + mov -4(%rdi, %rdx, 1), %ecx + xor (%rsi), %eax + xor -4(%rsi, %rdx, 1), %ecx + or %ecx, %eax + ret + +.L0916: mov (%rdi), %rax + mov -8(%rdi, %rdx, 1), %rcx + xor (%rsi), %rax + xor -8(%rsi, %rdx, 1), %rcx + or %rcx, %rax + setnz %al # ensure EAX nonzero even if only + ret # high bits of RAX were set + + /* more than 16 bytes: process buffer in a loop */ +.Lgt16: mov (%rdi), %rax # process first 16 bytes + mov 8(%rdi), %r9 + mov $32, %ecx + xor (%rsi), %rax + xor 8(%rsi), %r9 + or %r9, %rax + + cmp %rdx, %rcx # enough left for a full iteration? + jae .Ltail + + /* main loop processing 16 bytes per iteration */ + ALIGN_TEXT +0: mov -16(%rdi, %rcx, 1), %r8 + mov -8(%rdi, %rcx, 1), %r9 + xor -16(%rsi, %rcx, 1), %r8 + xor -8(%rsi, %rcx, 1), %r9 + add $16, %rcx + or %r9, %r8 + or %r8, %rax + + cmp %rdx, %rcx + jb 0b + + /* process last 16 bytes */ +.Ltail: mov -16(%rdi, %rdx, 1), %r8 + mov -8(%rdi, %rdx, 1), %r9 + xor -16(%rsi, %rdx, 1), %r8 + xor -8(%rsi, %rdx, 1), %r9 + or %r9, %r8 + or %r8, %rax + setnz %al + ret +ARCHEND(timingsafe_bcmp, scalar) + +ARCHENTRY(timingsafe_bcmp, baseline) + cmp $32, %rdx # at least 33 bytes to process? + ja .Lgt32b + + cmp $16, %edx # at least 17 bytes to process? + ja .L1732b + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916b + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508b + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304b + + test %edx, %edx # buffer empty? + jnz .L0102b + + xor %eax, %eax # empty buffer always matches + ret + +.L0102b: + movzbl (%rdi), %eax # load 1--2 bytes from first buffer + movzbl -1(%rdi, %rdx, 1), %ecx + xor (%rsi), %al # xor in second buffer + xor -1(%rsi, %rdx, 1), %cl + or %ecx, %eax # mismatch in any of the two? + ret + +.L0304b: + movzwl (%rdi), %eax + movzwl -2(%rdi, %rdx, 1), %ecx + xor (%rsi), %ax + xor -2(%rsi, %rdx, 1), %cx + or %ecx, %eax + ret + +.L0508b: + mov (%rdi), %eax + mov -4(%rdi, %rdx, 1), %ecx + xor (%rsi), %eax + xor -4(%rsi, %rdx, 1), %ecx + or %ecx, %eax + ret + +.L0916b: + mov (%rdi), %rax + mov -8(%rdi, %rdx, 1), %rcx + xor (%rsi), %rax + xor -8(%rsi, %rdx, 1), %rcx + or %rcx, %rax + setnz %al # ensure EAX nonzero even if only + ret # high bits of RAX were set + +.L1732b: + movdqu (%rdi), %xmm0 + movdqu (%rsi), %xmm2 + movdqu -16(%rdi, %rdx, 1), %xmm1 + movdqu -16(%rsi, %rdx, 1), %xmm3 + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pmovmskb %xmm0, %eax # 1 where equal + xor $0xffff, %eax # 1 where not equal + ret + + /* more than 32 bytes: process buffer in a loop */ +.Lgt32b: + movdqu (%rdi), %xmm4 + movdqu (%rsi), %xmm2 + movdqu 16(%rdi), %xmm1 + movdqu 16(%rsi), %xmm3 + mov $64, %ecx + pcmpeqb %xmm2, %xmm4 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm4 + cmp %rdx, %rcx # enough left for a full iteration? + jae .Ltailb + + /* main loop processing 32 bytes per iteration */ + ALIGN_TEXT +0: movdqu -32(%rdi, %rcx, 1), %xmm0 + movdqu -32(%rsi, %rcx, 1), %xmm2 + movdqu -16(%rdi, %rcx, 1), %xmm1 + movdqu -16(%rsi, %rcx, 1), %xmm3 + add $32, %rcx + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pand %xmm0, %xmm4 + cmp %rdx, %rcx + jb 0b + + /* process last 32 bytes */ +.Ltailb: + movdqu -32(%rdi, %rdx, 1), %xmm0 + movdqu -32(%rsi, %rdx, 1), %xmm2 + movdqu -16(%rdi, %rdx, 1), %xmm1 + movdqu -16(%rsi, %rdx, 1), %xmm3 + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm3, %xmm1 + pand %xmm1, %xmm0 + pand %xmm4, %xmm0 + pmovmskb %xmm0, %eax + xor $0xffff, %eax + ret +ARCHEND(timingsafe_bcmp, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Sun Oct 15 19:31:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2c3Ms8z4xJdj; Sun, 15 Oct 2023 19:31: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 4S7r2b5mVtz4kmD; Sun, 15 Oct 2023 19:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mX7SEmOI9rJktSKZrSxmNxQ6Y9sHLz5GX68KRAzQaQg=; b=RW2QLwRQnylTPkzS9qU+2EfZzBbYYdXA9Tf7b5F0j44k9CkQtaFrtxiVuLM1AbkxSE55Gi xkBvhQlfQppwFZybkxpepANk4VQBvAQ4f+Aeh0YirHs/3t8vU/PaMcYJzJ3i9H/riFWEwB oLHAOyG+ughgwIc/Lo0LsFZY0hzlpYjUGu6UWM8zUn2uBTY02juZl+YAEDQNrEj+ueGMJ5 uGkasYTDFQuKgyo4t6DlFzN/j47nA8njsAfMBefLn6rTM01Cdd0ACB6DM3DNrxgHUy6I82 Nw18wwyEgtOsV78VchhAzNxre+bm6nqrE0cPqur8CA1eXz9T1jJoKBIqziMcAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398279; a=rsa-sha256; cv=none; b=pc+NsmCQ0E26XdBiCPgqOjn/E4GIs06CtG61PmaIhatoR0Ryv3Y8NIMd49GesGuGbPAKny LV6nJ4hstA0LQPQntSRqCUSkEJ+F3PtM0IHP5h5RnlbVoGtIdDMxEdf1g/Uhnl7pDnxuQM MzUs03VkzrvVrCAQ+rL4VgASDTrD8blynxFKyRK4MhYWRu2cKgTiN9ySBq8QQv9oE5RHHN MWR/vkK8GSA30n2dn/F2w58osYwaBay5zA5JQjlTa0E9bsMTr2HLGTS54CHOBN7gxcPLBs d+3zMYEWL/zi8i944NAlLwBnV49rHZTjKQwvHvafTwL7aeMb2p4SB7RwFvaKsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mX7SEmOI9rJktSKZrSxmNxQ6Y9sHLz5GX68KRAzQaQg=; b=SF0c9ta2q9cLD0hpQyBosyjg/3vn8665R5VbvMre+VfNsB2rk1cfuTN2/2NX69dZyJJfCW p8h8LKroqXf4Mh4RBjH3vaBzm7eGhmZK3ymtg0WH4y2rA2BF3x/QTaqvX2kwuC0rr/lKhH T4FhijKSco2Of/3MoIWqbQ7O1cn1VDfLaErPCJ1YyBd2NIvnprfAxwr+E3HHIGQDDEAmXA cdba+OU/khkTj6xglNal/13apcCukvPizGmfEL7Ez8VVmD/MMVnSPLWyHHXomo+FF62Pt3 cfF5+hXvw7fxAk1UNQUJ8m+MwKG18/OMkZ1lVpzmZqtlgagHD+SluD1NIt1BVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2b4sP1z1P3B; Sun, 15 Oct 2023 19:31: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 39FJVJXJ088813; Sun, 15 Oct 2023 19:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVJmf088810; Sun, 15 Oct 2023 19:31:19 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:19 GMT Message-Id: <202310151931.39FJVJmf088810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a78879dfaa8c - main - share/man/man7/simd.7: document new timingsafe_bcmp(3) scalar, baseline implementations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78879dfaa8cae5384fefc0f03f10e15dc28d994 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a78879dfaa8cae5384fefc0f03f10e15dc28d994 commit a78879dfaa8cae5384fefc0f03f10e15dc28d994 Author: Robert Clausecker AuthorDate: 2023-08-31 15:34:44 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:21:26 +0000 share/man/man7/simd.7: document new timingsafe_bcmp(3) scalar, baseline implementations Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41673 --- share/man/man7/simd.7 | 69 ++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index e5823f463ffb..057d74b944bc 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 25, 2023 +.Dd August 31, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -49,39 +49,40 @@ the environment variable can be used to override this mechanism. .Pp Enhanced functions are present in the following architectures: -.Bl -column FUNCTION__ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent -.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 -.It bcmp Ta Ta Ta S1 Ta S -.It bcopy Ta Ta S Ta S Ta S Ta SV -.It bzero Ta Ta S Ta S Ta S -.It div Ta Ta Ta S Ta S -.It index Ta S Ta Ta S1 -.It ldiv Ta Ta Ta S Ta S -.It lldiv Ta Ta Ta S -.It memchr Ta Ta Ta S1 -.It memcmp Ta Ta S Ta S1 Ta S -.It memcpy Ta S Ta S Ta S Ta S Ta SV -.It memmove Ta S Ta S Ta S Ta S Ta SV -.It memset Ta Ta S Ta S Ta S -.It rindex Ta S -.It stpcpy Ta Ta Ta S1 -.It strcat Ta Ta Ta S Ta S -.It strchr Ta S Ta Ta S1 Ta S -.It strchrnul Ta Ta Ta S1 -.It strcmp Ta Ta S Ta S Ta S -.It strcpy Ta Ta Ta S1 Ta S Ta S2 -.It strcspn Ta Ta Ta S2 -.It strlen Ta Ta S Ta S1 -.It strncmp Ta Ta S Ta Ta S -.It strncpy Ta Ta Ta Ta Ta S2 -.It strnlen Ta Ta Ta S1 -.It strrchr Ta S Ta Ta Ta S -.It strspn Ta Ta Ta S2 -.It swab Ta Ta Ta Ta S -.It wcschr Ta Ta Ta Ta S -.It wcscmp Ta Ta Ta Ta S -.It wcslen Ta Ta Ta Ta S -.It wmemchr Ta Ta Ta Ta S +.Bl -column FUNCTION________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 +.It bcmp Ta Ta Ta S1 Ta S +.It bcopy Ta Ta S Ta S Ta S Ta SV +.It bzero Ta Ta S Ta S Ta S +.It div Ta Ta Ta S Ta S +.It index Ta S Ta Ta S1 +.It ldiv Ta Ta Ta S Ta S +.It lldiv Ta Ta Ta S +.It memchr Ta Ta Ta S1 +.It memcmp Ta Ta S Ta S1 Ta S +.It memcpy Ta S Ta S Ta S Ta S Ta SV +.It memmove Ta S Ta S Ta S Ta S Ta SV +.It memset Ta Ta S Ta S Ta S +.It rindex Ta S +.It stpcpy Ta Ta Ta S1 +.It strcat Ta Ta Ta S Ta S +.It strchr Ta S Ta Ta S1 Ta S +.It strchrnul Ta Ta Ta S1 +.It strcmp Ta Ta S Ta S Ta S +.It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strcspn Ta Ta Ta S2 +.It strlen Ta Ta S Ta S1 +.It strncmp Ta Ta S Ta Ta S +.It strncpy Ta Ta Ta Ta Ta S2 +.It strnlen Ta Ta Ta S1 +.It strrchr Ta S Ta Ta Ta S +.It strspn Ta Ta Ta S2 +.It swab Ta Ta Ta Ta S +.It timingsafe_bcmp Ta Ta Ta S1 +.It wcschr Ta Ta Ta Ta S +.It wcscmp Ta Ta Ta Ta S +.It wcslen Ta Ta Ta Ta S +.It wmemchr Ta Ta Ta Ta S .El .Pp .Sy S Ns :\ scalar (non-SIMD), From nobody Sun Oct 15 19:31:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2d3HLPz4xJbj; Sun, 15 Oct 2023 19:31: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 4S7r2d02Hrz4l4H; Sun, 15 Oct 2023 19:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWzBzF9PTdHjDbwBPVNoxP92z03bXQM2l14ygW+BStM=; b=szcwZfY1yEumRus/F4tcnThael43GpjdA0nH6tYzw5M36MADwVlwNUdDvR7VEMzg7NhazQ DzOUbLw7xIpplPlq4eIC3hQSM4D2Y2/zxVexbN1PUAGvLCmia0YWV+ZTdL0qbIa5/gXdWj xBn2KNFdPkFz+r6SO4lu7aNP7Q002WU0FM2tCv5D+4DWF5ABmc6Wi/+qyrJj9SZtY5++ra oXQGQjuRmQeY8pjBWfbOKRVzlTsYqLKuJiowF4pJG6zri8pDbxk8wKQbVdmUyWN37gP0az m2V4QnPl1ieSNKZ+e1rGqFgeadeskzFAPqopLBIGTNQNwxpMJ1c4vWyJYqgd9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398281; a=rsa-sha256; cv=none; b=Fdvu01t+T0OS9+aPScluGPz+64Fi6P0pRNVywqVlVs7VQcNJQj78BnU+YYBbgESZJAeDYn 6VdzxOEjuD/U2ImUPH6/RR00TjxsrzeTYyNTiJ3zPsHwzEnU2TIdeJsWKO5LtH/ecz4l0i gkUjBihV0CxpKXTa8/QrDuWOwSApyC8w/PhFhrx0ayLZmPVGuoXCof36YX5AWQvPY52SzR EbMXvO7MhqcggOevvSJniZFIugNXZkNlzSuga2xd4GtFc/I1wY+QJGwBLWmp5zDdFgCEZm e0fIwsrpQGsUu0Ja75XFUwiYIszQaMSEh5jG/pQtJbpW1VVmPzWd3hcdAQ/4+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWzBzF9PTdHjDbwBPVNoxP92z03bXQM2l14ygW+BStM=; b=wIPb7G1aUuK8VLO4mYgYxz4TRhKpK3XLXgpLk0x7xBcBe5LPrRw5MM1Yq3ssTNBKsX/PBY EMniVPt5lvUjS1G+Iz/9mFPL+G9ri7r60Jr9KqzEnE9LRF4sjw314qNYnJNOQWz4faxHdN F0dc6qUdYZuPWqGJ4yAke2Kmu7hjaOLUHkP8dTcln/HCntwBwvniKb8EKfMC1f6Vdd8VIx oy1o5uS1q3V29IAe3qg3ncam141cXfEvpgFC/bIGIL8m/cszBgH+/NWlQEoQ1DqaxQ+Ztf 3NpTLasajp9ih69fpUNfzGI4F5Er66rHAYI20U1zEPYlS0UtyE81BZP5VfE63A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2c64RCz1PKG; Sun, 15 Oct 2023 19:31: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 39FJVKFO088862; Sun, 15 Oct 2023 19:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVKNf088859; Sun, 15 Oct 2023 19:31:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:20 GMT Message-Id: <202310151931.39FJVKNf088859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5048c1b85506 - main - lib/libc/amd64/string: add timingsafe_memcmp() assembly implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 commit 5048c1b85506c5e0f441ee7dd98dd8d96d0a4a24 Author: Robert Clausecker AuthorDate: 2023-10-15 19:25:53 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:25:53 +0000 lib/libc/amd64/string: add timingsafe_memcmp() assembly implementation Conceptually very similar to timingsafe_bcmp(), but with comparison logic inspired by Elijah Stone's fancy memcmp. A baseline (SSE) implementation was omitted this time as I was not able to get it to perform adequately. Best I got was 8% over the scalar version for long inputs, but slower for short inputs. Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Inspired by: https://github.com/moon-chilled/fancy-memcmp Differential Revision: https://reviews.freebsd.org/D41696 --- lib/libc/amd64/string/Makefile.inc | 4 +- lib/libc/amd64/string/timingsafe_memcmp.S | 145 ++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index fc420de0450e..09bf7c8f251e 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ amd64_archlevel.c \ bcmp.S \ @@ -16,4 +15,5 @@ MDSRCS+= \ strlen.S \ strnlen.c \ strspn.S \ - timingsafe_bcmp.S + timingsafe_bcmp.S \ + timingsafe_memcmp.S diff --git a/lib/libc/amd64/string/timingsafe_memcmp.S b/lib/libc/amd64/string/timingsafe_memcmp.S new file mode 100644 index 000000000000..3f1eccdbd640 --- /dev/null +++ b/lib/libc/amd64/string/timingsafe_memcmp.S @@ -0,0 +1,145 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * 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 + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +/* int timingsafe_memcmp(const void *rdi, const void *rsi, size_t rdx) */ +ENTRY(timingsafe_memcmp) + cmp $16, %rdx # at least 17 bytes to process? + ja .Lgt16 + + cmp $8, %edx # at least 9 bytes to process? + ja .L0916 + + cmp $4, %edx # at least 5 bytes to process? + ja .L0508 + + cmp $2, %edx # at least 3 bytes to process? + ja .L0304 + + test %edx, %edx # buffer empty? + jnz .L0102 + + xor %eax, %eax # empty buffer always matches + ret + +.L0102: movzbl -1(%rdi, %rdx, 1), %eax # load 1--2 bytes from first buffer + movzbl -1(%rsi, %rdx, 1), %ecx + mov (%rdi), %ah # in big endian + mov (%rsi), %ch + sub %ecx, %eax + ret + +.L0304: movzwl -2(%rdi, %rdx, 1), %ecx + movzwl -2(%rsi, %rdx, 1), %edx + movzwl (%rdi), %eax + movzwl (%rsi), %esi + bswap %ecx # convert to big endian + bswap %edx # dito for edx, (e)ax, and (e)si + rol $8, %ax # ROLW is used here so the upper two + rol $8, %si # bytes stay clear, allowing us to + sub %edx, %ecx # save a SBB compared to .L0508 + sbb %esi, %eax + or %eax, %ecx # nonzero if not equal + setnz %al + ret + +.L0508: mov -4(%rdi, %rdx, 1), %ecx + mov -4(%rsi, %rdx, 1), %edx + mov (%rdi), %edi + mov (%rsi), %esi + bswap %ecx # compare in big endian + bswap %edx + bswap %edi + bswap %esi + sub %edx, %ecx + sbb %esi, %edi + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %edi, %ecx # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret + +.L0916: mov -8(%rdi, %rdx, 1), %rcx + mov -8(%rsi, %rdx, 1), %rdx + mov (%rdi), %rdi + mov (%rsi), %rsi + bswap %rcx # compare in big endian + bswap %rdx + bswap %rdi + bswap %rsi + sub %rdx, %rcx + sbb %rsi, %rdi + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %rdi, %rcx # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret + + /* compare 17+ bytes */ +.Lgt16: mov (%rdi), %r8 # process first 16 bytes + mov (%rsi), %r9 + mov $32, %ecx + cmp %r8, %r9 # mismatch in head? + cmove 8(%rdi), %r8 # if not, try second pair + cmove 8(%rsi), %r9 + cmp %rdx, %rcx + jae .Ltail + + /* main loop processing 16 bytes per iteration */ + ALIGN_TEXT +0: mov -16(%rdi, %rcx, 1), %r10 + mov -16(%rsi, %rcx, 1), %r11 + cmp %r10, %r11 # mismatch in first pair? + cmove -8(%rdi, %rcx, 1), %r10 # if not, try second pair + cmove -8(%rsi, %rcx, 1), %r11 + cmp %r8, %r9 # was there a mismatch previously? + cmove %r10, %r8 # apply new pair if there was not + cmove %r11, %r9 + add $16, %rcx + cmp %rdx, %rcx + jb 0b + +.Ltail: mov -8(%rdi, %rdx, 1), %r10 + mov -8(%rsi, %rdx, 1), %r11 + cmp %r8, %r9 + cmove -16(%rdi, %rdx, 1), %r8 + cmove -16(%rsi, %rdx, 1), %r9 + bswap %r10 # compare in big endian + bswap %r11 + bswap %r8 + bswap %r9 + sub %r11, %r10 + sbb %r9, %r8 + sbb %eax, %eax # -1 if less, 0 if greater or equal + or %r10, %r8 # nonzero if not equal + setnz %al # negative if <, 0 if =, 1 if > + ret +END(timingsafe_memcmp) + + .section .note.GNU-stack,"",%progbits From nobody Sun Oct 15 19:31:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7r2f50kNz4xJbm; Sun, 15 Oct 2023 19:31: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 4S7r2f0qlyz4kdY; Sun, 15 Oct 2023 19:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBpICiX2Yj56PsuKHzdPYA36sCgdTSwPrrgEdl18NqE=; b=mTPi1F9Fy3CoVUZ91VehF98vkdTeG+SJzkJk7MsAfdd6zHnMKzIc7+FieEfO87fTHA5Ehx cpTD5cHCph/H2mtreNV3WXOuNu68Bz/6HEGrvEvkcretAOPnXQ3xfVBve4bkXg6j0uw460 cd8WJFVGLX91DrvWan8jAAuqBjwHScYGbkmhApRS9LWG44HKq7fdkxGyNIz8JLvs3Co+7z c/9+dksU/fR/FIYyeO/l+uZvwz0pp3a+jRNsjnnAOQdA5qvIiy7jGRhVept5e5OaLfEmUD ztVKPRL3CM4hxh+J+6LRs5Bmp4l7zpnQ702JPR4bj/MXcuTgR3INsmbBuSfp/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697398282; a=rsa-sha256; cv=none; b=cjB6e2L/eUkoLBOfH19UuaRRMyfX1+TBoRitRUqGraA5vgl5NnYdqtFE6kjUR0/NngJ8Pw 4IELJaks7xQYfvq8Eb5mwXYKNvDu6nct/fhtK5qg7+LUys95HByZK9/R7e+SUsbnjNtQK9 DiKbBV+1Liax8M8zuqtvk9Bh/UIiWXlXjpradUDr36NAhqrYlrno60xKFaMiKTkl712Dow sKvH1IN2mXY09v2JV32GU6HnufOGhXu/saE5KkMXfU0YKGKlr9AMVoQm4ZZ7jWLtspBASG 8dDxRexpfkS0pU2Lam3lqXXXwT/usiY2d0wE8ACkVGq82T/QAD5UI+neIOT7Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697398282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SBpICiX2Yj56PsuKHzdPYA36sCgdTSwPrrgEdl18NqE=; b=b3Fbfp8m4CxNza0JktNixp5ncARCi3Cy0TWhn1+ZnGOIN01/weICKDIWLxVTmHQLtWW/7R bxTFUsFD8Gp5gxPA0B0xva6kgAcLf2yvE8mlb47PK3mPBV8cegKKIU4wUp6tlitU7wYWme 1kE0hLjgSNJt32+EEA2iKi1WupbI+mMFbO6azpLS5vsvkg7L+XtviiT4i8xnM+cBVApulF GuWbXbS96KGLN+Dit/hU3bXgse2CX/DzWwbdWKJs2pWiOEw9bXZ5b+hsjjB5mYmlgBdWdv tObrUc3GRvKVnk2cojqP8ZsAIK7Bm4H1ytDOe9YefbpcrLoB8iixXHCLzUfWWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S7r2d738bz1PKH; Sun, 15 Oct 2023 19:31: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 39FJVL0G088904; Sun, 15 Oct 2023 19:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39FJVLdN088901; Sun, 15 Oct 2023 19:31:21 GMT (envelope-from git) Date: Sun, 15 Oct 2023 19:31:21 GMT Message-Id: <202310151931.39FJVLdN088901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a8cc4671c06a - main - share/man/man7/simd.7: document new amd64 timingsafe_memcmp() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8cc4671c06ab77d5551a74cdebced8d859cac76 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a8cc4671c06ab77d5551a74cdebced8d859cac76 commit a8cc4671c06ab77d5551a74cdebced8d859cac76 Author: Robert Clausecker AuthorDate: 2023-10-15 19:29:20 +0000 Commit: Robert Clausecker CommitDate: 2023-10-15 19:29:20 +0000 share/man/man7/simd.7: document new amd64 timingsafe_memcmp() Sponsored by: The FreeBSD Foundation Approved by: security (cperciva) Differential Revision: https://reviews.freebsd.org/D41696 --- share/man/man7/simd.7 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index 057d74b944bc..3fd8890c4f53 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 31, 2023 +.Dd September 2, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -49,7 +49,7 @@ the environment variable can be used to override this mechanism. .Pp Enhanced functions are present in the following architectures: -.Bl -column FUNCTION________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.Bl -column FUNCTION_________ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent .It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 .It bcmp Ta Ta Ta S1 Ta S .It bcopy Ta Ta S Ta S Ta S Ta SV @@ -79,6 +79,7 @@ Enhanced functions are present in the following architectures: .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It timingsafe_bcmp Ta Ta Ta S1 +.It timingsafe_memcmp Ta Ta Ta S .It wcschr Ta Ta Ta Ta S .It wcscmp Ta Ta Ta Ta S .It wcslen Ta Ta Ta Ta S From nobody Sun Oct 15 20:11:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S7rxD2rwJz4xLl2 for ; Sun, 15 Oct 2023 20:11:44 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 4S7rxC3lcGz4nvD for ; Sun, 15 Oct 2023 20:11:43 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=DBkufF9d; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d34 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org; dmarc=none Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-79fd60f40ebso88548039f.1 for ; Sun, 15 Oct 2023 13:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1697400702; x=1698005502; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=gv30Sx75bBnrEyNg5W6Gc410dxaQstu6Fb8/WMBiG+s=; b=DBkufF9di0VRonSINYtlgLHVJPsaOVK9NLYL99CTOsJMxnhBISWoDZiEtF7rpHO1AL QMXX4imTJ8SXsvLt/CcNDvwilwxqwuMgIEWGQ++rQOotaI2CLHB1vz1KYIm11acnfvQL j9XN7mAnDeNh6T0MsMdpMay3/s1byk5uuoVyvTfEnAzAX3dvwVffa3b9Q4wNLx9Jtsfv fE3caeLWsIr3l0raew1nRijv6dBJjY+bGr9T/mvOYPsEAHsel1KgyAu4kbXBuv1dulNl PLF8NhCVI0f7PzNNi3KrN3Rv6IL1QnLYvHA4ge0cbK/htPGE7V88HAJdBsc1TRDd/7j7 gNGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697400702; x=1698005502; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=gv30Sx75bBnrEyNg5W6Gc410dxaQstu6Fb8/WMBiG+s=; b=xPzyl+OgRptquPdAKm7VNr4vuL9OmdhD9YECpKekke9r3ImGREDIoEstXnJr8+mMOv TZLUu0zbiTBo6fCS4Rut+HDzl8jrO+THq15jiFsc67fPRKvHp3EefCbNYcEQyvWdjFjL n4TfBDExspUkYpPVr9hZqFs7ZCq5xkc48B+I3DOOdiLDLotXxjSnRQQPiGWMjaI0XTcY bdV2GUwexzPkMCjyW+xBRD0xMxSIfeiCgYs8UYlat3b8kmEkcRq3Lwl21REhZYtO2HZP CltfK/4BcCXpenpWLVcj2j9HkKZaWlLHPln8hbqTElL2a9wxubMUoZc97mNfMSoPSvc9 a6tQ== X-Gm-Message-State: AOJu0YwUCWYY6QzkjqqlsuUWPWCb9Rgd+vNGqKTtw6g39CqMevPnw+uI jGccuV9uIgMBXYuXjhkO+R4Fk2v5YM5G39ce7MQ= X-Google-Smtp-Source: AGHT+IE14Tr0NbC4aJq9p/c/8SQoRZ1eCP53syIYLzgWghG/6Vjj+q+05oHWLO14AfdQajzzdQaq/Q== X-Received: by 2002:a05:6602:154:b0:795:d33:861f with SMTP id v20-20020a056602015400b007950d33861fmr3817747iot.6.1697400702093; Sun, 15 Oct 2023 13:11:42 -0700 (PDT) Received: from mutt-hbsd (c-73-153-118-59.hsd1.co.comcast.net. [73.153.118.59]) by smtp.gmail.com with ESMTPSA id u8-20020a02cb88000000b004564b193674sm890663jap.160.2023.10.15.13.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Oct 2023 13:11:39 -0700 (PDT) Date: Sun, 15 Oct 2023 16:11:39 -0400 From: Shawn Webb To: Kristof Provost Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2cef62886dc7 - main - pf: convert state retrieval to netlink Message-ID: <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ri7nrzjoeqv4izka" Content-Disposition: inline In-Reply-To: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.10 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_EQ_ENVFROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d34:from]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[hardenedbsd.org:+]; RCPT_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[hardenedbsd.org]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4S7rxC3lcGz4nvD --ri7nrzjoeqv4izka Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 10, 2023 at 09:50:34AM +0000, Kristof Provost wrote: > The branch main has been updated by kp: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D2cef62886dc7c33ca01f70ca71= 2845da1e55b470 >=20 > commit 2cef62886dc7c33ca01f70ca712845da1e55b470 > Author: Alexander V. Chernikov > AuthorDate: 2023-09-15 10:06:59 +0000 > Commit: Kristof Provost > CommitDate: 2023-10-10 09:48:21 +0000 >=20 > pf: convert state retrieval to netlink > =20 > Use netlink to export pf's state table. > =20 > The primary motivation is to improve how we deal with very large state > stables. With the previous implementation we had to build the entire > list (both in the kernel and in userspace) before we could start > processing. With netlink we start to get data in userspace while the > kernel is still generating more. This reduces peak memory consumption > (which can get to the GB range once we hit millions of states). > =20 > Netlink also makes future extension easier, in that we can easily add > fields to the state export without breaking userspace. In that regard > it's similar to an nvlist-based approach, except that it also deals > with transport to userspace and that it performs significantly better > than nvlists. Testing has failed to measure a performance difference > between the previous struct-copy based ioctl and the netlink approach. > =20 > Differential Revision: https://reviews.freebsd.org/D38888 > --- > include/Makefile | 3 +- > lib/libpfctl/libpfctl.c | 214 +++++++++++++++++---------------- > sys/conf/files | 1 + > sys/modules/pf/Makefile | 2 +- > sys/netpfil/pf/pf_ioctl.c | 5 + > sys/netpfil/pf/pf_nl.c | 292 ++++++++++++++++++++++++++++++++++++++++= ++++++ > sys/netpfil/pf/pf_nl.h | 105 +++++++++++++++++ > 7 files changed, 522 insertions(+), 100 deletions(-) > diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c > index db8f481a1567..42c2aa9bfb01 100644 > --- a/sys/netpfil/pf/pf_ioctl.c > +++ b/sys/netpfil/pf/pf_ioctl.c > @@ -83,6 +83,7 @@ > #include > #include > #include > +#include > #include > =20 > #ifdef INET6 > @@ -6648,6 +6649,8 @@ pf_unload(void) > } > sx_xunlock(&pf_end_lock); > =20 > + pf_nl_unregister(); > + > if (pf_dev !=3D NULL) > destroy_dev(pf_dev); > =20 > @@ -6683,6 +6686,7 @@ pf_modevent(module_t mod, int type, void *data) > switch(type) { > case MOD_LOAD: > error =3D pf_load(); > + pf_nl_register(); > break; > case MOD_UNLOAD: > /* Handled in SYSUNINIT(pf_unload) to ensure it's done after > @@ -6703,4 +6707,5 @@ static moduledata_t pf_mod =3D { > }; > =20 > DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND); > +MODULE_DEPEND(pf, netlink, 1, 1, 1); > MODULE_VERSION(pf, PF_MODVER); Hey Kristof, This causes a hard dependency on the netlink kernel module, which may not be available in some configurations. For safety reasons, HardenedBSD prevents loading of netlink.ko by default. The code is too new and too complex, with already a not-so-nice security history, to be trusted. A lot (all?) of the other netlink integration code respects the potential unavailability of netlink (or netlink.ko). Would it be possible to do the same in pf? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --ri7nrzjoeqv4izka Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmUsR3UACgkQ/y5nonf4 4fq7yA/+IZAb8B02qAvO/oPfGMk4UO67EjXnpA5y3Qp67K37NTQ/ZIKroZR1OSp0 8GHCVeXC552hxv62JQV097NICKBxEWel9FKOFTGbyv+JlIp4hJR+3O6mMC68E5TU i20PqCuZp1E9dixsQxd7mEvJgFld8MahuqZDh424799M5J1mdgprdIvp3taS7S5R yhaJZ9buJ1iwFBSJDo4QoDI0tQcxEqMbaHEf5ZPyZV4ReRtV7BmG1SMotZ4QwTgy GVAslKnCVfVuiX+pJdfrr1QfV5s0njCbHSgGaN5tQDkS+/dBCSi9DcwfW30OJIOP yITioPPnw/5xBnbft6tHAYFSYaXHhG29JPUzCy4WHSBZQ3PnxnTxhjGMvYiL8/Jl oklvRG2JJ1x1gtYmQmGm+UkCb6lt6JBBAxD7nG988Fxp5pu/tzYk2WTdGr9Pag7Z NwfVRkqVcOuvBjR+Zj6NoktLxAiHF4hg2oLBVvHZInhfZtKe+FiIFyfJXSSeniXg 0x0+xU3dmkLFCiWe+hdP7MNBPxn08Nnq3JAwleBw/ZqXID+IE+LZXIYveJM5yTKK OQs99jPYkpsbCy9AVdnk7YKjC5fxIQvmEKCwLXOTz2xHWUXg0u8qF+ykSHVlCyD6 +uv/+IetAlVBTB3OurPbo67B/3h9oPnxYnx+7RBz1VTa/XMPWQI= =eoPf -----END PGP SIGNATURE----- --ri7nrzjoeqv4izka-- From nobody Mon Oct 16 04:00:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S83Kj2fhXz4wncN; Mon, 16 Oct 2023 04:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S83Kj27FGz3dgl; Mon, 16 Oct 2023 04:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibfwN6YzK0lFNDNTmJD9Et2m/oKc4B/94077Q07h+bE=; b=voujcqDiOBVfU6rnaDKnOHGacSrCFaj+VhxsHZ3Uf/BtGD/Kvv0LuPjFcua3nxD7C25vaC PsKacQrHujN8xhuoE4Y1eS43CVr8XAR3lFxWYygkGPkK27qlDfBq8IylbifkOTWv+o2K8Y 4fzSMW7kKTs/wvQAdNAmOlLzUGF1zk+n0xwRyHdhD3oAM1j8PGkpQsbChu26tnxBW5vnPE ESvIdybTdr2DX1mdfKAaExOz4rbDumK6BaIoxcMAfWthuCvwGtkRNiliYfYo9a43Wf7UfT CH0Zw5lBi/ZtcOAh8Y/IbzOzaHmOcFKQ0CoQnhqFRhG1Rr7dj2bV8z2W3CpxfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697428809; a=rsa-sha256; cv=none; b=nkfDlcSpDeacLxzCg3WUngOX06SR27bDeeEFeNtIiP/NWgBaxHwZ+35hPcLJ3YFLYdFsgF zZnAZDwXpvgAFs5w86bCn3AgqOyPf1EQYmRcFIx1vJcZjQrwnm7I56cjZfDHM0a1iB6rbj E0kpJPiG4Ad5TexzzkI4AzBWqGh7oPYotbPb/+q6QPBDPQKVgW2SGvRNg41rhMKAvt2zCy vJ58YjGc1XAqSFcqjEWv56mirPCPbbt2Qzc5coTPXA2k/cP8CzWFEpXp6LsYNhp6V8nBeb JLoCuFeblPrIgBTr6gcM42VrxhMqu60AbYvvwRg2Mq5xJ5KenaJTuf5LEDBr/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibfwN6YzK0lFNDNTmJD9Et2m/oKc4B/94077Q07h+bE=; b=vGpqubaROTpmfDjkv6MPo/bMWnpy8duW3GZQAhPWeg1k2j+gKc2GxpgnfVTRHA0/Ga35iW EJLzQyFzcg7u8tnMGmq+1rHQAbhiEIBtnzKBiA8sQ3omkdI9AN6gmGqh5sWkl0xls88DSQ nFIXOBXOI9DqwNwdgUElvW82mY5Fr9HOmzJUrrpuBDYx0aTvUvQodklNkKFysoRFA3SkqA GHE4u0hNpRqYRzm1ga4zJ05wxFkhW+qDgaW8KuzKoauuKy411rPcuIRG5ctIQKf8CiIYkO jNKedt7ECZgKv0/BCMyMHEPUhWepwPO+E/GjTzl5WhS9wF+ngDuRh3TRf4X5vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S83Kj19wJz9HF; Mon, 16 Oct 2023 04:00:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39G409bx025988; Mon, 16 Oct 2023 04:00:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G409tc025983; Mon, 16 Oct 2023 04:00:09 GMT (envelope-from git) Date: Mon, 16 Oct 2023 04:00:09 GMT Message-Id: <202310160400.39G409tc025983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8a9416b18f8a - stable/14 - unbound: Import upstream 0ee44ef3 when ENOBUFS is returned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a9416b18f8a894c4bb0c3a284746d5e0bc81152 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8a9416b18f8a894c4bb0c3a284746d5e0bc81152 commit 8a9416b18f8a894c4bb0c3a284746d5e0bc81152 Author: Cy Schubert AuthorDate: 2023-10-13 00:04:25 +0000 Commit: Cy Schubert CommitDate: 2023-10-16 04:00:00 +0000 unbound: Import upstream 0ee44ef3 when ENOBUFS is returned From upstream 0ee44ef3: - Fix send of udp retries when ENOBUFS is returned. It stops looping and also waits for the condition to go away. Reported by Florian Obser. PR: 274352 Merge commit '292d51198aa319c58f534549851e9c28486abdf4' (cherry picked from commit 6e71235e558ef579605e7f35b02f983b9a246a4a) --- contrib/unbound/.gitignore | 1 + contrib/unbound/util/netevent.c | 102 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore new file mode 100644 index 000000000000..b25c15b81fae --- /dev/null +++ b/contrib/unbound/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/contrib/unbound/util/netevent.c b/contrib/unbound/util/netevent.c index 204e4883cf27..b9395a8998b9 100644 --- a/contrib/unbound/util/netevent.c +++ b/contrib/unbound/util/netevent.c @@ -116,6 +116,8 @@ /** timeout in millisec to wait for write to unblock, packets dropped after.*/ #define SEND_BLOCKED_WAIT_TIMEOUT 200 +/** max number of times to wait for write to unblock, packets dropped after.*/ +#define SEND_BLOCKED_MAX_RETRY 5 /** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */ #ifndef SO_TIMESTAMP @@ -402,9 +404,10 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif + int retries = 0; /* if we set the fd blocking, other threads suddenly * have a blocking fd that they operate on */ - while(sent == -1 && ( + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -419,6 +422,13 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -457,8 +467,48 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; if (!is_connected) { sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), sldns_buffer_remaining(packet), 0, @@ -665,7 +715,8 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif - while(sent == -1 && ( + int retries = 0; + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -680,6 +731,13 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -718,8 +776,48 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; sent = sendmsg(c->fd, &msg, 0); } } From nobody Mon Oct 16 04:00:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S83LP5Pqtz4wp57; Mon, 16 Oct 2023 04:00: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 4S83LP50W0z3fRK; Mon, 16 Oct 2023 04:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ug7S1vhrzfLLHaDibIbFlACf6ApSMeRa14BDeXWWcM=; b=abMF20e8x4PoEX54LMHGGQ/mXCwU/D/54FzVHSNd9S/XPZPwgX2me1SCbscC+s/DLN2xZ/ a5P9tRx5lG3mRymn/eL7a/+YKtR0EQ8GWdFKl6RtUIldqofUWg92onFW+7rqJRUKMg5MFm lqlnfZWx61f/S6Jji3M+nO3RCgwHqqyTdqUQJuKWBiuozvtsMXuUazSLvmNkvmDNMJuu7i FcdOVE8OodGiOCKIZWXombjHAHMS8bsQE2qyIigtojQpG1fSUPgicccC+tr765RnkvGNq7 5YbR8jCsnh9Gj/XK5WUoNCMiGFu4kDSGlNTZ9cYoyI3LH/nGd0XRUsu/gdCE5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697428845; a=rsa-sha256; cv=none; b=ycBj198qLOHGmxXAyjkLPVry5cNRnBAojlHyPVmQBkvjmQQ76H0AvWR9/bdjKw7eIBADOz /mn5us6m5h62euLPVzkG+U9zlzpQ1KR3eg6lFESWO9cANXLVA1N55EnFGCQPD6dbCiEojM TA3um/wOU7Ft1OjwOdjNUAkuYeWgy9Fqp9jq+d2xIeZQ6Awj5/EZFCV0kTxFUUUP/Ci6dP k1u8xgjoCUztsDwa18MYLIlBE/y5g47e0FMerCoqJgajI0TgWAW6MKaePYGlTPeKsH3YbX OxmQqV8vEGk746mddtbOA8CklVfEybTMKOFIvs1cMTqjy5W/GqZbQEATX8LebA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ug7S1vhrzfLLHaDibIbFlACf6ApSMeRa14BDeXWWcM=; b=hlBxzEsPV1rEAXya1eHK+4DI5OaZYvVxUO1JpTHNOJzl7+G0HPsyzbCzaq4pU4CTTeTYUA QnPjK+f8ssGnLuEvy9Ehnz4/WklATTUCxpYV0QSiz0D8YXlbpAw3xkcPRC1a+t3AUk3xJs bVlqBTVB2g2sGTwyQfN84dZImRqXTItKHLOHQnYkkFpdgAiom4Yla1jJZWJzmHuJ0sMOsC s4KePoNBgEzSfu1KLTnjfuS8JAKjPCTaVevY1wXZe3pNRUNcgByu7sUzj+8+U2mFEu55RK MWrFrb8rQW2OeP0nyD+nGfJ1fhOyAsbP04zPtGaDGuwzEuQA503wKDVOLepAqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S83LP446Fz9HH; Mon, 16 Oct 2023 04:00: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 39G40j5Y033807; Mon, 16 Oct 2023 04:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G40jwa033804; Mon, 16 Oct 2023 04:00:45 GMT (envelope-from git) Date: Mon, 16 Oct 2023 04:00:45 GMT Message-Id: <202310160400.39G40jwa033804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 64ac3bca3a6e - stable/13 - unbound: Import upstream 0ee44ef3 when ENOBUFS is returned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 64ac3bca3a6ec8510ae7175cbdd73aa594756e2a Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=64ac3bca3a6ec8510ae7175cbdd73aa594756e2a commit 64ac3bca3a6ec8510ae7175cbdd73aa594756e2a Author: Cy Schubert AuthorDate: 2023-10-13 00:04:25 +0000 Commit: Cy Schubert CommitDate: 2023-10-16 04:00:36 +0000 unbound: Import upstream 0ee44ef3 when ENOBUFS is returned From upstream 0ee44ef3: - Fix send of udp retries when ENOBUFS is returned. It stops looping and also waits for the condition to go away. Reported by Florian Obser. PR: 274352 Merge commit '292d51198aa319c58f534549851e9c28486abdf4' (cherry picked from commit 6e71235e558ef579605e7f35b02f983b9a246a4a) --- contrib/unbound/.gitignore | 1 + contrib/unbound/util/netevent.c | 102 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore new file mode 100644 index 000000000000..b25c15b81fae --- /dev/null +++ b/contrib/unbound/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/contrib/unbound/util/netevent.c b/contrib/unbound/util/netevent.c index 204e4883cf27..b9395a8998b9 100644 --- a/contrib/unbound/util/netevent.c +++ b/contrib/unbound/util/netevent.c @@ -116,6 +116,8 @@ /** timeout in millisec to wait for write to unblock, packets dropped after.*/ #define SEND_BLOCKED_WAIT_TIMEOUT 200 +/** max number of times to wait for write to unblock, packets dropped after.*/ +#define SEND_BLOCKED_MAX_RETRY 5 /** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */ #ifndef SO_TIMESTAMP @@ -402,9 +404,10 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif + int retries = 0; /* if we set the fd blocking, other threads suddenly * have a blocking fd that they operate on */ - while(sent == -1 && ( + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -419,6 +422,13 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -457,8 +467,48 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; if (!is_connected) { sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), sldns_buffer_remaining(packet), 0, @@ -665,7 +715,8 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif - while(sent == -1 && ( + int retries = 0; + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -680,6 +731,13 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -718,8 +776,48 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; sent = sendmsg(c->fd, &msg, 0); } } From nobody Mon Oct 16 04:01:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S83Lp43tMz4wndt; Mon, 16 Oct 2023 04:01: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 4S83Lp3fKyz3fhQ; Mon, 16 Oct 2023 04:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrdeD52UaG8ODwUF52Xi/8embO3jt7YQt7Y+IevUbJk=; b=C9teasPrBgzYSbbJnvz2dtLzS+dLUNPDtYznRtYyEPeT+sH+SDUzEJ6/zB2U8bJvQG7Jbk 8389TZb2C1yFu04wJ9tzpaga3xDkwSoT5j2mUbyU+jiKeN5ZjFbxAldPFY9pUL718PxJzR K1bFxDDXWh2pSgdxWsplBjFJCQ5AHVSyOShE0mgWZ+U6dmMTGBt6HR3xEXsuckJ9Mfw6qL xj0IuYJ7oBKvDHqImfMRbl6WfxpJsx954gjnSmKndxqDQ8jztBUcfzOVQ8Qkk3YKbRC11z 2yYjgFrOGZVCFMI2B/2F1k5AnlOzngXQI1Tv6vQVpVwi5NtfCmCio0NCm9OceA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697428866; a=rsa-sha256; cv=none; b=i6R0vJcATUHZw3W7lKy/UaXFkib1eXNnmP3E+YzDVtSowhrm4E0LhqlNO4VP6YTFgmW0QJ BKDYGOYDTsXky5x/jJmwX0/ZtbYo/rgAMxbUx55qSob3cma3/l6I76fb8t3240wlb7lShB ndSvrgxPeIF9oD/qJXa8uAYhFNzlnnHJlgTHY9XG9W4QySpWo0+TomjmbWPlsApYny8jSJ XM9rvwn+fA94pe4pCgwmfKDKnjre1G/Ebi2WxoLNTmuPESxE60Ih9OAE5TCGWmdUIlVQJ1 QLLepp25cKeVFBp16mEBtAgPD63atw71Cd4BVDNkcIreJ8aWVH8lFXehdhvw8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697428866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrdeD52UaG8ODwUF52Xi/8embO3jt7YQt7Y+IevUbJk=; b=lFDmB8Y35BmmuxorETQ0Rq5Iy/B/hOnDYY4iHcDr1DBqJrpi1On+9H0ZApP/62AY2S8HTx XOFBcIb3Hi3ignDsQuezDNISyZgM0q1XoL/JgFnosDha4cu9qNXXPA1OL+jjLezhzNcGUy 36Dz65WBzLsfHsS/0EpSqZ9NJRQADZuRYNOyWAXkO2b+gBx0hWYDPgH4rqv0VFF5Ny9mqx pS1Zk52Lb5MDXLFMmWOt7ctpBBr1JnHjA+RgYhlArLRtMmCXvoDugDo/KWltGOEPN9qdwR i08jfZcBL7i1sxkmxKZ0RoWETqZTVVK7l3HqzAd0YPJDkvukabhmhcPBdFqOPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S83Lp2j9Hz9h4; Mon, 16 Oct 2023 04:01: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 39G416Zo034895; Mon, 16 Oct 2023 04:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G416Zp034892; Mon, 16 Oct 2023 04:01:06 GMT (envelope-from git) Date: Mon, 16 Oct 2023 04:01:06 GMT Message-Id: <202310160401.39G416Zp034892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 7d9c0fb57893 - stable/12 - unbound: Import upstream 0ee44ef3 when ENOBUFS is returned List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7d9c0fb578931f7f622970bad40d799abd74a76f Auto-Submitted: auto-generated The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=7d9c0fb578931f7f622970bad40d799abd74a76f commit 7d9c0fb578931f7f622970bad40d799abd74a76f Author: Cy Schubert AuthorDate: 2023-10-13 00:04:25 +0000 Commit: Cy Schubert CommitDate: 2023-10-13 01:54:35 +0000 unbound: Import upstream 0ee44ef3 when ENOBUFS is returned From upstream 0ee44ef3: - Fix send of udp retries when ENOBUFS is returned. It stops looping and also waits for the condition to go away. Reported by Florian Obser. PR: 274352 Merge commit '292d51198aa319c58f534549851e9c28486abdf4' (cherry picked from commit 6e71235e558ef579605e7f35b02f983b9a246a4a) --- contrib/unbound/.gitignore | 1 + contrib/unbound/util/netevent.c | 102 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/contrib/unbound/.gitignore b/contrib/unbound/.gitignore new file mode 100644 index 000000000000..b25c15b81fae --- /dev/null +++ b/contrib/unbound/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/contrib/unbound/util/netevent.c b/contrib/unbound/util/netevent.c index 204e4883cf27..b9395a8998b9 100644 --- a/contrib/unbound/util/netevent.c +++ b/contrib/unbound/util/netevent.c @@ -116,6 +116,8 @@ /** timeout in millisec to wait for write to unblock, packets dropped after.*/ #define SEND_BLOCKED_WAIT_TIMEOUT 200 +/** max number of times to wait for write to unblock, packets dropped after.*/ +#define SEND_BLOCKED_MAX_RETRY 5 /** Let's make timestamping code cleaner and redefine SO_TIMESTAMP* */ #ifndef SO_TIMESTAMP @@ -402,9 +404,10 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif + int retries = 0; /* if we set the fd blocking, other threads suddenly * have a blocking fd that they operate on */ - while(sent == -1 && ( + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -419,6 +422,13 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -457,8 +467,48 @@ comm_point_send_udp_msg(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; if (!is_connected) { sent = sendto(c->fd, (void*)sldns_buffer_begin(packet), sldns_buffer_remaining(packet), 0, @@ -665,7 +715,8 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, WSAGetLastError() == WSAENOBUFS || WSAGetLastError() == WSAEWOULDBLOCK) { #endif - while(sent == -1 && ( + int retries = 0; + while(sent == -1 && retries < SEND_BLOCKED_MAX_RETRY && ( #ifndef USE_WINSOCK errno == EAGAIN || errno == EINTR || # ifdef EWOULDBLOCK @@ -680,6 +731,13 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, #endif )) { #if defined(HAVE_POLL) || defined(USE_WINSOCK) + int send_nobufs = ( +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ); struct pollfd p; int pret; memset(&p, 0, sizeof(p)); @@ -718,8 +776,48 @@ comm_point_send_udp_msg_if(struct comm_point *c, sldns_buffer* packet, log_err("poll udp out failed: %s", sock_strerror(errno)); return 0; + } else if((pret < 0 && +#ifndef USE_WINSOCK + errno == ENOBUFS +#else + WSAGetLastError() == WSAENOBUFS +#endif + ) || (send_nobufs && retries > 0)) { + /* ENOBUFS, and poll returned without + * a timeout. Or the retried send call + * returned ENOBUFS. It is good to + * wait a bit for the error to clear. */ + /* The timeout is 20*(2^(retries+1)), + * it increases exponentially, starting + * at 40 msec. After 5 tries, 1240 msec + * have passed in total, when poll + * returned the error, and 1200 msec + * when send returned the errors. */ +#ifndef USE_WINSOCK + pret = poll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#else + pret = WSAPoll(NULL, 0, (SEND_BLOCKED_WAIT_TIMEOUT/10)<<(retries+1)); +#endif + if(pret < 0 && +#ifndef USE_WINSOCK + errno != EAGAIN && errno != EINTR && +# ifdef EWOULDBLOCK + errno != EWOULDBLOCK && +# endif + errno != ENOBUFS +#else + WSAGetLastError() != WSAEINPROGRESS && + WSAGetLastError() != WSAEINTR && + WSAGetLastError() != WSAENOBUFS && + WSAGetLastError() != WSAEWOULDBLOCK +#endif + ) { + log_err("poll udp out timer failed: %s", + sock_strerror(errno)); + } } #endif /* defined(HAVE_POLL) || defined(USE_WINSOCK) */ + retries++; sent = sendmsg(c->fd, &msg, 0); } } From nobody Mon Oct 16 07:16:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S87hM3ZjSz4x0tf; Mon, 16 Oct 2023 07:16: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 4S87hL74MCz4V0f; Mon, 16 Oct 2023 07:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gFnt1QCHRPPvcsqsmwPMguEyUiFJgmaF9hvva9cSv30=; b=bcjEFkQB4l+ShN8P3r0UbybXI10ormQcxN+1MIcdKgbBGBIUlCFxKcl//WXCLny3VTWWeS X7YjoXiqy6R/pU2zDBjiWlQyK0NX+WDfoe224VhrC8im5v5ZDUsTHSlq2SkMiVmx75pPKP uluRoBTt8tcbeK7RC74d8SGNScRE0Krh0RB6GI8OqEJXrrOPEZbHngfa4JtTg/Ln7oWaf3 NtwAMn7htMSuRY7PUC4bH38ogORVA8JQEcLanpLLd9nl33panUSTQo7bL6OOcROVnOb0ND tEk8qSwLZvcO5YMwHCjOO9NjsvNkijU8VctouISlZAvn2Ta8VD4lsWWAWa/vqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697440595; a=rsa-sha256; cv=none; b=VDTHP2S/K0rbHkkIL0M9uQrJ9sgYQZz5zhnrz9JfaOL32fcyXc9KVNTnrzUU/nmsBULeRe wZe86bUwhyLIHc5ehCSk1hySTJ4PgWdDNKt9jV3k39CgUNndfsjg3FypcP1Ak5kNkJr2ir /bPt8C/4QsqukhGkdFaAzR9JxrSTH5nxtf65cxhWySQ1NU/KysPkh1DssKjJ5KDRUIzmBG 9asaixzJArZqSyJwVHajYt+hJKmLYDw3W2TmdBuXsZCW/ZIg2eG5kNVTiysi8Y58tRNq2R DLo8KLI0KtgDLuTM67fVnI2o3cnxqjUBDEl9SSOxp9fSgCOqSsj2xP/oc2qBbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gFnt1QCHRPPvcsqsmwPMguEyUiFJgmaF9hvva9cSv30=; b=HzsczeGIijOEnnVaxy0saoG9CqQaNRCwlw1PYda0/XljZcVQL4o/Wgku7YT+rmHAaUbvx7 AReSrlcYYVicrxlaq/lV1Cw529BsSNKEFCE+HmXjM9+3qW/HZy6HdZUttItcAW0hkbgbzy XIyITgHDveBHXQedHUPkHDzG80e0yUSmg0cPACqH3ASoAS8vmNgjSsBSebIcZwsMzHIzQd 826Bicoe8vx2C1Qm+rYeHiUlm2eBK8FYeKlUi6VvcBqqsFF80v+gyndesszQ86A4qu8/Sa jqLy4ELoCqvyU6NdCyE3U+ZnTvdSkH4do5zoBP6vMNEGRFXyy89T0zg13NiN3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S87hL67b0zX2l; Mon, 16 Oct 2023 07:16: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 39G7GYFc054773; Mon, 16 Oct 2023 07:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G7GYrK054770; Mon, 16 Oct 2023 07:16:34 GMT (envelope-from git) Date: Mon, 16 Oct 2023 07:16:34 GMT Message-Id: <202310160716.39G7GYrK054770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5230afce76a2 - stable/14 - tun/tap: correct ref count on cloned cdevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5230afce76a2de387cc162384ffef4cebf576e97 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5230afce76a2de387cc162384ffef4cebf576e97 commit 5230afce76a2de387cc162384ffef4cebf576e97 Author: Konstantin Belousov AuthorDate: 2023-09-21 10:47:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-16 07:16:01 +0000 tun/tap: correct ref count on cloned cdevs PR: 273418 (cherry picked from commit 27f1ec0be24b45559793e486a4fa5a2e7fdadc17) --- sys/net/if_tuntap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index f4dbf685fba6..a01bc11aa64c 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -548,6 +548,7 @@ tun_clone_create(struct if_clone *ifc, char *name, size_t len, if (i != 0) i = tun_create_device(drv, unit, NULL, &dev, name); if (i == 0) { + dev_ref(dev); tuncreate(dev); struct tuntap_softc *tp = dev->si_drv1; *ifpp = tp->tun_ifp; @@ -611,8 +612,10 @@ tunclone(void *arg, struct ucred *cred, char *name, int namelen, i = tun_create_device(drv, u, cred, dev, name); } - if (i == 0) + if (i == 0) { + dev_ref(*dev); if_clone_create(name, namelen, NULL); + } out: CURVNET_RESTORE(); } From nobody Mon Oct 16 07:16:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S87hN4BXVz4x1nv; Mon, 16 Oct 2023 07:16: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 4S87hN11Fjz4V9H; Mon, 16 Oct 2023 07:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLOgzdbWoYL18+nzcFwaCr/REVuUdDHZqdp+iwploGg=; b=d7YPXM2ytSg9NGTBiLlRTWJZwSLeECgRHYgSKAlmAhJ01QP8MW4KJgjMwKyQa7MMsntEuo lE27BVBtus99EbbE8bOam/TyuqXo8iOMTGo6vqByycadMmvY8xlC/6M82rJMby6BWQGd4U KTFRfZJM1Ag0gT0C1yx9/JcE07cfu/dpdWWQgqFi1HM70qNiIJXOeCjOV6Smki2oUkSC7T LAks7mPvD3r37YDVMq+EobYMYJ7QHQgnclHcI+DiO0oqT+MhYBy4+wD1YcJwlN3v+2Dgwg nEcrPlwFIP+y/8a5h8GsrQEtBGMNyhI5FAMQZya2chfUpp472ymShtlqakhWpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697440596; a=rsa-sha256; cv=none; b=E+ECjoBWq367xiBEgnzulu4YpnqikusrP66i+6KDS9dfWyIt4XmrsBB9UYXvUiZdQBnm41 oH1RE5ZSiNb/E9NU4XO8Rl5Kw6pILo4FnNv0YgNIeU67IXvdKy9Q+Pigs7wdnpZrJnN35a jbJZcA93AI1OOQVWt6ZRHJcggrHDsrSxq/xpJIPy9R5fIcAqKukRq3zfJyjqpcCxHQ9kuh U+5zl7eJiU7tP8x+COimpDl7lSYmyNHd68OuznxbGTjNWf+LmmN7CbU6EoWYYWX2dktT/I sbpf+hYsNYYo4Rozj1qjrqBd2xWrXXgk11PQpl2TI6ZUuICR5I5yFses6BJSIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLOgzdbWoYL18+nzcFwaCr/REVuUdDHZqdp+iwploGg=; b=jzvhUgKSb8DRJ4VJnxpmFk2XPfc6sEKqhZWuWX1OJF4Tco1TzWDfv7kdJ1ycS5Uuma8HO9 anOWCrqZbzLh0QXV0WN9RTGV7KQ30c8da1eBYWPjCONZvUGMlAc9eoT8hATOTqCk36qqNQ 0561+GANcQO+73GZmJ/02ra0DHEg/bMnbxuoQUj9uAQAMAev570sASSPbygVJd64OYauIq BmujDs3XDcZAI/HSSuTcebF7yxZ/scwr0RZL+49lyAwwsTfkYVPjWwf2wZmMGEAd9EAtvG Ja1nXj1fgXxAXURL6Y4DkJBW0fZOwD5VI5SQCDUzOxA6sFQQ8m74TZGYDOKLNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S87hN02hmzWZm; Mon, 16 Oct 2023 07:16: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 39G7GZ8T054828; Mon, 16 Oct 2023 07:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G7GZmx054825; Mon, 16 Oct 2023 07:16:35 GMT (envelope-from git) Date: Mon, 16 Oct 2023 07:16:35 GMT Message-Id: <202310160716.39G7GZmx054825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 23a55498a818 - stable/14 - vkbd: correct ref count on cloned cdevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23a55498a8184add2396479a09c7ba0921d057a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23a55498a8184add2396479a09c7ba0921d057a4 commit 23a55498a8184add2396479a09c7ba0921d057a4 Author: Konstantin Belousov AuthorDate: 2023-10-02 22:25:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-16 07:16:01 +0000 vkbd: correct ref count on cloned cdevs (cherry picked from commit 6e92fc930943a85f311e986a02e2b3dae9e37126) --- sys/dev/vkbd/vkbd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c index a8d4583f46c7..3dbf64063e33 100644 --- a/sys/dev/vkbd/vkbd.c +++ b/sys/dev/vkbd/vkbd.c @@ -191,6 +191,8 @@ vkbd_dev_clone(void *arg, struct ucred *cred, char *name, int namelen, *dev = make_dev_credf(MAKEDEV_REF, &vkbd_dev_cdevsw, unit, cred, UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME "%d", unit); + else + dev_ref(*dev); } /* Open device */ From nobody Mon Oct 16 07:17:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S87jd56TGz4x1h8; Mon, 16 Oct 2023 07: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 4S87jd4bb4z4W25; Mon, 16 Oct 2023 07: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=1697440661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LFz7YOVrtxiZtrRnHEyfj0/51CJJUm3ohMZw21capRY=; b=obkHlIEmPhBvmvis5L1k54e0uUaEIG6qenVmFHtQyvj1OWeO48fQg63+MBY7u2iFWN4zN+ ume+zKpTY4dOOOWmFsVMUMM/jtFra8YtuZpRpdDFm45/MVZZydARmmv2UW2Jl82bGsB7fa KAWgGMEUjBreOTuFHdNH6g+nOo0yjB+X6r4S7yr4EusXQhATAJgnJpcRuxpaYCTMr52NzF vHr1tD1nH4uxpCPlJiTKLiIFmBoyyPgLCW9kcjMfHwqsV9gqYV75LmuklQQm8em/kPfeLW oe4cWgiVWM9biy2WdWO3U9DqQCRPnNA20SVLy3PlKZSy0F838V+I3p0j1uLadg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697440661; a=rsa-sha256; cv=none; b=MUJkdqGuv7cHD6L/RGLjVCLN37zgK0CbE3RTiDkgg++jGLNdYc3iRzohBEagoRUHUSNXZS pgtCNzPtnYwaFidIqWLvVEUdV1wpuYex442XNH25ltd3/AVhd7aYNUcNafCyHQXHN0YFQK eR5p5TNIfWppfjy5ig7ANsE/idIFxV4KB2AQBWc3mY4GWmIQBpn9NQidfteUO95+n+ivgt esOunxZSV4EgujePZKrrIUArKiUuZtZJ72rpQ7+rXa/pNDgIoeU0tnv91TRDzDeWeYmHbA ROykLer+2BP1ta/MtVaM7SlnW7/9s203Hz3imvf5ekCOoWcqdkYriPf8UmdjkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LFz7YOVrtxiZtrRnHEyfj0/51CJJUm3ohMZw21capRY=; b=ANUBOZ1dDTMm9vtm7fetinxjDfD6JfgLAKbKskar28LzPcQPGWEE25qofQ9+ukM59cuGtk 0+GPMIUp8reF5ZOwWiudS2uW32sN+5cDrBdmu44/5A1d9k8IfwoEkkxTW9T1TyerF9DD8m MddViryapny7PkiZpDq/az3exO+XgVehvGV/d57mmCl1RfQpkSOH1KUNTXiT0wfJ5Hl6C/ 8YrWWtLNl0Neb0hiZS0kqHPJDtp+pPZUWPNkOBu42iK0mZUWIsBZe6hP6fb2P/IJnShp/G 5EHYAFISrcLYZRbABGnnZtbOQggMNfOSXcxNNQ2NNYO8w/M3O/Ut4cU+4Dfwvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S87jd3g9TzX2m; Mon, 16 Oct 2023 07: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 39G7HftE055111; Mon, 16 Oct 2023 07: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 39G7HfUZ055108; Mon, 16 Oct 2023 07:17:41 GMT (envelope-from git) Date: Mon, 16 Oct 2023 07:17:41 GMT Message-Id: <202310160717.39G7HfUZ055108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e900c81ede85 - stable/13 - tun/tap: correct ref count on cloned cdevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e900c81ede851f52ab50b541b9a6ef5fbc9bb919 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e900c81ede851f52ab50b541b9a6ef5fbc9bb919 commit e900c81ede851f52ab50b541b9a6ef5fbc9bb919 Author: Konstantin Belousov AuthorDate: 2023-09-21 10:47:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-16 07:17:23 +0000 tun/tap: correct ref count on cloned cdevs PR: 273418 (cherry picked from commit 27f1ec0be24b45559793e486a4fa5a2e7fdadc17) --- sys/net/if_tuntap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index b81c2149a62f..756aa04482cb 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -541,6 +541,8 @@ tun_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) /* find any existing device, or allocate new unit number */ dev = NULL; i = clone_create(&drv->clones, &drv->cdevsw, &unit, &dev, 0); + if (i == 0) + dev_ref(dev); /* No preexisting struct cdev *, create one */ if (i != 0) i = tun_create_device(drv, unit, NULL, &dev, name); @@ -596,6 +598,8 @@ tunclone(void *arg, struct ucred *cred, char *name, int namelen, /* find any existing device, or allocate new unit number */ i = clone_create(&drv->clones, &drv->cdevsw, &u, dev, 0); + if (i == 0) + dev_ref(*dev); if (i) { if (append_unit) { namelen = snprintf(devname, sizeof(devname), "%s%d", From nobody Mon Oct 16 07:17:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S87jf69wYz4x1pB; Mon, 16 Oct 2023 07:17: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 4S87jf5gJMz4WX3; Mon, 16 Oct 2023 07:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1f1BW3smOIJH0J547lUvE3TYKt07QTTYNE6EAokE4UI=; b=JyHM425hgz0drM6mT8OofSCy0Oe3ljV0LE2mQr92IEQ7GdBFo/69Yr1fGYijHZpM618Qgd d4WQjhS65qwqSebz5y3BggY9R95piWj2a9NNkuBMc4FsLN7rSwmT1ilBFyt+Qh38Yefuyz KqdiFyrjwWIs34seEgqZ573CyRQrC08Gur6Se2ywE2J/eSL2/PzsuFImqDQXqNodV17/AN IjAi/6wtVpc7cLHvafqaSyVfTHa64x23D50sefN4SOZjibTu+4NNJ+sVoBqLImpMq1K0GL JXLE/v1IaSFUUOOABbPQIY6s931KIBx2ZN/uSPxadp2B2TgldEX6HFI15p06JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697440662; a=rsa-sha256; cv=none; b=tnbXQszLDIAfuxC3k9Wul56AlqDBxtFxMM9nEdKxQwj6BHZJdjNcu5YDcwCwyOfAEaX/+F N1BcB5QHVzLEdK1Wr1KCBwkTP3GREk7pk2qkhsQFp+/kOwFJPZoSsUIsheKGrwefvB7R1p Aq9KChlGZ4D65TpDIErAtFWW+ZoSAiLFTzAYnC06wVA6v2f6Pkv7ynwq4g+ACYiSayxF0Q bTQ6j9l/bgA5qzUcQ1HGBCsgXFMqq8CnapNp6IfcOnKHZLeDQFjopwjQcqZwha3/2ACp2H Sy8+JTMR8po1ySDPcD5qLdA6e9amlmpyUhkxYjcHS1Bj1Cx9GGTEWmxcRYEApg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1f1BW3smOIJH0J547lUvE3TYKt07QTTYNE6EAokE4UI=; b=tThRgv4kXpe7t6cqJ+Wpo15exqn34n6IlH3mYd8HPV2K8WjBIUT+1nTp8G7df3JgXLAH2W nnnrVCfXpjGvghgaoqPWg2RE2dYHnwpDz4wnPTgH/oycWS42yxpMZG1zbwvniv+zJ7JJD/ vT1sgSIu/UD2zhovB7C/xe6Ql03HEJtWOX6jYcSKDCHb2H528pfKiH1ssUP9pM0sgwunhW cXsRQSbZESl7OwMFu01coEtMgcrLnIotUBLo/1CTr7k3vzBgepodYAdKD0dxskXMpfohaI 9Oew6paZ568RLqqul5MLyAlEqSDcWBMbH5l4dJBocw+tirhNxkG6Fx5l6w74UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S87jf4jc0zWZp; Mon, 16 Oct 2023 07:17: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 39G7HgqX055161; Mon, 16 Oct 2023 07:17:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G7HgtZ055158; Mon, 16 Oct 2023 07:17:42 GMT (envelope-from git) Date: Mon, 16 Oct 2023 07:17:42 GMT Message-Id: <202310160717.39G7HgtZ055158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9769b9e9c004 - stable/13 - vkbd: correct ref count on cloned cdevs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9769b9e9c00471e366dceeb8d2fb0d0e16fbd204 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9769b9e9c00471e366dceeb8d2fb0d0e16fbd204 commit 9769b9e9c00471e366dceeb8d2fb0d0e16fbd204 Author: Konstantin Belousov AuthorDate: 2023-10-02 22:25:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-16 07:17:23 +0000 vkbd: correct ref count on cloned cdevs (cherry picked from commit 6e92fc930943a85f311e986a02e2b3dae9e37126) --- sys/dev/vkbd/vkbd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c index 3725e852ecd1..6a3f63796f13 100644 --- a/sys/dev/vkbd/vkbd.c +++ b/sys/dev/vkbd/vkbd.c @@ -191,6 +191,8 @@ vkbd_dev_clone(void *arg, struct ucred *cred, char *name, int namelen, *dev = make_dev_credf(MAKEDEV_REF, &vkbd_dev_cdevsw, unit, cred, UID_ROOT, GID_WHEEL, 0600, DEVICE_NAME "%d", unit); + else + dev_ref(*dev); } /* Open device */ From nobody Mon Oct 16 07:37:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S888y3DC8z4x2tC; Mon, 16 Oct 2023 07:37:54 +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 4S888y2jcWz4YHq; Mon, 16 Oct 2023 07:37:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697441874; 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=l91kvURmSb9nHaSCNfegLEjxhfZcC+MMGZHOR2F6+6g=; b=w8sGGekJ86z/UreVMtGdWE4GC6sf1KupKNRSQhAG+9AERnFoqyzYIJ5U1IqWl74esYu9Rx ovnby7Bsbpaj6SSqmaB9EjsjqlQ6eXEL3PE7Mo/rF1mCCBbFryTyN0FlIrnTx4KTfZ+cex qpCauq4vbjHCbqC1qxcsnGMSHuYTobTOhNyiEMp/vQnx1Ppec2x4ng3YaIN7uMOtrC5jlO 33d4cjecaFcWrsgmcYWRKVtvkCdjr7NBSp58uJ6hXjaYCO5LYR2z/BmiSkQhxOuA1gUPLs 1WVsU2ReC8S+M7eih3cfV6SRMHSHBhR7Ruvisj3a78utcLMzUXiFf4DHWYaBZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697441874; a=rsa-sha256; cv=none; b=XIp6lFuMFFrQ/WX68irHc5TbRFhCLkQaabjC/6by8SVIeejlvVeiBeQ79bZ++h6tL8qcWI VbvD29qfttZDusP6OOCp7b0d5hvo+k4kYl+Vlaxfl0o3E7wluS7hVCAzF1NfTZfAXexTqX vRWq/xa9NX89CX+9x+n7cENqQW/n01KYBnZke81pY38TzAYrREkWYEMDn3SPSki0wPelLY XCfyr/t+/FIvvjb/Q+lcEMBZVDpy+pkH9owtrsTlVsaln2vEwX0IGAmKVfE7dHMEWdyUO/ wtSvLDiVoy9it4IKp1uCohjJ2zN2TkFBNTwlPxM1A7OUqT7WTRMSQ8toCxfQYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697441874; 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=l91kvURmSb9nHaSCNfegLEjxhfZcC+MMGZHOR2F6+6g=; b=Z1oBI9uVIF/mCG0YTEIpSredzbq+F8p3WVOSdeKMHBGdvVkfRuE1yShiJNhu0wpQRuye6n f6hqTLiOkuwOxj2trtMoNKjghZQn1BJqPsDTlTG8lAZbABHl7p3ViPDDm68u3Pc4+Yq4Xq ucTeHulWajGuBL1PIlgJK+k3sI4ctWRYoA4tOskKiynx8OQZIf+Gtih79A+C2asCrOcRhK RxYR71GpeLkRvP1AXBHf+udEe0GsZfeSn5GsPJ9UysS8br9JIsdwLgquR6aWE1u3S7I4oj 7y3+di35eMgiLVkK6mERJNbtSIyyX5pI39OCys/cGluJUJdWxweH6hr/y7rEaQ== 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 4S888y11mMz5Hd; Mon, 16 Oct 2023 07:37:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 3AAE94B26E; Mon, 16 Oct 2023 09:37:52 +0200 (CEST) From: Kristof Provost To: Shawn Webb Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2cef62886dc7 - main - pf: convert state retrieval to netlink Date: Mon, 16 Oct 2023 09:37:51 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <92D6FE8C-50FF-4DC2-B0BF-29CBC7A4075C@FreeBSD.org> In-Reply-To: <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> References: <202310100950.39A9oYuc029996@gitrepo.freebsd.org> <20231015201139.zt7mfyss4ua2bkn3@mutt-hbsd> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 15 Oct 2023, at 22:11, Shawn Webb wrote: > On Tue, Oct 10, 2023 at 09:50:34AM +0000, Kristof Provost wrote: >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D2cef62886dc7c33ca01f70c= a712845da1e55b470 >> >> commit 2cef62886dc7c33ca01f70ca712845da1e55b470 >> Author: Alexander V. Chernikov >> AuthorDate: 2023-09-15 10:06:59 +0000 >> Commit: Kristof Provost >> CommitDate: 2023-10-10 09:48:21 +0000 >> >> pf: convert state retrieval to netlink >> >> Use netlink to export pf's state table. >> >> The primary motivation is to improve how we deal with very large s= tate >> stables. With the previous implementation we had to build the enti= re >> list (both in the kernel and in userspace) before we could start >> processing. With netlink we start to get data in userspace while t= he >> kernel is still generating more. This reduces peak memory consumpt= ion >> (which can get to the GB range once we hit millions of states). >> >> Netlink also makes future extension easier, in that we can easily = add >> fields to the state export without breaking userspace. In that reg= ard >> it's similar to an nvlist-based approach, except that it also deal= s >> with transport to userspace and that it performs significantly bet= ter >> than nvlists. Testing has failed to measure a performance differen= ce >> between the previous struct-copy based ioctl and the netlink appro= ach. >> >> Differential Revision: https://reviews.freebsd.org/D38888 >> --- >> include/Makefile | 3 +- >> lib/libpfctl/libpfctl.c | 214 +++++++++++++++++---------------- >> sys/conf/files | 1 + >> sys/modules/pf/Makefile | 2 +- >> sys/netpfil/pf/pf_ioctl.c | 5 + >> sys/netpfil/pf/pf_nl.c | 292 +++++++++++++++++++++++++++++++++++++= +++++++++ >> sys/netpfil/pf/pf_nl.h | 105 +++++++++++++++++ >> 7 files changed, 522 insertions(+), 100 deletions(-) > >> diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c >> index db8f481a1567..42c2aa9bfb01 100644 >> --- a/sys/netpfil/pf/pf_ioctl.c >> +++ b/sys/netpfil/pf/pf_ioctl.c >> @@ -83,6 +83,7 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #ifdef INET6 >> @@ -6648,6 +6649,8 @@ pf_unload(void) >> } >> sx_xunlock(&pf_end_lock); >> >> + pf_nl_unregister(); >> + >> if (pf_dev !=3D NULL) >> destroy_dev(pf_dev); >> >> @@ -6683,6 +6686,7 @@ pf_modevent(module_t mod, int type, void *data) >> switch(type) { >> case MOD_LOAD: >> error =3D pf_load(); >> + pf_nl_register(); >> break; >> case MOD_UNLOAD: >> /* Handled in SYSUNINIT(pf_unload) to ensure it's done after >> @@ -6703,4 +6707,5 @@ static moduledata_t pf_mod =3D { >> }; >> >> DECLARE_MODULE(pf, pf_mod, SI_SUB_PROTO_FIREWALL, SI_ORDER_SECOND); >> +MODULE_DEPEND(pf, netlink, 1, 1, 1); >> MODULE_VERSION(pf, PF_MODVER); > > Hey Kristof, > > This causes a hard dependency on the netlink kernel module, which may > not be available in some configurations. > > For safety reasons, HardenedBSD prevents loading of netlink.ko by > default. The code is too new and too complex, with already a > not-so-nice security history, to be trusted. > > A lot (all?) of the other netlink integration code respects the > potential unavailability of netlink (or netlink.ko). Would it be > possible to do the same in pf? > No. I=E2=80=99m not maintaining multiple configuration paths for pf. There=E2= =80=99s currently fallback paths to support old binaries, but I intend to= remove that code as soon as possible. Having configuration paths that ar= e untested, practically untestable and unmaintained is not a situation we= want to maintain either. Kristof From nobody Mon Oct 16 10:47:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8DMg4Ws2z4xDD3; Mon, 16 Oct 2023 10:47: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 4S8DMg3rSqz3MHT; Mon, 16 Oct 2023 10:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ1l897Ns3+xBWUzMMznfYAGwKlzUaktuDvPAA+WCOo=; b=f7ZvZG5flNU7ni2FOmhkXjxWnKs0vEjxw/kA0t8mWrMMKQLd5kTyByw8hG4GeHPI4YokBy XKXqnWRYMWXly7SVH9g8gRk4ee9r3KcoFhdn01rmx+pHZlfeh6vT7T8yRKeW8qQRTJD2aB osJ/FKCyty2+meBEJJLJLtlw+VyYhIdEO5DoyaaFA8DgQzV9RQWahBskY2X0uOYHnYonQi ePOpWTzBI5OZccz9iwe4o2JGHBnJ/58s+O6G1FRocaWjx5e+oCa8r50ACtQmmcB1cYpAUI D35yZVyMLfPaCniTcJUWPVRMDEfV/eS+IwwsdMRiCAw8Hf3bEdUTVLAsneO/bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697453247; a=rsa-sha256; cv=none; b=hyxV0Rq51og4VG2pe6iFsNK58w+7TEvNL9PCaQLsIjoyJEs4cygOQtxVenxYR+BaHZROa6 L4EgXW5+GKnxkekwpniq+G7mrbKLguN84f/w9SOMfCaIjf5SjbvT13uLto+Npz7rQ6lXLL AnaMiBPY518Oh6XpKQ+rWZJiXnmPxFG6Jz1vkbjSFbXiq+JwCdMcoVA7eNKPwzymXxevFk /lzszS4X6qT96JVCE7GAcMX45NXs4BiQHReOqkKXJ3BNlfEdf7YQgkgnEqLSafb9Zgc1an JTn0DVJ6omCxo7XiVOrsT6u3BsHOf7pLOyIM2ECWx7cmeET20T526Ek4J7eXFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZ1l897Ns3+xBWUzMMznfYAGwKlzUaktuDvPAA+WCOo=; b=dHVJjSsymWmhLOP83KoGkjbz/DYkCjeVa2GXvMF/Qj9unSOkxFu2XMmk6NayQa95VMNZBh P/g32WDPXEdYyZbE/C0MfGCT6Q22z2IDvm0/tAahx0mzfW5k3MhSHNcAsnN65JTWLzLWDG kkzVrfk7Q6Z1ghwHIlobhEhXrpLXjreC0IqeMw5rHoBWaPWEAw6si4adqTqYLnUa5f+Tx6 HWY9ApjUiFNadrdVg10s4e11xFBf8J2SjjLEGWg7iEDmUIAHBulZeb/m2tCraV+pziElnb 6/mYxS5jCed3SWT5OSzKeMdqvX94eHw61MDzAX2XUrGIVb+HmJUnmutiOzbEtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8DMg2w7szcSL; Mon, 16 Oct 2023 10:47: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 39GAlRus003695; Mon, 16 Oct 2023 10:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GAlR8c003692; Mon, 16 Oct 2023 10:47:27 GMT (envelope-from git) Date: Mon, 16 Oct 2023 10:47:27 GMT Message-Id: <202310161047.39GAlR8c003692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 7098f3c7569c - main - pci: Set the domain in the pci_generic driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7098f3c7569c21ecdfc990772e96a416f1a94eee Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7098f3c7569c21ecdfc990772e96a416f1a94eee commit 7098f3c7569c21ecdfc990772e96a416f1a94eee Author: Andrew Turner AuthorDate: 2023-10-13 10:08:21 +0000 Commit: Andrew Turner CommitDate: 2023-10-16 09:36:39 +0000 pci: Set the domain in the pci_generic driver Tell bus_dma(9) which NUMA domain the PCI driver is closest to so it can allocate memory from there when possible. Reviewed by: markj, jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42186 --- sys/dev/pci/pci_host_generic.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index cef83069c371..90361a7258ed 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -83,7 +83,7 @@ pci_host_generic_core_attach(device_t dev) uint64_t phys_base; uint64_t pci_base; uint64_t size; - int error; + int domain, error; int rid, tuple; sc = device_get_softc(dev); @@ -104,6 +104,13 @@ pci_host_generic_core_attach(device_t dev) if (error != 0) return (error); + /* + * Attempt to set the domain. If it's missing, or we are unable to + * set it then memory allocations may be placed in the wrong domain. + */ + if (bus_get_domain(dev, &domain) == 0) + (void)bus_dma_tag_set_domain(sc->dmat, domain); + if ((sc->quirks & PCIE_CUSTOM_CONFIG_SPACE_QUIRK) == 0) { rid = 0; sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, From nobody Mon Oct 16 10:47:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8DMh5Nkwz4xDL7; Mon, 16 Oct 2023 10:47: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 4S8DMh4sbxz3MFN; Mon, 16 Oct 2023 10:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IqrHDY788YzmIKpLZHvzn7QzeTz5l7c3Abx60TyXqc=; b=IaleBtwDMA36WsdAbk2iqc8x9u/OOqlMV/6N4kieuv2wpr+Cumr1a0XH6nlUK+3O1XVgiZ 9rGSvSria+3gYSARgAWcoWq2/d8UZr44n7jCJ4IaNlqzNNDvkUnXnwtu3HSwtuXPSn8g2r EwojRsTJI7jvhbEULghol3AfJBynScDGhyVfkzva4fR6+nyduwRtiuA9X6j/pxlpF2+fLh zxv3AfTFmtzfiWePw/Vs0bnUvJmZmzhEpyor3xmIH1tuquH4ZpWJr6fVqKfW3ntpYs180j l2gyDZupqH1IgRe+dYJNRi83CS+K7LvfOu389pFzNlHOmfVtxoGPo6/bIXJVaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697453248; a=rsa-sha256; cv=none; b=niZNrM95iQq1ES18PXkxgo5fZlNVIor4jEV6EmMuq6CbaGcynwHuhR8o7TlfQWZytt8S5m F+CTdL2jbQCSjFp2YOL5cC5RH1D3I/jaHPobpdb7E5uoIih1EzLBBq9ao5AkGCNN6JOcx1 OI2fl6qVosMJNatLLjGAg9GMOROVkWeyFimDOZYjp9zz/1DWW+irAJeeH43PvkDizfhbrZ mm1T0bKbIsP8oMLYd25c4u9vQGjzQ4+s9CKSLGraENhsVclpTti6qU9lvGTaBLyAwIuGJI s/behBQmDWHtj0r/eanyX7OrTHrydTj1rEbTEG6r07oVMpiIcpNaFHTQ7x2NHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697453248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2IqrHDY788YzmIKpLZHvzn7QzeTz5l7c3Abx60TyXqc=; b=c62MO/1mwGLM74LR59kT3xc9jaGhV0TdNSvNh5nn7TK5DGPRcosaYgfpf1KTmey4b6ZAWP uA9fLjoTBq3v7EtL4Ih87v4IqDH/5Rgl48JnrXbsCIW0mfLQUVY1XCNNdmfjijUPJ4NQre Ff/eR+dRVaWbOR7sno+Biq0VwvbBIFAa48qQ9czIMAzwkl0wMr9zZ0DV0brkDY76CJ+BUJ BKQh6XA1bJnuNpVb7K1Kh9Ab99gHUio43M1a0qW38t3TBH4O5kvyASBDF9QeGzQEGdFDCZ azVGuOxerE7/fhu3uWjKzJnRdVnYmd6bUBlVpH9oQ0RpXhXruyw4OVy/ehz+hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8DMh3xKrzcC3; Mon, 16 Oct 2023 10:47: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 39GAlSf5003756; Mon, 16 Oct 2023 10:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GAlS4A003753; Mon, 16 Oct 2023 10:47:28 GMT (envelope-from git) Date: Mon, 16 Oct 2023 10:47:28 GMT Message-Id: <202310161047.39GAlS4A003753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a69450102ff1 - main - arm64: Raise a SIGBUS on a user external abort List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a69450102ff1fe1466077a021a16bb265274d3a2 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a69450102ff1fe1466077a021a16bb265274d3a2 commit a69450102ff1fe1466077a021a16bb265274d3a2 Author: Andrew Turner AuthorDate: 2023-09-29 13:55:48 +0000 Commit: Andrew Turner CommitDate: 2023-10-16 10:38:14 +0000 arm64: Raise a SIGBUS on a user external abort When userspace triggers an external abort allow it to handle the abort by raising a SIGBUS. Reviewed by: markj, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42018 --- sys/arm64/arm64/trap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 2dda8cfc4c20..6534fd2283a1 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -225,19 +225,25 @@ static void external_abort(struct thread *td, struct trapframe *frame, uint64_t esr, uint64_t far, int lower) { + if (lower) { + call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)far, + ESR_ELx_EXCEPTION(frame->tf_esr)); + userret(td, frame); + return; + } /* * Try to handle synchronous external aborts caused by * bus_space_peek() and/or bus_space_poke() functions. */ - if (!lower && test_bs_fault((void *)frame->tf_elr)) { + if (test_bs_fault((void *)frame->tf_elr)) { frame->tf_elr = (uint64_t)generic_bs_fault; return; } print_registers(frame); print_gp_register("far", far); - panic("Unhandled EL%d external data abort", lower ? 0: 1); + panic("Unhandled external data abort"); } /* From nobody Mon Oct 16 11:32:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8FM92mFpz4xGN8; Mon, 16 Oct 2023 11: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 4S8FM91vnfz3XW1; Mon, 16 Oct 2023 11: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=1697455925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ehxx1S7B8/vCvnQ4LlMAGrhywNiwjWlA+hGjSXmhC7U=; b=gHs1KgPercCbYMbjhIdUgwP4AyJ1fIV+DELU1RNKcWYPrDapNV5ALf0eSYna/hlY+3FX5m KUVdF//1hgb4xl+eQQ82E72hFPB/fYXv+Ib3XffUBj6W8LoWRGLKV1ALvXhG/eJ678og7W w2cVPeP2E+Et+ASF+J85KyNRpXtqBHFhBL5wY7nd1bo70u7cZXnfyrHAp9+x7rKCsn8bi4 Bw27Qkdf7eo++PA1KZYN/mIWqcnd5Dl7CqeTyfMqK3Ybc+cvT7qSW1j7pv9SgmMkieDCyD ChNIcO6yMiX/wDdG26+FBjTNjdxxVPQXAi20d8dtb2HYuG1RVv02/tyLBsR60g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697455925; a=rsa-sha256; cv=none; b=yXu+O/LXbLb67QUneosMotEKOOcZoCsLsT4793dDsAABrzT1RpUXkcsAdD2ukn5L91HxHt lM7uEWdNzlacZXhB2ln39PlAuAtaDnTONuzLt4UYuHH4nWyNOZS7H/NWzZ7nJNgKZmAnib kH8/yeGuAsbjHMSRMp0NbOm6vu0UX8+A20pHAbzeExAntB+T9nEvn1QZgx+l4D5Bgk0EkA tagnWpMBbYWEevpKBLkEERZ0Eocxna0UW+C/bgOK/CCtiZVQj53Dvv0CFdZSSNHXuyjF0k ByRkVcNrgJICy/t6bTV2AV4nESEuJXg/A8SeWMGQVzISrPjv9CR7yXxIqE9RDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697455925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ehxx1S7B8/vCvnQ4LlMAGrhywNiwjWlA+hGjSXmhC7U=; b=lmbD3sPEDF0cBUg20p/xt1IYOGkKtkrL/cZi6kRc76uCPsLzNRtkP6juCOdIZX48N2c0eh D3OBI45QdrQOh2PtcuqTyDE+o5aDHvaM3YD29s36dHYQlpgL08DjSBW0oJBmTGy8bPy1b/ v6bsIZ8hIPuYORPzz7vvzehBKuY4CvDy0yM5ZwhKn3DXAuTv/18L/z1nuQ7PsS2rKLjcnr 3/IyHS5zbt99aIiX6gYZ8Z5nLlWpmSWk+S8efMjLO/r6Jr43uAEUujjD6ccPbYP4MYY/J6 wE381cQjJ4Yu4Cwz+vM+ow+HIcnE8Dl+uKHKdTqXiiuVpu+nOBSlShUpbX3S1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8FM90ygBzdZP; Mon, 16 Oct 2023 11: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 39GBW5QR083701; Mon, 16 Oct 2023 11: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 39GBW5Sh083698; Mon, 16 Oct 2023 11:32:05 GMT (envelope-from git) Date: Mon, 16 Oct 2023 11:32:05 GMT Message-Id: <202310161132.39GBW5Sh083698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ff15498894e2 - stable/14 - netlink: move NETLINK define to opt_global.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff15498894e2546fcce7ffc24967e714de3805ed Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ff15498894e2546fcce7ffc24967e714de3805ed commit ff15498894e2546fcce7ffc24967e714de3805ed Author: Kristof Provost AuthorDate: 2023-10-12 19:55:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-16 07:42:33 +0000 netlink: move NETLINK define to opt_global.h Move the NETLINK define into opt_global.h so we can rely on it being set correctly, without having to remember to include opt_netlink.h. This ensures that the NETLINK define is correctly set. If not we may end up with unloadable modules, due to missing symbols (such as nlmsg_get_group_writer). PR: 274306 Reviewed by: imp, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42179 (cherry picked from commit ab393e9548f8cc0ee28499c411963b798ebb38a5) --- sys/compat/linux/linux_netlink.c | 1 - sys/conf/options | 2 +- sys/modules/carp/Makefile | 2 +- sys/modules/ktest/ktest/Makefile | 1 - sys/modules/ktest/ktest_example/Makefile | 1 - sys/modules/ktest/ktest_netlink_message_writer/Makefile | 1 - sys/modules/linux/Makefile | 3 +-- sys/modules/linux_common/Makefile | 3 +-- sys/modules/netlink/Makefile | 2 +- sys/net/if_clone.c | 2 -- sys/net/if_vlan.c | 1 - sys/netinet/ip_carp.c | 2 -- sys/netlink/ktest_netlink_message_writer.c | 2 -- sys/netlink/netlink_domain.c | 1 - sys/netlink/netlink_generic.c | 2 -- sys/netlink/netlink_glue.c | 2 -- sys/netlink/netlink_io.c | 2 -- sys/netlink/netlink_message_writer.c | 2 -- sys/netlink/netlink_module.c | 2 -- sys/netlink/route/iface.c | 2 -- sys/netlink/route/iface_drivers.c | 1 - sys/netlink/route/neigh.c | 2 -- sys/netlink/route/nexthop.c | 2 -- sys/netlink/route/rt.c | 2 -- sys/tests/ktest.c | 2 -- 25 files changed, 5 insertions(+), 40 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index a6846035c22e..807cdc7a14bc 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_netlink.h" #include #include diff --git a/sys/conf/options b/sys/conf/options index 83742af0204f..aede28eeaaa7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -470,7 +470,7 @@ MBUF_PROFILING MBUF_STRESS_TEST MROUTING opt_mrouting.h NFSLOCKD -NETLINK opt_netlink.h +NETLINK opt_global.h PF_DEFAULT_TO_DROP opt_pf.h ROUTE_MPATH opt_route.h ROUTETABLES opt_route.h diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile index 5506d1aaec23..d7a85043539f 100644 --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -5,6 +5,6 @@ KMOD= carp SRCS= ip_carp.c sha1.c SRCS+= device_if.h bus_if.h vnode_if.h -SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h opt_netlink.h +SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h .include diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile index f72aa5d820db..264eb7b9f443 100644 --- a/sys/modules/ktest/ktest/Makefile +++ b/sys/modules/ktest/ktest/Makefile @@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest SRCS= ktest.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile index 5b0c9b41f9c8..a5fe6d6d7843 100644 --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest_example SRCS= ktest_example.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile index cdcd1d2c190f..2f84b2fecd72 100644 --- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile +++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile @@ -8,7 +8,6 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest_netlink_message_writer SRCS= ktest_netlink_message_writer.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 51b434d91b00..d1035445ccfb 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -70,8 +70,7 @@ SRCS+= imgact_linux.c \ linux_vdso_selector_x86.c \ linux_x86.c \ linux_copyout.c \ - linux_netlink.c \ - opt_netlink.h + linux_netlink.c .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 07df4555d1ee..374bc32215a2 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -7,8 +7,7 @@ KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux_dummy.c linux_errno.c linux_netlink.c \ - linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \ - opt_netlink.h + linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_x86.c linux_vdso_selector_x86.c diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile index 667c0b2475fe..6835be6e7bd7 100644 --- a/sys/modules/netlink/Makefile +++ b/sys/modules/netlink/Makefile @@ -5,7 +5,7 @@ SRCS = netlink_module.c netlink_domain.c netlink_io.c \ netlink_message_writer.c netlink_generic.c \ netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \ route/nexthop.c route/rt.c -SRCS+= opt_inet.h opt_inet6.h opt_route.h opt_netlink.h +SRCS+= opt_inet.h opt_inet6.h opt_route.h CFLAGS+= -DNETLINK_MODULE diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 1a2cea94ad35..5345d613f9d6 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -32,8 +32,6 @@ * @(#)if.c 8.5 (Berkeley) 1/9/95 */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index e7a290564722..b69d8107e30d 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -46,7 +46,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_kern_tls.h" -#include "opt_netlink.h" #include "opt_vlan.h" #include "opt_ratelimit.h" diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 28c1e535b783..b0a422d5060f 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -28,8 +28,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_bpf.h" #include "opt_inet.h" diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index c13a25e05a70..e46065dd4bd2 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 262361773fbb..7b2bbd39447d 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -30,7 +30,6 @@ * This file contains socket and protocol bindings for netlink. */ -#include "opt_netlink.h" #include #include #include diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index b28b206a7ace..b7600b2b6b71 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c index 29eac82aaffd..e7649c6b13dc 100644 --- a/sys/netlink/netlink_glue.c +++ b/sys/netlink/netlink_glue.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index 0745f7fdcb77..0ca71fb6219b 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 9fc0eddc78ec..8443cc59d9e0 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c index ba56ac6d6a17..b4073721fdc4 100644 --- a/sys/netlink/netlink_module.c +++ b/sys/netlink/netlink_module.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index b6e120933f83..0587b478431e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 1a7aaffa7dd7..4bf913d9c978 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 4168b5936ddc..9914e7febf57 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c index 722dc5fdee4e..0d6bb5c9ec84 100644 --- a/sys/netlink/route/nexthop.c +++ b/sys/netlink/route/nexthop.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 2a6a0bc54e85..cfaa2167b0d2 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c index 495fedf95dde..cd83a6aaaa3f 100644 --- a/sys/tests/ktest.c +++ b/sys/tests/ktest.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include From nobody Mon Oct 16 12:09:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8GBs05k4z4xHlv; Mon, 16 Oct 2023 12:09: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 4S8GBr6clVz3ZYy; Mon, 16 Oct 2023 12:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697458196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyR63E6fkVw7imjczn+TZAZC3beIqxZalAtlaW3G3Do=; b=KzYLcAPB0imcU5uMn1mz2qSyvZKuY9495naxo+QBc+qUv6YsZZ0XpInocrXtiSHaoY/iv1 QEARTIBb7owm36zQ14pLZONgPAFZs9TPOMna2XMR2jQf2HCoRwtWhC+SyGodsE5ucrKVeo W1sA53Vu3yVTokg91OeiDHNFifywIs9ltlV/k6c1WPvX0dMtZ492/8sVKDzflX0hNzOynh 3UHyh+eV3UlbS3Ne5B+KvZ2BhuPA1XK7YOyLwXSdXJTLTKeMnqWVJDVk261GfGHUYNBjIe J5GBJjQs6CUSCoVCvqR/yuwT/9hb8m7iWNwMQTiVssPOq8djNrnyxwx7uUzIIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697458196; a=rsa-sha256; cv=none; b=dYuF+QQgWhXsoGiasUrPdlp4KHM6fvaEK4wqRJ5Fnx7/9l+L6OfhpKWMDHKpWHFvCbop6z 6O/eCgQ7+K3JHpy/kQ6qwRhndajZEH7SamVm4qriUrRUjNLZsLPGsx0OiybSMuQJysYT9O MTJ5L6U9PWLGnfvDJk3DmTHpVwi72RWEsNFV+xZPbQ80HB79n5RSFY0090QwhyQNK3J3he fKo8VFTFd98RVwDS2/2E+MXNpoMCfFyq+7s/MIxnTjocUuc2XImdhGK7Hx5JpshM0Wohpf aNQEv1ni6em7vlXtIeJefwsjYxbN5rXCMrudjuHFXIQ6USNyDhZ4T3OA8GHo5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697458196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JyR63E6fkVw7imjczn+TZAZC3beIqxZalAtlaW3G3Do=; b=WRlcS6jcnYPXjUtlGeYFWF3JWcAqvFTEdGubtxyQ8VEAP5mV4zbPvF4WUKtSoCT/r93MnE 0uWzBczd8mS5o6d9Q2MXAgh00TX63YfNY8fTu5GftMRpkUv86bD57jg787aUClbFWNyI3j a8lUQ7KTkyCz2TAnO/8hKXFAKYDVE1B9Yo/CoZmvyUfOTeDIvKaVtw9aHAHdxQnSBH1g8R amPN5kAF/bkKHGeWnW0gt8hVuDfNsuCPmySX8lcOv5dkqw17z+BnifAh5amIr73rmDu546 TqAE1I47DK5h2A+tM65G0ShcMYrTSTrXPmuFt5RS7uddqA6HjSNqyUYKqwQ9AQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8GBr5frmzfYP; Mon, 16 Oct 2023 12:09: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 39GC9u6X038065; Mon, 16 Oct 2023 12:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GC9uSf038062; Mon, 16 Oct 2023 12:09:56 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:09:56 GMT Message-Id: <202310161209.39GC9uSf038062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 7ef6e99752db - main - sade: Restore UI behavior like dialog(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ef6e99752db3c0fc7953a039050881c068b43fe Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=7ef6e99752db3c0fc7953a039050881c068b43fe commit 7ef6e99752db3c0fc7953a039050881c068b43fe Author: Alfonso S. Siciliano AuthorDate: 2023-10-16 12:06:06 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-16 12:06:06 +0000 sade: Restore UI behavior like dialog(3) Restore UI behavior like previous disk menu implementation built on dialog(3): * Buttons of Create and Modify forms always active to close the dialogs just pressing Enter. * Disk menu indentation. --- usr.sbin/bsdinstall/partedit/diskmenu.c | 8 ++++---- usr.sbin/bsdinstall/partedit/gpart_ops.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/diskmenu.c b/usr.sbin/bsdinstall/partedit/diskmenu.c index f87c7714e5a7..55ef5a200658 100644 --- a/usr.sbin/bsdinstall/partedit/diskmenu.c +++ b/usr.sbin/bsdinstall/partedit/diskmenu.c @@ -48,14 +48,14 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items, for (i = 0; i < nitems; i++) { bsditems[i].prefix = ""; bsditems[i].on = false; - bsditems[i].depth = items[i].indentation; + bsditems[i].depth = 2 * items[i].indentation; /* old menu sets max namelen to 10 */ bsditems[i].name = items[i].name; humanize_number(size, 7, items[i].size, "B", HN_AUTOSCALE, HN_DECIMAL); mp = items[i].mountpoint != NULL ? items[i].mountpoint : ""; - asprintf(__DECONST(char**, &bsditems[i].desc), "%s %-15s %-10s", - size, items[i].type, mp); + asprintf(__DECONST(char**, &bsditems[i].desc), + " %-9s %-15s %s", size, items[i].type, mp); bsditems[i].bottomdesc = ""; } @@ -86,5 +86,5 @@ diskmenu_show(const char *title, const char *text, struct partedit_item *items, free((char *)bsditems[i].desc); free(bsditems); - return output; + return (output); } diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 92d1a367890c..b1d4d0f23315 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -639,8 +639,10 @@ gpart_edit(struct gprovider *pp) items[1].init = sizestr; editpart: + conf.button.always_active = true; conf.title = "Edit Partition"; choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL); + conf.button.always_active = false; if (choice == BSDDIALOG_CANCEL) goto endedit; @@ -1128,10 +1130,12 @@ addpartform: if (interactive) { conf.button.with_extra = true; conf.button.extra_label = "Options"; + conf.button.always_active = true; conf.title = "Add Partition"; choice = bsddialog_form(&conf, "", 0, 0, 0, nitems, items, NULL); conf.button.with_extra = false; conf.button.extra_label = NULL; + conf.button.always_active = false; switch (choice) { case BSDDIALOG_OK: break; From nobody Mon Oct 16 12:30:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8GfR57L4z4xK1l; Mon, 16 Oct 2023 12:30: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 4S8GfR4f3qz3bl6; Mon, 16 Oct 2023 12:30:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aD762zxfLF209TJyp8hPPCGo9K+i3PTHbLH5t9CBmrY=; b=r5nO8DZApfwzs0NtF7QFqG7U4aVHsh2HidbmDYuqCNi7EShaFYChROOBiFocMz4pjSVVMh 2uHDDHUxhlK82+s6NbPtN7SAT48r6GtXtSfC9N4yFWdNAT09TbM7iVXdpQ18mm4NFFuUqI oHp6ouEln+SCZrft5goqfIhibvXFo2SV7O/Uj++n62taw8cD75YqcerOvLLRVtff+jvoFs Yt9zaFUfIr2ENfN2+P5XGulVSzMdJjSp+U/Nrjj8/EjVwtpHL9FeSrPGGBW25mAobcN1xa DFKVMIfURC7yfro95SuOGtGrLx1G2xA0sbKcctwNGg349t4A+CU4s8ghn5XxYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697459423; a=rsa-sha256; cv=none; b=deE6TSNsU3KEPXUe1pmuBRyfHQP1uDPlmYxEGdf6UyP2Z2eSgzj4IIiXQczYHM5VQTTYPf y/XvwCKozvu1ZVVJMJ42z05DOMTOzAb95zEhCAnKUdACbJLU1Muwl+MBhTrvE3/oFMkmfb 9hF65c2wO7Rv5B4LKoz8UJ/0yZyaDuViWR6qiNAuzNCwClS4h0rFIiWLuz75cTcmInSis0 lDnakApVUVUc5e5h+JpvSA1I8/bTEtC5fIoIdISN6Stxthku5X517RGfCaJXh7rxo3/pf4 ShwvBpTgHnlIKkSwlhaD5gQtZWItmcn4VP98o5oZTZ8op43v6sQhqnBocCdYHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aD762zxfLF209TJyp8hPPCGo9K+i3PTHbLH5t9CBmrY=; b=K8KD37z7lnJbjwIeRhS4Z3J846w3E2dn+u55DkvfrsK45IrWuvM8smFl3QsRtWq/tUUZKO IWLePnrodpMMIjP1M21s4HDvZsiZp8qE8Fkwq5URjsVN2MRHSj08Bo2cbdCukI8O4LCfyY LqhcBY/qUuo67AsPVn1RCEGGPP3KQADV4Cig2F5Gqse2Y4ou/0BtCOAtFKAQzWRcRsoKzY O+zULT0hgVC15k+B3V1vEifq83LSmvONqchB+6H2s0kkyyyG1tEpI0runK/lH7Drz9o+9q Qy6rAecf3RA0UBnmSrBlgdbYeonxWqmJCUciLiiG7ZInO18FwrASZ8xOPqgpQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8GfR3hKkzgTF; Mon, 16 Oct 2023 12:30: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 39GCUNx5079216; Mon, 16 Oct 2023 12:30:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GCUNBx079213; Mon, 16 Oct 2023 12:30:23 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:30:23 GMT Message-Id: <202310161230.39GCUNBx079213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 73099785902d - stable/14 - Handle MOVED_LIBS in list-old-files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73099785902d750f96d07f2c413db062bf0e47bd Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73099785902d750f96d07f2c413db062bf0e47bd commit 73099785902d750f96d07f2c413db062bf0e47bd Author: Ed Maste AuthorDate: 2023-10-13 18:06:58 +0000 Commit: Ed Maste CommitDate: 2023-10-16 12:29:46 +0000 Handle MOVED_LIBS in list-old-files MOVED_LIBS is used when a library moves from one directory to another, e.g. /usr/lib/libc++.so.1 to /lib/libc++.so.1. delete-old-files and delete-old-libs are two separate steps, so that old libraries can be retained until third party software packages are rebuilt or reinstalled. Having two copies of the same shared library with the same so version (as can happen when delete-old-libs hasn't been run) causes trouble. The PR below gives one example. Libraries listed in MOVED_LIBS are logically equivalent to updating a library without changing the so version, and should be removed as soon as possible. Handle them in list-old-files and thus delete-old-files. Leave them also in *-old-libs for now, in case the user updates their tree between running delete-old-files and delete-old-libs. PR: 272642 Reviewed by: dim Sponsored by: The FreeBSD Foundation Co-authored-by: Dimitry Andric Differential Revision: https://reviews.freebsd.org/D42197 (cherry picked from commit 922337e8d3989e4f54a0338b7fc397e3e0af7832) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 45d034c0002c..01d3328726bd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3306,6 +3306,7 @@ list-old-files: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \ + -V "MOVED_LIBS:ts\n" \ ${_ALL_libcompats:@v@-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ sort From nobody Mon Oct 16 12:30:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8GfS6nthz4xJxG; Mon, 16 Oct 2023 12:30: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 4S8GfS68SSz3c3x; Mon, 16 Oct 2023 12:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTjkyqevDmpoGtd6kTZMHAmTWvvVyjKGnLF9r7SJh40=; b=KGqGvPuiSSRSn4ZQ+fHASGQGulR6nM9CFlNlSlLVD7EACsDXr1YHUf+REItdtHtY1HSM2g kCYg+xxh4Og5GeVJF4zzdQFhAlpM35oyQElQyKBFDBJHRNQC+EI3DTGX5sxO3KPy/hTjB8 QxiQtL7Q5lhrbGfCafcS15ZPiXmTDA+c2GDao1N0EWO4yE2wjnu6UO+ntnWbZVrg/8r51s Lt8F+GEoqjQ7SEs3wItTm/OiB/mm2jrVHvilpl7YFWS/HQ/KMdx4LcMVoxk3fTvpXAcHlq W6k31PNv3ZHMpz1lpTT46wZtaRGMGs3ownF/qBp+djQ6P+sijcwIh2qws/RMxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697459424; a=rsa-sha256; cv=none; b=h5ckszYNZulI1wbgZDgcNnfSSsBmZqT5gw+ChONtGpoyR2cRQ3GzGCGl9UpBiBGQm9J2nR vFP3EM9MIXaM/agKjLxPRUL81Q89TqKFtHtdFTbe1bjvqzviwbELs+8IaK1VeD7qHzueKr dy+GqFNrxQaquYD8x+jNnNmTGp+6LG3442Mxov6w9cUUXJXetcx0opAb+IdwS3WDNsypek CavP9FZhV+l9b8qxR+5pAltQgyTUsStdDcK7fbaIqxpj6etRTYjFjwy6vnVeJfapNplGw8 Ok2YnQWD64hpLViDVgZd0GNux5xbKqmjzLk/ZpG7U/zy8ghTaYIlb3AG089z2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wTjkyqevDmpoGtd6kTZMHAmTWvvVyjKGnLF9r7SJh40=; b=E7xbjbRErB2m64gkaCQwfL1VC65VgFaFgKsDI/Gtesa2PhQSNQBuPL0suLCL96wW5uBMIe 4iIJyPgeZzDZYyLwvld81Q8Md2hbh34nWkofgcvHCw1VLaiu0Xt81xRLsUZN5WiqnCN7b7 b0Wpi0klX+wzzR6g/BsDN4sYuU0oMRwy1oHzkbiXEokJ0TWbzLvrxfHZa2SfINYplMLuy5 rTSnLVeRk21F0cHUTQKDUzT6GJAX6uSy0HBSTyJ2M5aYY9b/qfLznrF+r0QcKXz/SfatHc duUgfMGptU20C31DetsfFF9b9mmx8IBYAUrX4al9jnIYcBfmg+qKguIafxZa5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8GfS4TmJzgYn; Mon, 16 Oct 2023 12:30: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 39GCUOoj079267; Mon, 16 Oct 2023 12:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GCUOFJ079264; Mon, 16 Oct 2023 12:30:24 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:30:24 GMT Message-Id: <202310161230.39GCUOFJ079264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: af632cc56bc3 - stable/14 - setusercontext(): Fix gap when setting a realtime-class priority List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af632cc56bc3781ef4409dffe9296d5a69bb281a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=af632cc56bc3781ef4409dffe9296d5a69bb281a commit af632cc56bc3781ef4409dffe9296d5a69bb281a Author: Olivier Certner AuthorDate: 2023-05-25 07:10:27 +0000 Commit: Ed Maste CommitDate: 2023-10-16 12:29:46 +0000 setusercontext(): Fix gap when setting a realtime-class priority The login.conf's "priority" capability allows to set priorities in the idle or realtime classes in addition to the classical nice values (-20 to 20), through a natural extension where values greater than 20 put the processes in the idle class (with priority adjusted within RTP_PRIO_MIN and RTP_PRIO_MAX, 21 being converted to 0, 22 to 1, etc.) and values lower than -20 put the process in the realtime class (with priority adjusted within RTP_PRIO_MIN and RTP_PRIO_MAX, -21 being converted to RTP_PRIO_MAX (31), -22 to 30, etc.). Before this fix, in the latter case (realtime class), -21 was converted to 30, and RTP_PRIO_MAX (31) could never be specified. While here, change the priority computation for the idle-class case to be symmetrical and use RTP_PRIO_MIN (in practice, this changes nothing at all, since RTP_PRIO_MIN is 0; but this is the correct theoretical formula, which would work as well with other values of RTP_PRIO_MIN). PR: 271727 Reviewed by: imp, kib MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40339 (cherry picked from commit bd572be78436473a2ad4c1b78728b739c74ef238) --- lib/libutil/login_class.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c index f561479690c1..90a3ec5d106a 100644 --- a/lib/libutil/login_class.c +++ b/lib/libutil/login_class.c @@ -452,7 +452,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in if (p > PRIO_MAX) { rtp.type = RTP_PRIO_IDLE; - p -= PRIO_MAX + 1; + 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", @@ -460,7 +460,7 @@ setusercontext(login_cap_t *lc, const struct passwd *pwd, uid_t uid, unsigned in lc ? lc->lc_class : LOGIN_DEFCLASS); } else if (p < PRIO_MIN) { rtp.type = RTP_PRIO_REALTIME; - p -= PRIO_MIN - RTP_PRIO_MAX; + 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", From nobody Mon Oct 16 12:30:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8GfT6tkCz4xK4d; Mon, 16 Oct 2023 12:30: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 4S8GfT6Pzrz3cBR; Mon, 16 Oct 2023 12:30:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iw500wBvszzUBAPbV1T+/6pAk1v3vH1CEvVFs8ze22Y=; b=gv4G1TPwWK6h3SrhnYbRPZOzNva+RJi8qIi1ux3np1Nty1IN3mIr+a2XkvmlPWdedGCg06 +ri0Db5kN/vr44gX9bJFY5w36xsTQQ08wi6CBDm49Iu8FIPoQtS96oZWsrZyHOnqg/mMbb TNoBTpZuRU/3Zbw1n0bKinqSJpnfrhBq6FiaGPpF2NksGrGzIqgc7lX+KNpLqEP7/chBKA EsPmmDA3PzSiyndMOSOGr+/HahPKjoJIS2Rhw0N1c2NSHunfWaqLGcR4cBZOsCGdGG31P0 6Xp/jYa45MfzRS6I1CQSPneSD46/ANKpVUjy5Y/gGi1qg/9jvqU1Kkfnfz+3iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697459425; a=rsa-sha256; cv=none; b=IXfEc4lUWTefHQYKcgOOs5tEE0PcJ2yYBcp6VZwQG7Vno+3wr6CjLEr8wKFfn1o35kJU9V 3Ap+S8X2UgUaLqkXa2COScM2aOJhRTlQZkKy7LoYVcjquD7zqVjmhzh/bFsDFvyD70tr1F /1zHNRMlLMUqBQBue3637oAXVcxWP/janRsZX83RT9x7XhRyWa0nB+5/+1wXw78Aprma8k 2tZW6t2m9XpJdaen6+3wVj2l/G8e3UV/UEFr6gDLMWQlylrDJXjQb7NuBODtgOEiozuzBC ulOIv4mX4VJY15nM1Il5+cqSeaaB/MZjSxVfJJJULdHmwUEYfbYOeGOrEAgixg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697459425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iw500wBvszzUBAPbV1T+/6pAk1v3vH1CEvVFs8ze22Y=; b=gBi/Z4w/lV3IQSGREU2gLWUiVPNO224urP+y4SJztGQEMrKzieOo+uKCbkBWcdsdcqh2K1 RyaMBfbzPH9olSJ1CQkL5nvq+eI9vhxaXtjht9THMooPkBeBpD5wLzfzvgVh3/ICpGmqOm IHyBqBc0pWTvClH8fTub7QmRHG0M2WmOK4QATd3pIXj3YTdhz2w+czYRXH5e+HKIqgpzu5 S0b+2x+GzAZxxSRjEcb6coJ6K13GyZ1HAGeobdVnWM5Ak7Vx4jpOd8aCK60qaikwLoWUFL C7evC+iWg1sSFDalNvAkz3IcqXZDQpk0HJWPDky8L+MLWYc5lC/MEjNohZnP6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8GfT5WSJzgWV; Mon, 16 Oct 2023 12:30: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 39GCUP9d079318; Mon, 16 Oct 2023 12:30:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GCUPtT079315; Mon, 16 Oct 2023 12:30:25 GMT (envelope-from git) Date: Mon, 16 Oct 2023 12:30:25 GMT Message-Id: <202310161230.39GCUPtT079315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 9ef162b2392f - stable/14 - tzsetup: add support for countries in two continents List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ef162b2392f34a88fb40b560ef700d0aacadfe1 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef162b2392f34a88fb40b560ef700d0aacadfe1 commit 9ef162b2392f34a88fb40b560ef700d0aacadfe1 Author: Pierre Pronchery AuthorDate: 2023-07-27 16:07:22 +0000 Commit: Ed Maste CommitDate: 2023-10-16 12:29:46 +0000 tzsetup: add support for countries in two continents This supports countries located across multiple continents, as per the zone1970.tab file. This only affects Cyprus and Türkiye at the moment. PR: 236874 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41306 (cherry picked from commit 914ab28c598c108bcfa5c040cc3056a8e6fc3811) --- usr.sbin/tzsetup/tzsetup.c | 67 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 5dfe840528b5..4279f888a33f 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -276,6 +276,7 @@ struct country { char *tlc; int nzones; struct continent *override; /* continent override */ + struct continent *alternate; /* extra continent */ TAILQ_HEAD(, zone) zones; dialogMenuItem *submenu; }; @@ -374,6 +375,18 @@ find_country(int lineno, const char *tlc) return (cp); } +static void +add_cont_to_country(struct country *cp, struct continent *cont) +{ + struct zone *zp; + + TAILQ_FOREACH(zp, &cp->zones, link) { + if (zp->continent == cont) + return; + } + cp->alternate = cont; +} + static void add_zone_to_country(int lineno, struct country *cp, const char *descr, const char *file, struct continent *cont) @@ -441,13 +454,13 @@ read_zones(void) struct country *cp; size_t len; char *line, *country_list, *tlc, *file, *descr; + char *p, *q; int lineno; - bool pass1; + int pass = 1; fp = fopen(path_zonetab, "r"); if (!fp) err(1, "%s", path_zonetab); - pass1 = true; again: lineno = 0; @@ -457,7 +470,9 @@ again: errx(1, "%s:%d: invalid format", path_zonetab, lineno); line[len - 1] = '\0'; - if (pass1) { + switch (pass) + { + case 1: /* * First pass: collect overrides, only looking for * single continent ones for the moment. @@ -481,7 +496,8 @@ again: cp = find_country(lineno, tlc); cp->override = cont; } - } else { + break; + case 2: /* Second pass: parse actual data */ if (line[0] == '#') continue; @@ -498,11 +514,34 @@ again: add_zone_to_country(lineno, cp, descr, file, cont); } + break; + case 3: + /* Third pass: collect multi-continent overrides */ + if (strncmp(line, "#@", strlen("#@")) != 0) + continue; + line += 2; + country_list = strsep(&line, "\t"); + /* Skip single-continent overrides */ + if (strchr(line, ',') == NULL) + continue; + while (line != NULL) { + cont = find_continent(lineno, line); + p = q = strdup(country_list); + if (p == NULL) + errx(1, "malloc failed"); + while (q != NULL) { + tlc = strsep(&q, ","); + cp = find_country(lineno, tlc); + add_cont_to_country(cp, cont); + } + free(p); + strsep(&line, ","); + } + break; } } - if (pass1) { - pass1 = false; + if (pass++ < 3) { errno = 0; rewind(fp); if (errno != 0) @@ -555,6 +594,12 @@ make_menus(void) if (zp2 == zp) zp->continent->nitems++; } + + for (i = 0; i < NCONTINENTS; i++) { + if (cp->alternate == continent_names[i].continent) { + continent_names[i].continent->nitems++; + } + } } /* @@ -611,6 +656,16 @@ make_menus(void) dmi->fire = set_zone_menu; dmi->data = cp; } + + if (cp->alternate != NULL) { + cont = cp->alternate; + dmi = &cont->menu[cont->nitems]; + memset(dmi, 0, sizeof(*dmi)); + asprintf(&dmi->prompt, "%d", ++cont->nitems); + dmi->title = cp->name; + dmi->fire = set_zone_menu; + dmi->data = cp; + } } } From nobody Mon Oct 16 13:12:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8HZz6cfSz4xLsJ; Mon, 16 Oct 2023 13: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 4S8HZz67djz4Fhq; Mon, 16 Oct 2023 13: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=1697461947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywSDb+P1nryLc5v2UGXDIthmG9cJKONuW7ppuviY2/s=; b=xxFEZEND/4kZeiCrNBqeB6Ez0P3LuFZ4kQXM90X8iuFYOLNOw5UF2Tm2/aC8mLWvnjMlhL LKIaJwrmiwaay+1LXFdFKu9SVGPu1W0Ma5L2qIk2m+sNhtWXFfrGmYpyH/92Oe28ThOX1x bAMfWd3edrOfSho3O9TteP7u2PouQfFwIS6d/wbzHf7Mxp2zoCW2p3rEqzemJ2Tfj/SGL4 R7LN77TK4wZvIAOec4xHfmKYMhGsMcHsxJRUcIBV3hSy4qDzdZ8T6IsDUe+172VGsvtq/u FM2COUOyV9XY/uCzX5LEoWGCxmVwFR4mL1zM+AO+0KOCfy3kh0gVsSMv5Ln6AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697461947; a=rsa-sha256; cv=none; b=NUNf0HGD+eWJUt4xz4xfCo8WIN+YZkScqircSkOZA90OxqRA+oaNEjktvJM04/hZz+XjWH hIxOnqYQGb9YTEyqXOMKxCzH2TVuIoFwDAih7S9Hp1iSVkNTroNMOjJEv/v4hrzuzjAfmL yq6QosmRQeg3FuwjeGzZf8O6/u7pJ6XgUforDP9jury3oVstTVHtvm9P+7KP8groAv9j9i RkOQU7Poi6yZAhRJ64KGgFnjksHUCng1kkQxrX/wO1ddomwf+RrGHEODm9Q3PF8i/tSeiK ngnHXNztG6yHP54JkRwKpaymc44MGQ90q+25RL8SdMWoaWzqd/4y86Qp2Fgg4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697461947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ywSDb+P1nryLc5v2UGXDIthmG9cJKONuW7ppuviY2/s=; b=uyylfTP0tJK+2Ga2qVyNba5KgKnen2zJL0qVrR6EMqIToEchR7aN7v5Rlg/NHvQ1a/3MDD +wuXJsxIZx70l8sHxKRazunFJ083Ts+guHMIY3aHaW+ZddlrnCmmJu/dfr/C60y4bpIf2e 8ZXFcRvSQv+yiLWV/Qkpa8ThixcxbPdAO6m8pSHDpe8+7B/YzazsOg3LosbN4WCR5omxLT jHjltJxLGgCw7TrmYbjwpY550ZVVL0ay7YYzBTJgkWFe24ZfbWLTT+MmvrI5ArcvR/bxru M+r0l/JSQZ8RQcXNbkqkNFV5nCUsRb1CoA+wBK/L+L/zrfEcAZJi76ukO3xuBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8HZz5BCQzhkB; Mon, 16 Oct 2023 13: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 39GDCRPx052630; Mon, 16 Oct 2023 13: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 39GDCRna052628; Mon, 16 Oct 2023 13:12:27 GMT (envelope-from git) Date: Mon, 16 Oct 2023 13:12:27 GMT Message-Id: <202310161312.39GDCRna052628@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: d556719e15d6 - main - syslogd: Keep console and tty descriptors open List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d556719e15d643ba9619bbbeab550eed87614525 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d556719e15d643ba9619bbbeab550eed87614525 commit d556719e15d643ba9619bbbeab550eed87614525 Author: Jake Freeland AuthorDate: 2023-10-15 20:34:06 +0000 Commit: Mark Johnston CommitDate: 2023-10-16 13:11:58 +0000 syslogd: Keep console and tty descriptors open Console and tty descriptors are initially opened in parse_action() to determine whether they are valid using isatty(). That descriptor is then closed because it is never accessed by syslogd again; ttymsg() will reopen the tty/console under a new descriptor when needed. If the user attempts to log to a tty that is inactive outside of syslogd, then syslogd must keep that descriptor open so the tty remains accessible. For example, logging to `/dev/ttyvb` requires the initial `/dev/ttyvb` descriptor to stay open so the user can view its buffer at any time via CTRL+ALT+F12. As a result, console and tty descriptors must remain open until a potential configuration reload or a system shutdown. The given descriptor will be closed in close_filed() in such circumstances. PR: 274454 Fixes: c3175a6e1c5a ("syslogd: Do not open console descriptor") Reported by: Trond Endrestøl Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D42215 --- usr.sbin/syslogd/syslogd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 7db5bab11008..11d1033651a8 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -3053,9 +3053,6 @@ parse_action(const char *p, struct filed *f) f->f_type = F_TTY; (void)strlcpy(f->fu_fname, p + sizeof(_PATH_DEV) - 1, sizeof(f->fu_fname)); - /* This will be reopened by ttymsg(). */ - close(f->f_file); - f->f_file = -1; } else { (void)strlcpy(f->fu_fname, p, sizeof(f->fu_fname)); f->f_type = F_FILE; From nobody Mon Oct 16 15:03:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8L2d0lNWz4xSwK; Mon, 16 Oct 2023 15: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 4S8L2c6vSSz4W32; Mon, 16 Oct 2023 15: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=1697468585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmOL/n9yL2SqsT3UoYhPSeEL5QOpx+PBTgizZy38KyI=; b=ol0YxTUMCh5FYzFU5w7LcWU3twswFLXtM/BJhqdx1BU6GE4enu3ztM4KElz7SyOi6yVX4O jC9Xx1sEZDVP2kESTlCHLHjbGXC4OdO2wkJ82jbERglVSzzCyiPawYrLywQdJy0z9hRmMP TXQlh/P2St70s8BajfwBHVQZzzyzl3A6gIvvYptGmkONICnMERVg8JXujrYIuJtE9jqeej LwwrtZvlcwy/ayDfLXbnHo9etlJCxAGabQpSUfEBIPx6fUW+zRDYjvbjjcLizONo2OFikn uYGUvc/0BTFV5SFdXuOW47IXtZyxoTHTDzQVdP9mapqKXCAKZ381nxejT5ichw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697468585; a=rsa-sha256; cv=none; b=JRRgI1bchO9Pw98HH9+f3ZrEWiCyQI65ZidfUANNOPSpz8FeYBRkA/qDPVP+EICFwI7bGx iTn3EzOkHLQpwNvvhRpGZn4B96Z+ipt9/EE9/XKvSnJK324D69yUWyEc8ByZFhiFxw4oWH CxjTiYYkcs+e1gMjR0A3ERehqcYZpAKTKdLilvWhmZxozeQzq9RY3sKi7Y6XEsBe+7GVft HH+90x6JrG4PZ8ui6Etu5WWGkFRLh3SJFR0p56d3IM8CYhHkeJeGSnyIQJMLGURB/pSkXh A/h8kdzN9yoT8QL0MpFHlni74zaPDFnpM6dxVKGg+V46PTeoYxZNFNUetsANzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697468585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GmOL/n9yL2SqsT3UoYhPSeEL5QOpx+PBTgizZy38KyI=; b=B/Lnzdz/Ih7TChZYQpBGiKepJzq6sgr4MYUUFYPLH0DUbPSshKIaoO7JXk7ncKnuIaH5U3 63ExMCH75lyMsrhRfowrKK7PvjoMaCG7vlHYRQislN12gJU2N7RB5x8rtYkkndLGJqsJ6d EvPVopy56bktuPuevGM8sb9HTBVeZmer/qyKokLasTg7YlBJJpmwRroMqiB/cxwqYF5Xa3 A9hw6BvOnCAbVcNxyzruKLZl8BMpaV1nA7FdxT6SppGoTJtnqlVHFhqXqrkhybFHkTXn15 vvetCjhVWOTaoutS1Hu+MIqZjwAhtOPrJGLxfC74AAAcVGg6vwklDcfuwM03/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 4S8L2c5yy5zlHy; Mon, 16 Oct 2023 15: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 39GF34Vl036714; Mon, 16 Oct 2023 15: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 39GF34QM036711; Mon, 16 Oct 2023 15:03:04 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:03:04 GMT Message-Id: <202310161503.39GF34QM036711@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: d62e01996e7c - main - pmap_kextract(9): tweaks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d62e01996e7cb54f16272219e6ccd334b4822126 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d62e01996e7cb54f16272219e6ccd334b4822126 commit d62e01996e7cb54f16272219e6ccd334b4822126 Author: Mitchell Horne AuthorDate: 2023-10-16 14:59:04 +0000 Commit: Mitchell Horne CommitDate: 2023-10-16 15:02:18 +0000 pmap_kextract(9): tweaks Improve the clarity of some descriptions. Fix a long line. Suggested by: kib Fixes: 74e4a8d208f0 ("pmap: add pmap_kextract(9) man page") --- share/man/man9/pmap_kextract.9 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/man/man9/pmap_kextract.9 b/share/man/man9/pmap_kextract.9 index dd73446648f2..40008a1bc96c 100644 --- a/share/man/man9/pmap_kextract.9 +++ b/share/man/man9/pmap_kextract.9 @@ -6,7 +6,7 @@ .\" This manual page was written by Mina Galić under .\" sponsorship from the FreeBSD Foundation. .\" -.Dd August 24, 2023 +.Dd October 16, 2023 .Dt PMAP_KEXTRACT 9 .Os .Sh NAME @@ -28,11 +28,12 @@ .Sh DESCRIPTION The .Fn pmap_kextract -function retrieves the underlying physical memory address corresponding to the given kernel virtual address +function retrieves the underlying physical memory address corresponding to the +given kernel virtual address .Fa va . The value of .Fa va -must correlate to an active mapping in the kernel address space. +must belong to a valid mapping in the kernel address space. .Pp .Fn vtophys is an alias for @@ -41,9 +42,8 @@ and behaves identically. .Sh RETURN VALUES The .Fn pmap_kextract -function will return the physical address -.Pq Vt vm_paddr_t -associated with the kernel virtual address +function returns the address of physical memory mapped at the kernel +virtual address .Fa va . .Pp .Fn pmap_kextract From nobody Mon Oct 16 15:18:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8LN54H8Qz4xTsK; Mon, 16 Oct 2023 15:18: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 4S8LN53mWMz4X8f; Mon, 16 Oct 2023 15:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697469493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hESP2ZB7X30lacCeVxORB9HufXLVtLwNxeoT5ZR0a0U=; b=IeiEqmkyK5V8kn58nk9JANzX8u0TmGeR2OqLJVSwB1N5dICMx+/lnZFozmLK4XP3B3ZLOb Xxob/LWhHt3AON8dUo9K/tIAy3PQacTHc9EDDJyQvvIskJxjh4Z61V5us/WhetztFGS0vw Eeop0vsl7ABZlliQILXXSnPjtafyUMbSzi/KcofeZWrQKA88PwMg+mXekK7anXk4xfPxjP N5yCwnpn8HRRHHxbjn337tHn8sxxvZi5UTMPoBweeoh60TgtQosswVFAAxYmHv0cACg22A JhGlk2cMGW/xuL/kG3mU0Q3OqfgyO5D1qFWePy4nRtl9gNsVJNAz7p1LNF6tUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697469493; a=rsa-sha256; cv=none; b=PlQnyMspeP8yPQB8YawT74DvuUglCXK+NDBMrPdJVpoMkkVIFuP/K71sXwbX56n8X7KHid 88eAk4A8fObi5ni301w2JDqleMGJt7S9nC1EjOCxz6vMDdio1BLig+a9fnanZzcirQ7WSt Verg34N8ywASWSBo8LMI0LYClLTvxOr2xPq3xiCwpTKXR0jPpWKEl6RK2rAYhiiifKqDZt t0Nbi/mYaa3T3jHOVP8RbIJTYkcF3FllRGh280mcA4AgWMB1zVRa2DWqzUW9eYcID7qRb1 0h8ONKDKgULjwXXhlR6dPvshdr/f4+2LfZntocrBZ+kLNN+Qp4g0SYbtYis9vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697469493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hESP2ZB7X30lacCeVxORB9HufXLVtLwNxeoT5ZR0a0U=; b=QhyQEpzsaQpjcNv23tkvZ5Lpu/K4KHKLJwkxy0wlFszRPpj7PEOKEz/1Nu/doX6EcDT83o apzlFc0zDkBK9B23jQRv3D4zpwXR5Iw+cg6AEVrIuWQ0ab5coMQSlqN5cjMIWJ9Ma/vfKV anbD/0+hvb2lFDQX0LnfVQqDVaM4TdTFWklhlk/ygy2jC2G07yxAeeDxyZF1vBDMLRKIFr Z3Nsp6/mTp03rDGqsHVRRR3yrKDBet4RQ32QCn6rwk1CDC8cEI10G1mbTiyLuIRHb5/ixq DWSQKw8wj7mwQnvKSKmPM3b/WQlzq2WFiU0O4eyVVAAqAW200v15IgK8ba3cyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8LN52Ywszlfn; Mon, 16 Oct 2023 15:18: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 39GFIDlE054289; Mon, 16 Oct 2023 15:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFIDL7054286; Mon, 16 Oct 2023 15:18:13 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:18:13 GMT Message-Id: <202310161518.39GFIDL7054286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3a97686fc11a - stable/14 - tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a97686fc11ae51ceb4004c07702a8a20f71410d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3a97686fc11ae51ceb4004c07702a8a20f71410d commit 3a97686fc11ae51ceb4004c07702a8a20f71410d Author: Zhenlei Huang AuthorDate: 2023-10-08 10:03:59 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:15:37 +0000 tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' No functional change intended. Reviewed by: cc, rscheff, #transport MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41998 (cherry picked from commit 38ecc80b2a4e5e11ece83ca4df63632f0b6fa394) --- sys/netinet/tcp_subr.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 696bd40f7ada..27b0eae83837 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -305,8 +305,17 @@ static int tcp_log_debug = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW, &tcp_log_debug, 0, "Log errors caused by incoming TCP segments"); -static int tcp_tcbhashsize; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, +/* + * Target size of TCP PCB hash tables. Must be a power of two. + * + * Note that this can be overridden by the kernel environment + * variable net.inet.tcp.tcbhashsize + */ +#ifndef TCBHASHSIZE +#define TCBHASHSIZE 0 +#endif +static int tcp_tcbhashsize = TCBHASHSIZE; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN, &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable"); static int do_tcpdrain = 1; @@ -1152,16 +1161,6 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) return; } -/* - * Target size of TCP PCB hash tables. Must be a power of two. - * - * Note that this can be overridden by the kernel environment - * variable net.inet.tcp.tcbhashsize - */ -#ifndef TCBHASHSIZE -#define TCBHASHSIZE 0 -#endif - MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers"); MALLOC_DEFINE(M_TCPFUNCTIONS, "tcpfunc", "TCP function set memory"); @@ -1508,7 +1507,6 @@ VNET_SYSINIT(tcp_vnet_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, static void tcp_init(void *arg __unused) { - const char *tcbhash_tuneable; int hashsize; tcp_reass_global_init(); @@ -1576,9 +1574,7 @@ tcp_init(void *arg __unused) tcp_pcap_init(); #endif - hashsize = TCBHASHSIZE; - tcbhash_tuneable = "net.inet.tcp.tcbhashsize"; - TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize); + hashsize = tcp_tcbhashsize; if (hashsize == 0) { /* * Auto tune the hash size based on maxsockets. @@ -1595,7 +1591,7 @@ tcp_init(void *arg __unused) hashsize = 512; if (bootverbose) printf("%s: %s auto tuned to %d\n", __func__, - tcbhash_tuneable, hashsize); + "net.inet.tcp.tcbhashsize", hashsize); } /* * We require a hashsize to be a power of two. From nobody Mon Oct 16 15:18:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8LN64Nbxz4xTdp; Mon, 16 Oct 2023 15:18: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 4S8LN63TRhz4X8r; Mon, 16 Oct 2023 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697469494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Vzm8AcJ4zTo17IpsIuMYcrd0PSQy5d2wFyD0q8wVoQ=; b=iMcShzEYg0ka3Ad8D6PVMota8gwpZA6bAgpbQJkM4J9EDHUMUehOqiupvHXdoJGSwUyCu1 v82zdgRaBtjJQKzDTcInwqMW468XqVH6J6c7rJkeW2y7fedvdMvcKSZT6xCrI9GOLKspuv +O/34mPABbnACVzUPjywqbuodPcbHJJnN6l6jvvM93iQuWQF/AzWJ/j5SIQNBeyNJ1JGXF g36jpLk/tkbPPwLM9OP7yXKm2ta+dM7Aks6df0WNGN0ifMVqflFUHp1jFU08T9yxJQCICl cAdSPaGEu+ufKDAMshncoTG2OEgDiVfVJzdYmf1+30tZVZfGTHCGXwRrIxVFEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697469494; a=rsa-sha256; cv=none; b=raeUtvadawTvbzOv8BIpcgly246yIJ78MFBEXC4I/6Aj2EUXhO1O0VwJkF0EAUr6dk/u4Y kHkIgowOQpLnEiZMur56mLoTB+WjfOqkFLDS8ks9QeI3HoCgmLm9eYuvaHcJu2dko9e2oI FLVutBe6CqcfGYw0uPhE2glMsmUWZs3rzFUnlVD6hjYrauvOzdpdTG4hSwQ/drF2hnCkrH HA8+yqGSSqDLlG2GiinGmw8TeuEgHyiBQLYggXy5RI12V/2vJ6UwmV7tdeScMdOSwAnqrp Fkad2WWBvNH5EtqRsm2ehlbVghCFmwRjyWExaW51LNf3tbYiAPFlavglrOobGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697469494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Vzm8AcJ4zTo17IpsIuMYcrd0PSQy5d2wFyD0q8wVoQ=; b=kWJMaMqH2TuwNuonsNAYLjM5VRO9ALVCFpyrVQFH1W0PKEQDerrVyYRZEoCYGp2G20PA3L sUWJvEDATYNnpyOYOWuParEFKEJ5nIiNUnItEVr4KtDt6eOY4LNyEZ6eHkRyW44VG8gs5u q4FS99CFME5XdVZ/BHGDsW1q8QlcAMt995KQHfCqJrcwzXw81q/j55FmkGlPSa30fLdx/I qpbmQO5aFHMhyySyNRgaYynlWia1SsnyaCyD/l868ystv5FJs5NVBJRrbP0YhfBWHWdKJi UncSGVCV5uIGVTh/8itXt2ONC7WZbDuvFl4ObZDtHq7q26QkVGH9Is9XMgunzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8LN62T2Kzlfp; Mon, 16 Oct 2023 15:18: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 39GFIEvX054341; Mon, 16 Oct 2023 15:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFIEBg054337; Mon, 16 Oct 2023 15:18:14 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:18:14 GMT Message-Id: <202310161518.39GFIEBg054337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: fd9de12a7110 - stable/14 - sctp: Various fixes for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2 commit fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2 Author: Zhenlei Huang AuthorDate: 2023-10-09 04:36:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:15:37 +0000 sctp: Various fixes for loader tunables The following sysctl variables are actually loader tunables. Add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. 1. net.inet.sctp.tcbhashsize 2. net.inet.sctp.pcbhashsize 3. net.inet.sctp.chunkscale The loader tunable 'net.inet.sctp.tcbhashsize' and 'net.inet.sctp.chunkscale' are only used during vnet initializing, thus it make no senses to make them writable tunable. Validate the values of loader tunables on vnet initialize, reset them to theirs defaults if invalid to prevent potential kernel panics. Reviewed by: tuexen, #transport, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42007 (cherry picked from commit dac91eb7660324677d8a2f71bd6f192422355ba1) --- sys/netinet/sctp_pcb.c | 8 ++++++++ sys/netinet/sctp_sysctl.c | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 16cde18c4c1d..a1742b2fffca 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -5676,6 +5676,11 @@ sctp_startup_mcore_threads(void) } #endif +#define VALIDATE_LOADER_TUNABLE(var_name, prefix) \ + if (SCTP_BASE_SYSCTL(var_name) < prefix##_MIN || \ + SCTP_BASE_SYSCTL(var_name) > prefix##_MAX) \ + SCTP_BASE_SYSCTL(var_name) = prefix##_DEFAULT + void sctp_pcb_init(void) { @@ -5717,6 +5722,9 @@ sctp_pcb_init(void) TUNABLE_INT_FETCH("net.inet.sctp.tcbhashsize", &SCTP_BASE_SYSCTL(sctp_hashtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.pcbhashsize", &SCTP_BASE_SYSCTL(sctp_pcbtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.chunkscale", &SCTP_BASE_SYSCTL(sctp_chunkscale)); + VALIDATE_LOADER_TUNABLE(sctp_hashtblsize, SCTPCTL_TCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_chunkscale, SCTPCTL_CHUNKSCALE); SCTP_BASE_INFO(sctp_asochash) = SCTP_HASH_INIT((SCTP_BASE_SYSCTL(sctp_hashtblsize) * 31), &SCTP_BASE_INFO(hashasocmark)); SCTP_BASE_INFO(sctp_ephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize), diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 851ed408092b..2c2cc58ee086 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -867,6 +867,14 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) #endif #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW); + +#define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH); + +#define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags) \ static int \ sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS) \ { \ @@ -885,9 +893,13 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) } \ return (error); \ } \ - SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0, \ - sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC); + SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, \ + NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) + +#define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix) \ + SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name, \ + CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH, \ + &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC); /* * sysctl definitions @@ -909,10 +921,10 @@ SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH) SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST) SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST) SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS) -SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) -SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) +SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) +SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT) -SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) +SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME) SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ) SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE) From nobody Mon Oct 16 15:44:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8LyY4TvPz4xW3j; Mon, 16 Oct 2023 15:44: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 4S8LyY3wtwz4bcG; Mon, 16 Oct 2023 15:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SZURxd2brG8uf3YvfVsf+PQNfLvLi2tyz+KxArjxCZ8=; b=mBb1uZqh5VNQDSR9+mhII9x7flKCEd+SEqg7hZhEj6kyVHg1nj3ii2k/eXD+DWV0Qxo7gv de+j1tRpFP+nWaUzV0VTJZ6ji8aw6rwVAEG11vPEJdgQAn+TW/yA7BAClYfH/imhE7rZv2 2yWiy51H44bT2S6GSGa6FnOWNuKuA25WNWSZR2/i0zdw0R1f3agyt9LPGrzSJEDsgfgcE9 2CneiB+ezEeS4KwdYc4MeluSCUtGVA0CdcyXSlJj2CDaB8F2b7gcX9PilLqa5fhy1DDvVe Y3NsmXLL4ikLy9IJ9paKYksyq5NdHs5m+G9gVl9ck2HK2nU8vgzCHWqRlp+BIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697471077; a=rsa-sha256; cv=none; b=N6HQ8YWJr0jgZzxZVdKHDxLbf2D4tie7URmiKSRbPM6hY42B0e5U81a9FrtHtRkM9iNEmk Ui85r/w3NPcZWwVG4/PPjkSQcmVgx4dlSu5j45gAJp0+VMdhJtOBsgQPOd7iRbL/nQmjVT sfCfBnJdY6ZjSV1it6K+/GEKp1jIA+cMqcSKduAF2GSgg/w4cVZM+VTBAqvXOuCaptwmS/ zYq7kSINjMKzx2Ibjfcxz7C4jCw3SG2RoTEFSjXdMgi2CxnmxJqTOnnXtUF64F9VsQ0Qr6 m6wpxCKWwDiqxZncunFQ8Ju/EExMebCoWYxhUWykJ+TbZ5u/+g4q+H46pU7nRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SZURxd2brG8uf3YvfVsf+PQNfLvLi2tyz+KxArjxCZ8=; b=mNPvXxXwComuJ3ncvi3BZ70Vv32cwolu8MPI94YqXKB/V3DxrMAzxNBOMItKyVu8jyMPe8 ZTbNPXKEQvRXEwKOrICR9bOUK7wrRpHmPJlm3gDgJxhYcMiRqq556UeA4qSOkr18W0K9wJ CVgsVQ2JeNnv+Cx+qzWW/rAp1Y8HCcqk/IeY/W7eabO2QMQf/x487+8qL4GtAi2X9ynB0V Asj5OZU68H5W2L3lXeNZOQviE9BsSVfXPhtM4qlCwckfNdKd4+E9mh+Zg60A+t02PHG3OI dXIBSqyyZgdnK6ktVU6qZ2tzYqJJ5c567Ycg+Mo2WbfGnV63f3uH4GW9f3R3nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8LyY2gDfzmXV; Mon, 16 Oct 2023 15:44: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 39GFib0g003922; Mon, 16 Oct 2023 15:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFibEn003919; Mon, 16 Oct 2023 15:44:37 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:44:37 GMT Message-Id: <202310161544.39GFibEn003919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 379f41a117eb - stable/13 - tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 379f41a117eb8aaf1dd43414658606d2ef0534a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=379f41a117eb8aaf1dd43414658606d2ef0534a7 commit 379f41a117eb8aaf1dd43414658606d2ef0534a7 Author: Zhenlei Huang AuthorDate: 2023-10-08 10:03:59 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:38:26 +0000 tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' No functional change intended. Reviewed by: cc, rscheff, #transport MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41998 (cherry picked from commit 38ecc80b2a4e5e11ece83ca4df63632f0b6fa394) (cherry picked from commit 3a97686fc11ae51ceb4004c07702a8a20f71410d) --- sys/netinet/tcp_subr.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 905a72dd1f91..9bf02d21a307 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -299,8 +299,17 @@ static int tcp_log_debug = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW, &tcp_log_debug, 0, "Log errors caused by incoming TCP segments"); -static int tcp_tcbhashsize; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, +/* + * Target size of TCP PCB hash tables. Must be a power of two. + * + * Note that this can be overridden by the kernel environment + * variable net.inet.tcp.tcbhashsize + */ +#ifndef TCBHASHSIZE +#define TCBHASHSIZE 0 +#endif +static int tcp_tcbhashsize = TCBHASHSIZE; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN, &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable"); static int do_tcpdrain = 1; @@ -1052,16 +1061,6 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) return; } -/* - * Target size of TCP PCB hash tables. Must be a power of two. - * - * Note that this can be overridden by the kernel environment - * variable net.inet.tcp.tcbhashsize - */ -#ifndef TCBHASHSIZE -#define TCBHASHSIZE 0 -#endif - /* * XXX * Callouts should be moved into struct tcp directly. They are currently @@ -1374,11 +1373,8 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, void tcp_init(void) { - const char *tcbhash_tuneable; int hashsize; - tcbhash_tuneable = "net.inet.tcp.tcbhashsize"; - #ifdef TCP_HHOOK if (hhook_head_register(HHOOK_TYPE_TCP, HHOOK_TCP_EST_IN, &V_tcp_hhh[HHOOK_TCP_EST_IN], HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0) @@ -1392,8 +1388,7 @@ tcp_init(void) printf("%s: WARNING: unable to initialise TCP stats\n", __func__); #endif - hashsize = TCBHASHSIZE; - TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize); + hashsize = tcp_tcbhashsize; if (hashsize == 0) { /* * Auto tune the hash size based on maxsockets. @@ -1410,7 +1405,7 @@ tcp_init(void) hashsize = 512; if (bootverbose && IS_DEFAULT_VNET(curvnet)) printf("%s: %s auto tuned to %d\n", __func__, - tcbhash_tuneable, hashsize); + "net.inet.tcp.tcbhashsize", hashsize); } /* * We require a hashsize to be a power of two. From nobody Mon Oct 16 15:44:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8LyZ53Jqz4xW3l; Mon, 16 Oct 2023 15:44: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 4S8LyZ4K76z4bZC; Mon, 16 Oct 2023 15:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3lVvYUB8Y+QHWPyjv6vxIhCup0Czv33oKdcE5h64D4=; b=gOvR449B5kBR+Hjaksz69kbJxDjIKnEWGKZbLTuuVEITiIvjgeDx1y8QRZL5yCxg1t63u3 ChHxmKq/TsZMQwVEcAr4iSW2nbqompfQsvdv/t09lj2jgl+yCBvp54J3DJH8Gyf/nBxmei POeh0DLAJJr8HAkOgo9Na9c6vgrb/HzkMo09SHYU4FIR9XFmVHZ183LUliIzA1/YT4/yKO //biN0OIyif7uu0vg1gBoDVpzCh13+Ug9FMkd2Kd6PrdtVQwSBypInxKBP6jF1oWng8yGj 7JF223RUqKsFZ/2KRsVDZKE2mjm+eMqrFtSmMWWLucQ1CUV+q/hlNV/jGas6Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697471078; a=rsa-sha256; cv=none; b=iYwgp8/XOM68D4ABubRsZ6gLWNn/BT2E9HW/VYQM9rq6bA7gBpdUIHCyp5Ar4dcMqNcYbd cUO4eFtfsL4PEHnSpFEPSaU47+E7G+0Dki+NGig4ljml6/X+AtK2hBdCSAd+mFrFYvERTg Eq+j4BgN2cwjqSQvJUb4bAOP+iIFunbNVcqnIwKXrtHYuBt3VAFcbTEWfWw9Tqn+fqf8Ps FdYY5A1kM9fN7buHJ+MVxfNjSlBYLCopSL4AZXOmH+paqR2Sg+iyjf0g0YYgBsPjTgQt8B XyA5VxwB7MT433xSCX0ew8eUn2QhVDBJuF95B4kxWKcC2KVUpVmDccQak6rRPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c3lVvYUB8Y+QHWPyjv6vxIhCup0Czv33oKdcE5h64D4=; b=qkiJxWzvIhuo7RTNH3zW433da2N3V4fLxlL55ALxs+UUCv+vL6Cu4f9E3h0KOyND9UDN+d AvGx6aXMrieyvF9C1uDNtFr2zUJ0AmOCz6YD/xTxz+lk6e+fVg0lVNsRhUfln4qTLxpmjM Yw1a9VvaSf+sPYmVoBO7GtZjFEMAgiWNZaxVEDbNuhyYO6dc6RTzy5b7k1Uxq6dJiYkWY0 Zahmb1CyI60DCRHzbIwOa+Q5JeenKTm/WgwnMnT3953+mlp8CRMjL+BYseogfT6bq05DTX tBZa6DbbDc+rS2HW404IcEezHnjQpbauBX451EIeymmJCWYBr3k8AlTMyEdcHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8LyZ3NnFzmXW; Mon, 16 Oct 2023 15:44: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 39GFicSr003967; Mon, 16 Oct 2023 15:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFicxI003964; Mon, 16 Oct 2023 15:44:38 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:44:38 GMT Message-Id: <202310161544.39GFicxI003964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 69e05e06c60d - stable/13 - sctp: Various fixes for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 69e05e06c60d1f068fafcc4a26ef5efdb8771c71 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=69e05e06c60d1f068fafcc4a26ef5efdb8771c71 commit 69e05e06c60d1f068fafcc4a26ef5efdb8771c71 Author: Zhenlei Huang AuthorDate: 2023-10-09 04:36:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:38:26 +0000 sctp: Various fixes for loader tunables The following sysctl variables are actually loader tunables. Add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. 1. net.inet.sctp.tcbhashsize 2. net.inet.sctp.pcbhashsize 3. net.inet.sctp.chunkscale The loader tunable 'net.inet.sctp.tcbhashsize' and 'net.inet.sctp.chunkscale' are only used during vnet initializing, thus it make no senses to make them writable tunable. Validate the values of loader tunables on vnet initialize, reset them to theirs defaults if invalid to prevent potential kernel panics. Reviewed by: tuexen, #transport, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42007 (cherry picked from commit dac91eb7660324677d8a2f71bd6f192422355ba1) (cherry picked from commit fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2) --- sys/netinet/sctp_pcb.c | 8 ++++++++ sys/netinet/sctp_sysctl.c | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index cecc727ac77f..b5c78bb67745 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -5690,6 +5690,11 @@ sctp_startup_mcore_threads(void) } #endif +#define VALIDATE_LOADER_TUNABLE(var_name, prefix) \ + if (SCTP_BASE_SYSCTL(var_name) < prefix##_MIN || \ + SCTP_BASE_SYSCTL(var_name) > prefix##_MAX) \ + SCTP_BASE_SYSCTL(var_name) = prefix##_DEFAULT + void sctp_pcb_init(void) { @@ -5731,6 +5736,9 @@ sctp_pcb_init(void) TUNABLE_INT_FETCH("net.inet.sctp.tcbhashsize", &SCTP_BASE_SYSCTL(sctp_hashtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.pcbhashsize", &SCTP_BASE_SYSCTL(sctp_pcbtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.chunkscale", &SCTP_BASE_SYSCTL(sctp_chunkscale)); + VALIDATE_LOADER_TUNABLE(sctp_hashtblsize, SCTPCTL_TCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_chunkscale, SCTPCTL_CHUNKSCALE); SCTP_BASE_INFO(sctp_asochash) = SCTP_HASH_INIT((SCTP_BASE_SYSCTL(sctp_hashtblsize) * 31), &SCTP_BASE_INFO(hashasocmark)); SCTP_BASE_INFO(sctp_ephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize), diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index d05274f32bca..88d16f71ef3c 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -864,6 +864,14 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) #endif #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW); + +#define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH); + +#define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags) \ static int \ sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS) \ { \ @@ -882,9 +890,13 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) } \ return (error); \ } \ - SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0, \ - sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC); + SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, \ + NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) + +#define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix) \ + SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name, \ + CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH, \ + &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC); /* * sysctl definitions @@ -906,10 +918,10 @@ SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH) SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST) SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST) SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS) -SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) -SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) +SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) +SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT) -SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) +SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME) SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ) SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE) From nobody Mon Oct 16 15:51:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8M6F24dxz4xW7d; Mon, 16 Oct 2023 15:51: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 4S8M6F19xMz4cH1; Mon, 16 Oct 2023 15:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rD+ALDOLVcEvlgBs1Mx9MFAbnV9vYI42ZlHZ4ogPuIE=; b=mI7fe/nTQ2ZpQBBlC6f/X/SXYLgeJDSbgv0msi/SzdJVfGm9XN4vPY+cl5GyJwmebmXSc2 RaM+EpUY4KIyyIuSYlU/owmXfvClSxv8winKwem6Y+8AL+bUoeYXT23+hJ3ghD6AO8QxvJ NpLLWd/S1Y5zOirYYYfQXiW+Rynm8f1B8zmRdY47ZbXe0OGOprgEu3yUp9r+DJzm6saQK7 6JtZY2vcSLVrMrG8IDTNJMRo2STM8OUH0X9Ar2lZUmnwZyIHdOIYDCNosJa9i3vhC9CGce QOfAXy2RUQVP2v3kTdmV8ihfe5pwFcWTISkmPkZFJIfxPG2ICVj/c5qZ5JzJiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697471477; a=rsa-sha256; cv=none; b=Z3SPhli/GrgVnH/Bg0+ZqLPdd9WyBH796HN9FQSa1lr9S4Xzd3QswILT/qu33jHGvf5pZ0 M7CEubktZyZeNqCqhzheRRYpTgWVoPCjKDIJyj+SeaLsYmcPKTy9tlFaC+56bpXsLbO/iD Gkk1Xomz8qEfLvLS6jbfreDQ625vK+J6sIk/asr653mJIvlVXn6c31iRvInBJh/OIQetsB gVSs8SKr1AWAVo5O1Ns+DtVWsIOZegAfLSmLBP35MDP21uVeiC705+rpHUauL0T2M86bJ2 mzMTL+DQ7A6ETtVuksmfdS0gey3iRG93HYhSqRUSRzlHWDbvA/M1oG8NbtH6IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rD+ALDOLVcEvlgBs1Mx9MFAbnV9vYI42ZlHZ4ogPuIE=; b=THaHTvCI+1hySRfBXfOJBanvTfjp/g98r0jD8KqoU+JTIkRdJAU3SXewykvg4GtvEqz3lu cLsJ7ZiGlk1Z53dO+7JxoaE5vsWc1PnjU5fjTKx8m4KyobrY2xdrrhp2AhTT5GxFuKHKjY 1L21fZcodQKPOMAQjFuBpTlu7+RymeXxnNJhxZt0kJ/TCeEU+FR+i8zeLuBzfC+aokwC5C 1vJ/im97HwcRZuiwfC2OZBhGVeOdjASnN6vXxieFjGyu7+X2gjCZLEZzRWQFBa6zo7F2v5 yTqTRm8Z8Z1qs61ZKklW07Rgc/sTmf+QhKTqsyH1rTBx4lJDN/Rz/uceLgqEiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8M6F0GXszm4N; Mon, 16 Oct 2023 15:51: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 39GFpGBR014476; Mon, 16 Oct 2023 15:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFpG4G014473; Mon, 16 Oct 2023 15:51:16 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:51:16 GMT Message-Id: <202310161551.39GFpG4G014473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0a31dbecd43d - stable/12 - tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0a31dbecd43d3aaa4be053a9d3c21c3c81077604 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0a31dbecd43d3aaa4be053a9d3c21c3c81077604 commit 0a31dbecd43d3aaa4be053a9d3c21c3c81077604 Author: Zhenlei Huang AuthorDate: 2023-10-08 10:03:59 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:49:59 +0000 tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' No functional change intended. Reviewed by: cc, rscheff, #transport MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41998 (cherry picked from commit 38ecc80b2a4e5e11ece83ca4df63632f0b6fa394) (cherry picked from commit 3a97686fc11ae51ceb4004c07702a8a20f71410d) (cherry picked from commit 379f41a117eb8aaf1dd43414658606d2ef0534a7) --- sys/netinet/tcp_subr.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c82a5bf21a15..2a5ab3d402c8 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -216,8 +216,17 @@ static int tcp_log_debug = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW, &tcp_log_debug, 0, "Log errors caused by incoming TCP segments"); -static int tcp_tcbhashsize; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, +/* + * Target size of TCP PCB hash tables. Must be a power of two. + * + * Note that this can be overridden by the kernel environment + * variable net.inet.tcp.tcbhashsize + */ +#ifndef TCBHASHSIZE +#define TCBHASHSIZE 0 +#endif +static int tcp_tcbhashsize = TCBHASHSIZE; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN, &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable"); static int do_tcpdrain = 1; @@ -692,16 +701,6 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) return; } -/* - * Target size of TCP PCB hash tables. Must be a power of two. - * - * Note that this can be overridden by the kernel environment - * variable net.inet.tcp.tcbhashsize - */ -#ifndef TCBHASHSIZE -#define TCBHASHSIZE 0 -#endif - /* * XXX * Callouts should be moved into struct tcp directly. They are currently @@ -1017,11 +1016,8 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, void tcp_init(void) { - const char *tcbhash_tuneable; int hashsize; - tcbhash_tuneable = "net.inet.tcp.tcbhashsize"; - #ifdef TCP_HHOOK if (hhook_head_register(HHOOK_TYPE_TCP, HHOOK_TCP_EST_IN, &V_tcp_hhh[HHOOK_TCP_EST_IN], HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0) @@ -1030,8 +1026,7 @@ tcp_init(void) &V_tcp_hhh[HHOOK_TCP_EST_OUT], HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0) printf("%s: WARNING: unable to register helper hook\n", __func__); #endif - hashsize = TCBHASHSIZE; - TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize); + hashsize = tcp_tcbhashsize; if (hashsize == 0) { /* * Auto tune the hash size based on maxsockets. @@ -1048,7 +1043,7 @@ tcp_init(void) hashsize = 512; if (bootverbose && IS_DEFAULT_VNET(curvnet)) printf("%s: %s auto tuned to %d\n", __func__, - tcbhash_tuneable, hashsize); + "net.inet.tcp.tcbhashsize", hashsize); } /* * We require a hashsize to be a power of two. From nobody Mon Oct 16 15:51:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8M6G4T59z4xWQ4; Mon, 16 Oct 2023 15:51: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 4S8M6G3Dq0z4cBF; Mon, 16 Oct 2023 15:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/CmWjWpi8+X7swOtfXmDrE78zm4zBDzfWuwYEAKUgiI=; b=EQHylpTYzC4EXLNSInsA/+jRyqOAdzAISrjCVEczxjz2W2fXOzMvdE0Nn33P/HT7rgvrpW 8EE00K9IINNby9rCT0clq+z5di5Ee+Kx9uvukur2TQm3KKnP14P8XwgSucUbUf6bf6NL2e mL8pMZXR2Twp3wGrTQUNWuR7Cg9LMvHdogRNIh5UGXOz4tXGcsgUJZbd0+9q/Dh+aZusMC 35bGobM03CjvZC89LokF5SpoZ6YlAsbdgvsP+/wSB/jfUWr4jZT0I+i5UHgroNgsg/hSC9 z2mAiEovHB66ovjdHcbAJ2JWTwFtNG/8KuN15B6oyOYSXrt8C3tFQmtSjV3VLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697471478; a=rsa-sha256; cv=none; b=QUD+VKoqPDCmGxwBkSsByQrRK3OfIKjqV+9eQZo2mllEeEB5b7y+xu6TwQaoYhYxg89ekr /MlmXreY5KdbbIKeU0N7tO9OMugfHvNw1UMvDgsof0xy8y2lLW5vtjBqKHTOXqCs+py0W8 h3cf64IQxXRcDGJy59rreJ46bsWuDYfPbSqDZ6RGVxt/PunhMnTyB6c4Ip1thk84mGPUf/ kwBchuzb0OAw0k4KJsKnb9xw7NBTulc9qs9GvVHHZAUzFARLTnDojuwYbDyMje4w42DszD BXE4imLbwf843gC6hStVxM0xrPkQaTFtJ7vGDpz/al5TvWQn/MhZ/Mn0BhZa3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/CmWjWpi8+X7swOtfXmDrE78zm4zBDzfWuwYEAKUgiI=; b=WT4/dT5FTx2/j+QUSZDQCe9sMTWA3Cr3gN83Y9I23LeFGq8X0dOqGRFpcoeMWoXs4PQBtT GtEazIe1VV9MNtGpx8UGBFHkrlMagmeLuqT3WmzVLBYLdxVkDQTY0hUz54NaUhrHaYXLKI tll/Ftq3ytvKvPRpI+8gHj59Z5MHxKqZTeKL5V3eAL9FgPai0F8X4ORpkqeYI9tNiEa5ZU k6CM2IOE5gSK2jtT91RLVj5nGAKPnm8fLOlWunnktTGcKFh9HruVlFv+7gP/2ELh04Ibpi oMckTF7HnDm/cI0HY/6JrXo7mvQz846E+sxpbnnDdL3C2Hgf1vA25rTaFNeKBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8M6G15FYzm07; Mon, 16 Oct 2023 15:51: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 39GFpIra014524; Mon, 16 Oct 2023 15:51:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFpIVk014521; Mon, 16 Oct 2023 15:51:18 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:51:18 GMT Message-Id: <202310161551.39GFpIVk014521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 53379a40395d - stable/12 - sctp: Various fixes for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 53379a40395dc4e66540c1c539dd1b70d8592852 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=53379a40395dc4e66540c1c539dd1b70d8592852 commit 53379a40395dc4e66540c1c539dd1b70d8592852 Author: Zhenlei Huang AuthorDate: 2023-10-09 04:36:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:49:59 +0000 sctp: Various fixes for loader tunables The following sysctl variables are actually loader tunables. Add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. 1. net.inet.sctp.tcbhashsize 2. net.inet.sctp.pcbhashsize 3. net.inet.sctp.chunkscale The loader tunable 'net.inet.sctp.tcbhashsize' and 'net.inet.sctp.chunkscale' are only used during vnet initializing, thus it make no senses to make them writable tunable. Validate the values of loader tunables on vnet initialize, reset them to theirs defaults if invalid to prevent potential kernel panics. Reviewed by: tuexen, #transport, #network MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42007 (cherry picked from commit dac91eb7660324677d8a2f71bd6f192422355ba1) (cherry picked from commit fd9de12a71109d1e3bb4b20e7d040fc9a1784dc2) (cherry picked from commit 69e05e06c60d1f068fafcc4a26ef5efdb8771c71) --- sys/netinet/sctp_pcb.c | 8 ++++++++ sys/netinet/sctp_sysctl.c | 24 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index a1e6ebb8589b..4761fb69c05f 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -5743,6 +5743,11 @@ sctp_startup_mcore_threads(void) } #endif +#define VALIDATE_LOADER_TUNABLE(var_name, prefix) \ + if (SCTP_BASE_SYSCTL(var_name) < prefix##_MIN || \ + SCTP_BASE_SYSCTL(var_name) > prefix##_MAX) \ + SCTP_BASE_SYSCTL(var_name) = prefix##_DEFAULT + void sctp_pcb_init(void) { @@ -5785,6 +5790,9 @@ sctp_pcb_init(void) TUNABLE_INT_FETCH("net.inet.sctp.tcbhashsize", &SCTP_BASE_SYSCTL(sctp_hashtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.pcbhashsize", &SCTP_BASE_SYSCTL(sctp_pcbtblsize)); TUNABLE_INT_FETCH("net.inet.sctp.chunkscale", &SCTP_BASE_SYSCTL(sctp_chunkscale)); + VALIDATE_LOADER_TUNABLE(sctp_hashtblsize, SCTPCTL_TCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE); + VALIDATE_LOADER_TUNABLE(sctp_chunkscale, SCTPCTL_CHUNKSCALE); SCTP_BASE_INFO(sctp_asochash) = SCTP_HASH_INIT((SCTP_BASE_SYSCTL(sctp_hashtblsize) * 31), &SCTP_BASE_INFO(hashasocmark)); SCTP_BASE_INFO(sctp_ephash) = SCTP_HASH_INIT(SCTP_BASE_SYSCTL(sctp_hashtblsize), diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 6e3b1d4ac3d5..2d5e573c0f8e 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -838,6 +838,14 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) #endif #define SCTP_UINT_SYSCTL(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW); + +#define SCTP_UINT_SYSCTL_TUN(mib_name, var_name, prefix) \ + SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, \ + CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RWTUN|CTLFLAG_NOFETCH); + +#define SCTP_UINT_SYSCTL_FLAG(mib_name, var_name, prefix, flags) \ static int \ sctp_sysctl_handle_##mib_name(SYSCTL_HANDLER_ARGS) \ { \ @@ -856,9 +864,13 @@ sctp_sysctl_handle_trace_log_clear(SYSCTL_HANDLER_ARGS) } \ return (error); \ } \ - SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, \ - CTLFLAG_VNET|CTLTYPE_UINT|CTLFLAG_RW, NULL, 0, \ - sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC); + SYSCTL_PROC(_net_inet_sctp, OID_AUTO, mib_name, flags, \ + NULL, 0, sctp_sysctl_handle_##mib_name, "UI", prefix##_DESC) + +#define SCTP_UINT_SYSCTL_RDTUN(mib_name, var_name, prefix) \ + SYSCTL_UINT(_net_inet_sctp, OID_AUTO, mib_name, \ + CTLFLAG_VNET|CTLFLAG_RDTUN|CTLFLAG_NOFETCH, \ + &VNET_NAME(system_base_info.sctpsysctl.var_name), 0, prefix##_DESC); /* * sysctl definitions @@ -880,10 +892,10 @@ SCTP_UINT_SYSCTL(peer_chkoh, sctp_peer_chunk_oh, SCTPCTL_PEER_CHKOH) SCTP_UINT_SYSCTL(maxburst, sctp_max_burst_default, SCTPCTL_MAXBURST) SCTP_UINT_SYSCTL(fr_maxburst, sctp_fr_max_burst_default, SCTPCTL_FRMAXBURST) SCTP_UINT_SYSCTL(maxchunks, sctp_max_chunks_on_queue, SCTPCTL_MAXCHUNKS) -SCTP_UINT_SYSCTL(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) -SCTP_UINT_SYSCTL(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) +SCTP_UINT_SYSCTL_RDTUN(tcbhashsize, sctp_hashtblsize, SCTPCTL_TCBHASHSIZE) +SCTP_UINT_SYSCTL_TUN(pcbhashsize, sctp_pcbtblsize, SCTPCTL_PCBHASHSIZE) SCTP_UINT_SYSCTL(min_split_point, sctp_min_split_point, SCTPCTL_MIN_SPLIT_POINT) -SCTP_UINT_SYSCTL(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) +SCTP_UINT_SYSCTL_RDTUN(chunkscale, sctp_chunkscale, SCTPCTL_CHUNKSCALE) SCTP_UINT_SYSCTL(delayed_sack_time, sctp_delayed_sack_time_default, SCTPCTL_DELAYED_SACK_TIME) SCTP_UINT_SYSCTL(sack_freq, sctp_sack_freq_default, SCTPCTL_SACK_FREQ) SCTP_UINT_SYSCTL(sys_resource, sctp_system_free_resc_limit, SCTPCTL_SYS_RESOURCE) From nobody Mon Oct 16 16:59:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Nck2Twbz4xZrK; Mon, 16 Oct 2023 16: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 4S8Nck21RQz3Sdc; Mon, 16 Oct 2023 16: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=1697475558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/qiLYrEGZE5FytGjOR1bHIfxr4lA13YTqU6RTQl7mE=; b=y1I4l86Tp5k9th9m/FEtSUletb2aoCVw3d3emZ/syTqmP2d541Sd6QS3XWLpt/cdoXpNJY SU52E4bm4f322AA0x34vpnVzCxelVeq+bd3nZZR4FacthV35ODAeqRxR7MZsURdXG1XVc1 NGUZSDMaM/TrSseFE/URorFOgDVoIVj/JcjCsQtd2gkHyTV9xsOSZgcV9bbgNuRc4lLKXO r3syHL6rUQYWrXHLzXMldBCEbjh7mIIXbgBMr0sD1D/j13AQwdZh0RMXPsxRrgmUQIop2S By3AcH4WPJ4EfOvkArfPjJHshpi3KMZb1dhnRg2GhFL0kDI22KD/3Uy+VGM+tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475558; a=rsa-sha256; cv=none; b=Eqjj8UVsaT9KYPHhGAPFgqJtnag/9E+SMtMYAq1XJL3/emSxJC4TgETdJXzI0H0lRXp1Xr 5psM6IBmQ1ivYPhahLzY5818SJZ06/abjGegKDEl4zZ6l9Eb5KH5WrXDhq+s6D6fcjo9Ml FPCkeiOfVNm8wkaAJ+E4vUWRKlL5EcVZizUPTcg/JFNRxZ/TpCfcZN3ytpPu46nauGA69r rbEqiO+gZN3oI8GRujhu8O2IlrEEL9ST17NigJAmt3beLfaVih+JBtaXCj6WIdvTvbmlCv 66Rz7LXphN2LXpevE2vM10JnkC5+b8lCjFtcNmcvRmce2dQ07/W8CPmJNXCJzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V/qiLYrEGZE5FytGjOR1bHIfxr4lA13YTqU6RTQl7mE=; b=mWydd8nffve1u6y7kfjXBHypOkMX4oUCHIBz18UainFOaG8jjRYMuuVm98D//dfVNs4L1B vK8O3Gm8OyRi9Z6B6JrxqOZip98JNVXu9nlyWOKwA1yebEWMRun0DJXZIIW4HTI/E2wZ4+ bKAiiwjI7gqJj1s5phBiq6Wi3qf5U8ZIDJCaTXct4obkFN5VAOSQM9leHWpVkrJA7ETUI2 AxupJjeRxuFIwrxwsr7Nn+4jwPIiDRbIp41sZga9w4obd6aRo7nAi7qpFkiN0h70HPShnU lJ5cafxHt3upLeV/MhMoxOPLUZvoGvXiVymEcEb2ceQ7kUp+yoWT3NE5d4CDbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Nck16nrznXv; Mon, 16 Oct 2023 16: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 39GGxIvJ028819; Mon, 16 Oct 2023 16:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxIc6028816; Mon, 16 Oct 2023 16:59:18 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:18 GMT Message-Id: <202310161659.39GGxIc6028816@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: 9735cc0e4182 - main - libprocstat: simplify auxv value conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9735cc0e41825bb9e95d16433d381ffe4c190f38 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9735cc0e41825bb9e95d16433d381ffe4c190f38 commit 9735cc0e41825bb9e95d16433d381ffe4c190f38 Author: Brooks Davis AuthorDate: 2023-10-16 16:52:57 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:27 +0000 libprocstat: simplify auxv value conversion Avoid a weird dance through the union and treat all 32-bit values as unsigned integers. This avoids sign extension of flags and userspace pointers. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42198 --- lib/libprocstat/libprocstat.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index a302310dfb9a..e5481c53eea1 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2414,7 +2414,6 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) { Elf_Auxinfo *auxv; Elf32_Auxinfo *auxv32; - void *ptr; size_t len; unsigned int i, count; int name[4]; @@ -2448,8 +2447,17 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) * necessarily true. */ auxv[i].a_type = auxv32[i].a_type; - ptr = &auxv32[i].a_un; - auxv[i].a_un.a_val = *((uint32_t *)ptr); + /* + * Don't sign extend values. Existing entries are positive + * integers or pointers. Under freebsd32, programs typically + * have a full [0, 2^32) address space (perhaps minus the last + * page) and treating this as a signed integer would be + * confusing since these are not kernel pointers. + * + * XXX: A more complete translation would be ABI and + * type-aware. + */ + auxv[i].a_un.a_val = (uint32_t)auxv32[i].a_un.a_val; } *cntp = count; out: From nobody Mon Oct 16 16:59:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncl31dPz4xZmS; Mon, 16 Oct 2023 16: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 4S8Ncl2YGHz3SNj; Mon, 16 Oct 2023 16: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=1697475559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UBguKUVsU2i9xSRL/qoZYLKdPcptxDkXnwqjP56CbE=; b=LBJfPeE6ydU/TG0h09sFJYagkZrSB/khulNGn7t681qK9xdb65on5QIWPYSGnvxDXZ3ze5 XE0I2DIYB0LWXs+mRjziMGXNW6EFFKrg7Dxh+CggMx5j8Ieg/85F2Y7jCSgzeUMtlUIeC9 TZJLGuF0XVk9WoO11K3zLimVtjqt+QAZ/xlp8babJDn1fEpxddt1884Zw7Mo4iTClDlb2f QEPKjgVE4mWGOnQsqFGZLAYCnjeIxXuCaCjOiuMgAbJtm1ElN2FQcNJyipDXih4WahLQS7 q/lVoV5Ez5BWHUnuHG26a/e+dRohdRGekr7pFdmymJwBRRMK9pSB2NdDoNJKNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475559; a=rsa-sha256; cv=none; b=UlUTIZn9MuGE5oQDEzGbGvFsOPAU/mG0UuVGTk0jOUiPlRLSSzUXbbLTAC/MqDHphm4GAs QSCeS1b7CcJ9gjvL5fmfl/JagEnDnr4oSJKKDj8dnckDysAo1C1HawDhRs38031OntEMc7 qy3XdX7QYcRPDJk59q5CgJ7oU2EIht+p86eInLLfeI6COzhIjrbvLoFXVxYbqEZrGcYk5K VEg4X2ivN/3K89CbPYymV67nx9+1dK1OdU8H1EtzA8b5oogk8YYvULRRgtMKh87epqJJfS BqF22ZYWfXOadm3lzYYq/c4BapC2scg6s7DLxJF5VJLLRiapKAG9hNiuB6hd3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UBguKUVsU2i9xSRL/qoZYLKdPcptxDkXnwqjP56CbE=; b=Lp3iWhicnvQbWyRW48UAbly/h6JXWPZC4WOb5LlVbYAA88WzuQPOtz9T7f1qNBpvhSJdYI nmnDNkU8dNlvjs/Q9vW3Ii60CcmBoU+OyU/AqlNgT+yr8FadhKus16aHytRG62kPCRC9Eb TJzimC4PUxgKTKGsJmDgIOH+XQrTIRV+8CLNlYyA3/BPATYiWtVVcviyDNIp6KvhD/aTDs 4daMPDVB/joE0gYsnHaslTehEf+TLiftFiOGXEdQwy0VMx7G3KFNtq5MHEtxZh3m7PblXy RJgbaH/ECY0WE3j+iDadTPjUbhl/jL6RDuiJwnqxce43lVbm4bMCyxoaPcdsSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncl1c4hznSd; Mon, 16 Oct 2023 16: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 39GGxJGu028863; Mon, 16 Oct 2023 16: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 39GGxJTc028860; Mon, 16 Oct 2023 16:59:19 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:19 GMT Message-Id: <202310161659.39GGxJTc028860@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: 72a4ee26a7c6 - main - libprocstat: make sv_name not static List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 commit 72a4ee26a7c665ae1c31abe1c6feeaa7ccaba140 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:11 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:37 +0000 libprocstat: make sv_name not static Making this variable static makes is_elf32_sysctl() and callers thread unsafe. Use a less absurd length for sv_name. The longest name in the system is "FreeBSD ELF64 V2" which tips the scales at 16+1 bytes. We'll almost certainly have other problems if we exceed 32 characters. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42199 --- lib/libprocstat/libprocstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index e5481c53eea1..84502bb895b7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2392,7 +2392,7 @@ is_elf32_sysctl(pid_t pid) { int error, name[4]; size_t len, i; - static char sv_name[256]; + char sv_name[32]; name[0] = CTL_KERN; name[1] = KERN_PROC; From nobody Mon Oct 16 16:59:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncm5zXtz4xZZ7; Mon, 16 Oct 2023 16: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 4S8Ncm3mQfz3Sc9; Mon, 16 Oct 2023 16: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=1697475560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOeIGQYARU0c5dofrUVzVzob7CvSosjmHvBgtnsA0c0=; b=Ay//xu9whsmfWaIq7NHE4vWp62xNbZnfVlRHyv1JKfR1eZ6HertoZ/uOrSjXn9mshaDW2s zkq2HvLqHTG2rCc5Z7JjeB0nwGcSXuN4bJyZvmebE9P3GKzLBJtQIu5/5+2yhIj0odZmZx iqcr0K9qxlmUZkQljvmSfua633zPT1wnzN36lvFXDcOwxcEcn4WFv21A2mX3AuUo1qHvYL uAzYDmyrsKrHi0mo9Z8XT7iqxeGC9fqMlIp1+JIg5vd5Qi2csS9rZqinR/ff/scH9JGZPr X81VBS3IC+Z6RAjmRwv4EcTV3N36Rq6atXCwNwKHhgVtA7z8MK1uVglt+fPdIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475560; a=rsa-sha256; cv=none; b=leDk9KbCjf0z1gfVBgvB1jhBk/3XLCLGDA1dwmWRlFLhe+yLqwV6O4PaVZouqmGf5b1ieF +RMJ3noU7Xs0dveQs74pMRK31BZfo5Fut8ysmBsRIASK4Fb7mksRxVjP+fTjSCehrJFNCz UW9GRDzRM0M+1KoqF1VCpx4tD+FZplVrpBQ7SqaF9wUldNhAXRmf2rZS4bTk2CRBR+hCfY M9ijeKaFyDVKF+aB5PdkM9TGTqRNswj+Qv8xYv60V8PiPyO6QApBFIlUqfQoOywAJnPZP5 3bE6zjQPaKkMAyQq1VSj5DM+jTu4PgN677ZLXSElEti97tGMLdpT77Wyj1QlTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TOeIGQYARU0c5dofrUVzVzob7CvSosjmHvBgtnsA0c0=; b=mc8FX9162IfUkNTGFK+1uOEKmKLOZgslMMphk7frRlUfk4EFxyYLFCmYKSJ66L/ufLSLJy 6YE+Zf5mAN4aNouhoLZAKxZk+tltGgTy7NVtnkwkUgnZRG1C62mSCzMhr3m5nILr+QmkFE RGlYbONJLrB/b/NafkX7UOQleNfKozKjNoX2j4n+EPCZxcnhH56VM5BTLvi2+AVdeRCKK0 XfPX06uj97AfVMS/W8j97mOiclZo3dRSA5rY60xcWbBcgPSXnhNMJ5coDfiJaSznIeqyA+ XGfluNO3ghZ3EIpWyVCaz4wvQYr+Gvb2jIDWGMh9dFeKFG4wzzJfVSRvRKwixQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncm2tNVzpDD; Mon, 16 Oct 2023 16: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 39GGxKOn028914; Mon, 16 Oct 2023 16: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 39GGxK01028911; Mon, 16 Oct 2023 16:59:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:20 GMT Message-Id: <202310161659.39GGxK01028911@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: 8f06fabe39ac - main - libprocstat: copy all the 32-bit auxv entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f06fabe39ac3ebca4ab448a456945008305a23f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8f06fabe39ac3ebca4ab448a456945008305a23f commit 8f06fabe39ac3ebca4ab448a456945008305a23f Author: Brooks Davis AuthorDate: 2023-10-16 16:53:22 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:43 +0000 libprocstat: copy all the 32-bit auxv entries Use source struct size not the destination struct size so we copy all the auxv entries, not just the first half of them. Fix a style issue on an adjacent line. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42200 --- lib/libprocstat/libprocstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 84502bb895b7..031294387ca7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2434,8 +2434,8 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) warn("sysctl: kern.proc.auxv: %d: %d", pid, errno); goto out; } - count = len / sizeof(Elf_Auxinfo); - auxv = malloc(count * sizeof(Elf_Auxinfo)); + count = len / sizeof(Elf32_Auxinfo); + auxv = malloc(count * sizeof(Elf_Auxinfo)); if (auxv == NULL) { warn("malloc(%zu)", count * sizeof(Elf_Auxinfo)); goto out; From nobody Mon Oct 16 16:59:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncn5WQCz4xZp7; Mon, 16 Oct 2023 16:59: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 4S8Ncn4shvz3SZN; Mon, 16 Oct 2023 16:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7xSUG2Fdxw3waXyVFOXzf/e3eOcg7id+0Y0RUkm/Ic=; b=ANj9vEOnDw3Sj8gZjOaLX5UWIXiRPFa01dvCqeLhgptUb6cu0bnSADCctwR7q8KcIxOX0n vFccuKpCL0LSegyLNSf/imja99+vDq+aGwtprH/C99IoQckJF2DGYSi4gZFzPk6Pklmagl /e8YEr8eaXgQ0s8KwAlYLWnoUpDEiYVcEPO+0X+2HapNPnPlsLM64Or2GML51IK9FXUX6H XgRJ1RpQsGOEGp9w/a17P0xr1vkqTW8vcaIPOwyUautbrxjwyaSbTooxEQ4yu7OUz39lVO as0+jctPhZEMd691Qli9rkwuKvHQTRjanwMhUtBBQD2EP2lAS+VFytOjGtsJoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475561; a=rsa-sha256; cv=none; b=eVQGxzafJDy1glJHCmYwaU8gtIzQRyzNdNKakryM7Mw42IQ1mjJ4TSy/cFEyaAiRCs++ax otG/lHK+5U2X1VwAVOMY/bupVWA0SEKZXhE7WV0pBrFoMsJuyWydYXOG1pkb6nsVW7cnjH yzZAY8WYD3SmBPKcx4zV3WdfySYJT1kdnHK7rRRqbjRY4poHUILAt9v+eovt3YsbyhHEdN 7j/dmGmYRHqKx/AQwsMvohbGQQEoiLNkL5Mm3V6bMIGsUNbWZz9TChJUBH+XwSPd8AUgzY B08/QG2BbegxercsIkvmu3xpeLxg0+818Kmh/6SMDYt+uuWNyFXa4gpS2XCj5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J7xSUG2Fdxw3waXyVFOXzf/e3eOcg7id+0Y0RUkm/Ic=; b=UWMPqerC90qX3+6T6u8ueVc0cHSfmCd3UIm5SOezdnqiWVNrZAE3WcurO8xV4ayDyhZb8D W+cYjugE4VKbgAynYbI1UYrCv+xydcY6qNu5AdL7sPyNeXcshwoBajV/lrmpQcoWPEozv8 ChXKmQ94taUE+YFgWkpzLW13bMMkJy/3/8M46xj2ygn6tjaj3MorZpbJsv9R8J6E1nRn8A wtYD1ADYMAlU1RNfCQxcQDIaL+W0cn1gwCOhG0vTAeyeoGOFPLGvz5ibdKs6JPnicFcy0U YurYrW3ooqvm1hN3XhG2zNA4/II0kFkfTZ3ij1cs+rRQsBswHmlp7FOy7Pb6/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 4S8Ncn3tgrznlc; Mon, 16 Oct 2023 16:59: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 39GGxLqW028963; Mon, 16 Oct 2023 16:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxLAY028960; Mon, 16 Oct 2023 16:59:21 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:21 GMT Message-Id: <202310161659.39GGxLAY028960@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: 248fe3d3483c - main - libprocstat: improve conditional for 32-bit compat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 248fe3d3483cb3ec2c78dd31dc02a467060a6577 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=248fe3d3483cb3ec2c78dd31dc02a467060a6577 commit 248fe3d3483cb3ec2c78dd31dc02a467060a6577 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:29 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:49 +0000 libprocstat: improve conditional for 32-bit compat Include support for translating 32-bit auxv vectors on non-64-bit platforms that aren't riscv (which has no 32-bit ABI support and probably never will). Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42201 --- lib/libprocstat/libprocstat.c | 6 +++--- lib/libprocstat/libprocstat.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 031294387ca7..c6a225a021a7 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2381,7 +2381,7 @@ procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp, int *osrelp) #define PROC_AUXV_MAX 256 -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 static const char *elf32_sv_names[] = { "Linux ELF32", "FreeBSD ELF32", @@ -2464,7 +2464,7 @@ out: free(auxv32); return (auxv); } -#endif /* __ELF_WORD_SIZE == 64 */ +#endif /* PS_ARCH_HAS_FREEBSD32 */ static Elf_Auxinfo * procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) @@ -2473,7 +2473,7 @@ procstat_getauxv_sysctl(pid_t pid, unsigned int *cntp) int name[4]; size_t len; -#if __ELF_WORD_SIZE == 64 +#ifdef PS_ARCH_HAS_FREEBSD32 if (is_elf32_sysctl(pid)) return (procstat_getauxv32_sysctl(pid, cntp)); #endif diff --git a/lib/libprocstat/libprocstat.h b/lib/libprocstat/libprocstat.h index 0df01817663e..3d30b4db4018 100644 --- a/lib/libprocstat/libprocstat.h +++ b/lib/libprocstat/libprocstat.h @@ -102,6 +102,11 @@ #define PS_FST_FFLAG_EXEC 0x2000 #define PS_FST_FFLAG_HASLOCK 0x4000 +#if !defined(__ILP32__) && !defined(__riscv) +/* Target architecture supports 32-bit compat */ +#define PS_ARCH_HAS_FREEBSD32 1 +#endif + struct kinfo_kstack; struct kinfo_proc; struct kinfo_vmentry; From nobody Mon Oct 16 16:59:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ncp6NZQz4xZZC; Mon, 16 Oct 2023 16:59: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 4S8Ncp5glfz3Sld; Mon, 16 Oct 2023 16:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dB13Obsz5aewrBNqr7WPN8xjPbQucBBV+dILOJm6oHU=; b=H/jYuHY++O7ZOt9YKlDsYCJNZ4YOaoG+0K8+4h2x7sHGMsZXILE0vTG00nD44irMXUV/Q1 nc02VNnooPIUvwCqwc1brmZ597YKAi5Lh5VDPBQn0fby3xPhRB3xlkOzmFXavegNJo7H8z DW+/f7CzuAMna41n5kx2oECHrOdiSVE6mUc2mprwcuDXWcNNzkabMRdK6oT1DvoHXqSMm9 /KLFTon26xBK3GYPJyL7VgSDjej5upy8jogJpZQZI7/SFwvVz3tf/QfEyKwWZf9wgsonkk 6ZBAsqn5PPgrnDNdPhUvJwNh8D6jgK1zYn/Vp25pboGdj0FK7mO5v5dRNEcspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697475562; a=rsa-sha256; cv=none; b=STXIQrg9PXZkCbQPafxw5kPNLpyVa177uqDWksYcmxkp638Xo+j+qyPa7SlaWnIiC0urNR ORerqU1NZNhcoFP0VHhJCaz7U5i7oXqwGIeBv1hrHBPEnEt0u8EwQ0owrCWpn+1Ig1Y1KI oyjAp6stgorY/MTdGTw5/KkeBarhHUDc6O28WPKTGHE/8xiBD+eb4mIj8Y/C+4epvWgqgG 6eeotZiCqcGd+a443x3zkYLK8llaW04tMgCrpKApldvitoMqj4EiIzlxdyrZB37koEhgO2 /a8VdsyuA3BcQInlZlQW/H3yRUeaGP60O5qroXJI9szt/31Jx6W+ljA+uDn7MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697475562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dB13Obsz5aewrBNqr7WPN8xjPbQucBBV+dILOJm6oHU=; b=Dmm7aPm1ZW7LVnOkBhPpzP7PbEFfstPFBRbOXLkMDe7IzepsXe5ozdKBezF0pXzEJxvJu3 bJe+C/N2jT43c9mcdasIXRU+pC8tp/3fY58as1I4rk52b9T2CD/aRRI/4aG3MXpQobVUKQ b+K/SlnV60JpbRQvudGQFWghKFLFWMHXjWq+GPkDVKkxxChfTxUdYVMBPNPonA67tYyMJL KW243gV/oHBkMM+vO+2Cq8YkCt/yndTBdbiSQiGTm98uR0yXdEC/jXrx4xYW7TycI2HUbL B+G6Y7ZJRg2ZFPBw5VOKGUzuNQXfOs7KzOtk6VwygDF0ZSEBQ1rJYUuuCGA8FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ncp4h2Pzp05; Mon, 16 Oct 2023 16:59: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 39GGxMAM029013; Mon, 16 Oct 2023 16:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GGxMdV029010; Mon, 16 Oct 2023 16:59:22 GMT (envelope-from git) Date: Mon, 16 Oct 2023 16:59:22 GMT Message-Id: <202310161659.39GGxMdV029010@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: 8f9f7b4a427f - main - procstat auxv: widen COMM column to MAXCOMLEN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f9f7b4a427f2518e978600794f013cb711dfb86 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8f9f7b4a427f2518e978600794f013cb711dfb86 commit 8f9f7b4a427f2518e978600794f013cb711dfb86 Author: Brooks Davis AuthorDate: 2023-10-16 16:53:53 +0000 Commit: Brooks Davis CommitDate: 2023-10-16 16:58:54 +0000 procstat auxv: widen COMM column to MAXCOMLEN For reasons unknown, procstat subcommands typically display the command in a 16+overflow column format. However, the command may be up to MAXCOMLEN (19) characters long causing the column to spill into the next one. Since there's plenty of room in the auxv case, bump the column width up to 19 to avoid this issue. While this is a format change 1) users who want to parse the data should use libxo output and 2) this makes it possible to parse reliably with cut. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42202 --- usr.bin/procstat/procstat_auxv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c index 9c37c511d190..7b68ac72f724 100644 --- a/usr.bin/procstat/procstat_auxv.c +++ b/usr.bin/procstat/procstat_auxv.c @@ -53,16 +53,16 @@ procstat_auxv(struct procstat *procstat, struct kinfo_proc *kipp) static char prefix[256]; if ((procstat_opts & PS_OPT_NOHEADER) == 0) - xo_emit("{T:/%5s %-16s %-16s %-16s}\n", "PID", "COMM", "AUXV", + xo_emit("{T:/%5s %-19s %-16s %-16s}\n", "PID", "COMM", "AUXV", "VALUE"); auxv = procstat_getauxv(procstat, kipp, &count); if (auxv == NULL) return; - snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid, - kipp->ki_comm); + snprintf(prefix, sizeof(prefix), "%5d %-19s", kipp->ki_pid, + kipp->ki_comm); - xo_emit("{e:process_id/%5d/%d}{e:command/%-16s/%s}", kipp->ki_pid, + xo_emit("{e:process_id/%5d/%d}{e:command/%-19s/%s}", kipp->ki_pid, kipp->ki_comm); for (i = 0; i < count; i++) { From nobody Mon Oct 16 17:50:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8PmD5slqz4xctR; Mon, 16 Oct 2023 17:50: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 4S8PmD4r5Lz3bVf; Mon, 16 Oct 2023 17:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697478652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKq0o/MMOwalIke1WTOV8mVnsluUoRdwO8mjGxbm8/w=; b=ypvfKPrMRCQEFcBR58Vib6slEeohPp20GfeOPLhj69aEFK2DuxjsKyXmPHSWakTUhVX4G2 FDa0dgbQQlQPXd/AfvP5akNBvey3lHwnIY6wj63xwfrc2tut3jRfGMzoHOuJfWobQnfee2 Gb61sHpkaaniKRpvttXSB5FTAX79V669lF3lAFUsVyyi/nD+voZWCggVfKNzPqe4IhjCBv bKnkfZbVI92rcLQw47d4KOf525th8UQnMqVfRzGkdnlpOo5BKLKGak7jZCCP8VV47Z3bFG SbbQje1ni/3f5uT8k+c1ySU0lQ3KfLC7MAU/p0UNzOymokYn7oit9z7Zy5OfBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697478652; a=rsa-sha256; cv=none; b=eAToO4KD8Qyob3Irjr6d9MfrNEZiQ+1jCXn4yJqCPrW6qXCjDjFzrlkUJm+IVm67X2Iqjs 7TS52y0WxMH6kkYDv2RIH+3/Czir1JL3CL4foqUuImRViFCFdIpGQdKpKYg0MIWl7sv2m6 Oh0QRz92q4YapyLL4bn9XWvoHBKMcf5ONDwwRa0gZtaWgS7giu8MyHQ2SWi3+eu9s17TgY m9+7BhkWLBKKRSXPd8ZZ1gmDDZ6HbxTMlo5hwBlPOhGFiHRJVyuLTOd/eKOXBzZFjcXA6J 6zuOp9z1GJc7Ntpafh+uxPJtglyDYAUKtrwiTF1kjH+0UTIXlMKzcZhR/QoRPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697478652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKq0o/MMOwalIke1WTOV8mVnsluUoRdwO8mjGxbm8/w=; b=eELDhxkkMdaGHsds8JincnZRSmxUBtC6YIpyyqBb6ALeT/fvNq+EePHj9Y6aLtsVQHWQ4f dvldITbB/fAGjagB+l8GHF2/JMhDM8km3rDhEKiWpyp1bj09tW+ODS2SXkIbULjlnNyX22 aY2oG81Dwe9FvAkk+ISYQFSOCnPniv/rh2YGwrUnVAl9XfPXxd2v27ry5eprG6V76+y/Co cR+SyParqX5bRPgmfeFVFsMKv5SrFN+/qd9kl3hqPmerLH07iThgHMTxb5p1C2IFGCejXR X2SsaMV2jKFMwfwlhkSiKbGdQfb4/zlNjx64CNCnaCKMnnOMtPNLiTUAsmEykg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8PmD3v78zqbG; Mon, 16 Oct 2023 17:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GHoqkE022780; Mon, 16 Oct 2023 17:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GHoqRq022777; Mon, 16 Oct 2023 17:50:52 GMT (envelope-from git) Date: Mon, 16 Oct 2023 17:50:52 GMT Message-Id: <202310161750.39GHoqRq022777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6eae573dc229 - stable/14 - ptsname.3: accommodate upcoming POSIX Issue 8 ptsname_r List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6eae573dc2298e3e0d97b0d829828a427254946c Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6eae573dc2298e3e0d97b0d829828a427254946c commit 6eae573dc2298e3e0d97b0d829828a427254946c Author: Ed Maste AuthorDate: 2023-10-13 20:25:53 +0000 Commit: Ed Maste CommitDate: 2023-10-16 17:50:10 +0000 ptsname.3: accommodate upcoming POSIX Issue 8 ptsname_r POSIX has accepted a proposal[1] to add glibc-compatible ptsname_r. It indicates an error by returning the error number, rather than returning -1 and setting errno. Update RETURN VALUES in ptsname_r's man page now to encourage folks to test that the return value != 0 rather than == -1. [1] https://www.austingroupbugs.net/bug_view_page.php?bug_id=508 Reported by: Collin Funk Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42204 (cherry picked from commit a5ed6a815e38d6c622cd97a6020592ded579cf7a) --- lib/libc/stdlib/ptsname.3 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/ptsname.3 b/lib/libc/stdlib/ptsname.3 index 532ce9e92ae0..df23e9ae6129 100644 --- a/lib/libc/stdlib/ptsname.3 +++ b/lib/libc/stdlib/ptsname.3 @@ -29,7 +29,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 17, 2020 +.Dd October 14, 2023 .Dt PTSNAME 3 .Os .Sh NAME @@ -104,7 +104,7 @@ function clears the lock held on the pseudo-terminal pair for the master device specified with .Fa fildes . .Sh RETURN VALUES -.Rv -std grantpt ptsname_r unlockpt +.Rv -std grantpt unlockpt .Pp The .Fn ptsname @@ -112,6 +112,19 @@ function returns a pointer to the name of the slave device on success; otherwise a .Dv NULL pointer is returned. +.Pp +The +.Fn ptsname_r +function returns the value 0 if successful; +otherwise a nonzero value is returned and the global variable +.Va errno +is set to indicate the error. +Note: +.Fn ptsname_r +was previously documented as returning -1 on error. +In the future it will be changed to return an error number, for POSIX +compatibility. +Therefore, callers should not check for -1. .Sh ERRORS The .Fn grantpt , From nobody Mon Oct 16 17:53:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Ppm1D8Kz4xd06; Mon, 16 Oct 2023 17:53: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 4S8Ppm0n84z3cWY; Mon, 16 Oct 2023 17:53:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697478784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iglNtaecCwgF/yg12pECPzqUXqwPwIlxTmz4KvGxJzk=; b=pTL48YKWWLhqFtqycx7Hs0pNnkvGwwyg9Boc3souILqVFwc+CD4IcOaH/TzSFphmnhUQNd m9awD/ctvMvV1YvuQtAoPYJNIQTKcw4iKmuj+pEsdAKgr63mEi50AQpClB41dVNG2+tiUl q0qiGH1lDzTXdZgox1QhBK7jTBokOdNnWJE94X8hskGGKTPsG0gJROX4/jrdTJzj1ygqEP Gg5JFbxl34lQyl6yvIBJTCxEM5Uu3PlUPgROzPvEkbVzZrehod3Wrq8+3xrJqusS0dsABQ 8UpdbahM53GXHzuZxXUhdttP9SMvhaswQw20YqpJelS35SGGa9hJwkyRkin75w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697478784; a=rsa-sha256; cv=none; b=Fmlj/hPrtV082tJdILM/N0LSMDfYxdJKj+BhXq1ZWCv9jHXMwfwxRVoqCqeuypXjy1V4z4 IbDAxW6q7X8qVv9bBRtjL3QLaKnJl+vSTF5HOkf+SpTC6MrAyI+tKBXbkcXepUhnVJ1ixx jJCo6oUl+Cu0ux6bqqqZ4ewQV8N0Dl8iR/aQzCDaNlFCx7oTjioVc0xM5YANAyf78tUboe oJXhyE06wTrSPo0hAzRZATTS/dZA6R4l17tQEcgLMiUhfftgr4K75ZTyEtLAKIh1boSAzA yUpGAPSFEaKR0m/UR8Wm7A+5kRoV5H3gsPyCnJixgiEr+MOH/Efw5dmdzOcL7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697478784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iglNtaecCwgF/yg12pECPzqUXqwPwIlxTmz4KvGxJzk=; b=hg/+/3S5eZKtqyn0UtKpDuXBKkhN4rG45R0dHwEK/2Pxr4KuFLs2kFCwxeT+y91Y1asDMO lhp/yXf6JsXufgk75pMMlsBjXrGX9Wrtgump1BSQkwsIE5StCYLaeiPG0D/cs0bIEehQxu gnYvGlaQw7BtPtsfCdyk/yROrsFgPjyd9HU47toDR41Adg07gCVLmIgV1zX8edneylNa3z Igghu0ByjznToawG3h81z2YQtZWWBcZQKijrMf5LYNmI1HPYB9sj2Z2EsfWIDW1TEsp87X 1kV2bYqWOxUPiA9J7Pjtk6izP9HEcrW98aTFLFsQGM+lhrY0ZVx2Q9cFAN4EJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Ppl6g2Lzq2n; Mon, 16 Oct 2023 17:53: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 39GHr3T8027781; Mon, 16 Oct 2023 17:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GHr3Qd027778; Mon, 16 Oct 2023 17:53:03 GMT (envelope-from git) Date: Mon, 16 Oct 2023 17:53:03 GMT Message-Id: <202310161753.39GHr3Qd027778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c90c45ac725b - stable/13 - ptsname.3: accommodate upcoming POSIX Issue 8 ptsname_r List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c90c45ac725ba2a7f9bb940a1d555a025b7e47aa Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c90c45ac725ba2a7f9bb940a1d555a025b7e47aa commit c90c45ac725ba2a7f9bb940a1d555a025b7e47aa Author: Ed Maste AuthorDate: 2023-10-13 20:25:53 +0000 Commit: Ed Maste CommitDate: 2023-10-16 17:52:57 +0000 ptsname.3: accommodate upcoming POSIX Issue 8 ptsname_r POSIX has accepted a proposal[1] to add glibc-compatible ptsname_r. It indicates an error by returning the error number, rather than returning -1 and setting errno. Update RETURN VALUES in ptsname_r's man page now to encourage folks to test that the return value != 0 rather than == -1. [1] https://www.austingroupbugs.net/bug_view_page.php?bug_id=508 Reported by: Collin Funk Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42204 (cherry picked from commit a5ed6a815e38d6c622cd97a6020592ded579cf7a) --- lib/libc/stdlib/ptsname.3 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/ptsname.3 b/lib/libc/stdlib/ptsname.3 index 532ce9e92ae0..df23e9ae6129 100644 --- a/lib/libc/stdlib/ptsname.3 +++ b/lib/libc/stdlib/ptsname.3 @@ -29,7 +29,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 17, 2020 +.Dd October 14, 2023 .Dt PTSNAME 3 .Os .Sh NAME @@ -104,7 +104,7 @@ function clears the lock held on the pseudo-terminal pair for the master device specified with .Fa fildes . .Sh RETURN VALUES -.Rv -std grantpt ptsname_r unlockpt +.Rv -std grantpt unlockpt .Pp The .Fn ptsname @@ -112,6 +112,19 @@ function returns a pointer to the name of the slave device on success; otherwise a .Dv NULL pointer is returned. +.Pp +The +.Fn ptsname_r +function returns the value 0 if successful; +otherwise a nonzero value is returned and the global variable +.Va errno +is set to indicate the error. +Note: +.Fn ptsname_r +was previously documented as returning -1 on error. +In the future it will be changed to return an error number, for POSIX +compatibility. +Therefore, callers should not check for -1. .Sh ERRORS The .Fn grantpt , From nobody Mon Oct 16 19:48:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8SN71CXLz4xkTm; Mon, 16 Oct 2023 19:48: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 4S8SN70kplz4GJJ; Mon, 16 Oct 2023 19:48:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697485719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fPA0+hp/D2q8wz4PlMyvfhPTFelK9ZlNgEx/BlF2zE=; b=WY9h+xXTbmvf+y5iZATY7kId/BjAl1aBRrqo2IYqQmHf6TAxegfGOMJ9KrvrLJMFJYCN0W fem4w/SEOL/lXkpGbk9EOOttVhXlUQNBMa2T+XgKO70oEsD5o3yWY/Nncwxd7J+1sz7Tkt dYc/wQb3yQO6+/w4/f9DWXVkwQMzoBVoiYByZQMJcyBVreLGoMikmLyGa/bG/xIeI2o9Hm 7RhIr8sS+LRkOk6Wh4Ih5iJXBq7pnW/g2xyRaWmz6pKKe2uA1gsE4bfUp51KmbLg6NMja3 24DzoXvez/v/ndJuGTwPKz5ux4xSNr5c0JkSNZtGWuvWklMhs4nSth3K8EtUMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697485719; a=rsa-sha256; cv=none; b=Hw0vkjwrrZ/0ZX137esrrzVacYSoUnywneJE6mqwvjJF8Z0geP/lnCeuksfTsjCLRYBgpo S2l98HSqWLNsUO0eLzMXjZuMkUWzyYI0lofnqfYdh1kII1yVPehwahVytjnjbgEu5tkhjM lDefYuRzXr0LETVg9WEPrM1d4sorRVa3pVzusIiMuuHHPj+swlVA6Nd5YPetPyzMvyoH+I SHoeYZu3xGsou4wYwJu7c5wzVawYd+fXTlp2+w+hazkuQDeNdWmj3qyJpkSZcAOg8BwL7O jUk/DBpa+7Gh3RZJI2QcE2Vn4aHcv0k5OaTWCNEJ3nFvitOKbtesDdWxlY04Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697485719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4fPA0+hp/D2q8wz4PlMyvfhPTFelK9ZlNgEx/BlF2zE=; b=pbu+FigULnZs1JTgBZJmdKJCWdbaHrErWGRVuoiTg9v1dEitD+ckVDMAKN09gT0I2WUmZr xDXyTTyGTSpVWNgl4hwwqKJwFFUyzY0e1h50i1cTfcgVdLbRZ75AiedITMdGOslw6oVBwp qyWGMsAKV4DA9eSuLUCya6UlG4Fjo89fFOOq7z/RK9CX+Qmbhc1KB1SkOy1lI2dsppn4ue rpEboeaycK4SzDKTN+VXM2GrsjuF8J7dclIu8mHE3QLM39nuY/w84CqonQnBIh1XS98B87 xELgxuz2Ey4kzTSaq7wLI4+yiQT4J8xFwZCpvADnd1h3A5lKqNy6NbanWDD73Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8SN66n5szt4P; Mon, 16 Oct 2023 19:48: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 39GJmcsA012423; Mon, 16 Oct 2023 19:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GJmcU7012420; Mon, 16 Oct 2023 19:48:38 GMT (envelope-from git) Date: Mon, 16 Oct 2023 19:48:38 GMT Message-Id: <202310161948.39GJmcU7012420@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: 0cb63dcac446 - main - Revert "dwc: re-rewrite barrier part" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cb63dcac446df85787cc0a77d4d38d01ff92913 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0cb63dcac446df85787cc0a77d4d38d01ff92913 commit 0cb63dcac446df85787cc0a77d4d38d01ff92913 Author: Emmanuel Vadot AuthorDate: 2023-10-16 19:43:36 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-16 19:48:19 +0000 Revert "dwc: re-rewrite barrier part" Turns out we need all the barrier. The one before writing the OWN bit is needed so the DMA engine have coherent data, the second one (after the OWN bit is set) is also needed because the DMA buffers are allocated with VM_MEMATTR_DEFAULT whic equals to being cached. This reverts commit 2b4f615e7d4720b16007cfa8aaedf720f572067a. This reverts commit 4870346488051b9c4a1dc8b11cab55d4e5b7c230. Reported by: mmel --- sys/dev/dwc/dwc1000_dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/dwc/dwc1000_dma.c b/sys/dev/dwc/dwc1000_dma.c index c91036f5a714..f6baa0bd3e45 100644 --- a/sys/dev/dwc/dwc1000_dma.c +++ b/sys/dev/dwc/dwc1000_dma.c @@ -218,6 +218,7 @@ txdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr, sc->txdesc_ring[idx].desc1 = desc1; wmb(); sc->txdesc_ring[idx].desc0 |= TDESC0_OWN; + wmb(); } inline static uint32_t @@ -238,6 +239,7 @@ rxdesc_setup(struct dwc_softc *sc, int idx, bus_addr_t paddr) wmb(); sc->rxdesc_ring[idx].desc0 = RDESC0_OWN; + wmb(); return (nidx); } @@ -524,6 +526,7 @@ dma1000_rxfinish_locked(struct dwc_softc *sc) if (m == NULL) { wmb(); desc->desc0 = RDESC0_OWN; + wmb(); } else { /* We cannot create hole in RX ring */ error = dma1000_setup_rxbuf(sc, idx, m); From nobody Mon Oct 16 19:56:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8SYM6skKz4xknx; Mon, 16 Oct 2023 19:56: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 4S8SYM624Dz4HGy; Mon, 16 Oct 2023 19:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697486199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcW5UMg+quXNQd8vkb2p8lKrGJuHhw9SmxuciTk2VrI=; b=IWGlb5ark4uMH0xSnL6MpZMigGlqx6Ts610CjrHCbSs+xKRx9WVFD0yeRZu4Ca1eatISOW NxQwEn+AtxATnz40bQXSBJ8Mpo/89gWtd3jlDXXARfQlKPHdxQ3+YxW0cbAmkSKrZn0wWO NdWjgDY5qSso4nvGKiYFoCILXEO7CRGBqN6HDO53xBZY9R1OhgLA2q09Q05yRvmHyW+mBH VyN9bFn4lsLCAJuhrUwqY30Ao9V2bOqdMuI+Uwtl7WAs9qxdDjHM/bXRYUwvFSXmk1Rlzx eLGExE09ZuToqYgD4TcpwN8nWKwH/SbMrXl/9yDewaXqemrrdCkglmjDP0E5Qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697486199; a=rsa-sha256; cv=none; b=SwLxNNZrrwOQ9yaoKTbohU2jJTcNyx2ihMnB3oGOWa8f1ZWrSlJND/NbNu0B0EZivxoMnk c4dOulTQfiYEhJKFq+ZJ+GplsxKyrehgEk53O1B/mgJlaHMWZt0SmkJ/n8V5asjl5O5/1O g2WKToa0U3pqQgB+jDR0QgR3qW+Q2P1ezLifbjgXQj/QbQgGw1BX2bkt84ez1XLni0SoWg E75EvmmmuRa+t+AXMkmfDsRRvz5UmBZkHNVOZjEqnxc2Y4mG0vyvkDOIRp4s+5NXzeMPBE 1f/rcAsWN5G/Woe87p1NKxNBQLogSK/yhgRYr6W/4diEkD+x0ajLgVdeq67iIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697486199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcW5UMg+quXNQd8vkb2p8lKrGJuHhw9SmxuciTk2VrI=; b=d+qMJCvHDztmH5Qyzi90wqZZQOtyMMXCufbd1glwHFkd+FrjtPTdEQQ86nK4tgIz4GuhjS FuaZtWd70pRYIkyjfb+RERDI6+SXmA4IB6AofUgJMvenFX7Y9rGe2SvvGLyDHE8VVwLGkw /1zV6p0/37FI658MxfHX7Ms3Pa+6khx4yI/mjzpiYJKeKyUI7bS2Vhxal2fEImplQNMWmP QoGkH3Kahfx9OouDgGOoU7wDSjDF50DOaPnG3eYKIpY4w+bzD9SDdxYSunEgL19FsVGYdl XS90R3dMS72lQ/SmpFniDB/cdsc+FHT2YDKsO2R3X3wopI2VT3w04M0Xq4RItQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8SYM53d8ztMx; Mon, 16 Oct 2023 19:56: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 39GJudQE028513; Mon, 16 Oct 2023 19:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GJudQ9028510; Mon, 16 Oct 2023 19:56:39 GMT (envelope-from git) Date: Mon, 16 Oct 2023 19:56:39 GMT Message-Id: <202310161956.39GJudQ9028510@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: e1fe34707a60 - main - arm64: Save an instruction in locore.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1fe34707a60b0f6cf47397c6eea0a39d675e3ac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e1fe34707a60b0f6cf47397c6eea0a39d675e3ac commit e1fe34707a60b0f6cf47397c6eea0a39d675e3ac Author: Alfonso Gregory AuthorDate: 2023-07-04 19:10:19 +0000 Commit: Ed Maste CommitDate: 2023-10-16 19:54:41 +0000 arm64: Save an instruction in locore.S We can move and sub at the same time, so let's do that. Reviewed by: andrew, kevans Pull Request: https://github.com/freebsd/freebsd-src/pull/794 --- sys/arm64/arm64/locore.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index b592c753aa50..d55a21e9c55e 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -112,8 +112,7 @@ virtdone: /* Set up the stack */ adrp x25, initstack_end add x25, x25, :lo12:initstack_end - mov sp, x25 - sub sp, sp, #PCB_SIZE + sub sp, x25, #PCB_SIZE /* Zero the BSS */ ldr x15, .Lbss From nobody Mon Oct 16 20:19:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8T426bsWz4xls4; Mon, 16 Oct 2023 20:19: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 4S8T425SYDz4Kpr; Mon, 16 Oct 2023 20:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697487586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxGYesAN5Cpi9auOwAm6u87fNCwACwJJyD9SQtuC3oE=; b=L95GjVoR0SC7TNgoYv/DY/B15Vdctx4cRsVpKu+M2EdJo+bQ3HAvnS4+j4qgrAeAOCiiB4 SX07WtYLnCDsUS/020K8dD6yfNkQjmJFTPlpQYOuPquCvhZ39OlH1KbVnhvKNlAY8OcyPz cwH6VqebmIERcoybNxtD1j0UGYxxMYJFXUNvOlPaRz2AA1VIzv0GFs60i2H9oBAMj5exBE GQr9BrRRO7sGWhaFqMOc3uHeczMSVTkvor/VFbJAYrTCfwZFd6TqiRbKIbuUZZMeh0ReLj Ni1xXbIXgqtQ0a22gMWV75nAkFox2G7hZ+DvZ2Pvu6iKM9LeSrRVO/Ohd/sUJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697487586; a=rsa-sha256; cv=none; b=GtBfvbmQqUEZpL4JTN9pKNiVZanBBZEdGdTe8cNElrqrI8/549jGP8DjHkI7qLIXkrAzfl YBhYW62j3X87Zs1pUuElI+Yv+NCzQid3PfJWN29VOzsja6vVzJzkgxt3lqNxQV5uTK+fBJ LvZymJlxSE5DDHv0e+ecE5Fek3b/c5gTc2EjUdYK8NP3PNqG39QM6subEEf3BYElX7RKsz fD56f7/wNNrb7c6Vav6GJvVhqhpK/UMgt1ID5JCyW6meKvPaUlY9nkKKBGlaBHpvdOehRR bkb7Pvm/1V9rZ0dF37D4Sv/iciYSE2EhISyR8xxiMcb8qmncqLvcQfH+0Vnrww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697487586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxGYesAN5Cpi9auOwAm6u87fNCwACwJJyD9SQtuC3oE=; b=RJVz/DZQkr1nv1BrPyDmzW3w6u4muT6GO4zmfBV3fERJGcpxckoRYjN5QLQ/f0o96v8QAy YLWvHK7473ljAyHGCZ0Q9mesQMzcu5tYSySaQEe6nbDEWzM1SnuI/VC1j2gce+DmhzwvEy kLCQLd8PE8ReliSNplqs9AKl16lcHFxzwtg687LraiGi2fpM4sHBmOdzY0sIOmLY/SCoP3 dGW5zSQNC+yrak2HcNZQus+ZuRLKRRLx+bvEdg48l9ZNfQIpibKsH6CcGJZJjyIceApV1r m1D9IDDTMyDrx/Y6gffOLatLlRx6GaaOizt/uKUHr8HmuAh0Mi+/dWMr11sjqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8T424LPhzvFC; Mon, 16 Oct 2023 20:19: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 39GKJkqR062729; Mon, 16 Oct 2023 20:19:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GKJkgr062726; Mon, 16 Oct 2023 20:19:46 GMT (envelope-from git) Date: Mon, 16 Oct 2023 20:19:46 GMT Message-Id: <202310162019.39GKJkgr062726@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8c630381b43c - main - bsd-family-tree: add OpenBSD 7.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c630381b43cc4d83c99305df3f732b0583ff8f2 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=8c630381b43cc4d83c99305df3f732b0583ff8f2 commit 8c630381b43cc4d83c99305df3f732b0583ff8f2 Author: Sergey A. Osokin AuthorDate: 2023-10-16 20:19:12 +0000 Commit: Sergey A. Osokin CommitDate: 2023-10-16 20:19:12 +0000 bsd-family-tree: add OpenBSD 7.4 MFC after: 3 days --- share/misc/bsd-family-tree | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 1a99910e1297..65719513e49b 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -448,6 +448,7 @@ FreeBSD 5.2 | | | | | 13.2 | | | | | macOS | | | | 14 | | | + | | | OpenBSD 7.4 | | | | | | FreeBSD 14 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -875,6 +876,7 @@ DragonFly 6.4 2022-12-30 [DFB] OpenBSD 7.3 2023-04-10 [OBD] FreeBSD 13.2 2023-04-11 [FBD] macOS 14 2023-09-26 [APL] +OpenBSD 7.4 2023-10-16 [OBD] Bibliography ------------------------ From nobody Mon Oct 16 20:29:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8TGy1GWGz4xmCp; Mon, 16 Oct 2023 20:29: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 4S8TGy0nzJz4Lrs; Mon, 16 Oct 2023 20:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697488154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=tHz1M6XmbW/yw3j3TltMWGSGbg3gPyjsM8YkrwcuWDh02/g5WGAtCQsRk2GCZ9C3/XnC0F apdFrsWln0SinQLFzQbjrUtsS9zPXIhLn3AO33jQ5xUueZdmgZCvZ2V2w14IadymtzvSAC 22L2LCQd3nKLAn0Pe8fTGpbxIA/A6kJHH2ebqzu93S2PzV5iG4ioP0jNYDDIqZ8lYTu3WD BaujOmarjeIaym3P8IqAM8lKl/VKUt+PFpixrzy3M1mBlV+EVUUCh3f+d3dzrmP9G0McGs AcCrWYTeWuQVenPzZjXftfphZ2bW8cG1vGLp420l9b3XsUrv+UbtcQH3v1WNGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697488154; a=rsa-sha256; cv=none; b=rbdD2U/wdwDOfp5+OJP4qudILwaP+8I5VCHx9IFHXbH+I7Ug7SU69/eATrFVUeINGxjEbD wHlTMh9L/x1evlgT5wb76zXBW75XOr6P1isPMGyfaRekrxLHHVBZrquN0CBPoZvN6G914H HPikNaqi4Ei/p3Bj8j93qo4zsgbHr1zHOT+eVyLuzde8IgxYZ361I8ioDDRqoLkviO/FG2 fJmxsvi0QD/irEIZwCTNonhJSj7JpZhtmONyohs6O1r7AVHX+ZqopGpUIJH1elNVeRJoBB sSQglZ7LPYwQ08W1LSTH5rtJZAX0YHG5lBEi5ledGuluKEQvxrPsI4YbQONzCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697488154; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EG2nvCiqbD/J9HmeeuVBB6z6uBFMsvB5Tga2wijmEzM=; b=OBqrhUzx7290q5nfwwil+Y/j+k/WRAnai1sr8xND49k2d9osPjlII+wx7u7oyxPffqOHTI tzVANJsgUkAZiHzVMMiK/FMkIt8BXmluqne/MA3ll3B1+Y9R29+EDO5BZMktsjiCHvd2lG hogIyj74JTfUV92mI+UtgbK1xE/m464nOKDL01iNOf8K3rCgALW9W264NXh+y0L8JTRpUB VAun3n/HKCSc5Odc3wDNTF6EyQNiyCBBg8i+fzjLoXGHf2cSWf1+6q6EVDcsgygYX3U3Dj V/s7lEL8CxZ67vWwn3CC84p1p8Z08utDKjm5vCrFvLh19y6RIy+2xeqNt15Twg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8TGx6yR6zvLb; Mon, 16 Oct 2023 20: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 39GKTDAI079456; Mon, 16 Oct 2023 20: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 39GKTDRa079453; Mon, 16 Oct 2023 20:29:13 GMT (envelope-from git) Date: Mon, 16 Oct 2023 20:29:13 GMT Message-Id: <202310162029.39GKTDRa079453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: ccd0f34d8585 - main - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccd0f34d8585cba727dd17a381309855af655b82 Auto-Submitted: auto-generated The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd0f34d8585cba727dd17a381309855af655b82 commit ccd0f34d8585cba727dd17a381309855af655b82 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-16 20:29:06 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 MFC After: 1 week --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index e19d845ca66e..1cf8403e0a0e 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -151,8 +151,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -168,8 +172,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit(); From nobody Mon Oct 16 22:14:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8WcT678Hz4xsBF; Mon, 16 Oct 2023 22:14: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 4S8WcT5bVMz4V0M; Mon, 16 Oct 2023 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=v0Cdpbi6CMNt1yaAfQysuCt1wNuqagqBtXLcgYwEu8Q8eue9Ajv8O5IvwwkfB9h5CIGPR/ u/wlcOahfbi4weSXsGvwmFAPApYO0uuig11yyvwnn3QUS2qgjYH08TpobS/p92kp15JNmQ Pz1VD2M19v5YfJYL2A9tzuxpktxyZg5ic9h0W+DVjfLckA4TF1SQmpPIrtCbIEd+mLNx7j yuVEFQSkmkbd0aHB9eVZ8pLF5JajtFN03pb0PH4rJS1jkuxjh9jSVS6+JgTGr+IwgO9S1K 19Zv3IwLImby9As3jfFNnhmODWGt6SnUQBLDUNq28AI89WxLQY10x23k0QwtvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697494473; a=rsa-sha256; cv=none; b=aT5IcjcumPefPie+9dVtfYpRnbklTaoI8zDPvbXwVMsOXVRGulVi5WjZMD69g2HpXhvy1v pCHTPzrv2TxJtjypLYKma2folPhfg7r2D893gmF5412M6fbKd76aCbmqrqJNTW2HbmZVUL dtG4Pl5YkD396qnNA1LbYl0Y46ROnIDSs+V0S2IVjITcdh4V3v+r/Ry9QvW+QSQ5mw/YvN ID63r6s148Q68X/UX5ZthH+562mxDZOzl/ZEI5VXOBDn4GEOvqNgzZnt0yCo7Yyh0DxzOS 6+ABXvRS9iJ4SMSD1j4HjwTUHRxx10Yrd/Re4U0pJ2/435wtQetTjVwcQDfcrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFQy/JRtLwkQ5/oYe6Iq2BlYCMPfRwAU6JOLLX8PVuc=; b=fTLdCnoDc2fXMNC6AZAbgfZvNs7ULVuPjC4TqUIxmOlVWjMYeRNtOspIM5tb3IzW2cVUbx FDwVz1sZituo2dd249vECo4B02oved3PYmnvxo8orgvirEj2MnLDS8qorh9rtr5chcUnAc YOqPZWMI5fLXmeVpndEykZtZMj3MVvsQ6Ux1EwuUBYUYzl7lSxV3+hBD2wRVBgiQ135yeG pSRXyT+WWKoa7JADoj5iMaGaSvTUit+4ESKH/c7KpVzfYYf01YsBcQVDr8HUT2Pgb8H5IW eusQwM3DCA8ZiJJ70Vc1fBFgvS6G4SkNeVNiPzeZ98atdkx+0uXb5af5LwWBfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8WcT4dXnzy6s; Mon, 16 Oct 2023 22:14: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 39GMEXko062641; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMEXtg062639; Mon, 16 Oct 2023 22:14:33 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:14:33 GMT Message-Id: <202310162214.39GMEXtg062639@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: 5307bbcc038f - main - bsdinstall partedit: Apply changes from scripted installs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5307bbcc038f878b4b3714f03a2c824a0caeba4f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5307bbcc038f878b4b3714f03a2c824a0caeba4f commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:13:31 +0000 bsdinstall partedit: Apply changes from scripted installs I got a check inverted in a previous cleanup commit and as a result partedit was only applying GEOM changes (and generating an /etc/fstab) if it got an error reading the current GEOM mesh. Instead, it needed to do those actions if it succeeded in reading the mesh. The lack of /etc/fstab meant that bsdinstall mount didn't mount anything in a scripted install. PR: 273723 Reported by: Andrey Fesenko Reported by: Michal Nowak Reviewed by: cognet, brooks Fixes: 230990991965 bsdinstall: Handle errors from geom_gettree. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42236 --- usr.sbin/bsdinstall/partedit/partedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 668824725ac8..bb2580789fe8 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -215,7 +215,7 @@ main(int argc, const char **argv) if (prompt == NULL) { error = geom_gettree(&mesh); - if (error != 0) { + if (error == 0) { if (validate_setup()) { error = apply_changes(&mesh); } else { From nobody Mon Oct 16 22:17:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8WhP5yBnz4xrlV; Mon, 16 Oct 2023 22:17: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 4S8WhP5dvdz4Vdv; Mon, 16 Oct 2023 22:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSYRPu1xZwfo8gR5ar0XPKvMOOvUJbBdaO+ZqrZncas=; b=moNym1SqKHqhr+zOO0K6dL6xs27ggEAvSMcLSlewVoUve8wiwD4HqvqwGDg6Ksnh+giGRd 3CrSEDOVDg3BpAYFFblm3amYgA6dOXyEncR2BXsxkSvPlMd6VXP70aS70AF83H9LFzu0EK Iuj2OFtxs86VEbBC0DQ6amDbmDEOmi2UUN/fpBc/saWcn0GPepQ+k7JawAQ/by6OWT8mEA w1fj4TZ3XotYdsXhSMISQ4H+tIukcHKokpvHuIP+D83t5mjBCDMIyWKgWCR3eAgHfPUWVi prq050UT+95lx7+oZNXsYrb5RJofQtOSfAvRcTJqih9jboC0XIQxfcG4eQjw6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697494677; a=rsa-sha256; cv=none; b=TzYoWa50WLM81bBsESKYksOZ23dRGkjsILpu9aYhPwo1OCL1fA7+wNsvYB+u9pRwqrSLV3 1K1Tn7+KQK3ZuUd7c1lkxmvGpy/bSavpgL11RhB4535Sgaj1olmcvp4BI8ipEos15pqwNC Z1TjpsX84Z6WYQCWwQsqdlGjLdqAPlRleEBnV3tY6U2FrFyeyCmbqBTV4IznBE6XdRo0EI 9qjT1QTu1r3AQxTF9Cv4cwmMVdVwK4nXhfd0E98IKX/gC65qWEdk8fe77IhgZi5GXdeFgG HcfbWOQLECyf8ZDWwQx5yw0wHmVDsHejT3IUOb1iDWNhJoDwSqgA9o9ZqyBczg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697494677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VSYRPu1xZwfo8gR5ar0XPKvMOOvUJbBdaO+ZqrZncas=; b=K4E5V1o8dLG3+Kj997edMd97c7YQVG5XqdeU1tVrkuhdk7YiQoI7Cl62QGzihkSiNLmgiJ xRgAiYqBtus/ODBgJdTs0kigsDxGCAYe13g9elsqxmZ2yO5rnJW/82heQnaP4QmSXVnC9f Yvg4dd9391/dwCL7igj+dlqW0sRTikBQnLH+JgVwV47VBTx38nrg7dk9J6wjjAdwjWuUOo jVkijjHxzKg7T1s382Fu6gFowefB4cL6jowJw74EJZr4dk5FmxAr5veWG0XOUyrOnUv2xs OTd2JDVHhavWOtdu0vS071IOfHmK1X4HhfMCMg7GBakDRsAKp1KY3i0m367STg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8WhP4ffwzy84; Mon, 16 Oct 2023 22:17: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 39GMHv6x063225; Mon, 16 Oct 2023 22:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMHvT1063222; Mon, 16 Oct 2023 22:17:57 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:17:57 GMT Message-Id: <202310162217.39GMHvT1063222@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: b0936440b8fc - main - bhyve: Replace many fprintf(stderr, ...) calls with EPRINTLN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0936440b8fcee523c0b26fdbbef7c3b2b5098bf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b0936440b8fcee523c0b26fdbbef7c3b2b5098bf commit b0936440b8fcee523c0b26fdbbef7c3b2b5098bf Author: John Baldwin AuthorDate: 2023-10-16 22:17:48 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:17:48 +0000 bhyve: Replace many fprintf(stderr, ...) calls with EPRINTLN EPRINTLN handles newlines appropriately when stdout/stderr have been reused as the backend for a serial port. For bhyverun.c itself, the rule this attempts to follow is to use regular fprintf/perror/warn/err prior to init_pci() (which is when serial ports are configured) and to switch to EPRINTLN afterwards. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D42182 --- usr.sbin/bhyve/amd64/bhyverun_machdep.c | 8 +++--- usr.sbin/bhyve/amd64/e820.c | 5 ++-- usr.sbin/bhyve/amd64/vmexit.c | 46 ++++++++++++++++----------------- usr.sbin/bhyve/bhyverun.c | 33 +++++++++++------------ usr.sbin/bhyve/block_if.c | 2 +- usr.sbin/bhyve/bootrom.c | 14 +++++----- usr.sbin/bhyve/gdb.c | 3 ++- usr.sbin/bhyve/pci_ahci.c | 7 +++-- usr.sbin/bhyve/pci_xhci.c | 10 +++---- usr.sbin/bhyve/snapshot.c | 6 ++--- usr.sbin/bhyve/snapshot.h | 3 +-- 11 files changed, 69 insertions(+), 68 deletions(-) diff --git a/usr.sbin/bhyve/amd64/bhyverun_machdep.c b/usr.sbin/bhyve/amd64/bhyverun_machdep.c index 40325a7f52c9..4f482586f900 100644 --- a/usr.sbin/bhyve/amd64/bhyverun_machdep.c +++ b/usr.sbin/bhyve/amd64/bhyverun_machdep.c @@ -37,6 +37,7 @@ #include "atkbdc.h" #include "bhyverun.h" #include "config.h" +#include "debug.h" #include "e820.h" #include "fwctl.h" #include "ioapic.h" @@ -70,7 +71,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) if (get_config_bool_default("x86.vmexit_on_hlt", false)) { err = vm_get_capability(vcpu, VM_CAP_HALT_EXIT, &tmp); if (err < 0) { - fprintf(stderr, "VM exit on HLT not supported\n"); + EPRINTLN("VM exit on HLT not supported"); exit(4); } vm_set_capability(vcpu, VM_CAP_HALT_EXIT, 1); @@ -82,8 +83,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) */ err = vm_get_capability(vcpu, VM_CAP_PAUSE_EXIT, &tmp); if (err < 0) { - fprintf(stderr, - "SMP mux requested, no pause support\n"); + EPRINTLN("SMP mux requested, no pause support"); exit(4); } vm_set_capability(vcpu, VM_CAP_PAUSE_EXIT, 1); @@ -95,7 +95,7 @@ bhyve_init_vcpu(struct vcpu *vcpu) err = vm_set_x2apic_state(vcpu, X2APIC_DISABLED); if (err) { - fprintf(stderr, "Unable to set x2apic state (%d)\n", err); + EPRINTLN("Unable to set x2apic state (%d)", err); exit(4); } diff --git a/usr.sbin/bhyve/amd64/e820.c b/usr.sbin/bhyve/amd64/e820.c index 545878aad39f..456ce0330b50 100644 --- a/usr.sbin/bhyve/amd64/e820.c +++ b/usr.sbin/bhyve/amd64/e820.c @@ -17,6 +17,7 @@ #include #include +#include "debug.h" #include "e820.h" #include "qemu_fwcfg.h" @@ -93,11 +94,11 @@ e820_dump_table(void) struct e820_element *element; uint64_t i; - fprintf(stderr, "E820 map:\n"); + EPRINTLN("E820 map:"); i = 0; TAILQ_FOREACH(element, &e820_table, chain) { - fprintf(stderr, " (%4lu) [%16lx, %16lx] %s\n", i, + EPRINTLN(" (%4lu) [%16lx, %16lx] %s", i, element->base, element->end, e820_get_type_name(element->type)); diff --git a/usr.sbin/bhyve/amd64/vmexit.c b/usr.sbin/bhyve/amd64/vmexit.c index 5d903d98f277..2c01c63f6454 100644 --- a/usr.sbin/bhyve/amd64/vmexit.c +++ b/usr.sbin/bhyve/amd64/vmexit.c @@ -83,7 +83,7 @@ vmexit_inout(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) error = emulate_inout(ctx, vcpu, vme); if (error) { - fprintf(stderr, "Unhandled %s%c 0x%04x at 0x%lx\n", + EPRINTLN("Unhandled %s%c 0x%04x at 0x%lx", in ? "in" : "out", bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port, vme->rip); @@ -107,7 +107,7 @@ vmexit_rdmsr(struct vmctx *ctx __unused, struct vcpu *vcpu, val = 0; error = emulate_rdmsr(vcpu, vme->u.msr.code, &val); if (error != 0) { - fprintf(stderr, "rdmsr to register %#x on vcpu %d\n", + EPRINTLN("rdmsr to register %#x on vcpu %d", vme->u.msr.code, vcpu_id(vcpu)); if (get_config_bool("x86.strictmsr")) { vm_inject_gp(vcpu); @@ -137,7 +137,7 @@ vmexit_wrmsr(struct vmctx *ctx __unused, struct vcpu *vcpu, error = emulate_wrmsr(vcpu, vme->u.msr.code, vme->u.msr.wval); if (error != 0) { - fprintf(stderr, "wrmsr to register %#x(%#lx) on vcpu %d\n", + EPRINTLN("wrmsr to register %#x(%#lx) on vcpu %d", vme->u.msr.code, vme->u.msr.wval, vcpu_id(vcpu)); if (get_config_bool("x86.strictmsr")) { vm_inject_gp(vcpu); @@ -239,17 +239,17 @@ vmexit_vmx(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) vme = vmrun->vm_exit; - fprintf(stderr, "vm exit[%d]\n", vcpu_id(vcpu)); - fprintf(stderr, "\treason\t\tVMX\n"); - fprintf(stderr, "\trip\t\t0x%016lx\n", vme->rip); - fprintf(stderr, "\tinst_length\t%d\n", vme->inst_length); - fprintf(stderr, "\tstatus\t\t%d\n", vme->u.vmx.status); - fprintf(stderr, "\texit_reason\t%u (%s)\n", vme->u.vmx.exit_reason, + EPRINTLN("vm exit[%d]", vcpu_id(vcpu)); + EPRINTLN("\treason\t\tVMX"); + EPRINTLN("\trip\t\t0x%016lx", vme->rip); + EPRINTLN("\tinst_length\t%d", vme->inst_length); + EPRINTLN("\tstatus\t\t%d", vme->u.vmx.status); + EPRINTLN("\texit_reason\t%u (%s)", vme->u.vmx.exit_reason, vmexit_vmx_desc(vme->u.vmx.exit_reason)); - fprintf(stderr, "\tqualification\t0x%016lx\n", + EPRINTLN("\tqualification\t0x%016lx", vme->u.vmx.exit_qualification); - fprintf(stderr, "\tinst_type\t\t%d\n", vme->u.vmx.inst_type); - fprintf(stderr, "\tinst_error\t\t%d\n", vme->u.vmx.inst_error); + EPRINTLN("\tinst_type\t\t%d", vme->u.vmx.inst_type); + EPRINTLN("\tinst_error\t\t%d", vme->u.vmx.inst_error); #ifdef DEBUG_EPT_MISCONFIG if (vme->u.vmx.exit_reason == EXIT_REASON_EPT_MISCONFIG) { vm_get_register(vcpu, @@ -257,9 +257,9 @@ vmexit_vmx(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) &ept_misconfig_gpa); vm_get_gpa_pmap(ctx, ept_misconfig_gpa, ept_misconfig_pte, &ept_misconfig_ptenum); - fprintf(stderr, "\tEPT misconfiguration:\n"); - fprintf(stderr, "\t\tGPA: %#lx\n", ept_misconfig_gpa); - fprintf(stderr, "\t\tPTE(%d): %#lx %#lx %#lx %#lx\n", + EPRINTLN("\tEPT misconfiguration:"); + EPRINTLN("\t\tGPA: %#lx", ept_misconfig_gpa); + EPRINTLN("\t\tPTE(%d): %#lx %#lx %#lx %#lx", ept_misconfig_ptenum, ept_misconfig_pte[0], ept_misconfig_pte[1], ept_misconfig_pte[2], ept_misconfig_pte[3]); @@ -275,13 +275,13 @@ vmexit_svm(struct vmctx *ctx __unused, struct vcpu *vcpu, struct vm_run *vmrun) vme = vmrun->vm_exit; - fprintf(stderr, "vm exit[%d]\n", vcpu_id(vcpu)); - fprintf(stderr, "\treason\t\tSVM\n"); - fprintf(stderr, "\trip\t\t0x%016lx\n", vme->rip); - fprintf(stderr, "\tinst_length\t%d\n", vme->inst_length); - fprintf(stderr, "\texitcode\t%#lx\n", vme->u.svm.exitcode); - fprintf(stderr, "\texitinfo1\t%#lx\n", vme->u.svm.exitinfo1); - fprintf(stderr, "\texitinfo2\t%#lx\n", vme->u.svm.exitinfo2); + EPRINTLN("vm exit[%d]", vcpu_id(vcpu)); + EPRINTLN("\treason\t\tSVM"); + EPRINTLN("\trip\t\t0x%016lx", vme->rip); + EPRINTLN("\tinst_length\t%d", vme->inst_length); + EPRINTLN("\texitcode\t%#lx", vme->u.svm.exitcode); + EPRINTLN("\texitinfo1\t%#lx", vme->u.svm.exitinfo1); + EPRINTLN("\texitinfo2\t%#lx", vme->u.svm.exitinfo2); return (VMEXIT_ABORT); } @@ -413,7 +413,7 @@ vmexit_suspend(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) case VM_SUSPEND_TRIPLEFAULT: exit(3); default: - fprintf(stderr, "vmexit_suspend: invalid reason %d\n", how); + EPRINTLN("vmexit_suspend: invalid reason %d", how); exit(100); } return (0); /* NOTREACHED */ diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 027042cf0c14..0d7f58509244 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -467,7 +467,7 @@ fbsdrun_deletecpu(int vcpu) pthread_mutex_lock(&resetcpu_mtx); if (!CPU_ISSET(vcpu, &cpumask)) { - fprintf(stderr, "Attempting to delete unknown cpu %d\n", vcpu); + EPRINTLN("Attempting to delete unknown cpu %d", vcpu); exit(4); } @@ -531,7 +531,7 @@ vm_loop(struct vmctx *ctx, struct vcpu *vcpu) exit(4); } } - fprintf(stderr, "vm_run error %d, errno %d\n", error, errno); + EPRINTLN("vm_run error %d, errno %d", error, errno); } static int @@ -938,13 +938,13 @@ main(int argc, char *argv[]) exit(4); if (qemu_fwcfg_init(ctx) != 0) { - fprintf(stderr, "qemu fwcfg initialization error"); + fprintf(stderr, "qemu fwcfg initialization error\n"); exit(4); } if (qemu_fwcfg_add_file("opt/bhyve/hw.ncpu", sizeof(guest_ncpus), &guest_ncpus) != 0) { - fprintf(stderr, "Could not add qemu fwcfg opt/bhyve/hw.ncpu"); + fprintf(stderr, "Could not add qemu fwcfg opt/bhyve/hw.ncpu\n"); exit(4); } @@ -952,11 +952,12 @@ main(int argc, char *argv[]) * Exit if a device emulation finds an error in its initialization */ if (init_pci(ctx) != 0) { - perror("device emulation initialization error"); + EPRINTLN("Device emulation initialization error: %s", + strerror(errno)); exit(4); } if (init_tpm(ctx) != 0) { - fprintf(stderr, "Failed to init TPM device"); + EPRINTLN("Failed to init TPM device"); exit(4); } @@ -979,33 +980,33 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { - fprintf(stdout, "Pausing pci devs...\r\n"); + FPRINTLN(stdout, "Pausing pci devs..."); if (vm_pause_devices() != 0) { - fprintf(stderr, "Failed to pause PCI device state.\n"); + EPRINTLN("Failed to pause PCI device state."); exit(1); } - fprintf(stdout, "Restoring vm mem...\r\n"); + FPRINTLN(stdout, "Restoring vm mem..."); if (restore_vm_mem(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore VM memory.\n"); + EPRINTLN("Failed to restore VM memory."); exit(1); } - fprintf(stdout, "Restoring pci devs...\r\n"); + FPRINTLN(stdout, "Restoring pci devs..."); if (vm_restore_devices(&rstate) != 0) { - fprintf(stderr, "Failed to restore PCI device state.\n"); + EPRINTLN("Failed to restore PCI device state."); exit(1); } - fprintf(stdout, "Restoring kernel structs...\r\n"); + FPRINTLN(stdout, "Restoring kernel structs..."); if (vm_restore_kern_structs(ctx, &rstate) != 0) { - fprintf(stderr, "Failed to restore kernel structs.\n"); + EPRINTLN("Failed to restore kernel structs."); exit(1); } - fprintf(stdout, "Resuming pci devs...\r\n"); + FPRINTLN(stdout, "Resuming pci devs..."); if (vm_resume_devices() != 0) { - fprintf(stderr, "Failed to resume PCI device state.\n"); + EPRINTLN("Failed to resume PCI device state."); exit(1); } } diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 93ddf6d8e0c6..29b8910101f6 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -1025,7 +1025,7 @@ blockif_pause(struct blockif_ctxt *bc) pthread_mutex_unlock(&bc->bc_mtx); if (!bc->bc_rdonly && blockif_flush_bc(bc)) - fprintf(stderr, "%s: [WARN] failed to flush backing file.\r\n", + EPRINTLN("%s: [WARN] failed to flush backing file.", __func__); } diff --git a/usr.sbin/bhyve/bootrom.c b/usr.sbin/bhyve/bootrom.c index cf527b98af89..64f1921f901e 100644 --- a/usr.sbin/bhyve/bootrom.c +++ b/usr.sbin/bhyve/bootrom.c @@ -237,14 +237,14 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) if (varfile != NULL) { varfd = open(varfile, O_RDWR); if (varfd < 0) { - fprintf(stderr, "Error opening bootrom variable file " - "\"%s\": %s\n", varfile, strerror(errno)); + EPRINTLN("Error opening bootrom variable file " + "\"%s\": %s", varfile, strerror(errno)); goto done; } if (fstat(varfd, &sbuf) < 0) { - fprintf(stderr, - "Could not fstat bootrom variable file \"%s\": %s\n", + EPRINTLN( + "Could not fstat bootrom variable file \"%s\": %s", varfile, strerror(errno)); goto done; } @@ -254,7 +254,7 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) if (var_size > BOOTROM_SIZE || (var_size != 0 && var_size < PAGE_SIZE)) { - fprintf(stderr, "Invalid bootrom variable size %ld\n", + EPRINTLN("Invalid bootrom variable size %ld", var_size); goto done; } @@ -262,8 +262,8 @@ bootrom_loadrom(struct vmctx *ctx, const nvlist_t *nvl) total_size = rom_size + var_size; if (total_size > BOOTROM_SIZE) { - fprintf(stderr, "Invalid bootrom and variable aggregate size " - "%ld\n", total_size); + EPRINTLN("Invalid bootrom and variable aggregate size %ld", + total_size); goto done; } diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index dcd733c484ca..55178677f837 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -59,6 +59,7 @@ #include "bhyverun.h" #include "config.h" +#include "debug.h" #include "gdb.h" #include "mem.h" #include "mevent.h" @@ -890,7 +891,7 @@ gdb_cpu_breakpoint(struct vcpu *vcpu, struct vm_exit *vmexit) int error, vcpuid; if (!gdb_active) { - fprintf(stderr, "vm_loop: unexpected VMEXIT_DEBUG\n"); + EPRINTLN("vm_loop: unexpected VMEXIT_DEBUG"); exit(4); } vcpuid = vcpu_id(vcpu); diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index b69c099225db..1eef285a871c 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -2610,7 +2610,7 @@ pci_ahci_snapshot(struct vm_snapshot_meta *meta) /* Mostly for restore; save is ensured by the lines above. */ if (((bctx == NULL) && (port->bctx != NULL)) || ((bctx != NULL) && (port->bctx == NULL))) { - fprintf(stderr, "%s: ports not matching\r\n", __func__); + EPRINTLN("%s: ports not matching", __func__); ret = EINVAL; goto done; } @@ -2619,9 +2619,8 @@ pci_ahci_snapshot(struct vm_snapshot_meta *meta) continue; if (port->port != i) { - fprintf(stderr, "%s: ports not matching: " - "actual: %d expected: %d\r\n", - __func__, port->port, i); + EPRINTLN("%s: ports not matching: " + "actual: %d expected: %d", __func__, port->port, i); ret = EINVAL; goto done; } diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 2d37cb0f08fc..99c1d20b3378 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -3102,8 +3102,8 @@ pci_xhci_snapshot(struct vm_snapshot_meta *meta) /* check if the restored device (when restoring) is sane */ if (restore_idx != i) { - fprintf(stderr, "%s: idx not matching: actual: %d, " - "expected: %d\r\n", __func__, restore_idx, i); + EPRINTLN("%s: idx not matching: actual: %d, " + "expected: %d", __func__, restore_idx, i); ret = EINVAL; goto done; } @@ -3118,9 +3118,9 @@ pci_xhci_snapshot(struct vm_snapshot_meta *meta) if (meta->op == VM_SNAPSHOT_RESTORE) { dname[sizeof(dname) - 1] = '\0'; if (strcmp(dev->dev_ue->ue_emu, dname)) { - fprintf(stderr, "%s: device names mismatch: " - "actual: %s, expected: %s\r\n", - __func__, dname, dev->dev_ue->ue_emu); + EPRINTLN("%s: device names mismatch: " + "actual: %s, expected: %s", + __func__, dname, dev->dev_ue->ue_emu); ret = EINVAL; goto done; diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 86c76e679e53..5f643c9ceb50 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -155,13 +155,13 @@ strcat_extension(const char *base_str, const char *ext) ext_len = strnlen(ext, NAME_MAX); if (base_len + ext_len > NAME_MAX) { - fprintf(stderr, "Filename exceeds maximum length.\n"); + EPRINTLN("Filename exceeds maximum length."); return (NULL); } res = malloc(base_len + ext_len + 1); if (res == NULL) { - perror("Failed to allocate memory."); + EPRINTLN("Failed to allocate memory: %s", strerror(errno)); return (NULL); } @@ -176,7 +176,7 @@ void destroy_restore_state(struct restore_state *rstate) { if (rstate == NULL) { - fprintf(stderr, "Attempting to destroy NULL restore struct.\n"); + EPRINTLN("Attempting to destroy NULL restore struct."); return; } diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index fdfbbcbe0cb8..179aafb6471d 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -119,8 +119,7 @@ do { \ (RNULL), (META)); \ if ((RES) != 0) { \ if ((RES) == EFAULT) \ - fprintf(stderr, "%s: invalid address: %s\r\n", \ - __func__, #ADDR); \ + EPRINTLN("%s: invalid address: %s", __func__, #ADDR); \ goto LABEL; \ } \ } while (0) From nobody Mon Oct 16 22:43:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XFh3C7hz4xtH6; Mon, 16 Oct 2023 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8XFh2P3Xz4XQS; Mon, 16 Oct 2023 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xpky8ZRrFi1ScpjAhYGJLg6HnStd91/KU2XrwxrKNY=; b=avIIaudaP7Tx0ACMdcGoVdz1x5+pfWFiDxHT4AmKvTvL9ykHMQji1GnwZQek3qq1UbuDRN PiovUwi6gSmAbofeeNb6aXW/PPex8JhLjjmOHzwc2GkWuMFnDlNNHTRyB6Uume4kauDObE YOjopaIlOaei9C3/lRq0DjoSqhE/BFiWMCy+lnoeb2ii6h3ouIDWiRz9rPKyI/RNwefLTl +prNkg2pqfWgubgWUuJKLjUfDktiiRkW/UQPIrZ7ulG7nXj6DtDqMtlJJ/ZZw+RpSkLa1S hDZOCuJPx0tpqSbU11kBvMEJ30keTfelrAiiMemuuzMqYlwKOXU1mp8dlziV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496200; a=rsa-sha256; cv=none; b=LBuPB33vpsTKPBIG7TkQziTg95mH9+TW/GfF1cY6vT41X+kA7Cz0oiagy2OGDWRJRqWSDA 5eIMxTYn7TRmiHmTyQzfkurSc+VR1BMkLyIaSzmqHpfkqxyqmKpGDt8RG8u90ejX8V+WNS Ed8tyi8ThrwGFzo5sgaHyvY6V6FzvGWy+c6auCE/khWQvezz/+mGYDeDNl7ikfvoSQGy6P GcDVHzEUifW/HtZFQJvT5GKaxz3cBry42GcDA83an/ytgepSgHejHJPXz/2t/57mqKJ8bt SeBCCm1SbQBJOdeYsYkUr7nvTdaZhNk641dLXRvzIRrbXcf3hn0G27qwo33dPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3xpky8ZRrFi1ScpjAhYGJLg6HnStd91/KU2XrwxrKNY=; b=fjzudjX9SUJPeAKEveeTsM6Skb/fxoWpT1booFbHN57PvHhyyC4CeJ/MrYK7aI/c6Zznde gApVGC3fxhN34a/QIjSqJHu6JXgs9li4vYNu7TbcNNhPSjPGU/yX3NN9eDvWjLLYsH/i+h EFK0sMilMvKbcUsBlOFVNo5wgwELeaoyzaPtp7Rp8P/WcjLPCC2X/bNjGxY4VNo3fCpTTI I3B8zRdnelHpRGAdz9LwjRUpCljG8De6ahbIbNTKh4yIO8KX6XBGi/yRQrkGNDsRsiX6J7 4OaCPbM+NAF6gsaKVKTLsR+It0jAoHhEHv0aIKyB1cAEZgw8gFOUUP8scz0YWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XFh1Rn6zyG8; Mon, 16 Oct 2023 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GMhKSb011763; Mon, 16 Oct 2023 22:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMhKmn011760; Mon, 16 Oct 2023 22:43:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:43:20 GMT Message-Id: <202310162243.39GMhKmn011760@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: 22a6678b627b - main - acpi_pcib: Trust decoded bus range from _CRS over _BBN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22a6678b627b39ceb94f7323be1010e928d92494 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=22a6678b627b39ceb94f7323be1010e928d92494 commit 22a6678b627b39ceb94f7323be1010e928d92494 Author: John Baldwin AuthorDate: 2023-10-16 22:19:07 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:33:10 +0000 acpi_pcib: Trust decoded bus range from _CRS over _BBN Currently if _BBN doesn't match the first bus in the decoded bus range from _CRS for a Host to PCI bridge, the driver fails to attach as a defensive measure. There is now firmware in the field where these do not match, and the _BBN values are clearly wrong, so rather than failing attach, trust the range from _CRS over _BBN. Co-authored-by: Justin Gibbs Reported by: gibbs Reviewed by: imp (earlier version) Differential Revision: https://reviews.freebsd.org/D42231 --- sys/dev/acpica/acpi_pcib_acpi.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 0575b1d83bb1..02e3a0be5956 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -289,7 +289,8 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) #if defined(NEW_PCIB) && defined(PCI_RES_BUS) static int -first_decoded_bus(struct acpi_hpcib_softc *sc, rman_res_t *startp) +decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, + rman_res_t *endp) { struct resource_list_entry *rle; @@ -297,6 +298,7 @@ first_decoded_bus(struct acpi_hpcib_softc *sc, rman_res_t *startp) if (rle == NULL) return (ENXIO); *startp = rle->start; + *endp = rle->end; return (0); } #endif @@ -366,7 +368,7 @@ acpi_pcib_acpi_attach(device_t dev) u_int slot, func, busok; #if defined(NEW_PCIB) && defined(PCI_RES_BUS) struct resource *bus_res; - rman_res_t start; + rman_res_t end, start; int rid; #endif int error, domain; @@ -495,7 +497,7 @@ acpi_pcib_acpi_attach(device_t dev) * If we have a region of bus numbers, use the first * number for our bus. */ - if (first_decoded_bus(sc, &start) == 0) + if (decoded_bus_range(sc, &start, &end) == 0) sc->ap_bus = start; else { rid = 0; @@ -512,15 +514,21 @@ acpi_pcib_acpi_attach(device_t dev) } } else { /* - * Require the bus number from _BBN to match the start of any - * decoded range. + * If there is a decoded bus range, assume the bus number is + * the first value in the range. Warn if _BBN doesn't match. */ - if (first_decoded_bus(sc, &start) == 0 && sc->ap_bus != start) { - device_printf(dev, - "bus number %d does not match start of decoded range %ju\n", - sc->ap_bus, (uintmax_t)start); - pcib_host_res_free(dev, &sc->ap_host_res); - return (ENXIO); + if (decoded_bus_range(sc, &start, &end) == 0) { + if (sc->ap_bus != start) { + device_printf(dev, + "WARNING: BIOS configured bus number (%d) is " + "not within decoded bus number range " + "(%ju - %ju).\n", + sc->ap_bus, (uintmax_t)start, (uintmax_t)end); + device_printf(dev, + "Using range start (%ju) as bus number.\n", + (uintmax_t)start); + sc->ap_bus = start; + } } } #else From nobody Mon Oct 16 22:47:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM3583mz4xtHY; Mon, 16 Oct 2023 22:47: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 4S8XM34ZnVz4XsD; Mon, 16 Oct 2023 22:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1amYf8ZNR1aieQH6Rr5740T1/jLe5GmfZXMHhm21YjQ=; b=HbaCfyQeU7saCvyrFNSDZQf2Gh5014BldBGn1twYMF5A4T1g3+KORyK1pN+eAkN9w9axzD cGLTEd/cSn47DX4zQrhzoHB09KOmhRhvNeSZb03ad1ugHS5orPL7sF6z9D03OgwV2Mjn6s eLxPN9gdfrl0AU7iSKyRFpv1IolHAsb7K1sgMvOKs8erCkwSW4skYKI6CyeT5j2dTJeTKy kPv1tcCCx7f+0MhPqWDcNhw9lr+qzLTfRLNPQU6GozZVyPk7dpxBF8XoiOSwyQos5aara0 xmIeJybYHq6zZSCNRoM563qZCsddEi9U0J4G77feJZN41bWeh+dc2clIEZjokQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496479; a=rsa-sha256; cv=none; b=yltuKoFuzDk8zaKg3AQ0sGChuKGojI3XHa4kXFqgu8vZZoMsUMRbnBRzJ7DJslmrxLjJjU 3cD/2iK7U+myxEEZqto9s+edpX81udbunYasho971ygahPsatqhbYx43OfyesKfdRJdrBs nZ0Vx1KDEY3NDDbG+YRrpsCv7b5/HFxL+etWOLkmVbyn7YdbqcMyAD43PL6olBE+aXkPsG Ca7gBmWPATs+0zzjplDCnVID4mEIhRT5S1tplFdmpVILxDHoFaHxevEV++i9AXwK6bbQqU xtsoazw+OUGuBmBOFJXz6nV+pZZNdIKfJBuy00epu+du2RG85ZIqXF6NffZ0Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1amYf8ZNR1aieQH6Rr5740T1/jLe5GmfZXMHhm21YjQ=; b=I0uqxEbFfyBp/Ry1pRDmMRcX4rSZzWtbEAK2yVf4bfEHWz5wfEllzle7lfR1lIQvAX2Whe Vj87sbl9pbjlMn5Has60XVUQWnatMPg2zGnyi56OkM/fPx6IIxXxTLFUJDF2HSkP8Lr3wR bZTARQdRek8ZCtxESJlMUjEPuAiND9v77l0Ghc1cGn9wD2DyNnf2DUvhZJL40G32K1YYUX OLWvHaewkpGH3Z+esXCsOcHvy3hl/Sgv2vwZSbPbhZBIofAkEPZgAZr2pq/EutLe2RJ13i QmIcctvoo6Tn6+zbay8NQOgwHmvS/Q2ZdHexUk2xGz/o2gJd1wSAHmExHG2qng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM33cVJzydk; Mon, 16 Oct 2023 22:47: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 39GMlx40012592; Mon, 16 Oct 2023 22:47:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMlxWg012589; Mon, 16 Oct 2023 22:47:59 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:47:59 GMT Message-Id: <202310162247.39GMlxWg012589@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: 2e539c6f5aba - main - cam: Make more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e539c6f5aba657c69790d91130ceceeb0b8c38e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2e539c6f5aba657c69790d91130ceceeb0b8c38e commit 2e539c6f5aba657c69790d91130ceceeb0b8c38e Author: John Baldwin AuthorDate: 2023-10-16 22:44:46 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:44:46 +0000 cam: Make more self-contained Include in the kernel for struct malloc_type. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42205 --- sys/cam/scsi/scsi_all.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index 937a6632d3be..4842732c8169 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -24,6 +24,7 @@ #include #ifdef _KERNEL +#include #include #else #include From nobody Mon Oct 16 22:48:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM469D1z4xtL2; Mon, 16 Oct 2023 22:48: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 4S8XM45kCcz4Xsx; Mon, 16 Oct 2023 22:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=IRoEqbtZ/Wy7x4aAmQrC6GmERtXwGeFkAgJ1GKVqQfkhwzNpLcW9fG4UjbSZFZLGMvQLgL pjkZgptv+erbQHdcr/J8QrnWaO1aPly9XHg5CbxoH2XTlUitWs9eMtz5UkFmPDSbOM92o/ Nr+sc74lWgIuv4tZhZutmldvWiPsYZDnRHiB4izV3iat635xsjEtp9JFg/qQvI9F8mjzSV 3/HOPNDvy9VIjgHfsd0x3HM5fn41AWp0+oP0WZ/VmAk3a6S/EhfjGUs8Oz8wi/IYaXgyGA KjCH3etpyUYBodfcYUacgywz6sGV50nMbtteba9wqQaR2f+kQP4G8u14y4QW6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496480; a=rsa-sha256; cv=none; b=aJ0w4+kmNRC41+n56HnymAapDzeDXB2AUNxmP0ubjI4929qcppz6sqfxOB9O6ZTE/Kf46G Q5fnZAAcyKJI4UDJjpK7cSaJDSN1Pobsi/hMUVALBpZGZmydaHp/SgIsc6FR7BNhQG+fFL 7qG8GQAZ9taRq8E7lmoWfKVyKGwNzfx89qvaOLifOYe3PvPNakS5LVAYWcW1ln/rR2wOtf TC1lIqCES9gj/SLo9rCDOFKsgBB1/y0GQVQk9cVZyushbgLmxp5i6NjVsPdCJJ7oUxLY9+ M7yfz+Ar34n2jQCghSZAg4ZVCRUOSOOzxCj+6puWH1yl22jF4FBNz3oFmaSSsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6oegKRbJEmDiq9TfI4iMZWGdj++AxMH2jjbJrNGujnU=; b=MVES/rkNIcm1Cib3IX1TpU4lYAH9h+PtKECLmrMjdHlMwwps/5QNW54jqQdCAClr29wUIT WuKbqZZG1wJE0xEGIduIqs4gUtSOHX+drCBi6OjWSY8CWBAoCLP+5bhfJV89Jqeu6Xqykt jz8yBgMv6wguWF8BAxQQBWXZnM5X05Db+y93XdO80NjrXOwRXPrC8bw+/sN1Mx88vYJ6tN PFaL5KoHqKHmsYCtw7iajj0sjPSAOyPlgNIMvA3vHBCQw3FXwjD2Mz8MbiVbEjVDSPOf6d /EaAlLi1OXAf88epSeOlG08gHM2dpF3snY+fbzoA7L3yTkQnKWU6w2BiglKNxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM44YtCzygj; Mon, 16 Oct 2023 22:48: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 39GMm0OF012640; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm0nO012637; Mon, 16 Oct 2023 22:48:00 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:00 GMT Message-Id: <202310162248.39GMm0nO012637@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: 55231cd18069 - main - ctl: Make ctl.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55231cd180692c7299bff65e608dba20013ec0f7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=55231cd180692c7299bff65e608dba20013ec0f7 commit 55231cd180692c7299bff65e608dba20013ec0f7 Author: John Baldwin AuthorDate: 2023-10-16 22:45:15 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:45:15 +0000 ctl: Make ctl.h more self-contained Make MALLOC_DECLARE conditional on and forward declare several types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42206 --- sys/cam/ctl/ctl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h index 1b7d7ad4ec38..a211e249b2dc 100644 --- a/sys/cam/ctl/ctl.h +++ b/sys/cam/ctl/ctl.h @@ -129,7 +129,9 @@ typedef enum { #ifdef _KERNEL +#ifdef MALLOC_DECLARE /* from malloc.h */ MALLOC_DECLARE(M_CTL); +#endif struct ctl_page_index; @@ -137,9 +139,13 @@ struct ctl_page_index; SYSCTL_DECL(_kern_cam_ctl); #endif +struct cdev; struct ctl_lun; struct ctl_port; struct ctl_softc; +struct ctl_scsiio; +struct sbuf; +union ctl_io; /* * Put a string into an sbuf, escaping characters that are illegal or not From nobody Mon Oct 16 22:48:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM572dlz4xtdp; Mon, 16 Oct 2023 22:48: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 4S8XM56RJ0z4Xr6; Mon, 16 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGygcT7qstbk+Q+LES2DF8KLlyz9ZlbMihfcJV0Qhsg=; b=wEqrdaUVNmjL6XIYLsdmehy9fwmIlnxyRSy8MxAAXM7NjG0ImNNDckm1tcdIjIqrqHFnhM BBHeiR9zrUbcGUol/88kLzfbp2ccRq6/o3sf4p+zrORgaiGsj961ZXjsxR9EqOuhznkUZp ZJi8FJhsih9wg5gib9ksupiGFhHeM9bYh3s4IZLqV0oF+WgXaYPCSDCeQY6Y5aO7Yx5Vme m/pPd3vczBOR6Y2GKXkQtISxFr2LF3vrOmWXXB1nSZMehOuVtot8j0Ne73xpnnjsaTFP+Y OGTd+nsGv1Gf8HsBZ12IpVfpjeMBp60Ogp2/jI2VxLNqAMEnmpRvb3eF72Eu2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496481; a=rsa-sha256; cv=none; b=dHANk1IELf+j8F9v8+JfiFQqazH5OiYHvaGizL7KLqQr6t4Hsf3j/IOM3n0VjUvfeWSk1M gaNlCR1Mq1BThzSivxAMyxS0skgGIOxoqJC90Zhtww6hfS3md0k0zTYyfndUQbqRFtdpVT mmK+17NCWaNAZiMiFSFkkFRXSohVDNkkdOcSuOiLSEaN2dOzOE5Lw+V0cBfBzal6UCtDMY 0hXmMNEukZ7lanN5Xosd57UmPEecn55idECvS07pbDNAGeQm6h4IE8klfmsIW9puB9+W8x 9vbfYJhbDUHC/rOcb1TB/LKnYHALOeg0PIxDw8T40rXxoGmDuUAEmkGlSobEPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGygcT7qstbk+Q+LES2DF8KLlyz9ZlbMihfcJV0Qhsg=; b=WZoXhTp4WrcFdqu61vPm9GsrS5jleW7GuphLcNjYGttDkv0lB39oviY1Xy1YCgjbH26eNp Ij4bwsevPhGjqQ5suMNN6YBCqdB1oq3RXENW+U+PS6XvU9HsGHpOHHU+Oav0tHlfaN5wC1 nulO8q3dn2zvc08/1oTu3p5TV1y9BurtjN1Ra3h9kcMa8rhWOENencQen9NePScq5rITxM n54iBbpXNbUACp+HtSbZ/PRb/Z2qNTkNxkVVuK8AISJWwjflhtJ30ZwnujuUXFrhP2pgnp 26xA399Cd89aQCvXWOiO3kCmSMlgiFVX0cz2Uhw4o1pbfojAz8wHYScLgAWZBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM55Xt5zybf; Mon, 16 Oct 2023 22:48: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 39GMm1rn012682; Mon, 16 Oct 2023 22:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm1Ej012679; Mon, 16 Oct 2023 22:48:01 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:01 GMT Message-Id: <202310162248.39GMm1Ej012679@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: 4efebb3de39a - main - ctl: Make ctl_io.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4efebb3de39a2694169d3032fb6ca567409c2bcb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4efebb3de39a2694169d3032fb6ca567409c2bcb commit 4efebb3de39a2694169d3032fb6ca567409c2bcb Author: John Baldwin AuthorDate: 2023-10-16 22:45:43 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:45:43 +0000 ctl: Make ctl_io.h more self-contained Include for struct scsi_sense_data. Include for queue macros. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42207 --- sys/cam/ctl/ctl_io.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h index add8ed2e3ac6..115e336bd354 100644 --- a/sys/cam/ctl/ctl_io.h +++ b/sys/cam/ctl/ctl_io.h @@ -45,6 +45,9 @@ #include #endif +#include +#include + #define CTL_MAX_CDBLEN 32 /* * Uncomment this next line to enable printing out times for I/Os From nobody Mon Oct 16 22:48:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM70t1rz4xtn0; Mon, 16 Oct 2023 22:48: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 4S8XM70Kxhz4Y6Z; Mon, 16 Oct 2023 22:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBrE/uOs6oMoRgyevzEiIB0/JuGHpiiFuuh/NAQpL2A=; b=yNgz9TA89gDCXn7NlyRl+y3yIp6yGilcDYsUKbExA2MoQ0rO4uCrJ+1V2noS9Z/0CSU8gG TMRDR6vLHyaRvz8cLtGhPsqULlX5ycZiaTMc5HlqL+aCHCB+y97dn2Dj2SLk6CyuruDi3z ZP8ibyHVpB5t/H9CGrnEcN+k92lYbTnwjkbfNR7bSsEcTvDeNB/pwwvDyquG4+3nae/rqF bXmxexUUgp6Gc2UHUVe2WZykZchkdIfHjRlRPvvk3S5/rBWB4zKH8m8333r0ChD9HSc/e/ a1jpatz7A5zvZIEOdVm6NUfdzW2G0zR1EMIeu83oklYYfVBBDYdK7GhQUfVdJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496483; a=rsa-sha256; cv=none; b=WC6rAW8q34Rc50xfnXZg0qcFMrGs6TLab4Iw3aHglCI4F0IB1UnFlh12kmTpu3gEB3E0Gn 8z+OuYgTJeGck4M+CmIs/AkhedZMtfI4WG71XWFeSNIsKgltCqo8FgejQALvgxWP/pmTke NlWqMTRvzSWYGBUOcx1akzKgnkQXbNBmECTRpjXAmCgJwmX9nvtABKgdupQO57Hh92uYbP xLvIsWmw8H0YLc3JN4RhTRcoh0KZOMlx20HseoiJ4gWS/BuplZthBbt2BXe+8qyYf9Kgga ypeLZl9Y35tWA+EgSik4mxVfC8TD1aAXa/w+6edGdSWBvBrNZEPC3I8UjUcFdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EBrE/uOs6oMoRgyevzEiIB0/JuGHpiiFuuh/NAQpL2A=; b=P0s+yyC9j2D1r4rHdaKMXkK4CDuuO7IPW9qTwzJ42yAq9HsStsw9+AvRLzTbC7Z9yXH9jT UdEbVZRnVxbpcBXhDJJlZ59Q+fgp7KwhR/nhAjyfQrY1Y1BwS8pqRHrq8YACO+PI7l9CJo o8k1laIx3nkSeysoST/pw3+vi58zuLlwyTUZR5c88bXEfDt6wFYC2ud9iN5cE7BadfnAXq ISHWEQvfY7SYx5Hw9DmiUxaCaaXwRcQH2fhKB06KwrZB+lC8b0hZMjsB4y6gYoZh2bAdk/ AFMKE1HUucCGmWtKYfCEAYdZUqjAV7aHJXYxpY3taAe3INULI62KIamYNpK/VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM66YGjzyGF; Mon, 16 Oct 2023 22:48: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 39GMm2Ym012728; Mon, 16 Oct 2023 22:48:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm29j012725; Mon, 16 Oct 2023 22:48:02 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:02 GMT Message-Id: <202310162248.39GMm29j012725@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: 10b1a66934b0 - main - ctl: Make ctl_ha.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10b1a66934b0c1b252369c496952974f980441a4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10b1a66934b0c1b252369c496952974f980441a4 commit 10b1a66934b0c1b252369c496952974f980441a4 Author: John Baldwin AuthorDate: 2023-10-16 22:46:11 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:46:11 +0000 ctl: Make ctl_ha.h more self-contained Include for queue macros Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42208 --- sys/cam/ctl/ctl_ha.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/ctl/ctl_ha.h b/sys/cam/ctl/ctl_ha.h index 5a6f6502da8b..49a55e16c547 100644 --- a/sys/cam/ctl/ctl_ha.h +++ b/sys/cam/ctl/ctl_ha.h @@ -37,6 +37,8 @@ #ifndef _CTL_HA_H_ #define _CTL_HA_H_ +#include + /* * CTL High Availability Modes: * From nobody Mon Oct 16 22:48:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM81WYBz4xtn5; Mon, 16 Oct 2023 22:48: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 4S8XM80xRcz4YDH; Mon, 16 Oct 2023 22:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id7O0APIVOq29whz7bJTsHVyWAmjCtSqkyfcYXyjx6I=; b=gjOyFwdYuoWZ/gnKSbM2MgouSykjpMKdw6ookepQEZJNUYoIOWao9f3Uel+rF5w18tdlcJ iEWtAnHp03HxfgNrip6whABU7FTgqMPLEtDKmgxDbXd0FhvdMfEzHGW3leafep1v5MA+p7 iPOu5xIOzjl863urP8Ho+W6SVm2tQ2iTDW2awV1FIz2//9Xs74y41gTc+Enne+yXFjqUTM eu9VTMUNe1TuL+LqlMMshf2xyB/Dc6HdbvAaL8PEAkLc79WvJM7zyDpEdwltxdQflkMTvm poc8O1qcYo7Wm3V15F+Z0CoeGQNxHHV1XKnaeZ3K+LofIdeevK/gWWycuawyhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496484; a=rsa-sha256; cv=none; b=egpL0KC6S9/Nty/ohEA93jCpd6ndMmd+Bu16kH+YglwfFlZ82CUE9NAMNG9+X+VNdkk7A1 SDgcy6X77OQNizTzS0xin/A57xVYuvl7DjjdBjxtDTxT6aZLR401nMl1119RA5N3D1RuPn K/X07PCFNEHb7duLyCn/j9G/yDE3LlBD0Jimmj4WVb9gwN0BhMhQOYaDP7YhKmaubLSh8K EtgLdafhf85/LoJsYSEYHf0vfob0VOkPcFmnZpUCkYWbQ/POTMKLfa9oPWVanPpIzAzlFR fiTzV/zCZwZvAmQx93i/TsnWhdIbMK9Sj672zZLTu6S/hJpTPN1WDv+cIDs0+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Id7O0APIVOq29whz7bJTsHVyWAmjCtSqkyfcYXyjx6I=; b=YApE6vf3G6aPEjjBaeCxO0hzXVhaDSuzP4KjoMagp+RpHPHZW1SVXGzqkQtbD0Nv7UqOl2 WC0cC8RHYsA3MjJh85xD0+iz9D0xBIeAeVrbI7qClV+iBa4I2trh9SNiq/6JMIDT3zG4tc 8+ANwsUq5TMCTmcAGNkJwTspkLnB8JdRUDlxoucgOL5q1jWGrmVP68LpuoPXudGNAz2cWj DMr9Tt9DydsGr4oeldgT42svY6l5vLdHauiKJFkTWRUNwYS35OBYiX/FeOKa4iD6rzbyKW VKCCNdvfV7x81VrRiyAGui/8ANMoppC6y+6uo0k5u/kJ/cjWKXDJbidJbqqqCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM800dPzyQD; Mon, 16 Oct 2023 22:48: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 39GMm33G012770; Mon, 16 Oct 2023 22:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm3i9012767; Mon, 16 Oct 2023 22:48:03 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:03 GMT Message-Id: <202310162248.39GMm3i9012767@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: fc8cf0a8deb8 - main - ctl: Make ctl_private.h more self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc8cf0a8deb8908fb17acc56e96f3f700c05136d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fc8cf0a8deb8908fb17acc56e96f3f700c05136d commit fc8cf0a8deb8908fb17acc56e96f3f700c05136d Author: John Baldwin AuthorDate: 2023-10-16 22:46:43 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:46:43 +0000 ctl: Make ctl_private.h more self-contained Include for sysctl context types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42209 --- sys/cam/ctl/ctl_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h index 9a87345015fa..04846f80e913 100644 --- a/sys/cam/ctl/ctl_private.h +++ b/sys/cam/ctl/ctl_private.h @@ -41,6 +41,7 @@ #ifndef _CTL_PRIVATE_H_ #define _CTL_PRIVATE_H_ +#include #include #include #include From nobody Mon Oct 16 22:48:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XM93rTCz4xtn8; Mon, 16 Oct 2023 22:48: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 4S8XM91wyqz4YDm; Mon, 16 Oct 2023 22:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kM4dPmyTpfoDnVEq+HG8uqabUeoTbT2YneCWTpin1Q8=; b=yzIgi+rv9qU8lXjL2I3PU1N6JRKUJzb438hVedO5VHmTEfYqlaFeOcMzoLmSoPZVi0UsHq 5FznswMpRBwOkRkA3ch5YOdYv+T/YymoXBIHgu8P6mjaceHjbop4JOyXtVFr7tlStVg38d BWgii+DMQ3laBNz96XTAp0cOa9aerMlGOKqsi0U70aCQ0pzss2epDT1du2vHb4W6VVvkcp ouPIwW4UqEE8fUDJ9Tpa4qFhUZtihFvD5MAKaEcsSSXF5V+vOiwqK9VeOu+PW42DxeBRon KwtwZYF1rxmDxBcgu83XIK1iNqAp8fFlH4AYE2ekZcvdhMouHnJnjFNLI1KJOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496485; a=rsa-sha256; cv=none; b=LutcKVD253aSJA3or7NWP1ZQep+01CcLTgEsGy7bBe8hqQZSuWQbpbR1lCYehmUezeFj+d 5NbwHy3MZz+EUe7M2pAQzn4ryNwpoS77bRnVpu2Q0IVVci7cPqVERnvgu2D4fz6GxqcqD/ z6FICsjmuCTjoqwqtkqf35WPMgEahINnB5KFXetUa9Mej5TI90sMaeD8tdJNnTvpSg2YBY ttQe/vFZuZiXJ0BdLJh/p6wLPdPWTn2VzaICq3FLhJ4RNv94bFWgCtEMrdtf9aacOZk1Nj /TOAPoA3VMV473YOhMoCUfi1NS8O7U0ZdeGlGHop2nJKpOLFdNpohHWwB5qUUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kM4dPmyTpfoDnVEq+HG8uqabUeoTbT2YneCWTpin1Q8=; b=hsFkiiGufvzFOxjHUS46g6vft2AGJ0G+tiBzRck6qNm2sLhalKhyplF2n6DUeMYPSoEGlY cu//oCvGeyRc6AssOG4VKTQnhPz0Zf1EtmEUsqg/tk3XZZe113UQiN1EHFvlrWLye9eXSy ruARPZ85/ceOikSxA2Znc1m1pCbT/w+Iwc2W+5lJMs9fiTb6v5LVX07qkC2epsUf751Xst Q2XYnCGzh+VZ9pmqXDfWaUsbsRMhnLJ3TnGaGQY6DTLsmrlJ0oHCdQX+HGO4iy/h9iygNh zl1UtRQ6BPS43sllK8hn6ED8IM5VzMQFDlrLxrTl5Ru65UkZ2WUKuKA5qQC4zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XM911xFzydl; Mon, 16 Oct 2023 22:48: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 39GMm56h012819; Mon, 16 Oct 2023 22:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMm5Vq012816; Mon, 16 Oct 2023 22:48:05 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:05 GMT Message-Id: <202310162248.39GMm5Vq012816@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: e846a3e0168f - main - ctl: Use ctl_io_sbuf in ctl_process_done List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e846a3e0168f9188a6eccedd52707c63fd83cba2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e846a3e0168f9188a6eccedd52707c63fd83cba2 commit e846a3e0168f9188a6eccedd52707c63fd83cba2 Author: John Baldwin AuthorDate: 2023-10-16 22:47:09 +0000 Commit: John Baldwin CommitDate: 2023-10-16 22:47:09 +0000 ctl: Use ctl_io_sbuf in ctl_process_done This reduces a second copy of (mostly) the same code. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42210 --- sys/cam/ctl/ctl.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 6faecb0da0a4..a315c5ef7df3 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -13035,25 +13035,7 @@ ctl_process_done(union ctl_io *io) ctl_scsi_path_string(io, path_str, sizeof(path_str)); sbuf_new(&sb, str, sizeof(str), SBUF_FIXEDLEN); - sbuf_cat(&sb, path_str); - switch (io->io_hdr.io_type) { - case CTL_IO_SCSI: - ctl_scsi_command_string(&io->scsiio, NULL, &sb); - sbuf_printf(&sb, "\n"); - sbuf_cat(&sb, path_str); - sbuf_printf(&sb, "Tag: 0x%jx/%d, Prio: %d\n", - io->scsiio.tag_num, io->scsiio.tag_type, - io->scsiio.priority); - break; - case CTL_IO_TASK: - sbuf_printf(&sb, "Task Action: %d Tag: 0x%jx/%d\n", - io->taskio.task_action, - io->taskio.tag_num, io->taskio.tag_type); - break; - default: - panic("%s: Invalid CTL I/O type %d\n", - __func__, io->io_hdr.io_type); - } + ctl_io_sbuf(io, &sb); sbuf_cat(&sb, path_str); sbuf_printf(&sb, "ctl_process_done: %jd seconds\n", (intmax_t)time_uptime - io->io_hdr.start_time); From nobody Mon Oct 16 22:48:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XMW48Ktz4xtf3; Mon, 16 Oct 2023 22:48: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 4S8XMW3fmWz4ZCy; Mon, 16 Oct 2023 22:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvfwkAAjWvHu/TfEDcU5cD/CTqhKn9lbU4yj8pxmCQQ=; b=GI/rMlTDwbJfE/4iOnSlxnajaEMZEAtoZgtBa59vMr+5tNLruv83qqPETDZkm4mjGBB9Vd LtXsNzFZUelxiXjYpeF/Rt5NzJZaOOWS20kL7buCaJjbMRgQbFbOL4OBQjIbigWEaOwQzG CG47VkSOEQw62pOG96h3bFv++kvtm9Hirb3sJpMErxPziclCpGxzposSgyRU2xEHqfaDvd GetCJ5rHPnULr+NTUj0tfpGXWVebck19QtjVwIE9o8yIyRkNxCi3IdZ6OyPpdoDemKZhN0 2vTqzJiT4iCezRe82Fof46LcNrW8odCmyE4WbgREpipfS/U7eeMJLKd3I0VBOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496503; a=rsa-sha256; cv=none; b=XddiLPiVEm4eLhpCVWnoyBkc4DD2GzdjijytLuKHQKRANTCbMSG56jctlih9A/KU+cHAFH Q88te923aoIAl/YRMjG3XkLMiMqF6aqaK2nYwHppt99kvKDig616Jqpyu5JWXReN2+e/dW K8fJZkUkIyKajktQZ+o4VmFV98hgF41Y8y1lp/UTliouMX0Oa2uzgHkolyoQ/HHK0c3DVK KRD5RyPVQPFZ9sKEc5y2G441Qy4bjIMkbc1jHXDUMJnLg5hXg8QEVQ8F/3SSPUgZ+N+LRC Jtwvnbope0lQXI+fQYxadbaWmyE6DCs1g607iDUkdA7IvqAXwrqSePqFc8SeSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rvfwkAAjWvHu/TfEDcU5cD/CTqhKn9lbU4yj8pxmCQQ=; b=ry0mN7qel3o9timkzhkPEegvkgOR74i80OrK2hSLNiZH4REzyEeYo7H0pEKdgYZst1BpzY TvxPItQYWSfidJtti6qDjxfrjYtt57KQspIsFhRSd5lNkxTjXiyEAUiiH1GPsjVan2P18r CRIpj7RvrSIbxkQ20y15Mg2kCDGC8KAC2aJTh8rKqNP9EIA2AaPw+4jQVDGUFd+FFsEHTF lQVLNCFYTbEdM8ehAkml88VhFAIVas9dMXpPvSYGo/nXA2qXs9kkESaiCSEuKMTDUnK77o Iok9JTomYbeO6mLTy0Wy0niFf8dtSfW64A8y9hDvbHj6NGrINmp3VogIE2loEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XMW2h3xzyRT; Mon, 16 Oct 2023 22:48: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 39GMmNAD013016; Mon, 16 Oct 2023 22:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMmNL1013013; Mon, 16 Oct 2023 22:48:23 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:48:23 GMT Message-Id: <202310162248.39GMmNL1013013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c886dfb048f9 - releng/14.0 - tzsetup: add support for countries in two continents List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c886dfb048f9dd97d418c280d2aea1f5f4752d3e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c886dfb048f9dd97d418c280d2aea1f5f4752d3e commit c886dfb048f9dd97d418c280d2aea1f5f4752d3e Author: Pierre Pronchery AuthorDate: 2023-07-27 16:07:22 +0000 Commit: Ed Maste CommitDate: 2023-10-16 22:47:48 +0000 tzsetup: add support for countries in two continents This supports countries located across multiple continents, as per the zone1970.tab file. This only affects Cyprus and Türkiye at the moment. PR: 236874 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41306 (cherry picked from commit 914ab28c598c108bcfa5c040cc3056a8e6fc3811) (cherry picked from commit 9ef162b2392f34a88fb40b560ef700d0aacadfe1) Approved by: re (karels) --- usr.sbin/tzsetup/tzsetup.c | 67 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 6 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 5dfe840528b5..4279f888a33f 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -276,6 +276,7 @@ struct country { char *tlc; int nzones; struct continent *override; /* continent override */ + struct continent *alternate; /* extra continent */ TAILQ_HEAD(, zone) zones; dialogMenuItem *submenu; }; @@ -374,6 +375,18 @@ find_country(int lineno, const char *tlc) return (cp); } +static void +add_cont_to_country(struct country *cp, struct continent *cont) +{ + struct zone *zp; + + TAILQ_FOREACH(zp, &cp->zones, link) { + if (zp->continent == cont) + return; + } + cp->alternate = cont; +} + static void add_zone_to_country(int lineno, struct country *cp, const char *descr, const char *file, struct continent *cont) @@ -441,13 +454,13 @@ read_zones(void) struct country *cp; size_t len; char *line, *country_list, *tlc, *file, *descr; + char *p, *q; int lineno; - bool pass1; + int pass = 1; fp = fopen(path_zonetab, "r"); if (!fp) err(1, "%s", path_zonetab); - pass1 = true; again: lineno = 0; @@ -457,7 +470,9 @@ again: errx(1, "%s:%d: invalid format", path_zonetab, lineno); line[len - 1] = '\0'; - if (pass1) { + switch (pass) + { + case 1: /* * First pass: collect overrides, only looking for * single continent ones for the moment. @@ -481,7 +496,8 @@ again: cp = find_country(lineno, tlc); cp->override = cont; } - } else { + break; + case 2: /* Second pass: parse actual data */ if (line[0] == '#') continue; @@ -498,11 +514,34 @@ again: add_zone_to_country(lineno, cp, descr, file, cont); } + break; + case 3: + /* Third pass: collect multi-continent overrides */ + if (strncmp(line, "#@", strlen("#@")) != 0) + continue; + line += 2; + country_list = strsep(&line, "\t"); + /* Skip single-continent overrides */ + if (strchr(line, ',') == NULL) + continue; + while (line != NULL) { + cont = find_continent(lineno, line); + p = q = strdup(country_list); + if (p == NULL) + errx(1, "malloc failed"); + while (q != NULL) { + tlc = strsep(&q, ","); + cp = find_country(lineno, tlc); + add_cont_to_country(cp, cont); + } + free(p); + strsep(&line, ","); + } + break; } } - if (pass1) { - pass1 = false; + if (pass++ < 3) { errno = 0; rewind(fp); if (errno != 0) @@ -555,6 +594,12 @@ make_menus(void) if (zp2 == zp) zp->continent->nitems++; } + + for (i = 0; i < NCONTINENTS; i++) { + if (cp->alternate == continent_names[i].continent) { + continent_names[i].continent->nitems++; + } + } } /* @@ -611,6 +656,16 @@ make_menus(void) dmi->fire = set_zone_menu; dmi->data = cp; } + + if (cp->alternate != NULL) { + cont = cp->alternate; + dmi = &cont->menu[cont->nitems]; + memset(dmi, 0, sizeof(*dmi)); + asprintf(&dmi->prompt, "%d", ++cont->nitems); + dmi->title = cp->name; + dmi->fire = set_zone_menu; + dmi->data = cp; + } } } From nobody Mon Oct 16 22:54:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XVB0YKSz4xtxm; Mon, 16 Oct 2023 22:54: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 4S8XVB03MVz4bL2; Mon, 16 Oct 2023 22:54:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REgP9hII+L5Vk9tPumY9LvZKcAMmKI3lJVMZIW3t1PQ=; b=C/CrsqzDb+mpR26qTo59ctM30HPg2RhPfT0g2Jable270ZHCVyyUvepauMnr2yPKQIwGDW +BOaxBkje8UhspDra4EOkd3wsfBcyqfKWfhUmMdFX2XuvVB1bc5DdeL17xgpHbtCGC1DyC wvq7kFfuohAX7vGw65N16YdSvOKjOjhlNxtPG0NqJ5fyaagvxiQYyb1wKMXgh7IgbBIKYf Gt8QJMo9z9/jLhdzPVjN/Iuaz9NgabQEKn4QijjiTvsO87VnIWNgTmuNf3Y0yTCU9p/1km 88Mn/BggHsvYBmeuEDuL7Iqr+gJ0aGbAsct41OCEBHIrGP/UaocIbgXJCllg7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496850; a=rsa-sha256; cv=none; b=PethUk2xcSh0/TPHGFL1LtZR0YRb5SGXEwkteTh9V+EPBDZ1knZDnAOjTnrrs1jiqU1J4S OHjr0NW9cVrhm3+fXCLsa4YCVE74tg9bx253ydj8ieosFy+N1ntAfQB1GzKR9MKQTPJ1pQ syZjHIvhQ8ykbvf3Zo4ZEVHiAfXwgkVcep1PP6a5p19dZB9s3tj1Xv2k2FNqNT9XpTnSZe 84iEc84OdklhZmVmrHUA4yf0G9T7XGSdXpUVfJJij0OUjN9D7ajCliiW72yd9nCYjMuDaS K7v5p6qk39ofLJk+Y9tH9cupX9pNcPM54NraENFfTX6Vz3vsFA+fBFANdORA2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=REgP9hII+L5Vk9tPumY9LvZKcAMmKI3lJVMZIW3t1PQ=; b=PjS7yudowqUKLACo9/lTRev4ObjtMgmkoF6uahcOiIbSDOyKC5ENHfk17l/3pCIzs3n4I8 aBzHQIQ7pL4nsaYVyBdZwlhuC73B7FKcYoPVEMdjUvwhDORaeOysQdqXTYK0x2m8xE9O+m SW+i76Yml4O5nTXNty63Q1DpJNIbHho2+xsP6lcLwFBAEzYq+hUCtUrJgAc7UjFiCD5K9t xU5ckHiHpeTMWPYgZa6QNag3YYryA2GP76r6kAIasIStcvcstGnWJPSVra5QLr8duLeAql BhUEoeLDOLO3QrZM/EH5LV7QklHD7JV1JdMhKj2hvtM4kQdcm8T1oddoDqfdTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8XV96CNBzywM; Mon, 16 Oct 2023 22:54: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 39GMs94T029282; Mon, 16 Oct 2023 22:54:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GMs98p029279; Mon, 16 Oct 2023 22:54:09 GMT (envelope-from git) Date: Mon, 16 Oct 2023 22:54:09 GMT Message-Id: <202310162254.39GMs98p029279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7bc17b59f802 - releng/14.0 - Handle MOVED_LIBS in list-old-files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7bc17b59f802d313b72930030e20e664a1c42ea2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc17b59f802d313b72930030e20e664a1c42ea2 commit 7bc17b59f802d313b72930030e20e664a1c42ea2 Author: Ed Maste AuthorDate: 2023-10-13 18:06:58 +0000 Commit: Ed Maste CommitDate: 2023-10-16 22:48:57 +0000 Handle MOVED_LIBS in list-old-files MOVED_LIBS is used when a library moves from one directory to another, e.g. /usr/lib/libc++.so.1 to /lib/libc++.so.1. delete-old-files and delete-old-libs are two separate steps, so that old libraries can be retained until third party software packages are rebuilt or reinstalled. Having two copies of the same shared library with the same so version (as can happen when delete-old-libs hasn't been run) causes trouble. The PR below gives one example. Libraries listed in MOVED_LIBS are logically equivalent to updating a library without changing the so version, and should be removed as soon as possible. Handle them in list-old-files and thus delete-old-files. Leave them also in *-old-libs for now, in case the user updates their tree between running delete-old-files and delete-old-libs. PR: 272642 Reviewed by: dim Sponsored by: The FreeBSD Foundation Co-authored-by: Dimitry Andric Differential Revision: https://reviews.freebsd.org/D42197 (cherry picked from commit 922337e8d3989e4f54a0338b7fc397e3e0af7832) (cherry picked from commit 73099785902d750f96d07f2c413db062bf0e47bd) Approved by: re (karels) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 45d034c0002c..01d3328726bd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3306,6 +3306,7 @@ list-old-files: .PHONY @cd ${.CURDIR}; \ ${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \ -V "OLD_FILES:ts\n" -V "OLD_FILES:Musr/share/*.gz:R:ts\n" \ + -V "MOVED_LIBS:ts\n" \ ${_ALL_libcompats:@v@-V "OLD_FILES:Mlib/*.so.*:S,^lib,usr/lib$v,:ts\n"@} \ ${_ALL_libcompats:@v@-V "OLD_FILES:Musr/lib/*:S,^usr/lib,usr/lib$v,:ts\n"@} | \ sort From nobody Mon Oct 16 22:54:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8XVf11Jvz4xtsd; Mon, 16 Oct 2023 22:54:34 +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 4S8XVf0VxYz4bjB; Mon, 16 Oct 2023 22:54:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496874; 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=4fHAV5uNhTzJI6ZNoCir9qONu6vXNOdi4Gy9l6gxWZs=; b=HURR6GFu2NW2jArq7GklIQvIeo521bqUhvhlK68qWjuub5Nnlz4NI6IS04k5tWIF91UKz1 C5iMzbRsufVTBHkL9gUXnG4QG48OBO33HNcv6sBejRu7+FvVOLMPBmTduxMyCcAkj9s7Mx 3QPJbhXQLbhOtHLOliKd0zttca/AanqZr2Mlqr24Yylr6bhbutZbKHD09999QToQMYPUJt HwcjEoGyO7yeLezLMGfJdNOIkzveFpfVzQGtROKj0aqyHcstmTIHVSLLQ0vXmNbVU02evq i8p3QvrDyZmvlq3tQivCaHNfRtXomY2oRmAYpoP2qx1BfrZaRbBYjAA7y4a7sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697496874; a=rsa-sha256; cv=none; b=GO4UFBouI4qI7zjAtKXf64XtIvlyth92zo84hsLyvov7ZyJR9UdubfMxKBSuoLPnq3R2G3 NdOU5c9QXkWnl6lLq5LT7SbVt8bfgaarLKRScwrNXVl5MtD07ATtSETYd7VgNPVE83us4v sSdzQB8S7l7KfFLhPA1Tuyx85aZgQZF20JXod8ArDSRWYtjuX0q8dh/r/w51nrIQ0Uqk+Y 56TsTIyXxO3J5iGH+UcSSEqTILBnACxXoJCoc4DXNJ0hqXhdFY06//30pQ66xKrcCzmCR8 7K0u9sjr55FUdULe/qWVBy+Hwcq31HtlyucjIUvwSeVasd2SxOD49F2xOGCDsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697496874; 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=4fHAV5uNhTzJI6ZNoCir9qONu6vXNOdi4Gy9l6gxWZs=; b=IjrpgyyzHepmL44Bn6jjb3uIJZLQfrUUSdVN2FBdlJOkbfRMIi/jvnRhEGTmiRQ5B7zO9v TvBpQHnWtqzjaYSvrSJud9PZD9QDxfHYS6Zf+A5C+l5EcY+Vx7ljvXZ6vRrC49e2WSRB/4 IRRuF8KSQIdEYjBgjCR+AKEC8GCR8Tg4Op3Fd3dr7qd8BoGLpC+L4FhCl0DSO8q/uUaxZ8 XqSD6FUOdv+SZnQqnUEKkUYdr6F3mef8GkMBWkgYUCq/fK59RY6f6LcuWM4BzMnCQnX+Us XIrVnI2795LbJIjwU0hhmpAVplNBXTbiE+cl8ItA+c8UDpzB90Lgb7Fqgxw85w== Received: from [IPV6:2601:648:8683:39a0:f055:f679:76c4:bebe] (unknown [IPv6:2601:648:8683:39a0:f055:f679:76c4:bebe]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S8XVd1lyNzrlq; Mon, 16 Oct 2023 22:54:33 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <527ab884-ce06-4325-52a6-7c6dec1af563@FreeBSD.org> Date: Mon, 16 Oct 2023 15:54:32 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: git: 74e4a8d208f0 - main - pmap: add pmap_kextract(9) man page Content-Language: en-US To: Mitchell Horne , Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202310131827.39DIRXsu082741@gitrepo.freebsd.org> <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> From: John Baldwin In-Reply-To: <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/14/23 10:34 AM, Mitchell Horne wrote: > On 10/14/23 10:28, Konstantin Belousov wrote: >> On Fri, Oct 13, 2023 at 06:27:33PM +0000, Mitchell Horne wrote: >>> +.Pp >>> +.Fn vtophys >>> +is an alias for >>> +.Fn pmap_kextract >>> +and behaves identically. >>> +.Sh RETURN VALUES >>> +The >>> +.Fn pmap_kextract >>> +function will return the physical address >>> +.Pq Vt vm_paddr_t >>> +associated with the kernel virtual address >> and 'associated'? >> >> The function returns address of physical memory mapped at the supplied >> kernel virtual address. >> > > Sure, this is more accurate. I suggest tweaking this further just to be very explicit about the type of address being returned: The .Fn pmap_kextract function returns the physical address of memory mapped at the kernel virtual address .Va va . or some such. -- John Baldwin From nobody Mon Oct 16 23:05:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xkw3h5Kz4xvLR; Mon, 16 Oct 2023 23:05: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 4S8Xkw3493z4dJf; Mon, 16 Oct 2023 23:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+cGer3y/qt0B4xJCHXaY4vXzdAdMuV0KTs3VxiIZYU=; b=q+O04aDCr5YUf4jQWMitY9Df6CASJ6jvvvC0NSFHAnNRrurgvIKt7NbO+UET1XzCMQYPUr z3rs1UTNBxGYpRvRgmVsiRFPIFnI6m84Dqnx3INAzkMiFAgYgaGqwT5b8Rnx+gQEN66SVk 0pziK0I7AVzvcshi7HkZKvZbbSuUo5wY98qAWoB5mp5uwKRz1u5jRkowLVmx7oJtIuxCPp j5EjrK9O4cN1ugEA16ZBWa7PKhsOriq8znUUQhCmSEBYzEt5ZhQ8vxVNmZd++grrW27k8P r5OYhFMVDbnzHoV17O9Ish6yFrvQ07YJsXr3/wlBvmr1GYU5lLJJLb072AQrpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497512; a=rsa-sha256; cv=none; b=skJ4wdM1NejEZ2AKvuUQJpuy487WSP0yZg+rS+r2p8WRx713JgAoPI0zeXaA50ApMOUvCv EZqpco/LIMvZJqKY/3FpFQ9MfrWHUttdeOlpx1gNMyeHiLSwMYlYPlBTXmrDjpSgeaekgH rP01Ip/C55BhL8yO52t7QjkL1ULHKQNlHbrrEzExh83EU36QAJNTwJzMIn3aYL5qj8ngiE Ob7blj0vbgEThb1DIlwYUD71YRjKvJzXZat7dLemyrny0m4zu7jRR2sweggvCWJkzZIKQ+ HuNT8I6HjjCpbgO4isY8vYKyOWPKbdP6kL55HpGEAes3XQvs2qWfuqE+r8fqsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L+cGer3y/qt0B4xJCHXaY4vXzdAdMuV0KTs3VxiIZYU=; b=QxMOpVqV8uJl9aBHASvAzPnEnych+oV6x7rMWChv07ouonNTL82lrOSUjjMOg0yXWONWpN /6sqvIQ/5BG6coaSjrWy+a2ilfWdM3yb2FR3ly3rcdSaL+3yHmqBhFwhe6Ij/yHUjclV13 zs57wgOKaZ4tGbBUx4nKAVhiCjEUUAihs7Dwuhg372j6173uUyXQ7RIv4OWe1d8JvrTFqr 6Z3yq0x7zF+bWBcbp22TqEg3iFaRMDL0lC0y92YWJ7SAsBPU7hJSoiDMMOMzYSO9CP8lkF K7VFJQB/JseUOAGJNnbM3cJSS9llOB5/wkNDY6L23jUJJ/dQ98Qr9RItuY+hlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Xkw26bzz10MD; Mon, 16 Oct 2023 23:05: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 39GN5Cgx046585; Mon, 16 Oct 2023 23:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5CSO046583; Mon, 16 Oct 2023 23:05:12 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:12 GMT Message-Id: <202310162305.39GN5CSO046583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c1e05a5e1a3e - releng/14.0 - virtio_random: Pipeline fetching the data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c1e05a5e1a3e94633a050026e26211aaae59cabc Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c1e05a5e1a3e94633a050026e26211aaae59cabc commit c1e05a5e1a3e94633a050026e26211aaae59cabc Author: John-Mark Gurney AuthorDate: 2023-09-05 15:59:43 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 virtio_random: Pipeline fetching the data Queue an initial fetch of data during attach and after every read rather than synchronously fetching data and polling for completion. If data has not been returned from an previous fetch during read, just return EAGAIN rather than blocking. Co-authored-by: John Baldwin Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41656 (cherry picked from commit f1c5a2e3a625053e2b70d5b1777d849a4d9328f2) (cherry picked from commit b7f5e993476f6e445895383e73aed01741f8b9cf) Approved by: re (karels) --- sys/dev/virtio/random/virtio_random.c | 73 +++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index c02b5c98cece..d54e2e6b70d4 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -54,6 +54,8 @@ struct vtrnd_softc { struct virtqueue *vtrnd_vq; eventhandler_tag eh; bool inactive; + struct sglist *vtrnd_sg; + uint32_t *vtrnd_value; }; static int vtrnd_modevent(module_t, int, void *); @@ -67,6 +69,7 @@ static int vtrnd_negotiate_features(struct vtrnd_softc *); static int vtrnd_setup_features(struct vtrnd_softc *); static int vtrnd_alloc_virtqueue(struct vtrnd_softc *); static int vtrnd_harvest(struct vtrnd_softc *, void *, size_t *); +static void vtrnd_enqueue(struct vtrnd_softc *sc); static unsigned vtrnd_read(void *, unsigned); #define VTRND_FEATURES 0 @@ -138,12 +141,17 @@ static int vtrnd_attach(device_t dev) { struct vtrnd_softc *sc, *exp; + size_t len; int error; sc = device_get_softc(dev); sc->vtrnd_dev = dev; virtio_set_feature_desc(dev, vtrnd_feature_desc); + len = sizeof(*sc->vtrnd_value) * HARVESTSIZE; + sc->vtrnd_value = malloc_aligned(len, len, M_DEVBUF, M_WAITOK); + sc->vtrnd_sg = sglist_build(sc->vtrnd_value, len, M_WAITOK); + error = vtrnd_setup_features(sc); if (error) { device_printf(dev, "cannot setup features\n"); @@ -174,6 +182,8 @@ vtrnd_attach(device_t dev) sc->inactive = false; random_source_register(&random_vtrnd); + vtrnd_enqueue(sc); + fail: if (error) vtrnd_detach(dev); @@ -185,6 +195,7 @@ static int vtrnd_detach(device_t dev) { struct vtrnd_softc *sc; + uint32_t rdlen; sc = device_get_softc(dev); KASSERT( @@ -197,7 +208,13 @@ vtrnd_detach(device_t dev) sc->eh = NULL; } random_source_deregister(&random_vtrnd); + + /* clear the queue */ + virtqueue_poll(sc->vtrnd_vq, &rdlen); + atomic_store_explicit(&g_vtrnd_softc, NULL, memory_order_release); + sglist_free(sc->vtrnd_sg); + zfree(sc->vtrnd_value, M_DEVBUF); return (0); } @@ -251,49 +268,45 @@ vtrnd_alloc_virtqueue(struct vtrnd_softc *sc) return (virtio_alloc_virtqueues(dev, 0, 1, &vq_info)); } +static void +vtrnd_enqueue(struct vtrnd_softc *sc) +{ + struct virtqueue *vq; + int error __diagused; + + vq = sc->vtrnd_vq; + + KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); + + error = virtqueue_enqueue(vq, sc, sc->vtrnd_sg, 0, 1); + KASSERT(error == 0, ("%s: virtqueue_enqueue returned error: %d", + __func__, error)); + + virtqueue_notify(vq); +} + static int vtrnd_harvest(struct vtrnd_softc *sc, void *buf, size_t *sz) { - struct sglist_seg segs[1]; - struct sglist sg; struct virtqueue *vq; - uint32_t value[HARVESTSIZE] __aligned(sizeof(uint32_t) * HARVESTSIZE); + void *cookie; uint32_t rdlen; - int error; - - _Static_assert(sizeof(value) < PAGE_SIZE, "sglist assumption"); if (sc->inactive) return (EDEADLK); - sglist_init(&sg, 1, segs); - error = sglist_append(&sg, value, *sz); - if (error != 0) - panic("%s: sglist_append error=%d", __func__, error); - vq = sc->vtrnd_vq; - KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); - - error = virtqueue_enqueue(vq, buf, &sg, 0, 1); - if (error != 0) - return (error); - - /* - * Poll for the response, but the command is likely already - * done when we return from the notify. - */ - virtqueue_notify(vq); - virtqueue_poll(vq, &rdlen); - if (rdlen > *sz) - panic("%s: random device wrote %zu bytes beyond end of provided" - " buffer %p:%zu", __func__, (size_t)rdlen - *sz, - (void *)value, *sz); - else if (rdlen == 0) + cookie = virtqueue_dequeue(vq, &rdlen); + if (cookie == NULL) return (EAGAIN); + KASSERT(cookie == sc, ("%s: cookie mismatch", __func__)); + *sz = MIN(rdlen, *sz); - memcpy(buf, value, *sz); - explicit_bzero(value, *sz); + memcpy(buf, sc->vtrnd_value, *sz); + + vtrnd_enqueue(sc); + return (0); } From nobody Mon Oct 16 23:05:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xkx5zkgz4xv9W; Mon, 16 Oct 2023 23:05: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 4S8Xkx45Xnz4d6c; Mon, 16 Oct 2023 23:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nk7oMvslZfk1PU1Il4P5dkbBwiLrkvjcdHKlhSgL45A=; b=PN53sfxtMQcn4t/qUOemfJav0phJkRcIM/E6xF3u9X8t1riYOYhaJvIsoLCHWwEl5rJUsa BMdlvk0LQUIPGA4oVrYrh81S3T9REXfyipOiGiLxQnMqNNoA6MJL9/dkEw/7gJ3cd2w5ri Ec3HMam9CHIfTQggGpSF3JBkopU0awTgTB47SlvaZ1X4ibPOLgUI1IJawbEv1WTXGk0DHC DLo0Z4KuHS0cbLf+M8GZs4KFhNO5ap0UrldN4JX9J8efkIYGOF45+v/KrKfoJl7Rr2MjCJ 2B33+w+wrE8QAtlWbjAuDARmnqoBlfmcPw0ccN2Xx8LbB+/9aAvWlqQe3tx6XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497513; a=rsa-sha256; cv=none; b=dv9pEikhUOODiZMlqsIxeztmsIzfJFoElBKCqomnkYXPBRlzZCjeDojn1dku025B5QszOi 5CeS/siXopN/aQjtaEiqplCgsxW1+xvwP8cW8xg7NP+2OPWpMQe0JjKnGNScxiWzh0ui/z mFmaGJfQHnEt1wQrbPN49iBUlTNDRV1ceJ66mcmcMSSTLaKjXqReu1DPL5Pa7+BeZy8n8f vRMMncEVx65bO5+7w2Z+626uV8u/ldmXVjQNRQVAwhveYAGdJlDlYtxKB3+aYU0sPEJ6cP r6N9OQqCeqofKXRSm4lL/4rbV4WwvHUjpd2LI+cxrjsvb+GRTHlCoXlFQamyhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nk7oMvslZfk1PU1Il4P5dkbBwiLrkvjcdHKlhSgL45A=; b=fLklpHlAMdOUMcb7gQrUi3+PDglnCEJ6p9WaMUFp1I6A434qjJuadW/0Nm0wmoNSaypGnA ab1gWeQRrgtLT3Y4U6NpShfbEq/09wFf1NCicgv6Z0Pd+tSYR3tuhv86zQC4v77pHgiSYu H6BWDaCoQZUGcvRS+LE+vWYKQStiqpnbjSUm9ffg7vzq4GbE7N8emprfpRdXeYWHWxiMfD hsS6usSucXnzEqaMat+ORR/hVTy7bXNNM2Sl1kEj+ayQQwHAPEJD80fiY1EX6TGDUm7fBk r7Xl4yJ1CfWBSM2QKpRSUqKDCxp04LDM0cjs/kfaqlVhOCQXW0hJg4Fs39qCZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Xkx2sMQzyx7; Mon, 16 Oct 2023 23:05: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 39GN5DNl046637; Mon, 16 Oct 2023 23:05:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5D2B046634; Mon, 16 Oct 2023 23:05:13 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:13 GMT Message-Id: <202310162305.39GN5D2B046634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7ca80c7f4bf7 - releng/14.0 - gic_acpi: Limit the number of CPUs to GIC_MAXCPU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7ca80c7f4bf79c7df3d113dd857f7fe41cdeac2f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7ca80c7f4bf79c7df3d113dd857f7fe41cdeac2f commit 7ca80c7f4bf79c7df3d113dd857f7fe41cdeac2f Author: John Baldwin AuthorDate: 2023-09-09 19:13:57 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 gic_acpi: Limit the number of CPUs to GIC_MAXCPU madt_table_data contains an array of pointers for each CPU and was allocated on the stack. If MAXCPU is raised to a sufficiently large value this can overflow the kernel stack. Cap the stack growth by using GIC_MAXCPU instead as for other parts of the gicv1/v2 driver in commit a0e20c0ded1a. Suggested by: andrew Reviewed by: andrew, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41800 (cherry picked from commit d0af08c4ba3e400049d246d72401ce36d3bee98a) (cherry picked from commit b7f6b86ee7e49718ab8bf74f7a33fa8cda4d38dc) Approved by: re (karels) --- sys/arm/arm/gic_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index e18bc12faf4d..56ff78f9b685 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -84,7 +84,7 @@ EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, 0, 0, struct madt_table_data { device_t parent; ACPI_MADT_GENERIC_DISTRIBUTOR *dist; - ACPI_MADT_GENERIC_INTERRUPT *intr[MAXCPU]; + ACPI_MADT_GENERIC_INTERRUPT *intr[GIC_MAXCPU]; }; static void @@ -107,7 +107,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) break; case ACPI_MADT_TYPE_GENERIC_INTERRUPT: intr = (ACPI_MADT_GENERIC_INTERRUPT *)entry; - if (intr->CpuInterfaceNumber < MAXCPU) + if (intr->CpuInterfaceNumber < GIC_MAXCPU) madt_data->intr[intr->CpuInterfaceNumber] = intr; break; } @@ -151,7 +151,7 @@ gic_acpi_identify(driver_t *driver, device_t parent) } intr = NULL; - for (i = 0; i < MAXCPU; i++) { + for (i = 0; i < GIC_MAXCPU; i++) { if (madt_data.intr[i] != NULL) { if (intr == NULL) { intr = madt_data.intr[i]; From nobody Mon Oct 16 23:05:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xky5RRvz4xvcX; Mon, 16 Oct 2023 23:05: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 4S8Xky4sx8z4dKH; Mon, 16 Oct 2023 23:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+7BMO+YrsyWj3OqzA1fQFt1V77Dvs5Ub6O5tSde5Ezk=; b=mfEKv07ZBjtQFaFq8RtL/5sdf782vqg6TidXjDA951LCjYkFUalUsXvyUOkgVCRDThELaE TzyTuOHhj9dr0euMl1CK/d0ue3P+sW06jeo6t6fvewAqxIPgg6/qLTMpcnVg210RB6mezi +R4z3R0UeeVrJ/JfkE66LgnYIDCqxncv9JEVhS9ER++wah97mUJP6tBP6poXojT9eXGPhm 3pzRAH4mdcM+aNd2XnRM8yHtor4jV3VPdwAINUuL35aAKTLYwhbL3MCSrGapFSltCIBnyx ml+ouOyFxytc2U8PWwa16EqvLX3RPTJo6AH5LWCK6ttY/A3GvLGfHas2voiH7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497514; a=rsa-sha256; cv=none; b=lY7IdKv4prhquENUZJar1puS/D0f29Lc5LZIMvVT2/vQu0CP7UuirHzaLjj/BG1uys6Lh2 ytFQum/sJkycWKzNcahvwpJAUU5qh6vZNbnFGfaSLk8FlRLU3iIAN7YZ77FDuGN+11FRpp 8jXo3jyBODCYPRDk1cBitr0JW+T2LiUzfG01cXDn5NVKqhCi9yZ0wZZ59PaklEwKBS6hBe gCu9ozI50d4xRlkHypo2erDJF9lHw+GkASjQLVvO1zj/EA+zvm7qupNZJCzYcL20zDJVWT UaWjWctsPwvNlkpw31p3L4kT2LeQmx2u1wcZLOhMJSkGSCQ0Dr74eo5kHbnGzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+7BMO+YrsyWj3OqzA1fQFt1V77Dvs5Ub6O5tSde5Ezk=; b=SHxSOTNnHUPPkN2hvsL8DpR90nkcO2t1eIvlHJku6qjcKjGjMxMI7llOkhE7adi11QplbN RYY9Y0r1R0yyGxbWnoCt+sq3zLENBlb66WXrmumTp1r+Ilc/ljlfHtBzFXaZwhbTpVcthM BZfzebSaPaFn1ZRagoQwX8gqNjD6Equ1rMCTXteHLqZBZg21IXd5Sq0I9lJfBBIFZt0gS3 sqI1Pj5Z0sbgxWTHMzC9L8wPEOGguMVItWZAQa26BlnYKXHaxatUs9O725av/qQmTrMk/D /4edZt1HqMlVFGAQerwlfAmNNnnqKleJ4md1Ce6fBFr4s79e8XP2LgKeqdwu5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Xky3yn6zyx8; Mon, 16 Oct 2023 23:05: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 39GN5ERb046694; Mon, 16 Oct 2023 23:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5EGp046691; Mon, 16 Oct 2023 23:05:14 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:14 GMT Message-Id: <202310162305.39GN5EGp046691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7916bb5cdf86 - releng/14.0 - cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7916bb5cdf86d01f4e4c5049260af64ac02534d4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7916bb5cdf86d01f4e4c5049260af64ac02534d4 commit 7916bb5cdf86d01f4e4c5049260af64ac02534d4 Author: John Baldwin AuthorDate: 2023-09-08 23:30:35 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits In particular, the kernel RPC layer used by the NFS client never invokes pru_rcvd since it always reads data from the socket upcall via MSG_SOCALLBCK which avoids calling pru_rcvd. As a result, on an NFS client connection managed by t4_tom, RX credits were never returned to the TOE connection to open the TCP window resulting in connection hangs. To fix, expand the set of conditions in do_rx_data where RX credits are returned to match those in t4_rcvd_locked by calling the function directly. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41688 (cherry picked from commit dcfddc8dc091e7688abc8488a0307eba425fa7a2) (cherry picked from commit bd8cecc466adeca0763cca674f83bfcc3a751356) Approved by: re (karels) --- sys/dev/cxgbe/tom/t4_cpl_io.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 9b48b2891f64..235d4196226d 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1647,7 +1647,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct socket *so; struct sockbuf *sb; struct epoch_tracker et; - int len, rx_credits; + int len; uint32_t ddp_placed = 0; if (__predict_false(toep->flags & TPF_SYNQE)) { @@ -1779,12 +1779,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) } sbappendstream_locked(sb, m, 0); - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(sc, toep, rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } + t4_rcvd_locked(&toep->td->tod, tp); if (ulp_mode(toep) == ULP_MODE_TCPDDP && toep->ddp.waiting_count > 0 && sbavail(sb) != 0) { From nobody Mon Oct 16 23:05:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xkz6NMBz4xv9b; Mon, 16 Oct 2023 23:05: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 4S8Xkz5zGMz4dkZ; Mon, 16 Oct 2023 23:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NxCGW+PA8SsjQvzgpF486538AqlLlJmXJGw2VeaRo24=; b=BuUijGRPkKcH0LAV+MkuU/py3l00vm8HkKWYIqdFdDhXPxNarL1V4ZVwxJG0fqzBX1I3Af 2y+KIqmtbK5LSuY4JJ1fkwuaKPR3bS1dck8VS/B1cqWDF0X2vawrWPEGS+fm1Ugz62/mmJ n+OxvUAomQTq5RjSjAItnFckcgvuLNth34h5DinwMrQWs+MdM62uMdoCcLDJfuxMbWBuxd ijt+B4ZeuYb5o1f65Jl/g9QEeeVDUBrJuyKIcXTv/akFXzDB3TqgzDLnIFd9iIQmblOzIW +NC/bCtKGzFsb54nOb1U2O2hZnz1u3m8VVH56635vYX7barmXszpAjsimzrsaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497515; a=rsa-sha256; cv=none; b=UWU0NfMhvuy7PgzM8aU8hNUNn+jzcvlIPxmxlZolvbASKpwy4fHDayhv70G5eFlMZhgQ5m toUtuBT38u7qkLbuQsUB2n2Bk+PR3f5IdnuJ3XSiSJ1DpoVVpYvl+5SmVDtv3z3iWYC+yl AeXMMcjP8AZEl1wcYBjCLm2a+Px+nS4OoDbD1WEZpiSDmWz50OvvNyrToEGCc+Z9H+bNbX hNAmMpTazRjmoqWd7c7olPvuhqi0APabYZitLsnvcR3OWKWXEVKIuHdypO3bWYFzXu4a+J qTph65kdjiGScgutCZNtv/SglDgZho5DcwIoH0IL3wk6cB8QVio2XVgRr66c9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NxCGW+PA8SsjQvzgpF486538AqlLlJmXJGw2VeaRo24=; b=iHg61V9u6jlXFwHs13OSYbwMD4+gq6BIuVx+CUZDqo37EbMQBBa8J02xHBeyaSNn/37SnQ bUqha+a8tYQ9fD5WFGb1AsRxF4c6BST0D7WYcJ70OEEbojD8WCvNpITsiMcCpxHFKMRrgg zG+qVtcwjMU5u46AWZr91bE13NfSITmKaU67q/kIA/7cAKp//cIAeIIdbhB6WOu1+Qfb/W Jy4YE61QsXbBQkA8NnQeJG23pw45lsCBGe2tIYtgucngbchyknINiwtuk25Sm60O3/Acxd hWB6pj0+9dgEKrV+3HghrbQ0Bgi6BddZStAZGJ6jkgWFPDmFeBHtWOilazVa5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Xkz4r4Vz100f; Mon, 16 Oct 2023 23:05: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 39GN5Flb046761; Mon, 16 Oct 2023 23:05:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5FnP046758; Mon, 16 Oct 2023 23:05:15 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:15 GMT Message-Id: <202310162305.39GN5FnP046758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f0441866442d - releng/14.0 - cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f0441866442d00aeb6a2e834b572430d679a5ca7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f0441866442d00aeb6a2e834b572430d679a5ca7 commit f0441866442d00aeb6a2e834b572430d679a5ca7 Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41689 (cherry picked from commit 75af2d951cce7d51d2033405f96f083c01f39f04) (cherry picked from commit cb2cd58dbd56f734f4346ce4db3d0412b2809667) Approved by: re (karels) --- sys/dev/cxgbe/tom/t4_tls.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index b8005e213621..29a840067c62 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -1004,7 +1004,7 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, struct tcpcb *tp; struct socket *so; struct sockbuf *sb; - int len, rx_credits; + int len; len = m->m_pkthdr.len; @@ -1075,22 +1075,6 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, so->so_error = EBADMSG; out: - /* - * This connection is going to die anyway, so probably don't - * need to bother with returning credits. - */ - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; -#ifdef VERBOSE_TRACES - CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u", - __func__, toep->tid, rx_credits, tp->rcv_wnd); -#endif - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(toep->vi->adapter, toep, - rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } - sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb); From nobody Mon Oct 16 23:05:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xl10BQxz4xvK0; Mon, 16 Oct 2023 23:05: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 4S8Xl06ZFbz4dn8; Mon, 16 Oct 2023 23:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXp1aXif6v9zYUc0GdQfAmX3g27kkoZS+IYLgvyNFRM=; b=yN8/XaWHMouY1O0dV9g7QI3SjXvrKAYdRNj/15R8X6bq1BacJZ0fPzf+NyH1QnoLfs7D1I 7Fsjnt+fg+8HW4jUPofrc1Yq/EACGt92P6CGgf7u9GP6GRU1Amm1dWGWwERX2OkVecTlc4 jIHLNBQ2PAgyu3crYBUHq0law2rIPLa+uhAJB/6FHzZc4IbrEr7AvIv32ke5X9WuOGHeZs QQ4IT5M1KVfIhU1CDKkYCcASFpki7xi8A+tPB4R4vaKgJEQbs1InOoCpwikZ/nqRqRuPVM q4cOQO3V3sEDOlch/gQM4qgn6wV2Poz/PlhyPvf1PYHJkewuNP+SgEGIIv93Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497516; a=rsa-sha256; cv=none; b=huAkW07PHpiWaKwD1WsL26r+aga4koVOKHs9kBszlnVYenAawehd694nHyUFg4ilrkt/Y1 S3JgJWAIIfI9AheMukLw7F7wi6rYqKzULeHww+Ewz+mdWWhat5iBlqx4XTBfjPnv5HbiaM Byd4Udxze9JBWTU2TA9Lq5Q0oNXIHXwP4+pbImUYbNzIVXWDZlP79PfVZyf61XedDkoEbc eq7WLg2QsDkG6kx0UrfLXK4oMPlTvLkI2ZOHJSvGD2PmPDdXw9a5DQtM6YcFhvCt6MV8mK nN6o+czDzFTCXUQKVF7OlBuMl8O6f3LA48c6s+FUKz30Td0buOBSwNo8QeKaKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXp1aXif6v9zYUc0GdQfAmX3g27kkoZS+IYLgvyNFRM=; b=XhA+C1T8Dh5XttPcNJELHINAeVzXT3/3itlZ8UsTxMFmhqasRIZ71EbEYRJmaAA1KhUxWL w6QFjDZyYb4/nSqtU82PX2j95L7lBledWweA5dUYem5O66cfH3/EnXreiwznP5oaYbRbzm 1u33Puqt/E9BiqTpVanHPQw9aE6Q3e6+jjf+0vnziauy8w315xHCHsQIi25S8Ruf/35/9D Xn1yl+qjal7TGaV0dv6fwsz7NH++XEYD/gAUo5B/1fV0o7LW6oqXv8COhvoj4HDEVRnH7j NV9uPESL/m7gHm9Q+J+9758Hzif+XObb/mtbtHsAtJ8evB0+OH6OrRTfq1HPPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8Xl05bmPz10MF; Mon, 16 Oct 2023 23:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GN5GDf046813; Mon, 16 Oct 2023 23:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5GnP046810; Mon, 16 Oct 2023 23:05:16 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:16 GMT Message-Id: <202310162305.39GN5GnP046810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5c855665a04e - releng/14.0 - cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5c855665a04ea950bc98e92f3a78f2a4d9988a3d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5c855665a04ea950bc98e92f3a78f2a4d9988a3d commit 5c855665a04ea950bc98e92f3a78f2a4d9988a3d Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp Similar to dcfddc8dc091e7688abc8488a0307eba425fa7a2, replace the simpler, inlined version with the full version. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41690 (cherry picked from commit 897e564361624411c4e557e0817642e1477f0af4) (cherry picked from commit 969dc06e919ca135fdbf5c9a760684c357ae9310) Approved by: re (karels) --- sys/dev/cxgbe/tom/t4_tls.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 29a840067c62..3a0c1a392e6c 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -794,7 +794,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct mbuf *tls_data; struct tls_get_record *tgr; struct mbuf *control; - int pdu_length, rx_credits, trailer_len; + int pdu_length, trailer_len; #if defined(KTR) || defined(INVARIANTS) int len; #endif @@ -975,16 +975,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) sbappendcontrol_locked(sb, m, control, 0); else sbappendstream_locked(sb, m, 0); - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; -#ifdef VERBOSE_TRACES - CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u", - __func__, tid, rx_credits, tp->rcv_wnd); -#endif - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(sc, toep, rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } + t4_rcvd_locked(&toep->td->tod, tp); sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb); From nobody Mon Oct 16 23:05:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8Xl22Mqfz4xvK2; Mon, 16 Oct 2023 23:05: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 4S8Xl20dWcz4dg9; Mon, 16 Oct 2023 23:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M53nAVU2qwADAEVOz6PBUaA5aHUJ7F4m6IcvsbYmoAM=; b=JEnFCiIcCdRpLsFb7XlnxlGXdCLXnz46aAO3s2NuyH/Jupss2eWyDLFpZPFALyu1Fw7tix tLnjvErEERTRhPwdfGl3Q+xDIedszLOYq63ie31SxnE878+O310E3Bu70kN8cNNM+op6vr ZYiGGiDBKPpUOGeUFfRrA3oWMfnDV2nS7oeV8y7FzM3060CY894iM3goDQcXhsqY6cKUif ANCuGbgEv5Jivet57wgmPH/0aDGWT2bJV37obcR7UzqMdxIE3em+vB2AkWpn17CDXVFqC6 T57/qHqI27Azhh+rO/Q0WKxTk18dTuZm3mgxaB/7oB/3GJ2saa6EZqAtc46C7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697497518; a=rsa-sha256; cv=none; b=fQayEqs3tC41J/1cvyweMO89c/x1J7LgBu0muqI4S4t4WcvfvpT5Cnx/kYetfPUZeg6fFi Xx5P/WNEigAq9fNbxZxz2IcZnZ6mCrArKctaT1GMttJRK26MSKYHxmhNxmnGT7fuZPNz7O jJc84eXqwIwUfoQr0z5NJB6D+4WdXnBX2HXK8C2jn1pDZYb8JnCZuHrjAIZ5nOmYxaqIpN zO5H0AC0pkkeAZaF3/pd+j2VQQj89gqMOwK4AMtj9GH2V4hu8eWwZG5NtF7Gd4jrCGheYY Vt/jQo6X6zTFGcRqR/G3iJ+8FiHdymQ9EOUbIBr4isrikFnqu2/TPTaYVRD3lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697497518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M53nAVU2qwADAEVOz6PBUaA5aHUJ7F4m6IcvsbYmoAM=; b=hUjaPttxvF0zhofa8F18vrYr6tvTIp6K9F1IaecoKUdfrG96XQOSsyBVTjZRuYDERg+l8+ 8Hm+qo9VaagjXKhBKXn4QeDZXkkFtZvJgBya+rqPIfC0eod+F3pgFMW/WiilApFc/2bj+g 8TfSZfBo2wMiXW5gblXT+XkRvNpNqPQzrdiGtD5zvvKaxkV5KoAWvy6L9bjDqkCs1Kmcdk 4FeZxkmERYqTbLOVvxrkzUR36cvX51ruw3t+mBSiSkm1ItUUh0ugt5l973AbxoUXHfQvTx jsAOzylnbBPhp8+1Uul32O6TCBDWNiLphi+iHlFrcS9soSP9NP+EDFUwpyqe+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 4S8Xl16qklz10B9; Mon, 16 Oct 2023 23:05: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 39GN5HSk046861; Mon, 16 Oct 2023 23:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GN5HTf046858; Mon, 16 Oct 2023 23:05:17 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:05:17 GMT Message-Id: <202310162305.39GN5HTf046858@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9851b24ed4fa - releng/14.0 - x86: Properly align interrupt vectors for MSI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9851b24ed4fa571ae3b931f834d21b9f800db9e9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9851b24ed4fa571ae3b931f834d21b9f800db9e9 commit 9851b24ed4fa571ae3b931f834d21b9f800db9e9 Author: John Hay AuthorDate: 2023-09-28 21:08:08 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:04:33 +0000 x86: Properly align interrupt vectors for MSI MSI (not MSI-X) interrupt vectors must be allocated in groups that are powers of 2, and the block of IDT vectors must be aligned to the size of the request. The code in native_apic_alloc_vectors() does an alignment check in the loop: if ((vector & (align - 1)) != 0) continue; first = vector; But it adds APIC_IO_INTS to the value it returns: return (first + APIC_IO_INTS); The problem is that APIC_IO_INTS is not a multiple of 32. It is 48: As a result, a request for 32 vectors (the max supported by MSI), was not always aligned. To fix, check the alignment of 'vector + APIC_IO_INTS' in the loop. PR: 274074 Reviewed by: jhb (cherry picked from commit d33a4ae8ba5343f555842e6e32321f9cd64dfd09) (cherry picked from commit d73b4f06403af6c1a384c8c59ba9eb138c861ee1) Approved by: re (karels) --- sys/x86/x86/local_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 17b0223f834b..b382368cc626 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -1582,7 +1582,7 @@ apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align) /* Start a new run if run == 0 and vector is aligned. */ if (run == 0) { - if ((vector & (align - 1)) != 0) + if (((vector + APIC_IO_INTS) & (align - 1)) != 0) continue; first = vector; } From nobody Mon Oct 16 23:32:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLB6GkWz4whjP; Mon, 16 Oct 2023 23: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 4S8YLB5q5Pz3Flr; Mon, 16 Oct 2023 23:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8KNXyI1axLvTYJm+br7LFfB3/KDXweLPeH6KHcC2Lc=; b=YAWRFTS9v4xit+adh4r0+7X2ygODLLwhXDueWpTeTOSNdIR4M6YUM6jidOe2zkfHBWQESR csc5IsR4aKZdR9fdelSHi00B2ZGw26EYSD3JSqdYvvWXwRD2L+Vf7Gkg9IiOgyEgNmiRx1 9E/ocX523ZWPhB3qfLdGIKUJpIiSmzJLUbfgxBQ6qI3vIvsT33NxprA3zaer9g+WyZMIlU NX9J1NSOPdIgLpcaLRJWVH5U+AjS6myDmZ5qO0jTOE2bN71D+AUaW+NKUUsGx8GnJEZFqn UgVIE3zFCAgTD3v+pxekBYt0urjZ2OQ7IszanBXNY+/E4htAMLSpU/PWpfk7SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499138; a=rsa-sha256; cv=none; b=WFjIi4kUHfZgJ4LfMyTzyX1pp7O/VJo3L7KU2Cxn9crcL5mpQmk2GY/EH6Wk8D8RYqkOcA cG5J/i3/vxtxhf5SdPOPTavoGAxM2Iqg4RDdirqllxK4ZMJmAPK8ipvW989RKpAQiOYlXl UqFg4lzHvPPmI4xi4jJJ/CrfRU1Z2HFxWkgfHO0NS8mmv8C6HZeWPSp/ucqAjDpEvFMRcU jYljl1IHepg/z1q20fD8YU3qPQm8TIjWEMMBdDt2MhRdQ3XVZ/dD8KFwTszNvKfP1L1xEw iRQKE4fchJcw73O66XoyEmMg+2Acct2H9N4CWy8/Rya6N8FWG2ooU+glLZkQHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8KNXyI1axLvTYJm+br7LFfB3/KDXweLPeH6KHcC2Lc=; b=j6juJcCJ6oX1oLtv7i3o3HTbfcZLnc2wwylu2YkTOpkD6yjVB2Ye4M3xq3dL1MZoZNV1E/ qq+mPeBKH+77H/4k5NV8VhOWvwqwXtzXjxzcxKCNe2D9Hxx4pVA7LIC3RNqVT2kXge6ytn gwNo4WtLGQDTwOuei/wWIPYNsRanIw7wK2lN9oheJNEBRe2nD61bkRS66PpqL1w3zLJtgl Y1+m1HsQsh6zWyHINE+AD/PqJCGxzfv4S1AMrjFxins0xMFafH6P93XwCM1js40ohYVCXW LuEmNMbWHVBXKTzyqBqFw3DPtsbPaUMNVNUsVpfBn/sUuGChnb9XB9p+yyGf8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLB4v8Vz10qH; Mon, 16 Oct 2023 23: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 39GNWIgM094648; Mon, 16 Oct 2023 23: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 39GNWIZR094645; Mon, 16 Oct 2023 23:32:18 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:18 GMT Message-Id: <202310162332.39GNWIZR094645@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: ae2fc74fe76c - main - bsdinstall partedit: Avoid potential buffer overflow in newfs_command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 commit ae2fc74fe76ca8b89c5ef0081ef3f4008f83de41 Author: John Baldwin AuthorDate: 2023-10-16 23:25:03 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:03 +0000 bsdinstall partedit: Avoid potential buffer overflow in newfs_command Allocate the buffer holding the newfs command string dynamically (building the string via open_memstream) rather than storing the command into a caller-supplied buffer of unknown length. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42237 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 68 +++++++++++++++++++------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index b1d4d0f23315..7f34819a3d4d 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -86,12 +86,16 @@ scheme_supports_labels(const char *scheme) return (0); } -static void -newfs_command(const char *fstype, char *command, int use_default) +static char * +newfs_command(const char *fstype, int use_default) { struct bsddialog_conf conf; + FILE *fp; + char *buf; + size_t len; bsddialog_initconf(&conf); + fp = open_memstream(&buf, &len); if (strcmp(fstype, "freebsd-ufs") == 0) { int i; @@ -115,21 +119,21 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_checklist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "newfs "); + fputs("newfs ", fp); for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "UFS1") == 0) - strcat(command, "-O1 "); + fputs("-O1 ", fp); else if (strcmp(items[i].name, "SU") == 0) - strcat(command, "-U "); + fputs("-U ", fp); else if (strcmp(items[i].name, "SUJ") == 0) - strcat(command, "-j "); + fputs("-j ", fp); else if (strcmp(items[i].name, "TRIM") == 0) - strcat(command, "-t "); + fputs("-t ", fp); } } else if (strcmp(fstype, "freebsd-zfs") == 0) { int i; @@ -153,30 +157,31 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_checklist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "zpool create -f -m none "); + fputs("zpool create -f -m none ", fp); if (getenv("BSDINSTALL_TMPBOOT") != NULL) { char zfsboot_path[MAXPATHLEN]; + snprintf(zfsboot_path, sizeof(zfsboot_path), "%s/zfs", getenv("BSDINSTALL_TMPBOOT")); mkdir(zfsboot_path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); - sprintf(command, "%s -o cachefile=%s/zpool.cache ", - command, zfsboot_path); + fprintf(fp, " -o cachefile=%s/zpool.cache ", + zfsboot_path); } for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "fletcher4") == 0) - strcat(command, "-O checksum=fletcher4 "); + fputs("-O checksum=fletcher4 ", fp); else if (strcmp(items[i].name, "fletcher2") == 0) - strcat(command, "-O checksum=fletcher2 "); + fputs("-O checksum=fletcher2 ", fp); else if (strcmp(items[i].name, "sha256") == 0) - strcat(command, "-O checksum=sha256 "); + fputs("-O checksum=sha256 ", fp); else if (strcmp(items[i].name, "atime") == 0) - strcat(command, "-O atime=off "); + fputs("-O atime=off ", fp); } } else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0 || strcmp(fstype, "ms-basic-data") == 0) { @@ -196,19 +201,19 @@ newfs_command(const char *fstype, char *command, int use_default) choice = bsddialog_radiolist(&conf, "", 0, 0, 0, nitems(items), items, NULL); if (choice == BSDDIALOG_CANCEL) - return; + goto out; } - strcpy(command, "newfs_msdos "); + fputs("newfs_msdos ", fp); for (i = 0; i < (int)nitems(items); i++) { if (items[i].on == false) continue; if (strcmp(items[i].name, "FAT32") == 0) - strcat(command, "-F 32 -c 1"); + fputs("-F 32 -c 1", fp); else if (strcmp(items[i].name, "FAT16") == 0) - strcat(command, "-F 16 "); + fputs("-F 16 ", fp); else if (strcmp(items[i].name, "FAT12") == 0) - strcat(command, "-F 12 "); + fputs("-F 12 ", fp); } } else { if (!use_default) { @@ -216,8 +221,11 @@ newfs_command(const char *fstype, char *command, int use_default) bsddialog_msgbox(&conf, "No configurable options exist " "for this filesystem.", 0, 0); } - command[0] = '\0'; } + +out: + fclose(fp); + return (buf); } const char * @@ -539,7 +547,7 @@ gpart_edit(struct gprovider *pp) const char *errstr, *oldtype, *scheme; struct partition_metadata *md; char sizestr[32]; - char newfs[255]; + char *newfs; intmax_t idx; int hadlabel, choice, nitems; unsigned i; @@ -687,10 +695,11 @@ editpart: } gctl_free(r); - newfs_command(items[0].value, newfs, 1); + newfs = newfs_command(items[0].value, 1); set_default_part_metadata(pp->lg_name, scheme, items[0].value, items[2].value, (strcmp(oldtype, items[0].value) != 0) ? newfs : NULL); + free(newfs); endedit: if (strcmp(oldtype, items[0].value) != 0 && cp != NULL) @@ -1022,7 +1031,7 @@ gpart_create(struct gprovider *pp, const char *default_type, struct ggeom *geom; const char *errstr, *scheme; char sizestr[32], startstr[32], output[64], *newpartname; - char newfs[255], options_fstype[64]; + char *newfs, options_fstype[64]; intmax_t maxsize, size, sector, firstfree, stripe; uint64_t bytes; int nitems, choice, junk; @@ -1123,7 +1132,7 @@ gpart_create(struct gprovider *pp, const char *default_type, /* Default options */ strncpy(options_fstype, items[0].init, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 1); + newfs = newfs_command(options_fstype, 1); init_allocated = false; addpartform: @@ -1142,9 +1151,10 @@ addpartform: case BSDDIALOG_CANCEL: return; case BSDDIALOG_EXTRA: /* Options */ + free(newfs); strncpy(options_fstype, items[0].value, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 0); + newfs = newfs_command(options_fstype, 0); for (i = 0; i < nitems(items); i++) { if (init_allocated) free((char*)items[i].init); @@ -1166,8 +1176,9 @@ addpartform: * their choices in favor of the new filesystem's defaults. */ if (strcmp(options_fstype, items[0].value) != 0) { + free(newfs); strncpy(options_fstype, items[0].value, sizeof(options_fstype)); - newfs_command(options_fstype, newfs, 1); + newfs = newfs_command(options_fstype, 1); } size = maxsize; @@ -1319,6 +1330,7 @@ addpartform: else set_default_part_metadata(newpartname, scheme, items[0].value, items[2].value, newfs); + free(newfs); for (i = 0; i < nitems(items); i++) { if (items[i].value != NULL) { From nobody Mon Oct 16 23:32:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLD0hY1z4whgV; Mon, 16 Oct 2023 23: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 4S8YLC6mf1z3Fry; Mon, 16 Oct 2023 23: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=1697499140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IHlS5k76PpDKsHgmJpX567709ZRC3fNEthkwou15m4=; b=nR87H99Kz1uZxCeH4jSugIQnYfEyviYYbmogtEj/IrePgeOAobVSCjiQ9fegdH6oBQ1io1 EAOMHNh27XunktWUUF3w/Dai5PS9s/dI6aWaT701t2z1ZKJdNn03EtcgZAB0rW09DmmpsG cBJtlbnBXtJzGL+5vYlnwSSYqccS3W9AhuLioXISZ7N6Rvg4G2w5aa1DmiiGcC/GsEH8FP MhPY+8aJYwDuWm0n941BL/nNlHr2tou+MVQHcrcEm6Re1h5bZ7ChzxGyQG5sF+mEQzPPtk +1jlALXslik6Zr/pD92mxkY4z4cG0gCB0yJbveYoV1Iqa9Tk8RxJIHOrIt/gNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499140; a=rsa-sha256; cv=none; b=A8uE9KPQ20NHJpl+QIOJJ+PT77bI8IBMloLLLLSkUDjvOe3VNYSVkSiSUJrPvh4jr2kHDV ReY8c8pxyoie42lIc9S9St/yQYiyHU6vAlz3sU6miex2pALdF/svmarKKM1VpaQzKAbx05 gyv4cUP1ql0r9J5mDwn0bFNWXdBt2KlMMCOWKIoqS6lsmUIMuTDKKiCXvRazK795MSvRqO dKg5LZW157YucbQpzR4QzrkPtZ2Qhz7K1WMd/VWl38e1SWHtjs7TIHowYgBqpeGiV8UNxW mGXUkee5jg45RnCZ3of0tKC6VVxb3+6qGyw+aDTwDK6V5W5UFUIVNh4xRX0dgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0IHlS5k76PpDKsHgmJpX567709ZRC3fNEthkwou15m4=; b=kml6q2pYul8W7rgvrq+sSvAR1GRFz8BqprpCsCtlCf2kbIRRUwFTMnBpHoa6xY4I7M/tRs y8Hxk41Iyb3+npxeL+iekJft/d188+TWHGJvXnRAl033vXC/PPmrMAGuAOSCb8hyW7284f l6waM4g2+8Q9GKhU3cRO8Y1l31KjSVcK8Cb5QczMOXiFVPgW/anhD4Gcwwbntk+tk4O60F 0M/u09oPbiw1iNE9MLIZY07XXRCcZPfOqLvZxJljLC5y9P5yfjxbgY9J2V4xpbmQKMivrU m9ovX/UbE6++MY3REp7JfZxKAC6yB6Gl3JKOj8mfOxfXi3+tQAFezSwqGHesSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLC5Xwbz118T; Mon, 16 Oct 2023 23:32: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 39GNWJcb094699; Mon, 16 Oct 2023 23:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GNWJEO094696; Mon, 16 Oct 2023 23:32:19 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:19 GMT Message-Id: <202310162332.39GNWJEO094696@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: 51749e05e96e - main - bsdinstall partedit: Replace malloc + sprintf with asprintf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51749e05e96eb07134a38984a8c06608b20f07ea Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=51749e05e96eb07134a38984a8c06608b20f07ea commit 51749e05e96eb07134a38984a8c06608b20f07ea Author: John Baldwin AuthorDate: 2023-10-16 23:25:15 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:15 +0000 bsdinstall partedit: Replace malloc + sprintf with asprintf This avoids potential bugs with the length passed to malloc not matching the string written via sprintf. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42238 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 10 +++------- usr.sbin/bsdinstall/partedit/partedit.c | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 7f34819a3d4d..7395030b26aa 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -732,18 +732,16 @@ set_default_part_metadata(const char *name, const char *scheme, } if (newfs != NULL && newfs[0] != '\0') { - md->newfs = malloc(strlen(newfs) + strlen(" /dev/") + - strlen(mountpoint) + 5 + strlen(name) + 1); if (strcmp("freebsd-zfs", type) == 0) { zpool_name = strdup((strlen(mountpoint) == 1) ? "root" : &mountpoint[1]); for (i = 0; zpool_name[i] != 0; i++) if (!isalnum(zpool_name[i])) zpool_name[i] = '_'; - sprintf(md->newfs, "%s %s /dev/%s", newfs, + asprintf(&md->newfs, "%s %s /dev/%s", newfs, zpool_name, name); } else { - sprintf(md->newfs, "%s /dev/%s", newfs, name); + asprintf(&md->newfs, "%s /dev/%s", newfs, name); } } } @@ -780,9 +778,7 @@ set_default_part_metadata(const char *name, const char *scheme, if (strcmp("freebsd-zfs", type) == 0) { md->fstab->fs_spec = strdup(zpool_name); } else { - md->fstab->fs_spec = malloc(strlen(name) + - strlen("/dev/") + 1); - sprintf(md->fstab->fs_spec, "/dev/%s", name); + asprintf(&md->fstab->fs_spec, "/dev/%s", name); } md->fstab->fs_file = strdup(mountpoint); /* Get VFS from text after freebsd-, if possible */ diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index bb2580789fe8..b6c81ad9fc25 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -360,8 +360,8 @@ apply_changes(struct gmesh *mesh) TAILQ_FOREACH(md, &part_metadata, metadata) { if (md->newfs != NULL) { char *item; - item = malloc(255); - sprintf(item, "Initializing %s", md->name); + + asprintf(&item, "Initializing %s", md->name); minilabel[i] = item; miniperc[i] = BSDDIALOG_MG_PENDING; i++; From nobody Mon Oct 16 23:32:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLF2rjnz4whxp; Mon, 16 Oct 2023 23: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 4S8YLF0ShKz3FXq; Mon, 16 Oct 2023 23: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=1697499141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdTETrB/3BNNN4kX8YV3YgzUZEHnHcT7g78JFwiiNI=; b=AYxxZveX8qvfPnck4eQcCF3znqqFcxLp0A/U34ULzkxX7U95qWeoN3bAP50uVPiF7oMrJT XaaEMRrJiLlg7lqjNXM5Tiazub0kF+fhi5GSm5ug8vMpfzO93QqYj926POdBEJMef7PwxF 9AtLEqjZe9YB3IbA9i84nIscJJ8VlqXaVXVnFn/dQCEAFdb9X9z1WTGuCfaDM43ISdvYsI k/WZ0eE0lqrngDdooBiva7Z+I5tzqI3DekQPnso71yjjno0K76e1eOhmA6W78+agA42mk1 CsHzjOwUbnwYmD2+cWZFkODzpG5sckhWF14q2OaU+MF/YwIS1wO3kNLwy0C4tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499141; a=rsa-sha256; cv=none; b=d/NzHsrwcREU1JyOi2csecsBjgLBi+l52Whh5stF8aGG4lOEwUwXProQZUTpNhjKSCYL8F OGmDlLRJFAdfTvtnaR7+rIwELccbhY4ZOZpFRhSSPK/Y6wtD+r1DdpXZxxi9PocFDOns9o 3tv3JgRK34wLr3pvG3PfJe2Jc/176nYFqd4SyJq7r8XR7boM9qH5o8Mm5iW+uxc7OfIcyY OKjf4VIxu18p9Yw3vha4QZ9Hl5GBVE45BfgAWH7+kHcJEhVzi3bL3IUVICsNZDVfOhh2rQ Zn7FGZCMVt6GPVWTfRliim2nKYa0tjiPShqzvTneWrTtlxCCopQ+MYgnF2Q3Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XdTETrB/3BNNN4kX8YV3YgzUZEHnHcT7g78JFwiiNI=; b=IdElSbV21CKacfSDN6FO79F9kMF32gsgKZVQtEbaZ6Qku/sbhWDGiSjBAEKo6A/amfetye eX+0vjX7IAYnBnLqDa659rOpqU4q82kPRdrhXJPbZjakw6PodrpJjJgT/tUmexHaqY9wK+ 0OceajeI3Pr53pqB1eoJD+FXPjvcVvDPQ7MLt0Jxr3QXrFW8jEABzGhZ9XemWD/GzwYwYm cddt75vwSnjTOiZuFFYHGwaONM+TWeoxqBT8C3AIlqJSnGfnTXlAlCnvRh5RDOhsvVip/1 hTwXnZc1IWeYfj5eZdN3jL1A2BXhN7l9m2nLXHkEfGsYl5rkK7nGk5bWk1VkQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLD68ldz118V; Mon, 16 Oct 2023 23: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 39GNWKVZ094762; Mon, 16 Oct 2023 23: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 39GNWKwH094759; Mon, 16 Oct 2023 23:32:20 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:20 GMT Message-Id: <202310162332.39GNWKwH094759@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: a8676bf367b0 - main - bsdinstall partedit: Use asprintf to build wrapper command for newfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8676bf367b099dcc97ff61031cbf4ceb5e37899 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a8676bf367b099dcc97ff61031cbf4ceb5e37899 commit a8676bf367b099dcc97ff61031cbf4ceb5e37899 Author: John Baldwin AuthorDate: 2023-10-16 23:25:25 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:25 +0000 bsdinstall partedit: Use asprintf to build wrapper command for newfs Don't abuse the message[] static buffer used elsewhere for error messages to generate the command that actually newfs's each filesystem. Use asprintf to a more aptly-named 'char *command' variable to construct the string instead. This avoids potential bugs from truncation of the command string. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42239 --- usr.sbin/bsdinstall/partedit/partedit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index b6c81ad9fc25..6a216f31161b 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -345,6 +345,7 @@ apply_changes(struct gmesh *mesh) const char **minilabel; const char *fstab_path; FILE *fstab; + char *command; struct bsddialog_conf conf; nitems = 1; /* Partition table changes */ @@ -387,10 +388,11 @@ apply_changes(struct gmesh *mesh) bsddialog_mixedgauge(&conf, "Initializing file systems. Please wait.", 0, 0, i * 100 / nitems, nitems, minilabel, miniperc); - sprintf(message, "(echo %s; %s) >>%s 2>>%s", + asprintf(&command, "(echo %s; %s) >>%s 2>>%s", md->newfs, md->newfs, getenv("BSDINSTALL_LOG"), getenv("BSDINSTALL_LOG")); - error = system(message); + error = system(command); + free(command); miniperc[i] = (error == 0) ? BSDDIALOG_MG_COMPLETED : BSDDIALOG_MG_FAILED; i++; From nobody Mon Oct 16 23:32:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8YLG1PVLz4whgc; Mon, 16 Oct 2023 23: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 4S8YLG0rdWz3FqG; Mon, 16 Oct 2023 23: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=1697499142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxwwtkzgYnJax6oE1fLo88ZQEAgJaavBNcT/rtLSOaM=; b=DiA1zNJBGM33g45PICB43HGOyoXOMiI5VQSiomrdRycxRNze2RLQk9REvteld2aWADCNO8 MRrRQEdOvxetXZWM2O3gFu2TVhX+HIcuDAzAcKxsBBwza57QxIAHapqVyvRqsks1/3wrgV w+f07q1TdKXcFP5fY3undRcKfWzjqdirlW48JkiDKmz/j0HOnkkD0Fzvf9e89zkqhcPhe1 QARPnyiYOf35S+wHxirWhtx6/zuvN8bF8K+GUN4di40IlBNaQb+Whb/yVKY+P9Xyj40GIc JYx/dbogc2nCta51n36oGa5qxRywKVs4W8NwiZFzGUoOb6M+BvzKLReVss4NLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697499142; a=rsa-sha256; cv=none; b=GdFrgdwYJ6erQSYVbWQp+x5xJkhIHQvGDi9o2pfAdawDgDZ2z7IHLAOxRlrHsI3h5TBMND /s0l8So91fkTPx9GwesPSLvsbwBGM3qU753Vqnn6V6Tt/mMZhF2G9+WgultmofAVTJ0L72 XiVOk4LNFJOFRCN1w4Wx2IWBG6m+LirhWo0JJghurMNPllcEPSLtmXrA/DGZtK3X3IATN2 qAgU1D63V9k70jpJYvyOeF4194U/arDiO9aNqI5p8z5lidmnnahYRbAwtkcL1fPWN0+Iyl QXqjKfuP+o933rphe2pQAPJfbRw5Wu+IMyvhLFnCt5FzKNLBWmS79nyaj9g6xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697499142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxwwtkzgYnJax6oE1fLo88ZQEAgJaavBNcT/rtLSOaM=; b=acFlu6ts3G9aog6EhNcdi+30yZsR+Xxtvmx5UJUBl/eCC1fPV+CggQ3djE0aj1u1mdKXZh wMsMeaeAuWoyrDBFSdghpETDgTLaYGWKcIH2hXtDroQ74/rLIKxkefcSMei2Mn58KtFabP T6Yz5yObddBCq2SknD6TGR3oCoCSCeoBbwCH3JvCngUOTImwSZMb7tx0FG88kpDPxBQsBT eATWUlL/rGpF8ikAS2BFwNIStd+TdwoMXo+2wukyQdnW5zAOwzEShOuonrGSEoTlaQ+GwK +wMFS5DnnRool03LapN4TDkt1VOYpjFuUid//JAsRrZhVE881OWrhRY4K5nQRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8YLF6xNzz114P; Mon, 16 Oct 2023 23: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 39GNWLCQ094820; Mon, 16 Oct 2023 23: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 39GNWLX6094817; Mon, 16 Oct 2023 23:32:21 GMT (envelope-from git) Date: Mon, 16 Oct 2023 23:32:21 GMT Message-Id: <202310162332.39GNWLX6094817@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: 6e8bf24073a1 - main - bsdinstall partedit: Use snprintf instead of sprintf for error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e8bf24073a1867c4b21bd84438a8b01ce91d82d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6e8bf24073a1867c4b21bd84438a8b01ce91d82d commit 6e8bf24073a1867c4b21bd84438a8b01ce91d82d Author: John Baldwin AuthorDate: 2023-10-16 23:25:38 +0000 Commit: John Baldwin CommitDate: 2023-10-16 23:25:38 +0000 bsdinstall partedit: Use snprintf instead of sprintf for error messages When generating a message for a dialog box into a static buffer, use snprintf instead of sprintf to avoid buffer overflows. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42240 --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 37 ++++++++++++++++++++---------- usr.sbin/bsdinstall/partedit/part_wizard.c | 6 +++-- usr.sbin/bsdinstall/partedit/partedit.c | 3 ++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 7395030b26aa..0bcd17950daf 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -62,12 +62,13 @@ gpart_show_error(const char *title, const char *explanation, const char *errstr) while (errmsg[0] == ' ') errmsg++; if (errmsg[0] != '\0') - sprintf(message, "%s%s. %s", explanation, - strerror(error), errmsg); + snprintf(message, sizeof(message), "%s%s. %s", + explanation, strerror(error), errmsg); else - sprintf(message, "%s%s", explanation, strerror(error)); + snprintf(message, sizeof(message), "%s%s", explanation, + strerror(error)); } else { - sprintf(message, "%s%s", explanation, errmsg); + snprintf(message, sizeof(message), "%s%s", explanation, errmsg); } bsddialog_initconf(&conf); @@ -263,7 +264,9 @@ parttypemenu: if (!is_scheme_bootable(items[choice].name)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not " "bootable on this platform. Are you sure you want " "to proceed?", items[choice].name); conf.button.default_cancel = true; @@ -298,7 +301,9 @@ schememenu: if (!is_scheme_bootable(scheme)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not " "bootable on this platform. Are you sure you want " "to proceed?", scheme); conf.button.default_cancel = true; @@ -484,10 +489,11 @@ gpart_partcode(struct gprovider *pp, const char *fstype) } /* Shell out to gpart for partcode for now */ - sprintf(command, "gpart bootcode -p %s -i %s %s", + snprintf(command, sizeof(command), "gpart bootcode -p %s -i %s %s", partcode_path(scheme, fstype), indexstr, pp->lg_geom->lg_name); if (system(command) != 0) { - sprintf(message, "Error installing partcode on partition %s", + snprintf(message, sizeof(message), + "Error installing partcode on partition %s", pp->lg_name); bsddialog_initconf(&conf); conf.title = "Error"; @@ -659,7 +665,9 @@ editpart: if (strcmp(items[2].value, "/") == 0 && !is_fs_bootable(scheme, items[0].value)) { char message[512]; - sprintf(message, "This file system (%s) is not bootable " + + snprintf(message, sizeof(message), + "This file system (%s) is not bootable " "on this system. Are you sure you want to proceed?", items[0].value); conf.button.default_cancel = true; @@ -1182,7 +1190,8 @@ addpartform: if (expand_number(items[1].value, &bytes) != 0) { char error[512]; - sprintf(error, "Invalid size: %s\n", strerror(errno)); + snprintf(error, sizeof(error), "Invalid size: %s\n", + strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, error, 0, 0); goto addpartform; @@ -1234,7 +1243,9 @@ addpartform: /* If this is the root partition, check that this scheme is bootable */ if (strcmp(items[2].value, "/") == 0 && !is_scheme_bootable(scheme)) { char message[512]; - sprintf(message, "This partition scheme (%s) is not bootable " + + snprintf(message, sizeof(message), + "This partition scheme (%s) is not bootable " "on this platform. Are you sure you want to proceed?", scheme); conf.button.default_cancel = true; @@ -1249,7 +1260,9 @@ addpartform: if (strcmp(items[2].value, "/") == 0 && !is_fs_bootable(scheme, items[0].value)) { char message[512]; - sprintf(message, "This file system (%s) is not bootable " + + snprintf(message, sizeof(message), + "This file system (%s) is not bootable " "on this system. Are you sure you want to proceed?", items[0].value); conf.button.default_cancel = true; diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index 5618d5ffe025..a3c5cb43ec51 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -277,7 +277,8 @@ query: char warning[512]; int subchoice; - sprintf(warning, "The existing partition scheme on this " + snprintf(warning, sizeof(warning), + "The existing partition scheme on this " "disk (%s) is not bootable on this platform. To install " OSNAME ", it must be repartitioned. This will destroy all " "data on the disk. Are you sure you want to proceed?", @@ -367,7 +368,8 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, HN_DECIMAL); humanize_number(neededstr, 7, MIN_FREE_SPACE, "B", HN_AUTOSCALE, HN_DECIMAL); - sprintf(message, "There is not enough free space on %s to " + snprintf(message, sizeof(message), + "There is not enough free space on %s to " "install " OSNAME " (%s free, %s required). Would you like " "to choose another disk or to open the partition editor?", disk, availablestr, neededstr); diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 6a216f31161b..74606a2ef8f3 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -436,7 +436,8 @@ apply_changes(struct gmesh *mesh) fstab_path = "/etc/fstab"; fstab = fopen(fstab_path, "w+"); if (fstab == NULL) { - sprintf(message, "Cannot open fstab file %s for writing (%s)\n", + snprintf(message, sizeof(message), + "Cannot open fstab file %s for writing (%s)\n", getenv("PATH_FSTAB"), strerror(errno)); conf.title = "Error"; bsddialog_msgbox(&conf, message, 0, 0); From nobody Tue Oct 17 05:57:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8jtr682rz4x66S; Tue, 17 Oct 2023 05:57: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 4S8jtr3q42z4J6C; Tue, 17 Oct 2023 05:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697522260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNo5UfhQzlgXPzp+IVYkcR7MWNyR8dvTfM8uBIDarDY=; b=F3rLRoqajF/mJPyJe3D8zz0bO+JvoV320JEWS2nB8qIn/3IMhJoKKi63NjWCM2Z2TUuzie QFeb3MQ1xlOpb59dgHTZnF/qbqpuOUo+mMDP4U/mjJcvvQrzzDqx+EESaLNOltcoXOFC65 FYySmy8NidWcXhpxpq61JbtKCATEXxZSBc+vDU+TBxcB+/NkLoMWSwbQpQze7EM9o5V0mD yHQpey13M4qnJ+mNJTK78Ev5rHxgHYPOxyjP5/6wku6nVtwmeoqYjjmJD2fvQpGtbfqJCZ XUd/lEK6DSGJPDOcT0rbIfq60M5goF2OgHXQEr9k9K3bMSKlt5+ncAnha6fVSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697522260; a=rsa-sha256; cv=none; b=y2EjdpjmO4Ic/1jb09SwtqE02e+KXJ6aBr5KXnAXQ/Km9Qr7U2dYcCHYPGrNYQ0YDj+URT sQmZhSMcaAewZmHjpueuZ+Ukj1PkueFdFVQJp8MSovgyBdmf8KyVMsIClX5ofCIRo6m76M 8xU+iR3N8PulSo0xgu8jfV/pg6HMps51fp1hRMMoAX/Mjj5d/d5ITpCOeXlgo6SK5m2xz2 syJZlKEwDhYsEUlyi63u5pPAmDoainGIdO8uvDTdNCwl193KtpqA7ojYt9W9tCsEdvCMKO YI3KFjF4j5d8O3jVHIfpSaFxXfhEY2OJtHGhYtBFo+r8P9oDB8itYPDnTWoiDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697522260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jNo5UfhQzlgXPzp+IVYkcR7MWNyR8dvTfM8uBIDarDY=; b=ALh4pPioF3esl4QaHLqwweuT9w4fWuoc5sp2nFGje6jDa6K5wMr0LwLvqLSwKw0fhw7uQk Um3WgrANxY5lC7SV/lamSgfOOVlVgWMmQo7+nrEvWwxYuoh9Wu2oFOI4ll0PtrHcR1QACf XC3pbDFb2nS9fg62U8WJjAprxppD1xfPMPnERVXrO+eGQappX8CLkjPfQaada/S9fvw9W2 tUTYOiwpu2CyHxQ6pakfst3bRhLA4c7KGKC6Gg9dUPCedlx3TadWLTPhRtVvGag6GnEGgD 9R7XDk3u5p9JB7BKIr1qVS90akgRvmshmflH6nvTHtT8KsxxJ9NoNLaKUf7x4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8jtr2vwMz1BG7; Tue, 17 Oct 2023 05:57: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 39H5veFr028853; Tue, 17 Oct 2023 05:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H5veCu028850; Tue, 17 Oct 2023 05:57:40 GMT (envelope-from git) Date: Tue, 17 Oct 2023 05:57:40 GMT Message-Id: <202310170557.39H5veCu028850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 2ae26ba67338 - releng/14.0 - netlink: move NETLINK define to opt_global.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 2ae26ba673384a075f31cea0ef495a02af293262 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae26ba673384a075f31cea0ef495a02af293262 commit 2ae26ba673384a075f31cea0ef495a02af293262 Author: Kristof Provost AuthorDate: 2023-10-12 19:55:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 05:56:51 +0000 netlink: move NETLINK define to opt_global.h Move the NETLINK define into opt_global.h so we can rely on it being set correctly, without having to remember to include opt_netlink.h. This ensures that the NETLINK define is correctly set. If not we may end up with unloadable modules, due to missing symbols (such as nlmsg_get_group_writer). PR: 274306 Reviewed by: imp, markj Approved by: re (karels) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42179 (cherry picked from commit ab393e9548f8cc0ee28499c411963b798ebb38a5) (cherry picked from commit ff15498894e2546fcce7ffc24967e714de3805ed) --- sys/compat/linux/linux_netlink.c | 1 - sys/conf/options | 2 +- sys/modules/carp/Makefile | 2 +- sys/modules/ktest/ktest/Makefile | 1 - sys/modules/ktest/ktest_example/Makefile | 1 - sys/modules/ktest/ktest_netlink_message_writer/Makefile | 1 - sys/modules/linux/Makefile | 3 +-- sys/modules/linux_common/Makefile | 3 +-- sys/modules/netlink/Makefile | 2 +- sys/net/if_clone.c | 2 -- sys/net/if_vlan.c | 1 - sys/netinet/ip_carp.c | 2 -- sys/netlink/ktest_netlink_message_writer.c | 2 -- sys/netlink/netlink_domain.c | 1 - sys/netlink/netlink_generic.c | 2 -- sys/netlink/netlink_glue.c | 2 -- sys/netlink/netlink_io.c | 2 -- sys/netlink/netlink_message_writer.c | 2 -- sys/netlink/netlink_module.c | 2 -- sys/netlink/route/iface.c | 2 -- sys/netlink/route/iface_drivers.c | 1 - sys/netlink/route/neigh.c | 2 -- sys/netlink/route/nexthop.c | 2 -- sys/netlink/route/rt.c | 2 -- sys/tests/ktest.c | 2 -- 25 files changed, 5 insertions(+), 40 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index a6846035c22e..807cdc7a14bc 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -27,7 +27,6 @@ #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_netlink.h" #include #include diff --git a/sys/conf/options b/sys/conf/options index 56c1a33216d5..ff7c0d984646 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -470,7 +470,7 @@ MBUF_PROFILING MBUF_STRESS_TEST MROUTING opt_mrouting.h NFSLOCKD -NETLINK opt_netlink.h +NETLINK opt_global.h PF_DEFAULT_TO_DROP opt_pf.h ROUTE_MPATH opt_route.h ROUTETABLES opt_route.h diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile index 5506d1aaec23..d7a85043539f 100644 --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -5,6 +5,6 @@ KMOD= carp SRCS= ip_carp.c sha1.c SRCS+= device_if.h bus_if.h vnode_if.h -SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h opt_netlink.h +SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h .include diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile index f72aa5d820db..264eb7b9f443 100644 --- a/sys/modules/ktest/ktest/Makefile +++ b/sys/modules/ktest/ktest/Makefile @@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest SRCS= ktest.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile index 5b0c9b41f9c8..a5fe6d6d7843 100644 --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -8,6 +8,5 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest_example SRCS= ktest_example.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile index cdcd1d2c190f..2f84b2fecd72 100644 --- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile +++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile @@ -8,7 +8,6 @@ SYSDIR?=${SRCTOP}/sys KMOD= ktest_netlink_message_writer SRCS= ktest_netlink_message_writer.c -SRCS+= opt_netlink.h .include diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 51b434d91b00..d1035445ccfb 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -70,8 +70,7 @@ SRCS+= imgact_linux.c \ linux_vdso_selector_x86.c \ linux_x86.c \ linux_copyout.c \ - linux_netlink.c \ - opt_netlink.h + linux_netlink.c .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 07df4555d1ee..374bc32215a2 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -7,8 +7,7 @@ KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux_dummy.c linux_errno.c linux_netlink.c \ - linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h \ - opt_netlink.h + linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h opt_inet.h .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_x86.c linux_vdso_selector_x86.c diff --git a/sys/modules/netlink/Makefile b/sys/modules/netlink/Makefile index 667c0b2475fe..6835be6e7bd7 100644 --- a/sys/modules/netlink/Makefile +++ b/sys/modules/netlink/Makefile @@ -5,7 +5,7 @@ SRCS = netlink_module.c netlink_domain.c netlink_io.c \ netlink_message_writer.c netlink_generic.c \ netlink_route.c route/iface.c route/iface_drivers.c route/neigh.c \ route/nexthop.c route/rt.c -SRCS+= opt_inet.h opt_inet6.h opt_route.h opt_netlink.h +SRCS+= opt_inet.h opt_inet6.h opt_route.h CFLAGS+= -DNETLINK_MODULE diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c index 1a2cea94ad35..5345d613f9d6 100644 --- a/sys/net/if_clone.c +++ b/sys/net/if_clone.c @@ -32,8 +32,6 @@ * @(#)if.c 8.5 (Berkeley) 1/9/95 */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index e7a290564722..b69d8107e30d 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -46,7 +46,6 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_kern_tls.h" -#include "opt_netlink.h" #include "opt_vlan.h" #include "opt_ratelimit.h" diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 28c1e535b783..b0a422d5060f 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -28,8 +28,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_bpf.h" #include "opt_inet.h" diff --git a/sys/netlink/ktest_netlink_message_writer.c b/sys/netlink/ktest_netlink_message_writer.c index c13a25e05a70..e46065dd4bd2 100644 --- a/sys/netlink/ktest_netlink_message_writer.c +++ b/sys/netlink/ktest_netlink_message_writer.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 262361773fbb..7b2bbd39447d 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -30,7 +30,6 @@ * This file contains socket and protocol bindings for netlink. */ -#include "opt_netlink.h" #include #include #include diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 54fc702d8ac6..4d95506e31b0 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c index 29eac82aaffd..e7649c6b13dc 100644 --- a/sys/netlink/netlink_glue.c +++ b/sys/netlink/netlink_glue.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index 0745f7fdcb77..0ca71fb6219b 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 9fc0eddc78ec..8443cc59d9e0 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c index ba56ac6d6a17..b4073721fdc4 100644 --- a/sys/netlink/netlink_module.c +++ b/sys/netlink/netlink_module.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index b6e120933f83..0587b478431e 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 1a7aaffa7dd7..4bf913d9c978 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index 4168b5936ddc..9914e7febf57 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c index 722dc5fdee4e..0d6bb5c9ec84 100644 --- a/sys/netlink/route/nexthop.c +++ b/sys/netlink/route/nexthop.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 2a6a0bc54e85..cfaa2167b0d2 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/tests/ktest.c b/sys/tests/ktest.c index 495fedf95dde..cd83a6aaaa3f 100644 --- a/sys/tests/ktest.c +++ b/sys/tests/ktest.c @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -#include "opt_netlink.h" - #include #include #include From nobody Tue Oct 17 06:40:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8kqx1JWZz4x8cm; Tue, 17 Oct 2023 06:40: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 4S8kqw6mKgz4LWn; Tue, 17 Oct 2023 06:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697524813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=cMq4LMEaEfkhwKMjnzDBZMG8lyFNOQQXCYurOEPnpuiWVXzcRKUoj4EXG5iiEYzInQgym3 b9ZJ5Q7pN8qLhRe2UUY6seR1pE4fwUhisCN1e8nSuZvWvR3h32c6cOOxDkQhWwDPUb3/se mzmAd34t0DQxU6mdGdgZzBcH9a9KwJwtTW/51K2w2V3wGgnmzmeCTCK9HbTWLfbXvERTqp iTEpEh1BBzmMjUWyPGzq71HmY8+fl4ZFCfA/I1ocxL7aMAewGCF6bGMON/7P5Rv4JTH9l7 nv2bq1ExwrIbp+oBSfeAiJITRDzL9J0y3SMhZN1MZNoOi60kK976sKEvSPVAcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697524812; a=rsa-sha256; cv=none; b=M7XKUCWI2EYRXwJQEIUUhnBTBGEmqf0/N9hL5dFle9XPUE4Iq9FipJaYXOc2vNDtWZ3Z8M 2/0ZcJ6I83/TbmFnY2fui575aujHqFc8hBWMxWiWWXKL4t1vcUqlbef0sbSudhx2d3S7FU bCSt1GpD/aqK4s1CGm/IiaIkHJdsKfmHQ9pTCmbJGHGKA7C3XlauOguQfmImheI50TP1OT XMRf+oKRYe+zrbZmWJx7VW+IJkqbQ+TCA6wAmoOvTUK78Bmb6a7qGGmNzFFHC7FMI8kLB3 vchnf29kWlbiOtfC5rMAF6EoMVJeFlRyk5KM/uOyEqwjei51bjHDu/CzbeC8yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697524812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TaMicHHhUt9q3vkJsny2Odxm55yBZz1qDqR3/T9Pzb4=; b=ylW5vR8Pcc1r3WBQukBXnwaCBZhirly/dXzEvAVu8aFvjYMkRXDTKuPtz8qW+bfX6ODOB4 hcyjro1m7TMD1+cc5o3aUiINUs9K/4i0XL0xiVQGl39Gakh0Cttsq7P4+jfAeJN486ye0n WfEacBCVJJhuZku5rpuzxnKrgJPSEYnqYF1/IUJDE8jyLniwSRu9Z2iBMn6S1tmvcVP9/v tPrAQ+DP+NI6MxtDZ4w3gvL0kNLCJPCyOOKqriQh7ZRmP7qxnfeSg6JljLPtsJfMPGe9FO 3G+dWFlOooIfNdwTq552pRzhHdULgv/Vqn2uZ4Xl+hgXFWImnnHLnj9Bt5uv9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8kqw5r9Rz1CFT; Tue, 17 Oct 2023 06:40: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 39H6eCNE001160; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H6eCcQ001148; Tue, 17 Oct 2023 06:40:12 GMT (envelope-from git) Date: Tue, 17 Oct 2023 06:40:12 GMT Message-Id: <202310170640.39H6eCcQ001148@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: 18be782c4e5f - main - pfsync: Provide documentation regarding message version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=18be782c4e5fcbe4d37a951a6c77c13b3c11b8be commit 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be Author: Kajetan Staszkiewicz AuthorDate: 2023-10-17 04:38:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 04:38:47 +0000 pfsync: Provide documentation regarding message version Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42235 --- sbin/ifconfig/ifconfig.8 | 7 ++++++- share/man/man4/pfsync.4 | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 1dc4c2e1b56d..bd6cbd05210e 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" -.Dd June 20, 2023 +.Dd October 17, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2886,6 +2886,11 @@ acknowledged that the associated state has been inserted. .It Fl defer Do not defer the first packet in a state. This is the default. +.It Fl version Ar n +Configure message format for compatibility with older versions of FreeBSD. +Refer to +.Xr pfsync 4 +for details. .El .Ss VLAN Parameters The following parameters are specific to diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index 5a1d576824e6..4decb50feb7b 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 6, 2018 +.Dd October 17, 2023 .Dt PFSYNC 4 .Os .Sh NAME @@ -113,6 +113,32 @@ dedicated to pfsync messages such as a crossover cable between two firewalls, or specify a peer address and protect the traffic with .Xr ipsec 4 . .Pp +When new features are introduced to +.Xr pf 4 +the format of messages used by +.Nm +might change. +.Nm +will by default use the latest format. +If synchronization with a peer running an older version of FreeBSD is needed the +.Ar version +parameter can be used. +E.g.: +.Bd -literal -offset indent +# ifconfig pfsync0 version 1301 +.Ed +.Pp +.Bd +Currently the following versions are supported: +.Bl -tag -width indent +.It Cm 1301 +FreeBSD releases 13.2 and older. +Compatibility with FreeBSD 13.1 has been verified. +.It Cm 1400 +FreeBSD release 14.0. +.El +.Ed +.Pp .Nm has the following .Xr sysctl 8 From nobody Tue Oct 17 07:37:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6b0l6xz4xC5d; Tue, 17 Oct 2023 07:37: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 4S8m6Z5JB7z4QSj; Tue, 17 Oct 2023 07:37:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghPHCBGzCRrvzvORf5tbivK49sAs9TlttaaMrG+cD5w=; b=G5Y4DfSt9l0tmLs0XbTWeQsOK9DNqZJ7xby0mqalGsbQzUKpNfGb2z44RboMGteDINjQly 8u7h8SP6XNNWoVkIJSTJklmDQ84rNFPYI0Vij6piVT7RgFGSEmhgtuUrMNFaYFgX2Cv76U 4QkdA8Y9VOfew4OaooYDrYNK55SHUlASefTxJdiqioqj8ZbpgHMCMeopTnQQR5zz55uZfi /Am++nOV8+Tov8R8XFtep4Y0nGVcCNJg/kfm6RuqxCz9bk6bznEdy1Hzxqw9Ki1MYjhgsg 1zUQX8KRG5pdufWtWT2wG4maIKBo2AOuSDPXJEi+LqVnjLrjChh9Z+ZgTfkZeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528278; a=rsa-sha256; cv=none; b=MnjJYk8xF0dwwZrUBvr54l9xTTmopBa9pTMaeTCQnM42Mz/JHbpCAfxMdJzw9bBBvlDG5j uHDtbUW2sk3Ml3Up7IHGz/v+uu0Lxe69OIUXRi15tu9wpdg3vdz8OCNRk6Ft/lCrGTUGWj ZMrkpOTyvXCEqMth/2jH87NxVOsWmt7R9U2qbrgrb7rF40VIJ1ykSi8S+dgRQ11CYCHn5E G9nM+NNxSjz710nz1BgMXHrRlmzc0FTaxxwe+dDn0ueDBrZ/PRmmjNhtGWGXrxu5lvUp++ 1FxoyZajyfZYWKeutTtdJ0LSMn/8ujDXzvPQz1rWUzHW76XExeMFgRJP1CROow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghPHCBGzCRrvzvORf5tbivK49sAs9TlttaaMrG+cD5w=; b=Y11jvEt/7gZyxpLkhnfkJEwFKsApKCv/ZjgsjdBF/XrC3b3FcNO4f9SoZ4ZpRkLO1Q+zW5 5+AxA37mz2kC9vXeCgSQ+silYBbk61BngiZW+fN+tyGBtcS4cFuDwjYsaFtJgQNaRx8I6l MLcmC9ft4wryxkJj9KL9K7lzNCC7bEitDjyq82MD/JFb66VvP2cbltr9sOyaxfYDNZDyp6 c67gK4wdFS8hKEr/74yLK2n+ckTD5LWZty5Td918KqOyG+DdANcODOuWso44ZZmLF+MUax q4rfynMfSifshCthbMT7LKE9H3WglLBA375fiXjN/4xBHPZKRRiWHounkKdDDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6Z467LzS1; Tue, 17 Oct 2023 07:37: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 39H7bw0I095216; Tue, 17 Oct 2023 07:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7bwUm095213; Tue, 17 Oct 2023 07:37:58 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:37:58 GMT Message-Id: <202310170737.39H7bwUm095213@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: 1c5c7e61c85f - main - netlink: add attr parser utility functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c5c7e61c85fffa274119a69d69b3405848b9c82 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c5c7e61c85fffa274119a69d69b3405848b9c82 commit 1c5c7e61c85fffa274119a69d69b3405848b9c82 Author: Kristof Provost AuthorDate: 2023-10-14 10:13:30 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:46 +0000 netlink: add attr parser utility functions - nlattr_get_chara() to read a string into a char array, rather than to a char * - nlattr_get_bytes() to read an arbitrary (fixed length) byte sequence - nlattr_get_nested_ptr() to read a nested type to a struct foo *, rather than struct foo Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42221 --- sys/netlink/netlink_message_parser.c | 42 ++++++++++++++++++++++++++++++++++++ sys/netlink/netlink_message_parser.h | 6 ++++++ 2 files changed, 48 insertions(+) diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index 9ff5cdee40b4..48d712211a98 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -428,6 +428,23 @@ nlattr_get_ifpz(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void return (nlattr_get_ifp_internal(nla, npt, target, true)); } +int +nlattr_get_chara(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + int maxlen = NLA_DATA_LEN(nla); + int target_size = (size_t)arg; + int len = strnlen((char *)NLA_DATA(nla), maxlen); + + if (__predict_false(len >= maxlen) || __predict_false(len >= target_size)) { + NLMSG_REPORT_ERR_MSG(npt, "nla type %d size(%u) is not NULL-terminated or longer than %u", + nla->nla_type, maxlen, target_size); + return (EINVAL); + } + + strncpy((char *)target, (char *)NLA_DATA(nla), target_size); + return (0); +} + int nlattr_get_string(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) { @@ -457,6 +474,20 @@ nlattr_get_stringn(struct nlattr *nla, struct nl_pstate *npt, const void *arg, v *((char **)target) = buf; return (0); } + +int +nlattr_get_bytes(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + size_t size = (size_t)arg; + + if (NLA_DATA_LEN(nla) != size) + return (EINVAL); + + memcpy(target, NLA_DATA(nla), size); + + return (0); +} + int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) { @@ -476,6 +507,17 @@ nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt, const void *arg, vo return (error); } +int +nlattr_get_nested_ptr(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target) +{ + const struct nlhdr_parser *p = (const struct nlhdr_parser *)arg; + int error; + + /* Assumes target points to the beginning of the structure */ + error = nl_parse_header(NLA_DATA(nla), NLA_DATA_LEN(nla), p, npt, *(void **)target); + return (error); +} + int nlf_get_ifp(void *src, struct nl_pstate *npt, void *target) { diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 0242177fdd26..517f3ebd49f2 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -187,14 +187,20 @@ int nlattr_get_ifpz(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_ipvia(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_chara(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); int nlattr_get_string(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_stringn(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_bytes(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); int nlattr_get_nla(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); int nlattr_get_nested(struct nlattr *nla, struct nl_pstate *npt, const void *arg, void *target); +int nlattr_get_nested_ptr(struct nlattr *nla, struct nl_pstate *npt, + const void *arg, void *target); bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...); From nobody Tue Oct 17 07:37:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6c0mG6z4xC8Y; Tue, 17 Oct 2023 07:38: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 4S8m6b6ZBVz4QJ5; Tue, 17 Oct 2023 07:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=FjYXxiujGou4BvVwwQiFxBmxOTcdcbFb4ryOsNtjrgtUUli7OQZM80UcLxRBs2z4+UFSnD 795wFAJdiRb30EP4nS6G8glVeojvnw3/4PHCWdZ4EaGIE3dnSTD0dkpTCuhQ+M12CUGdTS yf2hPLTvXq0KZ/9owlrrEO4eeXag1hn1HCUh9+3/xrq/6PCXBpNcQ9Je/ZvM37Te7/cq41 jdsMq2craJNmiH9eHZqqSVOSFkFRH9QfwLDv1u6o6ao3AS6ozLGlBpF7suGZh9rKnksC7F GGE/iUMoAGoRG5tfGnZknkQk6+zWqtyYmdWTuVjR8q4wpmbw09XpLRgnGdHTJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528279; a=rsa-sha256; cv=none; b=nTogSR49mvhdDSID9QfJbY1TJ4bEB8nCpkm9HgLk7W4H0vY1wmITAjWpZHz6Am00A1P1KU AHO0YtLUhfyVa+nrcdTD3Tmew0Za5ozr6OpdK27N/5r/CkkJObEjxYl4j0lWfI7Ec+2In3 jSibqPmRuDgPNhL9eljcbBJHwCTEI4hkDyntLZgB6X8IDKffTjQT2NhVunZlnKFnDJv0ZC NxEoMeY+LhEMIYFkPYVk5Y0AGand9ZihhKSifmTITWlfZEXANTCcS36AQUPY1edrwtM1xr PXeOodrurBh+jZsGVnAtvn8tWS3O1nwQiYIPqvSebAUJj8yT0Zle3tQHW3b/TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LbJU/ng56S26ltxys9XUrRwMDoUq5pSTCqlJEDA4VvI=; b=cHJMv5bES7/MgJHOkTfKXFFn0/Yl+3itkQJxGlmXj8Nic9zSB7LzBbJqk8dDBzqayiHRiV vYzZ3Qhnhj8fGXkLvVbEQYZK2w0h2EkG7vvThGtXivdODfwQUPInJnWh2JSBXWOqbYNfgF 1g988RIqYQtYkch6t1DJ51CRJURX70wp6ZKHIySxCentXrlAvGuPuenw9ZbZ6Lz80t0r+o QwWVTibdBMzf4Fo6qMYW+MvKz0NTTN+Q2uzlJc/HFhOg953pHRQa7kzO8BKJvGzZQupOj/ TSDz7rGGpaxY1lS/JjrZRAeG4Y4VOslk2+O2bm9pBj2CxH/FS/lLwrGC+tsVaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6b4xXlzS2; Tue, 17 Oct 2023 07:37: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 39H7bxLi095265; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7bxoQ095262; Tue, 17 Oct 2023 07:37:59 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:37:59 GMT Message-Id: <202310170737.39H7bxoQ095262@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: fad5734995e3 - main - netlink: descend into nested parsers when verifying List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fad5734995e3fba428ce5e4131389c4fff0610ab Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fad5734995e3fba428ce5e4131389c4fff0610ab commit fad5734995e3fba428ce5e4131389c4fff0610ab Author: Kristof Provost AuthorDate: 2023-10-14 12:47:35 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:48 +0000 netlink: descend into nested parsers when verifying When we verify that the attributes are correctly sorted we should also try to verify the nested attribute parsers. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42222 --- sys/netlink/netlink_message_parser.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 517f3ebd49f2..c682973d3e33 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -289,6 +289,14 @@ nl_verify_parsers(const struct nlhdr_parser **parser, int count) for (int j = 0; j < p->np_size; j++) { MPASS(p->np[j].type > attr_type); attr_type = p->np[j].type; + + /* Recurse into nested objects. */ + if (p->np[j].cb == nlattr_get_nested || + p->np[j].cb == nlattr_get_nested_ptr) { + const struct nlhdr_parser *np = + (const struct nlhdr_parser *)p->np[j].arg; + nl_verify_parsers(&np, 1); + } } } #endif From nobody Tue Oct 17 07:38:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8m6d3yNWz4xBkh; Tue, 17 Oct 2023 07:38: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 4S8m6d0rDdz4QQX; Tue, 17 Oct 2023 07:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhvTLEdVPX/oVlTfwM8wQXsLXmB129kzeUJZGP3sWC0=; b=QAPUUjUrK3krgYTnVyjYJubnXLO588PU9Yf4Y/qhuLPf5p7Em4TjQ7fheApFNknHIpOyyS dHiQP7HGO02HqliQXlhgLPwn+aT3UY9OYj0kYplEuqcTeCcaj0GxxTck1MBO4Xec55+n/r +S0xu/KjzE/ch/PvPdr/p9NdDT7GTH1H1m3gh+tkoLxmQKXt0j+f3/7Ve4Y2oz+4mJex6d MujVtb7ZmUXKvb7ldK2hC9/eawPi/MKQtLON1l3sD2rGW44mevC8Qa5Wmcc2vdh+NTlfJh M3ylLaKpb+VEHhKr/rIWTzLWbcv9AGWuTgsOdnRVdxpS9WtfEoauJ+8gsAesrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697528281; a=rsa-sha256; cv=none; b=U8IoOikedaFEYOSDP8pTsAuuM0OnjPsWrkn4r96DUAY3vpdabcKT3M9F6zhdbW00HWn9Sk wcHJi2xUKNSAYkoHVNEirmnQciIunx7v+L1fSQwaFieQ+tuu5leU6G6P9frhB76sT6QANV RCjykcqWvRRIE5Lgo7rm27ROaDCDVlsk5BiAQRtQXJTF8YGS2eGxujtxdhGOqyjZMkKqA0 R6S4NJh3CgU4NUVTOcqrxjz7TiaOhopTXVa6Jn4dlDP+Vt5OEedQ66DzCapON4ydxD1v34 EZRMeDcDsTdRO6xRO2F95cUBTThtCwTAxfZU0y6j5aBmH3hJxj5N09n82bjfJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697528281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhvTLEdVPX/oVlTfwM8wQXsLXmB129kzeUJZGP3sWC0=; b=KieZOF8zKT8Fuy4btMEdHKdZllYxPZS3Tjj0PoPLph53tktftDVcjuwyL4/Cfxc1yXcDli 1ohtFBEIcFIbtd1l3MBNgIJYLSpdpq4VYQgFc0lvR775fO26yZl4fh6IRTX/ghgGf0C5VE 2+f/wmNDIYTURzO6kwmNuR28uUpcKiZa/VoVa/dOE6giWaWo/SYKi8b4D3YmWVjOcDLLTB GGiDDJrdUTOmV2Cf6ZbHp3fpt/+G95H683ZTFvBwcat1Sm7TT9YNyVefsbSrKInumfvk/k a1VYdNd4S+f5RprT+izuuilV6CEZjQzwp73VMlEHS4p25mOl8rrQlnhUyKSefw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8m6c5lhnzkb; Tue, 17 Oct 2023 07:38: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 39H7c0V5095317; Tue, 17 Oct 2023 07:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H7c0qR095314; Tue, 17 Oct 2023 07:38:00 GMT (envelope-from git) Date: Tue, 17 Oct 2023 07:38:00 GMT Message-Id: <202310170738.39H7c0qR095314@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: 4f8f43b06ed0 - main - netlink: cope with growing requests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f8f43b06ed07e96a250855488cc531799d5b78f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f8f43b06ed07e96a250855488cc531799d5b78f commit 4f8f43b06ed07e96a250855488cc531799d5b78f Author: Kristof Provost AuthorDate: 2023-10-16 09:48:57 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 06:47:52 +0000 netlink: cope with growing requests If a request ends up growing beyong the initially allocated space the netlink functions (such as snl_add_msg_attr_u32()) will allocate a new buffer. This invalidates the header pointer we can have received from snl_create_msg_request(). Always use the hdr returned by snl_finalize_msg(). Reviewed by: melifaro MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42223 --- lib/libpfctl/libpfctl.c | 6 +++--- sbin/ifconfig/af_inet.c | 6 +++--- sbin/ifconfig/af_inet6.c | 2 +- sbin/ifconfig/ifconfig_netlink.c | 6 +++--- sbin/route/route_netlink.c | 8 ++++---- sys/netlink/netlink_snl_generic.h | 2 +- tests/sys/netlink/test_snl_generic.c | 2 +- usr.sbin/arp/arp_netlink.c | 12 ++++++------ usr.sbin/ndp/ndp_netlink.c | 12 ++++++------ 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 51276d8bb343..571fabae4359 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -194,7 +194,7 @@ pfctl_startstop(int start) hdr = snl_create_genl_msg_request(&nw, family_id, start ? PFNL_CMD_START : PFNL_CMD_STOP); - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); seq_id = hdr->nlmsg_seq; snl_send_message(&ss, hdr); @@ -1161,7 +1161,7 @@ pfctl_get_creators_nl(struct snl_state *ss, uint32_t *creators, size_t *len) snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETCREATORS); hdr->nlmsg_flags |= NLM_F_DUMP; - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); @@ -1309,7 +1309,7 @@ pfctl_get_states_nl(struct snl_state *ss, pfctl_get_state_fn f, void *arg) snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GETSTATES); hdr->nlmsg_flags |= NLM_F_DUMP; - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); uint32_t seq_id = hdr->nlmsg_seq; snl_send_message(ss, hdr); diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index d9499d64ed13..5e3084165b33 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -355,7 +355,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_family = AF_INET; ifahdr->ifa_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); nlmsg_seq = hdr->nlmsg_seq; @@ -386,7 +386,7 @@ in_delete_first_nl(if_ctx *ctx) ifahdr->ifa_index = ifindex; snl_add_msg_attr_ip4(&nw, IFA_LOCAL, &addr); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (EINVAL); memset(&e, 0, sizeof(e)); snl_read_reply_code(ss, hdr->nlmsg_seq, &e); @@ -426,7 +426,7 @@ in_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index bc4f77f6848d..fcd04139a8c1 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -488,7 +488,7 @@ in6_exec_nl(if_ctx *ctx, unsigned long action, void *data) snl_add_msg_attr_u32(&nw, IFAF_VHID, pdata->vhid); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ctx->io_ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ctx->io_ss, hdr)) return (0); struct snl_errmsg_data e = {}; diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index a6f52ea2a7f0..826d199d3ccb 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -171,7 +171,7 @@ prepare_ifmap(struct snl_state *ss) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifinfomsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (NULL); uint32_t nlmsg_seq = hdr->nlmsg_seq; @@ -212,7 +212,7 @@ if_nametoindex_nl(struct snl_state *ss, const char *ifname) snl_reserve_msg_object(&nw, struct ifinfomsg); snl_add_msg_attr_string(&nw, IFLA_IFNAME, ifname); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -247,7 +247,7 @@ prepare_ifaddrs(struct snl_state *ss, struct ifmap *ifmap) hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifaddrmsg); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; uint32_t nlmsg_seq = hdr->nlmsg_seq; diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index cad1c8030535..040b97568f20 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -266,7 +266,7 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs if (rt_metrics->rmx_weight > 0) snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); - if (snl_finalize_msg(&nw) && snl_send_message(ss, hdr)) { + if ((hdr = snl_finalize_msg(&nw)) && snl_send_message(ss, hdr)) { struct snl_errmsg_data e = {}; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -319,7 +319,7 @@ get_ifdata(struct nl_helper *h, uint32_t ifindex, struct snl_parsed_link_simple struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return; hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -822,7 +822,7 @@ flushroute_one(struct nl_helper *h, struct snl_parsed_route *r) snl_add_msg_attr_u32(&nw, RTA_TABLE, r->rta_table); snl_add_msg_attr_ip(&nw, RTA_DST, r->rta_dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (ENOMEM); if (!snl_read_reply_code(ss, hdr->nlmsg_seq, &e)) { @@ -869,7 +869,7 @@ flushroutes_fib_nl(int fib, int af) rtm->rtm_family = af; snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (EINVAL); } diff --git a/sys/netlink/netlink_snl_generic.h b/sys/netlink/netlink_snl_generic.h index 1324cf3da17a..0a2913c9155e 100644 --- a/sys/netlink/netlink_snl_generic.h +++ b/sys/netlink/netlink_snl_generic.h @@ -106,7 +106,7 @@ snl_get_genl_family_info(struct snl_state *ss, const char *family_name, snl_init_writer(ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, family_name); - if (snl_finalize_msg(&nw) == NULL || !snl_send_message(ss, hdr)) + if ((hdr = snl_finalize_msg(&nw)) == NULL || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); diff --git a/tests/sys/netlink/test_snl_generic.c b/tests/sys/netlink/test_snl_generic.c index f3c11daf19e1..d84d3f88f487 100644 --- a/tests/sys/netlink/test_snl_generic.c +++ b/tests/sys/netlink/test_snl_generic.c @@ -86,7 +86,7 @@ ATF_TC_BODY(test_snl_get_genl_family_groups, tc) snl_init_writer(&ss, &nw); hdr = snl_create_genl_msg_request(&nw, GENL_ID_CTRL, CTRL_CMD_GETFAMILY); snl_add_msg_attr_string(&nw, CTRL_ATTR_FAMILY_NAME, "nlctrl"); - snl_finalize_msg(&nw); + hdr = snl_finalize_msg(&nw); snl_send_message(&ss, hdr); hdr = snl_read_reply(&ss, hdr->nlmsg_seq); diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 40b5367f330d..d78f380af04b 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -63,7 +63,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -116,7 +116,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)&dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -148,7 +148,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct in_addr addr) snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -285,7 +285,7 @@ print_entries_nl(uint32_t ifindex, struct in_addr addr) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -355,7 +355,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -422,7 +422,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in *dst, struct sockaddr_dl *sdl, char snl_end_attr_nested(&nw, off); } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index 954d16995b5a..79bdec2356d0 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -76,7 +76,7 @@ get_link_info(struct snl_state *ss, uint32_t ifindex, struct ifinfomsg *ifmsg = snl_reserve_msg_object(&nw, struct ifinfomsg); if (ifmsg != NULL) ifmsg->ifi_index = ifindex; - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (false); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -152,7 +152,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_ip(&nw, RTA_DST, (struct sockaddr *)dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fibnum); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -184,7 +184,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const struct sockaddr_in6 * snl_add_msg_attr_u32(&nw, NHAF_TABLE, fibnum); snl_end_attr_nested(&nw, off); - if (!snl_finalize_msg(&nw) || !snl_send_message(ss, hdr)) + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (0); hdr = snl_read_reply(ss, hdr->nlmsg_seq); @@ -327,7 +327,7 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) ndmsg->ndm_ifindex = ifindex; } - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss_req, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss_req, hdr)) { snl_free(&ss_req); return (0); } @@ -421,7 +421,7 @@ delete_nl(uint32_t ifindex, char *host) } snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)&dst); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } @@ -493,7 +493,7 @@ set_nl(uint32_t ifindex, struct sockaddr_in6 *dst, struct sockaddr_dl *sdl, char snl_add_msg_attr_ip(&nw, NDA_DST, (struct sockaddr *)dst); snl_add_msg_attr(&nw, NDA_LLADDR, sdl->sdl_alen, LLADDR(sdl)); - if (!snl_finalize_msg(&nw) || !snl_send_message(&ss, hdr)) { + if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(&ss, hdr)) { snl_free(&ss); return (1); } From nobody Tue Oct 17 09:05:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8p3Y628jz4xHB7; Tue, 17 Oct 2023 09:05:29 +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 4S8p3Y291xz4Z71; Tue, 17 Oct 2023 09:05:29 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 39H95Gji024622 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 17 Oct 2023 12:05:19 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 39H95Gji024622 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 39H95F7L024620; Tue, 17 Oct 2023 12:05:16 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 17 Oct 2023 12:05:15 +0300 From: Konstantin Belousov To: John Baldwin Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 74e4a8d208f0 - main - pmap: add pmap_kextract(9) man page Message-ID: References: <202310131827.39DIRXsu082741@gitrepo.freebsd.org> <068574a3-f63a-4830-be1d-2a8cd67c1819@freebsd.org> <527ab884-ce06-4325-52a6-7c6dec1af563@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <527ab884-ce06-4325-52a6-7c6dec1af563@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4S8p3Y291xz4Z71 On Mon, Oct 16, 2023 at 03:54:32PM -0700, John Baldwin wrote: > On 10/14/23 10:34 AM, Mitchell Horne wrote: > > On 10/14/23 10:28, Konstantin Belousov wrote: > > > On Fri, Oct 13, 2023 at 06:27:33PM +0000, Mitchell Horne wrote: > > > > +.Pp > > > > +.Fn vtophys > > > > +is an alias for > > > > +.Fn pmap_kextract > > > > +and behaves identically. > > > > +.Sh RETURN VALUES > > > > +The > > > > +.Fn pmap_kextract > > > > +function will return the physical address > > > > +.Pq Vt vm_paddr_t > > > > +associated with the kernel virtual address > > > and 'associated'? > > > > > > The function returns address of physical memory mapped at the supplied > > > kernel virtual address. > > > > > > > Sure, this is more accurate. > > I suggest tweaking this further just to be very explicit about the type > of address being returned: > > The > .Fn pmap_kextract > function returns the physical address of memory mapped at the > kernel virtual address > .Va va . > > or some such. There are two larger things that are worth adding to the man page, IMO. 1. pmap_kextract() is safe to be used from any context (in particular, it does not do any locking internally) 2. it is caller duty to ensure that the active mapping is alive and stable long enough for the answer to be useful From nobody Tue Oct 17 13:37:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4t6MNTz4xWT0; Tue, 17 Oct 2023 13:37: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 4S8w4t5qm8z3FXD; Tue, 17 Oct 2023 13:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quYSNTQ9dXByehhoDrCX4NN5Pzg/xghLQumsw3i95D8=; b=FMfquHYPNFqkn3P7gb6jwRgzBey9a7QH6dDsQTV9c4LeQt1Kuc2iYWwmmYTKGynltqYfRP x4SDwcAUwQ46XJNF9N14DtX0FMeh+nZLDMBpxbqsJuwpOoWJrYcmt0Iz2TUQYlP9aQmLVa cncRqOVrzb32odMHU4Ti8o8e+XEGAfM4zlbNH4eGSKxLyRVWOZQ3LzJUdiQQvX74w2bFA+ oQ90UJNc3eXxU66qwhGztyd4/v/BPQoYWW+T1wSBtTleAJ1wRAuUOTyrYLX/wtmMr/a6Qj W+CInA5pZ/O5EpynCRvpOJJtoTmYnxo8QLmy/nU4p8A714ABR8GdoWw4MlHtzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549822; a=rsa-sha256; cv=none; b=naPAHtca2LohOwjnVuv9Hg60mpaCxn686B1OOCFxI3ghL8SyeHpBepTDekwPE4DpcUMjgf Q+DnFzbmrLswU+Pabca4Q5wiN3m+la2gn+MFttJ6LX59/MOEeH5qUJWAPU6xDcQrfXuOpR C/ht8gHGbOTGcwfqY51Ec8cFodRMA6r6BeirB3kKB4Bnh3/CApFKrjYSSp3cF09iOWrKei f+U9cGSYf3z1mDP+DPJhvX05sl5AR6DVsIvrJ8DRZulBWWFDBoU65QA0ilqK7ERArZeDlV HuDSHLrbithOs3eiKW8iZeYyh/ClAY/9Vpjma2uFM2GQCKlSSRFdHlDL93PDtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=quYSNTQ9dXByehhoDrCX4NN5Pzg/xghLQumsw3i95D8=; b=NyxXAuKKetGYmGzNPCH2wQnaBEUs24Ea++2fIsnvustDVLGk+2hgW0sDNtCapMdqC8bGKx pOhYQvIUR5+QLI0T0XlHSUkoN+obTdbdZaHYqADpgLH8NPfnKaAQh1q8WTxDQZB1RUW1Ij ygFr1g9Xrai2uBrptD9M/lERqWxAd9mD1GRshG0QspazbQIwVElADEoAf99EdeL/R5ivrr K+ZsNWW4V94sQmxgwNi1qXiBXqGpDbC2oGPIi/1+ReWkJhAdtxbQBMzltwp59KAXhLC3im 8RyVBqo2jyYA6fE2kRpp9ReKdPLvuoNKyW6YKqRDqErFB8VWKyR4z8maRd+Pvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4t4t63z9r3; Tue, 17 Oct 2023 13:37: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 39HDb2Z3095599; Tue, 17 Oct 2023 13:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb218095596; Tue, 17 Oct 2023 13:37:02 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:02 GMT Message-Id: <202310171337.39HDb218095596@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: 7123222220aa - main - witness: Unconditionally initialize out-params for witness_save() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7123222220aa563dc16bf1989d335722e4ff57a6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7123222220aa563dc16bf1989d335722e4ff57a6 commit 7123222220aa563dc16bf1989d335722e4ff57a6 Author: Mark Johnston AuthorDate: 2023-10-16 17:23:40 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 witness: Unconditionally initialize out-params for witness_save() As of LLVM 16, the -fsanitize-memory-param-retval option is set to true by default, meaning that MSan will eagerly report uninitialized function parameters and return values, even if they are not used. A witness_save()/witness_restore() call pair fails this test since witness_save() may return before saving file and line number information. Modify witness_save() to initialize the out-params unconditionally; this appears to be the only instance of the problem triggered when booting to a login prompt, so let's just address it directly. Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. MFC after: 1 week --- sys/kern/subr_witness.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index d4ab085197f4..5b9f8afd9565 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -2362,6 +2362,10 @@ witness_save(struct lock_object *lock, const char **filep, int *linep) struct lock_instance *instance; struct lock_class *class; + /* Initialize for KMSAN's benefit. */ + *filep = NULL; + *linep = 0; + /* * This function is used independently in locking code to deal with * Giant, SCHEDULER_STOPPED() check can be removed here after Giant From nobody Tue Oct 17 13:37:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4w09GGz4xWhg; Tue, 17 Oct 2023 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8w4v6m7Dz3FMK; Tue, 17 Oct 2023 13:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PeX+Ph75PjUS0S/l2vFsgkCfjD+6CeQAaFZvFI4kzE=; b=Sie367JI0Mm2XpbR51AyXmXAVCyik7MCkMeidlxqhRsyGBfO/d/zb+30J6B9zmmru6NktO pguRKUfXzH+9Hy6EL5lD8FKyNCBI+wNi7aj1utkp4h2CP+rU/Vjt2SbDWHrI9u5kl5ohwD VzH6Y2SUW7qLmTSYek7jO5akyIu5yS+YrDj4pPoCreHNuIZMBIQSUjx2hZRnOK6ejOhvcx afAcbwCRS2QAUQ2jt8LN6VFv4jGX9/t0t2giFVqLO10pYMmgx3t5Oh5n//XaXI2EYPWUA8 xiZ/I7lFLe6nlThHvq3pTv37yhrDC6WPkMajCNMYMvbg8sJCdlhZBwotP8EQbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549823; a=rsa-sha256; cv=none; b=YDOc7PQBOl2eIGMeWggv2owBlkX96v0r9QB0eAmzo5+mXhsFxfro+AXyOim4oU3+JBYk7I WREZwHDOf1x9VsGtYmqEa3Y1fSbqd7PAev7CypCOD1yWn94Twtvk3enuB4WIOqgytbZrxn fm4UxvBDthxNM8OJoIpsInke4TvEM0YVK3tCaHd0/BUzWHtZr4GXpTP0u3x3CFHgnDZAbx L07v2FKO6A2ijhEilfbEJzCTxtBsHYc+2n/l+nBvcrAFWJsvfu8sd3rWig3JcVkUgqPqak JIr0pmuMOOZ6VMhN9qX9YJjcZThJ+mbVEnmh9FMnwzoEo3ZK5FrhqYgQLJerxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/PeX+Ph75PjUS0S/l2vFsgkCfjD+6CeQAaFZvFI4kzE=; b=I3uHvlM+bMChOMgDFc0wBX2ncnsnYfO26+ncY2cZmhoGcf5uevacQvVkDsKrHxNdqzVjH3 Z0YUGiul/SXLHOhhprlGcHd5gzUimuZwXs0BhxF6FN2Kszuz3lrKqlMIT1k1qJaJ1zSbFE lcKu48HKSnW5DF25MCltGAqOpi0wYnadpyeykcdMi3fsX5cXLOVTtYbR3vcXw2WHPgCKm7 YsdB4e/ZLotT226yA8zDJrqRF4jeutnJHiA8p6mjwtVaxHM7JLUJ4ON3t34Ud6uWR+5+Bq jcdoKO1QsdZX9HgsZkR7TjoNoZ2vhV/htD1fXUY37PsiiQKJB9Ikq9HaolOgEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4v5sy2z9hn; Tue, 17 Oct 2023 13:37: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 39HDb3q5095647; Tue, 17 Oct 2023 13:37:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb35s095644; Tue, 17 Oct 2023 13:37:03 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:03 GMT Message-Id: <202310171337.39HDb35s095644@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: e5caed14067b - main - kmsan: Use __builtin_memset to initialize per-thread state List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5caed14067b40f1454d74e99789a28508d0eea3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e5caed14067b40f1454d74e99789a28508d0eea3 commit e5caed14067b40f1454d74e99789a28508d0eea3 Author: Mark Johnston AuthorDate: 2023-10-16 19:37:19 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 kmsan: Use __builtin_memset to initialize per-thread state Accesses to KMSAN's TLS block are not instrumented, so there's no need to use kmsan_memset(). No functional change intended. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/kern/subr_msan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 54948370a14a..f8fdcf478b79 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -452,7 +452,7 @@ kmsan_thread_alloc(struct thread *td) sizeof(int)); mtd = malloc(sizeof(*mtd), M_KMSAN, M_WAITOK); } - kmsan_memset(mtd, 0, sizeof(*mtd)); + __builtin_memset(mtd, 0, sizeof(*mtd)); mtd->ctx = 0; if (td->td_kstack != 0) From nobody Tue Oct 17 13:37:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4x24yQz4xWfh; Tue, 17 Oct 2023 13:37: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 4S8w4x0gCtz3Ff6; Tue, 17 Oct 2023 13:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxgVXk982FwBRgHrOzWxTzjmqjMi7m06+Wt48lgLPS8=; b=mEKLZvib/3S2ewTzV0FxLPgvRYHi3ZbdDzbdqGr7Z3eBytCpTQOBN3QZ1aFyBvITidzvkP 4/xWUV8i7na60fwFCNkPixMnWHyanIr9u37/qKC8Taak7vCORaRYXvldPqAMmHKSXFxW3C sBWhfdx8Fo6URZq43+OipcgPNiwJ6D6bdL8vbPN3RHx6TAp+yHq1C/8LVz89hQHIEcYNlB /FI7422RjyLUw8nJc+Zb+Syh6tj7a204d7LRvNKcd/G76CjV6HleLdRHfspDEy5FabBkTd E9c/3IkkEcHoDt8F9hGs1GKzcvnqYf3fugzgE/j1fqbfeb1VnzqWwt6FXx/uIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549825; a=rsa-sha256; cv=none; b=K7XHLeyEAdUB9HDqHnBSDCF3Z+ey1T5Ds9kmtnj6or/bwueNZ5LcKv3E+VJFgZlAuITTJ4 7GeKxN+ePrhd0/4rm8WPhz5bSiql+RstgnXWi2fYy6BSHk/s8eVMfXZ6W9AihT7bzeTser A+78pEPigag0ZyaOYjwU2xa2UaCfFhPEpm7ERafbLNMsgK1ZUwHAJl1gfJz5wGZ+w0sbOz lEtEiWWNaYz2nP/lzbQqWmVNzgwYWQiR4OcMcouX6/G4ZRm1M0UEQw3TlO7x6KW2Z2bMQB 15inSeDwbnaT9XyEH4EsbnuPefTV5Tr2968q+hO/vq3lk4Ov+LGLJJmbrnc6sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxgVXk982FwBRgHrOzWxTzjmqjMi7m06+Wt48lgLPS8=; b=mFQFpvixKKM3J5hovPuLnNeHnsL+SUcxVrQw9O561RjonBjnG72BXj3O3MIz9YHpqXsMur KnbgHW7RUCe2BjR6JncPF8lb399IuOxApxOk0HqzOKu2NUclw/3hhZybf1ROFetgW3A0J8 wpVFLetb407oAagpQgKHyJdV5XDOJ/zYrrq/y0SH47H+7BN3pj80Hwe201MNcv/wyjVEDw CAhYsqiUh9eXoiI6VAsWQc0Ys64uiVqWW4ZuNfYxH0ccfT4dAEPqm+nC+lSwNbJjpRCAmP Hj8B6zVhzXpomfRmB5jIFKoXDaa5JO+8sMJ//ZsQxtnWBtW64kijg8FWZ2eEKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4w6sBkz9hp; Tue, 17 Oct 2023 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HDb4Nd095689; Tue, 17 Oct 2023 13:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb4Xp095686; Tue, 17 Oct 2023 13:37:04 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:04 GMT Message-Id: <202310171337.39HDb4Xp095686@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: b6c653c97463 - main - kmsan: Set -fno-sanitize-memory-param-retval for now List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6c653c9746342b373af01979319b3cb123b2872 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b6c653c9746342b373af01979319b3cb123b2872 commit b6c653c9746342b373af01979319b3cb123b2872 Author: Mark Johnston AuthorDate: 2023-10-16 19:45:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:05:45 +0000 kmsan: Set -fno-sanitize-memory-param-retval for now As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields significantly smaller code, but the KMSAN runtime interceptors need to be updated to stop checking shadow state of parameters. Apply a minimal workaround for now. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. --- sys/conf/files | 2 +- sys/conf/kern.pre.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index dc837eb02c06..8c3bdca61905 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3872,7 +3872,7 @@ kern/subr_mchain.c optional libmchain kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ - compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fstack-protector*}" kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4d37cd4156f0..158175eb6899 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,8 +122,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kcsan \ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo .if !empty(KMSAN_ENABLED) +# Disable -fno-sanitize-memory-param-retval until interceptors have been +# updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory + -fsanitize=kernel-memory \ + -fno-sanitize-memory-param-retval .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo From nobody Tue Oct 17 13:37:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4y286Hz4xWNZ; Tue, 17 Oct 2023 13:37: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 4S8w4y1h6Pz3FmM; Tue, 17 Oct 2023 13:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oOjgKnE3+I/Q9Zy3ViLHo5gNHJ4ZLG0FJoljmFxwgE=; b=N4Va8yKaicDvB1swl864xR+smv4fgOhzvc5HgDEqJmM+Qm0lXmhLTj7UAXYt3NSwoUWig5 WM4RIXqCyM5uqTid1GrE0TUiEjXNPLX26RaHZCykphuLUxgvjDD7R7IY6KUJrKn+d+yVPi EgiuZ/W9pkuxLKsa3ZIcOs0cQzSFoPAxxIttoW4v9o3R9+eDIourOwQP+W6/yBosjbu0I5 UiRcF/VP4XOmNWnJJRPnCSYTpy75CZC6JrrFm33fqSSqh1BZFnF8nG5bl1nUFtVc31HSv5 UcvEw1xMZoh/WrCEV7hAMwX8UJxYUVtaKzgRrNtBYwaXqyPb+lThLYaBcSjLCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549826; a=rsa-sha256; cv=none; b=xs/8adL7L3lNp3Qba2jBjVIo9i+evh2vmJ+7BC6J0zXNAuUNfoLUOBySvKGskTJDQ424P2 cPT9hLo5TAEeqCTqvdPA9iqFvcqbORNl+26qhlTX/F5SRBdycnXEpXeYcK7YSXRwFGH6Zg k9Wbi22SHgJMGD+6kkIhmF+XdnbVaEP3F3W/MqCukGr/6jfZOdyvMiI5UOX/N9pslCqeOP mX0FodgDZ4ulydCutUXjq4QKIj5/2MNI8oGx3ZyaVFMgXDC5R1BkZKjCKRAdmPlf/whe9N giSYIbaqukA1egqNfWYLw/DwkH/Jd1+9PjKPGzuRAo1C8N/dUtD552qtUBoZQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9oOjgKnE3+I/Q9Zy3ViLHo5gNHJ4ZLG0FJoljmFxwgE=; b=CypOVB66wj5OHlwmBKIFVDsYzpqpjsPNHQ11o2rj2H4x7FP23D+ijf/X339401BXxJ/wKK 91/yqDEKK5RRziptdmCT/eX2NQ1suqBnRekRwOu5lmk/ZfW1KPq4PAywZvIl4+nMTtQ+vF OAk9DS1Szgf0clXFors9TxNSWvUc5IHEJWLTL3tEyUbR0+GcVBISjrQS7n4thM/o13SYDY YJXJSvxJ3ZsE5Bcqg60IGQ82OVZLsf0YHMgaSRtCIY1t0BIsWO6RABhKRShrLQmbLfT41r T4GDAD5nn7tknBInasPBRu0aNeypHd00WBNT+B3lb0RUs/FINUOSUVwrt8eojA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4y0kFVz9Q5; Tue, 17 Oct 2023 13:37: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 39HDb6Fx095731; Tue, 17 Oct 2023 13:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb67k095728; Tue, 17 Oct 2023 13:37:06 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:06 GMT Message-Id: <202310171337.39HDb67k095728@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: a37e484d0497 - main - amd64: Zero-fill AP PCPU pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a37e484d049758c70f2d61be0d28a115b6f2f01e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a37e484d049758c70f2d61be0d28a115b6f2f01e commit a37e484d049758c70f2d61be0d28a115b6f2f01e Author: Mark Johnston AuthorDate: 2023-10-16 22:40:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:08 +0000 amd64: Zero-fill AP PCPU pages At least KMSAN relies on zero-initialization of AP PCPU regions, see commit 4b136ef259ce. Prior to commit af1c6d3f3013 these were allocated with allocpages() in the amd64 pmap, which always returns zero-initialized memory. Reviewed by: kib Fixes: af1c6d3f3013 ("amd64: do not leak pcpu pages") MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42241 --- sys/amd64/amd64/mp_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index ec4501c3aeed..d506ffada4b9 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -300,11 +300,12 @@ amd64_mp_alloc_pcpu(void) m = NULL; if (vm_ndomains > 1) { m = vm_page_alloc_noobj_domain( - acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), 0); + acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), + VM_ALLOC_ZERO); } if (m == NULL) #endif - m = vm_page_alloc_noobj(0); + m = vm_page_alloc_noobj(VM_ALLOC_ZERO); if (m == NULL) panic("cannot alloc pcpu page for cpu %d", cpu); pmap_qenter((vm_offset_t)&__pcpu[cpu], &m, 1); From nobody Tue Oct 17 13:37:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w4z3J8Hz4xWnl; Tue, 17 Oct 2023 13:37: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 4S8w4z2bnkz3FnS; Tue, 17 Oct 2023 13:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4FYlXDS0Q2AbcG5PjbgGodc2JToTOXxmKmum7IFsng=; b=dAKIkxkvyQhr8bi1s11HbcnESTxmekMf13r7XZ0JQSkuZLUdSepBcppmlRnaSC4eGfNA2d +R6i99/9w9xmrAu1XMaaLJ9cKhVPBibgFQakeVyONuxMet4d3ehsjlxIJeeqx31hEnAPRL uySJlC5FjoM046NgTFOLld6clJ3Zq0zE2C55CAJMDOKYoK4OQm/6Mx2ejY51oB3sphjuY+ sVAG6uUskHMEEyFZPmbHVI6UlzehSChAK8nW+p0Lg7aW0Eo+DnTgR997X8cE7jG3RyM4wJ SyIoYoGHLk+3yvxmZdjs3Ve8fFXDgOIvTFnkFbsf2lOoMSSk4WPSz6mSPz8r9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549827; a=rsa-sha256; cv=none; b=XI8DUGWS/FnpaEHZ46JcURlr9bo78NE3oxvg82qoJTtEa61/6eFThy9P3Z8hdHYMmHteVB NQa/HY5lVYdXUlbz7PyvJ8sx2GACexjuK+ve+Cs8YObVx760tGhgl4uRG2g/wN317zQ09m jwW8Dgpuxuq/mTvgXkYRHgAerZSVOvROA+/dK37bA3OULbte772768AR8X6bz9jNktJl6w m43mAXodR3inp+Y5inW1rFwu6cD3r30Qi5brv5f9MdGjr1oAMJiIsNHFlAHVvzqntOU0eU tTNpCWCcbDoWNVvKib42q+YWGRlkHKa7sqxIhuZYp1q5f+oCL7KIvGLqbYXk3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4FYlXDS0Q2AbcG5PjbgGodc2JToTOXxmKmum7IFsng=; b=QvHBMwMzc7AAaLo9CKneZr031JiQ3Jqala9DB4mSgOQJ4mwwEv4GcIIC3ne5rK3GUXY/dZ HnYOb9Xigy5Uxw3DjZj08KfjBBaChTQSR55aO7XjglL0d3xyII5qytg+HW94EBYZpBFa+P L+ZPBry6markdW7ZwLZkgBxInsNu1WBa4AVT+/E1x2IAsD95AVEwEA6iRYdMdMvgr6wnKm /P0QZQ8RIAY5/zRdmQm8WzjlawnSw+f+JMHukztLg/68/MBCkMzg282whE6IQfj9bYFy5V MtGitJukojH5eXjy/2RbXRLffIy6g4/l/JF5oOyV5jFaAANQ4TvkODhYAsxeLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w4z1hZczBGj; Tue, 17 Oct 2023 13:37: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 39HDb7w2095783; Tue, 17 Oct 2023 13:37:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb76r095780; Tue, 17 Oct 2023 13:37:07 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:07 GMT Message-Id: <202310171337.39HDb76r095780@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: 761ae1ce798a - main - ktrace: Handle uio_resid underflow via MSG_TRUNC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 761ae1ce798add862d78728cc5ac5240ce7db779 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=761ae1ce798add862d78728cc5ac5240ce7db779 commit 761ae1ce798add862d78728cc5ac5240ce7db779 Author: Mark Johnston AuthorDate: 2023-10-16 20:11:55 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:19 +0000 ktrace: Handle uio_resid underflow via MSG_TRUNC When recvmsg(2) is used with MSG_TRUNC on an atomic socket type (DGRAM or SEQPACKET), soreceive_generic() and uipc_peek_dgram() may intentionally underflow uio_resid so that userspace can find out how many bytes it should have asked for. If this happens, and KTR_GENIO is enabled, ktrgenio() will attempt to copy in beyond the end of the output buffer's iovec. In general this will silently cause the ktrace operation to fail since it'll result in EFAULT from uiomove(). Let's be more careful and make sure not to try and copy more bytes than we have. Fixes: be1f485d7d6b ("sockets: add MSG_TRUNC flag handling for recvfrom()/recvmsg().") Reported by: syzbot+30b4bb0c0bc0f53ac198@syzkaller.appspotmail.com Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42099 --- sys/kern/uipc_syscalls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 2dad9d487290..c7c2e6544902 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -948,7 +948,8 @@ kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, AUDIT_ARG_SOCKADDR(td, AT_FDCWD, fromsa); #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; + /* MSG_TRUNC can trigger underflow of uio_resid. */ + ktruio->uio_resid = MIN(len - auio.uio_resid, len); ktrgenio(s, UIO_READ, ktruio, error); } #endif From nobody Tue Oct 17 13:37:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w503Z2Cz4xWnx; Tue, 17 Oct 2023 13:37: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 4S8w5035F3z3Fww; Tue, 17 Oct 2023 13:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg8W7BP5pvV7t00mCCCmgz3sdPzc5M9D6J+djyCRDyc=; b=YD00NUPkayxyUAShJRAP6MkQdCU/RxQKHjbGzUhmY1k0K0LaAS0m5bhhYu1jsubuFWbJ2H Uji+/FlHKzkKWnxV0fPUGTROV7dC2V+JFJ+Zs6YUMQWQEx/+9h6Jr90mdKsX4avcvPNIh5 70aH4qtTGM6mtTxNw2EHcDqndZDoXKqpBEA3Xgv/C+l8PMBuU5g63d0AzMT+Wc5Ii3UWIq ZT8GD+/mEsDAY/OYOmEP4PGCuqdEOfVWLWXUrBWI/MewNNwbu5/DMLOm5DBm3ByXyQ4LPS nil/Jmu5RhdU5wyb6snhs3vZGGpGjuLZgglYezYAZCnKIYsv2R+QtlxeO+VpjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549828; a=rsa-sha256; cv=none; b=svy67dimeFAgEHDjcOAJJIIaMbkhwNaGjD+bvQLen8IQShxZN0Ff8pP6GeLyCUNVorPlHA 64EPawg+y3YOx4+g7E034e6XH2Qy0vTShR1rXe8ogCgf7rGRUUV7lWokBe8pM0Aun5fECk DQIcP5Yl+6NMYQTQ70lZlh1udZG9pAxwIyQyS4AT86TmmkBLxw8m3jNpMI+mhttQgQ8vOV 2Wd4ukfH/B/wxOod2mtDPz9t086j7ffW+IhvKZBkzP94dE7j3Upf0NvaRtj+ZLTaWYeACz GpDr29781AuRfbfEwYpXTMw5XexsNbBuNzWcn5gwoVksurcbyIjEMPutKeyfPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rg8W7BP5pvV7t00mCCCmgz3sdPzc5M9D6J+djyCRDyc=; b=NRNr9fkB+PMm3/XVTpueyJxg1vTrVO+3NTgxG7NZmdrNG7qWTiGmFAkFIwg5JClurDKvvE K5X1EpTywUhfR9ClSoLRtiDNJtpeUazmxq3+CKdf/iFZBaXWgkybAcbYjOUST4XtIdMvcC 1+oGq3fmyWA9qsCYSlZG8cvPCGccNOM19pA6bHA0GdEhK9/ITkL1zABea71QhQOC6dMAyK 3RblAyo8m/o/nSakR4bGxPvplaO3mYDif5TmMpsKmhQnSCnltQES+UzbS4TV7uOl9p0Nsx 8YzBoe2OEs4yTG66EFbg7jBBmwURHTurJkjj5vyHFi+tGhsQ9fZ2nTJDf8mvOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w5029B5z9hq; Tue, 17 Oct 2023 13:37: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 39HDb8m2095822; Tue, 17 Oct 2023 13:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb8oW095819; Tue, 17 Oct 2023 13:37:08 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:08 GMT Message-Id: <202310171337.39HDb8oW095819@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: 8fd0ec53deaa - main - uiomove: Add some assertions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fd0ec53deaad34383d4b344714b74d67105b258 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8fd0ec53deaad34383d4b344714b74d67105b258 commit 8fd0ec53deaad34383d4b344714b74d67105b258 Author: Mark Johnston AuthorDate: 2023-10-16 20:12:37 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:19 +0000 uiomove: Add some assertions Make sure that we don't try to copy with a negative resid. Make sure that we don't walk off the end of the iovec array. Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42098 --- sys/amd64/amd64/uio_machdep.c | 6 ++++++ sys/arm/arm/uio_machdep.c | 6 ++++++ sys/arm64/arm64/uio_machdep.c | 6 ++++++ sys/i386/i386/uio_machdep.c | 6 ++++++ sys/kern/subr_uio.c | 5 +++++ sys/powerpc/powerpc/uio_machdep.c | 5 +++++ sys/riscv/riscv/uio_machdep.c | 6 ++++++ 7 files changed, 40 insertions(+) diff --git a/sys/amd64/amd64/uio_machdep.c b/sys/amd64/amd64/uio_machdep.c index f3e80addc92c..67e14d8e0d12 100644 --- a/sys/amd64/amd64/uio_machdep.c +++ b/sys/amd64/amd64/uio_machdep.c @@ -71,10 +71,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm/arm/uio_machdep.c b/sys/arm/arm/uio_machdep.c index 07531f76217b..18661ebd1652 100644 --- a/sys/arm/arm/uio_machdep.c +++ b/sys/arm/arm/uio_machdep.c @@ -72,9 +72,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/arm64/arm64/uio_machdep.c b/sys/arm64/arm64/uio_machdep.c index f9e4e7a9547f..4fdcaf74890c 100644 --- a/sys/arm64/arm64/uio_machdep.c +++ b/sys/arm64/arm64/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c index 07d71eac5db6..92e067b35bed 100644 --- a/sys/i386/i386/uio_machdep.c +++ b/sys/i386/i386/uio_machdep.c @@ -71,9 +71,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 21a1f044db54..b0c4a256cd17 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -216,6 +216,8 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) ("uiomove: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); if (uio->uio_segflg == UIO_USERSPACE) { newflags = TDP_DEADLKTREAT; @@ -234,6 +236,9 @@ uiomove_faultflag(void *cp, int n, struct uio *uio, int nofault) } while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/powerpc/powerpc/uio_machdep.c b/sys/powerpc/powerpc/uio_machdep.c index 679139a96e99..5de2dd8b416b 100644 --- a/sys/powerpc/powerpc/uio_machdep.c +++ b/sys/powerpc/powerpc/uio_machdep.c @@ -75,10 +75,15 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { diff --git a/sys/riscv/riscv/uio_machdep.c b/sys/riscv/riscv/uio_machdep.c index 86a39be12cdb..e2f82974b2e9 100644 --- a/sys/riscv/riscv/uio_machdep.c +++ b/sys/riscv/riscv/uio_machdep.c @@ -69,10 +69,16 @@ uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio) ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); + KASSERT(uio->uio_resid >= 0, + ("%s: uio %p resid underflow", __func__, uio)); + save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; mapped = false; while (n > 0 && uio->uio_resid) { + KASSERT(uio->uio_iovcnt > 0, + ("%s: uio %p iovcnt underflow", __func__, uio)); + iov = uio->uio_iov; cnt = iov->iov_len; if (cnt == 0) { From nobody Tue Oct 17 13:37:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w5219L0z4xWT5; Tue, 17 Oct 2023 13:37: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 4S8w514Jq8z3G4t; Tue, 17 Oct 2023 13:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkv+G5kmL8LRADhorMuEUexOZHSu8du8Fss6tdDVqVU=; b=fnhTlHWABwBncsAENkmjySbZbgJsXOkloMQZvsptRGmcYO0IEajL3ndz1dDCn0JJNW9XVa TCadk46NkK2kVtD21YwZRf9jGrE1DNYlPuuL3AH7fu4ipxH6z18VACruZ26T+vM0nBC8ho qTW5jeDM+xrm4DF3az4IrTcV8GEwHob6G7jaM4T0pgTLVUDkQ8lGvdinB10+uVKswZdYre +OlnmxANPey3r336OeVTJyqJPLXb8zqJXek8WLAzP3srMe/WXrGNtyuG5UtFfgIABAt8JY gWfGLpHdvOTzY3MUVVvcMLqCgq6GM9syfRfKxPSjKxq4L0vM6F09T4hFcSnFiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549829; a=rsa-sha256; cv=none; b=T4q6gVVz3lBjtasGffUitujzHHH49obb0f82XyyxpiCeTufNLyu5W8yhraAMiM0Dz56ubF xaPZxokqX7JmwThBuFXF2R8GpaUB/WAI8ZfUwduHIcoAlHWCNeVYY+IhtvjZfCZjiFKoyx CL5zJVuYqPtu3RLwHrmn5f4gZFWRyPxaW4Yq/90Xog03wOr7eSwEpJR33hrg9ctPaMb2ae O3ta9P1VOFVxhgIcLEUYCeYysobhdZOVHqd3fHRMUOyu7cIrlW2OqWGl4Y/k0o/wQjV3Is XETSJzG2wVf2k8Sdxk7Hc8KEH5m7cdNIW6IznUW6HNS+gbdii325a6EElqDwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fkv+G5kmL8LRADhorMuEUexOZHSu8du8Fss6tdDVqVU=; b=GsWQQsdEgo3TZe1xKqzYUqfGASY4V+9V4WD5UoZrWX0LcCShy1qB/W0cPZFVXy7cNdjeNk qIssy20UuH36b38lLhv6OJPtrb+vWiuLD9g4MIgCgH+ttkl6jLv4xChwPTaMiKf+qndOeR KOe6fzs7DNku2Ee8BnWoA2fsea6lO95UcZBhfBV0dWYhEFyBquaTSJBFticuOdyzPfwT1L GJmyYtaxPrthkbFY5N4zTYAqmnrcnxkFKVPrb8HTVzFUkw3V7wCBe7ASp55DMutgwLTJNi VSDSdbIHt7+ILHLqsYaPRjftYE3jkZrmkMV6CBykT/aY5MH9LqJyRioGEKyk8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w513QmSzB7W; Tue, 17 Oct 2023 13:37: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 39HDb90B095881; Tue, 17 Oct 2023 13:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDb9cB095879; Tue, 17 Oct 2023 13:37:09 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:09 GMT Message-Id: <202310171337.39HDb9cB095879@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: b5e7dbac756a - main - socket tests: Clean up the MSG_TRUNC regression tests a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5e7dbac756afb49c58315c7081737b34a1d2dfd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e7dbac756afb49c58315c7081737b34a1d2dfd commit b5e7dbac756afb49c58315c7081737b34a1d2dfd Author: Mark Johnston AuthorDate: 2023-10-16 21:35:07 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:36 +0000 socket tests: Clean up the MSG_TRUNC regression tests a bit - Fix style. - Move test case-specific code out of the shared function and into the individual test cases. - Remove unneeded setting of SO_REUSEPORT. - Avoid unnecessary copying. - Use ATF_REQUIRE* instead of ATF_CHECK*. The former cause test execution to stop after a failed assertion, which is what we want. - Add a test case for AF_LOCAL/SOCK_SEQPACKET sockets. MFC after: 1 week --- tests/sys/kern/socket_msg_trunc.c | 230 +++++++++++++++++++++----------------- 1 file changed, 128 insertions(+), 102 deletions(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index a863705adbae..469b9e1503cd 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -25,143 +25,169 @@ * SUCH DAMAGE. */ -#include -#include -#include +#include #include #include #include + #include + #include +#include +#include #include static void -check_recvmsg(const char *test_name) +check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], + size_t nsizes) { - int ss, cs, rc; - struct sockaddr *sa; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - struct sockaddr_un saun; - int *sizes, sizes_count; - int one = 1; - - - if (!strcmp(test_name, "udp")) { - ss = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_len = sizeof(sin); - sin.sin_port = htons(6666); - sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - sa = (struct sockaddr *)&sin; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "udp6")) { - ss = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&sin6, sizeof(sin6)); - sin6.sin6_family = AF_INET6; - sin6.sin6_len = sizeof(sin6); - sin6.sin6_port = htons(6666); - const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; - sin6.sin6_addr = in6loopback; - sa = (struct sockaddr *)&sin6; - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_INET6, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int inet_sizes[] = {80, 255, 256, 1024, 4096, 9000}; - sizes_count = sizeof(inet_sizes) / sizeof(int); - sizes = malloc(sizeof(inet_sizes)); - memcpy(sizes, inet_sizes, sizeof(inet_sizes)); - - } else if (!strcmp(test_name, "unix")) { - const char *PATH = "/tmp/test_check_recvmsg_socket"; - ss = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(ss >= 0); - rc = setsockopt(ss, SOL_SOCKET, SO_REUSEPORT, &one, sizeof(one)); - ATF_CHECK_EQ(0, rc); - bzero(&saun, sizeof(saun)); - saun.sun_family = AF_UNIX; - strcpy(saun.sun_path, PATH); - saun.sun_len = sizeof(saun); - sa = (struct sockaddr *)&saun; - unlink(PATH); - rc = bind(ss, sa, sa->sa_len); - ATF_CHECK_EQ(0, rc); - - cs = socket(PF_UNIX, SOCK_DGRAM, 0); - ATF_CHECK(cs >= 0); - int unix_sizes[] = {80, 255, 256, 1024, 2000}; - sizes_count = sizeof(unix_sizes) / sizeof(int); - sizes = malloc(sizeof(unix_sizes)); - memcpy(sizes, unix_sizes, sizeof(unix_sizes)); - } else - return; - char buf[4096]; + memset(buf, 0xFF, sizeof(buf)); - for (int i = 0; i < sizes_count; i++) { - int sz = sizes[i]; + for (size_t i = 0; i < nsizes; i++) { + ssize_t rc; + size_t sz = sizes[i]; char tbuf[1]; + rc = sendto(cs, buf, sz, 0, sa, sa->sa_len); - ATF_REQUIRE_EQ(rc, sz); + ATF_REQUIRE_MSG(rc != -1, "sendto failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, NULL, 0, MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_PEEK | MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); rc = recv(ss, tbuf, sizeof(tbuf), MSG_TRUNC); - ATF_CHECK_EQ(rc, sz); + ATF_REQUIRE_MSG(rc >= 0, "recv failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)rc == sz); } - close(ss); - close(cs); + ATF_REQUIRE(close(cs) == 0); + ATF_REQUIRE(close(ss) == 0); } -ATF_TC_WITHOUT_HEAD(socket_afinet_udp_recv_trunc); -ATF_TC_BODY(socket_afinet_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet_udp); +ATF_TC_BODY(recv_trunc_afinet_udp, tc) { - check_recvmsg("udp"); + struct sockaddr_in sin; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = AF_INET; + sin.sin_len = sizeof(sin); + sin.sin_port = htons(6666); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sa = (struct sockaddr *)&sin; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afinet6_udp_recv_trunc); -ATF_TC_BODY(socket_afinet6_udp_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afinet6_udp); +ATF_TC_BODY(recv_trunc_afinet6_udp, tc) { - check_recvmsg("udp6"); + struct sockaddr_in6 sin6; + struct sockaddr *sa; + int cs, ss, rc; + + ss = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + memset(&sin6, 0, sizeof(sin6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_len = sizeof(sin6); + sin6.sin6_port = htons(6666); + const struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; + sin6.sin6_addr = in6loopback; + sa = (struct sockaddr *)&sin6; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 4096, 9000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } -ATF_TC_WITHOUT_HEAD(socket_afunix_recv_trunc); -ATF_TC_BODY(socket_afunix_recv_trunc, tc) +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_dgram); +ATF_TC_BODY(recv_trunc_afunix_dgram, tc) { - check_recvmsg("unix"); + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, cs, rc; + + ss = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_DGRAM, 0); + ATF_REQUIRE(cs >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, ss, sa, sizes, nitems(sizes)); } +ATF_TC_WITHOUT_HEAD(recv_trunc_afunix_seqpacket); +ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) +{ + struct sockaddr_un sun; + struct sockaddr *sa; + int ss, nss, cs, rc; + + ss = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(ss >= 0); + + bzero(&sun, sizeof(sun)); + sun.sun_family = AF_UNIX; + strlcpy(sun.sun_path, "test_check_recvmsg_socket", sizeof(sun.sun_path)); + sun.sun_len = sizeof(sun); + sa = (struct sockaddr *)&sun; + rc = bind(ss, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "bind failed: %s", strerror(errno)); + rc = listen(ss, 1); + ATF_REQUIRE_MSG(rc == 0, "listen failed: %s", strerror(errno)); + + cs = socket(PF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE(cs >= 0); + rc = connect(cs, sa, sa->sa_len); + ATF_REQUIRE_MSG(rc == 0, "connect failed: %s", strerror(errno)); + nss = accept(ss, NULL, NULL); + ATF_REQUIRE(nss >= 0); + + size_t sizes[] = {80, 255, 256, 1024, 2000}; + check_recvmsg(cs, nss, sa, sizes, nitems(sizes)); + + ATF_REQUIRE(close(ss) == 0); +} ATF_TP_ADD_TCS(tp) { + ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); + ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); - ATF_TP_ADD_TC(tp, socket_afinet_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afinet6_udp_recv_trunc); - ATF_TP_ADD_TC(tp, socket_afunix_recv_trunc); - - return atf_no_error(); + return (atf_no_error()); } From nobody Tue Oct 17 13:37:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8w530C02z4xWrQ; Tue, 17 Oct 2023 13:37: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 4S8w525dcSz3GG0; Tue, 17 Oct 2023 13:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z05AGBtfV5p0MGWgHu8wVZ7VlSzmkyGQEDSQ8AJz1vk=; b=IrFruGjowKTCkarKhasAtjh1M/R3jBk3BbMWty1rduJYxTilkseWtEknGwSYj0EO2KsaGG ZMkB+2SPxmA83xezFJDp4t2oKP/qQ0IC4ePfhIhRxXnYhpcJIudohkWFw2Y8ZfkDJpFj2P 1OvFBtDn1cB+LZ73hMdVkG6jScjHW22WH+byXFW2jTPbMqW6q/c7OyQT44ZvACBr9g5T/1 4wVojWU4nlAp+Ak7Qe30A9PK7hYMbV86WvWA2UlpJO+0GwLYt6WdUC1PjsaXPVXvAI3Iuq hTVcgTs7I06l+un4l5aTQbMJCESkpv+NCCDjDzui8vWB0mr+rBsGr27ofOcdXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697549830; a=rsa-sha256; cv=none; b=M8TicKHvNvQ6QOI+SjkZ2xnB7OxugGLa20sAwWMG6ZYn9nsftQdQGKOf8wNmbps5V648zr cOm5XVWxepzyWNXBF6kICs/Nyw0kwcAZ58idLPhE8GcDFNwTCcKm1V5+acOp0zAONWT425 Ct1ahGHqL8WtxOfMmVdvEz3Qsis/TqZKwRrxnHSwv8NAr13sdgKKTnU5SFYUFoqa3Ayt6v Jdr/bdJqUPTwN7HEMiVX+KFWoQ2GzOIFaOcdqSK9YLPVyO6/ZMLgVNwnqVLJ1xS4KLC6Yt bq+V+e1RgIOdgGqxOValhtVJy+Wap5gqsndiReZ3nM8iLbpqQKVQB8X23TuBJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697549830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z05AGBtfV5p0MGWgHu8wVZ7VlSzmkyGQEDSQ8AJz1vk=; b=AV6TEWlHCiUjae/XoPjuVfYapHUvigUjEX+NrXxtQuOoSSlfbgFKTrvc4FCwsp/Q63ixfr 62gaPkdX+/tl5ZX71cJcgOil0EZd0J+FGT8hPmlaS2pIJNfBlxsNRk1f9tBuAI46aV8ysu tAcs55tG80CVMga4NBqYPqJv7Xut7s1Aa280hS5gvKY4atys0x/736CPcH1wGhk9UlLgDA HU4YXcgfddKw4DtABsOkZtLQHiihEEAi4NIFH2FnCPMEpTyo8EcRrm79OdkdoNMNQ1bnSb sBkLt2yf3KVQRZjOLlC+Q4hoLDfHe+kyK4Hscy5qWcZgv5SjYOY/md/4z0SMxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8w524SvZz9hr; Tue, 17 Oct 2023 13:37: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 39HDbABm095932; Tue, 17 Oct 2023 13:37:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDbAKs095929; Tue, 17 Oct 2023 13:37:10 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:37:10 GMT Message-Id: <202310171337.39HDbAKs095929@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: d8735eb7acc0 - main - socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e commit d8735eb7acc0613fd19f74a49d3bdcb7ed0e9b0e Author: Mark Johnston AuthorDate: 2023-10-16 22:23:36 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 13:12:57 +0000 socket tests: Add a regression test for ktrace+recv(MSG_TRUNC) MFC after: 1 week --- tests/sys/kern/socket_msg_trunc.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 469b9e1503cd..279170158643 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -27,11 +27,13 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -182,12 +184,67 @@ ATF_TC_BODY(recv_trunc_afunix_seqpacket, tc) ATF_REQUIRE(close(ss) == 0); } +/* + * Exercise the case where ktrace was used to dump a truncated buffer. + */ +ATF_TC_WITHOUT_HEAD(recvmsg_trunc_ktrace_uio); +ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) +{ + struct ktr_header ktr; + struct msghdr msg; + struct iovec iov; + const char *tracepath; + char buf[128]; + ssize_t nbytes; + int error, fd, sd[2]; + + tracepath = "ktrace"; + + error = socketpair(AF_UNIX, SOCK_DGRAM, 0, sd); + ATF_REQUIRE(error == 0); + + memset(buf, 0, sizeof(buf)); + nbytes = send(sd[0], buf, sizeof(buf), 0); + ATF_REQUIRE_MSG(nbytes >= 0, "send failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + + fd = open(tracepath, O_RDWR | O_CREAT | O_TRUNC, 0644); + ATF_REQUIRE_MSG(fd >= 0, "open failed: %s", strerror(errno)); + error = ktrace(tracepath, KTROP_SET, KTRFAC_GENIO, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(SET) failed: %s", strerror(errno)); + + iov.iov_base = buf; + iov.iov_len = sizeof(buf) - 1; /* truncate */ + memset(&msg, 0, sizeof(msg)); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + nbytes = recvmsg(sd[1], &msg, MSG_TRUNC); + ATF_REQUIRE_MSG(nbytes >= 0, "recvmsg failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(buf)); + ATF_REQUIRE((msg.msg_flags & MSG_TRUNC) != 0); + + error = ktrace(tracepath, KTROP_CLEARFILE, 0, getpid()); + ATF_REQUIRE_MSG(error == 0, + "ktrace(CLEARFILE) failed: %s", strerror(errno)); + + nbytes = read(fd, &ktr, sizeof(ktr)); + ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); + ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); + ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + + ATF_REQUIRE(close(fd) == 0); + ATF_REQUIRE(close(sd[0]) == 0); + ATF_REQUIRE(close(sd[1]) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, recv_trunc_afinet_udp); ATF_TP_ADD_TC(tp, recv_trunc_afinet6_udp); ATF_TP_ADD_TC(tp, recv_trunc_afunix_dgram); ATF_TP_ADD_TC(tp, recv_trunc_afunix_seqpacket); + ATF_TP_ADD_TC(tp, recvmsg_trunc_ktrace_uio); return (atf_no_error()); } From nobody Tue Oct 17 13:58:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8wYC37tNz4xXn6; Tue, 17 Oct 2023 13:58: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 4S8wYC2cvCz3MbZ; Tue, 17 Oct 2023 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=L8l3Y+mNaorgIczpOoURBoLQB9BqR9HzDTKQyLQtfKtdd/UWkFuAhErLDv/CLPo+YHM02a BIxaNTAmac7RVM+O78WLw7aHPmGHZS3/6rXc1V1V1IOOBMW8T5JBZifbq9F0y1oMmlO+/y sWDNpXdTatNRc9WOPmV6q5FCM7qlJ5QTIV1S2s85yiRnk0S5E0xHCuUyKpK7BKKF9Dg8Im NW9EfwiImXmoIKOfPd1FfyBkUbQRH78g9RksBCzzQ1fkTz6z8WVmmOr+ru9njdfvGfOnr9 8y1PS24C/QIBy7epDRHt6so/NgKVFBlwFuvkRD5/OtLbrOiwBavDaVOvk2cgBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697551087; a=rsa-sha256; cv=none; b=xFr01KkaoQudD/Je0fCf/fFE54o3gx4UKLz3KfrSkWXMBftr9J0rt8V+x4HcnSee1wr0JC ptkEe6Ju65Ws/rWr8BiBldN/raUlv9SR/+DA5Sf9L0g21Egsv3OftgRdhjqz2/WRpNI2M+ wpEdKqZw4LBWgxdxyepxj3BIm3fv1DLRsYV2xOYWs+60j5N3cJfhJBE1zugWTDv91gpjC3 Km8BD2I9DFt8tN4Nti5Wzh63h5nMk1dNTSP+81EAOCpbDUgFLud1P4JTDWAvm/Yk4vQ66P w7e6UZCZh+OYX76cTpC8ESRJiIHTgG59cARlwhHAG28NmbyiAsapjONX8U0oEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HZsx3gRkpPe7jnoe5iYhHg1uOirV6ZrN1Jpx3TfGqkI=; b=kxgJxeT1RWNK59LRb3tkMJuMLHQ/HIw4U6tWT0GzEuhLOkNILTGbJQtUB0SdlhOH5n51ik XW8spIEMlwy0iqMY7qq5rilKj5xG2FweZrFhMs7F1JMhxKgIkEG5W5tB+pBYqKccWaYHk5 33U32hc5GCCKslHKHOMGM2q5outHHLxuqz11lzhjPv9UWdD9j2WD/yJ8axzg82in4EFl1c QVv48V9IhCUPVIxizQ2kMY/OEM44sbKCz4MPciYATYSJ5TdqahsBp7i1U+d+/x19PWXGek M6/C84wmu9w9B6vQMPTHYOLuEXLbmvQjHiD8dPujIxMoAZBWmf29mBQS+l91Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8wYC1RRvzBJs; Tue, 17 Oct 2023 13:58: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 39HDw7dR029963; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HDw7kp029960; Tue, 17 Oct 2023 13:58:07 GMT (envelope-from git) Date: Tue, 17 Oct 2023 13:58:07 GMT Message-Id: <202310171358.39HDw7kp029960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 4a3810075fd3 - main - bhyve: fix buffer overflow in QemuFwCfg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a3810075fd307301d8b3f087efe7a61bc37199b Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3810075fd307301d8b3f087efe7a61bc37199b commit 4a3810075fd307301d8b3f087efe7a61bc37199b Author: Corvin Köhne AuthorDate: 2023-10-16 08:52:21 +0000 Commit: Corvin Köhne CommitDate: 2023-10-17 13:57:28 +0000 bhyve: fix buffer overflow in QemuFwCfg We're accessing one element of the newly allocated and the old directory too much. Reported by: andy@omniosce.org Reviewed by: markj Fixes: 6f9ebb3d0fed2b0ae604dd6daf17f1fe1d8df216 ("bhyve: add helper for adding fwcfg files") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42220 --- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index 830cee730dbd..5b33dfab037d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -365,7 +365,7 @@ qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data) /* copy files above file_index to directory */ memcpy(&new_directory->files[file_index + 1], &fwcfg_sc.directory->files[file_index], - (count - file_index) * sizeof(struct qemu_fwcfg_file)); + (count - file_index - 1) * sizeof(struct qemu_fwcfg_file)); /* free old directory */ free(fwcfg_sc.directory); From nobody Tue Oct 17 14:11:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8wrq03GBz4xYTF; Tue, 17 Oct 2023 14:11: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 4S8wrp6HJfz3QQl; Tue, 17 Oct 2023 14:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6TEJGU48EYtQxO2IKktlubyKZi1eYqVRnuVtiDhoQZk=; b=p6CQ/3qJcIQEeZjyhGeYPQKvHCJClhJX82x8KGKMCgsDM5nW9frrON7UrwW+mk2nGUwpSb lflwz71VhDZB5rGICIzoyyx/s3OP+hOPKqWaHUdGSLMqrgWzTNTbtJJyI6wztMTv04GjXB kTPVrC/9XsOaenlep+pjPrUUPomTYEW3Y2rHiZREEYtbx3p1N+jzNkgAwDRKV2ARMdjzVe sH3EkglWyCNiXq1k6iREen638nNu8meOpVNwEQ3Fx+hZwxJmEGqPsWa9h7WNxwPdx2BPgZ S5VVxiUjitGasFueNodXS2sDvIabMQYBcKfCkWEvlfTj6DZAZ4YMoVFrE9ZziQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697551898; a=rsa-sha256; cv=none; b=TEborb6zDXyOpxY2Rg8h7VPMXyBL3eI/L/CGnwuVu6PBwLbhYgmCzxLmxrg2MnwaVws75T AT/IPS1vA2fcSNhc000xIk9sTETTsayzhFsOTlNxf64rOIKZr+xt6VTOILjQnGUdVWXU9h sQ13QrPMFrZSVHlrgsFCF/JHep2+Sds0LTU1VsHR1sN6ygkE6vjDQqJvZc2QZ2vU3BpGFQ uzbv01M1XXZ5+UbkkU0YsmfsrdrSSr2dxWlh27HI2ti7Qx/4O+2O6jGhDmIN6IRy9dSKEw kOCFtJJpq+tPFCSNBCjOqc5Y4+GB/ZWmG5uF1eNNB7MGE7pc6ErT7JAK9E/RxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697551898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6TEJGU48EYtQxO2IKktlubyKZi1eYqVRnuVtiDhoQZk=; b=wWPUPiJkaOm7X2bWgNEBxIf6ly6qqtZMTCGP1ij8QEze0b5s9FjyNg9T3RyxoTrc9V6ogh DipWOAC+um49pF47ojJPvRK8rUuIkenYru6dNdiGpcyVk6pQQNk+qJ7ULE/I24/R5HhAFl aDZjVNfOSKcqLzJv+d4zuNXxL4jN5Ik6KiHXYlRudy7N/0mC1muaCjvSxOHWy2C2E8A0II AKrMXspfA09mZ9rF7rLwqbqO+ukwLAsNHhx9r+oZSEB+eKe71uPhmJJ2ab8+4RK2ck3ttA tcuKWEND1xYRMnuAvd3ysRvLJcjP/7DHe62TpIVKn8cYBeAfX814F7XRRki45A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8wrp5Ld1zC4r; Tue, 17 Oct 2023 14:11: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 39HEBcRB058947; Tue, 17 Oct 2023 14:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEBcsO058944; Tue, 17 Oct 2023 14:11:38 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:11:38 GMT Message-Id: <202310171411.39HEBcsO058944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 1ffcc2983834 - releng/14.0 - pmcstat: fix duplicate event allocation on CPU 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1ffcc2983834accfd21089daa116ec802e90e088 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1ffcc2983834accfd21089daa116ec802e90e088 commit 1ffcc2983834accfd21089daa116ec802e90e088 Author: Mitchell Horne AuthorDate: 2023-09-27 16:37:46 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 14:11:13 +0000 pmcstat: fix duplicate event allocation on CPU 0 Commit b6e28991bf3a modified the allocation path for system scope PMCs so that the event was allocated early for CPU 0. The reason is so that the PMC's capabilities could be checked, to determine if pmcstat should allocate the event on every CPU, or just on one CPU in each NUMA domain. In the current scheme, there is no way to determine this information without performing the PMC allocation. This broke the established use-case of log analysis, and so 0aa150775179a was committed to fix the assertion. The result was what appeared to be functional, but in normal counter measurement pmcstat was silently allocating two counters for CPU 0. This cuts the total number of counters that can be allocated from a CPU in half. Additionally, depending on the particular hardware/event, we might not be able to allocate the same event twice on a single CPU. The simplest solution is to release the early-allocated PMC once we have obtained its capabilities, and reallocate it later on. This restores the event list logic to behave as it has for many years, and partially reverts commit b6e28991bf3a. Approved by: re (karels) Reported by: alc, kevans Reviewed by: jkoshy, ray Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41978 (cherry picked from commit c362fe939f6fe52056fb7506be9e5cbd0a5ef60b) (cherry picked from commit 5a2849bc3c60426039ff2aeef1d2b54940152927) --- usr.sbin/pmcstat/pmcstat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c index fd4be99f83c8..c36cee436e55 100644 --- a/usr.sbin/pmcstat/pmcstat.c +++ b/usr.sbin/pmcstat/pmcstat.c @@ -713,8 +713,16 @@ main(int argc, char **argv) errx(EX_SOFTWARE, "ERROR: Out of memory."); (void) strncpy(ev->ev_name, optarg, c); *(ev->ev_name + c) = '\0'; + libpmc_initialize(&npmc); + if (args.pa_flags & FLAG_HAS_SYSTEM_PMCS) { + /* + * We need to check the capabilities of the + * desired event to determine if it should be + * allocated on every CPU, or only a subset of + * them. This requires allocating a PMC now. + */ if (pmc_allocate(ev->ev_spec, ev->ev_mode, ev->ev_flags, ev->ev_cpu, &ev->ev_pmcid, ev->ev_count) < 0) @@ -726,8 +734,14 @@ main(int argc, char **argv) err(EX_OSERR, "ERROR: Cannot get pmc " "capabilities"); } - } + /* + * Release the PMC now that we have caps; we + * will reallocate shortly. + */ + pmc_release(ev->ev_pmcid); + ev->ev_pmcid = PMC_ID_INVALID; + } STAILQ_INSERT_TAIL(&args.pa_events, ev, ev_next); @@ -751,10 +765,7 @@ main(int argc, char **argv) } if (option == 's' || option == 'S') { CPU_CLR(ev->ev_cpu, &cpumask); - pmc_id_t saved_pmcid = ev->ev_pmcid; - ev->ev_pmcid = PMC_ID_INVALID; pmcstat_clone_event_descriptor(ev, &cpumask, &args); - ev->ev_pmcid = saved_pmcid; CPU_SET(ev->ev_cpu, &cpumask); } From nobody Tue Oct 17 14:22:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8x5c0tx9z4xZ1l; Tue, 17 Oct 2023 14:22: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 4S8x5c0Nckz3RZG; Tue, 17 Oct 2023 14:22:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697552564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QtjvXEEVRJ+NIrFqoY6xVgFV8YbDKB7vKPicIarMRo=; b=vxDf2G8eZi33zYbAtvQZFqgFrDpP/JqXj5DRQxOKDzTJwloxMyeoHrn1wlFfSVRHhdHuNy v6ZscYmPJgoOBBrUOmXlFMcyOOzH7oZLLFFg/hRy13ojwq7nN8X1ErWiKU5Emg2uHQ8kTP nXRD5ffWYo5UgE+UawDKXSaWO9V6pd2CtIQyjS/PPYGICJ/d+gAjxrspqQKaqoZTGzocBZ BC7wpRVg/sLVWldsklgQuESiej8yQD5mMaGD+oa84P5CpQIIouIsocfENC6n4hpnP+ooYv gfY7W3omImyPh6Coddszkn2rxoxPEdirVoFNmTohAUV74Qjq7ViVQOkhY2W3Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697552564; a=rsa-sha256; cv=none; b=iqeYro/V0USfWeNBX46OPVEwpzsfC5TymckJkrXKyt5aH7P9fTR42lANUPSDxvpyEl9crf bRyrvHtyRWqoCjAqRVLae2tQRere0QwTOvOFkQAHOuT3UqgqrwCOyBOeDS10ARyaiKe21p 0A9iTilnXwffRxFHINv6gEe7bNVJV9pQeCnncdxgl1l9YkkOU6xzCJwZ22KOv8IcJmy19c 3pphEiLaGWE1aNshNdrNKREFV/4sy5jss+pe4J1lKS7msnje0rTL5RUrjDgFbekwOq4ZHb q7KTVwUOPaF6W07sbJl4qBkIfx/pnrBo3lSS/j5fJKt+OWKphHKCjDpvTCKitA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697552564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1QtjvXEEVRJ+NIrFqoY6xVgFV8YbDKB7vKPicIarMRo=; b=xLoy4+iE/roRXbzz4HAAr3PW9FDBZXmwR4xnC7nA+CyybD0se312tmh35LvJBZdoFQqlce PJAY0xR987gNGy61obQcpwB2RAyJbOUhPVDfmOvvylihBq0gWBGkmasbybpQXlp9VgL3K1 6pBYE0mDoXf4FhXSz64tk6amG3Sk7VqxSMeqMSHXO+JyP87d5aSHhva9YO0xRPhusYohKL SP4UJNKUqCEMWC4MzWbvTnwq5eDkYIWT4IkiKqHXUQbaVITqbO7f3QyOoG5y0JGbPU3NFF ps98nRiuHVCO2nKvJFj+D+dePJwC+8Q087QgVYyH0Je+MFO73E1KmbrsCXp/gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8x5b6Yn5zCbT; Tue, 17 Oct 2023 14:22: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 39HEMhtX078899; Tue, 17 Oct 2023 14:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEMhZA078896; Tue, 17 Oct 2023 14:22:43 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:22:43 GMT Message-Id: <202310171422.39HEMhZA078896@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: 4bd1e1968494 - main - socket tests: Build fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4bd1e19684945aa1fd3397b58613f5210fda9091 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4bd1e19684945aa1fd3397b58613f5210fda9091 commit 4bd1e19684945aa1fd3397b58613f5210fda9091 Author: Mark Johnston AuthorDate: 2023-10-17 14:21:32 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 14:22:11 +0000 socket tests: Build fix Fixes: d8735eb7acc0 ("socket tests: Add a regression test for ktrace+recv(MSG_TRUNC)") Reported by: Jenkins --- tests/sys/kern/socket_msg_trunc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index 279170158643..ff0499c4540d 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -231,7 +231,7 @@ ATF_TC_BODY(recvmsg_trunc_ktrace_uio, tc) nbytes = read(fd, &ktr, sizeof(ktr)); ATF_REQUIRE_MSG(nbytes >= 0, "read failed: %s", strerror(errno)); ATF_REQUIRE((size_t)nbytes == sizeof(ktr)); - ATF_REQUIRE_MSG((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); + ATF_REQUIRE((ktr.ktr_type & ~KTR_TYPE) == KTR_GENIO); ATF_REQUIRE(close(fd) == 0); ATF_REQUIRE(close(sd[0]) == 0); From nobody Tue Oct 17 14:38:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8xS74cWSz4xb12; Tue, 17 Oct 2023 14:38: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 4S8xS744hcz3WsB; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697553527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=rUhRFBa51L6g7AIML/h37Q48h43uFUiTvrU0AR/1zHEpKvFvT0QpCyEzlMMxzBLx2M7jIQ n4S3fROe0bsr7dW+dR9d57MQfKiNzduEv3C3rAQZULN1K9MspvEvzzZ9IWTPhQRcQ7wxnL qaj/SEu0hHi0KyJlFk9TWacblczOHLbv2NN38MnqXXVJBq25MSeAL6ImxMUxjt224SBF3X AvoA7SE2K9XsVvtUcXYVeKFOSLTzD5F3WAsef1fBtOltM/K3sA9wP8dnn2xFqQ+lf45azK CRQcS5PvPJ/aO6aji3zo/x8Pk2p/jt8bAJ8vMn0lQydVbIs9MQ/nBjz5/t6kpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697553527; a=rsa-sha256; cv=none; b=Am8YPhFbWEyK52/v4qWgToypMzqP3UUwx2/gG+7xCo6MSnszI7YlwuCzkpLFGBT/AkbWEK LuzqwnWLGzBgBT5IPj19iuv/2+8b70vjFdFwuIRUaEVy4E91ZarDG1KefEo4ZUCH+Gu9sT oA4+NCiUWq4RGMBMT1peR/vw7PfdGEhmeKhrzI/3wCi/mzgrDebg5NhFNGvMbRwubptgfF 4/YMOZOs0v5pRd47OJSZNMFfNsQAFgXGDzRx0T1QZgFVOyUjisLcdItXVguqnXMpHN9KA7 Bhmbzv2fGrK9FWr8b8YTAxyYO67OXZmvWpVPsCNWMOkF0CNkGyYsmdMgvIiXYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697553527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=JSrD1bzzNhplGx5YUC9p+yKCMEUCw7ZXW2Po+olMxFXkGUziIG5Dz7bYwKCRD3fwE7vMGu FxFgIasCgLAUXoI7k/DYuhdt4s9p03bzhKzIoV2y/jumcOrrHa5ORADsifajRGAUEDWWpL VNE/yVep0KcKHC2NMWbIRGzV4YEEJsKL9O+nANBQ1qpmYB3SQklNyDTU2W7eMY+2nTttNP VrxfzUqgI4mHerSkj5g/W7St3QIrUI5aRxQYkgR9/EIfBkKSm8aa+7HZmHdsjoH/+MkzTQ 9JW9BG3gmccJCm2liO/r3p6+f+PuaPfA3fpDSXnTZqgdo+gZ3KCL8/5cXCLSAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8xS739VHzCBJ; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HEclOQ097077; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEcl2J097074; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:38:47 GMT Message-Id: <202310171438.39HEcl2J097074@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: 22dc8609c565 - main - tcp: use signed IsLost() related accounting variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22dc8609c565456fda3de6ddc34e07af98f11203 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=22dc8609c565456fda3de6ddc34e07af98f11203 commit 22dc8609c565456fda3de6ddc34e07af98f11203 Author: Richard Scheffenegger AuthorDate: 2023-10-17 14:07:23 +0000 Commit: Richard Scheffenegger CommitDate: 2023-10-17 14:37:09 +0000 tcp: use signed IsLost() related accounting variables Coverity found that one safety check (kassert) was not functional, as possible incorrect subtractions during the accounting wouldn't show up as (invalid) negative values. Reported by: gallatin Reviewed By: cc, #transport Sponsored By: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42180 --- sys/netinet/tcp_sack.c | 4 ++-- sys/netinet/tcp_var.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 8647630bb6bc..589b0c424acb 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -888,10 +888,10 @@ tcp_free_sackholes(struct tcpcb *tp) while ((q = TAILQ_FIRST(&tp->snd_holes)) != NULL) tcp_sackhole_remove(tp, q); tp->sackhint.sack_bytes_rexmit = 0; - tp->sackhint.sacked_bytes = 0; tp->sackhint.delivered_data = 0; - tp->sackhint.lost_bytes = 0; + tp->sackhint.sacked_bytes = 0; tp->sackhint.hole_bytes = 0; + tp->sackhint.lost_bytes = 0; KASSERT(tp->snd_numholes == 0, ("tp->snd_numholes == 0")); KASSERT(tp->sackhint.nexthole == NULL, diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 11509a87c6e7..c6e24b187e0f 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -128,8 +128,8 @@ struct sackhint { uint32_t recover_fs; /* Flight Size at the start of Loss recovery */ uint32_t prr_delivered; /* Total bytes delivered using PRR */ uint32_t prr_out; /* Bytes sent during IN_RECOVERY */ - uint32_t hole_bytes; /* current number of bytes in scoreboard holes */ - uint32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ + int32_t hole_bytes; /* current number of bytes in scoreboard holes */ + int32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ }; #define SEGQ_EMPTY(tp) TAILQ_EMPTY(&(tp)->t_segq) From nobody Tue Oct 17 15:55:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8f5kWcz4xgP7; Tue, 17 Oct 2023 15:55: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 4S8z8f54hbz4F1Q; Tue, 17 Oct 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCfs80IW3BBxFPS6ON49NfXtm1IuJMrTP8Vxi7QhDXM=; b=h6nZevO1HqhIv5AsLakruZzvTlBAWcu+5arm6O4n3EVDjev4EDFo5SFEbCharDw6Ubb30/ NfJFzxl0kzaaNhnZZSk+I523M6yJcx6xjyzk+qY0cMVcfr8Cc32DPnFoSg/96FuMGfD4rB VlhjDxKANf/2cuX9y1tLpXcF5vUAjIzmw72LxrqpVaiptVJg8W5+CYMZtWXxPEBUmQno7+ RAwBA6eHckCA71E2gIVgBdAotq5NWUmHXanew0N9CB5cTGAvGDrvXWhr3c3/zatLQ544F6 ilKrZ7lQFWWp1/N27FzXupkeBrJ0/T83SFWqVLNkR+m5Am9GfHPXrxAvP7To5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558130; a=rsa-sha256; cv=none; b=wzijS73axUYB/C8SHH49/vxfZwKyiGINpuU2y8dt4AfscsoICvSLhSHYUrkyK7iaHFowAc kVY5kjn13FQoF4+T0is8TxLH75b8tiVSKf/oYMXgoJbd/nZJ2UZz7bEmbdWLMEDUih3C4D vFk6Y5nCymKRWuELePaohjB63HH9Jbt46hFsAIomSE3ax3UL2yGZt4Jrgaju7U2nmUKzwa ufL92J51BvlykmL9rf16Udr9d0Jh+vYfFsgEbW7A9i1FeBf0D9HctYK6L0H6ibjq34Nr/9 TJb4ktM7wBoJYDEK4jNEeVdM4FGjG6ELofQAYFifOa0X4A2kXwrUTQVq3k+ijQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NCfs80IW3BBxFPS6ON49NfXtm1IuJMrTP8Vxi7QhDXM=; b=R79l7oUpN/eazmFSKRxuiq/u0fdr+HMHBZ/rrWPEmQ2bsSMokLS1/qfp2spN9Zo3hq7f5X IdiGgOfYq0rHycsG+pJxGJCKLBPxz9Iljnzp1xzZ918BJ0yvgb42N5ozpDEqn7R40T7LUG m72aJmDAAjbcXtKtkuqHNu0JfqY8Lm/IGxUs5+Oj6jsvesx7gm8LjzsXykGaXg4frN0PHI hsfcZblRHWBAWQEEcASsxRyiAfaOuzIlRCAHZeNq3+Y1lXuZ7HD7iucrjs2Kx1E1+dqduE c5M+k6g73k5gaN5PLs00GMSJscWUVXSngVdN9QTobj4FE6shjyTb4zucOwabdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8f47YjzVds; Tue, 17 Oct 2023 15:55: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 39HFtU1A028973; Tue, 17 Oct 2023 15:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtU8T028970; Tue, 17 Oct 2023 15:55:30 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:30 GMT Message-Id: <202310171555.39HFtU8T028970@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: 56279238b03a - main - geom_linux_lvm: Avoid removing from vg_list before inserting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56279238b03a0ccef245b22fff7679fe35cffccc Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=56279238b03a0ccef245b22fff7679fe35cffccc commit 56279238b03a0ccef245b22fff7679fe35cffccc Author: Mark Johnston AuthorDate: 2023-10-17 14:25:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:05 +0000 geom_linux_lvm: Avoid removing from vg_list before inserting PR: 266693 Reported by: Robert Morris MFC after: 1 week --- sys/geom/linux_lvm/g_linux_lvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index dddc3ae9184e..c63318fed729 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -512,7 +512,6 @@ g_llvm_free_vg(struct g_llvm_vg *vg) LIST_REMOVE(lv, lv_next); free(lv, M_GLLVM); } - LIST_REMOVE(vg, vg_next); free(vg, M_GLLVM); } @@ -596,7 +595,8 @@ g_llvm_destroy(struct g_llvm_vg *vg, int force) } } - g_llvm_free_vg(gp->softc); + LIST_REMOVE(vg, vg_next); + g_llvm_free_vg(vg); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (0); From nobody Tue Oct 17 15:55:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8g6ZJjz4xgQn; Tue, 17 Oct 2023 15:55: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 4S8z8g659jz4DwH; Tue, 17 Oct 2023 15:55:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odmS3avjerTaBzlrWdql1GWlDG4JEAoPmAiFpymuYhY=; b=A4WATrV99spBHLrpDPyOmelsoA0/bd7J/+GOZdAiTXS0Db+ZMt0OLKInRWw6CJ3tPLMLDf NmZxyi8VMJN1ox3GTACDdsXiKtQFXd4nfPlKJmGOgcs67y5ooVXae+HA3T3l6qFoESLz7e YoFBv3ucF7JTGUVsdD9PW0f9E+yktg4ORvJicad/beJwosKaIela5VnT4RV6DVZg1wlKGt 3QFwkAd0Y14+yt4GZNSCqqJmlk1Ke00ZnqMfetQq0k59KRnSVh0KyBWh60/Pd6VoxieBTr RFQWEPG4W0InUiEqPDonIgUM6yntTF+RIf4Zjq4Dg4qPuDrspjClbFoXcrfw8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558131; a=rsa-sha256; cv=none; b=raL7plVSWIl4ezd4iEIGFRQI7ZGylrfFP9nYBIx0R6oZtANNrC56ravvIAf1XOylw9mfzG 9zPfbTuPjDUUBSW+IDy72Q+knKOIWoFnz4e5SdqeTHhRnnEGTseCrLpu2dlRULUmLc+BZn 7uVqHAxMV4gmVZo3nCm6HEh3IzO0Pp22bVuqnJE0Q8qiaTeWGjtBgrqmwkSoySe9NNOQ40 ZUI6ccXoAeIor4AkWumjfVX8m8ATmTAN2LszoBnLGZn2qPoyEfDyGIEWnFMs794b+dJmrH GTOBuY4a5Ppi15Dbtb1wVeyMOaItIlyhnPhE2S3+dhhMn/oPWAbmMiMnPA3+mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=odmS3avjerTaBzlrWdql1GWlDG4JEAoPmAiFpymuYhY=; b=JTx787vPs3ZbWVJJsfrNPQ68ddc/AtYty4cMwqLLzIoDw2CCA8UgS0kDZxiI4P4tZXeKnW ulKsD5W0utcaheibxFYtpZ0xpxqJ1pW8iKoGxwCf5FHzlqFj9TW+hpxQdip7qj/HjY5cB9 QxcV1Sl0sFnfPIm//Ry99jkxD+AR2+onKYy6G+NcgDNmUBEaVF/yYM/90wjZ+TkDNntSt/ 3VS5dd4B5rHlbOK/xrtftIxiYyBJweQij22o6lMFpWTsLGMUetpekpRGtw1UxQtQyocB/b u6fd5JUD5tUtKMDP3ZUb52eTcqYXeIVdqFTy3vEgOgiThtKYn9dOG5xPKze+Tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8g4vfKzVdt; Tue, 17 Oct 2023 15:55: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 39HFtVOV029021; Tue, 17 Oct 2023 15:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtVnn029019; Tue, 17 Oct 2023 15:55:31 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:31 GMT Message-Id: <202310171555.39HFtVnn029019@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: 6223d0b67af9 - main - linuxkpi: Handle direct-mapped addresses in linux_free_kmem() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6223d0b67af923f53d962a9bf594dc37004dffe8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6223d0b67af923f53d962a9bf594dc37004dffe8 commit 6223d0b67af923f53d962a9bf594dc37004dffe8 Author: Mark Johnston AuthorDate: 2023-10-17 14:26:18 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:06 +0000 linuxkpi: Handle direct-mapped addresses in linux_free_kmem() See the analysis in PR 271333. It is possible for driver code to allocate a page, store its address as returned by page_address(), then call free_page() on that address. On most systems that'll result in the LinuxKPI calling kmem_free() with a direct-mapped address, which is not legal. Fix the problem by making linux_free_kmem() check the address to see whether it's direct-mapped or not, and handling it appropriately. PR: 271333, 274515 Reviewed by: hselasky, bz Tested by: trasz MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40028 --- sys/compat/linuxkpi/common/src/linux_page.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index ce9ad34464bd..21e338acb089 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -145,6 +145,14 @@ linux_alloc_pages(gfp_t flags, unsigned int order) return (page); } +static void +_linux_free_kmem(vm_offset_t addr, unsigned int order) +{ + size_t size = ((size_t)PAGE_SIZE) << order; + + kmem_free((void *)addr, size); +} + void linux_free_pages(struct page *page, unsigned int order) { @@ -163,7 +171,7 @@ linux_free_pages(struct page *page, unsigned int order) vaddr = (vm_offset_t)page_address(page); - linux_free_kmem(vaddr, order); + _linux_free_kmem(vaddr, order); } } @@ -185,9 +193,17 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - size_t size = ((size_t)PAGE_SIZE) << order; + KASSERT((addr & PAGE_MASK) == 0, + ("%s: addr %p is not page aligned", __func__, (void *)addr)); - kmem_free((void *)addr, size); + if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { + _linux_free_kmem(addr, order); + } else { + vm_page_t page; + + page = PHYS_TO_VM_PAGE(DMAP_TO_PHYS(addr)); + linux_free_pages(page, order); + } } static int From nobody Tue Oct 17 15:55:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8j1p1pz4xgZ9; Tue, 17 Oct 2023 15:55: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 4S8z8j0VTHz4Dx2; Tue, 17 Oct 2023 15:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UYGq7E/q38eJ/MFdKz1sWmzpgvA8PkAcWEbOtsp5GQ=; b=KusWq/Iy2OpVO0hlBnZ6lXRwRkL4ZlLRSdcpG6qg9s2x8/pXYYXSjyJza7yyvDAHx6Pq5R aOwJlWI8ciOPk87mdoQmlDSVRQrd7ELHh59LByBf0XUpHpI2Jh9bJdo8xRPhcH6UslMTrF q/gqVB05WUVvK8D+zJTnu4uH3biny+lsFAWZ/ep7jtDxyyL29zlGr0nwHXuSZL5YtkRnyp J08zVS1iRx8Z8rkvFcGvJMkic/qF6MiZT6UhPrJ8zfOkpISpFQsy++beMzJt+TPYoM05dJ hwLO7m4X9WnfYR2+XZsVvxHEQu7g1miuGdyeJBWhNYwBXAvYdWTVxyQJquqa0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558133; a=rsa-sha256; cv=none; b=jEtIoA1Wo4IlidceExyUMeEvRBoLfptoV7w2MYJv9nJsNVfL+4j5hwBAMaDuPF7lGm/uHj ZmV1fiEq44hnweHGatD67hIifzPiOK2/AJ8SS7zH+M++nTbLHb7bu/mst7IGXdABPnyPRX vwzMfBowO8L9IHQmO9SAjc6JwcCtNo30XtDX2RSPKnCfGZ2XrNAABHxK2dTWYg2zjL5ooc b2VuqWDDYx8TXKtPOjZUze0z5HwxWB7Trkr4tWkOt3g5SwtiuVLXgCWgOzTbP9aS98MDk+ v3RCYW2JuHglDhRaHDyPvVIpH7iJ8GDjSyW923oIvaysiGOeRKRaCUQW8q3hag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558133; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+UYGq7E/q38eJ/MFdKz1sWmzpgvA8PkAcWEbOtsp5GQ=; b=szo1mLyznySw1Ky0ykJxxGkP5pJD3daKeqieBCrxQPIiAAXKwPRXZf96J4XPVZtOsHP5yr nRwyb/dFj8Y/gowU56uxlaFnvNxaWy/uJ8Wfoq4qpCnO4EKeoNvICwRdt/PeFgVuN9JB2u W6LHHB2XNySJii3h32jSxI+xPRksYfcSz30pDplNtwHSTWLmmicAIxk5gUdKCewzcio6AP m5KgwpJ2omuFlyooPCku9O+CkBiXFMmNI+s0absPnnV0cbfoiIUfdzcQV13BL01fVOf3IQ xVqGF7FsbwnKLDQgKv61ixu2Z+QEmzbZG3vmGOsAbJ0ed6qabYkJs4tnofffLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8h6LvkzVhJ; Tue, 17 Oct 2023 15:55: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 39HFtW47029082; Tue, 17 Oct 2023 15:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtWoA029079; Tue, 17 Oct 2023 15:55:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:32 GMT Message-Id: <202310171555.39HFtWoA029079@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: ae5c3dfd3e75 - main - netinet tests: Add error handling tests for UDP with v4-mapped sockets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae5c3dfd3e75bb287984947359d4f958aea505ec Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ae5c3dfd3e75bb287984947359d4f958aea505ec commit ae5c3dfd3e75bb287984947359d4f958aea505ec Author: Mark Johnston AuthorDate: 2023-10-17 14:29:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:19:06 +0000 netinet tests: Add error handling tests for UDP with v4-mapped sockets This provides a regression test for commit abca3ae7734f. Add it to the existing v4-mapped address test file, and rename accordingly. Reviewed by: tuexen, karels, rrs MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39216 --- ObsoleteFiles.inc | 3 + tests/sys/netinet/Makefile | 2 +- ...p6_v4mapped_bind_test.c => ip6_v4mapped_test.c} | 81 +++++++++++++++++++--- 3 files changed, 76 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c3cc72351963..9e4be6b69312 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231006: rename tcp6_v4unmapped_bind_test +OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test + # 20231005: Remove man page link for now gone net80211 function. OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 144754acfbcc..44f76508bf5c 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -7,9 +7,9 @@ BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= libalias ATF_TESTS_C= ip_reass_test \ + ip6_v4mapped_test \ so_reuseport_lb_test \ socket_afinet \ - tcp6_v4mapped_bind_test \ tcp_connect_port_test \ tcp_md5_getsockopt diff --git a/tests/sys/netinet/tcp6_v4mapped_bind_test.c b/tests/sys/netinet/ip6_v4mapped_test.c similarity index 81% rename from tests/sys/netinet/tcp6_v4mapped_bind_test.c rename to tests/sys/netinet/ip6_v4mapped_test.c index c7fc682d7ae7..d4c4ed526ab5 100644 --- a/tests/sys/netinet/tcp6_v4mapped_bind_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -194,17 +194,15 @@ restore_portrange(void) "failed while restoring value"); } -ATF_TC_WITH_CLEANUP(v4mapped); -ATF_TC_HEAD(v4mapped, tc) +ATF_TC_WITH_CLEANUP(tcp_v4mapped_bind); +ATF_TC_HEAD(tcp_v4mapped_bind, tc) { - /* root is only required for sysctls (setup and cleanup). */ atf_tc_set_md_var(tc, "require.user", "root"); atf_tc_set_md_var(tc, "require.config", "allow_sysctl_side_effects"); atf_tc_set_md_var(tc, "descr", "Check local port assignment with bind and mapped V4 addresses"); } - /* * Create a listening IPv4 socket, then connect to it repeatedly using a * bound IPv6 socket using a v4 mapped address. With a small port range, @@ -213,7 +211,7 @@ ATF_TC_HEAD(v4mapped, tc) * and then the connect would fail with EADDRINUSE. Make sure we get * the right error. */ -ATF_TC_BODY(v4mapped, tc) +ATF_TC_BODY(tcp_v4mapped_bind, tc) { union { struct sockaddr saddr; @@ -315,17 +313,82 @@ ATF_TC_BODY(v4mapped, tc) ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); } +ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) +{ + restore_portrange(); +} -ATF_TC_CLEANUP(v4mapped, tc) +ATF_TC(udp_v4mapped_sendto); +ATF_TC_HEAD(udp_v4mapped_sendto, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Validate sendto() with a v4-mapped address and a v6-only socket"); +} +ATF_TC_BODY(udp_v4mapped_sendto, tc) { + struct addrinfo ai_hint, *aip; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + ssize_t n; + socklen_t salen; + int error, ls, s, zero; + short port; + char ch; - restore_portrange(); + ls = socket(PF_INET, SOCK_DGRAM, 0); + ATF_REQUIRE(ls >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET; + ai_hint.ai_flags = AI_NUMERICHOST; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin, aip->ai_addr, sizeof(sin)); + + error = bind(ls, (struct sockaddr *)&sin, sizeof(sin)); + ATF_REQUIRE_MSG(error == 0, "bind: %s", strerror(errno)); + salen = sizeof(sin); + error = getsockname(ls, (struct sockaddr *)&sin, &salen); + ATF_REQUIRE_MSG(error == 0, + "getsockname() for listen socket failed: %s", strerror(errno)); + ATF_REQUIRE_MSG(salen == sizeof(struct sockaddr_in), + "unexpected sockaddr size"); + port = sin.sin_port; + + s = socket(PF_INET6, SOCK_DGRAM, 0); + ATF_REQUIRE(s >= 0); + + memset(&ai_hint, 0, sizeof(ai_hint)); + ai_hint.ai_family = AF_INET6; + ai_hint.ai_flags = AI_NUMERICHOST | AI_V4MAPPED; + error = getaddrinfo("127.0.0.1", NULL, &ai_hint, &aip); + ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); + memcpy(&sin6, aip->ai_addr, sizeof(sin6)); + sin6.sin6_port = port; + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_ERRNO(EINVAL, n == -1); + + zero = 0; + error = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)); + ATF_REQUIRE_MSG(error == 0, + "setsockopt(IPV6_V6ONLY) failed: %s", strerror(errno)); + + ch = 0x42; + n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); + ATF_REQUIRE_MSG(n == 1, "sendto() failed: %s", strerror(errno)); + + ch = 0; + n = recv(ls, &ch, 1, 0); + ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); + ATF_REQUIRE(ch == 0x42); } ATF_TP_ADD_TCS(tp) { - ATF_TP_ADD_TC(tp, v4mapped); + ATF_TP_ADD_TC(tp, tcp_v4mapped_bind); + ATF_TP_ADD_TC(tp, udp_v4mapped_sendto); return (atf_no_error()); } - From nobody Tue Oct 17 15:55:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8z8k2kdCz4xgWt; Tue, 17 Oct 2023 15:55: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 4S8z8k172Yz4F2j; Tue, 17 Oct 2023 15:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdZUa21RB5EVMyq0nqDl33y5HEB7q9AUuMOOFkxezg8=; b=KYUCDqrNXARU285B5Bk3J3wbE+1yPbkOHXQB9x+EB5ImpRm0phV8bYnnGzcmmlxl7df4va IALj4yP8tcaO5BvM6ApFj+nHWNYCfsvkJ41n0oFsWVtu8BOxDwQwEJFFmV7ku80n5GY09A qTStRmCTbqUEYSN4gHUbBT6KwmlI/tKAxIqkN3/9jDqi/Y4CEzWHVuNuUe7Rb27ctOeKai GfX8hkFzTGiQ5PbAdnc5t39LoiAqvsl9zv3NTy0GkPMaguyKBuO8FdRSQxyfIZIrEFfY4J TiGZ0xt/27EfS21/nkkgKFxkk963x6MfCpt24Unt/KRA3MDgFEY/g/f19z8QDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697558134; a=rsa-sha256; cv=none; b=nNKAHrlUvKwKCR1LT93K4yGKUL7EOkvnwt0ZemAgaM8fPyAJ4N1BaQsKAyLHLoJiCyI8c1 6kpHZK/GJl99cenFHEvzSUPMrsQsKHz7lxfjLuB0IpqCVoQSrcIKT+giFh7D39KeI5KJ8/ ABGraNkSnCVVH0cL/OhVGHSu7Uekvdqw5v81shOpccb70X7Mpww34HeM5YDnPZPTXOHW9O LEKt4Rjvz0RU1gcyClxs8SOtUJ5F43NLCuqcob6UwOYaVVvDyX7/OVsR3VcAVZ79osYcF8 ILGwAlQxGZF34Ho1f/bZSfLOfzh1uKKro0vm98R8ERG3wM7BIYYaR1T/HSQIZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697558134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DdZUa21RB5EVMyq0nqDl33y5HEB7q9AUuMOOFkxezg8=; b=ebpclrZ6LTjGK5lVzy+LQpbuFRv/zHem462GL2U+EQgaQZBQ7RNr2vZrE63TRUUqOc0WR1 MXACrlRFFch9a1KnmGFlgcQvQV7O5fm0GgjxXSUQkCYEdWvTMeIOb2NOPI+TprDnnqImxK PscNAnkq0+/Miuhfz3wJbjAsWMl8bFTH5CHrLxRRZwEnWc6xW6juyRyJpIXiuK0b8/6foQ yDENjQreYketfXJLLCACiK+ByLoLVbwyPd+uRJnUlGJYTQjQW31m/ipHzpJVnFjzySbe5K D8H5/6Po06ykTr94J9ahUCPkrd3zMjw36RODkM+8sRQNb6BsBuD+vwRkkKnTTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8z8k0D9HzVhK; Tue, 17 Oct 2023 15:55: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 39HFtXlE029131; Tue, 17 Oct 2023 15:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HFtXHS029128; Tue, 17 Oct 2023 15:55:33 GMT (envelope-from git) Date: Tue, 17 Oct 2023 15:55:33 GMT Message-Id: <202310171555.39HFtXHS029128@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: fd8b9c73a5a6 - main - bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a commit fd8b9c73a5a63a7aa438a73951d7a535b4f25d9a Author: Jan Bramkamp AuthorDate: 2023-09-04 08:38:25 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 15:24:11 +0000 bhyve: Use VMIO_SIOCSIFFLAGS instead of SIOCGIFFLAGS Creating an IP socket to invoke the SIOCGIFFLAGS ioctl on is the only thing preventing bhyve from working inside a bhyve jail with IPv4 and IPv6 disabled restricting the jailed bhyve process to only access the host network via a tap/vmnet device node. PR: 273557 Fixes: 56be282bc999 ("bhyve: net_backends, automatically IFF_UP tap devices") Reviewed by: markj MFC after: 1 week --- usr.sbin/bhyve/net_backends.c | 52 ++++--------------------------------------- 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/usr.sbin/bhyve/net_backends.c b/usr.sbin/bhyve/net_backends.c index fa7cd9c81f46..99781cfdcbb6 100644 --- a/usr.sbin/bhyve/net_backends.c +++ b/usr.sbin/bhyve/net_backends.c @@ -42,9 +42,7 @@ #include #include -#if defined(INET6) || defined(INET) #include -#endif #include #include #define NETMAP_WITH_LIBS @@ -180,17 +178,6 @@ SET_DECLARE(net_backend_set, struct net_backend); * The tap backend */ -#if defined(INET6) || defined(INET) -static const int pf_list[] = { -#if defined(INET6) - PF_INET6, -#endif -#if defined(INET) - PF_INET, -#endif -}; -#endif - struct tap_priv { struct mevent *mevp; /* @@ -222,11 +209,8 @@ tap_init(struct net_backend *be, const char *devname, { struct tap_priv *priv = NET_BE_PRIV(be); char tbuf[80]; - int opt = 1; -#if defined(INET6) || defined(INET) - struct ifreq ifrq; - int s; -#endif + int opt = 1, up = IFF_UP; + #ifndef WITHOUT_CAPSICUM cap_rights_t rights; #endif @@ -254,39 +238,11 @@ tap_init(struct net_backend *be, const char *devname, goto error; } -#if defined(INET6) || defined(INET) - /* - * Try to UP the interface rather than relying on - * net.link.tap.up_on_open. - */ - bzero(&ifrq, sizeof(ifrq)); - if (ioctl(be->fd, TAPGIFNAME, &ifrq) < 0) { - WPRINTF(("Could not get interface name")); - goto error; - } - - s = -1; - for (size_t i = 0; s == -1 && i < nitems(pf_list); i++) - s = socket(pf_list[i], SOCK_DGRAM, 0); - if (s == -1) { - WPRINTF(("Could open socket")); + if (ioctl(be->fd, VMIO_SIOCSIFFLAGS, &up)) { + WPRINTF(("tap device link up failed")); goto error; } - if (ioctl(s, SIOCGIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not get interface flags")); - goto error; - } - ifrq.ifr_flags |= IFF_UP; - if (ioctl(s, SIOCSIFFLAGS, &ifrq) < 0) { - (void)close(s); - WPRINTF(("Could not set interface flags")); - goto error; - } - (void)close(s); -#endif - #ifndef WITHOUT_CAPSICUM cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); if (caph_rights_limit(be->fd, &rights) == -1) From nobody Tue Oct 17 16:41:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909v74GMz4xkGj; Tue, 17 Oct 2023 16:41: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 4S909v63y1z4Qqg; Tue, 17 Oct 2023 16:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=xX72rYK6GC9NuBUnoHUNZK88aPtjw8fuDztJ9xc8fauuNI+epJQDwBNHw0SSAmCK9wAAi3 pyy8KmvoBmz+VYUJjpD/vzZcaQVgBWhAJ6FDtQHzFcJNhiVmEBi2/AqfOev+YO/rlnntMf O5gZ3bUNMmivRhr68fUPu1LCCY3HtKCClTa1zI5SPySEIhPKTmO0m03DVrlto5p3l7CbeG 0MiUD9Am/6+t36I/rBq+5dHi50WhjThUK9eWzl+SQmIHRCjcRPZcsnSbFyhUaDw+tDmOro GpoT+WhngvVqD5UTMF7/Sycpz8MAaRKAYRqV9LX4VAaNwqvTIyCGiAg1CGzF7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560899; a=rsa-sha256; cv=none; b=ge8taFMR/xcTLK5DddIKmTptENu0wRl+4C3w+WezaPeBfIsXlmzyJl/AbNlxKyR6LneEaG tIREBTvfohbfTMamYU5Kq51eSFJwgInfz2r1gSsLKpASpSm4x2sDyXjbivcTcKj+c7JcQP kYoKMbNC4qIijM7uGbph6yHjd/r2xsEJAaHt2VbOxhkatls16EYFIL4KprB8x1TL9JKMQG d/hsjA8SOXw7Amm6Fny/dyri+QYiI7H3o+gZgyNS4cJcY1QcOGERQEXyJ45p+e5MbEcUQF g4JBRP6ce6lgIfJtZabSZxO7MAV7e3lgz/At72lFjCaasYGOFaRuiG/H/1RSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzyM3ATpZRCv0UQ1fXNZlfYdE4tUxS2hD9aUitdWCCo=; b=tlw5WDuaApF4Bw18DbWPJW0nPv+bsd76JMf0o0lgGCBV45b/da/hg+3Wo7+Ft+d7g4SuRX kdC0IlC9PV6rKoYydMrTTsAMY1OC06hn5J5ildyI+DBBDUcvwaAffx9smryozUIzvWkB8u uqcivcS30MwLo7sW0Za0oNo+c30k0gCjDx+JyLRpV8Cx9xK4GmCBulSlTXkYbBmbesgGU4 3gt7gfPIHnoI7jQ7YtLUGtmNXi6ehA2RqBHO7x6DnVkJZRF25sQvcrTe+aDQkczoxD5fAZ pwjvu6w+RIGsQTgrgLgfpypJ6uWrA06X4SDLUJO7f4H7dsLx85+3+hxlNBfy8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909v4qdhzXPw; Tue, 17 Oct 2023 16:41: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 39HGfdEj009906; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGfdZJ009903; Tue, 17 Oct 2023 16:41:39 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:39 GMT Message-Id: <202310171641.39HGfdZJ009903@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: 9ef7a491a423 - main - nmount(MNT_UPDATE): add optional generid fsid parameter List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 commit 9ef7a491a4236810e50f0a2ee8d52f5c4bb02c64 Author: Konstantin Belousov AuthorDate: 2023-09-29 18:42:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:12 +0000 nmount(MNT_UPDATE): add optional generid fsid parameter to check looked up path against specific mounted filesystem. Reviewed by: mjg Tested by: Andrew Gierth Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42023 --- sys/kern/vfs_mount.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 8364081585f8..aa4642c0ba8c 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1313,9 +1313,10 @@ vfs_domount_update( struct vnode *rootvp; void *bufp; struct mount *mp; - int error, export_error, i, len; + int error, export_error, i, len, fsid_up_len; uint64_t flag; gid_t *grps; + fsid_t *fsid_up; bool vfs_suser_failed; ASSERT_VOP_ELOCKED(vp, __func__); @@ -1378,10 +1379,24 @@ vfs_domount_update( VI_UNLOCK(vp); VOP_UNLOCK(vp); + rootvp = NULL; + + if (vfs_getopt(*optlist, "fsid", (void **)&fsid_up, + &fsid_up_len) == 0) { + if (fsid_up_len != sizeof(*fsid_up)) { + error = EINVAL; + goto end; + } + if (fsidcmp(&fsid_up, &mp->mnt_stat.f_fsid) != 0) { + error = ENOENT; + goto end; + } + vfs_deleteopt(*optlist, "fsid"); + } + vfs_op_enter(mp); vn_seqc_write_begin(vp); - rootvp = NULL; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); From nobody Tue Oct 17 16:41:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909x0zSlz4xkD3; Tue, 17 Oct 2023 16:41: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 4S909x01dCz4QwX; Tue, 17 Oct 2023 16:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfRbJRYoax61Os9vKc3BXBH60LLU5Xb5sAOe4decnJA=; b=WVIHuFG/Yn9aZynmh7spt8YRWnAUZtoV3s9u3hDHZVRrJesHemr6PIECPhugg2iV2TO1qZ nLYX4xZ8Y75ro52K/8Wmk0bKVrShWtwLvJteu5foLiKJSj8GMsTU/YHmym8YjjSlWkPK8I nSaiMb7s7mEHWmF4WTBD46210MoVnGTf4nRZsUwvZDRyHkuyH6bcuHozEMI/zGfmJHMwQT U0oTiJwdhzGxnzkJWQ782Bya89jmhf3jt0T93mpbEp79YzTqodSNaRxMVmsuPKUCtlykps 7YICAF6jnySt8lfUPFY9drkPb09YfJ5Ta1brWOXO9b0ekxiN96DAYK4cklvC6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560901; a=rsa-sha256; cv=none; b=CX0ydu1dpyJqSw5gxrEo9jKieFBH/iUF/9nq6ruArj7vU1H+jdapiKgOuEsewdORbIsdqE uWQ6X40+q17QRpBZo78i2dwfchE/eUXpki8VsTThzs20RvTUZ1NJu0Eqv9M292ub1u2/yP /+oOLOIQsAOboAU54hcVFJ8n2bvjEueX1ZJu9FXrImlsxsCUrR5Kk6ZkwKWkRd2W7+nfcG eiQm/oC1sx1Nw6ne8faB8X3PrmGOtjeU6gpP/9RHjIgE1HgjLmzrhhcnVvOrHzl8f/cq/N +y126KwKf9/6Gz9aG7Er8pPWlBBc4XTsY0DAplejWQ4n89/4JGuFKxstT84rUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfRbJRYoax61Os9vKc3BXBH60LLU5Xb5sAOe4decnJA=; b=eGWX5z9eX/2gaXLnTCLbqbTYP7wIaGmlI197X1D/rzUz/I7JTxD8zcyhjcGoOO7ANSr3qU +aoTo0Q7RT2YdGeb9tk6Nhe/X3qIsNztdeQDavBCJkm+/E65zLlDlwAiGbcfqZspOknHRQ WrMNu00JH5AjzyoJKJEc82idfQlclq9kPA5Um0La9EdaN2VYHjjVYu8cPLBoGtyNuNlFy1 r4MBGrxSCs16d3dUuGr9yecp8JRVv38PCGVetAolWbo8KZSmjoiJ4UDTFafwnxvrj1OYHO a9NYuRKx4Qf0S2kamnm7nsMJhGeqe1AgQxvLMioI/5N1YyU/oVmGsGZnkUq1eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909w5lbHzX2S; Tue, 17 Oct 2023 16:41: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 39HGfeaA009957; Tue, 17 Oct 2023 16:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGfeCS009954; Tue, 17 Oct 2023 16:41:40 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:40 GMT Message-Id: <202310171641.39HGfeCS009954@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: 21b8e363c4eb - main - automount: check for mounted-over autofs instances on flush List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21b8e363c4eb24c0a5659101603cc08a86d87759 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21b8e363c4eb24c0a5659101603cc08a86d87759 commit 21b8e363c4eb24c0a5659101603cc08a86d87759 Author: Andrew Gierth AuthorDate: 2023-07-10 15:09:56 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:45 +0000 automount: check for mounted-over autofs instances on flush PR: 272446 Reviewed by: kib MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40961 --- usr.sbin/autofs/automount.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index 188bbc3a040f..cee647cb4e2c 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -260,6 +260,7 @@ static void flush_caches(void) { struct statfs *mntbuf; + struct statfs statbuf; int i, nitems; nitems = getmntinfo(&mntbuf, MNT_WAIT); @@ -274,6 +275,21 @@ flush_caches(void) mntbuf[i].f_mntonname); continue; } + /* + * A direct map mountpoint may have been mounted over, in + * which case we can't MNT_UPDATE it. There's an obvious race + * condition remaining here, but that has to be fixed in the + * kernel. + */ + if (statfs(mntbuf[i].f_mntonname, &statbuf) != 0) { + log_err(1, "cannot statfs %s", mntbuf[i].f_mntonname); + continue; + } + if (strcmp(statbuf.f_fstypename, "autofs") != 0) { + log_debugx("skipping %s, filesystem type is not autofs", + mntbuf[i].f_mntonname); + continue; + } flush_autofs(mntbuf[i].f_mntonname); } From nobody Tue Oct 17 16:41:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S909y2zbGz4xkD5; Tue, 17 Oct 2023 16: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 4S909y0nM3z4QnX; Tue, 17 Oct 2023 16: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=1697560902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/U6g+h+mdm6Sty58ElnRDHg0+nMgNM66JT04PlRe5c=; b=RBOUjRJpyKeMqg3W4TIwtsCRwpFWDZgGlp3N2hwvr2QUaxz6zQiOHtK3d1FM/nTxKs5oRh JfAgRO8WxPNAuzEHNJgGW1g8556RQfsqZDIki4OxXneUOztY/5+3KL1kU29fH5POQ6yWUm TK8xUtMxm5CEhZ5s2/fMWRyECinHgsP4wTSExWJw/6Z+DgeGiin8iYQrCmYWW8dDjVflAq mwnBypEgLw0VnGXNM+GQwWe46J6MQNhGEzEtn5LoT/Ew6g6DkEmgPCTvG3IokBdhnGEuET u+sf6sUB+WmltvC5TA1v+03naTvc44W2p9Lyd1sCDLsuMYR+R30oCNqC7xz/vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697560902; a=rsa-sha256; cv=none; b=k52NQZdFj9GWfGVFsJCMiJXoDLQblyd7yUi6TaCVKD+1GPvu/UwYqzfYgQAL+idSnnYuXk A6Ps7KputIUfUtXWqc14XmBWaYhyjzzqunVpD3Is3KM3iJa43dFIFkiVxovPbf6tXK3AIS 8TjcJn47Au6exa7Ib1vxwkkpUHNePI+Bq8syHe3V2BXA269ifu62Wlxu1KPguOC7ACol1M 9hyY8SxASYYRrvp0NNdUZ0+M54c/DkJTTojvc8vav8thG9cG7cH/dIBxqhMtfFUfK9Jj1v JfMFzDPrlpQhpY0ZIZnW9aWzk/Nu9CxifGM2LZHs34qiWhgTwEDqLU03sBxayQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697560902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/U6g+h+mdm6Sty58ElnRDHg0+nMgNM66JT04PlRe5c=; b=mQluodW+pAF5nylpyblaDolJ5nI3QwmR+69sDGeg1ouF48UQzwVOjxfE7TJF3FPjfgDpM7 /PB+Jn3Pk7Z6eqnU3Qhq0N79warFD7ci8xCYIMd7iIQOXG7UYfEZivT2h3RbX/p8wc6X1N lJOD5vV3VIeCa8mZ+QPVF9UZGmO2zClCrfFEo7R7gZ5xG8ZGDme/kKH39rOZipAxJhb+u3 NIETEt8k9tvBGQni1+prsQ/hqud9MflcWuwH7Vc8esbCJogPV+tMrpGX98JOp+F3hnVdRS XC4H1DO1Uze8ufKilX+BoVUPOgWCMIHpKeksMlRzjoexacwLLfaGtgnzLfQUCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S909x6mZJzXFj; Tue, 17 Oct 2023 16:41: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 39HGffTB010003; Tue, 17 Oct 2023 16:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HGffnj010000; Tue, 17 Oct 2023 16:41:41 GMT (envelope-from git) Date: Tue, 17 Oct 2023 16:41:41 GMT Message-Id: <202310171641.39HGffnj010000@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: 56c44bd92efa - main - automount(8): when flushing autofs, specify fsid List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56c44bd92efa002b2185445878fc98172ae8c66f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=56c44bd92efa002b2185445878fc98172ae8c66f commit 56c44bd92efa002b2185445878fc98172ae8c66f Author: Konstantin Belousov AuthorDate: 2023-09-29 18:43:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-17 16:40:50 +0000 automount(8): when flushing autofs, specify fsid Which should avoid situation where flushed filesystem is not autofs, because it was mounted over autofs mp. Reported and tested by: Andrew "RhodiumToad" Gierth PR: 272446 Reviewed by: mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42023 --- usr.sbin/autofs/automount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/autofs/automount.c b/usr.sbin/autofs/automount.c index cee647cb4e2c..6637e16c9129 100644 --- a/usr.sbin/autofs/automount.c +++ b/usr.sbin/autofs/automount.c @@ -229,7 +229,7 @@ mount_unmount(struct node *root) } static void -flush_autofs(const char *fspath) +flush_autofs(const char *fspath, const fsid_t *fsid) { struct iovec *iov = NULL; char errmsg[255]; @@ -242,6 +242,8 @@ flush_autofs(const char *fspath) __DECONST(void *, "autofs"), (size_t)-1); build_iovec(&iov, &iovlen, "fspath", __DECONST(void *, fspath), (size_t)-1); + build_iovec(&iov, &iovlen, "fsid", + __DECONST(void *, fsid), sizeof(*fsid)); build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg)); @@ -291,7 +293,7 @@ flush_caches(void) continue; } - flush_autofs(mntbuf[i].f_mntonname); + flush_autofs(mntbuf[i].f_mntonname, &statbuf.f_fsid); } } From nobody Tue Oct 17 17:17:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S90z25MZqz4xmFp; Tue, 17 Oct 2023 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S90z24tBfz4WlS; Tue, 17 Oct 2023 17:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697563038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xImLEE7T8cP9ZSGnPJeLAllalnoqfR7Gth5I9+icoTE=; b=PQj+I9rgu6JKzF3M92Ig7vvTn1GmSa46+sAOWrsLwdh9wGU3z3sLcTevdKZdDmpfi/kVLb HEHB41gw/YOKAAci30OsuO995JbnsIj4moVEb3CxPswedw7VdloHfs+CWE8OmKOG/wUP69 Zakng3gHhnSjWxEdYfm32+9rGhV3WfdSI51tbzFduRvq0JCmRuNDmSQrp5VpfNmJYtvb0N VY+64mhAUPjxWX+kMoYKozStgaoBrPMvR759G8VZutkFgD+EEUVg0S2wi1lo8/v2wgbB6T 9lHXwZhWLQ8fuSGDAgvA8u7c1+GDyxrGB4LDvnWrRU8hmTqpzHVOo01DkGlQRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697563038; a=rsa-sha256; cv=none; b=gfbAp5GPvcNXCKhniRCcSbFYse/JH0yXnnbcH/KgkExpNfgXmCw43s4lyAtjOSGJVlTaCH GiZhPpReOp0o+PWcgLCRO8in3mkCh6EFrazi3VZtbogbKcd1A6ocQbnIAytOa0/rnUNkGO 5sBBfMCODslXnax0L0Y3bH+trquxHr/OhZ49757ME0fqVI9Rj+1en2aSVvqT2aKgKsIXqF kM8pxdMacbK5pXO+SFyOZO+EAwFDT5DVtb6eBzgGtqIXyxDdwxVac1/UQK7Q/rC6lfbGZq vg/lWDCdTNaJHd/kw3fGYLwT0pgljcRzS3K88dXzNf9FfmvXEKaxEwx39mGgdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697563038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xImLEE7T8cP9ZSGnPJeLAllalnoqfR7Gth5I9+icoTE=; b=Kr6IPsF861IceKB/1FRHIHsVj9sC369PqBQ7OMJ3rejy4t2v7AgWhlrCo73lrUyzDYHxR8 QS0msNPlmlaOPyl39aiX+CKlORa3bdmAkt9K11GgFOZmPkWuyiUvPajHxe8XbTSndgqQon 05SDy4b2/WfFpLp13VenJQ7/1mjRj4XuWVRSfvUQlxXLO/bVdjwGEDqKsbhzBg76Hme2Ka Tsmw4EXBaLKruJqmFxgfvv4GDhYUUjiTJzweIrQD9cpqAssLkSWP5FcYUWGhsRcuc9oLMs jimPNt21CCyqEMTkRr1II1wXZB5SMbZu3+xcLcvv/BB8aXYrk0KJAqiwAfGeCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S90z23dk7zYVy; Tue, 17 Oct 2023 17:17: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 39HHHIDV063320; Tue, 17 Oct 2023 17:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHHIWD063317; Tue, 17 Oct 2023 17:17:18 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:17:18 GMT Message-Id: <202310171717.39HHHIWD063317@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: 9b42d3e12ffc - main - mkimg: Ensure GPT Entry Array is at least 16k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b42d3e12ffc6896fcb4e60c1b239ddf60705831 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b42d3e12ffc6896fcb4e60c1b239ddf60705831 commit 9b42d3e12ffc6896fcb4e60c1b239ddf60705831 Author: Warner Losh AuthorDate: 2023-10-17 17:14:14 +0000 Commit: Warner Losh CommitDate: 2023-10-17 17:14:23 +0000 mkimg: Ensure GPT Entry Array is at least 16k UEFI v2.10 Section 5.3 documentes that the minimum reserved space after the GPT header be at least 16kB. Enforce this minimum. Before, we'd only set the number of entries to be the unpadded size. gpart's selective enforcement of aspects of the GPT standard meant that these images would work, but couldn't be changed (to add a partition or grow the size of a partition). This ensures that gpart's overly picky standards don't cause problems for people wishing to, for example, resize release images. MFC after: 1 day (we want this in 14.0) PR: 274312 Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42245 --- sys/sys/disk/gpt.h | 7 +++++++ usr.bin/mkimg/gpt.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index e48b13684814..596a5cba1681 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -82,6 +82,13 @@ struct gpt_hdr { CTASSERT(offsetof(struct gpt_hdr, padding) == 92); #endif +/* + * The GPT standard (section 5.3 of UEFI standard version 2.10) requires + * we reserve at least 16k after the PMBR and the GPT header for the GPT + * Array Entries. + */ +#define GPT_MIN_RESERVED 16384 + struct gpt_ent { gpt_uuid_t ent_type; gpt_uuid_t ent_uuid; diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 59c51a6a177b..ed3f008c394f 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include @@ -124,13 +124,21 @@ crc32(const void *buf, size_t sz) return (crc ^ ~0U); } +/* + * Return the number of sectors needed to store the partition table. + */ static u_int gpt_tblsz(void) { - u_int ents; + u_int eps; /* Entries per Sector */ - ents = secsz / sizeof(struct gpt_ent); - return ((nparts + ents - 1) / ents); + /* + * Count the number of sectors needed for the GPT Entry Array to store + * the number of partitions defined for this image. Enforce the 16kB + * minimum space for the GPT Entry Array per UEFI v2.10 Section 5.3. + */ + eps = secsz / sizeof(struct gpt_ent); + return (MAX(howmany(GPT_MIN_RESERVED, secsz), howmany(nparts, eps))); } static lba_t From nobody Tue Oct 17 17:49:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S91h83FbPz4xnf2 for ; Tue, 17 Oct 2023 17:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S91h82k03z4Zfg; Tue, 17 Oct 2023 17:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697564968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0tW+/FLLSAOhtqm0I8ra5Dqp5l8D9YjjyxR8wCoWt8=; b=QAMeeGLzji7vtXNyU7YRFuDhR769F+7kQOvTWb/0+idoDsMu3+TWlwH3mwwhyi67Pv347K gEH4yX22Ez/7aJ5uOoEyiGzcBOLEGSi09d91o29AwugyVJUOc0MrsvnVNk7M4I8ftIwyY6 WVlo4jL0aU1Yugqo7hIPyAWBsQmNFPiFlMqseL0gnyIoV+Y0CKmHYYG5NbkKcAiR8bXzfW Uw3RbcQSFzHezFlxjUH+AOlZMHkOZggxPm9fSgkk5PyGs2tLvv1qxmtxg4npffbDEf02L8 GVC4NVQcceBl8NoZ5b6s+z5RDXbBcmiLFEUKzuv3J0qlHOBJQzZxGU73MtxDXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697564968; a=rsa-sha256; cv=none; b=dxbN06gwm+ooj/ahmsYeD/YzAYgWnHQrxfRRw09Am3+gsbpRrKHi1OD6pe7zAZUOzHgGvx rQVJqt2RBDZiIM/4S8mDw423wTFrf8OFGbjywvkJ7BA5cMPKZxxscitE/lbt9elUbz1ATu BBd2inzD3vVWNRdyFqBiI1g4NjQ6vX5mAAj1mNv8hMvFRDbFNIFlqzjB9f4cxWPTqX1eXD YG0PJhQQ7T0c7++Qc5ZIQ3Zj6UhViUds9O7LMHxGT7Pb8dTmedpI68yQQkJwjderufkaOS nuJK95krW0HpvGmpV0z4qb9UkwHPHYLRRYzOzPilWh/2yCHgNUk+q2ka3UeIHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697564968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0tW+/FLLSAOhtqm0I8ra5Dqp5l8D9YjjyxR8wCoWt8=; b=UpGx+D6FKq1PYUuzMO/HDGZK2+nkjno2MvvJNQlt6TjXZ39fjTMINTFevvH7YWBc/AyaVg Aav+xur7MV4THF8JXedK8zfoH1UNVQh8dJI5s/IpkqZYyBoQH7u6B4MX85+nuTND1g2+z4 wknJnlw0avRANKV9DyMX8f1xaWPp8oyub/25kSAlECJmdnRshX5jO1lq00clD5pLb+aWVa AWjuppzgaBkwYudV0uLzcU+o6VAfv/Za3Vw25zPCslPogqxCupl3YBdY5Mf6sFjpKLRF+0 k+cR35h9rEJJiOnfl8B1/ihoHrH3vixZoa3WP9KJW/ul20l8absinMvyU2t1gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S91h81nx0zZCF; Tue, 17 Oct 2023 17:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HHnS8l013545; Tue, 17 Oct 2023 17:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHnSqP013542; Tue, 17 Oct 2023 17:49:28 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:49:28 GMT Message-Id: <202310171749.39HHnSqP013542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 0c1adccd4c54 - internal/admin - Restore dteske's commit bit. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 0c1adccd4c5467212f747d8a17f43c5774142035 Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0c1adccd4c5467212f747d8a17f43c5774142035 commit 0c1adccd4c5467212f747d8a17f43c5774142035 Author: John Baldwin AuthorDate: 2023-10-17 17:46:35 +0000 Commit: John Baldwin CommitDate: 2023-10-17 17:46:35 +0000 Restore dteske's commit bit. Approved by: core (jhb) --- access | 1 + 1 file changed, 1 insertion(+) diff --git a/access b/access index 60d9d2003456..0ab30c444191 100644 --- a/access +++ b/access @@ -56,6 +56,7 @@ dim donner dougm dsl +dteske emaste erj eugen From nobody Tue Oct 17 17:53:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S91nH4Sb2z4xnsx; Tue, 17 Oct 2023 17:53: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 4S91nH3h37z4cP2; Tue, 17 Oct 2023 17:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGWmyKkthJcoAbPup5VEzXTX9rjFMVD6VzO4wdErfN8=; b=s89hkYUhiwQbPhDzuYzqig3YPylGwkCgSe7C850FjReTTweHxRywX1mdgQqsiHGS35vk1p jw2hGnr6j2BGiD7GdbGYY69RVbWREcrWYCGOq9ATO/6bS5bS4OObIciHGgPIu9TvgeVjxs 4dLIuLpZACrtanCzMae9qXl03zLCbau0f4FgfvH2H9Usk1MO1IaNQQ6wIT+D7vBBjsiycZ pYknFLv8Tr6PtvQWtd4r0YjJ07Dnjw+DP2PSlTJpLoppWVxFWZlDCvStx1pHq8seVYHVD3 /DuFgjWvmqQfZp2quC2aqjSZs6jry7zl8ENBsSMm5aYlhWjVifdQcVyCDzQujg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697565235; a=rsa-sha256; cv=none; b=YVwLp9hwDXG4+NhxUe3PSlF19IRsNRddCCiXzhrYjFIZ1F7/JnS+TzaNkWRRFeOaW4jFqV e4NEwDF6sqkRShpQ+DlsHs4sgP2tAzMmdfStzaNKhYC0DFvmKGMcm7LxXer30MNtMT2AD3 N1qNEwVaFmdCFSLK3YQypwIwtJTdvwieFa8F2nbcj3F6aXuYbXNvPRbomI3OUGPRGrfCSO bxuess1Isrw3r6IukETq+2qoDs2HlueEUP7FbTXiwkqp33LJ5tXeTQhC7ZWFlBRMAkkYp8 T3UkIPIuShI7iLqWWImX2s+eWBzSQTpEO7edk0YdZwohCadLHa48tLbrhSn+9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bGWmyKkthJcoAbPup5VEzXTX9rjFMVD6VzO4wdErfN8=; b=NbqKCIphxNAclFhSseIxNgFzqQ+blZDOidmZlzpvsSsUK/uUoPjjmpPqqJFt0u4mea0xpC hVDv5HimHyPePzd9xM3cvQyPo0Kb7ktBypK+o7xAoGLQM5UmpwzZ9q3uM4ovdFI9i1KOpN cWLyGi85NsoOGqkRAgavIKktsOA5xWvEhyDWlYySn2IhsOK+dT6vLbZ5urKg1ShtlgZPuR 0PUICGOXD9KHjQjEuUEaaQWEbtvkEZDonFQEmq5I5GTwNMSVrC5ZmHpmAzKVa1/kuixTKP 48PuI1zUwS5Attud2LoGf1chbzJKIees9GOTb6FMX+bS7kbDF8KaFu5Ev6Rx/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 4S91nH2lPSzYnf; Tue, 17 Oct 2023 17:53: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 39HHrt8C029253; Tue, 17 Oct 2023 17:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHrtN3029250; Tue, 17 Oct 2023 17:53:55 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:53:55 GMT Message-Id: <202310171753.39HHrtN3029250@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: 2ee2890249ca - main - Makefile.inc1: remove ncurses/form from _prebuild_libs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ee2890249ca359c1f5ee91f184eac13aec37a77 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2ee2890249ca359c1f5ee91f184eac13aec37a77 commit 2ee2890249ca359c1f5ee91f184eac13aec37a77 Author: Ed Maste AuthorDate: 2023-10-16 13:12:16 +0000 Commit: Ed Maste CommitDate: 2023-10-17 17:53:45 +0000 Makefile.inc1: remove ncurses/form from _prebuild_libs As of d287d3282f43 libbsddialog has a built-in form implementation and does not need a formw dependency. This reverts commit 483a226238ed8949c6d280ae0757a0683962a74b. Reported by: asiciliano Sponsored by: The FreeBSD Foundation --- Makefile.inc1 | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 67dce43e5228..68549d91598d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3038,7 +3038,6 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_lib_casper} \ lib/ncurses/tinfo \ lib/ncurses/ncurses \ - lib/ncurses/form \ lib/libpam/libpam lib/libthr \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ lib/libgeom \ @@ -3075,7 +3074,6 @@ _lib_libradius= lib/libradius .endif lib/ncurses/ncurses__L: lib/ncurses/tinfo__L -lib/ncurses/form__L: lib/ncurses/ncurses__L .if ${MK_OFED} != "no" _prebuild_libs+= \ From nobody Tue Oct 17 18:26:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S92WL0zy6z4xqrL for ; Tue, 17 Oct 2023 18:26: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 4S92WL0Vlqz4fjq; Tue, 17 Oct 2023 18:26:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeV4BylH2eOKff5wMNt0bKyg1nLtoEtAw4MgxjUggQY=; b=hOxVHLd4oeFxMTSwQNKEOc6JSuk7lkf7GTJJqNJG0t59tP+/G6FL2qJ33BA4LQ8mc2mgGh mWucf35horVptlfvjqookN/oDyOGEEgCkKNddEsBdfxfAaVJJajgDX2FXvNvkf1sObkoiS t4Q7A6u4Tc9kPpgJvqB4P/sAaZki/NT0WtG5xCipHfcRXZh+lNoYCNgjVW4sdo6WLFtxWa NO1IdXr2A3a6sjJkuUJkhaM0RB8Sw02eAtR/SrnrV8sf140ueBlS1FcsklaD4sJlnLx8Ec vspVRN4A18A+c8ugg4hFHmGogIishtTCIm7OEfzFKIOZ8eso2yJrpE/+m0sayg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697567214; a=rsa-sha256; cv=none; b=Q6uYz08NyFSKF2aVtUBfof8L8oJ7DoT2cKeaJ0xITeNT+jnBSemZx/hoyCkcPGWbT9tcMA HggwBOSYi1JtEv1dJc1CN9HsdW6w/Ajgd3T7eBEb2CuKmr2qdwDV40Tz12nEpc2cvwgnRM Lpe7bXOMjnjYDakfvBPwcELYiqsa9Al5RqErDl6f8+rYFa/jg/eoCEwgAm0TMH6DOWLU/D fwuChdUhyAiVxUHPMb0n1NYFw0hOlH61keBEyUukpelDNqP9WzN8LuPBGZmLrm8IPaFCMl iO/tE/R9cX1xtqECb3LyZ5dR5+J9d0CnK8EHXrJXK1WT1ta5aC00y4wSqwgKtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZeV4BylH2eOKff5wMNt0bKyg1nLtoEtAw4MgxjUggQY=; b=WwfKFVcVQoDuRH1saR47Ll+cmraZ9gDH8SRnJ2s4ZE4UQ2OIL8EoWaI2IBBqlxTTBOjc+s JiHvioyQCGgHnaD+K6PQLCXM7I54LOHFhF5FMc6/BO7VJTVN0Xg+1uaRFMKynUo9BzaMiq kBy21HbTLZ4xqpir2PQQGhlSZ5bI7rJfh3kO51Q1eFT3pqVZxfbZFroQ+pW6UBwJPdHzdB 6spLND2/Ohpe40/oLzCigf8NHrUwohlGQVJq03hSVD0sneoAi0b4Q8ODodiF6jWG/qI7iT a7O9xF2b+07xpm/uI+ITqewrOhivTyX9W26cKyX7Sq/pDVjrbse3ww7kTEf9Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S92WK6YJFzbDn; Tue, 17 Oct 2023 18:26: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 39HIQrJE080367; Tue, 17 Oct 2023 18:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HIQrMP080364; Tue, 17 Oct 2023 18:26:53 GMT (envelope-from git) Date: Tue, 17 Oct 2023 18:26:53 GMT Message-Id: <202310171826.39HIQrMP080364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 07a56fafff56 - internal/admin - Add Jake Freeland - jfree@. Mentors: imp@ and markj@ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 07a56fafff56d3202d8150f3d304ec8d04b5e257 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=07a56fafff56d3202d8150f3d304ec8d04b5e257 commit 07a56fafff56d3202d8150f3d304ec8d04b5e257 Author: Sergio Carlavilla Delgado AuthorDate: 2023-10-17 18:24:09 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-10-17 18:26:31 +0000 Add Jake Freeland - jfree@. Mentors: imp@ and markj@ Approved by: core (implicit) --- access | 1 + mentors | 1 + 2 files changed, 2 insertions(+) diff --git a/access b/access index 0ab30c444191..e599789b1796 100644 --- a/access +++ b/access @@ -77,6 +77,7 @@ hrs imp jah jamie +jfree jhb jhibbits jilles diff --git a/mentors b/mentors index 407b3813c215..d9f57239184a 100644 --- a/mentors +++ b/mentors @@ -19,6 +19,7 @@ def oshogbo dsl bz gordon delphij Co-mentor: emaste jceel trasz +jfree imp Co-mentor: markj jkh rwatson kadesai ken Co-mentor: scottl, ambrisko mjoras rstone From nobody Tue Oct 17 18:32:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S92dr5CRjz4xr9s; Tue, 17 Oct 2023 18:32: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 4S92dr4k2Wz3Bt5; Tue, 17 Oct 2023 18:32:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=cVSFavrwcsp56uaJsxFx2CD3WSR+oCEhMscd2pjT5+FcwkzzH4RwYYXsku3s22A9xUHNuL lOtHMJwAzI942fkLBxI3/VBo1F59Ygb1goMydbTh8lnJMgJviPqNYejkOL2VhzSe2gJdLy yZsmEIMUgqvwN8FrsiNAb6KOp22UvDg+Sp2xkS2G74FRKa15sZSSiXR1XVbAElZ5jZxJLI QP6yDwJehZGga7ayUT37xh2vEBQLMP/8g3gxHfAEV9kAy9NKyV+HSGtmyX+Gh4Vz2YUz8A UyVCHbYX72opjXTUbkx6ymjW6idveqtcpLkBOyhPXbgl1X+s9+CDdZ+/reiEng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697567552; a=rsa-sha256; cv=none; b=y0UCPZAt/VXs844XJk0a2igrsT8JyRzLuA3rND0gVtn0xRbo6L1VSYGVwd0uRSoE5W+eHL LYiQSEnPjyW4ELBjGHuJCKlbZs2DVG9KwGSVJm+vwF1QLYeDfW9/AIDfLcho/g29KWxAMa C72i+skEs9YPU+ICiLUj97eqaB02mdKvFaHpu02DXfq4hL7yLQ/Y3KwxhEG+rXUsOAqWhi SSHvE4sDGWmfhi8yrwKN4QFwLTW9SbzF3kWmWHm7w3NK0kX6vx2Ix300VUeqYFLO1hROyP mYL6MFeRZELag5H0XIdzp4O5ft6siRh5U6WzOE1ZzeDrZTplzv9/zqPUl/wsZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697567552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vV3GSpiIkTVPKecU29DBDimwndgKA1TidU4BiDz9bD0=; b=OW0mZio4Dkal4irHIa0Voclu0SCxnlTYxffoVBmdj2aSDCURKh+rC+7lYGhB8Mfa1++ZMx xG+bz+Mcu1JAmIX1DhCMulVHlbp/CUIl6/DUnr4famUW6vuUGYHtSlEKZlv48aQyCe35KC KzwTUJ3xRjF+0agMsXbL5K7BGs9aIQFEPM3vUbYys9KhaV9kFMyqOTCCfFbzj1ZFlTTBIO ilpwuiVuX9SwUx/zl2kY4HFgWMqYTCxAKDaJn6Z6gn5BVyg4LMSvUdH3SBUSrXI1X3/Ugn /VFd4VU9/1MPQhrdhROyP14kc19fWmyQwLx9V1FNVjOEOHWEQ15fVkN+PpaEjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S92dr3nbkzbZJ; Tue, 17 Oct 2023 18:32: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 39HIWWu1095930; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HIWWiG095927; Tue, 17 Oct 2023 18:32:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 18:32:32 GMT Message-Id: <202310171832.39HIWWiG095927@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: 7de582874eb9 - main - bhyve: Remove init_snapshot() and initialize static vars List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7de582874eb9d08f3f87d11ed9e2b9ce8306db79 commit 7de582874eb9d08f3f87d11ed9e2b9ce8306db79 Author: Vitaliy Gusev AuthorDate: 2023-10-17 14:16:08 +0000 Commit: Mark Johnston CommitDate: 2023-10-17 18:26:51 +0000 bhyve: Remove init_snapshot() and initialize static vars vCPU threads are starting before init_snapshot() is called. That can lead to corruption of vcpu_lock userspace mutex (snapshot.c) and then VM hangs in acquiring that mutex. init_snapshot() initializes only static variables (mutex, cv) and that code can be optimized and removed. Fixes: 9a9a248964696 ("bhyve: init checkput before caph_enter") Reviewed by: markj MFC after: 1 week Sponsored by: vStack --- usr.sbin/bhyve/bhyverun.c | 3 --- usr.sbin/bhyve/snapshot.c | 21 +++------------------ usr.sbin/bhyve/snapshot.h | 1 - 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 0d7f58509244..8147dcd3872b 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1021,9 +1021,6 @@ main(int argc, char *argv[]) setproctitle("%s", vmname); #ifdef BHYVE_SNAPSHOT - /* initialize mutex/cond variables */ - init_snapshot(); - /* * checkpointing thread for communication with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5f643c9ceb50..edce55c03eae 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -137,8 +137,9 @@ static const struct vm_snapshot_kern_info snapshot_kern_structs[] = { }; static cpuset_t vcpus_active, vcpus_suspended; -static pthread_mutex_t vcpu_lock; -static pthread_cond_t vcpus_idle, vcpus_can_run; +static pthread_mutex_t vcpu_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t vcpus_idle = PTHREAD_COND_INITIALIZER; +static pthread_cond_t vcpus_can_run = PTHREAD_COND_INITIALIZER; static bool checkpoint_active; /* @@ -1395,22 +1396,6 @@ vm_do_checkpoint(struct vmctx *ctx, const nvlist_t *nvl) } IPC_COMMAND(ipc_cmd_set, checkpoint, vm_do_checkpoint); -void -init_snapshot(void) -{ - int err; - - err = pthread_mutex_init(&vcpu_lock, NULL); - if (err != 0) - errc(1, err, "checkpoint mutex init"); - err = pthread_cond_init(&vcpus_idle, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_idle)"); - err = pthread_cond_init(&vcpus_can_run, NULL); - if (err != 0) - errc(1, err, "checkpoint cv init (vcpus_can_run)"); -} - /* * Create the listening socket for IPC with bhyvectl */ diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index 179aafb6471d..8bebdafd6117 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -100,7 +100,6 @@ int vm_resume_devices(void); int get_checkpoint_msg(int conn_fd, struct vmctx *ctx); void *checkpoint_thread(void *param); int init_checkpoint_thread(struct vmctx *ctx); -void init_snapshot(void); int load_restore_file(const char *filename, struct restore_state *rstate); From nobody Tue Oct 17 19:03:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S93KW5xz7z4xsZZ; Tue, 17 Oct 2023 19:03: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 4S93KW5NLBz3FSX; Tue, 17 Oct 2023 19:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697569407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=ZoMKXrFk0lLkRxkbDDXNgatS8MMxk89M0C6UwTADEfDCWHid22V6CjwcBVGXSjVOyuv9He YAvXfZ4eZarkQOPn28Wd5YDkZAi8Rm1gAs+xfD/Jc/IUZ91iyEg4TihgNijdQfQMRrDWut EbZRkdmTTPBcAajha+9FD2tKS45XuguiorZYTYyUh9g4I8XejcRfQBzkmV9QhJjbq6DCZL euHqZ+hAPK/wrioc2JWPmhImWcHTG37SxzCfTGDRJwmsCEXx9s9wY5V4MLExrGUXdtybw1 8Nm2qsE4KgmqNr8WHNbrmUGqZC066u/ANo+aGomoOb8v+8WMmH+Ln+77mD9bOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697569407; a=rsa-sha256; cv=none; b=wcn52FU0e5sLt9SfQ5iEGQNapuQTiAfY+9DM9ad2QMtXFmybxQviRP1dLwaLnpfP4au1NK lEVCVqfSLzeSH86lcU0UP54S9O8/m1GV0Xunf63arBzChRxtGhr2SwJv/FsiRQXdFhux6p Ve4IKDO9wZ4hKGaaiiteye7Jy8cauI/t06yNWwcxSA6tgRzIpZb0L0MIZ8A++Bdrq0Rqw6 HPQowPsQN0z0EnhSdDplNklAhWjpu8v8fby7PffjDJE3FSnmReVPTPY/CKOA7di6N/jzma nsclSmHpAOK0uZQWnTxuJBmttz0OXJy33vcGkNroomwloExQbYvlU0HIRodd7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697569407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l5EpUYc8BJDcUizQLQrq2DI+5Drp6TJFlVOSZZnIkjM=; b=tvLlGttAsoB7R3Tt4NsxkkAOQZoZvKrVQycRWY2zb0Am+hvdgrw7iugq/3mPmL59IwUndx 4rRIwdtIgRij3pKF+t9QZaZwondQGDzy1/8lTsPnYUJ+ztjE/Mn8l3GC7byrSd7DJpoC2x WPea1Gt+fpCpA93JGu1esfQEtp0r1hakNh7jJmnlkMiIrVDUuC8Rtb+tdT15PCXw84MkC7 nevXovUMDLcn8LLR1U125Xcqua3E1H0TxU+YdQJDNa+yjnMOaCe25cVQcuStmXsNW56zlH /B7QybRkDGk25guCyzK6lRzjTVEAnTwbLWdvOYuUPNKB4+e40g7iTYeBpb+vXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S93KW4RDrzcGK; Tue, 17 Oct 2023 19:03: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 39HJ3RM5046825; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJ3RKj046822; Tue, 17 Oct 2023 19:03:27 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:03:27 GMT Message-Id: <202310171903.39HJ3RKj046822@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: 2bb78b46e024 - main - ndp: fix timestamp display output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bb78b46e02413483409fe73244995524b838b6e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bb78b46e02413483409fe73244995524b838b6e commit 2bb78b46e02413483409fe73244995524b838b6e Author: R. Christian McDonald AuthorDate: 2023-10-17 16:57:22 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 17:01:38 +0000 ndp: fix timestamp display output The current xo_format string is incorrect. This restores the display format prior to libxo-ification work while also explicitly marking tv_sec and tv_usec as encoded output only. MFC after: 1 week Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42269 --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 1e3469d54228..b7bc25dd7aa4 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1544,7 +1544,7 @@ ts_print(const struct timeval *tvp) /* Default */ sec = (tvp->tv_sec + thiszone) % 86400; - xo_emit("{:tv_sec/%lld}{:tv_usec/%lld}%02d:%02d:%02d.%06u ", + xo_emit("{e:tv_sec/%lld}{e:tv_usec/%lld}{d:/%02d:%02d:%02d.%06u} ", tvp->tv_sec, tvp->tv_usec, sec / 3600, (sec % 3600) / 60, sec % 60, (u_int32_t)tvp->tv_usec); } From nobody Tue Oct 17 19:15:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S93bm2Gftz4xssr; Tue, 17 Oct 2023 19:15: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 4S93bm1gkjz3GsM; Tue, 17 Oct 2023 19:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697570148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAC2X1tAahGRL/tSnTLimZ8O39hj44OGNvPIQDLoysQ=; b=GolOcFMkazhDMiGlbe6IEfVZzcEJk+TLqMyncfeRjJlg/RZYOFjEeuswIsJ4DWvVzjTI+9 9VShYcJpaQSy7lj1Jfyg0O0QAyuGuEwRx2JuX7ljv1wMIRjy9IG5C8NhJ+Nppos0GwMbmU yly+NOpL06QaOYt0o+bVt/JU1mLdU2BIWuR+sqxAzgMND1ARBLhfrzKq9qv8Ri0Ro2Jefu j4f2noi90xdsCzd6bz39WMVrGnI4q/Wq8UQS1NwzhJvLdGz/nGJnOUKMRwgECfaqJQ8NlU CZB8Qten8hKgXAFWngCV7Q8PiJj0V+z3270T/c+nAz5Xw7w72PyC54YIqy5CsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697570148; a=rsa-sha256; cv=none; b=dilZlxz5KNefkcjML1K594Vz6dVdgKzg/l/6hKy3OCkpGY2NIcd4iwDpknkbP5UAjZOsUd Tfttg2P74ZSzWhGd5Zmuypnuqwv45/98Jf8274VWhuZ1IaUMpSEMbwU0jSK+OWSQdYpDhv 1Sqivo8VzzHxGOyV7SIZGtVetBLudwkgDzHuGYkD08C3p+7U2EKPb3lwP15V+7l/6EDb9X c6dCuEEjmgEsEoHDKMFHEH+wU3SDnmPD74pqMaMfp+f7qzuBo1PkLZJusoUEIp1lJedCer Exg7oQNt0qSbMvgmkehGCC6KL0wJoWk5eV1swDvgSiwD8HamMF/vRGe8B5QI1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697570148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAC2X1tAahGRL/tSnTLimZ8O39hj44OGNvPIQDLoysQ=; b=E40/8O9wHPKFR3ziBP22JPtKX9dyrP5xnJE975/CKNHmozphWh5GuJs3PECwiWoQ2KsUIQ 13xJcIuar4YKbLjknRWu6WdNymC/c4CuFAmHm2idiO44ZRPofIFNQfh+by9+Gz9mLnWXkZ ol6Y675y4mDB81BBv82eh8O9XnvAa2EoEsoCXAEciQxKMz/WXwkLpZ+/znNCPqUtEMzuin zcBIj5/u1dqfbu+IeY6AMGjRtVYQjfK2oTg/p2ctdhDQbY2S+84QLh2ZBoF4bY2BUxyjrm QdW3X2xZ8KhmZKBhOgfTWzCUCD5m5jTHkR7wrb9etu59JvfuyQpJ/SQkErin4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S93bm0bWkzc8P; Tue, 17 Oct 2023 19:15: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 39HJFl42063576; Tue, 17 Oct 2023 19:15:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJFlEx063573; Tue, 17 Oct 2023 19:15:47 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:15:47 GMT Message-Id: <202310171915.39HJFlEx063573@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: 6e281255ea35 - main - lltable: fix ddb show llentry l3_addr pretty printer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e281255ea3574ca666e99c535a9b2734871ded8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6e281255ea3574ca666e99c535a9b2734871ded8 commit 6e281255ea3574ca666e99c535a9b2734871ded8 Author: R. Christian McDonald AuthorDate: 2023-10-17 17:03:49 +0000 Commit: Kristof Provost CommitDate: 2023-10-17 17:03:49 +0000 lltable: fix ddb show llentry l3_addr pretty printer The ddb commands for lltable do not produce useful l3_addr information. This fixes the llentry pretty printer to correctly display the l3_addr Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D42253 --- sys/net/if_llatbl.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c index ef4f27dbb00c..fe5273cf19c0 100644 --- a/sys/net/if_llatbl.c +++ b/sys/net/if_llatbl.c @@ -1065,18 +1065,13 @@ lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info) } #ifdef DDB -struct llentry_sa { - struct llentry base; - struct sockaddr l3_addr; -}; - static void -llatbl_lle_show(struct llentry_sa *la) +llatbl_lle_show(struct llentry *lle) { - struct llentry *lle; uint8_t octet[6]; + sa_family_t af = AF_UNSPEC; + char l3_addr_fmt[] = " l3_addr=%s (af=%d)\n"; - lle = &la->base; db_printf("lle=%p\n", lle); db_printf(" lle_next=%p\n", lle->lle_next.cle_next); db_printf(" lle_lock=%p\n", &lle->lle_lock); @@ -1097,33 +1092,37 @@ llatbl_lle_show(struct llentry_sa *la) octet[0], octet[1], octet[2], octet[3], octet[4], octet[5]); db_printf(" lle_timer=%p\n", &lle->lle_timer); - switch (la->l3_addr.sa_family) { + if (lle->lle_tbl) { + af = lle->lle_tbl->llt_af; + } + + switch (af) { #ifdef INET case AF_INET: { - struct sockaddr_in *sin; + struct sockaddr_in sin; char l3s[INET_ADDRSTRLEN]; - sin = (struct sockaddr_in *)&la->l3_addr; - inet_ntoa_r(sin->sin_addr, l3s); - db_printf(" l3_addr=%s\n", l3s); + lltable_fill_sa_entry(lle, (struct sockaddr *)&sin); + (void) inet_ntop(af, &sin.sin_addr, l3s, sizeof(l3s)); + db_printf(l3_addr_fmt, l3s, af); break; } #endif #ifdef INET6 case AF_INET6: { - struct sockaddr_in6 *sin6; + struct sockaddr_in6 sin6; char l3s[INET6_ADDRSTRLEN]; - sin6 = (struct sockaddr_in6 *)&la->l3_addr; - ip6_sprintf(l3s, &sin6->sin6_addr); - db_printf(" l3_addr=%s\n", l3s); + lltable_fill_sa_entry(lle, (struct sockaddr *)&sin6); + (void) inet_ntop(af, &sin6.sin6_addr, l3s, sizeof(l3s)); + db_printf(l3_addr_fmt, l3s, af); break; } #endif default: - db_printf(" l3_addr=N/A (af=%d)\n", la->l3_addr.sa_family); + db_printf(l3_addr_fmt, "N/A", af); break; } } @@ -1136,7 +1135,7 @@ DB_SHOW_COMMAND(llentry, db_show_llentry) return; } - llatbl_lle_show((struct llentry_sa *)addr); + llatbl_lle_show((struct llentry *)addr); } static void @@ -1150,7 +1149,7 @@ llatbl_llt_show(struct lltable *llt) for (i = 0; i < llt->llt_hsize; i++) { CK_LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - llatbl_lle_show((struct llentry_sa *)lle); + llatbl_lle_show(lle); if (db_pager_quit) return; } From nobody Tue Oct 17 19:43:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cc0lyPz4xvMD; Tue, 17 Oct 2023 19:43: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 4S94Cc09l4z3K5y; Tue, 17 Oct 2023 19:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3J1BK5T67jLAE/JA5E3WaOozkhKw6oZvfCVQeArkpc=; b=A5qfNttqb/ittWiePODo8r/TL1XfDTqz6xeKf61epqsCeLeNimGmOsmaIuMDEOMHFiWVjs jLBzY7h6JwxgWKHOv6rgMt6Q89pczZ1tH+5IwjlFKXkhoHxVMsMb5NhbipCGztrwLAmogY SnbxgHKF+2c4xeofFZ16/OXk0EmHuYd1irRj5I4FxYv9GFEq9DtLdYLZDhQ5BhnvN4bEio JnznsVyHrbz/tQz2UBEBzNo+2D+FpwC2GAimje+U0G40pS+ngvv7SneAD1inHkLBeDnGkx W/CoMF9ejBcKApZDSaX1Ncz0G3+kXpH4Bi1yXkbFXT/PkPKIk46DvqmJRAYfBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571804; a=rsa-sha256; cv=none; b=VD+flQalgg/nHGGEyd3CBhVAGlled6Lud9JUNWwUTfjVLhiIHsABVFDtY4Jy2lSp0Xu/w9 sG01aXdYykDW0samqW7xhyyXTsOE8ckMiCSpbreHK3Ks7WpVMST8aObsvQrUlDLm7n3RIk ln2K9NSQVZkI9KR13fan6bfebIls+oPXcz76AQecEIl47s6/RqO5mKo1D5y404dg+SnUWv sWN5sEqcupUU++byc6hRZ2z2mgQbZZK4DkLhfXBsU/i05rb6OKvE4CSIUZ4uyYnCfSA+20 i3bcB7dB4NWie3eML7TBiruJyV+WzD2bnWr7HaM7DAiNssOw5CIulk9SuPK5kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3J1BK5T67jLAE/JA5E3WaOozkhKw6oZvfCVQeArkpc=; b=sibA/laewBXiEFzRKRavgEkRYvNzqXOKPOIHnoTNLUgP0yAch26IRbHXxtIlOZrfT/Z1Jq Y2WDdX904WfOhjhph3rWe11KTqVL5sqoSMfAKfiFDhkIyn8UgIhLL4Axu20/C/gRqniig2 sTvEUj78jALrEbEsRiVnEOyFHhMJRS5dcIFpX+7wDu4TORPfKizrMX1X/GDx9/7eIvVyQI f5VwtfpLcoOscvgfAP4KUYR0jA8Xge7nM7sjS3RWT1szXfyDs861ELkkuyHanCcWvQ1gdi U8GQzZu/nrWJ666VKCqmhQTpuj6coeqNARJya34RURhLf2f3UEaB15+r6dJ9yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cb6Jmdzcng; Tue, 17 Oct 2023 19:43: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 39HJhNbR012801; Tue, 17 Oct 2023 19:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhNlX012797; Tue, 17 Oct 2023 19:43:23 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:23 GMT Message-Id: <202310171943.39HJhNlX012797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9dad3ed1d15c - stable/14 - cr_canseejailproc(): New privilege, no direct check for UID 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9dad3ed1d15c95c3eedb49c59e55bb25a7071250 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9dad3ed1d15c95c3eedb49c59e55bb25a7071250 commit 9dad3ed1d15c95c3eedb49c59e55bb25a7071250 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:37 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_canseejailproc(): New privilege, no direct check for UID 0 Use priv_check_cred() with a new privilege (PRIV_SEEJAILPROC) instead of explicitly testing for UID 0 (the former has been the rule for almost 20 years). As a consequence, cr_canseejailproc() now abides by the 'security.bsd.suser_enabled' sysctl and MAC policies. Update the MAC policies Biba and LOMAC, and prison_priv_check() so that they don't deny this privilege. This preserves the existing behavior (the 'root' user is not restricted, even when jailed, unless 'security.bsd.suser_enabled' is not 0) and is consistent with what is done for the related policies/privileges (PRIV_SEEOTHERGIDS, PRIV_SEEOTHERUIDS). Reviewed by: emaste (earlier version), mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40626 (cherry picked from commit 7974ca1cdbee949f5e453eea112be265b425c407) --- sys/kern/kern_jail.c | 1 + sys/kern/kern_prot.c | 7 +++++-- sys/security/mac_biba/mac_biba.c | 1 + sys/security/mac_lomac/mac_lomac.c | 1 + sys/sys/priv.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 39bdcaf5ef0e..57e6024a9939 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3938,6 +3938,7 @@ prison_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: /* * Jail implements inter-process debugging limits already, so diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 19e0b78c6709..ed15cb566499 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1426,9 +1426,12 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { - if (u1->cr_uid == 0) + if (see_jail_proc || /* Policy deactivated. */ + u1->cr_prison == u2->cr_prison || /* Same jail. */ + priv_check_cred(u1, PRIV_SEEJAILPROC) == 0) /* Privileged. */ return (0); - return (!see_jail_proc && u1->cr_prison != u2->cr_prison ? ESRCH : 0); + + return (ESRCH); } /*- diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 6948548503e1..5d66e2fd4b9b 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -1924,6 +1924,7 @@ biba_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 05bd0da06960..aa9abf458721 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1702,6 +1702,7 @@ lomac_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 45cb5bab4275..a61de8d32fe0 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -105,6 +105,7 @@ #define PRIV_CRED_SETRESGID 58 /* setresgid. */ #define PRIV_SEEOTHERGIDS 59 /* Exempt bsd.seeothergids. */ #define PRIV_SEEOTHERUIDS 60 /* Exempt bsd.seeotheruids. */ +#define PRIV_SEEJAILPROC 61 /* Exempt from bsd.see_jail_proc. */ /* * Debugging privileges. From nobody Tue Oct 17 19:43:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cd3pnnz4xvRv; Tue, 17 Oct 2023 19:43: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 4S94Cd1Kbsz3K6F; Tue, 17 Oct 2023 19:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4+w3xO6Whz8QKn6nec+f2j1fnzQy31oVaH9E3nrjmA=; b=q39ZXOCuOXOvSe7wSA/ciOSziUPsh9vvBBvxhMALANSewbarkC+oEIfEZia8ja8rUw0fPI CPYHwh7z5K8fLiIibqQf6PXM4+7lzvhPwy4Sp/m2/bfAXJ51TAGHSLYyHNivwBetr/UeIm rbLF+4VwPRxEiH2HWfrGJDpWAn8yGP9jZfJcxzqLOMTUOzQpXqcZHAsieYg+IjDdDBH6mY qLbMDmYvOZ+XkHjXQBSCMi33MnKooCV7vZI6Smp3mRLAcyh08l6lYS/SV/OLte25yCqBub BzozVRGVBPvCfXlfZQWy0g9FZCxvn6Acpklb9hIgxYS8w68UiXoWjPj+q1Ibtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571805; a=rsa-sha256; cv=none; b=sPYU7djcxcvA38OmY5JcvK+yHii8g1ZFTi1bApWu0a/XTEtSS10ACbP8JuEe4eTymU/CaY Ggi0211+YGDXF/Og2tRFd7yZuf3bTXdBOa1lU7udNDTe75uQRI+qvf9fOC3NmD8polaLlk NW/TS5JOadrbME0fE1MVLge6Bblj2fNVWgL0ZyatXWTYxILOxhOGHBKlk9P20hZ3ysv5OI FoA7Q8aeVQFiLTVpmFeOmnwRH5zS7T5DGEhJYN+KSMmC7sPqkX/CjvFPUAYnSVz/4UZuXM oQn6X5mjEiSXM3BCFKG87y9fN0Ehg1+TzTTgmL5ykRQQTN2cYWtrASlshJ2kUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4+w3xO6Whz8QKn6nec+f2j1fnzQy31oVaH9E3nrjmA=; b=idXLxX3u3IuPVQdWV/7aR+8geu9mQAWWdv4bo+gWRlFiPm+bEZ4z8ko/Ph2/hvm/uj29jW FSFtWM9NlcMtl+BHEeyRJVEuZQOhzWaKFImAa3rhwrGKZFyAK35oUsKyiavHIGvCmgcr0L kvSxALntn7miM1szKZN+B3uDFORpC41yWCvJ6kcc1s8WaM+ISaYt8wGYh3k/0zBhoiSspO f8FYv/qL4m2J4RvJD/Fq4afItK7acX1nZXIx0Qk4jEM1qd8uBGLjpd/R57hqOjp8TwiFgX Oo6Rk1Ag9awRmbEWeyOtWpq0AoKzDtHgQKVGgwI5W+ijXreEDQxHypw5RcTT3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cd0CFszcbl; Tue, 17 Oct 2023 19:43: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 39HJhOBG012855; Tue, 17 Oct 2023 19:43:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhOhx012852; Tue, 17 Oct 2023 19:43:24 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:24 GMT Message-Id: <202310171943.39HJhOhx012852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3ad322db8902 - stable/14 - New cr_bsd_visible(): Whether BSD policies deny seeing subjects/objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3ad322db8902da1c3d3669471e4e5738f980a849 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ad322db8902da1c3d3669471e4e5738f980a849 commit 3ad322db8902da1c3d3669471e4e5738f980a849 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:38 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 New cr_bsd_visible(): Whether BSD policies deny seeing subjects/objects This is a new helper function that leverages existing code: It calls successively cr_canseeotheruids(), cr_canseeothergids() and cr_canseejailproc() (as long as the previous didn't deny access). Will be used in a subsequent commit. Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40627 (cherry picked from commit e4a7b4f99cfd4931468c0866da4ae8b49cf5badb) --- sys/kern/kern_prot.c | 19 +++++++++++++++++++ sys/sys/proc.h | 1 + 2 files changed, 20 insertions(+) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index ed15cb566499..1e6073b554e4 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1434,6 +1434,25 @@ cr_canseejailproc(struct ucred *u1, struct ucred *u2) return (ESRCH); } +/* + * Helper for cr_cansee*() functions to abide by system-wide security.bsd.see_* + * policies. Determines if u1 "can see" u2 according to these policies. + * Returns: 0 for permitted, ESRCH otherwise + */ +int +cr_bsd_visible(struct ucred *u1, struct ucred *u2) +{ + int error; + + if ((error = cr_canseeotheruids(u1, u2))) + return (error); + if ((error = cr_canseeothergids(u1, u2))) + return (error); + if ((error = cr_canseejailproc(u1, u2))) + return (error); + return (0); +} + /*- * Determine if u1 "can see" the subject specified by u2. * Returns: 0 for permitted, an errno value otherwise diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3102cae7add0..8609bbd124ad 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1163,6 +1163,7 @@ void ast_sched(struct thread *td, int tda); void ast_unsched_locked(struct thread *td, int tda); struct thread *choosethread(void); +int cr_bsd_visible(struct ucred *u1, struct ucred *u2); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); int cr_canseeothergids(struct ucred *u1, struct ucred *u2); From nobody Tue Oct 17 19:43:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cf34Ysz4xvRx; Tue, 17 Oct 2023 19:43: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 4S94Cf2Jbxz3KYG; Tue, 17 Oct 2023 19:43:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NIqxckPlQFzI8CnouBS1QIbG494LZlfuJdw/00sFjg=; b=rND76IalCZiew+ZqABgSjjOcqPbLOyeZhrprgcipxIfgwocoYBlM0Wv7UfT9jrscv5zgyT xGfIj51FhuO3h4NH4fhNCflKPjBGHOOtxw/gwJni3DzJJMw8L2KmEK8r0XUEgiaxi8iJRE pQ5dpntaVIf08TzIh9zVd4eabPLkb40o2nbVcR5sjmeVzXi4m+JdR+eq0pJZzLlGrDLT3B /UkEhbJJxVeDBQdWcrWoztlUtTzciHm+1INtoFA+IDxetZOlGMyYTvwIDBmY4cfBZNnZ5l yJ918i0EkQIZZxlvRMaK/CIHDDpuSgL9b7KtS0Tr3mnnrK9Fyd8lx4NNsmj83w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571806; a=rsa-sha256; cv=none; b=eq35egQ7DiyMx6QC7HYFvTSDj4Konj7C7uDd2VeKke8Kk5rkYhQldOvaP5ESsawkn+Ibut NQi7RND2Bz3aj/N0mvjQB4c/qLjZrIcoz/Mt3Tb9S5knzZmWNAgLzOWkET1jqG8qc7xXH6 FqB5QO9xQURHG8sbwY9Kfg/S5ga9TEYjT1CIEk165LOfY7qge48LjVaucqq39cXjEClmCH vd/Liz6pyAUSxlX+WyGrboNxkmGWqVfQfzFWakXYlV5nEYBDvxVAJa10rK6SwV88YuV8bG vDwK6J+H3DAnzUi7kHonPOCmnkSHI1N42y4GfyzsYrmfGEiNVfoXuEJG+f8MoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2NIqxckPlQFzI8CnouBS1QIbG494LZlfuJdw/00sFjg=; b=UMaPFZM/effMK77ygwBisUf6BbjxVq9p5Ascm3VDM3+2ViBvluwn4xs6pODijMPaEmXeQ+ sOVAskK0Ah9qyATOJFGyIf24j2n0XDOwLskQa7a5k5djEQDF9TI05kLIwJ6vHoJp6CM7w0 AsJn3IkNfVkrpAQmIvc3r1C7iXbtTXKNfjD4YSDm+yaDDONxUOApmJOuwwUq1nrNanv8pS HPDk8tDZrHEMHeXtFcDMzzPTTbunu8zLfq0VZaSbg/Y0nD5W1URx5zf3wJM2Hudnk5MXl6 OyX6xcf4ny549K3Jnqv0nYizFhr0b16EyV7UXjLEsaMN0cU3oFsVnloKQgTy3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cf1BDFzcnh; Tue, 17 Oct 2023 19:43: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 39HJhQOx012899; Tue, 17 Oct 2023 19:43:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhQMi012896; Tue, 17 Oct 2023 19:43:26 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:26 GMT Message-Id: <202310171943.39HJhQMi012896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e1153205a719 - stable/14 - Fix 'security.bsd.see_jail_proc' by using cr_bsd_visible() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e1153205a719c6cb792cb2213a3737ee6b53d59c Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e1153205a719c6cb792cb2213a3737ee6b53d59c commit e1153205a719c6cb792cb2213a3737ee6b53d59c Author: Olivier Certner AuthorDate: 2023-08-17 23:54:38 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 Fix 'security.bsd.see_jail_proc' by using cr_bsd_visible() As implemented, this security policy would only prevent seeing processes in sub-jails, but would not prevent sending signals to, changing priority of or debugging processes in these, enabling attacks where unprivileged users could tamper with random processes in sub-jails in particular circumstances (conflated UIDs) despite the policy being enforced. PR: 272092 Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40628 (cherry picked from commit 5817169bc4a06a35aa5ef7f5ed18f6cb35037e18) --- sys/kern/kern_prot.c | 25 +++++++------------------ sys/netinet/in_prot.c | 4 +--- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 1e6073b554e4..648c067dc528 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1471,11 +1471,7 @@ cr_cansee(struct ucred *u1, struct ucred *u2) if ((error = mac_cred_check_visible(u1, u2))) return (error); #endif - if ((error = cr_canseeotheruids(u1, u2))) - return (error); - if ((error = cr_canseeothergids(u1, u2))) - return (error); - if ((error = cr_canseejailproc(u1, u2))) + if ((error = cr_bsd_visible(u1, u2))) return (error); return (0); } @@ -1536,9 +1532,7 @@ cr_cansignal(struct ucred *cred, struct proc *proc, int signum) if ((error = mac_proc_check_signal(cred, proc, signum))) return (error); #endif - if ((error = cr_canseeotheruids(cred, proc->p_ucred))) - return (error); - if ((error = cr_canseeothergids(cred, proc->p_ucred))) + if ((error = cr_bsd_visible(cred, proc->p_ucred))) return (error); /* @@ -1653,10 +1647,9 @@ p_cansched(struct thread *td, struct proc *p) if ((error = mac_proc_check_sched(td->td_ucred, p))) return (error); #endif - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) - return (error); - if ((error = cr_canseeothergids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); + if (td->td_ucred->cr_ruid != p->p_ucred->cr_ruid && td->td_ucred->cr_uid != p->p_ucred->cr_ruid) { error = priv_check(td, PRIV_SCHED_DIFFCRED); @@ -1723,9 +1716,7 @@ p_candebug(struct thread *td, struct proc *p) if ((error = mac_proc_check_debug(td->td_ucred, p))) return (error); #endif - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) - return (error); - if ((error = cr_canseeothergids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); /* @@ -1815,9 +1806,7 @@ cr_canseesocket(struct ucred *cred, struct socket *so) if (error) return (error); #endif - if (cr_canseeotheruids(cred, so->so_cred)) - return (ENOENT); - if (cr_canseeothergids(cred, so->so_cred)) + if (cr_bsd_visible(cred, so->so_cred)) return (ENOENT); return (0); @@ -1847,7 +1836,7 @@ p_canwait(struct thread *td, struct proc *p) #endif #if 0 /* XXXMAC: This could have odd effects on some shells. */ - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); #endif diff --git a/sys/netinet/in_prot.c b/sys/netinet/in_prot.c index 222e39c6bcd2..204f4f60456e 100644 --- a/sys/netinet/in_prot.c +++ b/sys/netinet/in_prot.c @@ -67,9 +67,7 @@ cr_canseeinpcb(struct ucred *cred, struct inpcb *inp) if (error) return (error); #endif - if (cr_canseeotheruids(cred, inp->inp_cred)) - return (ENOENT); - if (cr_canseeothergids(cred, inp->inp_cred)) + if (cr_bsd_visible(cred, inp->inp_cred)) return (ENOENT); return (0); From nobody Tue Oct 17 19:43:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cg3n2sz4xvNw; Tue, 17 Oct 2023 19:43: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 4S94Cg30wXz3KYj; Tue, 17 Oct 2023 19:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYGPp5VkmYTZiZ84i9vUmBXLvNDyvl2h6D2JxA+zaW4=; b=DXHVlNXRsdUlSlMGKhGKHU6CNJUwXbzqxtAOBRhq+Nje0ensfAS+eSS4x+ktaozi75WPl1 L1yeFIZpExbdW8Aas+TOGjlRmxhWq7QQ/eTuVHhEDBuo1D9xadizv6bhYFFkbl47v7ptYY bJ9mMaxxH2ABoy0b+dNhflWSc9U+w+IB3UnNKTy9Z65Xl1VI08BqreANTg2i16iR2FhRBg EO7Pd+2VOafLCj1mnO/E8/27Xjq8urRXbjrCf+1f9xzdritOdmLAZCQSoHrAtkmrWpiSNt QnmQNi1N4i9hfYQKu/+rYs2W8+7OJOZY2cxJ3llFKLAImpX66mXqkUfzX+NOHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571807; a=rsa-sha256; cv=none; b=KkT++4XUZ9GrVSUSjrlpWNVyQfxDCEQx73WOdiDADtjUXBJ+IbPIh7OShlyNr/eeKFwirI 8dA28JyO5dbsXrnc0ZXQkTSO4HAlgjhSRAFqP3tTGQY/hNga1x20R67cjl3LS2fVMhUIF/ 1lAl576z7zK24/j6vVr3AbOhX0jCHgBU36yKy4udscU9kY0JMqY/EiF6h/7UsMlgpRJ98d hzXfzEoy3Cr0bGswpJPKDSmD6F6r3BsI0R66sPDDxnpKM1V24cZ1l0MXrMxX9axxFFYtb7 XK2M4arIsG9NMK5uTzG/OTu/sWub5duJqdAXKlZN4kLeOuIhvneFcWOFk59idA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYGPp5VkmYTZiZ84i9vUmBXLvNDyvl2h6D2JxA+zaW4=; b=oJEhkRESIifDG9vIkoykx8ROZ2ce/D2251Q0HMF9TwUZL6E7cdlL1LXACqf2hIrOSZuS2s JfLfbudaZoJUhCgimzfpiTkPG/FlDdbWZVI52wVVKVWS5wg4HSrKECBfBsHqvKwJSfE7y7 9Pl5KXc1quxRQNZPIr6DdhmmpZfC4qhv2VQTVaJqEsWGVbjjY3EmhMv+ycT7qpJzWWaeOu gne+8uFBUhIPKHvZ19TVOosa/2xTjxjAohklcRAObsHjFjIXfn8vmPoDaptyDqOply7Sr8 lzjyFVxeyTPsxu0UdW/MCP0llI5fMrXvX0lm26NUZSVM5d+43nIWvruab6jEjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cg25sxzcr6; Tue, 17 Oct 2023 19:43: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 39HJhRDg012950; Tue, 17 Oct 2023 19:43:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhRHT012947; Tue, 17 Oct 2023 19:43:27 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:27 GMT Message-Id: <202310171943.39HJhRHT012947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f173bbdbc1f8 - stable/14 - cr_canseeotheruids(), cr_canseeothergids(): Man pages: Impacts of rename List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f173bbdbc1f8701d55db52be30b738395ab3c925 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f173bbdbc1f8701d55db52be30b738395ab3c925 commit f173bbdbc1f8701d55db52be30b738395ab3c925 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:39 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_canseeotheruids(), cr_canseeothergids(): Man pages: Impacts of rename When these functions were renamed 7 years ago, their man pages were not. Rename the latter in accordance and fix the names inside them. Fix references to them as well. Add the old man pages to the list of obsolete files. Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40630 (cherry picked from commit c59ab75c04fa32bc6d292596ff5e4593a05a6b1b) --- ObsoleteFiles.inc | 4 ++++ share/man/man9/Makefile | 4 ++-- share/man/man9/cr_cansee.9 | 8 ++++---- share/man/man9/{cr_seeothergids.9 => cr_canseeothergids.9} | 8 ++++---- share/man/man9/{cr_seeotheruids.9 => cr_canseeotheruids.9} | 8 ++++---- share/man/man9/p_candebug.9 | 8 ++++---- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6f07b70494f8..6a5e4e39fc1e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20231013: Man pages renamed to match the actual functions +OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz +OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz + # 20230906: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index eb670c924077..08ad811fa901 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -69,9 +69,9 @@ MAN= accept_filter.9 \ counter.9 \ cpuset.9 \ cr_cansee.9 \ + cr_canseeothergids.9 \ + cr_canseeotheruids.9 \ critical_enter.9 \ - cr_seeothergids.9 \ - cr_seeotheruids.9 \ crypto.9 \ crypto_buffer.9 \ crypto_driver.9 \ diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9 index 8e058eb4e3e5..4824a231170b 100644 --- a/share/man/man9/cr_cansee.9 +++ b/share/man/man9/cr_cansee.9 @@ -50,9 +50,9 @@ variables and .Va security.bsd.see_other_uids , as per the description in -.Xr cr_seeothergids 9 +.Xr cr_canseeothergids 9 and -.Xr cr_seeotheruids 9 +.Xr cr_canseeotheruids 9 respectively. .Sh RETURN VALUES This function returns zero if the object with credential @@ -84,7 +84,7 @@ does not belong to the same jail as The MAC subsystem denied visibility. .El .Sh SEE ALSO -.Xr cr_seeothergids 9 , -.Xr cr_seeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseeotheruids 9 , .Xr mac 9 , .Xr p_cansee 9 diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_canseeothergids.9 similarity index 94% rename from share/man/man9/cr_seeothergids.9 rename to share/man/man9/cr_canseeothergids.9 index bd8eb5d2e9d9..79269533ae5c 100644 --- a/share/man/man9/cr_seeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -26,14 +26,14 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 11, 2003 -.Dt CR_SEEOTHERGIDS 9 +.Dt CR_CANSEEOTHERGIDS 9 .Os .Sh NAME -.Nm cr_seeothergids +.Nm cr_canseeothergids .Nd determine visibility of objects given their group memberships .Sh SYNOPSIS .Ft int -.Fn cr_seeothergids "struct ucred *u1" "struct ucred *u2" +.Fn cr_canseeothergids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION This function determines the visibility of objects in the kernel based on the group IDs in the credentials @@ -76,5 +76,5 @@ or .Er ESRCH otherwise. .Sh SEE ALSO -.Xr cr_seeotheruids 9 , +.Xr cr_canseeotheruids 9 , .Xr p_candebug 9 diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_canseeotheruids.9 similarity index 94% rename from share/man/man9/cr_seeotheruids.9 rename to share/man/man9/cr_canseeotheruids.9 index 2cefd0f9dc8e..80acc2d7a6ca 100644 --- a/share/man/man9/cr_seeotheruids.9 +++ b/share/man/man9/cr_canseeotheruids.9 @@ -26,14 +26,14 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 11, 2003 -.Dt CR_SEEOTHERUIDS 9 +.Dt CR_CANSEEOTHERUIDS 9 .Os .Sh NAME -.Nm cr_seeotheruids +.Nm cr_canseeotheruids .Nd determine visibility of objects given their user credentials .Sh SYNOPSIS .Ft int -.Fn cr_seeotheruids "struct ucred *u1" "struct ucred *u2" +.Fn cr_canseeotheruids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION This function determines the visibility of objects in the kernel based on the real user IDs in the credentials @@ -76,5 +76,5 @@ or .Er ESRCH otherwise. .Sh SEE ALSO -.Xr cr_seeothergids 9 , +.Xr cr_canseeothergids 9 , .Xr p_candebug 9 diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9 index ffa4fedb6172..e80d313de55c 100644 --- a/share/man/man9/p_candebug.9 +++ b/share/man/man9/p_candebug.9 @@ -113,9 +113,9 @@ Process is not visible to thread .Fa td as determined by -.Xr cr_seeotheruids 9 +.Xr cr_canseeotheruids 9 or -.Xr cr_seeothergids 9 . +.Xr cr_canseeothergids 9 . .It Bq Er ESRCH Thread .Fa td @@ -129,8 +129,8 @@ The MAC subsystem denied debuggability. .Sh SEE ALSO .Xr jail 2 , .Xr sysctl 8 , -.Xr cr_seeothergids 9 , -.Xr cr_seeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseeotheruids 9 , .Xr mac 9 , .Xr p_cansee 9 , .Xr prison_check 9 From nobody Tue Oct 17 19:43:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Ch4vg0z4xvn5; Tue, 17 Oct 2023 19:43: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 4S94Ch4CFMz3KlQ; Tue, 17 Oct 2023 19:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glKZg05nMdIiCrMrQdWDH6xnkyWT+GI382BpSGZzeww=; b=L0MEs0aXVQBhy8OdDs/52T2NX4Z2cLjfS9EGY0eLAHVzZauWR4jyQVUcC5U24J9vIxNSc1 77ClpuLUJznTE+UuLzyQeTC5FcVWPWgwnpJm00mUKBTf4XXuRdIC6x21I4r356MyrFB68m 0SWVUX7pouHNhCX+7njf+zSH/j9oLeONZgSy9PuuL9+i8jcNZxNtialLJkkUTT6WxdX13q He7l+1vZ/s1bO5qWL7H2Kg8eg62LERsdE7L0YrCJklAk2GseE9F3xY2si1/jy/q4wVBy4h ttBOtrdllnoIjRnsnwA9jv8tmUudWcVRa6D0MCdZlmUV+4LpDnFNnEA8CWC8BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571808; a=rsa-sha256; cv=none; b=PtwCZHfwJOkDwozQJaEef0GgMWqMQMQvSMhAZiTANJh+3hpUYKgFHWyptIoYEv97+b9YtT cqXs63pbCE6hTRQt9B2vq2veyfPvxQJD3jNSF/L4/KxpWsoEdQsoI55N6LZ3+oUdFYHDWJ rmQv8jwv63X2aSNRsCNCjwVWpU7Rtgchi3hNoqmD6OtwXXs1uYG3TOOFGrYgFeJLVUYwfv uuH/2MRYpnKX5UhCAqlMrhsE9zu+muCsAXaTVaHB6PgFwecpr1cv18O6VeGilhSRrLQ48Y WW9kQbtJTP1CfKVP1lmqdIadxQa5Ka9YETVz1GcgbMm5X61a/vSEdLU2OrXzSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=glKZg05nMdIiCrMrQdWDH6xnkyWT+GI382BpSGZzeww=; b=U5FblCxh5jE4322GrAcoXhKlQHWXRjsRjGeH5A/ctm8Q/chV+xA+QXafSZD5i8b6+mTfwo NfNe5CykPKQLPba96RxCR4qhei7ffzO3v5yo/c4NMCeEV+AYXF0prnQKRll6XV4lzhLpPx 3J3NPEFp73c8IjAg4hH8w4gu+kEuS6EubyGQ1sX4Xgj9BvaEgobcIMH1yezQ5x/bOwW5py EcGMmk4cdWrQOtX72eC3wbhdfC36XyxBUT/r4Ei6p3DbjjZDrdOLH33SsiBdG5YiDWJ7/G xuZXQfcbVG2gG/wBfHcjsgDjfOYoq80sBDlDPVGRy9WXKiu52HIJRQFAOU43SA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Ch3JjXzd4G; Tue, 17 Oct 2023 19:43: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 39HJhSY7012996; Tue, 17 Oct 2023 19:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhS9L012993; Tue, 17 Oct 2023 19:43:28 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:28 GMT Message-Id: <202310171943.39HJhS9L012993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ce4c78b612b1 - stable/14 - cr_canseejailproc(9): New man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce4c78b612b1d933320ae794b50f85f60db2e1a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ce4c78b612b1d933320ae794b50f85f60db2e1a0 commit ce4c78b612b1d933320ae794b50f85f60db2e1a0 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:40 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_canseejailproc(9): New man page Reviewed by: pauamma_gundo.com, mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40631 (cherry picked from commit 29d863bb7ffc692998f21fa3e7a91afa1151cf1c) --- share/man/man9/Makefile | 1 + share/man/man9/cr_canseejailproc.9 | 81 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 08ad811fa901..71a11a7cc6c0 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -69,6 +69,7 @@ MAN= accept_filter.9 \ counter.9 \ cpuset.9 \ cr_cansee.9 \ + cr_canseejailproc.9 \ cr_canseeothergids.9 \ cr_canseeotheruids.9 \ critical_enter.9 \ diff --git a/share/man/man9/cr_canseejailproc.9 b/share/man/man9/cr_canseejailproc.9 new file mode 100644 index 000000000000..775c76722b05 --- /dev/null +++ b/share/man/man9/cr_canseejailproc.9 @@ -0,0 +1,81 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Olivier Certner +.\" +.\" 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 DEVELOPERS ``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 DEVELOPERS 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. +.\" +.Dd August 18, 2023 +.Dt CR_CANSEEJAILPROC 9 +.Os +.Sh NAME +.Nm cr_canseejailproc +.Nd determine if subjects may see entities in sub-jails +.Sh SYNOPSIS +.Ft int +.Fn cr_canseejailproc "struct ucred *u1" "struct ucred *u2" +.Sh DESCRIPTION +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials +.Fa u1 +is denied seeing a subject or object associated to credentials +.Fa u2 +by a policy that requires both credentials to be associated to the same jail. +This is a restriction to the baseline jail policy that a subject can see +subjects or objects in its own jail or any sub-jail of it. +.Pp +This policy is active if and only if the +.Xr sysctl 8 +variable +.Va security.bsd.see_jail_proc +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . +.Sh RETURN VALUES +The +.Fn cr_canseejailproc +function returns 0 if the policy is disabled, both credentials are associated to +the same jail, or if +.Fa u1 +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . +.Sh SEE ALSO +.Xr cr_bsd_visible 9 , +.Xr priv_check_cred 9 +.Sh AUTHORS +This manual page was written by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Tue Oct 17 19:43:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cj67yGz4xvnH; Tue, 17 Oct 2023 19:43: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 4S94Cj5FRKz3Kgy; Tue, 17 Oct 2023 19:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5aUray6WaQIosna2Lb2K/O+xz2ciflPGQQcl93VXoE=; b=IuyzHjrKmnBzH0mm57MBi8Neekv8IemOnjBpwkS4Sips3RUJWsZs9omzHDF5fhNAuUD59e b2swTJfG9q7y0oA0poGPjA+1b4/j+NaCCne+NNVReK5DO3hRI5tqOEffq+deNOM2dq+q3B OPDOhCQOmGKqnEKrV9WCk9sg6vsEqB8s2YfRwwpYef2APObd1JfxauvMIrEiOqQ7WseCrR lDIhgtPmq86r9fjUjbcRRhoDB0tF4k6z5Umikj8OylUIaHLzOpns7lN+1TU+i7Vc767WT0 yI50P0F8dR07bfH4ZoRMeNYTD3iDHNwKnLz9AX22CGarL9xMo/0Hdy0DdWDm8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571809; a=rsa-sha256; cv=none; b=gE1O69dk7H8bXWQy+IZv+kwCD6mgOibNDV/oir8WKl+pqI+9eBY+M7NpGDFF3Lev00tqMs pDDrQ9UYj6Z4El0hBXs9zGVrKIobfQSDcmmrFuxa0eZvaZJmGv92QNQhgK3y/OlMdmU2Tl 4YMIOVGw/XFHTSQsVVhzUs1+36ceGT5zirkk4l/8b+KY9bR4DbhnSB0bOWotq4GiGU8pS2 Yu9lHnuPPDW7riCrPz/9U73S1ZyWJvBrln+qDc34rJMmqsRvSEIQfff+PXRGG8AKEC6zaa jg0Y9sC/ZZyc/EhDynbCNFeDadgRAEcFEP29Wyi/gA6ZL1wPhxlPXCexiEa5tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T5aUray6WaQIosna2Lb2K/O+xz2ciflPGQQcl93VXoE=; b=OINrwmGG6VORZxhVeoxULGay2Ktn+TlAlUcNZlKNJcCU+OUZItLN0CiAcytozqqftkKvyi 7FyZciXRm0ybPtpmy8Kq4If/G3CegbEX98Abj7Q1/MGgrcLDH1c4XqUk1X0rnp5cPOQdFN EgKDtzl56AMjDzdjmg91/0QPjRW5npNbfUwdJR+Dw/+eZooADZkYE9BLCLUH67Q2uZS4yw 6f7/7hQqmnX3XZyDD7RZWIworMLS3Ok3JcWLqyaOnkEFQkinR2qv6OE52f0j7Xz7DPoKEF kpgYxM5lagBtbW6usc9oFkeln1iJbxJBf7CnBM4d9MX48/kdg+YCylo3aR1FVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cj4LKHzcr7; Tue, 17 Oct 2023 19:43: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 39HJhTXk013037; Tue, 17 Oct 2023 19:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhTkt013033; Tue, 17 Oct 2023 19:43:29 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:29 GMT Message-Id: <202310171943.39HJhTkt013033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d9181d86c6ae - stable/14 - cr_bsd_visible(9): New man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9181d86c6aed243927620b414a7c37b1ae613d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d9181d86c6aed243927620b414a7c37b1ae613d7 commit d9181d86c6aed243927620b414a7c37b1ae613d7 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:40 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_bsd_visible(9): New man page Reviewed by: bcr, pauamma_gundo.com MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40632 (cherry picked from commit 0d6bf73c4f20e6ed719c29c1b382d24bb0a81a2f) --- share/man/man9/Makefile | 1 + share/man/man9/cr_bsd_visible.9 | 117 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 71a11a7cc6c0..c3c81719b7d2 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -68,6 +68,7 @@ MAN= accept_filter.9 \ copy.9 \ counter.9 \ cpuset.9 \ + cr_bsd_visible.9 \ cr_cansee.9 \ cr_canseejailproc.9 \ cr_canseeothergids.9 \ diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9 new file mode 100644 index 000000000000..bd676e6f5705 --- /dev/null +++ b/share/man/man9/cr_bsd_visible.9 @@ -0,0 +1,117 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Olivier Certner +.\" +.\" 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 DEVELOPERS ``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 DEVELOPERS 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. +.\" +.Dd August 18, 2023 +.Dt CR_BSD_VISIBLE 9 +.Os +.Sh NAME +.Nm cr_bsd_visible +.Nd determine if subjects may see entities according to BSD security policies +.Sh SYNOPSIS +.In sys/proc.h +.Ft int +.Fn cr_bsd_visible "struct ucred *u1" "struct ucred *u2" +.Sh DESCRIPTION +This function determines if a subject with credentials +.Fa u1 +is denied seeing an object or subject associated to credentials +.Fa u2 +by the following policies and associated +.Xr sysctl 8 +knobs: +.Bl -tag -width indent +.It Va security.bsd.seeotheruids +If set to 0, subjects cannot see other subjects or objects if they are not +associated with the same real user ID. +The corresponding internal function is +.Xr cr_canseeotheruids 9 . +.It Va security.bsd.seeothergids +If set to 0, subjects cannot see other subjects or objects if they are not both +a member of at least one common group. +The corresponding internal function is +.Xr cr_canseeothergids 9 . +.It Va security.bsd.see_jail_proc +If set to 0, subjects cannot see other subjects or objects that are not +associated with the same jail as they are. +The corresponding internal function is +.Xr cr_canseejailproc 9 . +.El +.Pp +As usual, the superuser (effective user ID 0) is exempt from any of these +policies provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . +.Pp +This function is intended to be used as a helper to implement +.Xr cr_cansee 9 +and similar functions. +.Sh RETURN VALUES +This function returns zero if a subject with credentials +.Fa u1 +may see a subject or object with credentials +.Fa u2 +by the active above-mentioned policies, or +.Er ESRCH +otherwise. +.Sh ERRORS +.Bl -tag -width Er +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +do not have the same real user ID. +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +are not members of any common group +.Po +as determined by +.Xr groupmember 9 +.Pc . +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +are not in the same jail. +.El +.Sh SEE ALSO +.Xr cr_canseeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseejailproc 9 , +.Xr priv_check_cred 9 , +.Xr cr_cansee 9 +.Sh AUTHORS +This function and its manual page were written by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Tue Oct 17 19:43:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cl1XRgz4xvSB; Tue, 17 Oct 2023 19:43: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 4S94Ck5vQjz3Kkp; Tue, 17 Oct 2023 19:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mcGZb4B3XAHUR6cWommntv1rCH8cTD4MjUw50dQZDOA=; b=E/SmIy+xQ09vcUL1+x5R1b+LRbEOgjIDWMwdSfrUL6zLGJYk2Yz2TM1Q87Lkgxta3qEQiG o4pthOt5U8jR+JskEssMaT9ufvlrVNOKdmk3AFkJ2f5J/Zv/qoYpmxVT+z+hCNPzjLBUmG ruZL/HYXOrWA11g9BcRdh0H3ouEFevvYYQdyIUN0zT9pGLl33j9NOIQGnyEY377swAKSdF xwysZlshWuSPQTk4mz+oawg92jxNetClVGSANdoZG0KXBKD+V04h8WwWujNIJIshY+SwM+ 5K64Tfjrla3niqzp7aKyYNQq5/Wm8MK7q0BTPjDHab+Lc22bk1F9+Il6E9Ep0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571810; a=rsa-sha256; cv=none; b=h3koemhvwr+CWSsVE0qhe/gb8ndH5Bq3p5RYQfz8PJyXCNntXCLrKtul5nsTZBkDnS0PGI AAXHX4AykFGHMwxtM6w5bDbm5hn5DiQTfiPC1uKen6DKu/v3x+v4P9hDhKSDbQZENXww3r oMtV0PFTWlb1347b3S1+M+MPXnHMAXgUGeFSyadeFnin6M8aS+f24u7snr8N5HCyAe2yiE VRn11ChAmJnp34bZaCM+dKl7qyIc6eGZBxPQlfnFuOoXHSKgVKOyJmTkEBH9HAD4ndWdfV GCRfGFtc0PAZxBxXFlC3Ut23xE7yVxsWEhbfCkO5efDNB770SJSPeLdqpSSJtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mcGZb4B3XAHUR6cWommntv1rCH8cTD4MjUw50dQZDOA=; b=KDz7pwpgGwCOj7Z3TW7Ba/yldJgwXWiwZA9aU+5y3esAg3y5odNZHMthIc4VWggfE9e45o XrvJGfUBqqZdRHceDErrm5DsnEm9LYdb8bReHJmFYwFdfADDJrYlfv15a3dazJJ2ccIpoH Iz3YENYgsrG67kamst6usgr5Wb6toR9Mc1P4xrJAa0STi5VbeHAkVycOVN7F+e5LezxWVx GPzE2ZfZBqj+l6s+ZH9qGZZIW+q+u355XxqDrwavczr9LjMoifXBODMxeXqc+8WpoVfJHo VU0KJ/qhcGVi4W3plWd6rdRJrJgolbS5JxKsCV8dGXqm0q/BdAF6/Uqvu+F1mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Ck4vVmzcSQ; Tue, 17 Oct 2023 19:43: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 39HJhUC9013083; Tue, 17 Oct 2023 19:43:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhUY5013080; Tue, 17 Oct 2023 19:43:30 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:30 GMT Message-Id: <202310171943.39HJhUY5013080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: ad1486b625ed - stable/14 - cr_canseeothergids(9): Revamp, mark as internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad1486b625edbf190ba0d9c77d695560e75037cb Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ad1486b625edbf190ba0d9c77d695560e75037cb commit ad1486b625edbf190ba0d9c77d695560e75037cb Author: Olivier Certner AuthorDate: 2023-08-17 23:54:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_canseeothergids(9): Revamp, mark as internal Significantly clarify. Replace references to cr_canseeotheruids(9) by ones to cr_bsd_visible(9). Reviewed by: pauamma_gundo.com, mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40633 (cherry picked from commit 3fe9ea4d2d04d48a249b2e6161d416bb4d5b364e) --- share/man/man9/cr_canseeothergids.9 | 77 +++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/share/man/man9/cr_canseeothergids.9 b/share/man/man9/cr_canseeothergids.9 index 79269533ae5c..f0c1e5c4e726 100644 --- a/share/man/man9/cr_canseeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,56 +26,58 @@ .\" (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 November 11, 2003 +.Dd August 18, 2023 .Dt CR_CANSEEOTHERGIDS 9 .Os .Sh NAME .Nm cr_canseeothergids -.Nd determine visibility of objects given their group memberships +.Nd determine if subjects may see entities in a disjoint group set .Sh SYNOPSIS .Ft int .Fn cr_canseeothergids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the group IDs in the credentials +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials .Fa u1 -and +is denied seeing a subject or object associated to credentials .Fa u2 -associated with them. +by a policy that requires both credentials to have at least one group in common. +For this determination, the effective and supplementary group IDs are used, but +not the real group IDs, as per +.Xr groupmember 9 . .Pp -The visibility of objects is influenced by the +This policy is active if and only if the .Xr sysctl 8 variable -.Va security.bsd.see_other_gids . -If this variable is non-zero then all objects in the kernel -are visible to each other irrespective of their group membership. -If this variable is zero then the object with credentials -.Fa u2 -is visible to the object with credentials -.Fa u1 -if either -.Fa u1 -is the super-user credential, or if at least one of -.Fa u1 Ns 's -group IDs is present in -.Fa u2 Ns 's -group set. -.Sh SYSCTL VARIABLES -.Bl -tag -width indent -.It Va security.bsd.see_other_gids -Must be non-zero if objects with unprivileged credentials are to be -able to see each other. -.El +.Va security.bsd.see_other_gids +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . .Sh RETURN VALUES -This function returns zero if the object with credential +The +.Fn cr_canseeothergids +function returns 0 if the policy is disabled, the credentials share at least one +common group, or if .Fa u1 -can -.Dq see -the object with credential -.Fa u2 , -or -.Er ESRCH -otherwise. +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . .Sh SEE ALSO -.Xr cr_canseeotheruids 9 , -.Xr p_candebug 9 +.Xr cr_bsd_visible 9 , +.Xr groupmember 9 , +.Xr priv_check_cred 9 From nobody Tue Oct 17 19:43:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cm0BhCz4xvd1; Tue, 17 Oct 2023 19:43: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 4S94Cl6Zzzz3Kps; Tue, 17 Oct 2023 19:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6SZFWGxVFrsG6pALfnC65XpPhZflXGU/qAmb7PyU7I=; b=HN/DADEL50jjJi3vv4d/kVghKkMLpTWJSeWV76EKeTe3pwmsEnf0CkadTNr1TaUXB2UWHa Q7A/kzpm88LuV2qqMOvheIW81PUUqCbJd3cxBVcatQiKduL8Ruh6EhAquCDsZkR3JKNZb8 OPeU6VCXWs3ZdCJvJ1h7rWeHLx0a54Bu+wE0QI8wj8gsLQ1Zph7RTLmobFw4xk/0O/aa5P gn0u/WoOqb4AKSWGV5QmQvTp2TcymtWT3+hRz9px04J7GBx5w7DD3d7Nnhhd3cZrvIo6t3 E6YTzYjY53HE/pybHLlcZaRmFEf543qjMngXckI4263XLzb/Ld/jPifnc608eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571811; a=rsa-sha256; cv=none; b=x6ERSKIS4W7BF0rX02JPspyfdGzstos0dWxFlAxZuuQ0wVGc9yGViBEUN3sDwnjWup3qM1 efAwJFt0VbdJjFVKbRSbbuXlm5NS7u30/tOu2zxAV0SV5qa1Le7NSYr/jjFEq64Pw+OsyZ wpcH6zggomleMZOU0yG13Y64YFI0pNfTKZfeGtodH8ntz+s7yXJqtIsEFYJMmVMS6Vlti0 xpB/BvnExbyScLHcs1+zJLrpdzg93e7+Jegh38SP0qWUq1AxBeuJBlmKGpL5TZMRm1xtsf v6fCiegvDoUyCzRUaCHYTfQWRfNquhBgq95nArOLyycJbuTdme6EmMA8aXHtCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m6SZFWGxVFrsG6pALfnC65XpPhZflXGU/qAmb7PyU7I=; b=U3fDfmcWcvTrVEpjQwEV3jzm94MHE8wqw0cFNxypxA3txkzhLyYuMQqKmRqQPAIQkvJcR+ dfTHFPoSeZk6jSTmm/JOMcRS86YJPEmRyTAsnoEbmN90rXxNRkKxqyzJpObmZBdaoVylP6 VHGLFHhJ9H6iAMVXtQWQOJu8qWnWlQCCkSQOksK/Z/YApPHwObY5ADebIiHRBrqwW36RYh HvfC7e3TeCe8W3tKRKgyx/94I+MvVn79cX1EaKSzWaNY0WJdDwv/EfKpResnPpkITIWm6m XIiSnhKnXU5CHDFouBaSCF9GRyXuTZzDNWffmlCY97hk0ogaEtJMVW1fuCJXQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cl5hj6zd4H; Tue, 17 Oct 2023 19:43: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 39HJhVEo013131; Tue, 17 Oct 2023 19:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhVG5013128; Tue, 17 Oct 2023 19:43:31 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:31 GMT Message-Id: <202310171943.39HJhVG5013128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 60cc4f16d4e9 - stable/14 - groupmember(9): Detail which groups are considered, simplify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60cc4f16d4e91d9d37a4619d708cfe88ff093526 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=60cc4f16d4e91d9d37a4619d708cfe88ff093526 commit 60cc4f16d4e91d9d37a4619d708cfe88ff093526 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 groupmember(9): Detail which groups are considered, simplify Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40634 (cherry picked from commit 75a45ca3b34062fe793ae326ad9da614a1a06df1) --- share/man/man9/groupmember.9 | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index d447bf64c482..3a516622efce 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (C) 2001 Chad David . All rights reserved. +.\" Copyright (C) 2023 Olivier Certner .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd July 9, 2001 +.Dd August 18, 2023 .Dt GROUPMEMBER 9 .Os .Sh NAME .Nm groupmember -.Nd checks group set for a group ID +.Nd checks if credentials mandate some group membership .Sh SYNOPSIS .In sys/param.h .In sys/ucred.h @@ -38,21 +39,26 @@ .Sh DESCRIPTION The .Fn groupmember -function checks to see if the given -.Fa gid -is in the group set of the credentials. +function checks if credentials +.Fa cred +indicate that the associated subject or object is a member of the group +designated by the group ID +.Fa gid . .Pp -Its arguments are: -.Bl -tag -width ".Fa cred" -.It Fa gid -The group ID to check for. -.It Fa cred -The credentials to search for the group in. -.El +Considered groups in +.Fa cred +are the effective and supplementary groups. +The real group is not taken into account. .Sh RETURN VALUES If the .Fa gid -is found, 1 is returned; otherwise, 0 is returned. +is found, 1 is returned, otherwise 0. +.Sh SEE ALSO +.Xr getgroups 2 +.Xr setgroups 2 .Sh AUTHORS -This manual page was written by -.An Chad David Aq Mt davidc@acns.ab.ca . +This manual page was initially written by +.An -nosplit +.An Chad David Aq Mt davidc@acns.ab.ca +and was revised by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Tue Oct 17 19:43:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cn1Lycz4xvP4; Tue, 17 Oct 2023 19:43: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 4S94Cn0nCjz3KtF; Tue, 17 Oct 2023 19:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/0i3efXg5vKZirgDLphmskbzKId/zuGhs7aN19EGI8=; b=Ym8yBlvnytf0VoSSbi3oFpqsjZPZX0Gbwa85vfqgAgq3C7CFqNLZ2KwMidZPcREQRAIj7B moNuAUtg70UzVYUJuWtdeVxAspXOVD2Mx6lqoji9adYusn+uk9YGqulVrDEXwC4KUqrj9Q JiF73w7DMBz7vS2vH8o2nvACdbM2E/bDd2FDuT7XSSUE+4p/NL96y7YFbM3xhv84ntmrNM dQPdlGlhgd+WuawgMVA34lw27n1iB92Gns4OxMXffOkDQl/8srELfoX48+EoG2CX++vPty TSBGzvf0Fw97wTv3KRYwHRGKDfjQgIABPaxoTb8nmmgPC58QOzTLZ65MKrj6vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571813; a=rsa-sha256; cv=none; b=FL6yo3SQNVNt9yVL6L30LkGAE8e6doVlmYoeErdQjAGaJiqXCR1Mhei5I6RUnkuzIHgJO2 LoPkst6QmcNk6YWAi4N3cUhmwhRdBYf+asiBT5FYTUVC1uf441RGXDx56MWsVUpw1QrQJ8 U1J4ZWr6YMZTmBKcooxYWffxIojkG+YByK4ZRmxAIZZHvbuSgzOxmEcXd5PiHdyD98LyV/ yZkTGxeHSsPuGAHstJq5+dk2vAT56kHNCDB0aC3fxcb1k/7Ggh4Ud65ABLjGShQ2oBM67K 1CN1OhywXXZaoSKKKNNmXjeVZeOpV6PTNcGRn5UGJ3FR1JpWe88+nAdoiZGVgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K/0i3efXg5vKZirgDLphmskbzKId/zuGhs7aN19EGI8=; b=Qv4hifu3c5Hd6p6kOq6ncjZ3tHEpAMypj/zSUpAQyAf3+wEv1EdavOfM8mtscM603+nq8t zrwARAIyYt0qaYO43W7+wMzAP+RXSp1JlLqL7o1/YiMaO4LA7I/m31C3+qak6DicVwOcTy X1Ge87SohQaYcMsTUJM/IE+prnVXuIR7HIUA5jTDUC1LvCdNy+cSRQEueMUrpjzUbm2H0T atGpA+TVT4A2gBoGo+OrjapEU1fR0DrALe4c/keLk08YQDs7CwtSJUg5tOdlFWQbX3Ok54 U/y6IOWoFi5q0iuCNkEXqiIdX+qOR+63pkHu/0dDBy3gwmXCU5u6Wfoz+E4VIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cm6nW9zd0B; Tue, 17 Oct 2023 19:43: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 39HJhWtX013173; Tue, 17 Oct 2023 19:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhW2k013170; Tue, 17 Oct 2023 19:43:32 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:32 GMT Message-Id: <202310171943.39HJhW2k013170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e04b81f8b76c - stable/14 - cr_canseeotheruids(9): Revamp, mark as internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e04b81f8b76ceb31abec1c739b42e70433047d3d Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e04b81f8b76ceb31abec1c739b42e70433047d3d commit e04b81f8b76ceb31abec1c739b42e70433047d3d Author: Olivier Certner AuthorDate: 2023-08-17 23:54:42 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_canseeotheruids(9): Revamp, mark as internal Significantly clarify. Replace references to cr_canseeothergids(9) by ones to cr_bsd_visible(9). Reviewed by: bcr, mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40635 (cherry picked from commit 4ddd253b38dff8725555355cc1b5238b1bbfd380) --- share/man/man9/cr_canseeotheruids.9 | 73 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/share/man/man9/cr_canseeotheruids.9 b/share/man/man9/cr_canseeotheruids.9 index 80acc2d7a6ca..230c5ea59b78 100644 --- a/share/man/man9/cr_canseeotheruids.9 +++ b/share/man/man9/cr_canseeotheruids.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,56 +26,54 @@ .\" (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 November 11, 2003 +.Dd August 18, 2023 .Dt CR_CANSEEOTHERUIDS 9 .Os .Sh NAME .Nm cr_canseeotheruids -.Nd determine visibility of objects given their user credentials +.Nd determine if subjects may see entities with differing user ID .Sh SYNOPSIS .Ft int .Fn cr_canseeotheruids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the real user IDs in the credentials +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials .Fa u1 -and +is denied seeing a subject or object associated to credentials .Fa u2 -associated with them. +by a policy that requires both credentials to have the same real user ID. .Pp -The visibility of objects is influenced by the +This policy is active if and only if the .Xr sysctl 8 variable -.Va security.bsd.see_other_uids . -If this variable is non-zero then all objects in the kernel -are visible to each other irrespective of their user IDs. -If this variable is zero then the object with credentials -.Fa u2 -is visible to the object with credentials -.Fa u1 -if either -.Fa u1 -is the super-user credential, or if -.Fa u1 -and -.Fa u2 -have the same real user ID. -.Sh SYSCTL VARIABLES -.Bl -tag -width indent -.It Va security.bsd.see_other_uids -Must be non-zero if objects with unprivileged credentials are to be -able to see each other. -.El +.Va security.bsd.see_other_uids +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . .Sh RETURN VALUES -This function returns zero if the object with credential +The +.Fn cr_canseeotheruids +function returns 0 if the policy is disabled, both credentials have the same +real user ID, or if .Fa u1 -can -.Dq see -the object with credential -.Fa u2 , -or -.Er ESRCH -otherwise. +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . .Sh SEE ALSO -.Xr cr_canseeothergids 9 , -.Xr p_candebug 9 +.Xr cr_bsd_visible 9 , +.Xr priv_check_cred 9 From nobody Tue Oct 17 19:43:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cp2vKcz4xvV2; Tue, 17 Oct 2023 19:43: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 4S94Cp1rdsz3KnJ; Tue, 17 Oct 2023 19:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JThUSMSr/Nx07aTgvT4lrT5HmM1h/oSegl72tma4D50=; b=PrRHdxXlwoOIkuPA4RYK0qctueYjWWrXp2zEpiRnQT2leUFtj6+2O3cjzMnKMz4ei+mwb0 U2yBdC9Oqa9k51KUAh/nzZZ3SU+nZnXdbUc1uT28KtMid0LRSY46cyqfNg6bWvrZN43czj qt+ThNTfgMcmeulaDalzW0pf51l+/+NLImCarEZyTwcDGDdX7XzwLnWGrp4LT8vEmrkKWz 3Gvr4bCGQul4mjvT5tNbYLM9xXkCUYPMO9XqJ+eCWlwekNHU5zKQbjsHOiel2ovs5mg5An tF9T++b1ZsJ43vNRdB4hNfMxFypYCovEq8I2R7RE3+4+qNF0puM90xPfaDxWFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571814; a=rsa-sha256; cv=none; b=HO1OQR+ElmbIgORyNL4he8mrppK+UZo5oRNL8TW+nmgbNJ7ofRmR/UMmEQUeSg0YzGSggK dmepjebFsNUJQsJU0bEdm5/Jk2FAtjUlnIOUWqRj7UFziA6ZAvtDpzC8KHUwYgU8XflubQ wUrQAbf83LYOWGa/tAiBR849eizJEhqXddqWRa7npZf+/0RbIkv/zvlFjjupTas2OVlAWS PJ9os044DRNnvCUiF36UzO0nB//lk2I7uVNN16yJJjdsSJo/GkC/ku3fBie/I6/b76qzkq bSv8B732+2oO1rKaRmcaAPZu7DYwImdz4KV8UzQIOOERJuRgByJEasLCpRWFGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JThUSMSr/Nx07aTgvT4lrT5HmM1h/oSegl72tma4D50=; b=HJ2oHgTXtbrX3eP0d/borQZZ0Lkht9WPJIGm3dIOslGywDHQCBVHPrzoXUdDh90TLbvBQo AS8bDeo04PY+rxgTyuqxiChtX37/uvq3esGc0qYXCA58Tvv3XfBwvMJHKExYICi70CZYDY Q444BnwrD5iHTPQmbtmUi5BzgpFNNy27YqQHXGs037ig3tbVXeo397n7GPpB/tAgoB3ebK aaE4YlHjKBUOzllZIaO97j6FeHNm6udc4O7FYd2B34WT/FkIy0oH9dIo/PJqu/wyDJ1gXF RPnocKfvtV7i9DVIi62Zyhi/99HouTggBIn4jtUjzHduPjT017L4bAHEgDTekg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cp0gYvzcnj; Tue, 17 Oct 2023 19:43: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 39HJhXXs013215; Tue, 17 Oct 2023 19:43:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhXs6013212; Tue, 17 Oct 2023 19:43:33 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:33 GMT Message-Id: <202310171943.39HJhXs6013212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 2ecbfdaecbd0 - stable/14 - cr_cansee(9): cr_bsd_visible() impacts, simplifications List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ecbfdaecbd009d32b2453c7b2bd6c33656b92ef Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2ecbfdaecbd009d32b2453c7b2bd6c33656b92ef commit 2ecbfdaecbd009d32b2453c7b2bd6c33656b92ef Author: Olivier Certner AuthorDate: 2023-08-17 23:54:42 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 cr_cansee(9): cr_bsd_visible() impacts, simplifications Remove references to cr_canseeothergids(9) and cr_canseeotheruids(9). Defer to cr_bsd_visible() for controlling sysctl(8) variables. Reviewed by: bcr, mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40636 (cherry picked from commit 82f9bc9ea8ed660c61050ad1d92f1a64108c7004) --- share/man/man9/cr_cansee.9 | 61 ++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9 index 4824a231170b..d5cdfdd6f8e5 100644 --- a/share/man/man9/cr_cansee.9 +++ b/share/man/man9/cr_cansee.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2006 Ceri Davies +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -23,43 +24,39 @@ .\" (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 November 19, 2006 +.Dd August 18, 2023 .Dt CR_CANSEE 9 .Os .Sh NAME .Nm cr_cansee .Nd "determine visibility of objects given their user credentials" .Sh SYNOPSIS -.In sys/param.h -.In sys/systm.h -.In sys/ucred.h +.In sys/proc.h .Ft int .Fn cr_cansee "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the real user IDs and group IDs in the credentials +This function determines if a subject with credential .Fa u1 -and -.Fa u2 -associated with them. +can see a subject or object associated to credential +.Fa u2 . .Pp -The visibility of objects is influenced by the +Specific types of subjects may need to submit to additional or different +restrictions. +As an example, for processes, see +.Xr p_cansee 9 , +which calls this function. +.Pp +The implementation relies on +.Xr cr_bsd_visible 9 +and consequently the .Xr sysctl 8 -variables -.Va security.bsd.see_other_gids -and -.Va security.bsd.see_other_uids , -as per the description in -.Xr cr_canseeothergids 9 -and -.Xr cr_canseeotheruids 9 -respectively. +variables referenced in its manual page influence the result. .Sh RETURN VALUES -This function returns zero if the object with credential +This function returns zero if the subject with credential .Fa u1 can .Dq see -the object with credential +the subject or object with credential .Fa u2 , or .Er ESRCH @@ -67,24 +64,20 @@ otherwise. .Sh ERRORS .Bl -tag -width Er .It Bq Er ESRCH -The object with credential -.Fa u1 -cannot -.Dq see -the object with credential -.Fa u2 . -.It Bq Er ESRCH -The object with credential +The subject with credential .Fa u1 -has been jailed and the object with credential +has been jailed and the subject or object with credential .Fa u2 -does not belong to the same jail as -.Fa u1 . +does not belong to the same jail or one of its sub-jails, as determined by +.Xr prison_check 9 . .It Bq Er ESRCH The MAC subsystem denied visibility. +.It Bq Er ESRCH +.Xr cr_bsd_visible 9 +denied visibility according to the BSD security policies in force. .El .Sh SEE ALSO -.Xr cr_canseeothergids 9 , -.Xr cr_canseeotheruids 9 , +.Xr prison_check 9 , .Xr mac 9 , +.Xr cr_bsd_visible 9 , .Xr p_cansee 9 From nobody Tue Oct 17 19:43:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cq40bgz4xvP8; Tue, 17 Oct 2023 19:43: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 4S94Cq2Py1z3L6j; Tue, 17 Oct 2023 19:43:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qVTA1obK55yD6G56XzFJKSP1q3GQA1cCrt2uWpS/BO8=; b=ZcYY0veiSLKXmT/uj2cAQyF8dR+tWBgYqZn6vLvBIii3PZpnQOw+PHZljoW0UVF5XQV9iP wHev2OFWGeVSFmv0TJCwKRIJcjgU6sv7MN9uBj5VmdG/tOfn1QPEuJ/j+Xfa5XQtoHZrFi qeQPR0NW28+ltDsQST8C1JBG2qR6cqx3EhvnLLLC1RInQjiGv+Azk/xt/fkPDzbiQUIvZS 1K/069x/UnoTkh0la7P6vclMIfQw5vKFXNuY3yvEksDWyVNAIwXzKFMRvAqjzs0igYX6Ge GNoYwrBvlPl5FoKKMPrwDuPABeMVpB1iG8XzzctaL4Rk4cYH8jan047Qo4KUyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571815; a=rsa-sha256; cv=none; b=p229QbNZLTRamYYbXWUfDIjNg1F1GS43K/I4txYXXyTIxUaeFW3/HcXfabWRdyoHZ6rf+W 5qnybgnFjsbLr3qmErG+eT4KglE/tZovwrZCoOblGSnUm5QKGIaN6DuLxx+N7YtTrab/J+ OoKgFn7cvgUmNIoI/MIBqssHVEmPq9jpPq36nXNb4m0SrDv8PyQJ6XmfuFJ5Cqw6rD5EwU xkdETHDtBCJGq06nhxDpDrWxwL65arw94XxtBcxhe+f4fQXBGMh/0IUGG28ufoWDsddjUC ntymlJNTzgNaj/xaVelwi/PjHhan6QNEcnrLX7q0+SkaFgxTEdKHf7ihOWAMQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qVTA1obK55yD6G56XzFJKSP1q3GQA1cCrt2uWpS/BO8=; b=reKFACeHsrdpFgqERaq4+ds5kRvNUoQWUGLN2uL0IWrjj+s2Ot8kOABkn1UKkNXdfyh7gW cn/0ljXMH2vXsUtZjqff8DaztjaIMTP6ko7p+BeZGU5zYNn2p1FfoooHZr/QVUcCBlMaBe DIbtUPdS5AqQxcZ7xh86QRCIDS7QE/VL/f/TfoFuegO5zL4bWwA/Z/KDUDVaB993048OUo jTd5G7L1ajtIco7/TQewJHBZsgRsygcyss+qDA2luiDSP+z8OWvQan/cG0DxGlFpACDeYw slqTdKM82jDRCbmmQ+VsrWIxekfZR+/3rS+9ld0ssec3Djl2cd7jEg+3QpgQ6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cq1TNGzd4J; Tue, 17 Oct 2023 19:43: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 39HJhZ8i013258; Tue, 17 Oct 2023 19:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhZkW013255; Tue, 17 Oct 2023 19:43:35 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:35 GMT Message-Id: <202310171943.39HJhZkW013255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: fea4e20afb76 - stable/14 - p_cansee(9): Bring up-to-date, misc fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fea4e20afb76b900bfc6a733487470e3ec6f13a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fea4e20afb76b900bfc6a733487470e3ec6f13a2 commit fea4e20afb76b900bfc6a733487470e3ec6f13a2 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:43 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 p_cansee(9): Bring up-to-date, misc fixes Essentially defer to cr_cansee(9), except for the specifics. Be more specific on the return codes. Reviewed by: bcr, pauamma_gundo.com MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40637 (cherry picked from commit 2ede38aff5d4c91a17ab6d093f2e8cce24b5418b) --- share/man/man9/p_cansee.9 | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9 index 84287dac951b..9fdce460dfea 100644 --- a/share/man/man9/p_cansee.9 +++ b/share/man/man9/p_cansee.9 @@ -24,19 +24,18 @@ .\" (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 November 19, 2006 +.Dd August 18, 2023 .Dt P_CANSEE 9 .Os .Sh NAME .Nm p_cansee .Nd determine visibility of a process .Sh SYNOPSIS -.In sys/param.h .In sys/proc.h .Ft int .Fn p_cansee "struct thread *td" "struct proc *p" .Sh DESCRIPTION -This function can be used to determine if a given process +This function determines if a given process .Fa p is visible to the thread .Fa td , @@ -45,13 +44,14 @@ where the notion of may be read as .Dq "awareness of existence" . .Pp -The function is implemented using -.Xr cr_cansee 9 , -and the dependencies on -.Xr sysctl 8 -variables documented in the -.Xr cr_cansee 9 -manual page apply. +This function explicitly allows a thread to always see its own process, +even with pending credentials changes +.Po +see +.Xr ucred 9 +.Pc . +Otherwise, it simply defers to +.Xr cr_cansee 9 . .Sh RETURN VALUES The .Fn p_cansee @@ -62,30 +62,18 @@ if the process denoted by .Fa p is visible by thread .Fa td , -or a non-zero error return value otherwise. +or ESRCH otherwise. .Sh ERRORS .Bl -tag -width Er .It Bq Er ESRCH -Process -.Fa p -is not visible to thread -.Fa td -as determined by -.Xr cr_cansee 9 . -.It Bq Er ESRCH Thread .Fa td -has been jailed and process +is not part of process .Fa p -does not belong to the same jail as -.Fa td . -.It Bq Er ESRCH -The MAC subsystem denied visibility. +and cannot see it as determined by +.Xr cr_cansee 9 . .El .Sh SEE ALSO -.Xr jail 2 , -.Xr sysctl 8 , +.Xr ucred 9 , .Xr cr_cansee 9 , -.Xr mac 9 , -.Xr p_candebug 9 , -.Xr prison_check 9 +.Xr p_candebug 9 From nobody Tue Oct 17 19:43:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cr6sPwz4xvSP; Tue, 17 Oct 2023 19:43: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 4S94Cr3M4Gz3L4p; Tue, 17 Oct 2023 19:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1/3nLs9L/bFwu3Xy9YmBIjOfjZlNV9372EQtAc5dys=; b=gtv/Qm98mAjadf+3wWo4MJpqsphsY0lyNqiaAQBKwQhi+5aQuL4rx5iuGX6hIODd555Mxy nhxbr2VW+c4oHXuWr5Gfr9En096RtE3OekwmSyEJeXC1ZGujqKgboHFfX0dpJWVPa1C9vb DozpwFyEGMrHPVoe79BHI2OqpA/W4hf+fsbpV44Jkt/z8Bur7lH9pH4vrIgLwAcv9qtPwn aZnToNFVOWu5uHIZdupmW5WMOgnI3hQ6Vnjc1uGpDISNuPBqsEJztQuHVizauuKqWuCDuA O2/mcz+wmh/XcYYZtcMNfh/hNhi9pCaDBtjG82emzNS1xN3E1IDxnxyvTXaNyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571816; a=rsa-sha256; cv=none; b=yD5vrW9UDLvN2xYBlpPrLkiZqkpqoc8mSyI2heitxkhQYZXoh19fXmgSKMzqrSpDUqRswc qNLDWMNWeADvrtSd296E6B9vWirfDnbnc3Y1jboAOfeSw9oguAEF0/t79dtrh1zDl0hob8 XqOUTQqSHtZVsX3uMEOL3HkHTS6j6b2xOY7a8szCaRO2DlxiWOY2x1LUzOSy+UKa7TcVlU GmBuVXZvwcq2XHVZ2kCgtaPJWRRIaZrqVY/YLvs7I6QZAri1KLWYPmNAxFFXBYGc4LoPEf rWtwRj9KvDWFmwG6S9P7KGOgyOBHFMBPseTRtDMSaImXewOxEaYVaxBWkjprTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l1/3nLs9L/bFwu3Xy9YmBIjOfjZlNV9372EQtAc5dys=; b=ehqobBGrOdQ+m845sWG/DCGWnUDb8m7hPQz8pEuFkMJI+BJsZaEV2BI3Of95vVKBczoSE2 9iKQ8tw6H0s36E+HsYzIhcYBQW3nTgbaTnLxcJ1HYSp4S3eLk9g0b+mG4AtxvCrusDwpxz nt41LDv4dOG+B18rWazAju3TsYOnzeHLf+Q8QoUkWKsShkPX1Xmd6hjhS/0/mq4yJgzSrA Ubn4wgvn/8s8rIEP0MBU/j6OzSACXP4h7IzsqJB5PXuoekZl3Nmc50zYh8vz+rBAUxjHfP Q8gx34ZgydPHbsnGg5sY6LgdPvrDFk2mEX9C06DPZj0YImExjxTwszoqMKn0kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cr2T52zcnk; Tue, 17 Oct 2023 19:43: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 39HJhanc013310; Tue, 17 Oct 2023 19:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhaRA013307; Tue, 17 Oct 2023 19:43:36 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:36 GMT Message-Id: <202310171943.39HJhaRA013307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 76781950658c - stable/14 - p_candebug(9): cr_bsd_visible() impacts, misc fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 76781950658cc95a0820af5f0fb013f2ef9eb3a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=76781950658cc95a0820af5f0fb013f2ef9eb3a9 commit 76781950658cc95a0820af5f0fb013f2ef9eb3a9 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:43 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:58 +0000 p_candebug(9): cr_bsd_visible() impacts, misc fixes Mention cr_bsd_visible(9). Remove references to cr_canseeothergids(9) and cr_canseeotheruids(9), as well as indirect references not immediately useful. Fix description of credentials checks to match reality. Re-order errors to match code's check order. Reviewed by: bcr, pauamma_gundo.com MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40638 (cherry picked from commit eb94f24fab4b44f13ca045370d9fcf12ca8835f2) --- share/man/man9/p_candebug.9 | 103 ++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9 index e80d313de55c..c824db974154 100644 --- a/share/man/man9/p_candebug.9 +++ b/share/man/man9/p_candebug.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 19, 2006 +.Dd August 18, 2023 .Dt P_CANDEBUG 9 .Os .Sh NAME @@ -37,24 +38,27 @@ .Ft int .Fn p_candebug "struct thread *td" "struct proc *p" .Sh DESCRIPTION -This function can be used to determine if a given process +This function determines if a given process .Fa p -is debuggable by the thread +is debuggable by some thread .Fa td . -.Sh SYSCTL VARIABLES +.Pp The following .Xr sysctl 8 variables directly influence the behaviour of .Fn p_candebug : .Bl -tag -width indent +.It Va security.bsd.unprivileged_proc_debug +Must be set to a non-zero value to allow unprivileged processes +access to the kernel's debug facilities. .It Va kern.securelevel Debugging of the init process is not allowed if this variable is .Li 1 or greater. -.It Va security.bsd.unprivileged_proc_debug -Must be set to a non-zero value to allow unprivileged processes -access to the kernel's debug facilities. .El +.Pp +Other such variables indirectly influence it; see +.Xr cr_bsd_visible 9 . .Sh RETURN VALUES The .Fn p_candebug @@ -68,35 +72,45 @@ is debuggable by thread or a non-zero error return value otherwise. .Sh ERRORS .Bl -tag -width Er -.It Bq Er EACCESS -The MAC subsystem denied debuggability. -.It Bq Er EAGAIN -Process -.Fa p -is in the process of being -.Fn exec Ns 'ed. .It Bq Er EPERM +An unprivileged process attempted to debug another process but the system is +configured to deny it +.Po +see +.Xr sysctl 8 +variable +.Va security.bsd.unprivileged_proc_debug +above +.Pc . +.It Bq Er ESRCH Thread .Fa td -lacks super-user credentials and process -.Fa p -is executing a set-user-ID or set-group-ID executable. +has been jailed and the process to debug does not belong to the same jail or one +of its sub-jails, as determined by +.Xr prison_check 9 . +.It Bq Er ESRCH +.Xr cr_bsd_visible 9 +denied visibility according to the BSD security policies in force. .It Bq Er EPERM Thread .Fa td -lacks super-user credentials and process +lacks superuser credentials and its (effective) group set is not a superset of +process .Fa p Ns 's -group set is not a subset of -.Fa td Ns 's -effective group set. +whole group set +.Pq "including real, effective and saved group IDs" . .It Bq Er EPERM Thread .Fa td -lacks super-user credentials and process -.Fa p Ns 's -user IDs do not match thread -.Fa td Ns 's -effective user ID. +lacks superuser credentials and its (effective) user ID does not match all user +IDs of process +.Fa p . +.It Bq Er EPERM +Thread +.Fa td +lacks superuser credentials and process +.Fa p +is executing a set-user-ID or set-group-ID executable. .It Bq Er EPERM Process .Fa p @@ -107,30 +121,25 @@ and the variable .Va kern.securelevel is greater than zero. -.It Bq Er ESRCH +.It Bq Er EBUSY Process .Fa p -is not visible to thread -.Fa td -as determined by -.Xr cr_canseeotheruids 9 -or -.Xr cr_canseeothergids 9 . -.It Bq Er ESRCH -Thread -.Fa td -has been jailed and process +is in the process of being +.Fn exec Ns 'ed. +.It Bq Er EPERM +Process .Fa p -does not belong to the same jail as -.Fa td . -.It Bq Er ESRCH -The MAC subsystem denied debuggability. +denied debuggability +.Po +see +.Xr procctl 2 , +command +.Dv PROC_TRACE_CTL +.Pc . .El .Sh SEE ALSO -.Xr jail 2 , -.Xr sysctl 8 , -.Xr cr_canseeothergids 9 , -.Xr cr_canseeotheruids 9 , +.Xr prison_check 9 , .Xr mac 9 , -.Xr p_cansee 9 , -.Xr prison_check 9 +.Xr cr_bsd_visible 9 , +.Xr procctl 2 , +.Xr p_cansee 9 From nobody Tue Oct 17 19:43:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cs5R0Gz4xvSS; Tue, 17 Oct 2023 19:43: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 4S94Cs4XR8z3LG3; Tue, 17 Oct 2023 19:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJZVzBJv4C7fkydpYSTZApLXF8KImVDuJvAMNZRKBgQ=; b=H8GZMHJrdeFM2+aCK5HfyDZkAN3yApHgZ0RiMci3q14PBksTIa1nZ7bAnaQ5/wGWnjbSLd /Toj/L48eux4uJQbFDhGjKid84Ak2wlK57MnUbmkyHoB5wOf/SESrb4skk43LcgZ7hogRv GJ6VOlufhoK7tkRkXpyGDXa5vx3AvfoPQZhJ80aifxhb0Tg3DM5OYBXqYb5a10eyLpc0Nq CEqcg8dQv+foFpsRMnc5JWBMpRJGAiqCVV9wBFVTflBpxTTQrC35xT0Z0jbsYDMWqul9JJ S+n7VZrHYZ1SWh3HdIxyf7B1mb550plxAJYtTWzu8UPJnaexjf839mLc1LUNtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571817; a=rsa-sha256; cv=none; b=xRcBb4Jz8vVecICa0g1wwWlcP8Vdr97+ypR0fuQS8QBuBd1A2tn5egNFIr2eFfmJUoRAvk rEDBLyoGX2vfjs2fmUxy0HSnvJsDbU0ZaMg3KzOSAMifycTZHk4vyGGMoqpjO//fLWalql MG8U7h6+GwXQJErry08KRdBAUp8D6VFV+G3XNJacIyNTX1C/GSk+ppzmjTdjBTMw5cXA/2 ZBT3EaP3NaSlrXGO5pA7r0j9Uwq3TTjLJlByjnlzLvDI+zwAzohVuiHW4gaRDHTGw/L1tc dakbZuY6W8TrUKAgppg3+RaaWVfxwfke8l28OllPzu9htAvYA8qijxEFWojIJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xJZVzBJv4C7fkydpYSTZApLXF8KImVDuJvAMNZRKBgQ=; b=h3nNDsCxWV5Unztip6pC180G1F1wOVWKO5k3GwEgOYdluF8OKR5X5c9+uWvyJ7KHNI5/hJ K1MB+4M/AQD4mNvcCuy4cuZbuD2dx1ejt5wYaSUxslloHx7d61CtbiOJfpAsuO9qHL4+/v aklRAxo6q7vwyIYN3EMQ/RyR51suff92zHQmjgvcQ9NaYxhyhnA4rtoqBRlw9ZI/rO34D8 jRd9IojKYYdipHDRjQXoDOvsHQnCZqpIMmp5AVsPns0boCNZ63NbXlpk57kf96juDz1QBd SpkwR12WbdiEc5zWmotOrrHBCJOyBRa7H5BPkGmCsQBCK0hN2SsMGwK/ye1Plw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cs3ZLTzd4K; Tue, 17 Oct 2023 19:43: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 39HJhbwP013358; Tue, 17 Oct 2023 19:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhbBs013355; Tue, 17 Oct 2023 19:43:37 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:37 GMT Message-Id: <202310171943.39HJhbBs013355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8d935c419fda - stable/14 - prison_check(9): Bring up-to-date with hierarchical jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d935c419fdafa0cb6fe9e1a3ed6dd92fd76d776 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8d935c419fdafa0cb6fe9e1a3ed6dd92fd76d776 commit 8d935c419fdafa0cb6fe9e1a3ed6dd92fd76d776 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 prison_check(9): Bring up-to-date with hierarchical jails Reviewed by: bcr, emaste, pauamma_gundo.com, mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40639 (cherry picked from commit e9fdd494537ca45b14e0917e8bb1595b6460f3a3) --- share/man/man9/prison_check.9 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9 index b3bdcf6b4571..7f174e3ceb2e 100644 --- a/share/man/man9/prison_check.9 +++ b/share/man/man9/prison_check.9 @@ -25,22 +25,23 @@ .\" (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 December 11, 2003 +.Dd August 18, 2023 .Dt PRISON_CHECK 9 .Os .Sh NAME .Nm prison_check -.Nd determine if two credentials belong to the same jail +.Nd determine if subjects may see entities according to jail restrictions .Sh SYNOPSIS .In sys/jail.h .Ft int .Fn prison_check "struct ucred *cred1" "struct ucred *cred2" .Sh DESCRIPTION -This function can be used to determine if the two credentials +This function determines if a subject with credentials .Fa cred1 -and +is denied access to subjects or objects with credentials .Fa cred2 -belong to the same jail. +according to the policy that a subject can see subjects or objects in its own +jail or any sub-jail of it. .Sh RETURN VALUES The .Fn prison_check @@ -48,12 +49,9 @@ function returns .Er ESRCH if -.Fa cred1 -has been jailed, and -.Fa cred1 -and .Fa cred2 -do not belong to the same jail. +is not in the same jail or a sub-jail of that of +.Fa cred1 . In all other cases, .Fn prison_check returns zero. From nobody Tue Oct 17 19:43:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Ct5klLz4xvd7; Tue, 17 Oct 2023 19:43: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 4S94Ct4yG9z3LD7; Tue, 17 Oct 2023 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cBR5f4Yl+a4RXAzL5mF8tVhY8PjrvEDFWRQP5U9onJo=; b=yz4kGQfXOzDBjTRDP5zHhPIDBmWjdy9OoFGn+ql9dfdcFbGJSbghE2SGs8dABS+UM3KDv7 gCoJJHbEOIydihhEJnIg+CrBiBD2lWpvqoVsBoT1kL6MT/BmHJlOpZrIHdmxa8HVTOPJvk pwYgyzzBfAOciRPfgaNXjWks4zNpFSwBbQXMav/NYxqhrT4FQZXqoqI3b3yOmT319/9pRL o1bJou+WWOzxd0Ok3Tt7CTs+7hcTvtVXesiLd0zgxJ8wI3cLfb+rjfi+9y/hNpFSpGMDrS qSfQjUn/Kb0UQZGgEM7TRhSu/DIZOYwNbaOTcCfixyQNOc9XlPGxMNCE8WlnVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571818; a=rsa-sha256; cv=none; b=wb3ZKoH/JpH8AnYAchAiBX0eT7PUn25cK84jOCdP/pBlCGOj1adSonLoxjYDY1N+9OGV2N HdpW+UIQx4deojqH7XYwA17ufgOzNRJYlqvQTh9pouIBMS2I7tRYN16TRfRnqFak8WBKDi YHJ2AnWYuptg6mUm/VNQCJsmSFZK5Wpr1ui1AAyvxV7PRwuIeswOxH2neBAsu+wMSi84ph t6pYi4EpRqNn5LjGZlyb65nwYud96cfTy5dZb/mzuTeFgFlblXs15vHHRbySEVdGToN2C6 b5/oKU+c8u2Pd2Gz1y6tpxvPpLvTDme8TAaq99oWPArlIjChW737h2z5kK1mFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cBR5f4Yl+a4RXAzL5mF8tVhY8PjrvEDFWRQP5U9onJo=; b=jgV9N0LYGFCOQvdpKwpc7FUzuaIcAdJ4dSBsCFxlYdkn5A7jLDaWZQ9+EC9mIGsvcuZXgP yjCrALwopxAYIm5Upx/qnTf+uriwvmSJqM/FqqN3tmTgmUzBB44e8NqBuD3Uc5R24mtqof KzGkQ7QQguJ+tzI0/I2Vl0yPtICLGoc4FT7wHuK1DuJH5h9noJH0jA9xGGYAli5blw1fva 0TvxbBBjdGLTyL2Y5e44bkkHql+G+l5tOeEqpRuNQupbWWXUn6bub3vOGstFoGOKeIXFDs xZ+buUgrJyVm7ag7BRFluR3Pp3V4wgbb2cyOx1liUVCdHbKNgEFJqMsZE5iLfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Ct443Lzcr8; Tue, 17 Oct 2023 19:43: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 39HJhc8l013420; Tue, 17 Oct 2023 19:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhcPR013417; Tue, 17 Oct 2023 19:43:38 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:38 GMT Message-Id: <202310171943.39HJhcPR013417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f3de805ace48 - stable/14 - groupmember(): Extract the supplementary group search in a separate function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3de805ace484db4a3bf9191a150ef4843ae92f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f3de805ace484db4a3bf9191a150ef4843ae92f3 commit f3de805ace484db4a3bf9191a150ef4843ae92f3 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 groupmember(): Extract the supplementary group search in a separate function This is in preparation for the introduction of the new realgroupmember() function, which does the same search into supplementary groups as groupmember(). Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40640 (cherry picked from commit b725f232f3b09b4bcbc426854fe1545234c66965) --- sys/kern/kern_prot.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 648c067dc528..21f5e5d3bc16 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1273,36 +1273,43 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) } /* - * Check if gid is a member of the group set. + * Returns whether gid designates a supplementary group in cred. */ -int -groupmember(gid_t gid, struct ucred *cred) +static int +supplementary_group_member(gid_t gid, struct ucred *cred) { - int l; - int h; - int m; - - if (cred->cr_groups[0] == gid) - return(1); + int l, h, m; /* - * If gid was not our primary group, perform a binary search - * of the supplemental groups. This is possible because we - * sort the groups in crsetgroups(). + * Perform a binary search of the supplemental groups. This is possible + * because we sort the groups in crsetgroups(). */ l = 1; h = cred->cr_ngroups; + while (l < h) { - m = l + ((h - l) / 2); + m = l + (h - l) / 2; if (cred->cr_groups[m] < gid) - l = m + 1; + l = m + 1; else - h = m; + h = m; } - if ((l < cred->cr_ngroups) && (cred->cr_groups[l] == gid)) + + return (l < cred->cr_ngroups && cred->cr_groups[l] == gid); +} + +/* + * Check if gid is a member of the (effective) group set (i.e., effective and + * supplementary groups). + */ +int +groupmember(gid_t gid, struct ucred *cred) +{ + + if (cred->cr_groups[0] == gid) return (1); - return (0); + return (supplementary_group_member(gid, cred)); } /* From nobody Tue Oct 17 19:43:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cv6qtHz4xvXW; Tue, 17 Oct 2023 19:43: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 4S94Cv6L14z3LV9; Tue, 17 Oct 2023 19:43:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RJu8Khip0RcPSflCEhMF9eQhuM9I2Hd8tdloYGGd5s8=; b=dcJpqZ1BDM4c2+zFzGPBXU4kLeI6+QcTA1jM8nQzgVkbJpYywcWsO36CBt4gEhLfggAYBh T/t162BtMrAVr3GFtEi7Gk6+lJyaP9IESG62l8b4umJ5Q4Jg2giLZ5Xwxd13304tgYBQZo bABBnG4Y7YhJ32ggOnQGZay3Frw/6uZyItTgXwkKzf9aGykZHBGldsursqAypR9epPdrI3 UdmG3p7D/PQwYdtHWW4WYHYh2Da4HvP72SA5h2da9+RN2PIyMreWm1Noz0Lmjx0i5E/7k5 6zaTsfwoUOhGv/t3F66MbrNcZeidZE9jowqE/rozT9+ViVMk9WWEkJhayioarw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571819; a=rsa-sha256; cv=none; b=KaxPAPExXROWaLAN2ivJlczMvJtduMShQEq35Tr2fZZYCnjML1mZZ+6J27tRuLTCFg/pfk 7jT7/4I+kJDpLqjjj6SiLyAQ+24BvoHQ+F6c0Fd9q/VMLeAeT4/bkIyN4S30MoNZlLtv3N QXiQiNTbFoqRgkakK2/Tkqc17m15yhSTJCXskb6fmkAgc9I0HN+dOTRTLs5v7GiXFF3I6Q Tfdee3qyr1r5jievnRVOgqAkfIk8hKFdY5PQfXVVW8FAUUKcTCbjWg+wntdUSzd/XCRMv7 if5PjmY/N3d5y9hfDx1b30gkyeI27MmQCHGnZsU0u7+od2KOQESCpyP1/P32fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RJu8Khip0RcPSflCEhMF9eQhuM9I2Hd8tdloYGGd5s8=; b=h7tBAVPcfREAJMjkgWkhbPboKCYyMe2JuiT6g6em7F/7XP4uurUNxV2YHskhVSEZWGqx97 Fz7OSTx3wlRrf8TZ50yLxQz1yvrMeueQsp6q/qHHlYb1cfOOGvbXsUX1+EFrp8xMHfqLg6 m/dLxZrfnIXhvEdNp2fVSflNcDJyuEKIcVicgdF1ka17wGJ1fTj63uvUGki84fmH3jrpSo 3qjp+y5R5KnfCwL6f9pMxLEq1VYuhd0Bo7sF1E6pDmsYYdzc0QGpGuL1ysuWeyV2YkrpcU /TmqToFxiimfVt6HoKCDkD1qvGxSgNIxblT30DnQPE2e6BssLLXc1ydf0SJw3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cv5GpczcVV; Tue, 17 Oct 2023 19:43: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 39HJhdIR013453; Tue, 17 Oct 2023 19:43:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhdiL013450; Tue, 17 Oct 2023 19:43:39 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:39 GMT Message-Id: <202310171943.39HJhdiL013450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: d1fde7841f3f - stable/14 - New realgroupmember() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d1fde7841f3f3dd86b932ae1f9bb285cbe16634c Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d1fde7841f3f3dd86b932ae1f9bb285cbe16634c commit d1fde7841f3f3dd86b932ae1f9bb285cbe16634c Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 New realgroupmember() Like groupmember(), but taking into account the real group instead of the effective group. Leverages the new supplementary_group_member() function. Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40641 Differential Revision: https://reviews.freebsd.org/D40643 (cherry picked from commit 2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559) (cherry picked from commit 5d9f38405a10fdcd9fc108c940dcf2642e9f1833) --- share/man/man9/Makefile | 1 + share/man/man9/groupmember.9 | 7 +++++++ sys/kern/kern_prot.c | 13 +++++++++++++ sys/sys/ucred.h | 1 + 4 files changed, 22 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index c3c81719b7d2..2122f8d6ea8c 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1157,6 +1157,7 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 MLINKS+=gone_in.9 gone_in_dev.9 +MLINKS+=groupmember.9 realgroupmember.9 MLINKS+=hash.9 hash32.9 \ hash.9 hash32_buf.9 \ hash.9 hash32_str.9 \ diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index 3a516622efce..ae7ccd477955 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -36,6 +36,8 @@ .In sys/ucred.h .Ft int .Fn groupmember "gid_t gid" "struct ucred *cred" +.Ft int +.Fn realgroupmember "gid_t gid" "struct ucred *cred" .Sh DESCRIPTION The .Fn groupmember @@ -49,6 +51,11 @@ Considered groups in .Fa cred are the effective and supplementary groups. The real group is not taken into account. +.Pp +Function +.Fn realgroupmember +works the same except that it considers instead the real and supplementary +groups, and not the effective one. .Sh RETURN VALUES If the .Fa gid diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 21f5e5d3bc16..23bd2009582b 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1312,6 +1312,19 @@ groupmember(gid_t gid, struct ucred *cred) return (supplementary_group_member(gid, cred)); } +/* + * Check if gid is a member of the real group set (i.e., real and supplementary + * groups). + */ +int +realgroupmember(gid_t gid, struct ucred *cred) +{ + if (gid == cred->cr_rgid) + return (1); + + return (supplementary_group_member(gid, cred)); +} + /* * Test the active securelevel against a given level. securelevel_gt() * implements (securelevel > level). securelevel_ge() implements diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index eb92776c158a..633bf436fcd4 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -159,6 +159,7 @@ void cru2x(struct ucred *cr, struct xucred *xcr); void cru2xt(struct thread *td, struct xucred *xcr); void crsetgroups(struct ucred *cr, int n, gid_t *groups); int groupmember(gid_t gid, struct ucred *cred); +int realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */ From nobody Tue Oct 17 19:43:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cx2Xkkz4xvPN; Tue, 17 Oct 2023 19:43: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 4S94Cx05fpz3LRm; Tue, 17 Oct 2023 19:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WrAoCanubx5FX1+0FG43oFVI37xJoYBaWBHSCJIOdY=; b=SvJWtfFz8T+Pbue9+VZlA1CBTtiuqw9sm/BKHs9FWOcUAD6w4nXM+d+GAJFJisBfKaw59d qXinFMJnpcsSk1D0S2EyaUJsnGldAJgR8mgdosGyvCc6NHVeTqshU3yyf7UQP6pXlU5ei3 iWBu+OAnQOnl39oIkFiWik1rH0ogE9ntNkftvST7kQoHIZfC7eD98uFKJxAg1H8FDQ6hvu eUIcqGGC4dn/1+GKNYGfYYDy6Nn2pRt8sNWQQzQZJWtcD3k8sF0BE10wW0n8wDeoG3xdYd xr4D2pKYDYbgxC3nCLWo1pTI1Z+Jh0qtNrgNzM0A4CY0bjOxUwJdLCGAMif7rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571821; a=rsa-sha256; cv=none; b=NKaXS2f4r1neS97cY0Ves6pxwJ6oyt8fXeeqMsw2uiRMcOO1z4ZfT9Uw0pQsZjtDzsbW/7 4g08L5xmrC/ETU3N8jmdyEbr+Y+WWADpcZpry+Jn0Th0aIWZiw+gbOnbVXsgTR9GndgI7T wwOBYK3T5AGUFEP8fMCFx+ZzuNLbFEgWsIhNxJpv6b8muMGM4D0Evs20IBuaVNDfyuQD/q hXpphVRALWCDh5dOq5zojiRqWCW5+sevnWxxayhc1jf983O5BOalif4zosFZ7qXUcopIAe f0VhhLL67saIEoKXTx1F/1xADeg49OEGaqo8b3n4C+MP+Wp49JmSXdo4yLYDYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5WrAoCanubx5FX1+0FG43oFVI37xJoYBaWBHSCJIOdY=; b=I49uZpa8VhqgsymWd0hIo3PXEciXixTjYqNQ3MbuJeztMp5FUkWir6efaLcRsX7Ftx4iH9 UcSMhm5OSscJnGLy55LhXiTX1vZlAgOB4hXM65nT5ZSwZo0RNfn7GGF6nag59OkoO1Tbdf L+9QPriZcaACgNrmnSb4fUWNc4PgTWDtmsOW2NBiwGfb6ya0I36ZcQVdicUgL8kSV6ig9w Qdcx6qGxh+hkOqOphTkRrbCAwnjwzaUHgHMMvDBFa6WELWXMrovMRdRG/GOGv78+raHge2 xszfY/Xvq8NhNYRH0hOzrrosVV4f/QZnyWZhMmN8Bh3Le/8+9wyyYIlWh4cZuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cw6JX7zcSR; Tue, 17 Oct 2023 19:43: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 39HJheng013509; Tue, 17 Oct 2023 19:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhej2013506; Tue, 17 Oct 2023 19:43:40 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:40 GMT Message-Id: <202310171943.39HJhej2013506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f482bc958437 - stable/14 - cr_canseeothergids(): Use real instead of effective group membership List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f482bc958437e90cf8eb3a9e45e92efeb0b2556e Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f482bc958437e90cf8eb3a9e45e92efeb0b2556e commit f482bc958437e90cf8eb3a9e45e92efeb0b2556e Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 cr_canseeothergids(): Use real instead of effective group membership Using the effective group and not the real one when testing membership has the consequence that unprivileged processes cannot see setuid commands they launch until these have relinquished their privileges. This is also in contradiction with how the similar cr_canseeotheruids() works, i.e., by taking into account real user IDs. Fix this by substituting groupmember() with realgroupmember(). While here, simplify the code. PR: 272093 Reviewed by: mhorne MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40642 Differential Revision: https://reviews.freebsd.org/D40644 (cherry picked from commit 91658080f1a598ddda03943a783c9a941199f7d2) (cherry picked from commit 0452dd841336cea7cd979b13ef12b6ea5e992eff) --- share/man/man9/cr_bsd_visible.9 | 2 +- share/man/man9/cr_canseeothergids.9 | 8 ++++---- sys/kern/kern_prot.c | 23 ++++++++++------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9 index bd676e6f5705..f2d42f3835dc 100644 --- a/share/man/man9/cr_bsd_visible.9 +++ b/share/man/man9/cr_bsd_visible.9 @@ -97,7 +97,7 @@ and are not members of any common group .Po as determined by -.Xr groupmember 9 +.Xr realgroupmember 9 .Pc . .It Bq Er ESRCH Credentials diff --git a/share/man/man9/cr_canseeothergids.9 b/share/man/man9/cr_canseeothergids.9 index f0c1e5c4e726..109d41a8545d 100644 --- a/share/man/man9/cr_canseeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -48,9 +48,9 @@ This function checks if a subject associated to credentials is denied seeing a subject or object associated to credentials .Fa u2 by a policy that requires both credentials to have at least one group in common. -For this determination, the effective and supplementary group IDs are used, but -not the real group IDs, as per -.Xr groupmember 9 . +For this determination, the real and supplementary group IDs are used, but +not the effective group IDs, as per +.Xr realgroupmember 9 . .Pp This policy is active if and only if the .Xr sysctl 8 @@ -79,5 +79,5 @@ Otherwise, it returns .Er ESRCH . .Sh SEE ALSO .Xr cr_bsd_visible 9 , -.Xr groupmember 9 , +.Xr realgroupmember 9 , .Xr priv_check_cred 9 diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 23bd2009582b..43fc3100bfa7 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1404,21 +1404,18 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW, int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { - int i, match; - if (!see_other_gids) { - match = 0; - for (i = 0; i < u1->cr_ngroups; i++) { - if (groupmember(u1->cr_groups[i], u2)) - match = 1; - if (match) - break; - } - if (!match) { - if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0) - return (ESRCH); - } + if (realgroupmember(u1->cr_rgid, u2)) + return (0); + + for (int i = 1; i < u1->cr_ngroups; i++) + if (realgroupmember(u1->cr_groups[i], u2)) + return (0); + + if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0) + return (ESRCH); } + return (0); } From nobody Tue Oct 17 19:43:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cy1zJJz4xvd8; Tue, 17 Oct 2023 19:43: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 4S94Cy16x5z3LKY; Tue, 17 Oct 2023 19:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oby0n7dnGRaGpY8xeNZ6IKGCkc/P80an+ySDgvCQ3zw=; b=Z2aOdYZqWM+sOVu4FBmzBknQCKekqLRLzNeeTA39Leuq3tgLbAaa0giKIwODh7uf5l6ltk 3f13iJDv2z+wCPZ8G2QyEWV8RogOVCZKJkfT/5GFVwozw7dj7oL/lkT6XibubNUszAIE61 M4gnwpZtYY3POf2Po6nQ07kdGheECOvaBoaIpjWWRD4sllbe8TqMkUHCTI/VQdycCsIHRW PR1jaXODM5ueDsXApGG5vtg32+Y5hXnv3rbvXONykC4YkL2/sB/028xQNHEo0ZlAztERC8 gaFgE8FnfHKpg+o4mUTOw7pY8ItSp7F1yPhikxPfxZvfNiH1QT1h5W7e7yUMag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571822; a=rsa-sha256; cv=none; b=rqqqTXc3t94XnH2q3MhK2JSTYDufHurzx9fJJhtJYwmZIxnHbnUdpCCjFLa9qQp6gMY2X9 UOUBa+CCxj+4C++QOvRKUiQoGM76UqYFgSJAs7TbpBJIKnWlBKz9u4lZH3PHIMAAE6BLzb 6m4qcXIjRfvKJZm3rLFYiyCpx1ATH5UDpKYl1GT6razKgiJzGOYw+AGBA+vzvRDfZosDjR DasZkBihv16kjQmkMfGrlGnBF8gWvN1BtWF9uLxOMT7+667S65D1n2CGMRHshocbx8GZsc rGYruWhfYRRPGeeLaHiyxGx1b1tpC5e7UM1nJv8BPbhSnWC3EdeVluI1hF2/Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oby0n7dnGRaGpY8xeNZ6IKGCkc/P80an+ySDgvCQ3zw=; b=Hw6TdMq2mue1REzxmdAMqNNBYbxZzVFfTib4T2pk65RymJ26Mz34aIvjJR6sSwqmGkDOO7 xlAPCJTR8NCNYSI7eDjfkMdzIlOeF1M2MnTu2Gov4K7NzdddMZI07QmxHWh82PKawkvL1t 7pRJSle4EfXUZY8/VY5+SDGR3grRruo007J1Au2BxRRgwd7nNNB2XTpkqM5MUY0GAkRcvr j0n7T15Z98nOrFTct1Wclx3ZoWuebX7OgvxuSfuGb6j+Wxiw0WKeJSqCccV5S3x+J6/f2D 7C1d8NOxGjGx5F+PTjDkcaItWPFzxDNqhpQCE38AONGb7PgMPF3Tlh457TK4VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cy0CTDzd0C; Tue, 17 Oct 2023 19:43: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 39HJhfDr013571; Tue, 17 Oct 2023 19:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhfuQ013568; Tue, 17 Oct 2023 19:43:41 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:41 GMT Message-Id: <202310171943.39HJhfuQ013568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b6b76c1c09a4 - stable/14 - groupmember(), realgroupmember(): Return a bool instead of an int List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a commit b6b76c1c09a44dbf9ef1ef8e6b0c3e8204baae7a Author: Olivier Certner AuthorDate: 2023-08-17 23:54:47 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 groupmember(), realgroupmember(): Return a bool instead of an int Requested by: mhorne Reviewed by: mhorne MFC after: 2 weeks MFC to: stable/14 releng/14.0 Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40958 Differential Revision: https://reviews.freebsd.org/D40959 (cherry picked from commit ffd3ef8ee0253ffaf214cf711251d112f6a2bcf6) (cherry picked from commit 845b7c80887ac84c82ee776836ef86d68ea71c94) --- share/man/man9/groupmember.9 | 18 +++++++++++++----- sys/kern/kern_prot.c | 12 ++++++------ sys/sys/ucred.h | 4 ++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index ae7ccd477955..b7865a35fdc9 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -34,9 +34,9 @@ .Sh SYNOPSIS .In sys/param.h .In sys/ucred.h -.Ft int +.Ft bool .Fn groupmember "gid_t gid" "struct ucred *cred" -.Ft int +.Ft bool .Fn realgroupmember "gid_t gid" "struct ucred *cred" .Sh DESCRIPTION The @@ -57,9 +57,17 @@ Function works the same except that it considers instead the real and supplementary groups, and not the effective one. .Sh RETURN VALUES -If the -.Fa gid -is found, 1 is returned, otherwise 0. +The +.Fn groupmember +and +.Fn realgroupmember +functions return +.Dv true +if the given credentials indicate membership of the group +.Fa gid , +or +.Dv false +otherwise. .Sh SEE ALSO .Xr getgroups 2 .Xr setgroups 2 diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 43fc3100bfa7..14b19837d5dc 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,7 +1275,7 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) /* * Returns whether gid designates a supplementary group in cred. */ -static int +static bool supplementary_group_member(gid_t gid, struct ucred *cred) { int l, h, m; @@ -1302,12 +1302,12 @@ supplementary_group_member(gid_t gid, struct ucred *cred) * Check if gid is a member of the (effective) group set (i.e., effective and * supplementary groups). */ -int +bool groupmember(gid_t gid, struct ucred *cred) { - if (cred->cr_groups[0] == gid) - return (1); + if (gid == cred->cr_groups[0]) + return (true); return (supplementary_group_member(gid, cred)); } @@ -1316,11 +1316,11 @@ groupmember(gid_t gid, struct ucred *cred) * Check if gid is a member of the real group set (i.e., real and supplementary * groups). */ -int +bool realgroupmember(gid_t gid, struct ucred *cred) { if (gid == cred->cr_rgid) - return (1); + return (true); return (supplementary_group_member(gid, cred)); } diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 633bf436fcd4..7c9e46e47774 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -158,8 +158,8 @@ void crcowfree(struct thread *td); void cru2x(struct ucred *cr, struct xucred *xcr); void cru2xt(struct thread *td, struct xucred *xcr); void crsetgroups(struct ucred *cr, int n, gid_t *groups); -int groupmember(gid_t gid, struct ucred *cred); -int realgroupmember(gid_t gid, struct ucred *cred); +bool groupmember(gid_t gid, struct ucred *cred); +bool realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */ From nobody Tue Oct 17 19:43:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94Cz2lX7z4xvK8; Tue, 17 Oct 2023 19:43: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 4S94Cz26PYz3LQR; Tue, 17 Oct 2023 19:43:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUBEAYaUQMwSRYIVrfKFbnUXE7bRX4e3JeDVmsGMyVM=; b=b7hmq1/QjWoBHioVqebaUw3exP9Wp79oo60C6v/WqTQX7u5m1G6axcPcC/au+s6TDPVS0G e0NyP+6JE3rUEYKfsMtGi0MnmlM/CKhPETWjij36wtuCFj3vb/5RgXPHGCCQFqXLcw1Ngc ddvhG2RM0+Pv/M98yCh0HSZTA2RiGQJvJnxHVjRBOT4KVwrK/DrT7qqLbHFtiV6zkRxnNy oiaUMvoI4YxLYdq6S/UjPyM2NxbgHxYV1oN69DsLmn7sMpRPpvruxJfIfL9lU6VWpOilLd s+dqqnMNKy6EU7Mswn3lZsBdxl//245XbUbzzTc5M9rh1XRM+CHqsWK3nctCsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571823; a=rsa-sha256; cv=none; b=lNKammlOAQ0zgZiac2YY5NDMWDvdC0/CP4naH7wS4E3C76bLaAofraaSEd7P7L19sbOY0Q mJNaWYqw+9PJ3JRYmTfCd/arEIQNq7XyF2z260X30fnkTmq1uYRVxWDAawiZ8F5p2OHPqK KL94IgUUKSYK4IfAxuMCZ5XKrbUOuT42Dn48/zY6o6JOKQCJ0A0zrSM50JZWT13/LnNaUZ IYyZlMyxCJWafA/hY6l43Vt1F7zYM4NmprzuQnWIEefcSSkMtKvHLm9Lxubt9scqOZC/Ok giztDjYv5kUlW8ZuzVwVFFLxl5uIDrpgnjtBJak3GuevE2Y2TigBqpyIN45MGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUBEAYaUQMwSRYIVrfKFbnUXE7bRX4e3JeDVmsGMyVM=; b=lAI6S5KkZP3B0o995asHX7C15jPT21aasNRFXK2mdnEOh8VqwIhDancYNo4tmnADhB1GgJ f7XKBTt718ue70EFGrpAms87ChFQE9curM+tdiLbJZHMknpJhBNk7Ewd3kc2bVui+trQ45 btU3zj7qXWbfdgunmpv4mtpsQBln7Mte3kj95EbqiVSEKs8y/tZkWvqZ7v41z/1WTINkat Yj0uKlbyHqOH7CIBrRrMLnJ0Cw9sBwm6W4wKyueCrsJq86wRqxW8mC8ctvWXNCqA/7sExF E7aD/5wheBy2+cV+NagMtQrmvIo8pI+dw/Cga/W37l+DxL1cCVeD65nbNQMfZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94Cz1CKmzdFc; Tue, 17 Oct 2023 19:43: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 39HJhhE6013621; Tue, 17 Oct 2023 19:43:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhhRM013619; Tue, 17 Oct 2023 19:43:43 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:43 GMT Message-Id: <202310171943.39HJhhRM013619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4a8585251944 - stable/14 - security(7): security.bsd.see*: Be more accurate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a8585251944e1d8f0242ee7937204e4fbcd3e8f Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4a8585251944e1d8f0242ee7937204e4fbcd3e8f commit 4a8585251944e1d8f0242ee7937204e4fbcd3e8f Author: Olivier Certner AuthorDate: 2023-08-17 23:54:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 security(7): security.bsd.see*: Be more accurate Reviewed by: mhorne, pauamma_gundo.com MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41108 (cherry picked from commit 61b6e00bee1d39e9c688e728fbf3a4efcdb61e66) --- share/man/man7/security.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index ebe5e66e22af..a48e3607f0e5 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -959,16 +959,18 @@ Backwards compatibility shims for the interim sysctls under will not be added. .Bl -tag -width security.bsd.unprivileged_proc_debug .It Dv security.bsd.see_other_uids -Controls visibility of processes owned by different uid. +Controls visibility and reachability of subjects (e.g., processes) and objects +(e.g., sockets) owned by a different uid. The knob directly affects the .Dv kern.proc sysctls filtering of data, which results in restricted output from utilities like .Xr ps 1 . .It Dv security.bsd.see_other_gids -Same, for processes owned by different gid. +Same, for subjects and objects owned by a different gid. .It Dv security.bsd.see_jail_proc -Same, for processes belonging to a jail. +Same, for subjects and objects belonging to a different jail, including +sub-jails. .It Dv security.bsd.conservative_signals When enabled, unprivileged users are only allowed to send job control and usual termination signals like From nobody Tue Oct 17 19:43:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94D04GvMz4xvpZ; Tue, 17 Oct 2023 19:43: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 4S94D03HVTz3LN0; Tue, 17 Oct 2023 19:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tt/gyerQLPfInmDvFlFdCQRMxdFIqlZAHj5lVsHb9Xw=; b=kPvcDTZx1M+3VhgiBAuqUmfGXnK2kD0wq+cgFnBYt374UoR6UeTsmyTmWqfE+JmDN54S+g YfBh+hCOnB1yjDCPVCJErzby5ODZyA2p6Fp+3PsO7Qdopdj3SIGqxJO7EBrl9qv2z5MbVj tytEg1atq50z28mWzFxW9TyJJmRWLtK7uTnbImSRBrzwKveGd7YWUVoYDxtDB/XJMdsmJ9 RhN87aTRs0cJHhNn3qv6i+CM5cWmPBwSR/T5g8zh9l7TaBnwBnjEQm1I6gOlZQ+4EmIDNe RPQ+0M06/XJ5Yujgt1zXbWhBO0WSR7ZrjNwxtLGAFP9egi9yXV0Kr6JDpUCOPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571824; a=rsa-sha256; cv=none; b=BrNNiVFUXkRCT6wSa06aRPH4x+dVog0ivVuisMTUEXXp2UGn963lJFUW7/v11NRtEOXoJo A4d55JKzHyOD2JPbIrA8hNnR52yrseNEfP6j2Pq63p1LkarZjPTaMkc3gnAVEsV7sCUb8s slQ49pb8FQF9Ybw/NSTHZlVPbNSHsXCl47ZeBQZgI+4kuS6kriOLxI8ryerX09PbBtbyv2 Vt6pU0lyKZeZ9/RIaPaF74zWehaDlCPuVGZqYU89MUlz9TizHKFaYYM85wom/wIQB4m+JN Re6EqjOfxRaAHw7qzgt4eyb1lnx9r0IJOOQbyEFXY5oFt62DnGMqcDRzHfE/Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tt/gyerQLPfInmDvFlFdCQRMxdFIqlZAHj5lVsHb9Xw=; b=uZ1ZBfGxwQ7xtN5mgnsCI8ySA39y0sOTbgn5mLZevIIR4NVvJaMpT9FBnUme5bAJkYuOdv 7Mz9WUo3tIdwqbQFtOlZa8uAZWK2F756KpzO1YKPLwd1EtmMcRrlxyD2dIWWmw0FBkg3Ng uYUZGoXq+LZfyRyvAOuGb4qI9OYZzY3QIjQEa3F84UjbBka/W3FuihkRHqOREd61oovUyF z0ByhBiGXudJ2++usfy6X5YNbA+368KlccbLSltL1JZgbyZCH75Pxq2MN4bBbPrzvyyrp4 r0eGAe8xkrT8jHoYl8HGlSpQdvMOI8ykB20vtdRYNNKHMB4/MwHYK5N7Uxhi3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94D02D0Fzd4L; Tue, 17 Oct 2023 19:43: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 39HJhijh013668; Tue, 17 Oct 2023 19:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhiiZ013665; Tue, 17 Oct 2023 19:43:44 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:44 GMT Message-Id: <202310171943.39HJhiiZ013665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b0186790020f - stable/14 - ptrace(2): Disabling: Describe influence of security.bsd.see_jail_proc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0186790020f1a3eecd6b1d86fe79841d90e3438 Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b0186790020f1a3eecd6b1d86fe79841d90e3438 commit b0186790020f1a3eecd6b1d86fe79841d90e3438 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 ptrace(2): Disabling: Describe influence of security.bsd.see_jail_proc Reviewed by: mhorne, emaste, pauamma_gundo.com MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41109 (cherry picked from commit d952820105d6a2ad87ddf3bdc6c5fc5215d13b87) --- lib/libc/sys/ptrace.2 | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index d7d244b1d84a..ae1770315aa5 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -1,7 +1,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd December 15, 2022 +.Dd August 18, 2023 .Dt PTRACE 2 .Os .Sh NAME @@ -149,31 +149,37 @@ its scope. The following controls are provided for this: .Bl -tag -width security.bsd.unprivileged_proc_debug .It Dv security.bsd.allow_ptrace -Setting this sysctl to zero value makes +Setting this sysctl to zero makes .Nm return .Er ENOSYS always as if the syscall is not implemented by the kernel. .It Dv security.bsd.unprivileged_proc_debug -Setting this sysctl to zero disallows use of +Setting this sysctl to zero disallows the use of .Fn ptrace by unprivileged processes. .It Dv security.bsd.see_other_uids -Setting this sysctl to zero value disallows +Setting this sysctl to zero prevents .Fn ptrace -requests from targeting processes with the real user identifier different -from the real user identifier of the caller. -The requests return -.Er ESRCH -if policy is not met. +requests from targeting processes with a real user identifier different +from the caller's. +These requests will fail with error +.Er ESRCH . .It Dv security.bsd.see_other_gids -Setting this sysctl to zero value disallows +Setting this sysctl to zero disallows .Fn ptrace -requests from process belonging to a group that is not also one of -the group of the target process. -The requests return -.Er ESRCH -if policy is not met. +requests from processes that have no groups in common with the target process, +considering their sets of real and supplementary groups. +These requests will fail with error +.Er ESRCH . +.It Dv security.bsd.see_jail_proc +Setting this sysctl to zero disallows +.Fn ptrace +requests from processes belonging to a different jail than that of the target +process, even if the requesting process' jail is an ancestor of the target +process'. +These requests will fail with error +.Er ESRCH . .It Dv securelevel and init The .Xr init 1 From nobody Tue Oct 17 19:43:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94D164MDz4xvVN; Tue, 17 Oct 2023 19:43: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 4S94D148xnz3LTW; Tue, 17 Oct 2023 19:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLziKFhwBSsZ0ks7X1Ug8YnTFvtXDBDE1UWIXAKAUko=; b=Y7Dtn52OzNPdDsxsjsvax2T2tSZszpBjMJpQy8/foxyZoeoZlIWMJ7n63AJhHCYpnCRRwm vDOl1xvD1H7amnA9rk6t/tLx5DUb6NGxzchDMMHjhTEWQgQJBIhtGQV8hmvawdbDmPFIxi v14ZtKCPLZ0QJo85J25CGCC5ddQoGVWqsSc1sVyVhffnXyJlJreN+G0itXxmZRr4zJZIDE r3oq8GSgwR7vw6AuUoKXuJsI4WUVVcYltOZyuK4cU5tmCVwZTkydEpdqZUps0fl94ex0ho MdkewhRhZUDGNBols89zdK/uMBONnBQqiXJnWL9TtZaAtXrVeOK9B7n9Thdmog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571825; a=rsa-sha256; cv=none; b=I+n71QuiVYXd1JzdLxXzyugh36c8py2Dp4hl4wqMROCS5wMZ0y5HKDDEbh1iz+JR6EHL0Z F8gZ9CL1m5sBBbfm5oQB5SRY/byVQsdL6dB2sC9JwhPPmAqkD24L986mofQg2SYmqypvJI L2geCO5cTkF3b84UOHkhw0DkLfSIYIQD14F4kTDl8B3/ZAO9NUGV017k6tuunCHGbmVVxF LbYCmthWa9ArrI2vyNBnT6Tsm+a4+/oFvLy0K3lJvcwbt5PXdYOmQRMnjX4lgqhdTlrBSn ZrINLpXaaIWuh7EBIvlPtiUFmGd5/OmlpGEsFtpT0Gl5lEc+tIyPJDqEzCueaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tLziKFhwBSsZ0ks7X1Ug8YnTFvtXDBDE1UWIXAKAUko=; b=yF8ljxffbi2r79y9md37Ay0hcZQrk/x17hxPRIqYpF7ynh8bmrruXPc9ND4/a1TVgcPIvI qLon7iKnWOtDEapsOg898A7Oko6oymAvH/EpywZfRt43m2Hmz4KNc4lB3sAalnBnUw40Cm CkEdvlKsKMcmo4MTTM1aabCXQkdq7gxkntiXOw9IoAxDeYDG2zVfXVY9yC6B5Aol+mwErI er/1qdO5z/wIGEj/bKJC9WymtFVf/yhMZ4kv6a/Kcj7LHVGE5fCJhW89nkd0BmiMj5rzbL Pr4CGxxnmrEj44piIWXEAqj+Q4hkVH5TPZOFnDxuScirY80LmQl6npP8RzSWQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94D13FDxzdCR; Tue, 17 Oct 2023 19:43: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 39HJhjXj013737; Tue, 17 Oct 2023 19:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJhjJS013734; Tue, 17 Oct 2023 19:43:45 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:43:45 GMT Message-Id: <202310171943.39HJhjJS013734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c8ca21cc94df - stable/14 - sysctl(8): Mention more security.bsd knobs; Refer to security(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8ca21cc94df97ec5b85c8aa6dcc71f75e99ecfe Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c8ca21cc94df97ec5b85c8aa6dcc71f75e99ecfe commit c8ca21cc94df97ec5b85c8aa6dcc71f75e99ecfe Author: Olivier Certner AuthorDate: 2023-08-17 23:54:49 +0000 Commit: Mitchell Horne CommitDate: 2023-10-17 19:42:59 +0000 sysctl(8): Mention more security.bsd knobs; Refer to security(7) Reviewed by: mhorne, pauamma_gundo.com, emaste MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41113 (cherry picked from commit 8d7a48d367ffde2a29419ef943c4099984e3af4d) --- sbin/sysctl/sysctl.8 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 3e995e40131b..ed768510eb6c 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" -.Dd December 24, 2022 +.Dd August 18, 2023 .Dt SYSCTL 8 .Os .Sh NAME @@ -194,7 +194,9 @@ for more information on which tunables are available and how to set them. .Pp The string and integer information is summarized below. For a detailed description of these variables see -.Xr sysctl 3 . +.Xr sysctl 3 +and +.Xr security 7 . .Pp The changeable column indicates whether a process with appropriate privilege can change the value. @@ -231,6 +233,8 @@ String and integer values can be set using .It "kern.logsigexit integer yes" .It "security.bsd.suser_enabled integer yes" .It "security.bsd.see_other_uids integer yes" +.It "security.bsd.see_other_gids integer yes" +.It "security.bsd.see_jail_proc integer yes" .It "security.bsd.unprivileged_proc_debug integer yes" .It "security.bsd.unprivileged_read_msgbuf integer yes" .It "vm.loadavg struct no" @@ -320,6 +324,7 @@ option has been deprecated and is silently ignored. .Xr sysctl 3 , .Xr loader.conf 5 , .Xr sysctl.conf 5 , +.Xr security 7, .Xr loader 8 .Sh HISTORY A From nobody Tue Oct 17 19:45:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94G66Tnkz4xvpr; Tue, 17 Oct 2023 19:45: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 4S94G65822z3R2f; Tue, 17 Oct 2023 19:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbI7hectgmysZ+CwAGWYvlDVSMsPLe8+1Ze35D88Byo=; b=kunKN6G1skAj8ENeSRMqUJylevQZ2FOZB2KIhUqD7FQDYn1m3UN2wzl07epPwWa16plCDb JWHC2tAyq/Q/h0d8hJIbbwbKjho9TbrKhhE5KJBdrznSZgi0NfE8nxIN/8dZ3zAPZk9Bmu 7kWGuDvKxSKHr3xk6u++m0GxP9Xh8ejh+bal2zJFJUtbMv3AgkmnfB6u86w6mCtNTOt8aW R3ZILNLhWyZpbgV4fzhPFHZnoHBbZsEn40w3SSIgduC+fo8MAmF49hOGjiXroESkWnoG2Z 4CTMKr9x3jyQnv458X6MxX40BbTDamU3a7MeFIHii7d062pWHM9lh7xmgSqmtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697571934; a=rsa-sha256; cv=none; b=J0MIhnxihxtOMwf+QN7r/WeeOQR5fLo9Kd6BfmPYd07F+b/fpiI65X8caxi4ByL48oXtkK 48cWdQmUdHJXCMoNXVCOGDYl+/dCqqTQWAJfnB1Qsz7pffGdRbrKescGsZLBeoVAmAqlMM DIGODP6pO7QqfhydJdpebd437Q4cfMG4Ncpjsc/RzIcMqfFwJFmtgPTmWCyycMFrAOpNQf RgmF+gKk9IfpcQ4OGbGZZLn9leoutDbHIwO+NiSO9tihS1+AwhUMfk7nuVeygyYq3aze4d p7QzGFC6YU0kbqjR/zHqmwihNzuBiHVYE6+k6fxOQ79PWEeIkmw7bJMVOlSYOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697571934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UbI7hectgmysZ+CwAGWYvlDVSMsPLe8+1Ze35D88Byo=; b=AjNYWmrnhzI/zTAgtrsCWkdrcUz9+CyxCkcXJ2AApy0Ibz7yIK/z11ebSc0jSrmerRwr97 +ezfpud28HQuEce8Ksnl5VBNFbUPBNvUHByDS1eIcYSjhQyfQzv9eQ6jla6J7tQLnrjLt0 /uvZ6VWyJrcNrH5IZvu3u5dJeOr8RH/n+PyGCKIlTpYhhcKzdWaex98RQLGwEBFXWrvZi8 BrINZJfDDnbZM7XT7MfvKaO1MIPriTl48HfnorJyPkbjpZINn8TDAKLZV7fpRmew9oSgDW ec7Vt2Bq+ebzmEVafX6BXh5vFxaR2IgYa2iOSoO9/8BgkqIGctpyUpVWfAAYUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94G646G5zdCb; Tue, 17 Oct 2023 19:45: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 39HJjYqf014363; Tue, 17 Oct 2023 19:45:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJjYqc014359; Tue, 17 Oct 2023 19:45:34 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:45:34 GMT Message-Id: <202310171945.39HJjYqc014359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 9e8372d0103a - stable/13 - MFC: Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e8372d0103ac474c08cc0031110860855368b05 Auto-Submitted: auto-generated The branch stable/13 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8372d0103ac474c08cc0031110860855368b05 commit 9e8372d0103ac474c08cc0031110860855368b05 Author: Gregory Neil Shapiro AuthorDate: 2023-08-18 00:32:56 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-10-17 19:44:01 +0000 MFC: Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. PR: 248387 (cherry picked from commit 98fd1add676321978db72d77d34ef51ca454c814) --- etc/sendmail/freebsd.mc | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index 97264805a67f..5fd201da3900 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -66,7 +66,6 @@ define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl define(`confCACERT', `CERT_DIR/cacert.pem')dnl define(`confCACERT_PATH', `CERT_DIR')dnl -define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl dnl Uncomment to allow relaying based on your MX records. dnl NOTE: This can allow sites to use your server as a backup MX without From nobody Tue Oct 17 19:49:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S94LQ03CGz4wwcs; Tue, 17 Oct 2023 19:49: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 4S94LP6Q06z3RMx; Tue, 17 Oct 2023 19:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697572157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8HvLidNKsUmuEb2Q5w1eg4IcNObckRgnGBboZPrBTUE=; b=an65TNK1qIvVdP/l2hvf/trKu2lbxZebZYW9CLx7nc3IpzuNo7K0MIjKbwqWhiGBYCdxb1 9bZCTFtvFZTF0peOKyvnykUMBr68Hu/+q8cPENrZXxs9/CVoQfINkUcXBnfQlFsWcuWA3i MdGJkiJz5i4ucjm2dtU/zvF3X0Gg3F10DLREuW8geTIVgvWsanL/NECG2pix/Xr3nnYtxc TfnfPx5c/IXsFBzo8LwdMo8Wt7Ml7wKlorhMUJvCS36prAZA7JIQv8U9uy6Sejz6mNoHQr Vd7NTfgq8J+ZhApRfxt7X0isJWAQOdjAJ2oIZolxt/vSahhUapIRAJxIeo62CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697572157; a=rsa-sha256; cv=none; b=CQEfTAZZI/J7RuaUTTFTzIob7RDqV3bCFZVou+ctO3gY7/3B14MnwKL0kg0R21ElAEPdW3 7uWM6/ZD8kofbGDy4qOT1teADvHiBKZw+WPPWMlTwV6sTlpfGPUUCJUyyGvhAulnHw/x5T G9T0dghCcgXaIehRVT4ni/qjJBB3bMQ19WcYEOTEKDz/ZdFPGkAsmCpcsqXmwOxA+TsI1a XKMbINSJ+UFbmKQ61dAPpU0o+eRv40HtZ0l6HVtlA6dsImH7QzX4QvUro9tsDoBQ3GmB65 4eZpbBxh5OJYsFJUUhhNx47yDzBMTP7vulTjMUBOri90w0vRwqOvjubCBi+IqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697572157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8HvLidNKsUmuEb2Q5w1eg4IcNObckRgnGBboZPrBTUE=; b=cUdQR7w+KE/D+haGmi1o0ruvDTb6zxSaVdC0ZHEZYDONbTN3F+ADQ0Ydwk64FGCBJYu1Z2 5XFaaMXKIbwGPoSw9QxyFnPEIImIllKckBa33GDssSRmV0CxruC4AxREATksWXvf113QLb WOvN/VGo/BnPKutre+b92foCpaWgz5J3gMKfs2kqaAT/ue6pYNxC616+XCTMY+O0Te/tEd aEA5FMifLbDtRfl7X/PmXrbLXoGHSJbp/k2kulecDsRjJYiFwP7KXTJ8XNTjNWXRHjW6kV v/UmuiQ4rgxOs+kimIKeJ6SrPfUsqk2+QeCpTBC34NkBRUlU5Oyb40v3yKVImA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S94LP598PzdCg; Tue, 17 Oct 2023 19:49: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 39HJnHWu015103; Tue, 17 Oct 2023 19:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HJnHKK015100; Tue, 17 Oct 2023 19:49:17 GMT (envelope-from git) Date: Tue, 17 Oct 2023 19:49:17 GMT Message-Id: <202310171949.39HJnHKK015100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 98f15d8f2fd4 - stable/12 - MFC: Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 98f15d8f2fd46c49a4ede89ac1a52aa3b5da8a41 Auto-Submitted: auto-generated The branch stable/12 has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=98f15d8f2fd46c49a4ede89ac1a52aa3b5da8a41 commit 98f15d8f2fd46c49a4ede89ac1a52aa3b5da8a41 Author: Gregory Neil Shapiro AuthorDate: 2023-08-18 00:32:56 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-10-17 19:48:22 +0000 MFC: Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. PR: 248387 (cherry picked from commit 98fd1add676321978db72d77d34ef51ca454c814) --- etc/sendmail/freebsd.mc | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index 97264805a67f..5fd201da3900 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -66,7 +66,6 @@ define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl define(`confCACERT', `CERT_DIR/cacert.pem')dnl define(`confCACERT_PATH', `CERT_DIR')dnl -define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl dnl Uncomment to allow relaying based on your MX records. dnl NOTE: This can allow sites to use your server as a backup MX without From nobody Tue Oct 17 20:57:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S95rd06Fbz4x0tL; Tue, 17 Oct 2023 20:57: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 4S95rc6dgYz3XFY; Tue, 17 Oct 2023 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697576224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q08LTkzubMHIpLk01AhToPaSGp6NHlWPmL27Sx9zK2M=; b=ee6UbHSkQnjvIyPx2HLgNSulyD2gtMSF26Ax2KEjkWD0omeh8K9eqzIlOntvIL43IKO7O0 ZL6z3UkXxHascBZ4MpWdD5s4MF47rYB+aqx9w+UhVWi+266ehj7TWpfj58BFBi1tjWC/lU QilMQUdlIBb90LN4HHfaCieFLkmNDbyO3DxMqZ8rHUjs24W4u8WnOuXxwY4y6aeBpLiT6U 2aTcKBGfKKOmIDabFWSKuaYd5H3mjZHjfgOtyM1FUmqXZLnN9x1WtexecHwKvfxGl8HhQI 5jpU/8X9FN9YR3S7Em/W2jeVIBs/rA/gkSamWBeQLpZuX8qJFhUi19Dx+E+FrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697576224; a=rsa-sha256; cv=none; b=VlLkz2S3lMAyavMUfNbrdV+3kgANnhklGN6qccLqvOcs7h2aKvljgzN3EhXptpi7r/4aGe f2tFbKYnDfOzfs0w56O3+GuW1c0eW8u6hHZNToi9On7eMyt69JyBpWJW2+k+2b4/KlR5bW T77d/0bu1NUzAPNrPP28K3chjruHOKp9sW5VQ3s1k6CBJM/zCmMeNF9pado2VDBob6Aav7 fTx2PSIm1L+sUTOLEYHE+IGiJ+yB+fkSShxy3B/5k6CnkqftiXQzbW6irq6t+wjVqOQs6e hao82WQAojC54T25R0wozQr3GsWIYMpEzNJFMhgVstcD0AInyBp/gGyXnlwaGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697576224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q08LTkzubMHIpLk01AhToPaSGp6NHlWPmL27Sx9zK2M=; b=bdcDS5VDLSgTrrMvgFvrr+OBXw5xpvjbuTWHgVjMglV3xOlHDIDSzLDWqxE/BLt0+TXNxc x9VWkMhb1QMDS00W4uBrzTDBJ+MBMMtsoRHH5aoIHfNZmS0H12h+KzXMyGgwPIUFmPdhb+ 4WZBPOia0UJKVE7Uj74u8aS76CwRqcXtIhLLlw19UOGANaZotb8fWpnEoHPQFRTlmlXPr8 R8Yv7aRVVhHjsEXcpt6cJgiUVLRgwdI0earIizAR/p0Sr+dYfe66b0RQmWc0b223bAvc28 pAHqvwKIrRjo1q+let7CkJj3wB8LBztpwyuOe2Beu1LjwDjVtyCE2i/GskWB2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S95rc5gWBzfn3; Tue, 17 Oct 2023 20:57: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 39HKv4NF030985; Tue, 17 Oct 2023 20:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HKv4QO030982; Tue, 17 Oct 2023 20:57:04 GMT (envelope-from git) Date: Tue, 17 Oct 2023 20:57:04 GMT Message-Id: <202310172057.39HKv4QO030982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: cd5edc7db261 - main - nfsd: Avoid acquiring a vnode for some NFSv4 Readdir operations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd5edc7db261fb228be4044e6fdd38850eb4e9c4 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cd5edc7db261fb228be4044e6fdd38850eb4e9c4 commit cd5edc7db261fb228be4044e6fdd38850eb4e9c4 Author: Rick Macklem AuthorDate: 2023-10-17 20:55:48 +0000 Commit: Rick Macklem CommitDate: 2023-10-17 20:55:48 +0000 nfsd: Avoid acquiring a vnode for some NFSv4 Readdir operations Without this patch, a NFSv4 Readdir operation acquires the vnode for each entry in the directory. If only the Type, Fileid, Mounted_on_fileid and ReaddirError attributes are requested by a client, acquiring the vnode is not necessary for non-directories. Directory vnodes must be acquired to check for server file system mount points. This patch avoids acquiring the vnode, as above, resulting in a 3-8% improvement in Readdir RPC RTT for some simple tests I did. Note that only non-rdirplus NFSv4 mounts will benefit from this change. Tested during a recent IETF NFSv4 Bakeathon testing event. MFC after: 1 month --- sys/fs/nfsserver/nfs_nfsdport.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 570ae653e06c..776d5c50861c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -117,6 +117,11 @@ extern int nfsrv_issuedelegs; extern int nfsrv_dolocallocks; extern struct nfsdevicehead nfsrv_devidhead; +/* Map d_type to vnode type. */ +static uint8_t dtype_to_vnode[DT_WHT + 1] = { VNON, VFIFO, VCHR, VNON, VDIR, + VNON, VBLK, VNON, VREG, VNON, VLNK, VNON, VSOCK, VNON, VNON }; +#define NFS_DTYPETOVTYPE(t) ((t) <= DT_WHT ? dtype_to_vnode[(t)] : VNON) + static int nfsrv_createiovec(int, struct mbuf **, struct mbuf **, struct iovec **); static int nfsrv_createiovec_extpgs(int, int, struct mbuf **, @@ -2310,7 +2315,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, caddr_t bpos0, bpos1; u_int64_t off, toff, verf __unused; uint64_t *cookies = NULL, *cookiep; - nfsattrbit_t attrbits, rderrbits, savbits; + nfsattrbit_t attrbits, rderrbits, savbits, refbits; struct uio io; struct iovec iv; struct componentname cn; @@ -2361,9 +2366,20 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram, if (error) goto nfsmout; NFSSET_ATTRBIT(&savbits, &attrbits); + NFSSET_ATTRBIT(&refbits, &attrbits); NFSCLRNOTFILLABLE_ATTRBIT(&attrbits, nd); NFSZERO_ATTRBIT(&rderrbits); NFSSETBIT_ATTRBIT(&rderrbits, NFSATTRBIT_RDATTRERROR); + /* + * If these 4 bits are the only attributes requested by the + * client, they can be satisfied without acquiring the vnode + * for the file object unless it is a directory. + * This will be indicated by savbits being all 0s. + */ + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_TYPE); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_FILEID); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_MOUNTEDONFILEID); + NFSCLRBIT_ATTRBIT(&savbits, NFSATTRBIT_RDATTRERROR); } else { NFSZERO_ATTRBIT(&attrbits); } @@ -2606,7 +2622,10 @@ again: new_mp = mp; mounted_on_fileno = (uint64_t)dp->d_fileno; if ((nd->nd_flag & ND_NFSV3) || - NFSNONZERO_ATTRBIT(&savbits)) { + NFSNONZERO_ATTRBIT(&savbits) || + dp->d_type == DT_UNKNOWN || + (dp->d_type == DT_DIR && + nfsrv_enable_crossmntpt != 0)) { if (nd->nd_flag & ND_NFSV4) refp = nfsv4root_getreferral(NULL, vp, dp->d_fileno); @@ -2743,6 +2762,11 @@ again: break; } } + } else if (NFSNONZERO_ATTRBIT(&attrbits)) { + /* Only need Type and/or Fileid. */ + VATTR_NULL(&nvap->na_vattr); + nvap->na_fileid = dp->d_fileno; + nvap->na_type = NFS_DTYPETOVTYPE(dp->d_type); } /* @@ -2774,7 +2798,7 @@ again: supports_nfsv4acls = 0; if (refp != NULL) { dirlen += nfsrv_putreferralattr(nd, - &savbits, refp, 0, + &refbits, refp, 0, &nd->nd_repstat); if (nd->nd_repstat) { if (nvp != NULL) From nobody Tue Oct 17 21:58:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S97Cw0kGBz4x4Rw; Tue, 17 Oct 2023 21:58: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 4S97Cv4c8hz3bY2; Tue, 17 Oct 2023 21:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pi5uKWdhoNiYoHj/LigpGPBHSVwKSOaWYiZiz5bpXW4=; b=Zc8tDjciyvXw2RMMK+hcn87zg1HlPU2aXr8IX6WRZCAAjotsOr/cEuQQMvhWXabriC8eAI gH1VhYO20f1KVBrH3c5cGg5wJUw99UFUMZttjPp++E+a2rhsKhoOO5xqWUPOS0IS22q+0z LKCD7XE8lY5mwGt2TZ7Nhrovgv8Z9Kr4pUTayhlUqUgqmkhcFkIiQ4NrhmO2fD6fjA7M1i njMM5w3racMTVGwBAiZ2KI7jbx8m/5uO28bGa7papSt2a2CT35SrwDvB/RLhirrcMbApSK cjUJljMaG8XayT+IJUL4OPhUR4BD2Vjdqi2lyVu7iYBM5nIKBA/bGYLunEEb2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697579931; a=rsa-sha256; cv=none; b=a+c4N4p6ygApem23Rk13CFYgE8dj8IXbLtNxiv0Hb3Ve2deJAtfz1yG4/N4B5O5m2Xq/VQ pSOGtPK6cPxx5jEEmvrs0fQ9U8DP4bYS3Poj6KyHx0slTsf27n22kvxtd+SLExrSJ1tvLC mkHIgjedqNqoiswsrpcJHUbHG4wEskUvvsKEVAa0uW7eKJMRPTAxR5fY2HHxY60JJQb9ni X2w/oY47djEJr7bN5MjL/nTDPwZbp4kKyizRpyJFD9qTjUKjxrc8XDYjbRt0vmCa/PuAGU pz1JFFVPsBgiY4Msb0Plu9V04NtcVqfgYWZd3JOqJWFiO5T18tkbmqggL7ypTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pi5uKWdhoNiYoHj/LigpGPBHSVwKSOaWYiZiz5bpXW4=; b=Uo72YScn0wQzkeF2APrlw/2pC2wEJjYSVD/DaXWl7uFin2OWtNOuZ054qMkITcQoDvWq4+ nJVb4TWH9qLnuI9ggGHHU54IQ74vFGr0IHRLFhSZBihxiQQZADnTM2btsHnuz4tIXh8cHV y5e+axtNmmorGD3ZlggMEVlO7B0uPZHPV/cJQnEocNewAxCAfuW0hyIl9e9mg/zas2KJUq 5/a9yJX+upv2FWAP+Zb5ipGfhBIAYDY4TmSxgsqNhv48VL/PIlX/72HszRaPOYXKnwxS6b MXd95rsl1AXxbs/bnhUwkq2YdoGvLyZb9ha0gwVQsc1wiBGW3NtSpKTT0FA5Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S97Cv3gk5zhL3; Tue, 17 Oct 2023 21:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HLwpLl031387; Tue, 17 Oct 2023 21:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HLwpml031384; Tue, 17 Oct 2023 21:58:51 GMT (envelope-from git) Date: Tue, 17 Oct 2023 21:58:51 GMT Message-Id: <202310172158.39HLwpml031384@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: 83bd5a833c3a - main - mkimg_test: remove vtoc8 images, they aren't needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=83bd5a833c3a14b74736e7b3fa0be66252a5a3dc commit 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc Author: Warner Losh AuthorDate: 2023-10-17 21:52:02 +0000 Commit: Warner Losh CommitDate: 2023-10-17 21:56:19 +0000 mkimg_test: remove vtoc8 images, they aren't needed vtoc8 support expired with sparc64 removal, so remove them all. Sponsored by: Netflix --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.hex | 550 --------------------- .../mkimg/tests/img-63x255-4096-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.hex | 324 ------------ usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.hex | 550 --------------------- usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.hex | 324 ------------ 28 files changed, 4472 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex deleted file mode 100644 index 93afee83d903..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex +++ /dev/null @@ -1,544 +0,0 @@ -00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 10 00 |.............B..| -00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| -00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00001000 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 |...... .......0.| -00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| -00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00005010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00005090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000050c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000051a0 00 00 00 00 0e 10 21 08 00 00 00 00 00 00 00 00 |......!.........| -000051b0 21 08 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000051c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000051d0 00 00 21 08 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000051e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000051f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 3f |.............."?| -00005200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00405200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00406000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex deleted file mode 100644 index dba435854881..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex +++ /dev/null @@ -1,72 +0,0 @@ -00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| -00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| -00000030 00 00 00 00 00 02 00 00 00 00 00 01 00 00 00 00 |................| -00000040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 80 00 00 00 00 03 00 00 00 00 00 00 00 00 00 00 |................| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 |................| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 80 00 00 00 00 05 00 00 80 00 00 00 00 06 00 00 |................| -00030010 80 00 00 00 00 07 00 00 80 00 00 00 00 08 00 00 |................| -00030020 80 00 00 00 00 09 00 00 80 00 00 00 00 0a 00 00 |................| -00030030 80 00 00 00 00 0b 00 00 80 00 00 00 00 0c 00 00 |................| -00030040 80 00 00 00 00 0d 00 00 80 00 00 00 00 0e 00 00 |................| -00030050 80 00 00 00 00 0f 00 00 80 00 00 00 00 10 00 00 |................| -00030060 80 00 00 00 00 11 00 00 80 00 00 00 00 12 00 00 |................| -00030070 80 00 00 00 00 13 00 00 80 00 00 00 00 14 00 00 |................| -00030080 80 00 00 00 00 15 00 00 80 00 00 00 00 16 00 00 |................| -00030090 80 00 00 00 00 17 00 00 80 00 00 00 00 18 00 00 |................| -000300a0 80 00 00 00 00 19 00 00 80 00 00 00 00 1a 00 00 |................| -000300b0 80 00 00 00 00 1b 00 00 80 00 00 00 00 1c 00 00 |................| -000300c0 80 00 00 00 00 1d 00 00 80 00 00 00 00 1e 00 00 |................| -000300d0 80 00 00 00 00 1f 00 00 80 00 00 00 00 20 00 00 |............. ..| -000300e0 80 00 00 00 00 21 00 00 80 00 00 00 00 22 00 00 |.....!......."..| -000300f0 80 00 00 00 00 23 00 00 80 00 00 00 00 24 00 00 |.....#.......$..| -00030100 80 00 00 00 00 25 00 00 80 00 00 00 00 26 00 00 |.....%.......&..| -00030110 80 00 00 00 00 27 00 00 80 00 00 00 00 28 00 00 |.....'.......(..| -00030120 80 00 00 00 00 29 00 00 80 00 00 00 00 2a 00 00 |.....).......*..| -00030130 80 00 00 00 00 2b 00 00 80 00 00 00 00 2c 00 00 |.....+.......,..| -00030140 80 00 00 00 00 2d 00 00 80 00 00 00 00 2e 00 00 |.....-..........| -00030150 80 00 00 00 00 2f 00 00 80 00 00 00 00 30 00 00 |...../.......0..| -00030160 80 00 00 00 00 31 00 00 80 00 00 00 00 32 00 00 |.....1.......2..| -00030170 80 00 00 00 00 33 00 00 80 00 00 00 00 34 00 00 |.....3.......4..| -00030180 80 00 00 00 00 35 00 00 80 00 00 00 00 36 00 00 |.....5.......6..| -00030190 80 00 00 00 00 37 00 00 80 00 00 00 00 38 00 00 |.....7.......8..| -000301a0 80 00 00 00 00 39 00 00 80 00 00 00 00 3a 00 00 |.....9.......:..| -000301b0 80 00 00 00 00 3b 00 00 80 00 00 00 00 3c 00 00 |.....;.......<..| -000301c0 80 00 00 00 00 3d 00 00 80 00 00 00 00 3e 00 00 |.....=.......>..| -000301d0 80 00 00 00 00 3f 00 00 80 00 00 00 00 40 00 00 |.....?.......@..| -000301e0 80 00 00 00 00 41 00 00 80 00 00 00 00 42 00 00 |.....A.......B..| -000301f0 80 00 00 00 00 43 00 00 80 00 00 00 00 44 00 00 |.....C.......D..| -00030200 80 00 00 00 00 45 00 00 00 00 00 00 00 00 00 00 |.....E..........| -00030210 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 |................| -* -00040080 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 00 |................| -00040090 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00050010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00050090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000500c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000501a0 00 00 00 00 0e 10 21 80 00 00 00 00 00 00 00 00 |......!.........| -000501b0 21 80 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000501c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000501d0 00 00 21 80 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000501e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000501f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 b7 |..............".| -00050200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00450200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00460000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex deleted file mode 100644 index ffa27d117070..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex +++ /dev/null @@ -1,20 +0,0 @@ -00000000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 21 01 00 00 00 00 00 00 00 00 |......!.........| -000001b0 21 01 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 21 01 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 36 |.............."6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00420200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex deleted file mode 100644 index 00828a72a331..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex +++ /dev/null @@ -1,52 +0,0 @@ -00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00000030 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00000040 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00000050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 63 78 73 70 61 72 73 65 ff ff ff ff ff ff ff ff |cxsparse........| -00000210 00 00 00 00 00 00 06 00 00 01 00 00 00 00 00 03 |................| -00000220 00 20 00 00 ff ff f4 74 00 00 00 00 00 00 00 00 |. .....t........| -00000230 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 00 00 00 04 00 00 10 05 00 00 20 06 ff ff ff ff |.......... .....| -00000610 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00000a00 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000a10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000a80 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000a90 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000aa0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000ab0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -00000ac0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000ba0 00 00 00 00 0e 10 21 34 00 00 00 00 00 00 00 00 |......!4........| -00000bb0 21 34 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!4..............| -00000bc0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -00000bd0 00 00 21 34 00 00 00 00 00 00 00 00 00 00 00 00 |..!4............| -00000be0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000bf0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 03 |..............".| -00000c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00200a00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00200c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400c00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00400e00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00401000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00600e00 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00600e10 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00600e20 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00600e30 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00600e40 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00600e50 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00600e60 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00601000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex deleted file mode 100644 index d55109faaec5..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex +++ /dev/null @@ -1,28 +0,0 @@ -00000000 46 72 65 65 42 53 44 35 4d 00 00 00 00 00 00 00 |FreeBSD5M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 28 00 00 00 00 00 00 00 00 00 |......(.........| -000001b0 28 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |(...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 |..(.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 2b 36 |..............+6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00500010 ff ff ff ff ff ff ff ff 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00500020 00 02 00 00 57 69 32 6b 00 00 00 00 00 50 00 00 |....Wi2k.....P..| -00500030 00 00 00 00 00 50 00 00 00 96 04 11 00 00 00 02 |.....P..........| -00500040 ff ff ef b4 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00500050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00500060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex deleted file mode 100644 index 76c4d5313850..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex +++ /dev/null @@ -1,71 +0,0 @@ -00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 68 65 61 64 64 db 05 73 00 00 00 00 00 00 00 00 |headd..s........| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00010050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 68 65 61 64 13 47 fd f1 01 00 00 00 00 00 00 00 |head.G..........| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00020050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00030010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00030020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00030030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00030040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00030050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00040010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00040020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00040030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00040040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00040050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00200000 6d 65 74 61 64 61 74 61 00 00 05 00 00 00 00 00 |metadata........| -00200010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00200020 37 67 a1 ca 36 fa 43 4d b3 b6 33 f0 aa 44 e7 6b |7g..6.CM..3..D.k| -00200030 00 00 01 00 08 00 00 00 04 00 00 00 00 00 00 00 |................| -00200040 24 42 a5 2f 1b cd 76 48 b2 11 5d be d8 3b f4 b8 |$B./..vH..]..;..| -00200050 08 00 01 00 08 00 00 00 06 00 00 00 00 00 00 00 |................| -00200060 ab 12 ca be e6 b2 23 45 93 ef c3 09 e0 00 c7 46 |......#E.......F| -00200070 10 00 01 00 10 00 00 00 06 00 00 00 00 00 00 00 |................| -00200080 1d bf 41 81 6f a9 09 47 ba 47 f2 33 a8 fa ab 5f |..A.o..G.G.3..._| -00200090 20 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 | ...............| -002000a0 c7 48 a3 cd 5d 44 71 44 9c c9 e9 88 52 51 c5 56 |.H..]DqD....RQ.V| -002000b0 24 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 |$...............| -002000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00210000 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 00 |................| -00210010 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00210020 00 02 00 00 00 10 00 00 00 00 00 00 00 00 00 00 |................| -00210030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00300000 06 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 |..@.............| -00300010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400000 46 72 65 65 42 53 44 31 36 4d 00 00 00 00 00 00 |FreeBSD16M......| -00400010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00400090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -004000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -004001a0 00 00 00 00 0e 10 80 00 00 00 00 00 00 00 00 00 |................| -004001b0 80 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |................| -004001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -004001d0 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be f8 7f |................| -00400200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00800200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -01400000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex deleted file mode 100644 index 865769bcea7e..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex +++ /dev/null @@ -1,314 +0,0 @@ -00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| -00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| -00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| -00000030 0b 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 |................| -00000040 20 00 00 00 00 00 00 00 00 0a 20 0d 0a 00 00 00 | ......... .....| -00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 23 20 44 69 73 6b 20 44 65 73 63 72 69 70 74 6f |# Disk Descripto| -00000210 72 46 69 6c 65 0a 76 65 72 73 69 6f 6e 3d 31 0a |rFile.version=1.| -00000220 43 49 44 3d 30 30 30 30 30 30 30 30 0a 70 61 72 |CID=00000000.par| -00000230 65 6e 74 43 49 44 3d 66 66 66 66 66 66 66 66 0a |entCID=ffffffff.| -00000240 63 72 65 61 74 65 54 79 70 65 3d 22 6d 6f 6e 6f |createType="mono| -00000250 6c 69 74 68 69 63 53 70 61 72 73 65 22 0a 23 20 |lithicSparse".# | -00000260 45 78 74 65 6e 74 20 64 65 73 63 72 69 70 74 69 |Extent descripti| -00000270 6f 6e 0a 52 57 20 31 30 32 34 30 20 53 50 41 52 |on.RW 10240 SPAR| -00000280 53 45 20 22 22 0a 23 20 54 68 65 20 44 69 73 6b |SE "".# The Disk| -00000290 20 44 61 74 61 20 42 61 73 65 0a 23 44 44 42 0a | Data Base.#DDB.| -000002a0 64 64 62 2e 61 64 61 70 74 65 72 54 79 70 65 20 |ddb.adapterType | -000002b0 3d 20 22 69 64 65 22 0a 64 64 62 2e 67 65 6f 6d |= "ide".ddb.geom| -000002c0 65 74 72 79 2e 63 79 6c 69 6e 64 65 72 73 20 3d |etry.cylinders =| -000002d0 20 22 31 30 32 34 30 22 0a 64 64 62 2e 67 65 6f | "10240".ddb.geo| -000002e0 6d 65 74 72 79 2e 68 65 61 64 73 20 3d 20 22 31 |metry.heads = "1| -000002f0 22 0a 64 64 62 2e 67 65 6f 6d 65 74 72 79 2e 73 |".ddb.geometry.s| -00000300 65 63 74 6f 72 73 20 3d 20 22 31 22 0a 00 00 00 |ectors = "1"....| -00000310 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000400 03 00 00 00 07 00 00 00 00 00 00 00 00 00 00 00 |................| -00000410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 20 00 00 00 30 00 00 00 40 00 00 00 50 00 00 00 | ...0...@...P...| -00000610 60 00 00 00 70 00 00 00 80 00 00 00 90 00 00 00 |`...p...........| -00000620 a0 00 00 00 b0 00 00 00 c0 00 00 00 d0 00 00 00 |................| -00000630 e0 00 00 00 f0 00 00 00 00 01 00 00 10 01 00 00 |................| -00000640 20 01 00 00 30 01 00 00 40 01 00 00 50 01 00 00 | ...0...@...P...| -00000650 60 01 00 00 70 01 00 00 80 01 00 00 90 01 00 00 |`...p...........| -00000660 a0 01 00 00 b0 01 00 00 c0 01 00 00 d0 01 00 00 |................| -00000670 e0 01 00 00 f0 01 00 00 00 02 00 00 10 02 00 00 |................| -00000680 20 02 00 00 30 02 00 00 40 02 00 00 50 02 00 00 | ...0...@...P...| -00000690 60 02 00 00 70 02 00 00 80 02 00 00 90 02 00 00 |`...p...........| -000006a0 a0 02 00 00 b0 02 00 00 c0 02 00 00 d0 02 00 00 |................| -000006b0 e0 02 00 00 f0 02 00 00 00 03 00 00 10 03 00 00 |................| -000006c0 20 03 00 00 30 03 00 00 40 03 00 00 50 03 00 00 | ...0...@...P...| -000006d0 60 03 00 00 70 03 00 00 80 03 00 00 90 03 00 00 |`...p...........| -000006e0 a0 03 00 00 b0 03 00 00 c0 03 00 00 d0 03 00 00 |................| -000006f0 e0 03 00 00 f0 03 00 00 00 04 00 00 10 04 00 00 |................| -00000700 20 04 00 00 30 04 00 00 40 04 00 00 50 04 00 00 | ...0...@...P...| -00000710 60 04 00 00 70 04 00 00 80 04 00 00 90 04 00 00 |`...p...........| -00000720 a0 04 00 00 b0 04 00 00 c0 04 00 00 d0 04 00 00 |................| -00000730 e0 04 00 00 f0 04 00 00 00 05 00 00 10 05 00 00 |................| -00000740 20 05 00 00 30 05 00 00 40 05 00 00 50 05 00 00 | ...0...@...P...| -00000750 60 05 00 00 70 05 00 00 80 05 00 00 90 05 00 00 |`...p...........| -00000760 a0 05 00 00 b0 05 00 00 c0 05 00 00 d0 05 00 00 |................| -00000770 e0 05 00 00 f0 05 00 00 00 06 00 00 10 06 00 00 |................| -00000780 20 06 00 00 30 06 00 00 40 06 00 00 50 06 00 00 | ...0...@...P...| -00000790 60 06 00 00 70 06 00 00 80 06 00 00 90 06 00 00 |`...p...........| -000007a0 a0 06 00 00 b0 06 00 00 c0 06 00 00 d0 06 00 00 |................| -000007b0 e0 06 00 00 f0 06 00 00 00 07 00 00 10 07 00 00 |................| -000007c0 20 07 00 00 30 07 00 00 40 07 00 00 50 07 00 00 | ...0...@...P...| -000007d0 60 07 00 00 70 07 00 00 80 07 00 00 90 07 00 00 |`...p...........| -000007e0 a0 07 00 00 b0 07 00 00 c0 07 00 00 d0 07 00 00 |................| -000007f0 e0 07 00 00 f0 07 00 00 00 08 00 00 10 08 00 00 |................| -00000800 20 08 00 00 30 08 00 00 40 08 00 00 50 08 00 00 | ...0...@...P...| -00000810 60 08 00 00 70 08 00 00 80 08 00 00 90 08 00 00 |`...p...........| -00000820 a0 08 00 00 b0 08 00 00 c0 08 00 00 d0 08 00 00 |................| -00000830 e0 08 00 00 f0 08 00 00 00 09 00 00 10 09 00 00 |................| -00000840 20 09 00 00 30 09 00 00 40 09 00 00 50 09 00 00 | ...0...@...P...| -00000850 60 09 00 00 70 09 00 00 80 09 00 00 90 09 00 00 |`...p...........| -00000860 a0 09 00 00 b0 09 00 00 c0 09 00 00 d0 09 00 00 |................| -00000870 e0 09 00 00 f0 09 00 00 00 0a 00 00 10 0a 00 00 |................| -00000880 20 0a 00 00 30 0a 00 00 40 0a 00 00 50 0a 00 00 | ...0...@...P...| -00000890 60 0a 00 00 70 0a 00 00 80 0a 00 00 90 0a 00 00 |`...p...........| -000008a0 a0 0a 00 00 b0 0a 00 00 c0 0a 00 00 d0 0a 00 00 |................| -000008b0 e0 0a 00 00 f0 0a 00 00 00 0b 00 00 10 0b 00 00 |................| -000008c0 20 0b 00 00 30 0b 00 00 40 0b 00 00 50 0b 00 00 | ...0...@...P...| -000008d0 60 0b 00 00 70 0b 00 00 80 0b 00 00 90 0b 00 00 |`...p...........| -000008e0 a0 0b 00 00 b0 0b 00 00 c0 0b 00 00 d0 0b 00 00 |................| -000008f0 e0 0b 00 00 f0 0b 00 00 00 0c 00 00 10 0c 00 00 |................| -00000900 20 0c 00 00 30 0c 00 00 40 0c 00 00 50 0c 00 00 | ...0...@...P...| -00000910 60 0c 00 00 70 0c 00 00 80 0c 00 00 90 0c 00 00 |`...p...........| -00000920 a0 0c 00 00 b0 0c 00 00 c0 0c 00 00 d0 0c 00 00 |................| -00000930 e0 0c 00 00 f0 0c 00 00 00 0d 00 00 10 0d 00 00 |................| -00000940 20 0d 00 00 30 0d 00 00 40 0d 00 00 50 0d 00 00 | ...0...@...P...| -00000950 60 0d 00 00 70 0d 00 00 80 0d 00 00 90 0d 00 00 |`...p...........| -00000960 a0 0d 00 00 b0 0d 00 00 c0 0d 00 00 d0 0d 00 00 |................| -00000970 e0 0d 00 00 f0 0d 00 00 00 0e 00 00 10 0e 00 00 |................| -00000980 20 0e 00 00 30 0e 00 00 40 0e 00 00 50 0e 00 00 | ...0...@...P...| -00000990 60 0e 00 00 70 0e 00 00 80 0e 00 00 90 0e 00 00 |`...p...........| -000009a0 a0 0e 00 00 b0 0e 00 00 c0 0e 00 00 d0 0e 00 00 |................| -000009b0 e0 0e 00 00 f0 0e 00 00 00 0f 00 00 10 0f 00 00 |................| -000009c0 20 0f 00 00 30 0f 00 00 40 0f 00 00 50 0f 00 00 | ...0...@...P...| -000009d0 60 0f 00 00 70 0f 00 00 80 0f 00 00 90 0f 00 00 |`...p...........| -000009e0 a0 0f 00 00 b0 0f 00 00 c0 0f 00 00 d0 0f 00 00 |................| -000009f0 e0 0f 00 00 f0 0f 00 00 00 10 00 00 10 10 00 00 |................| -00000a00 20 10 00 00 30 10 00 00 40 10 00 00 50 10 00 00 | ...0...@...P...| -00000a10 60 10 00 00 70 10 00 00 80 10 00 00 90 10 00 00 |`...p...........| -00000a20 a0 10 00 00 b0 10 00 00 c0 10 00 00 d0 10 00 00 |................| -00000a30 e0 10 00 00 f0 10 00 00 00 11 00 00 10 11 00 00 |................| -00000a40 20 11 00 00 30 11 00 00 40 11 00 00 50 11 00 00 | ...0...@...P...| -00000a50 60 11 00 00 70 11 00 00 80 11 00 00 90 11 00 00 |`...p...........| -00000a60 a0 11 00 00 b0 11 00 00 c0 11 00 00 d0 11 00 00 |................| -00000a70 e0 11 00 00 f0 11 00 00 00 12 00 00 10 12 00 00 |................| -00000a80 20 12 00 00 30 12 00 00 40 12 00 00 50 12 00 00 | ...0...@...P...| -00000a90 60 12 00 00 70 12 00 00 80 12 00 00 90 12 00 00 |`...p...........| -00000aa0 a0 12 00 00 b0 12 00 00 c0 12 00 00 d0 12 00 00 |................| -00000ab0 e0 12 00 00 f0 12 00 00 00 13 00 00 10 13 00 00 |................| -00000ac0 20 13 00 00 30 13 00 00 40 13 00 00 50 13 00 00 | ...0...@...P...| -00000ad0 60 13 00 00 70 13 00 00 80 13 00 00 90 13 00 00 |`...p...........| -00000ae0 a0 13 00 00 b0 13 00 00 c0 13 00 00 d0 13 00 00 |................| -00000af0 e0 13 00 00 f0 13 00 00 00 14 00 00 10 14 00 00 |................| -00000b00 20 14 00 00 30 14 00 00 40 14 00 00 50 14 00 00 | ...0...@...P...| -00000b10 60 14 00 00 70 14 00 00 80 14 00 00 90 14 00 00 |`...p...........| *** 3700 LINES SKIPPED *** From nobody Tue Oct 17 21:58:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S97Cx12Vpz4x4w2; Tue, 17 Oct 2023 21:58: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 4S97Cw6XW0z3bY4; Tue, 17 Oct 2023 21:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0BR7j3KBj85WHXMbrL5BEywH0U+3qsHqf6EhM747ZA=; b=jcac0CtcPXQUqzxfY0lg+etKhkfzvMBuT0LrcsdhwTvI130ry3JWUFhyW42ZYDhVi9k7tW Thw04R9L3590Bly5zV7LPEoFxpQAMH7M+Cwzdld9xDUElivcdvFoBSNLQYtjZMX+7quoEG Os2q9awzHFXp157B6oO2jvzc+W/2icrjF+c5sGNZd1mklj+Xf01yvKgP9CaQpEAS8EkSpX i9A5+PY9KNAqb9z3YStFvYyOLnJ6ZWJh+uPqEAfGhu29scSrlGM+KBWP41/z6lmqj1CdHD G+Wx+4VC33+6Dj+hixiqse9/OYg90Yfmofc1QKUc43hNEvcwkLjzrtjuNo3yMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697579932; a=rsa-sha256; cv=none; b=X8Nq3D2h84Mabod15E1LBb+jZpg0KwfqQQuTWbTg8lEmHk9hv342yXJ/1m5TEDhzxGLo8T QlIsjcW5Wg31bSMvj94pHo7cAzkkpgaifzBmSwh79/qSyAiQns1vTFAtLfgp7AbSW6eLfY Ovlox5OC6/Zunjg6mwM9u9n+MZDCM2jJF2pCMiAO0jQWUKJ07HDDUWEZm4b3OxY1gnNYO4 c99Irrk2vbjeq/BVKjB1AwFY0qwsZwc2g6g3VKSejO2BPtj+uy39NWAZMIDU4JrBiQgezV O2/uL68AKECiFQPgNZ0QzsRz9aQ21fHDfTqJSBWK0iXRPJ7MC4wI/0KPqa+d3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697579932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H0BR7j3KBj85WHXMbrL5BEywH0U+3qsHqf6EhM747ZA=; b=C0jmRRk+Ike23a1sQArQajJFV9shoNk4B7VcNh47nS6rGzMn85aIANNohx1TrkUF9xOtvP gGYx66vrVWQj+ZYk07afLrO0VHLcHRI1zsDSLJzCjgr9Q1lSQazW/iGt5HMcSksLq/oTz9 uG7Au8aKiVBIE0o5ArcKAik1DTfAREYksdK7OoTbqj9CDoSh2X35etn3DB5qtRAA6TQsQH KkW7Yrrwx3HOBYvfOZkwf3mX8+KtIAr4HP/UYKLpJJXkmmy1rGRVd9KO8ab6FR2gufTAH7 MNpbZhJfSjs3xhePt1nPKz3bU8rRG/HgAk+pmgaqr0R3VOWiAmYkzgDekWyubQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S97Cw5cvxzglK; Tue, 17 Oct 2023 21:58: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 39HLwqGq031441; Tue, 17 Oct 2023 21:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HLwqOr031439; Tue, 17 Oct 2023 21:58:52 GMT (envelope-from git) Date: Tue, 17 Oct 2023 21:58:52 GMT Message-Id: <202310172158.39HLwqOr031439@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: d2abbfede534 - main - mkimg: Regenerate all the tests for gpt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2abbfede5342b19f3e5994140cdb6622c95ef66 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2abbfede5342b19f3e5994140cdb6622c95ef66 commit d2abbfede5342b19f3e5994140cdb6622c95ef66 Author: Warner Losh AuthorDate: 2023-10-17 21:54:20 +0000 Commit: Warner Losh CommitDate: 2023-10-17 21:56:19 +0000 mkimg: Regenerate all the tests for gpt Recent changes to mkimg has changed the generated GPT images to be more correct. Use make rebase to regenerate the baseline. Sponsored by: Netflix --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 569 +++++------ 28 files changed, 3798 insertions(+), 3754 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index a974400ad2e8..ae764c000ae7 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,5 +1,6 @@ +# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 20 00 |.............B .| +00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| 00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * @@ -7,569 +8,573 @@ 00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| 00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 00 00 |......P.........| +00002010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 60 00 |..............`.| +00002030 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| +00002040 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| +00002050 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| +00002060 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| +00002070 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| +00002080 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| +00002090 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| +000020a0 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| +000020b0 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| +000020c0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| +000020d0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| +000020e0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| +000020f0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| +00002100 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| +00002110 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| +00002120 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| +00002130 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| +00002140 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| +00002150 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| +00002160 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| +00002170 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| +00002180 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| +00002190 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| +000021a0 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| +000021b0 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| +000021c0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| +000021d0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| +000021e0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| +000021f0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| +00002200 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| +00002210 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| +00002220 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| +00002230 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| +00002240 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| +00002250 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| +00002260 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| +00002270 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| +00002280 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| +00002290 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| +000022a0 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| +000022b0 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| +000022c0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| +000022d0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| +000022e0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| +000022f0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| +00002300 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| +00002310 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| +00002320 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| +00002330 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| +00002340 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| +00002350 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| +00002360 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| +00002370 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| +00002380 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| +00002390 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| +000023a0 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| +000023b0 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| +000023c0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| +000023d0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| +000023e0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| +000023f0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| +00002400 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| +00002410 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| +00002420 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| +00002430 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| +00002440 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| +00002450 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| +00002460 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| +00002470 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| +00002480 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| +00002490 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| +000024a0 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| +000024b0 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| +000024c0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| +000024d0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| +000024e0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| +000024f0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| +00002500 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| +00002510 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| +00002520 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| +00002530 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| +00002540 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| +00002550 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| +00002560 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| +00002570 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| +00002580 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| +00002590 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| +000025a0 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| +000025b0 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| +000025c0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| +000025d0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| +000025e0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| +000025f0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| +00002600 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| +00002610 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| +00002620 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| +00002630 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| +00002640 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| +00002650 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| +00002660 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| +00002670 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| +00002680 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| +00002690 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| +000026a0 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| +000026b0 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| +000026c0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| +000026d0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| +000026e0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| +000026f0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| +00002700 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| +00002710 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| +00002720 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| +00002730 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| +00002740 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| +00002750 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| +00002760 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| +00002770 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| +00002780 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| +00002790 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| +000027a0 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| +000027b0 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| +000027c0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| +000027d0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| +000027e0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| +000027f0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| +00002800 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| +00002810 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| +00002820 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| +00002830 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| +00002840 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| +00002850 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| +00002860 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| +00002870 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| +00002880 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| +00002890 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| +000028a0 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| +000028b0 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| +000028c0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| +000028d0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| +000028e0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| +000028f0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| +00002900 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| +00002910 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| +00002920 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| +00002930 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| +00002940 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| +00002950 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| +00002960 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| +00002970 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| +00002980 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| +00002990 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| +000029a0 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| +000029b0 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| +000029c0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| +000029d0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| +000029e0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| +000029f0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| +00002a00 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| +00002a10 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| +00002a20 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| +00002a30 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| +00002a40 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| +00002a50 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| +00002a60 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| +00002a70 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| +00002a80 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| +00002a90 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| +00002aa0 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| +00002ab0 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| +00002ac0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| +00002ad0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| +00002ae0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| +00002af0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| +00002b00 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| +00002b10 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| +00002b20 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| +00002b30 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| +00002b40 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| +00002b50 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| +00002b60 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| +00002b70 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| +00002b80 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| +00002b90 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| +00002ba0 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| +00002bb0 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| +00002bc0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| +00002bd0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| +00002be0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| +00002bf0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| +00002c00 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| +00002c10 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| +00002c20 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| +00002c30 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| +00002c40 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| +00002c50 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| +00002c60 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| +00002c70 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| +00002c80 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| +00002c90 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| +00002ca0 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| +00002cb0 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| +00002cc0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| +00002cd0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| +00002ce0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| +00002cf0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| +00002d00 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| +00002d10 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| +00002d20 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| +00002d30 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| +00002d40 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| +00002d50 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| +00002d60 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| +00002d70 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| +00002d80 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| +00002d90 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| +00002da0 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| +00002db0 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| +00002dc0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| +00002dd0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| +00002de0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| +00002df0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| +00002e00 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| +00002e10 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| +00002e20 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| +00002e30 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| +00002e40 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| +00002e50 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| +00002e60 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| +00002e70 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| +00002e80 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| +00002e90 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| +00002ea0 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| +00002eb0 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| +00002ec0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| +00002ed0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| +00002ee0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| +00002ef0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| +00002f00 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| +00002f10 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| +00002f20 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| +00002f30 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| +00002f40 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| +00002f50 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| +00002f60 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| +00002f70 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| +00002f80 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| +00002f90 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| +00002fa0 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| +00002fb0 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| +00002fc0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| +00002fd0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| +00002fe0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| +00002ff0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| +00003000 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| +00003010 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| +00003020 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| +00003030 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| +00003040 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| +00003050 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| +00003060 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| +00003070 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| +00003080 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| +00003090 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| +000030a0 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| +000030b0 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| +000030c0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| +000030d0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| +000030e0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| +000030f0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| +00003100 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| +00003110 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| +00003120 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| +00003130 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| +00003140 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| +00003150 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| +00003160 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| +00003170 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| +00003180 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| +00003190 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| +000031a0 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| +000031b0 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| +000031c0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| +000031d0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| +000031e0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| +000031f0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| +00003200 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| +00003210 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| +00003220 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| +00003230 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| +00003240 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| +00003250 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| +00003260 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| +00003270 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| +00003280 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| +00003290 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| +000032a0 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| +000032b0 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| +000032c0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| +000032d0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| +000032e0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| +000032f0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| +00003300 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| +00003310 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| +00003320 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| +00003330 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| +00003340 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| +00003350 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| +00003360 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| +00003370 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| +00003380 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| +00003390 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| +000033a0 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| +000033b0 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| +000033c0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| +000033d0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| +000033e0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| +000033f0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| +00003400 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| +00003410 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| +00003420 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| +00003430 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| +00003440 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| +00003450 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| +00003460 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| +00003470 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| +00003480 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| +00003490 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| +000034a0 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| +000034b0 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| +000034c0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| +000034d0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| +000034e0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| +000034f0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| +00003500 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| +00003510 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| +00003520 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| +00003530 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| +00003540 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| +00003550 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| +00003560 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| +00003570 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| +00003580 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| +00003590 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| +000035a0 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| +000035b0 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| +000035c0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| +000035d0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| +000035e0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| +000035f0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| +00003600 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| +00003610 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| +00003620 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| +00003630 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| +00003640 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| +00003650 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| +00003660 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| +00003670 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| +00003680 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| +00003690 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| +000036a0 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| +000036b0 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| +000036c0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| +000036d0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| +000036e0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| +000036f0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| +00003700 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| +00003710 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| +00003720 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| +00003730 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| +00003740 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| +00003750 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| +00003760 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| +00003770 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| +00003780 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| +00003790 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| +000037a0 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| +000037b0 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| +000037c0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| +000037d0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| +000037e0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| +000037f0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| +00003800 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| +00003810 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| +00003820 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| +00003830 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| +00003840 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| +00003850 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| +00003860 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| +00003870 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| +00003880 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| +00003890 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| +000038a0 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| +000038b0 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| +000038c0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| +000038d0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| +000038e0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| +000038f0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| +00003900 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| +00003910 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| +00003920 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| +00003930 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| +00003940 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| +00003950 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| +00003960 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| +00003970 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| +00003980 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| *** 7601 LINES SKIPPED *** From nobody Wed Oct 18 02:44:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9FY5351Lz4xNBm; Wed, 18 Oct 2023 02:44: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 4S9FY52YCsz4YRR; Wed, 18 Oct 2023 02:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=e/jQy/ee02dKokq4h/18/SUqZP7hxV2i+ANul4UtplcuNvytIhLqJLDct2QUR/jyv9VjfH RBTgTsTniX1B3cOEHVi0lTZMR9M0SBdHYKBpnIOyFpdguE/gjRridMVtb3F0FDWk3cwYDY R3llkOE9fEhiKjZ5yhddMIVhaIkUeRsTuMZnN7Tm0ghviV/ATTQKwqLrDosWogxnrETl8t QY6ODbOYJR/nknhNtlVFplBVBFqWD0DGatHe+lui79Md59oHyPamS6RkabRNUVKchdvw6R VAFPEqzx7zLprygOr6YPNPCs38cNFAcMAIVM8oEX1aU9b3WEcGwQITcO0rcWuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697597049; a=rsa-sha256; cv=none; b=uyABDBmf8bAhA0CkvmlPaLm8gCRFKJd1wCnJdyNRa+y9DVK+8JneAgOqjrEVzLZEFln5+h U7uwmLHbHUz03KTtDj0MChuE0Rzd5YloLyc2cAYk7S/ro0mO1jzQUKZnpEsjpfnKoyGXCF 5m7sJKvc1WMiGbJ08RwiL9c8SaGbiFB4FEh2Bmu6Ka8LG2Rl73ASSqBCZ85RxR5CS9VjxH DSe4bqhFSv4vKtyztukx0riJIJMlbXqbrBfxrb2vueeD1dpEglk71+qQoHG+0Kg6zm3FOK qDjJSZg/uwkmdAZ/O2vWLAASs5nTOLeKQ+/2JRGEGS8D6eX1qRkofdCh1aTUtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697597049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qBIGizAExzLhhoLqHyKbDFKO5c0qXZzV7xugcE6Sv14=; b=t416h5cnAGOHzaBUJdsjXGrK8iQrc6Dg11Qlest7GLxsPjogQXDF8pBlIo0oVLT62qgWBG 2ELrkckZaTDjnh3hU4L/eIf6Fj9unLPJ9QUJzgnNqX0zFCEgOP8lPQliAccQ96NUdC3LYs Aif9GylnUtqvfKhyiNXOZOMTTbLO63vVMlRLuGW5C69uv7Clhh4JGq6ab1JfAzTFs0TywC M6fE8Urrl+qRIFUpeZcLcF58+rI0Kh+CUb4FoQrxqb+hb435DoKWXusyT1BZK6i6JyZY3e cWiz3wL7ViyPNWP5l/ldp/6zFpCcr6bHhMsHuWeRjn7yomG52wpMjryFqPtioQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9FY51b4tzqFH; Wed, 18 Oct 2023 02:44: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 39I2i9lI010368; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I2i9Pm010365; Wed, 18 Oct 2023 02:44:09 GMT (envelope-from git) Date: Wed, 18 Oct 2023 02:44:09 GMT Message-Id: <202310180244.39I2i9Pm010365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: db7257ef972e - main - nfsd: Fix a server crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db7257ef972ed75e33929d39fd791d3699b53c63 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=db7257ef972ed75e33929d39fd791d3699b53c63 commit db7257ef972ed75e33929d39fd791d3699b53c63 Author: Rick Macklem AuthorDate: 2023-10-18 02:40:23 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 02:43:25 +0000 nfsd: Fix a server crash PR#274346 reports a crash which appears to be caused by a NULL default session being destroyed. This patch should avoid the crash. Tested by: Joshua Kinard PR: 274346 MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 9 +++++++++ sys/fs/nfs/nfs_commonsubs.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 936373c79366..29c7cdbd671c 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1208,6 +1208,14 @@ tryagain: NFSCL_DEBUG(1, "Got badsession\n"); NFSLOCKCLSTATE(); NFSLOCKMNT(nmp); + if (TAILQ_EMPTY(&nmp->nm_sess)) { + NFSUNLOCKMNT(nmp); + NFSUNLOCKCLSTATE(); + printf("If server has not rebooted, " + "check NFS clients for unique " + "/etc/hostid's\n"); + goto out; + } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, nd->nd_sequence, NFSX_V4SESSIONID) == 0) { @@ -1388,6 +1396,7 @@ tryagain: nd->nd_repstat = NFSERR_STALEDONTRECOVER; } } +out: #ifdef KDTRACE_HOOKS if (nmp != NULL && dtrace_nfscl_nfs234_done_probe != NULL) { diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index ffe1ec542492..f2305795e53e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -5141,11 +5141,13 @@ nfsrpc_destroysession(struct nfsmount *nmp, struct nfsclsession *tsep, struct nfsrv_descript *nd = &nfsd; int error; + if (tsep == NULL) + tsep = nfsmnt_mdssession(nmp); + if (tsep == NULL) + return (0); nfscl_reqstart(nd, NFSPROC_DESTROYSESSION, nmp, NULL, 0, NULL, NULL, 0, 0, NULL); NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); - if (tsep == NULL) - tsep = nfsmnt_mdssession(nmp); bcopy(tsep->nfsess_sessionid, tl, NFSX_V4SESSIONID); nd->nd_flag |= ND_USEGSSNAME; error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred, From nobody Wed Oct 18 05:52:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Kkv72ZNz4xYpl; Wed, 18 Oct 2023 05:52: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 4S9Kkv5WtTz3LB5; Wed, 18 Oct 2023 05:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3AdffS5EOQYfli+BqG/3F5uDCrqsXvdNIYXeo2wPqM=; b=M0srP/yHxIWASnI9lfFIIk6XBhfPuKTMo/dlJyd2WwGxPicp+qqxcLSyBqKdh3vvzl+WjL D10Z2TPuW8AdYwJX82zZtj70PwhHJB0qtXtZJdXimZef/pkXpmH0lMOvCY8z9v1ewQCUqr hMKNfyKX592AJRSuGSvFMROPz9El96sToPvAkpJTGs/YpA3Cl9CqqF3wlmVhMFVUu1d31x +RTkvLodgp5+igSwxOH9P5LSiLOIWgEYZ8pIQpms9jGBSGRJF+gujkMX0ks/YDFHw9xW8I GewNclvZdWBpHIHk6EG2WBT7yReJjV1O2Y3QWW1opIXhAJf+HvJTI7mGKTGoWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697608375; a=rsa-sha256; cv=none; b=ZdoWFv6zjppv5NFB0o8gSEB4TaqXnaR/baRrntSzaQW3lLmRkiCTwecoCy1DWvnGkQjvPg wz10c19YcHPykNWzi6K8RfDrwRbP2B99uzvHr8iSGFkzWFj9ijLpQi4TswZb4grXmFA9QQ TGBzR9miD0kE1GNPQy4G4vRC7EIAvVoOy5uvztYiZtxL3oBdThulf/XIyaNgW79UY+I8kl DSeCQqkSZCodR7EwLwqklikUVzI8jdB/7ZBOOmIituXWRJ7DFxeqF/eirPX9sxmdbdVqLD ZMmF5cDsBQIGaf8UaAV8qH6Rm3DMPTX8qxAbrg+dVHGUrhQ3boBxQVA/1yrtxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l3AdffS5EOQYfli+BqG/3F5uDCrqsXvdNIYXeo2wPqM=; b=FHP7v5AXJ2JCDbuqlNBU2fkxQ54ntAUlPpOD3usiVRkJZoMcIop/o4VO5wOiT4X/TYtOnO OenAxjgPx4/MTb5PyZQoDlghqTHH6ru2fAt4//MXN/L+8wt/4dTrLc3fNj4VfkSoyri1O1 ebhkTMX1XTu0EP7dBBRkBroECkR5oyRnllcz7FTLxAUeVfpMR4Ww2p73aeWV9FbPoncGem LJPTTjK2i4nAThTvfr2R/w//jBETs2TyK/+Jp/9ngboc1ekEjHBwJomKhfpTofQbSALPq+ Xy+wswsmz97sFKviXk98m3aMKmQRv+8iJI+3T+DZzAmL7tIeXcknt2/ZlAwzxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Kkv4c1tzvjs; Wed, 18 Oct 2023 05:52: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 39I5qtK2026252; Wed, 18 Oct 2023 05:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I5qtvL026249; Wed, 18 Oct 2023 05:52:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 05:52:55 GMT Message-Id: <202310180552.39I5qtvL026249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: c9ec2fb86cf1 - stable/14 - linux(4): Drop the outdated comments about sixth register on i386 int0x80 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9ec2fb86cf1c88624ff4e1694a19543771bffb4 Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c9ec2fb86cf1c88624ff4e1694a19543771bffb4 commit c9ec2fb86cf1c88624ff4e1694a19543771bffb4 Author: Dmitry Chagin AuthorDate: 2023-10-10 09:33:22 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-18 05:52:33 +0000 linux(4): Drop the outdated comments about sixth register on i386 int0x80 This is well documented in the Linux syscall(2). MFC after: 1 week (cherry picked from commit 5bdd74cc05e6c7d110688feacdbd22b6dffe5d72) --- sys/amd64/linux32/linux32_sysvec.c | 2 +- sys/i386/linux/linux_sysvec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 7104cc50735e..1002648c3df8 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -525,7 +525,7 @@ linux32_fetch_syscall_args(struct thread *td) sa->args[2] = frame->tf_rdx; sa->args[3] = frame->tf_rsi; sa->args[4] = frame->tf_rdi; - sa->args[5] = frame->tf_rbp; /* Unconfirmed */ + sa->args[5] = frame->tf_rbp; sa->code = frame->tf_rax; sa->original_code = sa->code; diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index a3d445951cce..8990b9b806ca 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -518,7 +518,7 @@ linux_fetch_syscall_args(struct thread *td) sa->args[2] = frame->tf_edx; sa->args[3] = frame->tf_esi; sa->args[4] = frame->tf_edi; - sa->args[5] = frame->tf_ebp; /* Unconfirmed */ + sa->args[5] = frame->tf_ebp; if (sa->code >= p->p_sysent->sv_size) /* nosys */ From nobody Wed Oct 18 05:52:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Kkx0LFlz4xYgZ; Wed, 18 Oct 2023 05:52: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 4S9Kkw6fZBz3Lb1; Wed, 18 Oct 2023 05:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvDactx54Yo2FYh0gPjm+ZyrUtJFcj2tzIkSg0lmgGw=; b=DM01zO05YxAbjQhpKujKmCgM+NrSxKXA3NJIUpWmz9ebYYTO49tKVYhOTL99XCllo7j5rE nR7GM2fat72xC6MmZPFD5IYavUQq7+Ec4Ad6ImEOhsUe04EIvih/CqMTMiyAFhU9/IDH59 TKvd/Tb+XNjUqe4ijqwmdPfB90u9ISeSA9pS9BKLKv6TpBKN78IlRjKVQZwy7bMHVrodUD T3boaUIlFjIs2CteMrLIKfDZOGy4+Oj4w0mA1mSV1nahG9PjxsdHIiP1OoCPt5y/+jnjha Ed0uMsaPfe9QUAtoom42aeYenOtzAB3/z01PEJOapGc+p7vBPMn05h35BwdOtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697608377; a=rsa-sha256; cv=none; b=PHLBDrja1Fcg+UpgvDqJ2AcMuWTWqTqopE4I7XcaYtMTYwabWcMIvFPOgCKgWh6VZ2U+n2 NOYWfAkJDCb8yLzyB5+OAOJBmkkg1P0Za1ilmgin3AxF6rfxZpu+MOHSn/xQZvbYUzeDBo V/VrlB+L34NOgu8lK2JrX1WWhLDQspBtc4rb5+OFbEnO2XmK8bdSLxPouvLAM71PMAv7Q6 KIkHffizkmhRYrRm8v2L/IVlO3op1PLG7qPkxNettSigGXKD5L0iYietbS5JN9THIK2mOn lsRJfsGKmLBPegjSc1qAbNAsVolbYGgStxRzg0bLgKqqZdk+DJrH9FWFUzgujQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvDactx54Yo2FYh0gPjm+ZyrUtJFcj2tzIkSg0lmgGw=; b=w+doS23oyaMcxoJ/rgn2UjO086jEwtqMU625ZZ6oQ7G5lhvFsbsnGGB/Wz6xBIonhI55Ya 3rJQLq7OZ9kvm/8hH01OzsDAcBppnSV/Z33X2oyf8wVrOKMX5MTpsg5nzWF/NhKCuqKjZ1 f9HxpMakMKpxy2TdTu0x8E126i1N6RJxlbNnuwgbulCH/GBI15cjcDHCr7zP1AWofISIMy I6yZkwiANG71kRbZF1eYU/zx71ZokBooeygL4zCi6I/ShpV8QdcUcd4NoHyi5CDKJ9d5FS 09Z3wMpqVabbsh9TWinajlsGn2C6rKQBSNIYse3S4W5jESqvv+S3oII79mRo8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Kkw5d9Fzvjt; Wed, 18 Oct 2023 05:52: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 39I5qu2W026310; Wed, 18 Oct 2023 05:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I5quCW026307; Wed, 18 Oct 2023 05:52:56 GMT (envelope-from git) Date: Wed, 18 Oct 2023 05:52:56 GMT Message-Id: <202310180552.39I5quCW026307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 133ada6bff53 - stable/14 - linux(4): Drop the outdated comment, nosys is fine since 39024a89 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 133ada6bff538483f308296ee944aa5ee24954ee Auto-Submitted: auto-generated The branch stable/14 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=133ada6bff538483f308296ee944aa5ee24954ee commit 133ada6bff538483f308296ee944aa5ee24954ee Author: Dmitry Chagin AuthorDate: 2023-10-10 09:20:51 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-18 05:52:33 +0000 linux(4): Drop the outdated comment, nosys is fine since 39024a89 MFC after: 1 week (cherry picked from commit 03f5bd1e462576838e79145379ce314e2e03e4b3) --- sys/arm64/linux/linux_sysvec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 19dd5866ba50..a850d5e34bc0 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -121,7 +121,7 @@ linux_fetch_syscall_args(struct thread *td) sa->code = td->td_frame->tf_x[8]; sa->original_code = sa->code; - /* LINUXTODO: generic syscall? */ + if (sa->code >= p->p_sysent->sv_size) sa->callp = &nosys_sysent; else From nobody Wed Oct 18 05:57:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Kr86YCPz4xYmr; Wed, 18 Oct 2023 05:57: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 4S9Kr85p4Yz3MGy; Wed, 18 Oct 2023 05:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIYzb6lHJOHUOv9RrAL8wCwpr9VZI+mC7NorWXsFeL8=; b=r0XuPVyQMN4ZslgTpIacQZqbbJ8UT1RmLrd9x/YjFjxtYQXXcg7ebbwC71eSCSgaOS9z0q DiYIVAI8S+COKvBE3Hn9be9fsb06e23IQU/sx65g1WRL4hr78YbDdM/a7pW9OoK51hpwFk sVEGcggJ24Uz6kQuBnnWRcGniM6LsV+MsvVBEWfsg2oQvKMIgjjTd7XRV0swiq3m2xPEQk tkiOLbn4adRQVWaMJwSqqxptxe+hIRH/AI/J+iHcxF8HqT7ZLbNRYaob7EfS5OtjQQ2vJ3 GMjIUbLReiCH7X+nhHuEj/wMWBoLwCe3OVzjZ5Vz1Z5Q7dUtxMHQSPAov7Sb1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697608648; a=rsa-sha256; cv=none; b=cSpcqd4Sqx/2GVkoY2rYv0YUwwAuQPEmAq/kt3d4ljkzxQRq2oPe7F1bnEWj9emkjq5C4g 2Fb3bw+yuqIcYpp05uzs8I3yX9P4layL7muDWLhl3zH1voYN3rWi6L4nzimlBBKI1FAL4h 61OqRC/gDiYpn2dU4WAu5M/8sH7ET+jdPQiZymmq92GwfA+1kzkvmNZGjzAPEh3ksXxvE8 4vQwmFYuprUvdCvmx9iXGkpDXn6KQXovN6IOuYM/0Tqx0S+F4MAEOh7pGHGgso747mAe7g srOoXAmlrHpkJ9H6OwSMZkKtb5Irc8j3iZiUv9uE2zmiTr1GmVJYaS09Z8V+xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIYzb6lHJOHUOv9RrAL8wCwpr9VZI+mC7NorWXsFeL8=; b=RsgaRNsVlsJPMuc/aKkU/jdYbZEPEbAjndk6+I8j6+N8zPecDjuBMhWHEqDhmL7Uy6qlf9 A6YiEJec+E/qB0Mwr+6lh8GrJ1QbHmFhWzxR3DFz8Qzxv55m306UbgmO0Jcwp0anoTwBnt 06A+JukmQ/PIyrjSVPGnN7KcX5+EZ4KbplrRiWdP5jhM6VNtplJaou+JSlSJaey4qiAhZ2 8znzLrkuLVwpWwO9KHmC4Y9YFMJnZ/LJVIU1DixDKEcqFx9FjNr5/3eRh7Pf99dJNWGZPw 4mVRi0bTvLCnzrkjWZOQv6Z5/0Mx0vSSNDGY+D3n76GnaGB3/1VGiZvitnHmGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Kr84qwjzvs0; Wed, 18 Oct 2023 05:57: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 39I5vSV3027072; Wed, 18 Oct 2023 05:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I5vSvu027069; Wed, 18 Oct 2023 05:57:28 GMT (envelope-from git) Date: Wed, 18 Oct 2023 05:57:28 GMT Message-Id: <202310180557.39I5vSvu027069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 44e3ce37f2f8 - stable/14 - uma.h: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44e3ce37f2f849ca457e2d14fba132972f0bbe01 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=44e3ce37f2f849ca457e2d14fba132972f0bbe01 commit 44e3ce37f2f849ca457e2d14fba132972f0bbe01 Author: Gordon Bergling AuthorDate: 2023-10-15 12:09:21 +0000 Commit: Gordon Bergling CommitDate: 2023-10-18 05:57:16 +0000 uma.h: Fix a typo in a source code comment - s/setable/settable/ (cherry picked from commit fc9f1d2c6391b1a4b133aab56ace625b72c9ea85) --- sys/vm/uma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 31f8dba33081..76f30efc94d1 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -637,7 +637,7 @@ void uma_zone_set_smr(uma_zone_t zone, smr_t smr); smr_t uma_zone_get_smr(uma_zone_t zone); /* - * These flags are setable in the allocf and visible in the freef. + * These flags are settable in the allocf and visible in the freef. */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kmem */ From nobody Wed Oct 18 05:57:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9KrX6MdVz4xYms; Wed, 18 Oct 2023 05:57: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 4S9KrX5qqCz3MCg; Wed, 18 Oct 2023 05:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkyaOYscwTnEMkydO4UhEOA5gJypId7cXY85UB4vzOM=; b=mYRSNgUn8YdRjrdfRh33S1NuESELPvDele/M3Yt3yy6+WVDJhZJA4iBGQhTbVVOL25hZVb iFlsUR0n130bFbmInd0eLGa6hD4TNxmHbWsRB5/k/YyVDQ2xNzucBdzRYpgYvyfb1w3aEl jpmazTTuduHhU6biAzBPxmeOSQCEYeg5vJyFjXw5T3Ig4BBeKin8IpAyoJ8XFZhgexGa8N Pl9UN3SSFjhdsjleeXm7b17ZcGNrFhnL2+o0HlKsU2HoziHMIPfd14b6W5splKMLDcZKMw GJBwq7KZbLhP0kZ9w+lOeMfqguDk8ZLEd8Vc5R0UBOXNu5rOMiH6Xafvc8Z/GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697608668; a=rsa-sha256; cv=none; b=rjS05veJxz3vvRLIFFw112BWNjRLPD0az05hP2IANJ3r6MzfWx4+2EDCyrMjrJlNMauuBy a7ijhibQZiKs8ux+CF2jQ0uPir42F2lzYNzF4nMZJeDUmdd6YRO6Ul7+j4PKwDyixB0Qz1 aJMq4ldMxtQ9ppuVTQ/7fHOT8BhV0SMXSH7xouvRHcQDVwFV/PmiqdUXig0ZZwCgfWpASg 5g4LCrUv4kDIBl8TmLampx2GRhVnm9p5fYFFPwJobQbEXX3lwo90N2UGAd5RdWEcoArkcV FVYZpDFX2fFx5VIXpSueOm4jR6C35wZxSpWa/DJUesV6SjUrx/MzyssLuvCulA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697608668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkyaOYscwTnEMkydO4UhEOA5gJypId7cXY85UB4vzOM=; b=PhPbFG7P7igPMZ0aLq/yCsMCWA3Bb9e9zj3JzDk2MYUsmf4jUmBjd9/V4eEDBkXL5e+JJx FKTin2IJOECVTsNqcHhxvXb6HVvqLIyghdoUYIyEmEw1pzuc3Opx8ogrpYcSI2sCGCVdTQ hSXHjafjT+cLKFJErlZUydgMk8fVgZrP4I8/JvdC9pLYiS7hJkkx2Xkc2nlc1Uf8HIz4L6 0wvNrUIf+jUTPYB0u1htWI7H6fpBG2FqmVEyED3oH47bCUajHdYIODyx5V+7e66DtQPsBw xKzujSSBGnwPanJaqEck/Qde1mSXXZM6Bm6MvLTTZLnEmdJplUbpaQYern3uWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9KrX4sV5zvJp; Wed, 18 Oct 2023 05:57: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 39I5vmLs027246; Wed, 18 Oct 2023 05:57:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I5vmD9027243; Wed, 18 Oct 2023 05:57:48 GMT (envelope-from git) Date: Wed, 18 Oct 2023 05:57:48 GMT Message-Id: <202310180557.39I5vmD9027243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 6c4855c18eed - stable/13 - uma.h: Fix a typo in a source code comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c4855c18eed77d2482bbe9cc32498bd3ad6fbe2 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4855c18eed77d2482bbe9cc32498bd3ad6fbe2 commit 6c4855c18eed77d2482bbe9cc32498bd3ad6fbe2 Author: Gordon Bergling AuthorDate: 2023-10-15 12:09:21 +0000 Commit: Gordon Bergling CommitDate: 2023-10-18 05:57:39 +0000 uma.h: Fix a typo in a source code comment - s/setable/settable/ (cherry picked from commit fc9f1d2c6391b1a4b133aab56ace625b72c9ea85) --- sys/vm/uma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 794bde878197..954d64c4d63b 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -636,7 +636,7 @@ void uma_zone_set_smr(uma_zone_t zone, smr_t smr); smr_t uma_zone_get_smr(uma_zone_t zone); /* - * These flags are setable in the allocf and visible in the freef. + * These flags are settable in the allocf and visible in the freef. */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KERNEL 0x04 /* Slab alloced from kmem */ From nobody Wed Oct 18 06:55:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9M7N3217z4xct2; Wed, 18 Oct 2023 06:55: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 4S9M7N2PFYz3RxW; Wed, 18 Oct 2023 06:55:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697612144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jmLI9GtA2xmBCS6KppE+hSzhTlzG7B4KyGz6rd7NaA=; b=Wd6oMrgWkG2CbA95r/C+rwa1OZbV999AV03JXicKXaA1682IDNWM5dVO8bHBNYUqHushz7 R07/sreYzT7JtOGAKOkJURt/iQr9DL37hs6TDSqLGZf9OOlCwuoA2eRG2ba3++iZWVGse9 GKia5WDOeluHEsnID/Z1yaVqDzdRSbANBlob3xKpVDEWIB/cII21x5UWYA3/OGkrnfBJvK d4eNAnO10AioJRYUDYqLmY9iE4LZjSsMXkbTsccLSzUaOn90tA8cwz8DX6uU6cNT39O7Ic ghTuenKKYIqz1lE6w1qYRR14pUcP0TX+VkgUugpybl6Qn6dgVdBA5QsBovzWjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697612144; a=rsa-sha256; cv=none; b=risH5PrjsqHZEGiCzt2fQax63PVusM4ogNhAmBnKHg9quyVZnYr+n6TdeIjb0FJ4NBLuMr k0WglTG9hg+ChPZnnksqca8yLmzZfAn5n7QeWuOV24VtAjU1zx00V6V+BjzHT05CoH/VuB MKPKLNkpAAvPyBeANzvJJ4oUgaviFBU8Q/Zuq6oz0lyB66537DsDXkzl2Nu9caVdFNCc08 EEA7MjupG9UFePhBSiT0SNcpstS6jjhbbW4YR44K2R9eFWIGeiLJQ0ad1lrZvwYonxCs1S Obc+SwrmiJTVU4fqKIXInXrizAr+4tIJehPiw5ZY4X70Zq+Hn2TtilZ2dQYByQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697612144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3jmLI9GtA2xmBCS6KppE+hSzhTlzG7B4KyGz6rd7NaA=; b=VMShCiN6SMqB6Jry4dZtG9WibmJlLBFhJh1M7QQkESyQ9yfamFIsC4cuEeE7grL1UqtYRh e0uAWueayhn2BAQk5aNkly6DKDhfqPAP2WfSS6vkYZgzOK9594Lyd8xumNbhRLkp1TqE9I A2ZqXmd1+ln9zaeD8I0DjKo8CNghJrQU/QhPMYIeq3MO3C5FaJdZnNffJWpHjrOO48t7TK x7zq4hoxxdW/PahRDu9BWsZL/e1jfejcsqtUXnRB44+RbEIMspQWvpTFgDnVhqOz1LxNWj naJjzdI11RowHTLx/PomJRRhR/4iGyFZK8B/WT5MLm4ioghpqM6JJ7hSBenbxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9M7N1Pt7zxCM; Wed, 18 Oct 2023 06:55: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 39I6ti30026110; Wed, 18 Oct 2023 06:55:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I6titH026107; Wed, 18 Oct 2023 06:55:44 GMT (envelope-from git) Date: Wed, 18 Oct 2023 06:55:44 GMT Message-Id: <202310180655.39I6titH026107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: ef1dad6d83ff - main - stress2: Fix "-Wunused-but-set-variable" warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef1dad6d83ff662ed211433ac2e5805bae5d04e9 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=ef1dad6d83ff662ed211433ac2e5805bae5d04e9 commit ef1dad6d83ff662ed211433ac2e5805bae5d04e9 Author: Peter Holm AuthorDate: 2023-10-18 06:54:38 +0000 Commit: Peter Holm CommitDate: 2023-10-18 06:54:38 +0000 stress2: Fix "-Wunused-but-set-variable" warnings --- tools/test/stress2/misc/exlock2.sh | 15 +++++---------- tools/test/stress2/misc/fcntl2.sh | 2 ++ tools/test/stress2/misc/fifo2.sh | 8 ++++---- tools/test/stress2/misc/mmap18.sh | 13 ++++--------- tools/test/stress2/misc/mmap32.sh | 5 ++--- tools/test/stress2/misc/poll2.sh | 4 ++-- tools/test/stress2/misc/procfs4.sh | 7 +++---- tools/test/stress2/misc/sendfile25.sh | 4 +--- tools/test/stress2/misc/setsockopt2.sh | 3 +++ 9 files changed, 26 insertions(+), 35 deletions(-) diff --git a/tools/test/stress2/misc/exlock2.sh b/tools/test/stress2/misc/exlock2.sh index 58a49919d86a..e1760cc52a4d 100755 --- a/tools/test/stress2/misc/exlock2.sh +++ b/tools/test/stress2/misc/exlock2.sh @@ -68,6 +68,7 @@ EOF #include static _Atomic(int) *share; +static int debug; /* Set to "1" for debug output */ static int quit; static char file[80]; @@ -101,9 +102,8 @@ test1(void) ; /* wait for test2 to signal "done" */ close(fd); } -#if defined(DEBUG) - fprintf(stderr, "%s: n = %d\n", __func__, n); -#endif + if (debug != 0) + fprintf(stderr, "%s: n = %d\n", __func__, n); _exit(0); } @@ -114,17 +114,15 @@ test2(void) struct flock fl; struct stat st; time_t start; - int e, fd, n; + int e, fd; e = 0; fd = 0; - n = 0; start = time(NULL); while (time(NULL) - start < RUNTIME) { share[SYNC] = 1; if ((fd = open(file, O_RDWR)) == -1) goto out; - n++; memset(&fl, 0, sizeof(fl)); fl.l_start = 0; fl.l_len = 0; @@ -151,12 +149,9 @@ out: share[SYNC] = 0; usleep(100); } -#if defined(DEBUG) - if (e != 0) { + if (debug != 0 && e != 0) system("ps -Uroot | grep -v grep | grep /tmp/exlock2 | "\ "awk '{print $1}' | xargs procstat -f"); - } -#endif share[SYNC] = 0; _exit(e); diff --git a/tools/test/stress2/misc/fcntl2.sh b/tools/test/stress2/misc/fcntl2.sh index 80be1bd05e5a..acb161fd0523 100755 --- a/tools/test/stress2/misc/fcntl2.sh +++ b/tools/test/stress2/misc/fcntl2.sh @@ -150,6 +150,8 @@ test(void) } close(fd); unlink(file); + if (success == 0) + fprintf(stderr, "No calls to fcntl() succeeded.\n"); _exit(0); } diff --git a/tools/test/stress2/misc/fifo2.sh b/tools/test/stress2/misc/fifo2.sh index 9e4a7e632e9d..4a7b986931d9 100755 --- a/tools/test/stress2/misc/fifo2.sh +++ b/tools/test/stress2/misc/fifo2.sh @@ -96,6 +96,7 @@ EOF #include #define N (128 * 1024 / (int)sizeof(u_int32_t)) +static int debug; /* Set to 1 for debug output */ u_int32_t r[N]; static void @@ -143,11 +144,10 @@ calls(void *arg __unused) arg6 = makearg(); arg7 = makearg(); -#if 0 - fprintf(stderr, "%2d : syscall(%3d, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", - i, SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + if (debug != 0) + fprintf(stderr, "%2d : syscall(%3d, %lx, %lx, %lx, %lx, %lx, %lx, %lx)\n", + i, SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); usleep(100000); -#endif alarm(1); syscall(SYS_open, arg1, arg2, arg3, arg4, arg5, arg6, arg7); } diff --git a/tools/test/stress2/misc/mmap18.sh b/tools/test/stress2/misc/mmap18.sh index 065b5bb7df6c..f2b19c07fe60 100755 --- a/tools/test/stress2/misc/mmap18.sh +++ b/tools/test/stress2/misc/mmap18.sh @@ -89,6 +89,7 @@ EOF static u_int32_t r[N]; static void *p; +static int debug; /* set to 1 for debug output */ static unsigned long makearg(void) @@ -176,11 +177,9 @@ tmlock(void *arg __unused) if (munlock(makeptr(), len) == 0) n++; } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmlock() only succeeded %d " "times.\n", n); -#endif return (NULL); } @@ -202,11 +201,9 @@ tmprotect(void *arg __unused) n++; usleep(1000); } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmprotect() only succeeded %d " "times.\n", n); -#endif return (NULL); } @@ -226,11 +223,9 @@ tmlockall(void *arg __unused) munlockall(); usleep(1000); } -#if defined(DEBUG) - if (n < 10) + if (debug != 0 && n < 10) fprintf(stderr, "Note: tmlockall() only succeeded %d " "times.\n", n); -#endif return (NULL); } diff --git a/tools/test/stress2/misc/mmap32.sh b/tools/test/stress2/misc/mmap32.sh index a775b756084e..334327a85989 100755 --- a/tools/test/stress2/misc/mmap32.sh +++ b/tools/test/stress2/misc/mmap32.sh @@ -62,6 +62,7 @@ EOF #include #define N 4096 +static int debug; /* set to 1 for debug output */ static uint32_t r[N]; static unsigned long @@ -133,10 +134,8 @@ fuzz(int arg, void *addr, size_t len, int prot, int flags, int fd, n++; } } -#if defined(DEBUG) - if (n == 0 && arg != 5) + if (debug != 0 &&n == 0 && arg != 5) fprintf(stderr, "%s(%d) failed\n", __func__, arg); -#endif exit(0); } diff --git a/tools/test/stress2/misc/poll2.sh b/tools/test/stress2/misc/poll2.sh index 7c0aff9c78ca..aa5ad5f995dd 100755 --- a/tools/test/stress2/misc/poll2.sh +++ b/tools/test/stress2/misc/poll2.sh @@ -136,11 +136,11 @@ static void * pl(void *data __unused) { struct pollfd pfd; - int i, r; + int r; pfd.fd = fds[0]; pfd.events = POLLIN; - for (i = 0; done == 0; i++) { + while (done == 0) { pfd.fd = fds[0]; pfd.events = POLLIN; pthread_set_name_np(pthread_self(), "pl-idle"); diff --git a/tools/test/stress2/misc/procfs4.sh b/tools/test/stress2/misc/procfs4.sh index ffa812a7f73d..18e5c0a6f803 100755 --- a/tools/test/stress2/misc/procfs4.sh +++ b/tools/test/stress2/misc/procfs4.sh @@ -68,6 +68,7 @@ EOF #define MAXRUN 1200 #define PARALLEL 10 +static int debug; /* Set to 1 for debug output */ char *files[] = { "cmdline", "ctl", @@ -116,10 +117,8 @@ test(void) close(fd); } kill(p, SIGHUP); -#if 0 - if (opens < 1) - fprintf(stderr, "Warn %d open(s) for pid %d\n", opens, getpid()); -#endif + if (debug != 0 && opens == 0) + fprintf(stderr, "No ioctl() calls succeeded.\n"); } for (i = 0; i < 64; i++) diff --git a/tools/test/stress2/misc/sendfile25.sh b/tools/test/stress2/misc/sendfile25.sh index fa2e2b8687cd..ae755bf1d4df 100755 --- a/tools/test/stress2/misc/sendfile25.sh +++ b/tools/test/stress2/misc/sendfile25.sh @@ -105,7 +105,7 @@ reader(void) { int on; socklen_t len; struct sockaddr_in inetaddr, inetpeer; - int n, t, *buf, fd; + int n, *buf, fd; on = 1; if ((tcpsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) @@ -132,7 +132,6 @@ reader(void) { (struct sockaddr *)&inetpeer, &len)) < 0) err(1, "accept(), %s:%d", __FILE__, __LINE__); - t = 0; if ((buf = malloc(bufsize)) == NULL) err(1, "malloc(%d), %s:%d", bufsize, __FILE__, __LINE__); @@ -142,7 +141,6 @@ reader(void) { for (;;) { if ((n = read(msgsock, buf, bufsize)) < 0) err(1, "read(), %s:%d", __FILE__, __LINE__); - t += n; if (n == 0) break; diff --git a/tools/test/stress2/misc/setsockopt2.sh b/tools/test/stress2/misc/setsockopt2.sh index 44ed98320404..13cc3175cce3 100755 --- a/tools/test/stress2/misc/setsockopt2.sh +++ b/tools/test/stress2/misc/setsockopt2.sh @@ -86,6 +86,7 @@ EOF #include #include +static int debug; /* set to 1 for debug output */ static volatile u_int *share; #define PARALLEL 128 @@ -165,6 +166,8 @@ bad: if (waitpid(pid, NULL, 0) != pid) err(1, "waitpid(%d)", pid); } + if (debug != 0 && success == 0) + fprintf(stderr, "No calls to connect() succeded.\n"); _exit(0); } From nobody Wed Oct 18 07:48:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9NJb4gf9z4xgpT; Wed, 18 Oct 2023 07:48: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 4S9NJb3wsTz3WMy; Wed, 18 Oct 2023 07:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697615327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fonGzp0e0UWpfSLJpaYqYscupjTyPzkdsctoIdpRrJw=; b=mZvRO/qwdBqBMW3MpC4ahpo7frX/QL/da2grWEV74GaeQOxxFIP07gB4TukELkC8/nTLQN gJ/swHL5lc2uB90mTMTBGoSoYYGp58zuEJNTaZ+KJydLyHrLquAXzY3ODripdAVne8flu3 FnOFb3I1yatmpnr4x10CTbiBbw2ihpu0mP1+utx9n6S4GJFpEJAjgBpsDd0HpHyal23T08 cyNE2dHvuWnsORUbhyQkHx9vmw6XKe66dkyBkmjixEYpWVwunwg8lhzzbGE7GVqGtxkZic Up+2VxqwQo4CZFItuay3dQQT9cCnsO3lYoIkXWMJhKu43yN45q8GuHyHasCvQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697615327; a=rsa-sha256; cv=none; b=AtSa9WRNEr4SnaTeqiWfTOW+/+NRCr1Dsnx2fWoWRLjg8BwbZYCWxtUjA50OBXhl4RVzb0 WDW1Pz3iEP7StGiYle7/UYrabT05xMpD937i7e2rIf5f5jXRiJNPVpPcZUYqTy4kGaCazk jJOMttBk+qX34mdLcc3/Gz0JSmD/IjzBRIcaiR9AHpS8X612Q2DronjVwJkCsM0XAZ0EMX 90iMTkvYLqFB2W37pp8fVA4kvkvyXo6js9/jihm+g6l62rLhRFuEtT+wrNcL6edp75SNKe 9dimoOytT+3SX7urjvhRisAULsHgGDn6KVyrBesF7Bvla0wqPoGx7q+KlOk1bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697615327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fonGzp0e0UWpfSLJpaYqYscupjTyPzkdsctoIdpRrJw=; b=pPon52ThU1Dwm4WmY0DPxsxaY72AZ64y/CspZVK47ZzqQtg+zebMhko0y7DJSjGf5/Wkq7 R+Qz+rW/mkXwJ/Xsri5vO0e3/kAE5bH6w6wr6mm0cnk/8Bl0mDsvktcM5m560pu76A196x xGKDkiA/G7OTl+Qp40+9K+h0fXtxXLHaOc1A6U1yDimtD7t7MDBEaY2YgqODxMoNUAi+yI rGDwHSpfcrRYBum6tuoPea+p/j1Mi333FjL5zUwd7fBXGxBnpN7663u4cVKhSvfulTwBMU Hu5ARKHBiUxz5bdiKPoLNM2QOs9fE+XW2sNyKC/WUK3Xx6A878wwiggu0a6ArQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9NJb2zDMzyWW; Wed, 18 Oct 2023 07:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39I7mli7009927; Wed, 18 Oct 2023 07:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39I7mliI009924; Wed, 18 Oct 2023 07:48:47 GMT (envelope-from git) Date: Wed, 18 Oct 2023 07:48:47 GMT Message-Id: <202310180748.39I7mliI009924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: b9cf989234d3 - main - bsdinstall: Fail nicely in jail target List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9cf989234d37a0885ee6228bcb6fa8f20f72b2f Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/src/commit/?id=b9cf989234d37a0885ee6228bcb6fa8f20f72b2f commit b9cf989234d37a0885ee6228bcb6fa8f20f72b2f Author: Fernando Apesteguía AuthorDate: 2023-10-17 13:37:04 +0000 Commit: Fernando Apesteguía CommitDate: 2023-10-18 07:46:05 +0000 bsdinstall: Fail nicely in jail target If the directory is empty we fail with a message regarding mkdir in which the empty directory can't be seen because it is not quoted. Show a nice message so the user knows what is going on. Reviewed by: bapt@ Differential Revision: https://reviews.freebsd.org/D42252 --- usr.sbin/bsdinstall/scripts/jail | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail index feb9d8b1c097..de6dee04b891 100755 --- a/usr.sbin/bsdinstall/scripts/jail +++ b/usr.sbin/bsdinstall/scripts/jail @@ -36,7 +36,6 @@ BSDCFG_SHARE="/usr/share/bsdconfig" : ${BSDDIALOG_OK=0} f_dprintf "Began Installation at %s" "$( date )" -export BSDINSTALL_CHROOT=$1 error() { local msg @@ -54,6 +53,11 @@ error() { fi } +if [ -z "$1" ]; then + error "Directory can not be empty\n\nUsage:\nbsdinstall jail directory" +fi +export BSDINSTALL_CHROOT=$1 + rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC mkdir -p $1 || error "mkdir failed for $1" From nobody Wed Oct 18 11:57:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Tqj2yl2z4xvq5; Wed, 18 Oct 2023 11:57: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 4S9Tqj2Llsz4V1L; Wed, 18 Oct 2023 11:57:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697630257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0ZKYu77f3B4CQjf5SX/hugi3hsMGU0StSThHl7T5JA=; b=CNhuQ1jk3qLIKWBrKeKzgDpkaCiycEkts+2dd6kyhMFVJjkCyT6lgu5MAxljCBrRPx98am c+iyyIKca4JUQe2ALWBh5KlsP3bDCrP+enEhO50YYU0uE9ndlQuBXblDotSNMP7DuYZqba xIDMleqboBsSEdz7njnxCrouTRLMaPRZjOeRwQADHqMygXVVYIzBjSeyfw9iQtGAJk0vBz fEeOz1GQc4GHRCeD20PCnOIPh3zkMX1PTzVGjk0Qmiz5QQJe1mLQxDamn+AISZLehBRUkP BKhbHEq22wirQBUqEn8QAIa7e1iGLGT56RWJWcckWC9w95is/QG1XrtNsLP+MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697630257; a=rsa-sha256; cv=none; b=eSD75mTAeC7oBQtBcDCA7KV2fcTXGUM1wpsQWLhGSZBgyjlTL8J+rflR/dZNZHq5lnn4+w UaRCi8Mic0hIK8cL4pkWHKNxatWlD/uqV2RX9d8SrDTzNh9vzsVPNbbLsCLPVvSzX3hWGi dLTgTVh3tjS+RhWiDijjBMzLaM5A4LN1uyw7WDUHUO6PL+K/Cu5WaGAnfiJbQxvzV7Gc+P VpncgxKJlONhkghy+6R3+RANKuzfgGy2VfUJlcrlfQzashVQJg1WUsS8qf8pQTU2CdlqSc d0iAxpdfMxrSMdedwiXo/R8gRIdmz/XAQBqhn+j2HLoyhkPC6D1WkC2by+mLew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697630257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0ZKYu77f3B4CQjf5SX/hugi3hsMGU0StSThHl7T5JA=; b=mr0gDrHndhI9gSjbh6GfUzbhRD3kENphWqNyazdaAM5DYr7KZh3ia+afXN/Cfz+EB3q0/o DquXxiRD9cUzdanAAuUpVxGW2lRcqm0d7BRNjhDeO0C/uOWY5ES2okegDtDeapkomztOUJ RACZstjz+RwsJSEbUeBvWKQSDsvLyf5tzzJvF0WyuxCCe2nkmQk7NFCtVflOxbTyfBgxC8 5js6+KOlg63LsOCZTpT32N3TSH1mWZxuekd5wTPsFAgDRKJvjuQEMz5+qvgGa7d1M31pr0 ll4O2uykNDqvoC03D0jVnXzh4tWPc3ThTM4ryi8m9QhWX9RDmAU7IOASsPUQOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Tqj1QZyz15TN; Wed, 18 Oct 2023 11:57: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 39IBvbSd024060; Wed, 18 Oct 2023 11:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IBvbCK024057; Wed, 18 Oct 2023 11:57:37 GMT (envelope-from git) Date: Wed, 18 Oct 2023 11:57:37 GMT Message-Id: <202310181157.39IBvbCK024057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ce3ab9dfee30 - stable/14 - ifconfig: add static bridge addresses for vlan 0, not 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce3ab9dfee304d335b4307c35e77407771d6cc3f Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ce3ab9dfee304d335b4307c35e77407771d6cc3f commit ce3ab9dfee304d335b4307c35e77407771d6cc3f Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-18 06:43:40 +0000 ifconfig: add static bridge addresses for vlan 0, not 1 Since fd7edfcdc3 ("bridge: fix lookup for untagged packets in bridge_transmit()") and b0e38a1373 ("bridge: distinguish no vlan and vlan 1") we do a better job of distinguishing between untagged and VLAN 1 traffic. However, ifconfig still defaulted to adding addresses for VLAN 1, rather than for untagged traffic. Change this to be the most common (i.e. untagged) option. Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 (cherry picked from commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2) --- sbin/ifconfig/ifbridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 3a97a5af3931..57ab0c6ae81c 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -407,7 +407,7 @@ setbridge_static(if_ctx *ctx, const char *val, const char *mac) memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 1; /* XXX allow user to specify */ + req.ifba_vlan = 0; /* XXX allow user to specify */ if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) err(1, "BRDGSADDR %s", val); From nobody Wed Oct 18 12:30:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9VYr5cfKz4wxyB; Wed, 18 Oct 2023 12:30:40 +0000 (UTC) (envelope-from asiciliano@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 4S9VYr57Xsz4b08; Wed, 18 Oct 2023 12:30:40 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697632240; 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=t7LUO13cI7H7bPbnkXhsWsVeYwPrjJ1PCNXk0Ix/MJg=; b=UsVcRJGMMQ01agORuA3R5VgsH6o//VU4RJrgLt/PxZiAJ4V8DvmlSVxFD7XHW1SavRqsdj gfExpxo8ZA2GJSbEgHWhmlcABEiOTZ68oXUy/pEwsjMHspfk3fOgZBkgLB4YojtE8mqj1/ zD0gDnpToK42YPVwnXn9hae9S5+sLBwc0lX/U0AnJJLaAZlKKkxK3q07MOXu9J7T0UCgAY 7kj/MoDPLomlL0MjjdMfq3jhLGTzp8aBBMoszRWM6qLYJRbhjDL1pC8tuUR2Y2wkepKfxP /R+9P813ycCWte6oZOxwpedKs83B12ftakFBt0pLysy0SzfTtQ4UuZSrkwpuww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697632240; a=rsa-sha256; cv=none; b=uQ+LEHFF2lLI19/X47g958VuQkD52aEczLAh8hr/OgmuwxfndiBp3ihAW5GajfAswLYqZg 31R6gwG6VdPN57tQgg+6zChUawSNT+jBYpcsab7nf0T/XYUYF4CsCbkVZf83QYrfSv+CHr JyrwPZ6EQbs0zsaPXjXOp8GtzqMPyX6BliOnXM82dXzMK5YOa1lubgOCsD7jtQjvtiUAz6 fP/Y0T9AwVDiKn8OMkj1UkFCnQ1YXTbO95NDOUtK8jf0YKO+DgiWzJZWuWXCuwVYMj3yPh b4XAtqw2OnAVXmXLPzp8u4Cd8vmkuS4V4XIHpx9ZoaLgnEoWj09kHZXY5H4eag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697632240; 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=t7LUO13cI7H7bPbnkXhsWsVeYwPrjJ1PCNXk0Ix/MJg=; b=c1f12xwIoA92lvJkELqemaS53VMQcQxxK9hlda/DRRMFuretsqimLzrcQVshA/l41jh2g8 eWYyu1BKyRLCwBknuNe4NDbFgbDbE3wiWoqgxewy2S6Cx1LOrdtyDnfCGDSQQk39csqVxP +t8cEjubqUiYM+1G/NSaTNo1XoDfm0jx+Mp6mtQOOCSf+X7wCvbBuJUKNMPK9z4ogyp93C 0UIQkLLLLH9wzmnqTTtgvNOSJohkweKLDAm2n5NISndGjZvXnsmxQBGf8KF49XVN0q5Gvq oWtHIjl7oXsaJNcfABIdAyX132nxZlLzM2KTSzHKT9t7VLD8qgtdXmy1S3iLmg== Received: from [192.168.1.9] (mob-5-91-126-91.net.vodafone.it [5.91.126.91]) (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: asiciliano) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S9VYq72hGz6Zx; Wed, 18 Oct 2023 12:30:39 +0000 (UTC) (envelope-from asiciliano@FreeBSD.org) Message-ID: <0fe92251-c75a-4074-9640-9af8ce0bf8b1@FreeBSD.org> Date: Wed, 18 Oct 2023 14:30:41 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8cfbeb56aa16 - main - bsdinstall services: Improve mouse configuration To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202205211442.24LEgsv9085401@gitrepo.freebsd.org> <99742C19-34A6-461F-BEA7-6B9206DF42C9@freebsd.org> Content-Language: en-US From: "Alfonso S. Siciliano" In-Reply-To: <99742C19-34A6-461F-BEA7-6B9206DF42C9@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 06/10/2022 22:38, Jessica Clarke wrote: > On 21 May 2022, at 15:42, Alfonso S. Siciliano wrote: >> >> The branch main has been updated by asiciliano: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=8cfbeb56aa160de1ea4f492abeb3aa029e84269f >> >> commit 8cfbeb56aa160de1ea4f492abeb3aa029e84269f >> Author: Alfonso S. Siciliano >> AuthorDate: 2022-05-21 14:37:53 +0000 >> Commit: Alfonso S. Siciliano >> CommitDate: 2022-05-21 14:42:23 +0000 >> >> bsdinstall services: Improve mouse configuration >> >> bsdinstall(8) has an option to enable moused support. >> However, if it is not selected, moused is still started >> through the configuration of nondefault devices. >> So, automatically add the moused_nondefault_enable="NO" >> setting to rc.conf unless moused support is selected. >> >> PR: 227999 >> Reported by: bcran >> Reviewed by: bapt >> Differential Revision: https://reviews.freebsd.org/D35193 > > I question the wisdom of this change. The text specifically says “PS/2 > mouse pointer”, because moused_enable controls only the default mouse, > which rc.conf sets to /dev/psm0. Turning this option on or off would > therefore affect specifically the PS/2 mouse, precisely as described in > the dialog menu entry. USB mice would always remain enabled. > > However, now, leaving the explicitly-PS/2 mouse option disabled *also* > disables non-default, i.e. USB, mice. Moreover, if you go and enable > the option so USB mice work, PS/2 mice are always enabled, but you may > not have a /dev/psm0. You may even be on an architecture where PS/2 > does not exist; atkbdc, and thus psm, only exists for x86. This means > that, in those cases, enabling the option gives an error during boot > because /dev/psm0 doesn’t exist. > > I can understand that some people want to turn off console mouse > support completely; however, with the current way moused works, that > cannot just be a single option that governs both moused_enable and > moused_nondefault_enable. > > Jess > I'll revert this commit. The comment could be added to the PR to track the discussion only in one place. Alfonso >> --- >> usr.sbin/bsdinstall/scripts/services | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services >> index f9141a523a31..1ac69fa63b2d 100755 >> --- a/usr.sbin/bsdinstall/scripts/services >> +++ b/usr.sbin/bsdinstall/scripts/services >> @@ -61,11 +61,17 @@ if [ $retval -ne $BSDDIALOG_OK ]; then >> fi >> >> havedump= >> +havemouse= >> for daemon in $DAEMONS; do >> [ "$daemon" = "dumpdev" ] && havedump=1 continue >> + [ "$daemon" = "moused" ] && havemouse=1 >> echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services >> done >> >> +if [ ! "$havemouse" ]; then >> + echo moused_nondefault_enable=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services >> +fi >> + >> echo '# Set dumpdev to "AUTO" to enable crash dumps, "NO"' \ >> 'to disable' >> $BSDINSTALL_TMPETC/rc.conf.services >> if [ "$havedump" ]; then > From nobody Wed Oct 18 13:45:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9XCj0MQHz4x3NX; Wed, 18 Oct 2023 13:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9XCh6GhCz3CXc; Wed, 18 Oct 2023 13:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697636704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=UVh1Q48gpG+gg8NCV5MVpo9pZ3S122k8q6SeJUxg7jpNifuWkZgGKxDXkoXzDft+oYukbR d8VrWcnMfKDXDLbK7zdFPLEASQyP2T7JrAb46QNj/vWyG061N55GomFRprC+J4Oy+801lS SXv8Uh86RJYiIIKqZYQmw06I6uEKvyRBaWx7V4MryKJfvSuiSabslBwlLgQXolOn/GAcwj CNKuywNwVhWvpkFtX4oXZ4V3Z4aKxbCLDbH5Y1gwRQGAO4be8El4zqN3jgPzU8k6kpM8NS vqx7kHs8KMd62gkCa2CzjVQgx/hTnpcWSX6SBM+t9+ZfQPRCrx5dOJTb63ni5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697636704; a=rsa-sha256; cv=none; b=rCK8vF41aiGYLE2zxhupGsZAKSa3YI2YZblYVzQLzq56tmG/40B5GZOCB4fZwsRDASAKHY wB8ju4v4grsVLrKdyyG4MicW4GEj9jy2jnK42BoTMeMercIMO8yHu7RXWOCG07fxTwnkXP UmIfA6G2hYY/ZqjdukRi+7Ut47iG/6+VMnXTLdeCOs45yVc0hY0VMF8xmxVzrVqCvQHS4Q /0Wh5HA9vWP+ocwft7AZX6CvYRMl7WBGpC/+/YOzH180nW70CyiLc6HB1OxpQV2c2Et7xP 1tq3I1OzwWWJnbRyrB7JGNP+0wY7032oZBETMH5ibKfIZOBA6a3oxTeeqV/ZHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697636704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yDYgZV+TEkm5/EFDuHYWPFkNwlD+BxLgxTvPixbAloM=; b=grNU+D4CRMI4SUiSe/SWYpoU8WoAtbCLc4DrPrE9JahJTP39zCBru8tc1Fzg0Xt7WNXvH2 oP5K56H57u2mZdw6bBJkA8rXePKRnBFEr8qwXzbSDg5qr/3qJSWZVZLvaadI5J+wwxZFwL 8wyrwAGXNROz8WQGcG5z4g2PwfrS65FJWW1mKSu1PjP+FQ2hNe5efjqsqokD+mJdXfzYc/ XkfSozInE9kkxPBz6krFogD1gfW/oF2I03BVCg/93j1VscY7z4qflKKB3ArtlmIN0br2Qy FqX7MtQBNDDzkkUUIuL6SfZImwG+g+M9/96Kl+1rJELIzD49RBL44a8qOPQDig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9XCh5Fp4z17Yx; Wed, 18 Oct 2023 13:45: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 39IDj4LF006693; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IDj4ej006690; Wed, 18 Oct 2023 13:45:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 13:45:04 GMT Message-Id: <202310181345.39IDj4ej006690@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: f88bd1174aab - main - linuxkpi: Fix an assertion in linux_free_kmem() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f88bd1174aab1aff7fea7241ab6e103e769d2d7a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f88bd1174aab1aff7fea7241ab6e103e769d2d7a commit f88bd1174aab1aff7fea7241ab6e103e769d2d7a Author: Mark Johnston AuthorDate: 2023-10-18 13:43:02 +0000 Commit: Mark Johnston CommitDate: 2023-10-18 13:43:02 +0000 linuxkpi: Fix an assertion in linux_free_kmem() In the LinuxKPI, PAGE_MASK is the logical negation of FreeBSD's PAGE_MASK, so the original assertion was simply incorrect. Reported by: trasz Tested by: trasz Fixes: 6223d0b67af9 ("linuxkpi: Handle direct-mapped addresses in linux_free_kmem()") --- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 21e338acb089..ead2f24cf5df 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -193,7 +193,7 @@ linux_alloc_kmem(gfp_t flags, unsigned int order) void linux_free_kmem(vm_offset_t addr, unsigned int order) { - KASSERT((addr & PAGE_MASK) == 0, + KASSERT((addr & ~PAGE_MASK) == 0, ("%s: addr %p is not page aligned", __func__, (void *)addr)); if (addr >= VM_MIN_KERNEL_ADDRESS && addr < VM_MAX_KERNEL_ADDRESS) { From nobody Wed Oct 18 14:08:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl14Q5Mz4x4Bj; Wed, 18 Oct 2023 14:08: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 4S9Xl13wMwz3FsH; Wed, 18 Oct 2023 14:08:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNYMdCewWIohE85TJHG1/xNupwKAMPb3giu0UuN518=; b=brXFzpmli70kUnXiv+CY1TTRKPBDyU1NRF8BPFx4Cjky964Kq3EowT6ipYQFZhrOS80gUH qJKHjBNzSbXsy2KVbG7CjOywEiBaFVARY8HN3aWNTLcPz7+pbvt9ml6icpppp99Q1kyGrN EsQxzKylJOT1Gd+WBL2C57omGXY6cYU9uMi9r4WkQUg2EtzPLHOXjQbstpv0c5zpRIToRI 6eEOt0g7pLSSag581kyfwHr5cqqDbk6UUehIxkLQi5hJxIH//buCTaZGnF2xZW9hnu1vIr jfwsFPGJEfkA1LpT2fKTMvpHxTNK2gxfnH/FXbG/7P0f5PIzM14NuXNk5oYwpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638125; a=rsa-sha256; cv=none; b=rIgsNTSoGWWqleNu1eG4uFRM/9GcxcEQ9FtS7WYbICG/JhmrWdZNl0UVTAm47yOYMugUaH VeNww/7kCgjxATe4Otos6rPhG718HkzmrU8nlfF/TlVNxpDjh7A9C4B43TKob12W8pCHgf EeWf5Bbv6ROHLYTxINKlx6V0KXFrz4tVKnavtAmdSjjxloeY1mrsJxLuw0eXZvuPlSP5SL rN92B3X73Rliafoc8ztseZGb/L0wZ4Xmsp+gG0sVJdsb4OvKr/d9suVgos1P4u1wlnWLEl ubZixulZsOSrfo6et3NucpYhYqTOZNWt9Z1a2vq6moBhqN7PWregaEI4HPMGnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTNYMdCewWIohE85TJHG1/xNupwKAMPb3giu0UuN518=; b=HmIwxatIK4sCw4a+SSnEtgo4Tbk7h2dBUDLCKyywVHCKS6EgymU83V4FsV6R2yPbNDdNJo tt1GUUWQUBO4Uc+gDpFbBCrWk98Q/kU8TodGT4XHlWgP5kPAhdNVWFCRSWU4ctQlsBfrbP i8HtqnSjZiBxml4H/ieliYJwnE4yWlJ3R84jFyJFjy0rTKbl4NYRRSpluFFm0NXBfUF3c4 SxgsXTDyRfKolXbxIdp1lU9oOLWXZyXsE7xIOAu5LxsDbTH4Ho2+tRlpsrnGqMnW6bMBr/ 5c20SydiW5LkMSv5LbO/RiG7EJefs8tlglGJKDeuOFMr7jzlydDAiaEYeGmh1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl12yyDz18Ww; Wed, 18 Oct 2023 14:08: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 39IE8j6w040717; Wed, 18 Oct 2023 14:08:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8jAm040714; Wed, 18 Oct 2023 14:08:45 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:45 GMT Message-Id: <202310181408.39IE8jAm040714@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: 64fc8a936c86 - main - hesiod: Modernize. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64fc8a936c868345a8f687fe2797474c5fcf35cb Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=64fc8a936c868345a8f687fe2797474c5fcf35cb commit 64fc8a936c868345a8f687fe2797474c5fcf35cb Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:37 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:05:55 +0000 hesiod: Modernize. Reviewed by: zlei Differential Revision: https://reviews.freebsd.org/D42190 --- lib/libc/net/hesiod.c | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c index 634f109e616b..421c3a4586d1 100644 --- a/lib/libc/net/hesiod.c +++ b/lib/libc/net/hesiod.c @@ -81,8 +81,7 @@ static void translate_errors(void); * initialize a hesiod_p. */ int -hesiod_init(context) - void **context; +hesiod_init(void **context) { struct hesiod_p *ctx; const char *p, *configname; @@ -130,8 +129,7 @@ hesiod_init(context) * Deallocates the hesiod_p. */ void -hesiod_end(context) - void *context; +hesiod_end(void *context) { struct hesiod_p *ctx = (struct hesiod_p *) context; @@ -221,10 +219,7 @@ hesiod_to_bind(void *context, const char *name, const char *type) * by the resolver. */ char ** -hesiod_resolve(context, name, type) - void *context; - const char *name; - const char *type; +hesiod_resolve(void *context, const char *name, const char *type) { struct hesiod_p *ctx = (struct hesiod_p *) context; char *bindname, **retvec; @@ -243,9 +238,7 @@ hesiod_resolve(context, name, type) /*ARGSUSED*/ void -hesiod_free_list(context, list) - void *context; - char **list; +hesiod_free_list(void *context, char **list) { char **p; @@ -263,9 +256,7 @@ hesiod_free_list(context, list) * or ctx->rhs which need to be freed by the caller. */ static int -read_config_file(ctx, filename) - struct hesiod_p *ctx; - const char *filename; +read_config_file(struct hesiod_p *ctx, const char *filename) { char *key, *data, *p, **which; char buf[MAXDNAME + 7]; @@ -357,9 +348,7 @@ read_config_file(ctx, filename) * return a list of them. */ static char ** -get_txt_records(qclass, name) - int qclass; - const char *name; +get_txt_records(int qclass, const char *name) { HEADER *hp; unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor; @@ -483,16 +472,14 @@ static void *context; static int errval = HES_ER_UNINIT; int -hes_init() +hes_init(void) { init_context(); return errval; } char * -hes_to_bind(name, type) - const char *name; - const char *type; +hes_to_bind(const char *name, const char *type) { static char *bindname; if (init_context() < 0) @@ -506,9 +493,7 @@ hes_to_bind(name, type) } char ** -hes_resolve(name, type) - const char *name; - const char *type; +hes_resolve(const char *name, const char *type) { static char **list; @@ -529,20 +514,19 @@ hes_resolve(name, type) } int -hes_error() +hes_error(void) { return errval; } void -hes_free(hp) - char **hp; +hes_free(char **hp) { hesiod_free_list(context, hp); } static int -init_context() +init_context(void) { if (!inited) { inited = 1; @@ -556,7 +540,7 @@ init_context() } static void -translate_errors() +translate_errors(void) { switch (errno) { case ENOENT: From nobody Wed Oct 18 14:08:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl26tgFz4x4FZ; Wed, 18 Oct 2023 14:08: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 4S9Xl24shKz3FVs; Wed, 18 Oct 2023 14:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00xf0MvuGfOz4WROuuY8nGOFvhtugMpdxH5sEo3GL58=; b=nLP4CZJP+We3QjbhHOXZI4Fd8FHFDoRvuIXNFw9PIB0V+OFTEbhT+snwW6dJEEo4uoXW3d WDoFVYltT5HuqXEwpAI25j2d9GzFWeSXqqTfsuz0fNuePmB9fyn6uL+a+xcjO9cbFb9psy Mgty4QV4ufc305Dhed78Z1z8auWgPgj1+UmvjRftiPNEw6844KrZfMAp44p/9dPtwAkn8X c7V7JAu8VuqAXVTJUmTWO0f5jGQMtiLPB9WoSTRI7Qb92t3VMhbh7ZL++7P583zcT60rDw 4c4u6NHfRJZII0X+XM39CGuu8OBETWjteLh+AjvjdaVUp420Mi2D2AIkIVoZuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638126; a=rsa-sha256; cv=none; b=xDcsuHJj9M1TeH1tnqEXLv/sVIhL4xwx9oYfz7fBGZ9j3fmXCugGETYq+l/KJgXFlV0uHb /e4sBrycvL82+3WBhUvDAGR2+dM5U6cFKGmhv/ebNcHyVA8vwqB0r1UBabg9kT+iHNqWsO 84nYdhtl0pHU8g9I/KXSDyaT1DTaHvWTGLlPOom1N5ld1n7pU5ef3fgjrm+WB/GdrJquhu rI2SkHHmDe1jD6f9mTFoLhwODMndBBw1Z9YdptCDZfQDmgeAqwTaiPxRZiNUuoTzjdeC9U qESdQ9XiV4b0k7BtQksIo/vmWhbuQcXYRS5eKUY57cmZRPjeejB7NmLTxU/e4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00xf0MvuGfOz4WROuuY8nGOFvhtugMpdxH5sEo3GL58=; b=tJ8VUAcBVjBML74eUMsS/0hX+HgHU4NytkFONZkLTGULMV3n7ZNdDBj1FMZk86ECinlBoX rjrWszJNNRoSSKsV/35d7X7v9tw0T1zilc/6/iCKXlF4bW/aQWEhFygb/gkr875M8rsY5j 0rjDJ4bHgXKIoCrvMztpEbn/8ahTmB3zMVjbit3H0HjRCZOmopoE6h+jD1ISxSJ22EtGTF yPQitRdTyDWE8JU+Ilkb0YpLRfkUndY/ND5gpFGqmoeDj1a07D5mMc6tNWVNcR/w3u9zOv Hq9qKxFyZq6Qgy+vBATp5Lb6QkvL2SYpYlIa22/pND5/dcxwByQwUV2vsBkgQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl23fhjz1873; Wed, 18 Oct 2023 14:08:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IE8k0q040767; Wed, 18 Oct 2023 14:08:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8kjN040764; Wed, 18 Oct 2023 14:08:46 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:46 GMT Message-Id: <202310181408.39IE8kjN040764@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: a66d27e22fa0 - main - memory(3): Mention more functions. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a66d27e22fa0a6ae42a559d2f58deef88425d795 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a66d27e22fa0a6ae42a559d2f58deef88425d795 commit a66d27e22fa0a6ae42a559d2f58deef88425d795 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:07:46 +0000 memory(3): Mention more functions. Differential Revision: https://reviews.freebsd.org/D42191 --- lib/libc/stdlib/memory.3 | 57 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/lib/libc/stdlib/memory.3 b/lib/libc/stdlib/memory.3 index 143dce488f7e..a8bdd3a3ddf3 100644 --- a/lib/libc/stdlib/memory.3 +++ b/lib/libc/stdlib/memory.3 @@ -27,50 +27,79 @@ .\" .\" @(#)memory.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 4, 1993 +.Dd October 18, 2023 .Dt MEMORY 3 .Os .Sh NAME -.Nm malloc , +.Nm aligned_alloc , +.Nm alloca , +.Nm calloc , .Nm free , +.Nm malloc , +.Nm posix_memalign , .Nm realloc , -.Nm calloc , -.Nm alloca , -.Nm mmap -.Nd general memory allocation operations +.Nm reallocf , +.Nm valloc , +.Nm mmap , +.Nm munmap +.Nd memory management functions .Sh LIBRARY .Lb libc .Sh SYNOPSIS .In stdlib.h .Ft void * -.Fn malloc "size_t size" +.Fn aligned_alloc "size_t alignment" "size_t size" +.Ft void * +.Fn alloca "size_t size" +.Ft void * +.Fn calloc "size_t nelem" "size_t elsize" .Ft void .Fn free "void *ptr" .Ft void * +.Fn malloc "size_t size" +.Ft int +.Fn posix_memalign "void **ptr" "size_t alignment" "size_t size" +.Ft void * .Fn realloc "void *ptr" "size_t size" .Ft void * -.Fn calloc "size_t nelem" "size_t elsize" +.Fn reallocf "void *ptr" "size_t size" .Ft void * -.Fn alloca "size_t size" +.Fn valloc "size_t size" .In sys/types.h .In sys/mman.h .Ft void * .Fn mmap "void * addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" +.Ft int +.Fn munmap "void *addr" "size_t len" .Sh DESCRIPTION These functions allocate and free memory for the calling process. They are described in the individual manual pages. .Sh SEE ALSO .Xr mmap 2 , +.Xr aligned_alloc 3 , .Xr alloca 3 , .Xr calloc 3 , .Xr free 3 , .Xr malloc 3 , -.Xr realloc 3 +.Xr posix_memalign 3 , +.Xr realloc 3 , +.Xr reallocf 3 , +.Xr valloc 3 , .Sh STANDARDS -These functions, with the exception of -.Fn alloca +The +.Fn calloc , +.Fn free , +.Fn malloc , and -.Fn mmap -conform to +.Fn realloc +functions conform to .St -isoC . +.Pp +The +.Fn mmap , +.Fn munmap , +and +.Fn posix_memalign +functions conform to +.St -p1003.1-2001 . From nobody Wed Oct 18 14:08:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9Xl364Ppz4x4c3; Wed, 18 Oct 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9Xl35hp8z3FSB; Wed, 18 Oct 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YomwuCAjoh1KN3hwibjfJuQdN8ag/sVCYtK4uPDQF+Q=; b=DBB21QZ3CxELKW6fOchqHeyB6cAq9rWH3PSUzob9AH6vYac0aUGQNoYzscQ/NRleoMqsD6 xUqnBt7FF9XppWlS1vWebWwFr2JKS3EzM79rgnsS+XN4pqL1C1JKfYQznsoiGAyXvEL/N/ C/qk+YidydiL7IlxBB2qU3lB7a8YbUM4xr0RxUS2ZTEjr4/NFUw0TqMv86r3DWeJLu41Zd gyv+to8VAcGESmTEq2ApTrRggxJyP2rN6l2WQRG386ZrhnuH4g65rLnMWE0F22Lbi25acj F2F+6LNix5srAe+cTGsEI/egt6EkR4FhzfjL/qD7U0bGuVoDZR0rsp1bLwV6hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638127; a=rsa-sha256; cv=none; b=RZ1/JxJuucxHEqKvBoJn4d2GvXpKfiUkDvfsw91UWgPysy6tzEo4KH+G7Io6MxkPozfQ+O I62kmBbzmOFtjPvgyR2nfH/rrgKLTwbXzHt0T8WYUUIZio3NQBlPf6zdcubKgnZcPSo9Pu rScuHNj5cO/9HOgeOco72MDn143lE1Mx9hh5Cca6lJD0smIDuQWzbha9AXAlNEm8eu1g+P KzTMCr8MNhDfC8FcA51norkhr6oeTD9+d8G0dGekVlTr4BhwNbFtPDbgkSQ7jsshqP1Io/ QKVD7RVnpejvtER1fxd4ycYOYY4/uDftThzGtW1TuwFUE1K/VJyL2mbDuUibCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YomwuCAjoh1KN3hwibjfJuQdN8ag/sVCYtK4uPDQF+Q=; b=k8xg0jCCmuh5hnuwlw0MrbQ1uTZAb0Xdjdl6jEyagrmQb+MBd2hjUIRYre9o36GDrG7Odq 4ozVHLM3dOYwiCcpDgBc88aCeP/NJhT2Ez8qXurQ/7w05Rvo5QgFd5IYWtpv6i2cnIc/Oh Lre4KD+2hYOmpqJlvkmfhlZQfRsmhOi0no2AhMfgoqyZIgaGuaYTLaNUZsUkKjVauZoP8R o0r8cdZLTZvElt8YnBuA95RI3+/ox6kRVFxavrYKhfvSAbAjXZzhSCYlldN7kvtjBwhFaA XFHQ9VTk6f9DRqfeXC7j0oUC5DkxQAjmjaZA5l/nH4jusJYDMwpDfQk316rZdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9Xl34nL2z17gd; Wed, 18 Oct 2023 14:08:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IE8l0R040816; Wed, 18 Oct 2023 14:08:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IE8lsg040813; Wed, 18 Oct 2023 14:08:47 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:08:47 GMT Message-Id: <202310181408.39IE8lsg040813@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: dc41de36abc0 - main - libc: Fix missing or misspelled MLINKS. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc41de36abc01cd19d43347e14f077b26d183665 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=dc41de36abc01cd19d43347e14f077b26d183665 commit dc41de36abc01cd19d43347e14f077b26d183665 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:05:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:07:46 +0000 libc: Fix missing or misspelled MLINKS. Differential Revision: https://reviews.freebsd.org/D42192 --- ObsoleteFiles.inc | 3 + lib/libc/db/man/Makefile.inc | 2 +- lib/libc/net/Makefile.inc | 123 +++++++++++++++++++++++++----------- lib/libc/posix1e/Makefile.inc | 12 ++-- lib/libc/rpc/Makefile.inc | 2 + lib/libc/stdio/Makefile.inc | 118 ++++++++++++++++++++++++---------- lib/libc/stdlib/Makefile.inc | 50 +++++++++++---- lib/libc/sys/Makefile.inc | 1 + lib/libc/sys/sctp_generic_sendmsg.2 | 2 +- lib/libc/uuid/uuid.3 | 10 ++- lib/libc/xdr/Makefile.inc | 17 +++-- 11 files changed, 243 insertions(+), 97 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9e4be6b69312..f54e13ea3d2d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231018: Remove misspelled man page link +OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz + # 20231006: rename tcp6_v4unmapped_bind_test OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc index 15021f0ca900..bbe89473e66d 100644 --- a/lib/libc/db/man/Makefile.inc +++ b/lib/libc/db/man/Makefile.inc @@ -7,7 +7,7 @@ MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 MLINKS+= dbm.3 dbm_close.3 MLINKS+= dbm.3 dbm_delete.3 -MLINKS+= dbm.3 dbm_dirnfo.3 +MLINKS+= dbm.3 dbm_dirfno.3 MLINKS+= dbm.3 dbm_error.3 MLINKS+= dbm.3 dbm_fetch.3 MLINKS+= dbm.3 dbm_firstkey.3 diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index ea5ddf875151..ef4898dbcbe7 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -50,41 +50,73 @@ MAN+= byteorder.3 ethers.3 eui64.3 \ sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \ sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \ -MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \ +MLINKS+=byteorder.3 htonl.3 \ + byteorder.3 htons.3 \ + byteorder.3 ntohl.3 \ byteorder.3 ntohs.3 -MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \ - ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3 -MLINKS+=eui64.3 eui64_aton.3 eui64.3 eui64_hostton.3 \ - eui64.3 eui64_ntoa.3 eui64.3 eui64_ntohost.3 -MLINKS+=getaddrinfo.3 freeaddrinfo.3 -MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \ - gethostbyname.3 gethostbyaddr_r.3 gethostbyname.3 gethostbyname2.3 \ - gethostbyname.3 gethostbyname2_r.3 gethostbyname.3 gethostbyname_r.3 \ - gethostbyname.3 gethostent.3 gethostbyname.3 herror.3 \ - gethostbyname.3 hstrerror.3 gethostbyname.3 sethostent.3 +MLINKS+=ethers.3 ether_aton.3 \ + ethers.3 ether_aton_r.3 \ + ethers.3 ether_hostton.3 \ + ethers.3 ether_line.3 \ + ethers.3 ether_ntoa.3 \ + ethers.3 ether_ntoa_r.3 \ + ethers.3 ether_ntohost.3 +MLINKS+=eui64.3 eui64_aton.3 \ + eui64.3 eui64_hostton.3 \ + eui64.3 eui64_ntoa.3 \ + eui64.3 eui64_ntohost.3 +MLINKS+=getaddrinfo.3 freeaddrinfo.3 +MLINKS+=gethostbyname.3 endhostent.3 \ + gethostbyname.3 gethostbyaddr.3 \ + gethostbyname.3 gethostbyaddr_r.3 \ + gethostbyname.3 gethostbyname2.3 \ + gethostbyname.3 gethostbyname2_r.3 \ + gethostbyname.3 gethostbyname_r.3 \ + gethostbyname.3 gethostent.3 \ + gethostbyname.3 herror.3 \ + gethostbyname.3 hstrerror.3 \ + gethostbyname.3 sethostent.3 MLINKS+=getifaddrs.3 freeifaddrs.3 MLINKS+=getifmaddrs.3 freeifmaddrs.3 -MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3 -MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \ - getnetent.3 getnetbyaddr_r.3 getnetent.3 getnetbyname.3 \ - getnetent.3 getnetbyname_r.3 getnetent.3 setnetent.3 \ +MLINKS+=getipnodebyname.3 getipnodebyaddr.3 \ + getipnodebyname.3 freehostent.3 +MLINKS+=getnetent.3 endnetent.3 \ + getnetent.3 getnetbyaddr.3 \ + getnetent.3 getnetbyaddr_r.3 \ + getnetent.3 getnetbyname.3 \ + getnetent.3 getnetbyname_r.3 \ + getnetent.3 setnetent.3 \ getnetent.3 getnetent_r.3 -MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \ - getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 -MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \ - getservent.3 getservbyport.3 getservent.3 setservent.3 -MLINKS+=if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \ +MLINKS+=getprotoent.3 endprotoent.3 \ + getprotoent.3 getprotobyname.3 \ + getprotoent.3 getprotobynumber.3 \ + getprotoent.3 setprotoent.3 +MLINKS+=getservent.3 endservent.3 \ + getservent.3 getservbyname.3 \ + getservent.3 getservbyport.3 \ + getservent.3 setservent.3 +MLINKS+=if_indextoname.3 if_nametoindex.3 \ + if_indextoname.3 if_nameindex.3 \ if_indextoname.3 if_freenameindex.3 -MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \ - inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \ - inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 inet_ntoa_r.3\ - inet.3 inet_ntop.3 inet.3 inet_pton.3 \ - inet.3 network.3 inet.3 ntoa.3 +MLINKS+=inet.3 addr.3 \ + inet.3 inet_addr.3 \ + inet.3 inet_aton.3 \ + inet.3 inet_lnaof.3 \ + inet.3 inet_makeaddr.3 \ + inet.3 inet_netof.3 \ + inet.3 inet_network.3 \ + inet.3 inet_ntoa.3 \ + inet.3 inet_ntoa_r.3 \ + inet.3 inet_ntop.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+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.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 \ inet6_opt_init.3 inet6_opt_find.3 \ inet6_opt_init.3 inet6_opt_finish.3 \ @@ -108,22 +140,39 @@ MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \ inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \ inet6_rthdr_space.3 inet6_rthdr_reverse.3 \ inet6_rthdr_space.3 inet6_rthdr_segments.3 -MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 -MLINKS+=rcmd.3 iruserok.3 rcmd.3 iruserok_sa.3 \ +MLINKS+=linkaddr.3 link_addr.3 \ + linkaddr.3 link_ntoa.3 +MLINKS+=rcmd.3 iruserok.3 \ + rcmd.3 iruserok_sa.3 \ rcmd.3 rcmd_af.3 \ - rcmd.3 rresvport.3 rcmd.3 rresvport_af.3 \ + rcmd.3 rresvport.3 \ + rcmd.3 rresvport_af.3 \ rcmd.3 ruserok.3 -MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \ - resolver.3 res_mkquery.3 resolver.3 res_query.3 \ - resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ - resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ - resolver.3 ns_put16.3 resolver.3 ns_put32.3 -MLINKS+=sourcefilter.3 setipv4sourcefilter.3 sourcefilter.3 getipv4sourcefilter.3 \ - sourcefilter.3 setsourcefilter.3 sourcefilter.3 getsourcefilter.3 +MLINKS+=resolver.3 dn_comp.3 \ + resolver.3 dn_expand.3 \ + resolver.3 res_init.3 \ + resolver.3 res_mkquery.3 \ + resolver.3 res_query.3 \ + resolver.3 res_search.3 \ + resolver.3 res_send.3 \ + resolver.3 dn_skipname.3 \ + resolver.3 ns_get16.3 \ + resolver.3 ns_get32.3 \ + resolver.3 ns_put16.3 \ + resolver.3 ns_put32.3 +MLINKS+=sourcefilter.3 setipv4sourcefilter.3 \ + sourcefilter.3 getipv4sourcefilter.3 \ + sourcefilter.3 setsourcefilter.3 \ + sourcefilter.3 getsourcefilter.3 .if ${MK_HESIOD} != "no" -SRCS+= hesiod.c +SRCS+= hesiod.c MAN+= hesiod.3 +MLINKS+=hesiod.3 hesiod_init.3 \ + hesiod.3 hesiod_resolve.3 \ + hesiod.3 hesiod_free_list.3 \ + hesiod.3 hesiod_to_bind.3 \ + hesiod.3 hesiod_end.3 .endif afterinstallconfig: modify-nsswitch-conf diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 5d3d30ed6dea..0b738ef7e239 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -95,23 +95,27 @@ MAN+= acl.3 \ posix1e.3 MLINKS+=acl_create_entry.3 acl_create_entry_np.3\ + acl_cmp_np.3 acl_cmp.3 \ acl_delete.3 acl_delete_def_file.3 \ - acl_delete.3 acl_delete_file_np.3 \ + acl_delete.3 acl_delete_def_link_np.3 \ acl_delete.3 acl_delete_fd_np.3 \ + acl_delete.3 acl_delete_file_np.3 \ + acl_delete.3 acl_delete_link_np.3 \ acl_delete_entry.3 acl_delete_entry_np.3\ acl_extended_file_np.3 acl_extended_file_nofollow_np.3 \ acl_extended_file_np.3 acl_extended_link_np.3 \ - acl_get.3 acl_get_file.3 \ acl_get.3 acl_get_fd.3 \ acl_get.3 acl_get_fd_np.3 \ + acl_get.3 acl_get_file.3 \ acl_get.3 acl_get_link_np.3 \ - acl_set.3 acl_set_file.3 \ acl_set.3 acl_set_fd.3 \ acl_set.3 acl_set_fd_np.3 \ + acl_set.3 acl_set_file.3 \ acl_set.3 acl_set_link_np.3 \ acl_to_text.3 acl_to_text_np.3 \ - acl_valid.3 acl_valid_file_np.3 \ acl_valid.3 acl_valid_fd_np.3 \ + acl_valid.3 acl_valid_file_np.3 \ + acl_valid.3 acl_valid_link_np.3 \ extattr.3 extattr_namespace_to_string.3 \ extattr.3 extattr_string_to_namespace.3 \ mac_get.3 mac_get_fd.3 \ diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 969c775d156a..6ca307d44b74 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -167,6 +167,7 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_soc.3 svc_fds.3 \ rpc_soc.3 svc_fdset.3 \ rpc_soc.3 svc_getcaller.3 \ + rpc_soc.3 svc_getreq.3 \ rpc_soc.3 svc_register.3 \ rpc_soc.3 svc_unregister.3 \ rpc_soc.3 svcfd_create.3 \ @@ -175,5 +176,6 @@ MLINKS+= bindresvport.3 bindresvport_sa.3 \ rpc_soc.3 svctcp_create.3 \ rpc_soc.3 svcudp_bufcreate.3 \ rpc_soc.3 svcunix_create.3 \ + rpc_soc.3 xdr_authunix_parms.3 \ rpc_soc.3 xdr_pmap.3 \ rpc_soc.3 xdr_pmaplist.3 diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 0fc0a6bfd68c..f02ac627a3b6 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -42,50 +42,102 @@ MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ stdio.3 tmpnam.3 \ ungetc.3 ungetwc.3 wprintf.3 wscanf.3 -MLINKS+=fclose.3 fcloseall.3 fclose.3 fdclose.3 +MLINKS+=fclose.3 fcloseall.3 \ + fclose.3 fdclose.3 MLINKS+=ferror.3 ferror_unlocked.3 \ - ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \ - ferror.3 feof.3 ferror.3 feof_unlocked.3 \ - ferror.3 fileno.3 ferror.3 fileno_unlocked.3 + ferror.3 clearerr.3 \ + ferror.3 clearerr_unlocked.3 \ + ferror.3 feof.3 \ + ferror.3 feof_unlocked.3 \ + ferror.3 fileno.3 \ + ferror.3 fileno_unlocked.3 MLINKS+=fflush.3 fflush_unlocked.3 \ fflush.3 fpurge.3 MLINKS+=fgets.3 gets.3 MLINKS+=fgets.3 gets_s.3 -MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3 -MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3 fopen.3 fmemopen.3 +MLINKS+=flockfile.3 ftrylockfile.3 \ + flockfile.3 funlockfile.3 +MLINKS+=fopen.3 fdopen.3 \ + fopen.3 freopen.3 \ + fopen.3 fmemopen.3 MLINKS+=fputs.3 fputs_unlocked.3 \ fputs.3 puts.3 MLINKS+=fread.3 fread_unlocked.3 \ fread.3 fwrite.3 \ fread.3 fwrite_unlocked.3 -MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \ - fseek.3 ftello.3 fseek.3 rewind.3 -MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3 -MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \ - getc.3 getchar_unlocked.3 getc.3 getw.3 +MLINKS+=fseek.3 fgetpos.3 \ + fseek.3 fseeko.3 \ + fseek.3 fsetpos.3 \ + fseek.3 ftell.3 \ + fseek.3 ftello.3 \ + fseek.3 rewind.3 +MLINKS+=funopen.3 fropen.3 \ + funopen.3 fwopen.3 +MLINKS+=getc.3 fgetc.3 \ + getc.3 getc_unlocked.3 \ + getc.3 getchar.3 \ + getc.3 getchar_unlocked.3 \ + getc.3 getw.3 MLINKS+=getline.3 getdelim.3 -MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3 -MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 \ - mktemp.3 mkostemp.3 mktemp.3 mkostemps.3 mktemp.3 mkostempsat.3 +MLINKS+=getwc.3 fgetwc.3 \ + getwc.3 getwchar.3 +MLINKS+=mktemp.3 mkdtemp.3 \ + mktemp.3 mkstemp.3 \ + mktemp.3 mkstemps.3 \ + mktemp.3 mkostemp.3 \ + mktemp.3 mkostemps.3 \ + mktemp.3 mkostempsat.3 MLINKS+=open_memstream.3 open_wmemstream.3 -MLINKS+=printf.3 asprintf.3 printf.3 dprintf.3 printf.3 fprintf.3 \ - printf.3 snprintf.3 printf.3 sprintf.3 \ - printf.3 vasprintf.3 printf.3 vdprintf.3 \ - printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \ +MLINKS+=printf.3 asprintf.3 \ + printf.3 dprintf.3 \ + printf.3 fprintf.3 \ + printf.3 snprintf.3 \ + printf.3 sprintf.3 \ + printf.3 vasprintf.3 \ + printf.3 vdprintf.3 \ + printf.3 vfprintf.3 \ + printf.3 vprintf.3 \ + printf.3 vsnprintf.3 \ printf.3 vsprintf.3 -MLINKS+=printf_l.3 asprintf_l.3 printf_l.3 fprintf_l.3 printf_l.3 snprintf_l.3 \ - printf_l.3 sprintf_l.3 printf_l.3 vasprintf_l.3 printf_l.3 vfprintf_l.3 \ - printf_l.3 vprintf_l.3 printf_l.3 vsnprintf_l.3 printf_l.3 vsprintf_l.3 -MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \ - putc.3 putchar_unlocked.3 putc.3 putw.3 -MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3 -MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \ +MLINKS+=printf_l.3 asprintf_l.3 \ + printf_l.3 fprintf_l.3 \ + printf_l.3 snprintf_l.3 \ + printf_l.3 sprintf_l.3 \ + printf_l.3 vasprintf_l.3 \ + printf_l.3 vfprintf_l.3 \ + printf_l.3 vprintf_l.3 \ + printf_l.3 vsnprintf_l.3 \ + printf_l.3 vsprintf_l.3 +MLINKS+=putc.3 fputc.3 \ + putc.3 fputc_unlocked.3 \ + putc.3 putc_unlocked.3 \ + putc.3 putchar.3 \ + putc.3 putchar_unlocked.3 \ + putc.3 putw.3 +MLINKS+=putwc.3 fputwc.3 \ + putwc.3 putwchar.3 +MLINKS+=scanf.3 fscanf.3 \ + scanf.3 sscanf.3 \ + scanf.3 vfscanf.3 \ + scanf.3 vscanf.3 \ scanf.3 vsscanf.3 -MLINKS+=scanf_l.3 fscanf_l.3 scanf_l.3 sscanf_l.3 scanf_l.3 vfscanf_l.3 \ - scanf_l.3 vscanf_l.3 scanf_l.3 vsscanf_l.3 -MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3 -MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3 -MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \ - wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 -MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ - wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 +MLINKS+=scanf_l.3 fscanf_l.3 \ + scanf_l.3 sscanf_l.3 \ + scanf_l.3 vfscanf_l.3 \ + scanf_l.3 vscanf_l.3 \ + scanf_l.3 vsscanf_l.3 +MLINKS+=setbuf.3 setbuffer.3 \ + setbuf.3 setlinebuf.3 \ + setbuf.3 setvbuf.3 +MLINKS+=tmpnam.3 tempnam.3 \ + tmpnam.3 tmpfile.3 +MLINKS+=wprintf.3 fwprintf.3 \ + wprintf.3 swprintf.3 \ + wprintf.3 vwprintf.3 \ + wprintf.3 vfwprintf.3 \ + wprintf.3 vswprintf.3 +MLINKS+=wscanf.3 fwscanf.3 \ + wscanf.3 swscanf.3 \ + wscanf.3 vwscanf.3 \ + wscanf.3 vswscanf.3 \ + wscanf.3 vfwscanf.3 diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 413c9421c0ee..227bc32b237d 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -44,27 +44,51 @@ MAN+= a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \ strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \ tsearch.3 -MLINKS+=a64l.3 l64a.3 a64l.3 l64a_r.3 +MLINKS+=a64l.3 l64a.3 \ + a64l.3 l64a_r.3 MLINKS+=atol.3 atoll.3 MLINKS+=exit.3 _Exit.3 -MLINKS+=getenv.3 clearenv.3 getenv.3 putenv.3 getenv.3 secure_getenv.3 \ - getenv.3 setenv.3 getenv.3 unsetenv.3 +MLINKS+=getenv.3 clearenv.3 \ + getenv.3 putenv.3 \ + getenv.3 secure_getenv.3 \ + getenv.3 setenv.3 \ + getenv.3 unsetenv.3 MLINKS+=getopt_long.3 getopt_long_only.3 -MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 -MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3 +MLINKS+=hcreate.3 hdestroy.3 \ + hcreate.3 hsearch.3 +MLINKS+=hcreate.3 hcreate_r.3 \ + hcreate.3 hdestroy_r.3 \ + hcreate.3 hsearch_r.3 MLINKS+=insque.3 remque.3 MLINKS+=lsearch.3 lfind.3 -MLINKS+=ptsname.3 grantpt.3 ptsname.3 ptsname_r.3 ptsname.3 unlockpt.3 -MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 \ +MLINKS+=ptsname.3 grantpt.3 \ + ptsname.3 ptsname_r.3 \ + ptsname.3 unlockpt.3 +MLINKS+=qsort.3 heapsort.3 \ + qsort.3 heapsort_b.3 \ + qsort.3 mergesort.3 \ + qsort.3 mergesort_b.3 \ + qsort.3 qsort_b.3 \ + qsort.3 qsort_r.3 \ qsort.3 qsort_s.3 -MLINKS+=rand.3 rand_r.3 rand.3 srand.3 -MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \ +MLINKS+=rand.3 rand_r.3 \ + rand.3 srand.3 +MLINKS+=random.3 initstate.3 \ + random.3 setstate.3 \ + random.3 srandom.3 \ random.3 srandomdev.3 MLINKS+=radixsort.3 sradixsort.3 MLINKS+=set_constraint_handler_s.3 abort_handler_s.3 MLINKS+=set_constraint_handler_s.3 ignore_handler_s.3 MLINKS+=strfmon.3 strfmon_l.3 -MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3 -MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3 -MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3 -MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 +MLINKS+=strtod.3 strtof.3 \ + strtod.3 strtold.3 +MLINKS+=strtol.3 strtoll.3 \ + strtol.3 strtoq.3 \ + strtol.3 strtoimax.3 +MLINKS+=strtoul.3 strtoull.3 \ + strtoul.3 strtouq.3 \ + strtoul.3 strtoumax.3 +MLINKS+=tsearch.3 tdelete.3 \ + tsearch.3 tfind.3 \ + tsearch.3 twalk.3 diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 480002f9875e..f52487a3fef2 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -469,6 +469,7 @@ MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \ sched_get_priority_max.2 sched_rr_get_interval.2 MLINKS+=sched_setparam.2 sched_getparam.2 MLINKS+=sched_setscheduler.2 sched_getscheduler.2 +MLINKS+=sctp_generic_sendmsg.2 sctp_generic_sendmsg_iov.2 MLINKS+=select.2 FD_CLR.3 \ select.2 FD_ISSET.3 \ select.2 FD_SET.3 \ diff --git a/lib/libc/sys/sctp_generic_sendmsg.2 b/lib/libc/sys/sctp_generic_sendmsg.2 index 5c62328aeace..66ce41ee2fcb 100644 --- a/lib/libc/sys/sctp_generic_sendmsg.2 +++ b/lib/libc/sys/sctp_generic_sendmsg.2 @@ -29,7 +29,7 @@ .Dt SCTP_GENERIC_SENDMSG 2 .Os .Sh NAME -.Nm sctp_generic_sendmsg +.Nm sctp_generic_sendmsg , .Nm sctp_generic_sendmsg_iov .Nd send data to a peer .Sh LIBRARY diff --git a/lib/libc/uuid/uuid.3 b/lib/libc/uuid/uuid.3 index 42f7a4b43ccd..1cfd3a86ad91 100644 --- a/lib/libc/uuid/uuid.3 +++ b/lib/libc/uuid/uuid.3 @@ -27,8 +27,14 @@ .Dt UUID 3 .Os .Sh NAME -.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal , -.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string +.Nm uuid_compare , +.Nm uuid_create , +.Nm uuid_create_nil , +.Nm uuid_equal , +.Nm uuid_from_string , +.Nm uuid_hash , +.Nm uuid_is_nil , +.Nm uuid_to_string .Nd DCE 1.1 compliant UUID functions .Sh LIBRARY .Lb libc diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc index 76997c1da218..b9d0b575d8dc 100644 --- a/lib/libc/xdr/Makefile.inc +++ b/lib/libc/xdr/Makefile.inc @@ -26,26 +26,31 @@ MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \ xdr.3 xdr_float.3 \ xdr.3 xdr_free.3 \ xdr.3 xdr_getpos.3 \ + xdr.3 xdr_hyper.3 \ xdr.3 xdr_inline.3 \ xdr.3 xdr_int.3 \ xdr.3 xdr_long.3 \ - xdr.3 xdrmem_create.3 \ + xdr.3 xdr_longlong_t.3 \ xdr.3 xdr_opaque.3 \ xdr.3 xdr_pointer.3 \ - xdr.3 xdrrec_create.3 \ - xdr.3 xdrrec_endofrecord.3 \ - xdr.3 xdrrec_eof.3 \ - xdr.3 xdrrec_skiprecord.3 \ xdr.3 xdr_reference.3 \ xdr.3 xdr_setpos.3 \ xdr.3 xdr_short.3 \ xdr.3 xdr_sizeof.3 \ - xdr.3 xdrstdio_create.3 \ xdr.3 xdr_string.3 \ xdr.3 xdr_u_char.3 \ + xdr.3 xdr_u_hyper.3 \ + xdr.3 xdr_u_int.3 \ xdr.3 xdr_u_long.3 \ + xdr.3 xdr_u_longlong_t.3 \ xdr.3 xdr_u_short.3 \ xdr.3 xdr_union.3 \ xdr.3 xdr_vector.3 \ xdr.3 xdr_void.3 \ + xdr.3 xdrmem_create.3 \ + xdr.3 xdrrec_create.3 \ + xdr.3 xdrrec_endofrecord.3 \ + xdr.3 xdrrec_eof.3 \ + xdr.3 xdrrec_skiprecord.3 \ + xdr.3 xdrstdio_create.3 \ xdr.3 xdr_wrapstring.3 From nobody Wed Oct 18 14:13:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9XrY448Rz4x50J; Wed, 18 Oct 2023 14:13: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 4S9XrY2vHqz3Hnq; Wed, 18 Oct 2023 14:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/u7JzptrmCW6PE/DtHQBRwAHi6lmh3oqDQgmVInhO0=; b=uRrOruFW/OGDi/dBU16dNLCNlwpFC0QhY9XJrBJjFkmI9jmPMtRjCMvC8ODt787PgvtC4m SrLs/JBgZY99b/6XU4NpKIB3XDW+Gkg2/aLUQMj+owAf/fP7dg9YA1ZdTx/T9oqXLdczQ4 /u/eJKoiPFps+IHIH6iAmlke8vjIEhqMTNWDWg3sDCujEQI1HoHM1E7zz2ivitC3k/Q3tR 5tC6sle8/rtESSUZGDjV9Ir8pW1lmYbXhG2MIM99n8r2HhQzFUMP7HglozlMUO9sYg9hey fNtppoCAZLStD3DpmwBdINuJ3h8P6I+WE6Qiu5dP5lGRlBwEXX7/kMfhtOtfQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697638413; a=rsa-sha256; cv=none; b=K8AGBmSo4akPIWdQiQMhPJq8ULwoQ6kY/e9/G5nHkbu05hFOzheLCHSCOdb1KABu7sW/Fv HN91ABlvePUmqxaP46OxZBgvzfzsNzFeDzccBzi1vgLbqI9Ff/COTo5J7rSy9qZ3KyQbYL rCFNHXfFZ/d6WjZP5z8ui4kRgyKURk6iAa8rrNryijPvaA+FlTvoxOhgrjtHBMPGrZQFGd WBt6fGBrZQz+s9pAfYgTiVr+qQNCs0FBlgAgIYSCjcT5lvYs9+HjRajmCrNyj4j9srz9pk HWCdyVirWWiX7lvc/gzyeDFB1cQ7PxIyL72E4vmJgE5wMlN4j2M+mCHoFJB6dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697638413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/u7JzptrmCW6PE/DtHQBRwAHi6lmh3oqDQgmVInhO0=; b=PMeN3Nh8BpbIj1wzNHit0PTUbDniEZtHnjEki2CS5Dc+Z2agcCzH58nODJ2980wV2+ut/x nIcEOO88ZZutXZ7ZM/OXYnoWKjSh6PoqfHrO8b2eAaxBb/OCjUu602fDztUdLKaiFpY2kc C64kwA5s0Fui26FrcWEwDduuWd6RTDKcVs3q0uxIvqfk/NTdPHyQVQ77rykBn20Amnb2xK Uad8ua+hxrTAS/PcUCc41K56XfT89RRJ+zSpY9SMaMVtUNk6+oStjzIx3S8CCSfPYby4TY kbKCj0iwfjWIcoqr3xtWSMKt07IOkMMmLvXOFHiz5HiFfT4BsKr2hu+5iDJUaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9XrY1y4kz18Vy; Wed, 18 Oct 2023 14:13: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 39IEDXsf057487; Wed, 18 Oct 2023 14:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEDXce057484; Wed, 18 Oct 2023 14:13:33 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:13:33 GMT Message-Id: <202310181413.39IEDXce057484@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: 3a338c534154 - main - Add the BBR and RACK stacks to the LINT kernel. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a338c534154164504005beb00a3c6feb03756cc Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3a338c534154164504005beb00a3c6feb03756cc commit 3a338c534154164504005beb00a3c6feb03756cc Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 14:13:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 14:13:12 +0000 Add the BBR and RACK stacks to the LINT kernel. While here, drop the EXTRA_TCP_STACKS option, which serves no purpose and should never have been added. Instead, build bbr and rack as long as either or both of INET and INET6 is enabled. There is no risk to anyone who doesn't load one or both and then twiddle the relevant sysctls. Differential Revision: https://reviews.freebsd.org/D42088 --- share/man/man5/src.conf.5 | 2 -- sys/conf/NOTES | 4 +++- sys/conf/files | 7 +++++++ sys/conf/kern.opts.mk | 1 - sys/conf/kern.post.mk | 4 ---- sys/conf/options | 2 ++ sys/modules/tcp/Makefile | 7 ++----- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9d26531e515b..bc94d5c62234 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -641,8 +641,6 @@ Avoid installing examples to .Pa /usr/share/examples/ . .It Va WITH_EXPERIMENTAL Include experimental features in the build. -.It Va WITH_EXTRA_TCP_STACKS -Build extra TCP stack modules. .It Va WITHOUT_FDT Do not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a5ed60792a1f..b12d5def2d57 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -681,7 +681,6 @@ options TCP_OFFLOAD # TCP offload support. options TCP_RFC7413 # TCP Fast Open options TCPHPTS -makeoptions WITH_EXTRA_TCP_STACKS=1 # RACK and BBR TCP kernel modules # In order to enable IPSEC you MUST also add device crypto to # your kernel configuration @@ -693,6 +692,9 @@ options IPSEC #IP security (requires device crypto) options IPSEC_SUPPORT #options IPSEC_DEBUG #debug for IP security +# Alternative TCP stacks +options TCP_BBR +options TCP_RACK # TLS framing and encryption/decryption of data over TCP sockets. options KERN_TLS # TLS transmit and receive offload diff --git a/sys/conf/files b/sys/conf/files index 8c3bdca61905..c127ce7e7103 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4361,6 +4361,13 @@ netinet/tcp_pcap.c optional inet tcppcap | inet6 tcppcap \ compile-with "${NORMAL_C} ${NO_WNONNULL}" netinet/tcp_reass.c optional inet | inet6 netinet/tcp_sack.c optional inet | inet6 +netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ + compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" +netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ + compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" +netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack +netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack +netinet/tcp_stacks/tailq_hash.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack netinet/tcp_stats.c optional stats inet | stats inet6 netinet/tcp_subr.c optional inet | inet6 netinet/tcp_syncache.c optional inet | inet6 diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index f908f761b21e..cc6f8a1d8755 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -56,7 +56,6 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BHYVE_SNAPSHOT \ - EXTRA_TCP_STACKS \ KERNEL_RETPOLINE \ RATELIMIT \ REPRODUCIBLE_BUILD \ diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index a4eb2e94a47b..bea29507a736 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -33,10 +33,6 @@ MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}" MKMODULESENV+= WITH_CTF="${WITH_CTF}" .endif -.if defined(WITH_EXTRA_TCP_STACKS) -MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" -.endif - .if !empty(KCSAN_ENABLED) MKMODULESENV+= KCSAN_ENABLED="yes" .endif diff --git a/sys/conf/options b/sys/conf/options index 4e74c4ab3a70..d2f31272d189 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -231,6 +231,8 @@ SW_WATCHDOG opt_watchdog.h TCPHPTS opt_inet.h TCP_REQUEST_TRK opt_global.h TCP_ACCOUNTING opt_global.h +TCP_BBR opt_inet.h +TCP_RACK opt_inet.h # # TCP SaD Detection is an experimental Sack attack Detection (SaD) # algorithm that uses "normal" behaviour with SACK's to detect diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile index 8f89977b5b69..364c0326c40d 100644 --- a/sys/modules/tcp/Makefile +++ b/sys/modules/tcp/Makefile @@ -8,13 +8,10 @@ SUBDIR= \ ${_tcp_rack} \ ${_tcpmd5} \ -.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES) -_tcp_bbr= bbr -_tcp_rack= rack -.endif - .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) +_tcp_bbr= bbr +_tcp_rack= rack .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} _tcpmd5= tcpmd5 .endif From nobody Wed Oct 18 14:30:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YDY50nnz4x60x; Wed, 18 Oct 2023 14:30: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 4S9YDY4PFvz3MP5; Wed, 18 Oct 2023 14:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQ/SLZEoxWEezjkeY7VGhwZAs7Xr6FPR/TrLBQW8qGo=; b=kvK/CnfrL5yz4x+AawaITSzkKnuRgJqYrxRZ9MOTU0aShPF+uWSGhvCPiEBi6PjOAc9pkc /vbxTkLZxNHhxY//Y9BLTDfF4rcTDRMBtMUpUlqjcaWoHUUtZ9le7LL6IM3JVhmjH5toji NBBxfc+ObXpPHdjVSEtQ6tBWoCxmErZZQSzeo2kn4ZMKOG6SbQ3IqoTPhrB7ZB/ytUziLn Ekeq/vc6TXTAZPoFANaAvcJWpPtNnqWB6KFjE6DRW62ZIOfj+ECmAyILXVr9WxadttgDZh hMsCyUCfoL1t2WMAt6OYWivAB7Rf5vRxeD9xWhv/FDV4i6tcXykuNb23BkRTBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639453; a=rsa-sha256; cv=none; b=jskOwiT59APUrr1mOKc05bd9rykk6TDP+yo2jIx1aXVvnCKUviIW4woXFLkudqkef5C/zt 7hCZ/c1SLVfVdoL+8rymL+4oM/hJNZBZyRdMBOUYy6PpEd8ZXyXgRvHm2TX9xtUO28ja26 +8/Wf+7QDhgM+oYySL/Y0UOBluZ92FbHQy+2ZQtugkIYXrO5XJ/eAxzEMumGHUbfdc0FNQ rVLBnp0PLbS4fJ/larmHMyj2TOOu+JovqBKfsc0nj4213hLGVYdZANyBOIO/Jpp8Pr45PI rt2RTDHmQCbByQ9NoF/P1MtxJ5XaRYDdFaNXA3jz0/eTSZ1Pzt/sy++0z9gRUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DQ/SLZEoxWEezjkeY7VGhwZAs7Xr6FPR/TrLBQW8qGo=; b=HBeDYaIopsaaiAIAYLnsiS6s3wURpkhtq3DPvAJZsxXTu6YASkCD3U7QVRKnMhtzrM1J5h jHotsmGrxDRWhJtwY3w3Sp3lNbF5q8gt8Bnog8BPtvhGSlECWpnbPocIEU1vdE/lH6JaO6 BQ6iSy2qrBCsdT5DI7X7+A9XtdBJdnfikmA4zDErgJNfn7SVzYdnJajOrg9oVBWMkJysoH 2GAD7Scn418fy7nJip8s4qkzKkvkuCq3g1QgLAJ+TFYo9/v8s6Piz/YXgqGOvE00ZwCBUz hjMp+rLEv4FoLWhMvXggyonzG7ocHv6s2z8Ku8e3/BkOW16t3gDuSFf1Tl+s6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YDY3SrBz19Fm; Wed, 18 Oct 2023 14:30: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 39IEUrvC085341; Wed, 18 Oct 2023 14:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEUrj7085338; Wed, 18 Oct 2023 14:30:53 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:30:53 GMT Message-Id: <202310181430.39IEUrj7085338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 62ce4a798f2c - stable/14 - cpufreq_dt: Find the closest frequency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 commit 62ce4a798f2c8a6357e8bc0c46e0f3e077ca1958 Author: Emmanuel Vadot AuthorDate: 2023-09-06 16:40:17 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:30:22 +0000 cpufreq_dt: Find the closest frequency When building the frequencies table we convert the value in the DTS to megahertz and loose precision. While it's not a problem for most of the DTS it is when the expected frequency value is strict down to the hertz. So it's either we don't truncate the value and have some ugly and long values in the sysctls or we just find the closest frequency. Do the latter. Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D41762 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 17c17872ca98df0e2b9f9c7a2c41ef73f7dee21a) --- sys/dev/cpufreq/cpufreq_dt.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index aaeada3a4e58..be434cabb4fd 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -104,17 +104,26 @@ static const struct cpufreq_dt_opp * cpufreq_dt_find_opp(device_t dev, uint64_t freq) { struct cpufreq_dt_softc *sc; - ssize_t n; + uint64_t diff, best_diff; + ssize_t n, best_n; sc = device_get_softc(dev); + diff = 0; + best_diff = ~0; DPRINTF(dev, "Looking for freq %ju\n", freq); - for (n = 0; n < sc->nopp; n++) - if (CPUFREQ_CMP(sc->opp[n].freq, freq)) - return (&sc->opp[n]); + for (n = 0; n < sc->nopp; n++) { + diff = abs64((int64_t)sc->opp[n].freq - (int64_t)freq); + DPRINTF(dev, "Testing %ju, diff is %ju\n", sc->opp[n].freq, diff); + if (diff < best_diff) { + best_diff = diff; + best_n = n; + DPRINTF(dev, "%ju is best for now\n", sc->opp[n].freq); + } + } - DPRINTF(dev, "Couldn't find one\n"); - return (NULL); + DPRINTF(dev, "Will use %ju\n", sc->opp[best_n].freq); + return (&sc->opp[best_n]); } static void From nobody Wed Oct 18 14:31:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFN2Bwwz4x639; Wed, 18 Oct 2023 14:31: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 4S9YFN1ng5z3MmW; Wed, 18 Oct 2023 14:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6XGf7PmUC80Ui8ihQZ3eJ6rSXhJTLK07qRQFn73D28=; b=WRGX0wzi0F/v/hiqvY4Ep8aZaN2uTsA3bUiel7HxsAwa/rmeP0I+06AFwgsXvoOjoir1/6 L5ey4Z27dm3uA8Dry3ZD+Zs4peDABAMrEmeIdTQMd34baf8k7O/zw18Tt/1t3Ss626BUF7 2MLwECyhSQzyw5NYXsfuwDPt1ZeLL34+4gJJSXT3ZEG7MWq95ir/hdjfv3Hqpzmy/9vytH sqFClGTQ+FB5GVtFhEViZqrrDsq/UsTzplnAMIwCGObZrEpGtC4e6IOVbWeRMHE2+DBMHW 0oc3KyyzlCsUJT6vOeCG0yTATO6BQpVb+sBj0R2LK+1Hu48dvyXTVdkA/9u82g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639496; a=rsa-sha256; cv=none; b=okvhzrxsQ297ypPRQADSrMOdjwKNtOzIA1VvXxSyaqycQqV6XFAOJAhckqNHn7UOSqt1Of HfqnVoEd7h+z5sDCsaxvYx2FG2btUNzepOiAohJ0j6XsjEj3IB4qk9RhQfynNsYvCsNMN3 rPRR9SibvUV+fF6ex5l7Hyw10sXeh9ePyJVrdTb7rfvgV1s0KaerVxhHSu10Yp0rDMpYiq q5R77KRqNyc6J2l2Sc+sPI5kIu6bjY+sHtegJLDlD81/L+0W9nZ6MA9r6wltQiLHXWjaNE TQxiK46Kc39uhDACgj6hnolqFZrNsHtnQsbCbmM6sN8BkYgDcXPXeaYj2EAQiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6XGf7PmUC80Ui8ihQZ3eJ6rSXhJTLK07qRQFn73D28=; b=jolx24iBHHTxx42eE7ziZ4G+AZvUGl9iE+yMpx053665b1VNVaSMG4rAlYvJRcsxPJxUFb 8F8OY0AAJO+rIuY2H8I5pw5vP9eyWaZFtyy3X8BLwv2Ja5H/+0YIc12SDMvNJQfNGeCsNu LBXHvCm7R1i5ninlFZIa+KZBoGhA1WEAiRJdigpWJ21t8Mga3kgzGzjnzeSUnA3d5vBu+R YHTLfRp9DJ7TN8e+0aqEbap9Mos7DzHQ+XW9ie/sH/yqtVUu/N53BoUaanWtGyLJeSaEps UhTI+mEYFTPooZNxoufGMR0o5CAT/+lqIArYsyaKeiWNcKOU8pEqLvGSirVuvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFN0sPFz18p2; Wed, 18 Oct 2023 14:31: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 39IEVauh089017; Wed, 18 Oct 2023 14:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVaUH089014; Wed, 18 Oct 2023 14:31:36 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:36 GMT Message-Id: <202310181431.39IEVaUH089014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: ab8f34675ae7 - stable/14 - arm64: zynqmp: Add firmware driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ab8f34675ae705060a6160521b1e7a91c5e00a9a Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ab8f34675ae705060a6160521b1e7a91c5e00a9a commit ab8f34675ae705060a6160521b1e7a91c5e00a9a Author: Emmanuel Vadot AuthorDate: 2023-09-07 07:56:45 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:01 +0000 arm64: zynqmp: Add firmware driver The ZynqMP SoC have a MCU running a firmware to control clocks, resets, fpga loading etc ... Add a driver that can be use to communicate with it. For now only the clock and reset part are implemented. Differential Revision: https://reviews.freebsd.org/D41811 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 9e88711f28dc9afa7d68ae8dd027d2399a2a290b) --- sys/conf/files.arm64 | 2 + sys/dev/firmware/xilinx/pm_defs.h | 380 ++++++++++++++++++++ sys/dev/firmware/xilinx/zynqmp_firmware.c | 511 +++++++++++++++++++++++++++ sys/dev/firmware/xilinx/zynqmp_firmware_if.m | 109 ++++++ 4 files changed, 1002 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 02dcadc0aa5c..987a1ea6cd09 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -698,3 +698,5 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt +dev/firmware/xilinx/zynqmp_firmware.c optional fdt soc_xilinx_zynq +dev/firmware/xilinx/zynqmp_firmware_if.m optional fdt soc_xilinx_zynq diff --git a/sys/dev/firmware/xilinx/pm_defs.h b/sys/dev/firmware/xilinx/pm_defs.h new file mode 100644 index 000000000000..3461dd7820ad --- /dev/null +++ b/sys/dev/firmware/xilinx/pm_defs.h @@ -0,0 +1,380 @@ +/* + * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/* ZynqMP power management enums and defines */ + +#ifndef PM_DEFS_H +#define PM_DEFS_H + +/********************************************************************* + * Macro definitions + ********************************************************************/ + +/* + * Version number is a 32bit value, like: + * (PM_VERSION_MAJOR << 16) | PM_VERSION_MINOR + */ +#define PM_VERSION_MAJOR 1U +#define PM_VERSION_MINOR 1U + +#define PM_VERSION ((PM_VERSION_MAJOR << 16U) | PM_VERSION_MINOR) + +/** + * PM API versions + */ +/* Expected version of firmware APIs */ +#define FW_API_BASE_VERSION (1U) +/* Expected version of firmware API for feature check */ +#define FW_API_VERSION_2 (2U) +/* Version of APIs implemented in ATF */ +#define ATF_API_BASE_VERSION (1U) + +/* Capabilities for RAM */ +#define PM_CAP_ACCESS 0x1U +#define PM_CAP_CONTEXT 0x2U + +#define MAX_LATENCY (~0U) +#define MAX_QOS 100U + +/* State arguments of the self suspend */ +#define PM_STATE_CPU_IDLE 0x0U +#define PM_STATE_SUSPEND_TO_RAM 0xFU + +/* APU processor states */ +#define PM_PROC_STATE_FORCEDOFF 0U +#define PM_PROC_STATE_ACTIVE 1U +#define PM_PROC_STATE_SLEEP 2U +#define PM_PROC_STATE_SUSPENDING 3U + +#define EM_FUNID_NUM_MASK 0xF0000U + +#define PM_GET_CALLBACK_DATA 0xa01 +#define PM_SET_SUSPEND_MODE 0xa02 +#define PM_GET_TRUSTZONE_VERSION 0xa03 + +/********************************************************************* + * Enum definitions + ********************************************************************/ + +enum pm_api_id { + /* Miscellaneous API functions: */ + PM_GET_API_VERSION = 1, /* Do not change or move */ + PM_SET_CONFIGURATION, + PM_GET_NODE_STATUS, + PM_GET_OP_CHARACTERISTIC, + PM_REGISTER_NOTIFIER, + /* API for suspending of PUs: */ + PM_REQ_SUSPEND, + PM_SELF_SUSPEND, + PM_FORCE_POWERDOWN, + PM_ABORT_SUSPEND, + PM_REQ_WAKEUP, + PM_SET_WAKEUP_SOURCE, + PM_SYSTEM_SHUTDOWN, + /* API for managing PM slaves: */ + PM_REQ_NODE, + PM_RELEASE_NODE, + PM_SET_REQUIREMENT, + PM_SET_MAX_LATENCY, + /* Direct control API functions: */ + PM_RESET_ASSERT, + PM_RESET_GET_STATUS, + PM_MMIO_WRITE, + PM_MMIO_READ, + PM_INIT_FINALIZE, + PM_FPGA_LOAD, + PM_FPGA_GET_STATUS, + PM_GET_CHIPID, + PM_SECURE_RSA_AES, + PM_SECURE_SHA, + PM_SECURE_RSA, + PM_PINCTRL_REQUEST, + PM_PINCTRL_RELEASE, + PM_PINCTRL_GET_FUNCTION, + PM_PINCTRL_SET_FUNCTION, + PM_PINCTRL_CONFIG_PARAM_GET, + PM_PINCTRL_CONFIG_PARAM_SET, + PM_IOCTL, + /* API to query information from firmware */ + PM_QUERY_DATA, + /* Clock control API functions */ + PM_CLOCK_ENABLE, + PM_CLOCK_DISABLE, + PM_CLOCK_GETSTATE, + PM_CLOCK_SETDIVIDER, + PM_CLOCK_GETDIVIDER, + PM_CLOCK_SETRATE, + PM_CLOCK_GETRATE, + PM_CLOCK_SETPARENT, + PM_CLOCK_GETPARENT, + PM_SECURE_IMAGE, + /* FPGA PL Readback */ + PM_FPGA_READ, + PM_SECURE_AES, + /* PLL control API functions */ + PM_PLL_SET_PARAMETER, + PM_PLL_GET_PARAMETER, + PM_PLL_SET_MODE, + PM_PLL_GET_MODE, + /* PM Register Access API */ + PM_REGISTER_ACCESS, + PM_EFUSE_ACCESS, + PM_FPGA_GET_VERSION, + PM_FPGA_GET_FEATURE_LIST, + PM_FEATURE_CHECK = 63, + PM_API_MAX +}; + +enum pm_query_id { + PM_QID_INVALID = 0, + PM_QID_CLOCK_GET_NAME, + PM_QID_CLOCK_GET_TOPOLOGY, + PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS, + PM_QID_CLOCK_GET_PARENTS, + PM_QID_CLOCK_GET_ATTRIBUTES, + PM_QID_PINCTRL_GET_NUM_PINS, + PM_QID_PINCTRL_GET_NUM_FUNCTIONS, + PM_QID_PINCTRL_GET_NUM_FUNCTION_GROUPS, + PM_QID_PINCTRL_GET_FUNCTION_NAME, + PM_QID_PINCTRL_GET_FUNCTION_GROUPS, + PM_QID_PINCTRL_GET_PIN_GROUPS, + PM_QID_CLOCK_GET_NUM_CLOCKS, + PM_QID_CLOCK_GET_MAX_DIVISOR, +}; + +enum pm_node_id { + NODE_UNKNOWN = 0, + NODE_APU, + NODE_APU_0, + NODE_APU_1, + NODE_APU_2, + NODE_APU_3, + NODE_RPU, + NODE_RPU_0, + NODE_RPU_1, + NODE_PLD, + NODE_FPD, + NODE_OCM_BANK_0, + NODE_OCM_BANK_1, + NODE_OCM_BANK_2, + NODE_OCM_BANK_3, + NODE_TCM_0_A, + NODE_TCM_0_B, + NODE_TCM_1_A, + NODE_TCM_1_B, + NODE_L2, + NODE_GPU_PP_0, + NODE_GPU_PP_1, + NODE_USB_0, + NODE_USB_1, + NODE_TTC_0, + NODE_TTC_1, + NODE_TTC_2, + NODE_TTC_3, + NODE_SATA, + NODE_ETH_0, + NODE_ETH_1, + NODE_ETH_2, + NODE_ETH_3, + NODE_UART_0, + NODE_UART_1, + NODE_SPI_0, + NODE_SPI_1, + NODE_I2C_0, + NODE_I2C_1, + NODE_SD_0, + NODE_SD_1, + NODE_DP, + NODE_GDMA, + NODE_ADMA, + NODE_NAND, + NODE_QSPI, + NODE_GPIO, + NODE_CAN_0, + NODE_CAN_1, + NODE_EXTERN, + NODE_APLL, + NODE_VPLL, + NODE_DPLL, + NODE_RPLL, + NODE_IOPLL, + NODE_DDR, + NODE_IPI_APU, + NODE_IPI_RPU_0, + NODE_GPU, + NODE_PCIE, + NODE_PCAP, + NODE_RTC, + NODE_LPD, + NODE_VCU, + NODE_IPI_RPU_1, + NODE_IPI_PL_0, + NODE_IPI_PL_1, + NODE_IPI_PL_2, + NODE_IPI_PL_3, + NODE_PL, + NODE_GEM_TSU, + NODE_SWDT_0, + NODE_SWDT_1, + NODE_CSU, + NODE_PJTAG, + NODE_TRACE, + NODE_TESTSCAN, + NODE_PMU, + NODE_MAX, +}; + +enum pm_request_ack { + REQ_ACK_NO = 1, + REQ_ACK_BLOCKING, + REQ_ACK_NON_BLOCKING, +}; + +enum pm_abort_reason { + ABORT_REASON_WKUP_EVENT = 100, + ABORT_REASON_PU_BUSY, + ABORT_REASON_NO_PWRDN, + ABORT_REASON_UNKNOWN, +}; + +enum pm_suspend_reason { + SUSPEND_REASON_PU_REQ = 201, + SUSPEND_REASON_ALERT, + SUSPEND_REASON_SYS_SHUTDOWN, +}; + +enum pm_ram_state { + PM_RAM_STATE_OFF = 1, + PM_RAM_STATE_RETENTION, + PM_RAM_STATE_ON, +}; + +enum pm_opchar_type { + PM_OPCHAR_TYPE_POWER = 1, + PM_OPCHAR_TYPE_TEMP, + PM_OPCHAR_TYPE_LATENCY, +}; + +/** + * @PM_RET_SUCCESS: success + * @PM_RET_ERROR_ARGS: illegal arguments provided (deprecated) + * @PM_RET_ERROR_NOTSUPPORTED: feature not supported (deprecated) + * @PM_RET_ERROR_NOT_ENABLED: feature is not enabled + * @PM_RET_ERROR_INTERNAL: internal error + * @PM_RET_ERROR_CONFLICT: conflict + * @PM_RET_ERROR_ACCESS: access rights violation + * @PM_RET_ERROR_INVALID_NODE: invalid node + * @PM_RET_ERROR_DOUBLE_REQ: duplicate request for same node + * @PM_RET_ERROR_ABORT_SUSPEND: suspend procedure has been aborted + * @PM_RET_ERROR_TIMEOUT: timeout in communication with PMU + * @PM_RET_ERROR_NODE_USED: node is already in use + */ +enum pm_ret_status { + PM_RET_SUCCESS = (0U), + PM_RET_ERROR_ARGS = (1U), + PM_RET_ERROR_NOTSUPPORTED = (4U), + PM_RET_ERROR_NOT_ENABLED = (29U), + PM_RET_ERROR_INTERNAL = (2000U), + PM_RET_ERROR_CONFLICT = (2001U), + PM_RET_ERROR_ACCESS = (2002U), + PM_RET_ERROR_INVALID_NODE = (2003U), + PM_RET_ERROR_DOUBLE_REQ = (2004U), + PM_RET_ERROR_ABORT_SUSPEND = (2005U), + PM_RET_ERROR_TIMEOUT = (2006U), + PM_RET_ERROR_NODE_USED = (2007U), + PM_RET_ERROR_NO_FEATURE = (2008U) +}; + +/** + * @PM_INITIAL_BOOT: boot is a fresh system startup + * @PM_RESUME: boot is a resume + * @PM_BOOT_ERROR: error, boot cause cannot be identified + */ +enum pm_boot_status { + PM_INITIAL_BOOT, + PM_RESUME, + PM_BOOT_ERROR, +}; + +/** + * @PMF_SHUTDOWN_TYPE_SHUTDOWN: shutdown + * @PMF_SHUTDOWN_TYPE_RESET: reset/reboot + * @PMF_SHUTDOWN_TYPE_SETSCOPE_ONLY: set the shutdown/reboot scope + */ +enum pm_shutdown_type { + PMF_SHUTDOWN_TYPE_SHUTDOWN, + PMF_SHUTDOWN_TYPE_RESET, + PMF_SHUTDOWN_TYPE_SETSCOPE_ONLY, +}; + +/** + * @PMF_SHUTDOWN_SUBTYPE_SUBSYSTEM: shutdown/reboot APU subsystem only + * @PMF_SHUTDOWN_SUBTYPE_PS_ONLY: shutdown/reboot entire PS (but not PL) + * @PMF_SHUTDOWN_SUBTYPE_SYSTEM: shutdown/reboot entire system + */ +enum pm_shutdown_subtype { + PMF_SHUTDOWN_SUBTYPE_SUBSYSTEM, + PMF_SHUTDOWN_SUBTYPE_PS_ONLY, + PMF_SHUTDOWN_SUBTYPE_SYSTEM, +}; + +/** + * @PM_PLL_PARAM_DIV2: Enable for divide by 2 function inside the PLL + * @PM_PLL_PARAM_FBDIV: Feedback divisor integer portion for the PLL + * @PM_PLL_PARAM_DATA: Feedback divisor fractional portion for the PLL + * @PM_PLL_PARAM_PRE_SRC: Clock source for PLL input + * @PM_PLL_PARAM_POST_SRC: Clock source for PLL Bypass mode + * @PM_PLL_PARAM_LOCK_DLY: Lock circuit config settings for lock windowsize + * @PM_PLL_PARAM_LOCK_CNT: Lock circuit counter setting + * @PM_PLL_PARAM_LFHF: PLL loop filter high frequency capacitor control + * @PM_PLL_PARAM_CP: PLL charge pump control + * @PM_PLL_PARAM_RES: PLL loop filter resistor control + */ +enum pm_pll_param { + PM_PLL_PARAM_DIV2, + PM_PLL_PARAM_FBDIV, + PM_PLL_PARAM_DATA, + PM_PLL_PARAM_PRE_SRC, + PM_PLL_PARAM_POST_SRC, + PM_PLL_PARAM_LOCK_DLY, + PM_PLL_PARAM_LOCK_CNT, + PM_PLL_PARAM_LFHF, + PM_PLL_PARAM_CP, + PM_PLL_PARAM_RES, + PM_PLL_PARAM_MAX, +}; + +/** + * @PM_PLL_MODE_RESET: PLL is in reset (not locked) + * @PM_PLL_MODE_INTEGER: PLL is locked in integer mode + * @PM_PLL_MODE_FRACTIONAL: PLL is locked in fractional mode + */ +enum pm_pll_mode { + PM_PLL_MODE_RESET, + PM_PLL_MODE_INTEGER, + PM_PLL_MODE_FRACTIONAL, + PM_PLL_MODE_MAX, +}; + +/** + * @PM_CLOCK_DIV0_ID: Clock divider 0 + * @PM_CLOCK_DIV1_ID: Clock divider 1 + */ +enum pm_clock_div_id { + PM_CLOCK_DIV0_ID, + PM_CLOCK_DIV1_ID, +}; + +/** + * EM API IDs + */ +enum em_api_id { + EM_SET_ACTION = 1, + EM_REMOVE_ACTION, + EM_SEND_ERRORS, +}; + +#endif /* PM_DEFS_H */ diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware.c b/sys/dev/firmware/xilinx/zynqmp_firmware.c new file mode 100644 index 000000000000..8ee6c9a21377 --- /dev/null +++ b/sys/dev/firmware/xilinx/zynqmp_firmware.c @@ -0,0 +1,511 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include + +#include + +#include "zynqmp_firmware_if.h" + +enum { + IOCTL_GET_RPU_OPER_MODE = 0, + IOCTL_SET_RPU_OPER_MODE = 1, + IOCTL_RPU_BOOT_ADDR_CONFIG = 2, + IOCTL_TCM_COMB_CONFIG = 3, + IOCTL_SET_TAPDELAY_BYPASS = 4, + IOCTL_SET_SGMII_MODE = 5, + IOCTL_SD_DLL_RESET = 6, + IOCTL_SET_SD_TAPDELAY = 7, + /* Ioctl for clock driver */ + IOCTL_SET_PLL_FRAC_MODE = 8, + IOCTL_GET_PLL_FRAC_MODE = 9, + IOCTL_SET_PLL_FRAC_DATA = 10, + IOCTL_GET_PLL_FRAC_DATA = 11, + IOCTL_WRITE_GGS = 12, + IOCTL_READ_GGS = 13, + IOCTL_WRITE_PGGS = 14, + IOCTL_READ_PGGS = 15, + /* IOCTL for ULPI reset */ + IOCTL_ULPI_RESET = 16, + /* Set healthy bit value */ + IOCTL_SET_BOOT_HEALTH_STATUS = 17, + IOCTL_AFI = 18, + /* Probe counter read/write */ + IOCTL_PROBE_COUNTER_READ = 19, + IOCTL_PROBE_COUNTER_WRITE = 20, + IOCTL_OSPI_MUX_SELECT = 21, + /* IOCTL for USB power request */ + IOCTL_USB_SET_STATE = 22, + /* IOCTL to get last reset reason */ + IOCTL_GET_LAST_RESET_REASON = 23, + /* AI engine NPI ISR clear */ + IOCTL_AIE_ISR_CLEAR = 24, + /* Register SGI to ATF */ + IOCTL_REGISTER_SGI = 25, +}; + +typedef int (*zynqmp_callfn_t)(register_t, register_t, register_t, uint32_t *payload); + +struct zynqmp_firmware_softc { + struct simplebus_softc sc; + device_t dev; + zynqmp_callfn_t callfn; +}; + +/* SMC calling methods */ +#define PM_SIP_SVC 0xC2000000 + +static int +zynqmp_call_smc(uint32_t id, uint32_t a0, uint32_t a1, uint32_t a2, uint32_t a3, uint32_t *payload, bool ignore_error) +{ + struct arm_smccc_res res; + uint64_t args[3]; + + args[0] = id | PM_SIP_SVC; + args[1] = ((uint64_t)a1 << 32) | a0; + args[2] = ((uint64_t)a3 << 32) | a2; + arm_smccc_smc(args[0], args[1], args[2], 0, 0, 0, 0, 0, &res); + if (payload != NULL) { + payload[0] = res.a0 & 0xFFFFFFFF; + payload[1] = res.a0 >> 32; + payload[2] = res.a1 & 0xFFFFFFFF; + payload[3] = res.a1 >> 32; + if (!ignore_error && payload[0] != PM_RET_SUCCESS) { + printf("%s: fail %x\n", __func__, payload[0]); + return (EINVAL); + } + } + return (0); +} + +/* Firmware methods */ +static int +zynqmp_get_api_version(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_API_VERSION, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "API version = %d.%d\n", + payload[1] >> 16, payload[1] & 0xFFFF); +out: + return (rv); +} + +static int +zynqmp_get_chipid(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_CHIPID, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "ID Code = %x Version = %x\n", + payload[1], payload[2]); +out: + return (rv); +} + +static int +zynqmp_get_trustzone_version(struct zynqmp_firmware_softc *sc) +{ + uint32_t payload[4]; + int rv; + + rv = zynqmp_call_smc(PM_GET_TRUSTZONE_VERSION, 0, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + device_printf(sc->dev, "Trustzone Version = %x\n", + payload[1]); +out: + return (rv); +} + +/* zynqmp_firmware methods */ +static int +zynqmp_firmware_clock_enable(device_t dev, uint32_t clkid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_ENABLE, clkid, 0, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_disable(device_t dev, uint32_t clkid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_DISABLE, clkid, 0, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getstate(device_t dev, uint32_t clkid, bool *enabled) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETSTATE, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *enabled = payload[1] == 1 ? true : false; + +out: + return (rv); +} + +static int +zynqmp_firmware_clock_setdivider(device_t dev, uint32_t clkid, uint32_t div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_SETDIVIDER, clkid, div, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getdivider(device_t dev, uint32_t clkid, uint32_t *div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETDIVIDER, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *div = payload[1]; + +out: + return (rv); +} + +static int +zynqmp_firmware_clock_setparent(device_t dev, uint32_t clkid, uint32_t parentid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_SETPARENT, clkid, parentid, 0, 0, payload, false); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_clock_getparent(device_t dev, uint32_t clkid, uint32_t *parentid) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_CLOCK_GETPARENT, clkid, 0, 0, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *parentid = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_pll_get_mode(device_t dev, uint32_t pllid, uint32_t *mode) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_IOCTL, 0, IOCTL_GET_PLL_FRAC_MODE, pllid, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *mode = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_pll_get_frac_data(device_t dev, uint32_t pllid, uint32_t *data) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_IOCTL, 0, IOCTL_GET_PLL_FRAC_DATA, pllid, 0, payload, false); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *data = payload[1]; +out: + return (rv); +} + +static int +zynqmp_firmware_clock_get_fixedfactor(device_t dev, uint32_t clkid, uint32_t *mult, uint32_t *div) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_QUERY_DATA, PM_QID_CLOCK_GET_FIXEDFACTOR_PARAMS, clkid, 0, 0, payload, true); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + goto out; + } + *mult = payload[1]; + *div = payload[2]; +out: + return (rv); +} + +static int +zynqmp_firmware_query_data(device_t dev, uint32_t qid, uint32_t arg1, uint32_t arg2, uint32_t arg3, uint32_t *data) +{ + struct zynqmp_firmware_softc *sc; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_QUERY_DATA, qid, arg1, arg2, arg3, data, true); + /* + * PM_QID_CLOCK_GET_NAME always success and if the clock name couldn't + * be found the clock name will be all null byte + */ + if (qid == 1) + rv = 0; + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); +} + +static int +zynqmp_firmware_reset_assert(device_t dev, uint32_t resetid, bool enable) +{ + struct zynqmp_firmware_softc *sc; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_RESET_ASSERT, resetid, enable, 0, 0, NULL, true); + if (rv != 0) + device_printf(sc->dev, "SMC Call fail %d\n", rv); + + return (rv); +} + +static int +zynqmp_firmware_reset_get_status(device_t dev, uint32_t resetid, bool *status) +{ + struct zynqmp_firmware_softc *sc; + uint32_t payload[4]; + int rv; + + sc = device_get_softc(dev); + rv = zynqmp_call_smc(PM_RESET_GET_STATUS, resetid, 0, 0, 0, payload, true); + if (rv != 0) { + device_printf(sc->dev, "SMC Call fail %d\n", rv); + return (rv); + } + *status = payload[1]; + + return (rv); +} + +/* Simplebus methods */ +static struct simplebus_devinfo * +zynqmp_firmware_setup_dinfo(device_t dev, phandle_t node, + struct simplebus_devinfo *di) +{ + struct simplebus_softc *sc; + struct simplebus_devinfo *ndi; + + sc = device_get_softc(dev); + if (di == NULL) + ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO); + else + ndi = di; + if (ofw_bus_gen_setup_devinfo(&ndi->obdinfo, node) != 0) { + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + + /* reg resources is from the parent but interrupts is on the node itself */ + resource_list_init(&ndi->rl); + ofw_bus_reg_to_rl(dev, OF_parent(node), sc->acells, sc->scells, &ndi->rl); + ofw_bus_intr_to_rl(dev, node, &ndi->rl, NULL); + + return (ndi); +} + +static device_t +zynqmp_firmware_add_device(device_t dev, phandle_t node, u_int order, + const char *name, int unit, struct simplebus_devinfo *di) +{ + struct simplebus_devinfo *ndi; + device_t cdev; + + if ((ndi = zynqmp_firmware_setup_dinfo(dev, node, di)) == NULL) + return (NULL); + cdev = device_add_child_ordered(dev, order, name, unit); + if (cdev == NULL) { + device_printf(dev, "<%s>: device_add_child failed\n", + ndi->obdinfo.obd_name); + resource_list_free(&ndi->rl); + ofw_bus_gen_destroy_devinfo(&ndi->obdinfo); + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + device_set_ivars(cdev, ndi); + + return(cdev); +} + +static int +zynqmp_firmware_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (!ofw_bus_is_compatible(dev, "xlnx,zynqmp-firmware")) + return (ENXIO); + device_set_desc(dev, "ZynqMP Firmware"); + return (0); +} + +static int +zynqmp_firmware_attach(device_t dev) +{ + struct zynqmp_firmware_softc *sc; + phandle_t node, child; + device_t cdev; + + sc = device_get_softc(dev); + sc->dev = dev; + + if (bootverbose) { + zynqmp_get_api_version(sc); + zynqmp_get_chipid(sc); + zynqmp_get_trustzone_version(sc); + } + + /* Attach children */ + node = ofw_bus_get_node(dev); + for (child = OF_child(node); child != 0; child = OF_peer(child)) { + cdev = zynqmp_firmware_add_device(dev, child, 0, NULL, -1, NULL); + if (cdev != NULL) + device_probe_and_attach(cdev); + } + + return (bus_generic_attach(dev)); +} + +static device_method_t zynqmp_firmware_methods[] = { + /* device_if */ + DEVMETHOD(device_probe, zynqmp_firmware_probe), + DEVMETHOD(device_attach, zynqmp_firmware_attach), + + /* zynqmp_firmware_if */ + DEVMETHOD(zynqmp_firmware_clock_enable, zynqmp_firmware_clock_enable), + DEVMETHOD(zynqmp_firmware_clock_disable, zynqmp_firmware_clock_disable), + DEVMETHOD(zynqmp_firmware_clock_getstate, zynqmp_firmware_clock_getstate), + DEVMETHOD(zynqmp_firmware_clock_setdivider, zynqmp_firmware_clock_setdivider), + DEVMETHOD(zynqmp_firmware_clock_getdivider, zynqmp_firmware_clock_getdivider), + DEVMETHOD(zynqmp_firmware_clock_setparent, zynqmp_firmware_clock_setparent), + DEVMETHOD(zynqmp_firmware_clock_getparent, zynqmp_firmware_clock_getparent), + DEVMETHOD(zynqmp_firmware_pll_get_mode, zynqmp_firmware_pll_get_mode), + DEVMETHOD(zynqmp_firmware_pll_get_frac_data, zynqmp_firmware_pll_get_frac_data), + DEVMETHOD(zynqmp_firmware_clock_get_fixedfactor, zynqmp_firmware_clock_get_fixedfactor), + DEVMETHOD(zynqmp_firmware_query_data, zynqmp_firmware_query_data), + DEVMETHOD(zynqmp_firmware_reset_assert, zynqmp_firmware_reset_assert), + DEVMETHOD(zynqmp_firmware_reset_get_status, zynqmp_firmware_reset_get_status), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_firmware, zynqmp_firmware_driver, zynqmp_firmware_methods, + sizeof(struct zynqmp_firmware_softc), simplebus_driver); + +EARLY_DRIVER_MODULE(zynqmp_firmware, simplebus, zynqmp_firmware_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_LATE); +MODULE_VERSION(zynqmp_firmware, 1); diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware_if.m b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m new file mode 100644 index 000000000000..1007d721952d --- /dev/null +++ b/sys/dev/firmware/xilinx/zynqmp_firmware_if.m @@ -0,0 +1,109 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG +# +# 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. +# +# $FreeBSD$ + +INTERFACE zynqmp_firmware; + +METHOD int clock_enable { + device_t dev; + uint32_t clkid; +}; + +METHOD int clock_disable { + device_t dev; + uint32_t clkid; +}; *** 70 LINES SKIPPED *** From nobody Wed Oct 18 14:31:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFP2q04z4x5yX; Wed, 18 Oct 2023 14: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 4S9YFP2KkRz3Mmr; Wed, 18 Oct 2023 14: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=1697639497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viwfSEXI/iozLdyJ9QbTIwTTJtP/vFS4fUuVfAGeYdM=; b=B1Vss2pd3p4vkeg7p/WbVB5IEiUEICGvW4EhWfLMJ2AvhOZJz4MQ1d5iBMk77KFhkG3Ci/ 4CSjSBvO1O6HWk7xD9iyppWTCrfur9tntCwfEKDjGUNRbDMdpzIcZoiEpyxHrrJGvkyq/t jUOCh2S/md8KnriAb0wiS8FzQSnAlB7kySExJa/zXMsKEnyhbzbiAlnwLZDVn5nd0XTsfZ LUV8LzwuDsCDOgV7/RuvsejoUdb6lcQuAfHlLsjhy6GZ4iFHpOQhtzODkR3xMVenGS8xH9 0wnA5YpiiV1dt01KyMxtMiKNtbgF6pQmX+uF2RT3pZV2WsPvDmg53BKj0Tvniw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639497; a=rsa-sha256; cv=none; b=yJcE839LnvDVRW/PQ3R7D2ETzKdYG3GeC9PaA1bRVcRO6y7xAYO9tQalgbIrlpCWcWvWk6 H66C/IORdKytoU/IH9eRH3M6D3Su6gicO7SOrmJnxTw+lgGPCUjreyHDuPVyTn/SSwXfvU BayRGouZj0xAPzf2gRaEKpoeCtfeSozlcQliIWLi1OMAdF3XNMKw0nYIkGQHvnuZyKNX7W iOvqwSkzZl8mGZCKPcNuU5LzRPzRYhOvx8BmnPL9MoERjIf5Gmx4CvrPYZgSIHfMl55qBN qmjzxzPo6wC/MJa1CkrMvCL5jysLKPOhFgJESIqhSHjsY8RChTJz40INzwgv6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viwfSEXI/iozLdyJ9QbTIwTTJtP/vFS4fUuVfAGeYdM=; b=My5vNOsDegM2eMkh8mxOCSkXvLZMCUf+F6wihKxz0TeNOd1W8S05NbhjQ861ULTZbaKe4I RrXWhHoC5j7SmbeNIqTV37hSLqPrgUGdbrcbjSLIhnFdWgP9Fyujs56hYwrdK6OiD+qDPj lMYJAXcTYBEn5oiSjPUFeZqrkV1rmUvpYY7ys1gMRBP9YfV4jcwfDNohu35S+q+cZ5aLwk I1vwvYBWknSeUrRl+46bryXZhXO1YOwBD4wME7gz48WFwFF8JTYgyYXQuLVLYkCIlz+x5+ wD6cmKrLdoMaowQc0CSWn/QC8W2fVERj8xO8g1JbU0F9jctg+tFnATUhIiDPcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFP1D18z19Fy; Wed, 18 Oct 2023 14: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 39IEVbJM089062; Wed, 18 Oct 2023 14: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 39IEVbdN089059; Wed, 18 Oct 2023 14:31:37 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:37 GMT Message-Id: <202310181431.39IEVbdN089059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 20d6c796fae0 - stable/14 - arm64: zynqmp: Add clock driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20d6c796fae0d3075485159514825a9090e50ce8 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=20d6c796fae0d3075485159514825a9090e50ce8 commit 20d6c796fae0d3075485159514825a9090e50ce8 Author: Emmanuel Vadot AuthorDate: 2023-09-07 07:57:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:03 +0000 arm64: zynqmp: Add clock driver Add clock and reset drivers for the ZynqMP SoC. The clocks are discovered by talking to the firmware as the topology isn't fixed on this SoC. Differential Revision: https://reviews.freebsd.org/D41812 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 4e579ad047720775ab580b74192c7de8a3386fea) --- sys/conf/files.arm64 | 7 + sys/dev/clk/xilinx/zynqmp_clk_div.c | 140 +++++++++ sys/dev/clk/xilinx/zynqmp_clk_div.h | 38 +++ sys/dev/clk/xilinx/zynqmp_clk_fixed.c | 101 ++++++ sys/dev/clk/xilinx/zynqmp_clk_fixed.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_gate.c | 102 ++++++ sys/dev/clk/xilinx/zynqmp_clk_gate.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_mux.c | 89 ++++++ sys/dev/clk/xilinx/zynqmp_clk_mux.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clk_pll.c | 132 ++++++++ sys/dev/clk/xilinx/zynqmp_clk_pll.h | 33 ++ sys/dev/clk/xilinx/zynqmp_clock.c | 562 ++++++++++++++++++++++++++++++++++ sys/dev/clk/xilinx/zynqmp_reset.c | 253 +++++++++++++++ 13 files changed, 1556 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 987a1ea6cd09..dc78840646bb 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -700,3 +700,10 @@ arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt dev/firmware/xilinx/zynqmp_firmware.c optional fdt soc_xilinx_zynq dev/firmware/xilinx/zynqmp_firmware_if.m optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clock.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_div.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_fixed.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_gate.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_mux.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_clk_pll.c optional fdt soc_xilinx_zynq +dev/clk/xilinx/zynqmp_reset.c optional fdt soc_xilinx_zynq diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.c b/sys/dev/clk/xilinx/zynqmp_clk_div.c new file mode 100644 index 000000000000..cc6e4d73e92d --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_div.c @@ -0,0 +1,140 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +#define DIV_ROUND_CLOSEST(n, d) (((n) + (d) / 2) / (d)) + +struct zynqmp_clk_div_softc { + device_t firmware; + enum zynqmp_clk_div_type type; + uint32_t id; +}; + +static int +zynqmp_clk_div_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_div_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_div_softc *sc; + uint32_t div; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GETDIVIDER(sc->firmware, sc->id, &div); + if (rv != 0) { + printf("%s: Error while getting divider for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + if (sc->type == CLK_DIV_TYPE_DIV0) + div &= 0xFFFF; + else + div = div >> 16; + *freq = howmany((unsigned long long)*freq, div + 1); + return (0); +} + +static int +zynqmp_clk_div_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + struct zynqmp_clk_div_softc *sc; + uint32_t div; + int rv; + + sc = clknode_get_softc(clk); + + div = DIV_ROUND_CLOSEST(fparent, *fout); + if (sc->type == CLK_DIV_TYPE_DIV0) { + div &= 0xFFFF; + div |= 0xFFFF << 16; + } else { + div <<= 16; + div |= 0xFFFF; + } + + rv = ZYNQMP_FIRMWARE_CLOCK_SETDIVIDER(sc->firmware, sc->id, div); + if (rv != 0) { + printf("%s: Error while setting divider for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + return (rv); +} + +static clknode_method_t zynqmp_clk_div_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_div_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_div_recalc), + CLKNODEMETHOD(clknode_set_freq, zynqmp_clk_div_set_freq), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_div_clknode, zynqmp_clk_div_clknode_class, + zynqmp_clk_div_clknode_methods, sizeof(struct zynqmp_clk_div_softc), clknode_class); + +int +zynqmp_clk_div_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef, enum zynqmp_clk_div_type type) +{ + struct clknode *clk; + struct zynqmp_clk_div_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_div_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + sc->type = type; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_div.h b/sys/dev/clk/xilinx/zynqmp_clk_div.h new file mode 100644 index 000000000000..f0dc07bf63e6 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_div.h @@ -0,0 +1,38 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZYNQMP_CLK_DIV_H_ +#define _ZYNQMP_CLK_DIV_H_ + +enum zynqmp_clk_div_type { + CLK_DIV_TYPE_DIV0 = 0, + CLK_DIV_TYPE_DIV1 +}; + +int zynqmp_clk_div_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef, enum zynqmp_clk_div_type type); + +#endif /* _ZYNQMP_CLK_DIV_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.c b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c new file mode 100644 index 000000000000..94de0491acb6 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.c @@ -0,0 +1,101 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_fixed_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_fixed_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_fixed_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_fixed_softc *sc; + uint32_t mult, div; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GET_FIXEDFACTOR(sc->firmware, sc->id, &mult, &div); + if (rv != 0) { + printf("%s: Error while getting fixed factor for %s\n", + __func__, + clknode_get_name(clk)); + return (EINVAL); + } + + *freq = (*freq * mult) / div; + return (0); +} + +static clknode_method_t zynqmp_clk_fixed_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_fixed_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_fixed_recalc), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_fixed_clknode, zynqmp_clk_fixed_clknode_class, + zynqmp_clk_fixed_clknode_methods, sizeof(struct zynqmp_clk_fixed_softc), clknode_class); + +int +zynqmp_clk_fixed_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_fixed_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_fixed_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_fixed.h b/sys/dev/clk/xilinx/zynqmp_clk_fixed.h new file mode 100644 index 000000000000..c014ea7b5457 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_fixed.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZYNQMP_CLK_FIXED_H_ +#define _ZYNQMP_CLK_FIXED_H_ + +int zynqmp_clk_fixed_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_FIXED_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.c b/sys/dev/clk/xilinx/zynqmp_clk_gate.c new file mode 100644 index 000000000000..180c7db38c09 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.c @@ -0,0 +1,102 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_gate_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_gate_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_set_gate(struct clknode *clk, bool enable) +{ + struct zynqmp_clk_gate_softc *sc; + int rv; + + sc = clknode_get_softc(clk); + if (enable) + rv = ZYNQMP_FIRMWARE_CLOCK_ENABLE(sc->firmware, sc->id); + else + rv = ZYNQMP_FIRMWARE_CLOCK_DISABLE(sc->firmware, sc->id); + if (rv != 0) { + printf("%s: Error %sbling %s\n", + __func__, + enable == true ? "ena" : "disa", + clknode_get_name(clk)); + return (EINVAL); + } + return (0); +} + +static clknode_method_t zynqmp_clk_gate_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_gate_init), + CLKNODEMETHOD(clknode_set_gate, zynqmp_clk_set_gate), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_gate_clknode, zynqmp_clk_gate_clknode_class, + zynqmp_clk_gate_clknode_methods, sizeof(struct zynqmp_clk_gate_softc), clknode_class); + +int +zynqmp_clk_gate_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_gate_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_gate_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_gate.h b/sys/dev/clk/xilinx/zynqmp_clk_gate.h new file mode 100644 index 000000000000..bc6e9f218d41 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_gate.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZYNQMP_CLK_GATE_H_ +#define _ZYNQMP_CLK_GATE_H_ + +int zynqmp_clk_gate_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_GATE_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.c b/sys/dev/clk/xilinx/zynqmp_clk_mux.c new file mode 100644 index 000000000000..6826ee5123fe --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.c @@ -0,0 +1,89 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_mux_softc { + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_mux_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_mux_set_mux(struct clknode *clk, int idx) +{ + + printf("%s: called for %s\n", __func__, clknode_get_name(clk)); + return (0); +} + +static clknode_method_t zynqmp_clk_mux_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_mux_init), + CLKNODEMETHOD(clknode_set_mux, zynqmp_clk_mux_set_mux), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_mux_clknode, zynqmp_clk_mux_clknode_class, + zynqmp_clk_mux_clknode_methods, sizeof(struct zynqmp_clk_mux_softc), clknode_class); + +int +zynqmp_clk_mux_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_mux_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_mux_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_mux.h b/sys/dev/clk/xilinx/zynqmp_clk_mux.h new file mode 100644 index 000000000000..4768accd2c9e --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_mux.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZYNQMP_CLK_MUX_H_ +#define _ZYNQMP_CLK_MUX_H_ + +int zynqmp_clk_mux_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_MUX_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.c b/sys/dev/clk/xilinx/zynqmp_clk_pll.c new file mode 100644 index 000000000000..6e5da9533859 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.c @@ -0,0 +1,132 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include + +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +struct zynqmp_clk_pll_softc { + device_t firmware; + uint32_t id; +}; + +enum pll_mode { + PLL_MODE_INT = 0, + PLL_MODE_FRAC, + PLL_MODE_ERROR, +}; + +static int +zynqmp_clk_pll_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static int +zynqmp_clk_pll_recalc(struct clknode *clk, uint64_t *freq) +{ + struct zynqmp_clk_pll_softc *sc; + uint64_t pll_freq, pll_frac; + uint32_t div, mode, frac; + int rv; + + sc = clknode_get_softc(clk); + rv = ZYNQMP_FIRMWARE_CLOCK_GETDIVIDER(sc->firmware, sc->id, &div); + if (rv != 0) { + printf("%s: Error while getting divider for %s\n", + __func__, + clknode_get_name(clk)); + } + rv = ZYNQMP_FIRMWARE_PLL_GET_MODE(sc->firmware, sc->id, &mode); + if (rv != 0) { + printf("%s: Error while getting mode for %s\n", + __func__, + clknode_get_name(clk)); + } + if (mode == PLL_MODE_ERROR) + return (0); + + pll_freq = *freq * div; + if (mode == PLL_MODE_FRAC) { + ZYNQMP_FIRMWARE_PLL_GET_FRAC_DATA(sc->firmware, sc->id, &frac); + pll_frac = (*freq * frac) / (1 << 16); + pll_freq += pll_frac; + } + + *freq = pll_freq; + return (0); +} + +static int +zynqmp_clk_pll_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, + int flags, int *stop) +{ + + /* TODO probably at one point */ + return (ENOTSUP); +} + +static clknode_method_t zynqmp_clk_pll_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_pll_init), + CLKNODEMETHOD(clknode_recalc_freq, zynqmp_clk_pll_recalc), + CLKNODEMETHOD(clknode_set_freq, zynqmp_clk_pll_set_freq), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_pll_clknode, zynqmp_clk_pll_clknode_class, + zynqmp_clk_pll_clknode_methods, sizeof(struct zynqmp_clk_pll_softc), clknode_class); + +int +zynqmp_clk_pll_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef) +{ + struct clknode *clk; + struct zynqmp_clk_pll_softc *sc; + uint32_t fw_clk_id; + + fw_clk_id = clkdef->id - 1; + clkdef->id = 0; + clk = clknode_create(clkdom, &zynqmp_clk_pll_clknode_class, clkdef); + if (clk == NULL) + return (1); + sc = clknode_get_softc(clk); + sc->id = fw_clk_id; + sc->firmware = fw; + clknode_register(clkdom, clk); + return (0); +} diff --git a/sys/dev/clk/xilinx/zynqmp_clk_pll.h b/sys/dev/clk/xilinx/zynqmp_clk_pll.h new file mode 100644 index 000000000000..c905efc1755f --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clk_pll.h @@ -0,0 +1,33 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _ZYNQMP_CLK_PLL_H_ +#define _ZYNQMP_CLK_PLL_H_ + +int zynqmp_clk_pll_register(struct clkdom *clkdom, device_t fw, struct clknode_init_def *clkdef); + +#endif /* _ZYNQMP_CLK_PLL_H_ */ diff --git a/sys/dev/clk/xilinx/zynqmp_clock.c b/sys/dev/clk/xilinx/zynqmp_clock.c new file mode 100644 index 000000000000..76f23cec38d0 --- /dev/null +++ b/sys/dev/clk/xilinx/zynqmp_clock.c @@ -0,0 +1,562 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include "clkdev_if.h" +#include "zynqmp_firmware_if.h" + +#define ZYNQMP_MAX_NAME_LEN 16 +#define ZYNQMP_MAX_NODES 6 +#define ZYNQMP_MAX_PARENTS 100 + +#define ZYNQMP_CLK_IS_VALID (1 << 0) +#define ZYNQMP_CLK_IS_EXT (1 << 2) + +#define ZYNQMP_GET_NODE_TYPE(x) (x & 0x7) +#define ZYNQMP_GET_NODE_CLKFLAGS(x) ((x >> 8) & 0xFF) +#define ZYNQMP_GET_NODE_TYPEFLAGS(x) ((x >> 24) & 0xF) + +enum ZYNQMP_NODE_TYPE { + CLK_NODE_TYPE_NULL = 0, + CLK_NODE_TYPE_MUX, + CLK_NODE_TYPE_PLL, + CLK_NODE_TYPE_FIXED, + CLK_NODE_TYPE_DIV0, + CLK_NODE_TYPE_DIV1, + CLK_NODE_TYPE_GATE, +}; + +/* + * Clock IDs in the firmware starts at 0 but + * exported clocks (and so clock exposed by the clock framework) + * starts at 1 + */ +#define ZYNQMP_ID_TO_CLK(x) ((x) + 1) +#define CLK_ID_TO_ZYNQMP(x) ((x) - 1) + +struct zynqmp_clk { + TAILQ_ENTRY(zynqmp_clk) next; + struct clknode_init_def clkdef; + uint32_t id; + uint32_t parentids[ZYNQMP_MAX_PARENTS]; + uint32_t topology[ZYNQMP_MAX_NODES]; + uint32_t attributes; +}; + +struct zynqmp_clock_softc { + device_t dev; + device_t parent; + phandle_t node; + clk_t clk_pss_ref; + clk_t clk_video; + clk_t clk_pss_alt_ref; + clk_t clk_aux_ref; + clk_t clk_gt_crx_ref; + struct clkdom *clkdom; +}; + +struct name_resp { + char name[16]; +}; + +struct zynqmp_clk_softc { + struct zynqmp_clk *clk; + device_t firmware; + uint32_t id; +}; + +static int +zynqmp_clk_init(struct clknode *clk, device_t dev) +{ + + clknode_init_parent_idx(clk, 0); + return (0); +} + +static clknode_method_t zynqmp_clk_clknode_methods[] = { + /* Device interface */ + CLKNODEMETHOD(clknode_init, zynqmp_clk_init), + CLKNODEMETHOD_END +}; + +DEFINE_CLASS_1(zynqmp_clk_clknode, zynqmp_clk_clknode_class, + zynqmp_clk_clknode_methods, sizeof(struct zynqmp_clk_softc), clknode_class); + +static int *** 686 LINES SKIPPED *** From nobody Wed Oct 18 14:31:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFQ4D9Dz4x5yb; Wed, 18 Oct 2023 14:31: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 4S9YFQ3f7cz3N4W; Wed, 18 Oct 2023 14:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUx1HkA99z7QbZoWQwfajfEEtuqiSeipocXoBdK8omA=; b=nDgmIyD9PZT0mpIO08KKl4a6d+f9SWeflf4kuuW9KJNCHGoPUdVKR2FoF8QSbkB2pELy4K oaNalOkJFV5XooAlD742wFHdXPJ/02l3ia+qClF0zLSevKRqcoxpky/LSYvl7eUUFw6L81 rIYKUdp6vEWDqRP14kr3xXQSuFqpQiNHNGdYtIR4PPuyd7Kg3IhmOE5zv+CezPaWZiMwhU 8c2f0DvEKONl3FXlKQiQhW6TwtiJ1d1S/wNeCE/90ltlinM+OG+SIb0Xg0qYnOTr7r5a7r 7HSVa1PVMyQS8zbhpuLW322JS5hAtT5ZCdLSeEJdNePVFHeKiPuaYtStpDazNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639498; a=rsa-sha256; cv=none; b=pRX4l2F86O5HAOjHoW/doWFnHWR2mye8lzOGmnKajx6mhblCLcQMyTraYQGzXiy9CEnx0r U0DIsXvnzsES71TktxR7uWr2hhsOa33vxeKU50ppb/TUuujWBfCrCsymoboXyH+JuD1iLa kxmi7Hozu83R52TrBD6WvIfLMoPOPbSiUfRvGWZ10gdqGfuJkmu8uy06M21i4Lbgmwhv/m PXYpVj4fE/NI1IqreJnzRLmdkS+1mil/NzwABSuaUldY9rx0oe2zTvgeDT0rb26aSbf+lL 1DorrAZ7yPLB5kFS9Iz1DFcazzyBFUguwil2+yqULmbRk5AHAVlRBE/Iw2lxvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hUx1HkA99z7QbZoWQwfajfEEtuqiSeipocXoBdK8omA=; b=gehqLT/p347QH6RSmX6EQOQyar+8N0ym57B2u79mGgFkbN1c3EtEMtmku7EGiK7HgkBU3c sJHjKy/hEZ2r5uJT/Fg0TcbTNiMhCz6jG6bS+g7OnPhIi3qSnSVXZPGOULZxLfPiJhZU2u WTVxT/htV4tDkOo+b1PDVnDjoKx05Vqk8KtEs5NCtQ3RilEBq/7WIVoalAEuM+GhDrkR11 k0f32mUAHDeAfn+k4AiSdfeTXfIGHOWwINfbSrHRXufuNOGynk5y7bZjw1HX7ZdbO9jspi uOL2OTSxGhBILRtLWkDf+cNXMeiAUz+h3qWKXYEsO0v/BInQ/rmaU0Sy98eogA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFQ2TD3z18ts; Wed, 18 Oct 2023 14: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 39IEVcT6089107; Wed, 18 Oct 2023 14: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 39IEVcCI089104; Wed, 18 Oct 2023 14:31:38 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:38 GMT Message-Id: <202310181431.39IEVcCI089104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 023ba06b4f95 - stable/14 - sdhci: fdt: Remove sdhci_generic compatible string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 commit 023ba06b4f95fa106e6bda2fe349ff32f9ab42c9 Author: Emmanuel Vadot AuthorDate: 2023-09-06 08:59:18 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:05 +0000 sdhci: fdt: Remove sdhci_generic compatible string This was used when we had our own DTS, it's not used anymore. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41807 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 8c7e747491ad636d6ee4069a74ddb24814870540) --- sys/dev/sdhci/sdhci_fdt.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 4a355d6514ad..16748dd4982c 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -70,12 +70,11 @@ #define MAX_SLOTS 6 #define SDHCI_FDT_ARMADA38X 1 -#define SDHCI_FDT_GENERIC 2 -#define SDHCI_FDT_XLNX_ZY7 3 -#define SDHCI_FDT_QUALCOMM 4 -#define SDHCI_FDT_RK3399 5 -#define SDHCI_FDT_RK3568 6 -#define SDHCI_FDT_XLNX_ZMP 7 +#define SDHCI_FDT_XLNX_ZY7 2 +#define SDHCI_FDT_QUALCOMM 3 +#define SDHCI_FDT_RK3399 4 +#define SDHCI_FDT_RK3568 5 +#define SDHCI_FDT_XLNX_ZMP 6 #define RK3399_GRF_EMMCCORE_CON0 0xf000 #define RK3399_CORECFG_BASECLKFREQ 0xff00 @@ -118,7 +117,6 @@ static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, - { "sdhci_generic", SDHCI_FDT_GENERIC }, { "qcom,sdhci-msm-v4", SDHCI_FDT_QUALCOMM }, { "rockchip,rk3399-sdhci-5.1", SDHCI_FDT_RK3399 }, { "xlnx,zy7_sdhci", SDHCI_FDT_XLNX_ZY7 }, @@ -516,9 +514,6 @@ sdhci_fdt_probe(device_t dev) sc->quirks = SDHCI_QUIRK_BROKEN_AUTO_STOP; device_set_desc(dev, "ARMADA38X SDHCI controller"); break; - case SDHCI_FDT_GENERIC: - device_set_desc(dev, "generic fdt SDHCI controller"); - break; case SDHCI_FDT_QUALCOMM: sc->quirks = SDHCI_QUIRK_ALL_SLOTS_NON_REMOVABLE | SDHCI_QUIRK_BROKEN_SDMA_BOUNDARY; From nobody Wed Oct 18 14:31:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFR6gKXz4x5yd; Wed, 18 Oct 2023 14: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 4S9YFR484Yz3Mt4; Wed, 18 Oct 2023 14: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=1697639499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a7oWxftNk2QtOnJ3trMS+W/3xD0xoFBrJa+VDvILBpM=; b=V2lZBJfEwdtDjoJXoVeYsG8KJY1Hg3JDgZMkGTDLh1sxeQqEkxNvyfG9XOaZwFIBMtS4k7 aIWbSYRoMOHWMOxByDRHdBR0A4MtPSsUq0AgUKf7bKtc5R1h8HqitSNUiuIm4qZxlSq5s1 DHf/jpe4N/e1KDjlUAzr+KXUmz1wfd0FXk/egl4Dsb74vbdgyLdlQvanNqG412WlJuv4BC v8XOXK4uPbdyQbImzmnnPl/6jdLnVRTQQ1Ft6XCAtQt0wLev0tnroC+JAQy2LbwHUGH9We aaccNctitLnl0ceYWUOESNTXDqNETN0MH/FkjLbIXB+nmnI0JC1U0dJxPoDqOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639499; a=rsa-sha256; cv=none; b=nmY9vhqZtOzRL1Ne74czrueL5gKLdytPVDLAcwsDUWjJQ9t8M6aET1fxWYJ79pYfAda/hJ rSX3Ri+8SQSwTxFJyA/GU/yobK5eeUmFYctXYptKpv0phwJy2CXdsxUUHgBoMpAMzkQKey 0uujtBS1erFaTE8WUGw9cirkyPpV7da7Df46eCWM6aslzhIFL8E/0O9UCYhJOwWTRwGk4h Kg7tAC1vrE1wiACels3fqfm7q1MpIN6WMc+d6C9TBCqkfo1qy7HjXh8m61lpH+XIJ94mWh UUFTGIG42Svcn6Etx7PNhFYW9G1N8215It3deZbWMHyn9OoLgPsvmTIvooKbrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a7oWxftNk2QtOnJ3trMS+W/3xD0xoFBrJa+VDvILBpM=; b=hT1OkwoB2W3LbLv4WIAUb3igJpmWIQ2kDzbqx4BHUxp31diV6nYXmLK0+aHF9iiOMvRoF5 gBMw9TXibdoNUBl5qZRq2HHXjBTNsASe432eezGH87zNZ+RAtU3g1UR3AAra5YKm57Lxlm D7uApqDrOPB9tGReCS4EypUHFbbi7nWT0e1e9eoXqkn1qLI7KUmuT8HFPnXRwB+8yH98MP OTc1cu4lB2feNXzr2i0TfbCOOVkaCS2b9yx/yVcO+MKjYeSkm+4sTm9zBEYpm+UOH4TLi2 fuvOu7b/oDQ0Ecnv4q025ihImIiggM4Z24NeIPxlXsTSeLtOEFOKbDOpxHRhGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFR3Ftyz18rP; Wed, 18 Oct 2023 14:31: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 39IEVdHw089161; Wed, 18 Oct 2023 14:31:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVdev089158; Wed, 18 Oct 2023 14:31:39 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:39 GMT Message-Id: <202310181431.39IEVdev089158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d6a1d41df4fa - stable/14 - sdhci: fdt: Always enable clock for ZynqMP and RK3399 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d6a1d41df4faf10bb66e62a6bb2ecc5c3b3d43cd Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d6a1d41df4faf10bb66e62a6bb2ecc5c3b3d43cd commit d6a1d41df4faf10bb66e62a6bb2ecc5c3b3d43cd Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:07:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:07 +0000 sdhci: fdt: Always enable clock for ZynqMP and RK3399 Those two (in fact all of the supported one in this driver except RK3568) always needs the clocks to be enabled. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41808 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 9377d7049c846d1e35c8fc8809c23e6413909fca) --- sys/dev/sdhci/sdhci_fdt.c | 59 +++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 16748dd4982c..372b08a3b78a 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -268,13 +268,9 @@ sdhci_init_rk3399_emmccardclk(device_t dev) } static int -sdhci_init_rk3399(device_t dev) +sdhci_init_clocks(device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(dev); - struct syscon *grf = NULL; - phandle_t node; - uint64_t freq; - uint32_t mask, val; int error; /* Get and activate clocks */ @@ -288,11 +284,6 @@ sdhci_init_rk3399(device_t dev) device_printf(dev, "cannot enable xin clock\n"); return (ENXIO); } - error = clk_get_freq(sc->clk_xin, &freq); - if (error != 0) { - device_printf(dev, "cannot get xin clock frequency\n"); - return (ENXIO); - } error = clk_get_by_ofw_name(dev, 0, "clk_ahb", &sc->clk_ahb); if (error != 0) { device_printf(dev, "cannot get ahb clock\n"); @@ -304,6 +295,25 @@ sdhci_init_rk3399(device_t dev) return (ENXIO); } + return (0); +} + +static int +sdhci_init_rk3399(device_t dev) +{ + struct sdhci_fdt_softc *sc = device_get_softc(dev); + struct syscon *grf = NULL; + phandle_t node; + uint64_t freq; + uint32_t mask, val; + int error; + + error = clk_get_freq(sc->clk_xin, &freq); + if (error != 0) { + device_printf(dev, "cannot get xin clock frequency\n"); + return (ENXIO); + } + /* Register clock */ sdhci_init_rk3399_emmccardclk(dev); @@ -561,7 +571,7 @@ sdhci_fdt_attach(device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(dev); struct sdhci_slot *slot; - int err, slots, rid, i; + int err, slots, rid, i, compat; sc->dev = dev; @@ -574,24 +584,33 @@ sdhci_fdt_attach(device_t dev) return (ENOMEM); } - if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == - SDHCI_FDT_RK3399) { - /* Initialize SDHCI */ - err = sdhci_init_rk3399(dev); + compat = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + switch (compat) { + case SDHCI_FDT_RK3399: + case SDHCI_FDT_XLNX_ZMP: + err = sdhci_init_clocks(dev); if (err != 0) { - device_printf(dev, "Cannot init RK3399 SDHCI\n"); + device_printf(dev, "Cannot init clocks\n"); return (err); } - } - - if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == - SDHCI_FDT_RK3568) { + if (compat == SDHCI_FDT_RK3399) { + err = sdhci_init_rk3399(dev); + if (err != 0) { + device_printf(dev, "Cannot init RK3399 SDHCI\n"); + return (err); + } + } + break; + case SDHCI_FDT_RK3568: /* setup & enable clocks */ if (clk_get_by_ofw_name(dev, 0, "core", &sc->clk_core)) { device_printf(dev, "cannot get core clock\n"); return (ENXIO); } clk_enable(sc->clk_core); + break; + default: + break; } /* Scan all slots. */ From nobody Wed Oct 18 14:31:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFS67zLz4x63Q; Wed, 18 Oct 2023 14:31: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 4S9YFS5WKPz3MnW; Wed, 18 Oct 2023 14:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UhAqqv0xAwji2eEGobtES3EeU/TtQi7pe0swNlMWyVs=; b=o9X++XpXf2Obf0h3T6DkSeMzp51wkhJkVRoFNBeVuMI6Y3l4B29Mwd9nMGSEA9IbLf9i+2 UbrqLJmXeaBj35DnOUTYn/AM8r4PC9B6XqyNHCDR/ZYDqMl5WSO1Fb+Z5C0hBYLnR7bEjQ 98tsrt4iKvxdpelcAXxEh7QIsXhtdCjxso6RcCzS1P3EjHvlbC3a6jfrfPKsj9HOANDYcS xLjUBKgIdxyxDuy9loTSpIbrH1adyPhVtE5Vbi/M9L/1ot+4ixCIo/uDmaTANr3QbOOtR7 rPep02cxg8P2lftQeYRVc0YquQcvtiRc0jsUA7zIEefzUIslmP+hG3QJ9XWpFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639500; a=rsa-sha256; cv=none; b=l2ZLgstLhr/H4c5nNFSSyQuRAArE/v8fi8B/Qm0WzpCJyWM5YNRIbxrLVjudt8TD0Ksdjx fkwZNxMe1qxKDKFB0zHfl7+d8n3+HGP+QPFeI2tQ+RcB4tBfXTL71gWAFnhIJXjhOSf/TR 6MVj8MDyFXlpm9MSO2A2Z5mr10HwaTgn7SGppbh3mPtgT2qPBszC4jY0LldkRQY/k6EL+t j3keQVBIiSCm5yVEsXn4zw71wAZPOp3qLEipGY/oIDVaq3AAnnel5W+CU7FRc5o2OUsG6Z KC/WRWZ7q0U3skEQPSJyU9MP0+31C0yOXHMLV52tQtyrAUjI7jihIsmPPQ355g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UhAqqv0xAwji2eEGobtES3EeU/TtQi7pe0swNlMWyVs=; b=fgmPqBptYjuvxE6XiBrmXkhcEZmMmLv64J29OQqybV8XGYK6K71tpVJIrKJPzIt70a0wyi a6pWUbEw80Y8OolgB8u63oUN0bqjbyhIYzWem+FSQndpB8Fa0bZLXQ3E10XXzQBwXjgkdk RAlgHCrIFzkxJcvdiZ2X3agCL7SnpsCmIFYDOcPXK7EtuENGfH/+sioSamN5jLlw5OsDEj 3kUP1GrZp22K9cS+nKaSg4NRgRtJo6OwCIbKxudV9USZtqya4NfMdBKc03SC2KLFdoIE1I gohudMIU2OsE8CzY1Q4mCQN2QHYi1qGvMBxxDYtIrDZq6NcpMeqQMbt0dQeaow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFS4JMPz18tv; Wed, 18 Oct 2023 14:31: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 39IEVe8b089232; Wed, 18 Oct 2023 14:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVevt089229; Wed, 18 Oct 2023 14:31:40 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:40 GMT Message-Id: <202310181431.39IEVevt089229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 62b14a75310b - stable/14 - sdhci: fdt: Always try to get the phy and the syscon List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 62b14a75310be97c13eafb236447bbf2ef54f357 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=62b14a75310be97c13eafb236447bbf2ef54f357 commit 62b14a75310be97c13eafb236447bbf2ef54f357 Author: Emmanuel Vadot AuthorDate: 2023-09-06 09:28:11 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:08 +0000 sdhci: fdt: Always try to get the phy and the syscon Per the bindings the phy and the syscon can always be present not just for RK3399. Reviewed-by: bz Differiential Revision: https://reviews.freebsd.org/D41809 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 0ee5d6fcfc63be48fd7c1b461917dfb880dc7f72) --- sys/dev/sdhci/sdhci_fdt.c | 75 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 372b08a3b78a..f3a9b5091f6b 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -146,6 +146,8 @@ struct sdhci_fdt_softc { clk_t clk_ahb; /* ahb clock */ clk_t clk_core; /* core clock */ phy_t phy; /* phy to be used */ + + struct syscon *syscon; /* Handle to the syscon */ }; struct rk3399_emmccardclk_sc { @@ -299,54 +301,71 @@ sdhci_init_clocks(device_t dev) } static int -sdhci_init_rk3399(device_t dev) +sdhci_init_phy(struct sdhci_fdt_softc *sc) { - struct sdhci_fdt_softc *sc = device_get_softc(dev); - struct syscon *grf = NULL; - phandle_t node; - uint64_t freq; - uint32_t mask, val; int error; - error = clk_get_freq(sc->clk_xin, &freq); - if (error != 0) { - device_printf(dev, "cannot get xin clock frequency\n"); - return (ENXIO); - } - - /* Register clock */ - sdhci_init_rk3399_emmccardclk(dev); - /* Enable PHY */ - error = phy_get_by_ofw_name(dev, 0, "phy_arasan", &sc->phy); + error = phy_get_by_ofw_name(sc->dev, 0, "phy_arasan", &sc->phy); + if (error == ENOENT) + return (0); if (error != 0) { - device_printf(dev, "Could not get phy\n"); + device_printf(sc->dev, "Could not get phy\n"); return (ENXIO); } error = phy_enable(sc->phy); if (error != 0) { - device_printf(dev, "Could not enable phy\n"); + device_printf(sc->dev, "Could not enable phy\n"); return (ENXIO); } + + return (0); +} + +static int +sdhci_get_syscon(struct sdhci_fdt_softc *sc) +{ + phandle_t node; + /* Get syscon */ - node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(sc->dev); if (OF_hasprop(node, "arasan,soc-ctl-syscon") && - syscon_get_by_ofw_property(dev, node, - "arasan,soc-ctl-syscon", &grf) != 0) { - device_printf(dev, "cannot get grf driver handle\n"); + syscon_get_by_ofw_property(sc->dev, node, + "arasan,soc-ctl-syscon", &sc->syscon) != 0) { + device_printf(sc->dev, "cannot get syscon handle\n"); return (ENXIO); } + return (0); +} + +static int +sdhci_init_rk3399(device_t dev) +{ + struct sdhci_fdt_softc *sc = device_get_softc(dev); + uint64_t freq; + uint32_t mask, val; + int error; + + error = clk_get_freq(sc->clk_xin, &freq); + if (error != 0) { + device_printf(dev, "cannot get xin clock frequency\n"); + return (ENXIO); + } + + /* Register clock */ + sdhci_init_rk3399_emmccardclk(dev); + /* Disable clock multiplier */ mask = RK3399_CORECFG_CLOCKMULTIPLIER; val = 0; - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON11, (mask << 16) | val); /* Set base clock frequency */ mask = RK3399_CORECFG_BASECLKFREQ; val = SHIFTIN((freq + (1000000 / 2)) / 1000000, RK3399_CORECFG_BASECLKFREQ); - SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); + SYSCON_WRITE_4(sc->syscon, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val); return (0); } @@ -593,6 +612,14 @@ sdhci_fdt_attach(device_t dev) device_printf(dev, "Cannot init clocks\n"); return (err); } + if ((err = sdhci_init_phy(sc)) != 0) { + device_printf(dev, "Cannot init phy\n"); + return (err); + } + if ((err = sdhci_get_syscon(sc)) != 0) { + device_printf(dev, "Cannot get syscon handle\n"); + return (err); + } if (compat == SDHCI_FDT_RK3399) { err = sdhci_init_rk3399(dev); if (err != 0) { From nobody Wed Oct 18 14:31:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFV0Xvwz4x61M; Wed, 18 Oct 2023 14:31: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 4S9YFT6m1lz3N0s; Wed, 18 Oct 2023 14:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnsJqx6F+jUjRmm5nYiOraLeeObfg07Yj4sZY9Z81Qk=; b=X2JHUEQQoqGrui0HGKjk/uFtgdRUbfkxxxpCh/rmyPJlT7opFa8hoof+FiuDOo4Ja+8cnx fxn0spZCEXubfkyT3XoKaptGWmr3MrP6SNzgBT/f4HCXFbdVqK3V2n5XUh4hIOUx5p4ksL LnK5LnRCNl6G623xsawFtqKOA12MfqCBa+bCOwxv7xOGVKATgTb6JS+CFrAYJJ6IX9DKWg TNaLePD5PygqDFxYeeWzRYTZzXBjuIX6nFVisxXQQ+LkXq06d/Q4IZEd7RZQzaG6Z8hfFM PTPvXZi45ZZzvhYjXlAH/fsvWVoapStIe64ZNOMNEpI/2Z7/un2XHNGMpFlpuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639502; a=rsa-sha256; cv=none; b=cg6/1Mig2rwdAmKtrmL93u8AJij+v/jzpXW4ITU52n2POtTKnvvfzzOEMyMSX7zscIhHbD qHgqqPIF6ipAgz1AviMv0FWyCQI6YE63DI/kNPbTnPwhOk+G6OkKWrePOE4AGNxiWpEXjV MUPjlHfi6y71HjF1nM32crtkVklxbNmduLTZlCMASM5qggU8cDY664byqv8G4abZgC5KCy tsa9num93qNP4cEZhh/RnEaZhJnZ7oSw4gD9CJevZlDdJwfqlHUwPhA4S0j5otjE1H8I52 LJ3dqD0S/hA7F0MBGIkIuI+7IV2UcEWYX8zR8MsHU1j8NDFQ3reliyq7Qlqwyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NnsJqx6F+jUjRmm5nYiOraLeeObfg07Yj4sZY9Z81Qk=; b=xgenPjE8i1lN4IImSzoiV5AT4K5UdU8a2q1rL/QHv5qOvkJGyUnreJQZx1GLdaSw3m45G2 zRvjiiHEV8FW+O8Ekj5ZAlHHLnmiJJFjYCvk+o1LBsO5ZdvRkeefCNnjMCOJloqvys3OWN MMGeU3jhbMfIKy6QxNyJp3W9B8HFnBGex8GbOb1CprTVLRuzyGht3VPQhj1U3+ZXPaPSXL 2w0fBHtq4BMw04zLSlHa4Ro+49eF/0LZ8RHEMmzhIKN1AbGP1W8jOwoCAqcW4MkyoPT9ON UGXVgITFIIFIexgypk8kNJRIVr4Hx+jyYofjElo9DRvYbFINdOiPRdnbLjFCXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFT57wyz19G0; Wed, 18 Oct 2023 14:31: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 39IEVfsM089283; Wed, 18 Oct 2023 14:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVf6m089280; Wed, 18 Oct 2023 14:31:41 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:41 GMT Message-Id: <202310181431.39IEVf6m089280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 0af2307d5926 - stable/14 - sdhci: fdt: Correctly export clock per the binding List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0af2307d592651ec4d020af9f20ae9e214d5bc9d Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0af2307d592651ec4d020af9f20ae9e214d5bc9d commit 0af2307d592651ec4d020af9f20ae9e214d5bc9d Author: Emmanuel Vadot AuthorDate: 2023-09-06 15:54:47 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:10 +0000 sdhci: fdt: Correctly export clock per the binding The binding says that we can have one or two clocks to export. The first one is the actual sdclock while the second is the sample clock. Both have the same parent, clk_xin. Correctly export the clocks for RK3399 and ZynqMP. No need to use a high ID as before, we have our own clock domain so use ids starting at 1 as all exported clocks should be. Reviewed-by: bz Differential Revision: https://reviews.freebsd.org/D41810 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 81a4fe38a6ce818bb7cba548bb2c697429fa9479) --- sys/dev/sdhci/sdhci_fdt.c | 92 ++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 57 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index f3a9b5091f6b..0ed1b57e7dc8 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -113,8 +113,6 @@ #define LOWEST_SET_BIT(mask) ((((mask) - 1) & (mask)) ^ (mask)) #define SHIFTIN(x, mask) ((x) * LOWEST_SET_BIT(mask)) -#define EMMCCARDCLK_ID 1000 - static struct ofw_compat_data compat_data[] = { { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, { "qcom,sdhci-msm-v4", SDHCI_FDT_QUALCOMM }, @@ -150,37 +148,36 @@ struct sdhci_fdt_softc { struct syscon *syscon; /* Handle to the syscon */ }; -struct rk3399_emmccardclk_sc { +struct sdhci_exported_clocks_sc { device_t clkdev; - bus_addr_t reg; }; static int -rk3399_emmccardclk_init(struct clknode *clk, device_t dev) +sdhci_exported_clocks_init(struct clknode *clk, device_t dev) { clknode_init_parent_idx(clk, 0); return (0); } -static clknode_method_t rk3399_emmccardclk_clknode_methods[] = { +static clknode_method_t sdhci_exported_clocks_clknode_methods[] = { /* Device interface */ - CLKNODEMETHOD(clknode_init, rk3399_emmccardclk_init), + CLKNODEMETHOD(clknode_init, sdhci_exported_clocks_init), CLKNODEMETHOD_END }; -DEFINE_CLASS_1(rk3399_emmccardclk_clknode, rk3399_emmccardclk_clknode_class, - rk3399_emmccardclk_clknode_methods, sizeof(struct rk3399_emmccardclk_sc), +DEFINE_CLASS_1(sdhci_exported_clocks_clknode, sdhci_exported_clocks_clknode_class, + sdhci_exported_clocks_clknode_methods, sizeof(struct sdhci_exported_clocks_sc), clknode_class); static int -rk3399_ofw_map(struct clkdom *clkdom, uint32_t ncells, +sdhci_clock_ofw_map(struct clkdom *clkdom, uint32_t ncells, phandle_t *cells, struct clknode **clk) { + int id = 1; /* Our clock id starts at 1 */ - if (ncells == 0) - *clk = clknode_find_by_id(clkdom, EMMCCARDCLK_ID); - else - return (ERANGE); + if (ncells != 0) + id = cells[1]; + *clk = clknode_find_by_id(clkdom, id); if (*clk == NULL) return (ENXIO); @@ -188,30 +185,29 @@ rk3399_ofw_map(struct clkdom *clkdom, uint32_t ncells, } static void -sdhci_init_rk3399_emmccardclk(device_t dev) +sdhci_export_clocks(struct sdhci_fdt_softc *sc) { struct clknode_init_def def; - struct rk3399_emmccardclk_sc *sc; + struct sdhci_exported_clocks_sc *clksc; struct clkdom *clkdom; struct clknode *clk; - clk_t clk_parent; bus_addr_t paddr; bus_size_t psize; const char **clknames; phandle_t node; int i, nclocks, ncells, error; - node = ofw_bus_get_node(dev); + node = ofw_bus_get_node(sc->dev); if (ofw_reg_to_paddr(node, 0, &paddr, &psize, NULL) != 0) { - device_printf(dev, "cannot parse 'reg' property\n"); + device_printf(sc->dev, "cannot parse 'reg' property\n"); return; } error = ofw_bus_parse_xref_list_get_length(node, "clocks", "#clock-cells", &ncells); if (error != 0 || ncells != 2) { - device_printf(dev, "couldn't find parent clocks\n"); + device_printf(sc->dev, "couldn't find parent clocks\n"); return; } @@ -221,47 +217,31 @@ sdhci_init_rk3399_emmccardclk(device_t dev) if (nclocks <= 0) return; - if (nclocks != 1) { - device_printf(dev, "Having %d clock instead of 1, aborting\n", - nclocks); - return; - } + clkdom = clkdom_create(sc->dev); + clkdom_set_ofw_mapper(clkdom, sdhci_clock_ofw_map); + + for (i = 0; i < nclocks; i++) { + memset(&def, 0, sizeof(def)); + def.id = i + 1; /* Exported clock IDs starts at 1 */ + def.name = clknames[i]; + def.parent_names = malloc(sizeof(char *) * 1, M_OFWPROP, M_WAITOK); + def.parent_names[0] = clk_get_name(sc->clk_xin); + def.parent_cnt = 1; - clkdom = clkdom_create(dev); - clkdom_set_ofw_mapper(clkdom, rk3399_ofw_map); - - memset(&def, 0, sizeof(def)); - def.id = EMMCCARDCLK_ID; - def.name = clknames[0]; - def.parent_names = malloc(sizeof(char *) * ncells, M_OFWPROP, M_WAITOK); - for (i = 0; i < ncells; i++) { - error = clk_get_by_ofw_index(dev, 0, i, &clk_parent); - if (error != 0) { - device_printf(dev, "cannot get clock %d\n", error); + clk = clknode_create(clkdom, &sdhci_exported_clocks_clknode_class, &def); + if (clk == NULL) { + device_printf(sc->dev, "cannot create clknode\n"); return; } - def.parent_names[i] = clk_get_name(clk_parent); - if (bootverbose) - device_printf(dev, "clk parent: %s\n", - def.parent_names[i]); - clk_release(clk_parent); - } - def.parent_cnt = ncells; - - clk = clknode_create(clkdom, &rk3399_emmccardclk_clknode_class, &def); - if (clk == NULL) { - device_printf(dev, "cannot create clknode\n"); - return; - } - sc = clknode_get_softc(clk); - sc->reg = paddr; - sc->clkdev = device_get_parent(dev); + clksc = clknode_get_softc(clk); + clksc->clkdev = device_get_parent(sc->dev); - clknode_register(clkdom, clk); + clknode_register(clkdom, clk); + } if (clkdom_finit(clkdom) != 0) { - device_printf(dev, "cannot finalize clkdom initialization\n"); + device_printf(sc->dev, "cannot finalize clkdom initialization\n"); return; } @@ -353,9 +333,6 @@ sdhci_init_rk3399(device_t dev) return (ENXIO); } - /* Register clock */ - sdhci_init_rk3399_emmccardclk(dev); - /* Disable clock multiplier */ mask = RK3399_CORECFG_CLOCKMULTIPLIER; val = 0; @@ -612,6 +589,7 @@ sdhci_fdt_attach(device_t dev) device_printf(dev, "Cannot init clocks\n"); return (err); } + sdhci_export_clocks(sc); if ((err = sdhci_init_phy(sc)) != 0) { device_printf(dev, "Cannot init phy\n"); return (err); From nobody Wed Oct 18 14:31:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFW1dlkz4x5ys; Wed, 18 Oct 2023 14:31: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 4S9YFW0dc1z3Mxh; Wed, 18 Oct 2023 14:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GDShvnS1GsCRMXYOxXkhUdU9dQJhaBa9Xlq0UwK2R8=; b=CgqPL831SxDRzHa1962datgAYeMiCgoENwo0bSgegV0I5UJM2FFl9UQsIgHqLVs5nc4lO1 qLGCDjvtKQnbFjX1IrSvmNn2Jo6KxAT4z0ES1EAvsHbqmovX9Cx4BFwFGb273EcqbsnsL/ wosI/vZkJiOY8hP6P9H36EkHKoxdaWxe82Gjgm4kb5ZiYd7SeuDNfY8f3MNZNYeb5l75kS pMbHNOYv8vu4oGbuAEFNbxGxdHPhTEkD6MJCp+K+L5S5pnb5xaxhIP3xhyy9U4zL23S8hW Kph5u1Y71ry3IPrjihDMDo8OMIIUXSUW+lZjOLnL/23VrBCTp3sk3ZLN+zzzuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639503; a=rsa-sha256; cv=none; b=M7ByEqAmZZNciOhAi87UKbDMZ36mejt4tCrYNvuorqQh9lTfg3c0yCwRW91fT8LgCkNtc/ AHyNkayvxe0Nrq/2H09cuIZtNa+x8NVQvj982Ao7b1uBVHByiAw0XflnUbKrjGV9OpNq6A Ydgnrc9hTvOaYjpDpYdokNIYTLpVYpRDaZZtMiO8/nqqlmzou5BXTJr9Kuayr8prdi4/qL qVvRI2g2jQIEyRFDQzrhQgG/TWEcn1lxmLnDsuo3aO3Psbs/FoKV5lVLnEsgIQHeUFuonb L21pZ3hbCGcuD2dW/2qTda5dHqujxbROfSL8tViXm9BQD1e092lttscDZBOfbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GDShvnS1GsCRMXYOxXkhUdU9dQJhaBa9Xlq0UwK2R8=; b=P/0P2dg8eXrE4TzZdPQzjgQnYZwure1W6oIEne+bey41i3q18opdsnxOnXvPwVbqRD7uX/ S71BwpiXfqVMpTYA9RjqQDuuPHYufpcZMzsx1cltBAWfVYhIuNgrurAYpQCrktn9YiyfEH A/A3Tka/uLVXjFnwYFvPphWV3L5/InVfCmPH4LgZ+pKxPvin3F3YdN0U4maTYIDDeRD4WR Mn8yRNjg1DjWcTkn6BgS4ZSJnANtL3NZFOxOpQnnTyOR7IvbYOKssQPCBnSYKniSTPFyYo TSOFjmxY9k90sQSKvDELwBVbmyDy3MataFm0+bB+QTX/M4lpf4Ub7pjN+XBJGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFV6Rr2z18tx; Wed, 18 Oct 2023 14:31: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 39IEVgK4089338; Wed, 18 Oct 2023 14:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVgDY089335; Wed, 18 Oct 2023 14:31:42 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:42 GMT Message-Id: <202310181431.39IEVgDY089335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 770b790eabac - stable/14 - if_cgem: Cleanup compatible and add new ones List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 770b790eabac42e6c22886439d1d776cbf0ff455 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=770b790eabac42e6c22886439d1d776cbf0ff455 commit 770b790eabac42e6c22886439d1d776cbf0ff455 Author: Emmanuel Vadot AuthorDate: 2023-09-12 14:49:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:11 +0000 if_cgem: Cleanup compatible and add new ones - Remove cdns,gem, it's the generic binding but for all platform that include this one we need specific drivers setup so remove it. - Remove cdns,macb, it's the generic binding for Atmel AT91 which we don't suport - Remove cadence,gem, it's not an official binding and seems to be only used in some obscure ARM11 SoC. - Note that the cdns,zynq* are deprecated - Add the new Xilinx compatible for zynq and zynqmp Reviewed-by: mhorne Tested-by: skibo, Milan Obuch Differential Revision: https://reviews.freebsd.org/D41856 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit bdbbbbb32104569fccd786d9cc07d17f6231a713) --- sys/dev/cadence/if_cgem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 1aa5d4955d93..43e35b2bf849 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -106,14 +106,13 @@ #define HWQUIRK_PCLK 8 static struct ofw_compat_data compat_data[] = { - { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, - { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, + { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, /* Deprecated */ + { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, /* Deprecated */ + { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, + { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, { "sifive,fu540-c000-gem", HWQUIRK_PCLK }, { "sifive,fu740-c000-gem", HWQUIRK_PCLK }, - { "cdns,gem", HWQUIRK_NONE }, - { "cdns,macb", HWQUIRK_NONE }, - { "cadence,gem", HWQUIRK_NONE }, { NULL, 0 } }; From nobody Wed Oct 18 14:31:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YFX4RmNz4x6Kw; Wed, 18 Oct 2023 14:31: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 4S9YFX1K8Gz3NCs; Wed, 18 Oct 2023 14:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6G0PHd1Jais2agfNrEaXATTqhNkoOxyuizjBHhzPQA=; b=df3PiThhAGR2ouDa6cDgvLy+0AO7gZA+xHNULDNm1q1LOGaiCjldskQrw0lFHN4Q9Lg69w fiNI3Owm6mV5KIR1RWZSs3IVY9qDNTBatUkkIDnsQZxhbAsIqVQVWCM/27cj3+ec+WmY9k TdXN4oOOqPHgjjFIMinUZvOnIa+fqbsRfjyAKt2LDaDKxtcOp4Y2hZPlJhgmnI5/01VSoL pMsBcswD8WryDh+kD9UIGX9icJccRYGo2C7oMpXre6zE5N/Tf9StfTaCP4TskVTzozt82Y OpS747REYb9sSIr8TQmEXAUc4W1Ie1hPJC2vfCf0PVFCfuOhwbaF/PyGKJiMOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639504; a=rsa-sha256; cv=none; b=UY2pwwlEomrezWsXFLxFuaTDzAaq5b9dQblVP9snupOVrgpwkTHhmcAAkH5n2UdqCmAJ7s Zlm0YOgZxj2cR02UhZae3DzEu7AsZeCWxDKGEHR/6GOz/wxKrBtO5kY78i7l6lhTn+RtTj CRfzO4ViFCXFreHwajO2XTYxaKR3TEISHjwhE/pJBpzYTt83LUwQBzYE1fj/0vALgG0FDW e7MFrDxV2inGrLryNuMHy5mEGvRicCGz8n4ZYrXQ74ycRSUPoPRiOhiO+C4KM6/tUppe+c sibeLNKAOiVgbb0xWkPf+XOADLSS0gzqL3OHIgs5ADUWI18fD8fEQP+fVpJ72w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6G0PHd1Jais2agfNrEaXATTqhNkoOxyuizjBHhzPQA=; b=WKvORSENJ9PUP+NxL6ZbL3gw5liteRK9+Mw7ZljqgTSS9DqBGdPgT+WhosUAOlknGen0Wj qpXaAS0zSIDkPzlWKlYk4CYfNiNzuij8pH4JFXiAHo8oLxyntE8YrFh5VHRQbcLt2wk740 QOHXerFYfoD2ByO+f3stNQiDayS3u0UIKT1klTeJwMGSq+cgpuFnwHngCdLDx8MPDvlOD0 AnLE1UUEOnoLCfU/JW2dU5Byi9wM8rKd+v/fp2V5oKBbkSy/+ezYPCFC/s6r40RkysY54/ Cfe+6VonCBz1qcAbIeEpbaXyu/BgKkj83HNHi7D0bq/CF05/K08O/ERp1AHf2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YFX0RKqz18rT; Wed, 18 Oct 2023 14:31: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 39IEVhRw089377; Wed, 18 Oct 2023 14:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEVhKJ089374; Wed, 18 Oct 2023 14:31:43 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:31:43 GMT Message-Id: <202310181431.39IEVhKJ089374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 1e685c7dd5c0 - stable/14 - if_cgem: Rewrite clock part List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1e685c7dd5c01955d1aee233bf79b61fc1f0a8a3 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1e685c7dd5c01955d1aee233bf79b61fc1f0a8a3 commit 1e685c7dd5c01955d1aee233bf79b61fc1f0a8a3 Author: Emmanuel Vadot AuthorDate: 2023-09-14 08:57:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:31:13 +0000 if_cgem: Rewrite clock part - pclk and hclk are mandatory so always try to get them. Don't make it fatal if it fails as some platform (like Zynq) don't have a proper clock driver. - Always use pclk for the reference clock. - Try to get all the possible clocks and enable them. Reviewed-by: mhorne Tested-by: Milan Obuch Differential Revision: https://reviews.freebsd.org/D41857 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 4c52dde5bda099936d43820da84e569dccc6f475) --- sys/dev/cadence/if_cgem.c | 118 +++++++++++++++++++++++++++++++++------------- 1 file changed, 86 insertions(+), 32 deletions(-) diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c index 43e35b2bf849..6e4a62f6e5ee 100644 --- a/sys/dev/cadence/if_cgem.c +++ b/sys/dev/cadence/if_cgem.c @@ -102,17 +102,15 @@ #define HWQUIRK_NONE 0 #define HWQUIRK_NEEDNULLQS 1 #define HWQUIRK_RXHANGWAR 2 -#define HWQUIRK_TXCLK 4 -#define HWQUIRK_PCLK 8 static struct ofw_compat_data compat_data[] = { - { "cdns,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, /* Deprecated */ - { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, /* Deprecated */ - { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR | HWQUIRK_TXCLK }, - { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, - { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS | HWQUIRK_TXCLK }, - { "sifive,fu540-c000-gem", HWQUIRK_PCLK }, - { "sifive,fu740-c000-gem", HWQUIRK_PCLK }, + { "cdns,zynq-gem", HWQUIRK_RXHANGWAR }, /* Deprecated */ + { "cdns,zynqmp-gem", HWQUIRK_NEEDNULLQS }, /* Deprecated */ + { "xlnx,zynq-gem", HWQUIRK_RXHANGWAR }, + { "xlnx,zynqmp-gem", HWQUIRK_NEEDNULLQS }, + { "microchip,mpfs-mss-gem", HWQUIRK_NEEDNULLQS }, + { "sifive,fu540-c000-gem", HWQUIRK_NONE }, + { "sifive,fu740-c000-gem", HWQUIRK_NONE }, { NULL, 0 } }; @@ -129,7 +127,11 @@ struct cgem_softc { struct callout tick_ch; uint32_t net_ctl_shadow; uint32_t net_cfg_shadow; - clk_t ref_clk; + clk_t clk_pclk; + clk_t clk_hclk; + clk_t clk_txclk; + clk_t clk_rxclk; + clk_t clk_tsuclk; int neednullqs; int phy_contype; @@ -1497,9 +1499,9 @@ cgem_mediachange(struct cgem_softc *sc, struct mii_data *mii) WR4(sc, CGEM_NET_CFG, sc->net_cfg_shadow); - if (sc->ref_clk != NULL) { + if (sc->clk_pclk != NULL) { CGEM_UNLOCK(sc); - if (clk_set_freq(sc->ref_clk, ref_clk_freq, 0)) + if (clk_set_freq(sc->clk_pclk, ref_clk_freq, 0)) device_printf(sc->dev, "could not set ref clk to %d\n", ref_clk_freq); CGEM_LOCK(sc); @@ -1744,19 +1746,47 @@ cgem_attach(device_t dev) sc->neednullqs = 1; if ((hwquirks & HWQUIRK_RXHANGWAR) != 0) sc->rxhangwar = 1; - if ((hwquirks & HWQUIRK_TXCLK) != 0) { - if (clk_get_by_ofw_name(dev, 0, "tx_clk", &sc->ref_clk) != 0) - device_printf(dev, - "could not retrieve reference clock.\n"); - else if (clk_enable(sc->ref_clk) != 0) - device_printf(dev, "could not enable clock.\n"); + /* + * Both pclk and hclk are mandatory but we don't have a proper + * clock driver for Zynq so don't make it fatal if we can't + * get them. + */ + if (clk_get_by_ofw_name(dev, 0, "pclk", &sc->clk_pclk) != 0) + device_printf(dev, + "could not retrieve pclk.\n"); + else { + if (clk_enable(sc->clk_pclk) != 0) + device_printf(dev, "could not enable pclk.\n"); + } + if (clk_get_by_ofw_name(dev, 0, "hclk", &sc->clk_hclk) != 0) + device_printf(dev, + "could not retrieve hclk.\n"); + else { + if (clk_enable(sc->clk_hclk) != 0) + device_printf(dev, "could not enable hclk.\n"); + } + + /* Optional clocks */ + if (clk_get_by_ofw_name(dev, 0, "tx_clk", &sc->clk_txclk) == 0) { + if (clk_enable(sc->clk_txclk) != 0) { + device_printf(dev, "could not enable tx_clk.\n"); + err = ENXIO; + goto err_pclk; + } + } + if (clk_get_by_ofw_name(dev, 0, "rx_clk", &sc->clk_rxclk) == 0) { + if (clk_enable(sc->clk_rxclk) != 0) { + device_printf(dev, "could not enable rx_clk.\n"); + err = ENXIO; + goto err_tx_clk; + } } - if ((hwquirks & HWQUIRK_PCLK) != 0) { - if (clk_get_by_ofw_name(dev, 0, "pclk", &sc->ref_clk) != 0) - device_printf(dev, - "could not retrieve reference clock.\n"); - else if (clk_enable(sc->ref_clk) != 0) - device_printf(dev, "could not enable clock.\n"); + if (clk_get_by_ofw_name(dev, 0, "tsu_clk", &sc->clk_tsuclk) == 0) { + if (clk_enable(sc->clk_tsuclk) != 0) { + device_printf(dev, "could not enable tsu_clk.\n"); + err = ENXIO; + goto err_rx_clk; + } } node = ofw_bus_get_node(dev); @@ -1768,7 +1798,8 @@ cgem_attach(device_t dev) RF_ACTIVE); if (sc->mem_res == NULL) { device_printf(dev, "could not allocate memory resources.\n"); - return (ENOMEM); + err = ENOMEM; + goto err_tsu_clk; } /* Get IRQ resource. */ @@ -1824,7 +1855,7 @@ cgem_attach(device_t dev) if (err) { device_printf(dev, "could not set up dma mem for descs.\n"); cgem_detach(dev); - return (ENOMEM); + goto err; } /* Get a MAC address. */ @@ -1841,12 +1872,29 @@ cgem_attach(device_t dev) device_printf(dev, "could not set interrupt handler.\n"); ether_ifdetach(ifp); cgem_detach(dev); - return (err); + goto err; } cgem_add_sysctls(dev); return (0); + +err_tsu_clk: + if (sc->clk_tsuclk) + clk_release(sc->clk_tsuclk); +err_rx_clk: + if (sc->clk_rxclk) + clk_release(sc->clk_rxclk); +err_tx_clk: + if (sc->clk_txclk) + clk_release(sc->clk_txclk); +err_pclk: + if (sc->clk_pclk) + clk_release(sc->clk_pclk); + if (sc->clk_hclk) + clk_release(sc->clk_hclk); +err: + return (err); } static int @@ -1923,13 +1971,19 @@ cgem_detach(device_t dev) sc->mbuf_dma_tag = NULL; } - if (sc->ref_clk != NULL) { - clk_release(sc->ref_clk); - sc->ref_clk = NULL; - } - bus_generic_detach(dev); + if (sc->clk_tsuclk) + clk_release(sc->clk_tsuclk); + if (sc->clk_rxclk) + clk_release(sc->clk_rxclk); + if (sc->clk_txclk) + clk_release(sc->clk_txclk); + if (sc->clk_pclk) + clk_release(sc->clk_pclk); + if (sc->clk_hclk) + clk_release(sc->clk_hclk); + CGEM_LOCK_DESTROY(sc); return (0); From nobody Wed Oct 18 14:32:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH00Ccxz4x6Ht; Wed, 18 Oct 2023 14:33: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 4S9YGz6qBHz3Q64; Wed, 18 Oct 2023 14:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=opVYOKnGjkvWIJk9/OpnLOdijSEtY2PThfRONoVoGFw=; b=XM+LmRdUTqbIJryuySFFJ2QhE4ogAs1xlHbsEzZOTLNgSD1FO9qCm69GN7J5IRfYgRQsUZ mSyU3zs2rvJ9rB3LPHP2fc00DR3mFcm6wMWzYravWWCaknARikpxUq+LIXObKQozE+DX9m 68gznyZ4hqIktV7ZTBNJ+4QZ5ze8TJpS4/4mC7vxBlyaozIAovTdOULwylngaRRhWypiup BggyQNfKz/G7EWQCw8QOmppBOr9v5gBtG3oG5ZbmsyKpwUDCbvVVyJY6c1WKxv3ygn0JMX rNu7MVcp5BVtn8tjmWlYJudZ08nYPM4tdXuL6lJQyCnQhXgSKNnL6wuuRKyrIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639580; a=rsa-sha256; cv=none; b=X59O2B1LjQQP3KvLOQTGPabU2yBvMUsET9aCsXI4M07Z/XJtNcvHSF3p2bmF2KGVZ2+RWV tr4c7mocs0iMufVM6WnajfDDGE/wnhrdGvPM3iQgJZI03GfVGmDxWWfW0Qx+qOgH9TBu7Z SjRhwZtC1y/dGIv0uqnWywgy7NI0ayUBrlxw3A8Gg0xp0ylUKZR/398Cy07IpVu9AmVpYO x4JnjC8YA6TckDe1jSV8HuJ6q4hyW661jOe9h4oMo0RYFt4cfvMtqeUpiJUAZbYGIu/qa0 IdmlJ/Nk6ullXNE5/k5vOZn5zBZBGq6AQ4EY0rtCd0KQgq88Qfp693zEzbRbTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=opVYOKnGjkvWIJk9/OpnLOdijSEtY2PThfRONoVoGFw=; b=fxV8oE345hZwpY/6zagQ5Tw2WcuIaFc7lQpx7J7smXdocVeN4e/zKU8el0sBPIboVVdTp2 D25UVcuQT1Wxi2w5C/2Xmz78NBezNTTNYp9OrgPac9xvNyY+a6mKk0LlU0HrJrYbc2SCn6 ZMZT7/sUqhCrbl/uC2hBRzLmEoKfvCyyqTvOYmtO+tYa2pHsJxgV6U/MMua53QcRi15S/R TGu4AGHyZUnAMd1qyvIB1puooEG/o932vslAvkEx0zDBOPacdw63ktKs7q4m3/p0XpfyN8 z2G0P5tCrBwvuByJUYeJKNBWw5hwTKtA94htd3L63mR1C95M2lblVdy6KO7dhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YGz5tdQz18xK; Wed, 18 Oct 2023 14:32: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 39IEWx1K091452; Wed, 18 Oct 2023 14:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEWxil091449; Wed, 18 Oct 2023 14:32:59 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:32:59 GMT Message-Id: <202310181432.39IEWxil091449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a5b3cbe6cc68 - stable/14 - iicbus: Move twsi under a new controller subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5b3cbe6cc68a42e8474f27fb9272c245c16bc67 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b3cbe6cc68a42e8474f27fb9272c245c16bc67 commit a5b3cbe6cc68a42e8474f27fb9272c245c16bc67 Author: Emmanuel Vadot AuthorDate: 2023-09-19 07:43:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:05 +0000 iicbus: Move twsi under a new controller subdirectory The folder is a mess so start moving stuff into sub-directories. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41907 (cherry picked from commit 580d00f42fdd94ce43583cc45fe3f1d9fdff47d4) --- sys/arm/allwinner/files.allwinner | 2 +- sys/arm/mv/files.arm7 | 2 +- sys/conf/files.arm | 2 +- sys/conf/files.arm64 | 6 +++--- sys/dev/iicbus/{ => controller}/twsi/a10_twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/mv_twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/twsi.c | 2 +- sys/dev/iicbus/{ => controller}/twsi/twsi.h | 0 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner index b5197809380d..cc609e50f2bd 100644 --- a/sys/arm/allwinner/files.allwinner +++ b/sys/arm/allwinner/files.allwinner @@ -22,7 +22,7 @@ arm/allwinner/axp81x.c optional axp81x arm/allwinner/if_awg.c optional awg syscon arm/allwinner/if_emac.c optional emac arm/allwinner/sunxi_dma_if.m optional a10_dmac | a31_dmac -dev/iicbus/twsi/a10_twsi.c optional twsi +dev/iicbus/controller/twsi/a10_twsi.c optional twsi dev/usb/controller/generic_ohci.c optional ohci dev/usb/controller/generic_usb_if.m optional ohci dev/usb/controller/generic_ehci.c optional ehci diff --git a/sys/arm/mv/files.arm7 b/sys/arm/mv/files.arm7 index 3eb18739532a..791046161151 100644 --- a/sys/arm/mv/files.arm7 +++ b/sys/arm/mv/files.arm7 @@ -22,7 +22,7 @@ arm/mv/rtc.c standard arm/mv/armadaxp/armadaxp_mp.c optional smp arm/mv/armadaxp/mptramp.S optional smp dev/cesa/cesa.c optional cesa -dev/iicbus/twsi/mv_twsi.c optional twsi +dev/iicbus/controller/twsi/mv_twsi.c optional twsi dev/mge/if_mge.c optional mge dev/neta/if_mvneta_fdt.c optional neta fdt dev/neta/if_mvneta.c optional neta mdio mii diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 3dc48e20b168..344dada420c9 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -93,7 +93,7 @@ dev/fdt/fdt_arm_platform.c optional platform fdt dev/video/crtc_if.m optional vt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/hwpmc/hwpmc_armv7.c optional hwpmc -dev/iicbus/twsi/twsi.c optional twsi +dev/iicbus/controller/twsi/twsi.c optional twsi dev/ofw/ofw_pcib.c optional fdt pci dev/pci/pci_host_generic.c optional pci_host_generic pci dev/pci/pci_host_generic_fdt.c optional pci_host_generic pci fdt diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index dc78840646bb..4df4f5c81bd1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -337,9 +337,9 @@ ice_ddp.fw optional ice_ddp \ clean "ice_ddp.fw" dev/iicbus/sy8106a.c optional sy8106a fdt -dev/iicbus/twsi/mv_twsi.c optional twsi fdt -dev/iicbus/twsi/a10_twsi.c optional twsi fdt -dev/iicbus/twsi/twsi.c optional twsi fdt +dev/iicbus/controller/twsi/mv_twsi.c optional twsi fdt +dev/iicbus/controller/twsi/a10_twsi.c optional twsi fdt +dev/iicbus/controller/twsi/twsi.c optional twsi fdt dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_acpi.c optional ipmi acpi diff --git a/sys/dev/iicbus/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c similarity index 98% rename from sys/dev/iicbus/twsi/a10_twsi.c rename to sys/dev/iicbus/controller/twsi/a10_twsi.c index 3b61d338e580..de3f6a92f44f 100644 --- a/sys/dev/iicbus/twsi/a10_twsi.c +++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include diff --git a/sys/dev/iicbus/twsi/mv_twsi.c b/sys/dev/iicbus/controller/twsi/mv_twsi.c similarity index 99% rename from sys/dev/iicbus/twsi/mv_twsi.c rename to sys/dev/iicbus/controller/twsi/mv_twsi.c index 3f50bb0c4968..35f5b0acc650 100644 --- a/sys/dev/iicbus/twsi/mv_twsi.c +++ b/sys/dev/iicbus/controller/twsi/mv_twsi.c @@ -63,7 +63,7 @@ #include #include -#include +#include #include "iicbus_if.h" diff --git a/sys/dev/iicbus/twsi/twsi.c b/sys/dev/iicbus/controller/twsi/twsi.c similarity index 99% rename from sys/dev/iicbus/twsi/twsi.c rename to sys/dev/iicbus/controller/twsi/twsi.c index 802110ed7f99..7031cce515ce 100644 --- a/sys/dev/iicbus/twsi/twsi.c +++ b/sys/dev/iicbus/controller/twsi/twsi.c @@ -56,7 +56,7 @@ #include #include -#include +#include #include "iicbus_if.h" diff --git a/sys/dev/iicbus/twsi/twsi.h b/sys/dev/iicbus/controller/twsi/twsi.h similarity index 100% rename from sys/dev/iicbus/twsi/twsi.h rename to sys/dev/iicbus/controller/twsi/twsi.h From nobody Wed Oct 18 14:33:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH11STtz4x63p; Wed, 18 Oct 2023 14:33: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 4S9YH10ZGYz3QFM; Wed, 18 Oct 2023 14:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//+wYk9UUKRw2scKvKQ3JJjJancfv/etrw49LdR6h9E=; b=yPVk6DHXd/hUK/q93CB2oVHnYeS1TcHQ4EAUFfNYW8xjjWRf+HOXH/OQWZ4sV12h9vvHh7 QYdSzxSjrN0vkQmY3y0qUwFteapddUPkxpaB7QM2xGmNQFPpw8/vblqSzT51nbMG2rD6ZP kOrOc3WADgteJFXI15LX9wxHomW5xH9Ht+HpFGCLYzWjWty2mTUQseOlt22K9chh6DtRXT S6Druqnuy8j/X060DnpHvC1C2oUAitR01jliF+6xQmI15dd3kHrxVOzceRChnkJiht/MEt Gqaj2Pf+82qQ1XI5CHZmFPLO2N7TZgBDQ5F4YwmO9eyIZPhXypz20wqmLOJWtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639581; a=rsa-sha256; cv=none; b=KdGNycBZ35hJEAJ45b9zRcMeVxjId8Knze0bFNV9JSGsEFuUAO6phcxeuai14T6PSHS8Ti aUzrGIBYIQJabtAqtq2oeCSdECEPp2pS5kum1LRbjm6b4QF96YnVFiN3z947ZHop0Q3tyJ k8Oisvg91xOjyz22GgrkJN/FMMCEMpvoFjU9t4nuLjGHWzPqCQqLdz4rgVn7j1E5AKonGK OBCNo3qvEw30F0tR/MGQOL+sKO0ba11OiC1aq3Nwaf5S657FJ+2mmgOtKgISqxogzU+chi o0fISo5M5R7nG2NerSAH2rTG5DhkyQzwJ7MAzWBzQP62NCT11QijkH3Sw2S9Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=//+wYk9UUKRw2scKvKQ3JJjJancfv/etrw49LdR6h9E=; b=RcqeJ4CPDB1eMFrZLCd1LNWdOUHzPY7Fii4EyWVdNWa+a4UaBu2PuEv0oPtSmiMLDLlcsd OtG+mxyejS2fhbZIcvrYR6r0bjNSOtc2T/9G+XkyNUCsWh8XdEPQgr77jPuy1Sgh5cdUZg ygFbqFDYJMfDxpONrsu6F7KIL2Xbo6Hnf9Jmo4cMcaV+RKl51HmB3dhfAcVcFiedfoWYwN lA02wx3Pv5LmtVPRShxxmJyR6oJaOQsq61qxE/4B5gtTsbpp1aKS0uc+qV9I8u1culcuNd 3EYmbeMJOuyPCjxUt9i+THoQk/rqih+qEgupsD/G/sHXZUMQBwHiDT+qBWWj4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH06k9Zz19GJ; Wed, 18 Oct 2023 14:33: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 39IEX0Kv091529; Wed, 18 Oct 2023 14:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX0WO091526; Wed, 18 Oct 2023 14:33:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:00 GMT Message-Id: <202310181433.39IEX0WO091526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 5e25c410bde7 - stable/14 - iicbus: Move remaining rtc driver into rtc subfolder List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e25c410bde7e7eadc9556d6eb1c97ea373b20ea Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=5e25c410bde7e7eadc9556d6eb1c97ea373b20ea commit 5e25c410bde7e7eadc9556d6eb1c97ea373b20ea Author: Emmanuel Vadot AuthorDate: 2023-09-19 07:49:45 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:07 +0000 iicbus: Move remaining rtc driver into rtc subfolder No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41908 (cherry picked from commit 2f16049c985a364e2bd2b256f5bef9af17e10c62) --- sys/conf/files | 16 ++++++++-------- sys/dev/iicbus/{ => rtc}/ds1307.c | 2 +- sys/dev/iicbus/{ => rtc}/ds1307reg.h | 0 sys/dev/iicbus/{ => rtc}/ds13rtc.c | 0 sys/dev/iicbus/{ => rtc}/ds1672.c | 0 sys/dev/iicbus/{ => rtc}/ds3231.c | 2 +- sys/dev/iicbus/{ => rtc}/ds3231reg.h | 0 sys/dev/iicbus/{ => rtc}/isl12xx.c | 0 sys/dev/iicbus/{ => rtc}/nxprtc.c | 0 sys/dev/iicbus/{ => rtc}/rtc8583.c | 0 sys/dev/iicbus/{ => rtc}/s35390a.c | 0 sys/modules/i2c/ds1307/Makefile | 2 +- sys/modules/i2c/ds13rtc/Makefile | 2 +- sys/modules/i2c/ds1672/Makefile | 2 +- sys/modules/i2c/ds3231/Makefile | 2 +- sys/modules/i2c/isl12xx/Makefile | 2 +- sys/modules/i2c/nxprtc/Makefile | 2 +- sys/modules/i2c/rtc8583/Makefile | 2 +- sys/modules/i2c/s35390a/Makefile | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 2b4bebaa6831..1fad62fd61f3 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1794,10 +1794,6 @@ dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi dev/iicbus/ad7418.c optional ad7418 dev/iicbus/ads111x.c optional ads111x -dev/iicbus/ds1307.c optional ds1307 -dev/iicbus/ds13rtc.c optional ds13rtc | ds133x | ds1374 -dev/iicbus/ds1672.c optional ds1672 -dev/iicbus/ds3231.c optional ds3231 dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic @@ -1814,7 +1810,6 @@ dev/iicbus/iicsmb.c optional iicsmb \ dev/iicbus/iicoc.c optional iicoc dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci -dev/iicbus/isl12xx.c optional isl12xx dev/iicbus/lm75.c optional lm75 dev/iicbus/max44009.c optional max44009 dev/iicbus/mux/iicmux.c optional iicmux @@ -1822,15 +1817,20 @@ dev/iicbus/mux/iicmux_if.m optional iicmux dev/iicbus/mux/iic_gpiomux.c optional iic_gpiomux fdt dev/iicbus/mux/ltc430x.c optional ltc430x dev/iicbus/mux/pca954x.c optional pca954x iicbus iicmux -dev/iicbus/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/ofw_iicbus.c optional fdt iicbus dev/iicbus/ofw_iicbus_if.m optional fdt iicbus dev/iicbus/pcf8574.c optional pcf8574 dev/iicbus/pcf8591.c optional pcf8591 -dev/iicbus/rtc8583.c optional rtc8583 +dev/iicbus/rtc/ds1307.c optional ds1307 +dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 +dev/iicbus/rtc/ds1672.c optional ds1672 +dev/iicbus/rtc/ds3231.c optional ds3231 +dev/iicbus/rtc/isl12xx.c optional isl12xx +dev/iicbus/rtc/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt +dev/iicbus/rtc/rtc8583.c optional rtc8583 dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt -dev/iicbus/s35390a.c optional s35390a +dev/iicbus/rtc/s35390a.c optional s35390a dev/iicbus/sy8106a.c optional sy8106a fdt dev/iicbus/syr827.c optional syr827 fdt dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio diff --git a/sys/dev/iicbus/ds1307.c b/sys/dev/iicbus/rtc/ds1307.c similarity index 99% rename from sys/dev/iicbus/ds1307.c rename to sys/dev/iicbus/rtc/ds1307.c index 6522b3284bf3..e8d24880571c 100644 --- a/sys/dev/iicbus/ds1307.c +++ b/sys/dev/iicbus/rtc/ds1307.c @@ -48,7 +48,7 @@ #include #endif -#include +#include #include "clock_if.h" #include "iicbus_if.h" diff --git a/sys/dev/iicbus/ds1307reg.h b/sys/dev/iicbus/rtc/ds1307reg.h similarity index 100% rename from sys/dev/iicbus/ds1307reg.h rename to sys/dev/iicbus/rtc/ds1307reg.h diff --git a/sys/dev/iicbus/ds13rtc.c b/sys/dev/iicbus/rtc/ds13rtc.c similarity index 100% rename from sys/dev/iicbus/ds13rtc.c rename to sys/dev/iicbus/rtc/ds13rtc.c diff --git a/sys/dev/iicbus/ds1672.c b/sys/dev/iicbus/rtc/ds1672.c similarity index 100% rename from sys/dev/iicbus/ds1672.c rename to sys/dev/iicbus/rtc/ds1672.c diff --git a/sys/dev/iicbus/ds3231.c b/sys/dev/iicbus/rtc/ds3231.c similarity index 99% rename from sys/dev/iicbus/ds3231.c rename to sys/dev/iicbus/rtc/ds3231.c index eb45f6fcf6e6..23e88eb7ecd3 100644 --- a/sys/dev/iicbus/ds3231.c +++ b/sys/dev/iicbus/rtc/ds3231.c @@ -47,7 +47,7 @@ #include #endif -#include +#include #include "clock_if.h" #include "iicbus_if.h" diff --git a/sys/dev/iicbus/ds3231reg.h b/sys/dev/iicbus/rtc/ds3231reg.h similarity index 100% rename from sys/dev/iicbus/ds3231reg.h rename to sys/dev/iicbus/rtc/ds3231reg.h diff --git a/sys/dev/iicbus/isl12xx.c b/sys/dev/iicbus/rtc/isl12xx.c similarity index 100% rename from sys/dev/iicbus/isl12xx.c rename to sys/dev/iicbus/rtc/isl12xx.c diff --git a/sys/dev/iicbus/nxprtc.c b/sys/dev/iicbus/rtc/nxprtc.c similarity index 100% rename from sys/dev/iicbus/nxprtc.c rename to sys/dev/iicbus/rtc/nxprtc.c diff --git a/sys/dev/iicbus/rtc8583.c b/sys/dev/iicbus/rtc/rtc8583.c similarity index 100% rename from sys/dev/iicbus/rtc8583.c rename to sys/dev/iicbus/rtc/rtc8583.c diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/rtc/s35390a.c similarity index 100% rename from sys/dev/iicbus/s35390a.c rename to sys/dev/iicbus/rtc/s35390a.c diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile index 9699a1057dc3..363aa412cbdc 100644 --- a/sys/modules/i2c/ds1307/Makefile +++ b/sys/modules/i2c/ds1307/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1307 SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile index ffeab1c12dd7..a9616765b7a5 100644 --- a/sys/modules/i2c/ds13rtc/Makefile +++ b/sys/modules/i2c/ds13rtc/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds13rtc SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile index 1b1fd9ab038c..c160e317c36d 100644 --- a/sys/modules/i2c/ds1672/Makefile +++ b/sys/modules/i2c/ds1672/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1672 SRCS = ds1672.c diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile index 7548f6ef8282..4c6a7241bf76 100644 --- a/sys/modules/i2c/ds3231/Makefile +++ b/sys/modules/i2c/ds3231/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds3231 SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile index 98411b78aae6..be0b409eeff2 100644 --- a/sys/modules/i2c/isl12xx/Makefile +++ b/sys/modules/i2c/isl12xx/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = isl12xx SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile index 23efdcfe7754..3501909f6ea4 100644 --- a/sys/modules/i2c/nxprtc/Makefile +++ b/sys/modules/i2c/nxprtc/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = nxprtc SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile index 23cb48afd33c..a474da20685e 100644 --- a/sys/modules/i2c/rtc8583/Makefile +++ b/sys/modules/i2c/rtc8583/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = rtc8583 SRCS = rtc8583.c diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile index d1091db58abc..e12ddeece2ec 100644 --- a/sys/modules/i2c/s35390a/Makefile +++ b/sys/modules/i2c/s35390a/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = s35390a SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h From nobody Wed Oct 18 14:33:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH2229Xz4x6J0; Wed, 18 Oct 2023 14:33: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 4S9YH21L9mz3Q4r; Wed, 18 Oct 2023 14:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4+Qygt5d9ZS6iZTyLB0fmaC5DGzwlpjTyPedEdyfJw=; b=i+bWN6C3uDB+T8nN2/lUWWaS7p26sqUBlQbDik4qHilMHERtAhUcrcErJb+qlH001Ji+Gx 6O7MnVW8lKxGOiXxS9zOP7/kliDUHGjrGat1PZg5XRLCB5VcXNrGRFlVs4s7peCvDX5/FK fzfO94N6YfRX418x7XLBO/BxabK8qkSPljaqb+VVhL/FGIX38ojKcQlpUdMCkMFu1Pf7D0 ND5R8OGhJGSeYBFj3FYzXDqTR+zJJcT9Yp+GdMT0DhpvLHUVWJbL9sCUz8wgZ0R/r/0GiL Drzi1CjLhZTd6E7rgupFDNGRukgp3EgJe2j2/yOD6FJusRw1DWYzQlFZL2RMgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639582; a=rsa-sha256; cv=none; b=c08Xox1CsnBqYAF+WFXx10uiJ6q5LMiCarVkF5/iveK0U8QAF9yPkB5juKqZhAp2TZWm/5 Nuboamm0djbbeaKtX+3kHdbTPFw7d9LDbzt7iJ9RfjVUqpsPE04wzqO3Pdk2X3U7iSwnx/ Hn2dN2V9tvKwtoMFFS91sFI2GCoQxLCWMq3uaFR+HrcE9zyGKHn3ZihRpHkfGpuPCUMLTb f1xMy4WllacrqyRzR6Moe61SzmF28FD/fZbNgNkRWhAj7TleI58JSG8QSYHtjcdhbyfhWB wEFfiXkRKpy26SP0wb3rkfPcZe9RXLCApOGqcQtFA4i4AlKI2fLIjbG5WvZobA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4+Qygt5d9ZS6iZTyLB0fmaC5DGzwlpjTyPedEdyfJw=; b=bj4U5hF8ZkVtdA6l//PgZeVgiEFXRiU/ppXjcaaPRfT6CF71fhw2FOpCFBk5A0Enwst5RO Ejj1skcm1pl58qlWnxV2KhEIPOOHm94BJ5GxwIoxlKd/NXas308Z7YnmRpIs4rnVYrK88x sxiFKvHBSgzcl2X5iyESsopCDBqjRtvhtpEIdqRAEc6SKrfhkirIMr5pZJF0M+RnFRKOnR rlSifGLy0kDTLgfUMsfOSwUvNmDc8B7eE+DmjdeCdS443yQ4xClDfV6KFQjMnT7wpx2t3/ XHkCCRoxeu4yeinGpRtM4pRyYky6bg7eOUPS7easZtOKn2aWPsmsay9ZT/UgeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH20RGXz18bm; Wed, 18 Oct 2023 14:33: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 39IEX1SP091578; Wed, 18 Oct 2023 14:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX17T091575; Wed, 18 Oct 2023 14:33:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:01 GMT Message-Id: <202310181433.39IEX17T091575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 8d715e2f4912 - stable/14 - iicbus: Move Silergy pmic/regulators under pmic/silergy subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d715e2f4912c7190853994aede086d81c66c481 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8d715e2f4912c7190853994aede086d81c66c481 commit 8d715e2f4912c7190853994aede086d81c66c481 Author: Emmanuel Vadot AuthorDate: 2023-09-19 07:56:02 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:08 +0000 iicbus: Move Silergy pmic/regulators under pmic/silergy subdirectory Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41909 (cherry picked from commit 062944cc4227e7bd002e4de2be48ec9b710bfaa5) --- sys/conf/files | 4 ++-- sys/conf/files.arm64 | 1 - sys/dev/iicbus/{ => pmic/silergy}/sy8106a.c | 0 sys/dev/iicbus/{ => pmic/silergy}/syr827.c | 0 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 1fad62fd61f3..9a8af0b97495 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1831,10 +1831,10 @@ dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt dev/iicbus/rtc/rtc8583.c optional rtc8583 dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt dev/iicbus/rtc/s35390a.c optional s35390a -dev/iicbus/sy8106a.c optional sy8106a fdt -dev/iicbus/syr827.c optional syr827 fdt dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt +dev/iicbus/pmic/silergy/sy8106a.c optional sy8106a fdt +dev/iicbus/pmic/silergy/syr827.c optional syr827 fdt dev/igc/if_igc.c optional igc iflib pci dev/igc/igc_api.c optional igc iflib pci dev/igc/igc_base.c optional igc iflib pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 4df4f5c81bd1..d8adc54763fc 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -336,7 +336,6 @@ ice_ddp.fw optional ice_ddp \ no-obj no-implicit-rule \ clean "ice_ddp.fw" -dev/iicbus/sy8106a.c optional sy8106a fdt dev/iicbus/controller/twsi/mv_twsi.c optional twsi fdt dev/iicbus/controller/twsi/a10_twsi.c optional twsi fdt dev/iicbus/controller/twsi/twsi.c optional twsi fdt diff --git a/sys/dev/iicbus/sy8106a.c b/sys/dev/iicbus/pmic/silergy/sy8106a.c similarity index 100% rename from sys/dev/iicbus/sy8106a.c rename to sys/dev/iicbus/pmic/silergy/sy8106a.c diff --git a/sys/dev/iicbus/syr827.c b/sys/dev/iicbus/pmic/silergy/syr827.c similarity index 100% rename from sys/dev/iicbus/syr827.c rename to sys/dev/iicbus/pmic/silergy/syr827.c From nobody Wed Oct 18 14:33:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH3315hz4x63w; Wed, 18 Oct 2023 14:33: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 4S9YH326GPz3QQv; Wed, 18 Oct 2023 14:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=az+89s/RqSL6mHbGqHVuw0YXmpxdXzLpw50Iu5wmv+E=; b=qNvJlREfWTqhwkpSRiZt3dCgRMQU/2Hpz3wzOqWFkqZWzhGTOI5dT94PZYAyXAETB30uZW BjiO3D/SdI7KkhRr5XbooaGbeIR5Cwj79HGE6xGbwS/PbtmVU17ObZSUvPZ5uwPfovFAUD 4nz53F6bBXHSSFnjbvS1Jd9CxZBv4L/E2WM8GdLQU8XCMiTRRIfSZIF+C95HHEtRsTWoY4 6gCTsT2oyvUWsyYUs/4ypwooo9ZZjMIbkDEgcUmve43PUr6vP9PJCyiRcWW5lSfxe4dXS9 EaRLNUZT63Ph8xwCWhPXWvUA3c6Ku4jVI7x6f7CJvqKaidk0sT4puV2SWsinJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639583; a=rsa-sha256; cv=none; b=Pvcufc5EYmEkyc7IDqqSFJ24ixuM16OjdJ9hbMBrxJu4g2+NCxahAuCzdKNqc5/FslB7rJ EjH1i1yja7iKxb8oCOjbPgL+iZ+5hzQvaPpfnupxg5gBG3O2xUogLr8wSlYeUc7dZb1QSi RBn+lJMvi2WdDMeyqzMExTtBe9YaTvHeSoZHxM/iPTGrQQ0IFKnoJ1HNZl6NtazWV80A4Q L2YJpPeAXcSYuXLDGiy250x6rh5b//yf9ofJtMKLsPaITDOg0T2oYFs4UfCfDy+HrGQQr+ fNbGt8qxh9KhutLTq/gJR/EANuII9Mn/jeQJ2XDjrQ96eyHlFDOiMpDgEb/UGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=az+89s/RqSL6mHbGqHVuw0YXmpxdXzLpw50Iu5wmv+E=; b=giTeFaNEx47BEJheBf8GRqfmzgrGUNbF46xspLy/ZLCdziutcHpov+DrJ5tPA2eyMqkctt TDtfgOk5voG5r8ULAQgV7frbH3FXZQDqs48bzulaI+9RbJDP+g104xXCbn7JVIQ1d9kFPP ZY+OvVo/H17jsOHoWce6NIOdx2H2Q8ebVtHPZnxkkY51XlU4Fs7hTsQWblE0f14mUC+L2H NsNpZGL1QGGCS6dlhpVNzfBRpX4cJJ4OCbzqahAG6mITfZLW14JG+687bsJ+Q1KVfYqSFG /eqBO4ApiVeNUqjgLjdElc2nEmSw0ksBBCHdvh8iprlZMko4nkjsBDBQCuaNPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH31BRxz19GK; Wed, 18 Oct 2023 14:33: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 39IEX3A9091644; Wed, 18 Oct 2023 14:33:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX39C091641; Wed, 18 Oct 2023 14:33:03 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:03 GMT Message-Id: <202310181433.39IEX39C091641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 26dd10a4f31f - stable/14 - iicbus: Move adm1030 and adt746x to new pwm subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26dd10a4f31ffdcd242df0ca2c49c58105fb72b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=26dd10a4f31ffdcd242df0ca2c49c58105fb72b9 commit 26dd10a4f31ffdcd242df0ca2c49c58105fb72b9 Author: Emmanuel Vadot AuthorDate: 2023-09-19 08:04:02 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:10 +0000 iicbus: Move adm1030 and adt746x to new pwm subdirectory Those are (mainly) pwm controller so move it under a new subdirectory. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41910 (cherry picked from commit 22d7dd834bc5cd189810e414701e3ad1e98102e4) --- sys/conf/files.powerpc | 4 ++-- sys/dev/iicbus/{ => pwm}/adm1030.c | 0 sys/dev/iicbus/{ => pwm}/adt746x.c | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 48251ab07d9e..0a05b1327689 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -41,13 +41,13 @@ dev/hwpmc/hwpmc_power8.c optional hwpmc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/hwpmc/hwpmc_ppc970.c optional hwpmc dev/iicbus/ad7417.c optional ad7417 powermac -dev/iicbus/adm1030.c optional powermac windtunnel | adm1030 powermac -dev/iicbus/adt746x.c optional adt746x powermac dev/iicbus/ds1631.c optional ds1631 powermac dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/iicbus/ofw_iicbus_if.m optional iicbus aim +dev/iicbus/pwm/adm1030.c optional powermac windtunnel | adm1030 powermac +dev/iicbus/pwm/adt746x.c optional adt746x powermac dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_opal.c optional powernv ipmi dev/ice/if_ice_iflib.c optional ice pci powerpc64 | ice pci powerpc64le \ diff --git a/sys/dev/iicbus/adm1030.c b/sys/dev/iicbus/pwm/adm1030.c similarity index 100% rename from sys/dev/iicbus/adm1030.c rename to sys/dev/iicbus/pwm/adm1030.c diff --git a/sys/dev/iicbus/adt746x.c b/sys/dev/iicbus/pwm/adt746x.c similarity index 100% rename from sys/dev/iicbus/adt746x.c rename to sys/dev/iicbus/pwm/adt746x.c From nobody Wed Oct 18 14:33:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH46KbZz4x6Np; Wed, 18 Oct 2023 14:33: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 4S9YH43bpkz3QZB; Wed, 18 Oct 2023 14:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5Rxl+XirRLnzdkC+ts8OXtQplDieXCyO5HyiKgbXy8=; b=fMHtvfNAzckO/SJaGggclwP9uFPZJ5MTRiIvvXtzVriigBGsXFbKva5vkqCOSsY756JXOu WiRR8YiO8etrKcppBmMi52WLNYf1BjWncA4lIconnn5tQ8pTngilmneGv5rWcv7dpjYzbi wiFqqr2TgiS+Ib8umET57juCyhTkCfA3ysZQ78bo6A9N0TI1oZ8udIVpJORWuyYVenNO72 LaddGtXpmsFrBR/j8dzdtqh/sd/0gSIZpyWxv4vynO6OCVteGvizf94HaMeAZJ8B6Bif3v 6nHPDNjlSmIxYs3Ivi1X3oHtAL3cFQ6AyFAwJgLsEXq6q2PdDvFo2lwjAeof2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639584; a=rsa-sha256; cv=none; b=qyjEwpzvOGhh2FtV8H4A4mBS47vlAtCb7ecCLO35HSGnuDzBXoW4fVWiidXE8UhVXWvpgm eBPfr/sM+jUa29F3HQPIZ29+LlSw+dI4rKSZDdm8M/zrVn/oBJkdDzbpxhUSuG/UNNcVBn ggG/F8L05mXpBZQck6pdgCLIcc7BYf9cnyS8RIbMuCRMLc3RRg+P+LHFW5U7g1gij0QTWS HdDbgRA8Ut66fSk2TM0IstvIlKu7EEp2TA2MJF5jUYM0rJZ0siFEwYjlrTtc9NzDUgAU3K P9L6d8KC2Mw2H0jHL0JwqnxVpm8H3mVtU+UTaeXnlz5mVzOH2yMvjuSbp8LiQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5Rxl+XirRLnzdkC+ts8OXtQplDieXCyO5HyiKgbXy8=; b=sljAnJlZstEF/24+U2wH3Ry/Rtxiy44Y5hsMXZ7W9vUScogovEgBFmbt+bIQic3zw5JCvX f8suC2Qdhy0YJe4lSoQuD9bF78Ws7RYZjSiCt77LdzuwZDmrBRcNKJV4t5HxH+ouBdiZJ1 +/+7wdcwamwjv2Ek2FsVgwJn7XOVLG7wEocTBYR3wpIj152S47SD2KrpHUPJaHQOK6Dj0i HVibWf2JZN5eGd/U3hAEXuNgYVoJvPL4ln/nupjN/uqb7cRJ9HA4Y3GWwuJZKIunQ0IHTK pSiQ44UrymDsRF0wuYT+bgqDvisAB0NHiusCggYOsA7JTdTrPNf0hdAm1WJhqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH42Vytz196r; Wed, 18 Oct 2023 14:33: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 39IEX4ZK091698; Wed, 18 Oct 2023 14:33:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX4ms091695; Wed, 18 Oct 2023 14:33:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:04 GMT Message-Id: <202310181433.39IEX4ms091695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: cd2f6226e793 - stable/14 - iicbus: Move ADC drivers into a new adc subfolder List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd2f6226e793babb9f4a35223d3843daa0cf051f Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cd2f6226e793babb9f4a35223d3843daa0cf051f commit cd2f6226e793babb9f4a35223d3843daa0cf051f Author: Emmanuel Vadot AuthorDate: 2023-09-19 08:38:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:11 +0000 iicbus: Move ADC drivers into a new adc subfolder No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41911 (cherry picked from commit 06589d6e029c6ff64a7816d743e0a508abe6193b) --- sys/conf/files | 6 +++--- sys/conf/files.powerpc | 2 +- sys/dev/iicbus/{ => adc}/ad7417.c | 0 sys/dev/iicbus/{ => adc}/ad7418.c | 0 sys/dev/iicbus/{ => adc}/ads111x.c | 0 sys/dev/iicbus/{ => adc}/pcf8591.c | 0 sys/modules/i2c/ads111x/Makefile | 2 +- sys/modules/i2c/pcf8591/Makefile | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 9a8af0b97495..87a82d61bd09 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1792,8 +1792,6 @@ dev/ida/ida.c optional ida dev/ida/ida_disk.c optional ida dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi -dev/iicbus/ad7418.c optional ad7418 -dev/iicbus/ads111x.c optional ads111x dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic @@ -1812,6 +1810,9 @@ dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/lm75.c optional lm75 dev/iicbus/max44009.c optional max44009 +dev/iicbus/adc/ad7418.c optional ad7418 +dev/iicbus/adc/ads111x.c optional ads111x +dev/iicbus/adc/pcf8591.c optional pcf8591 dev/iicbus/mux/iicmux.c optional iicmux dev/iicbus/mux/iicmux_if.m optional iicmux dev/iicbus/mux/iic_gpiomux.c optional iic_gpiomux fdt @@ -1820,7 +1821,6 @@ dev/iicbus/mux/pca954x.c optional pca954x iicbus iicmux dev/iicbus/ofw_iicbus.c optional fdt iicbus dev/iicbus/ofw_iicbus_if.m optional fdt iicbus dev/iicbus/pcf8574.c optional pcf8574 -dev/iicbus/pcf8591.c optional pcf8591 dev/iicbus/rtc/ds1307.c optional ds1307 dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 dev/iicbus/rtc/ds1672.c optional ds1672 diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0a05b1327689..76a0f4d707f3 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -40,10 +40,10 @@ dev/hwpmc/hwpmc_mpc7xxx.c optional hwpmc dev/hwpmc/hwpmc_power8.c optional hwpmc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/hwpmc/hwpmc_ppc970.c optional hwpmc -dev/iicbus/ad7417.c optional ad7417 powermac dev/iicbus/ds1631.c optional ds1631 powermac dev/iicbus/ds1775.c optional ds1775 powermac dev/iicbus/max6690.c optional max6690 powermac +dev/iicbus/adc/ad7417.c optional ad7417 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/iicbus/ofw_iicbus_if.m optional iicbus aim dev/iicbus/pwm/adm1030.c optional powermac windtunnel | adm1030 powermac diff --git a/sys/dev/iicbus/ad7417.c b/sys/dev/iicbus/adc/ad7417.c similarity index 100% rename from sys/dev/iicbus/ad7417.c rename to sys/dev/iicbus/adc/ad7417.c diff --git a/sys/dev/iicbus/ad7418.c b/sys/dev/iicbus/adc/ad7418.c similarity index 100% rename from sys/dev/iicbus/ad7418.c rename to sys/dev/iicbus/adc/ad7418.c diff --git a/sys/dev/iicbus/ads111x.c b/sys/dev/iicbus/adc/ads111x.c similarity index 100% rename from sys/dev/iicbus/ads111x.c rename to sys/dev/iicbus/adc/ads111x.c diff --git a/sys/dev/iicbus/pcf8591.c b/sys/dev/iicbus/adc/pcf8591.c similarity index 100% rename from sys/dev/iicbus/pcf8591.c rename to sys/dev/iicbus/adc/pcf8591.c diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile index 05e2d1c0da0e..d02cb704146c 100644 --- a/sys/modules/i2c/ads111x/Makefile +++ b/sys/modules/i2c/ads111x/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= ads111x SRCS= ads111x.c diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile index c944a2c8c66d..8f17f3dc3ae1 100644 --- a/sys/modules/i2c/pcf8591/Makefile +++ b/sys/modules/i2c/pcf8591/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= pcf8591 SRCS= pcf8591.c From nobody Wed Oct 18 14:33:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH743G0z4x6Nq; Wed, 18 Oct 2023 14:33: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 4S9YH53z3Yz3QJv; Wed, 18 Oct 2023 14:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPvoWPEBs0+6ZVd3jCTDNZPZUA0ef4o65F82wTsjcbU=; b=rOURK3SOQSa4K7pciOXcp2DRxSpkjCsJhEcbEFOPRxazAGAEjn+EhjOjFJaSiulyuz4xEn RIhlLJ1DMxOxJwyAxsYHdlkKukkRj1pf7XjPeoy/pVzSiCna172aVSnWQomPDEpcXpMwES 1no2adJBuyZRFVmHREUO+MkTyRJfbiFA6OeXEsHBlizMn06RWs5eoMMOHoekQr1pd8GoWd WraPe1lIgOMWwrVc0EsKx//pM6cZA4yni+cIzjBIgfZ6FoPt3U5hY+IUHbPsgBAdg3lZdu U3oZqKfj/F+JkdarF6a1MxHk9csRdh+BwtVs+JUeNBmdn2PNYkeZ2suqRuMMug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639585; a=rsa-sha256; cv=none; b=sjq5k/XPIZQW2ZOVdcLq4hJ+Wox/DxSm4xb/Me7pMI9fAUhVbC44gFDg+G3mmy6LFyxMWc GlRjEkG0BJ42vKfisHzVxRTSmFzF+HF2Jx6Ir6Dfjd+NORPz1GMI9x8wO/nkrEFIuO2uaE xa6FaPBRWibopM/9dqTAej8UKgPLEQl3/W0aHCHYRvOoofHFsoMUglXUheULkYYu33KjYT sqxkxCWubfgmVGJonorzepKkQuKerYdreUHsveWcq+/JYI1GjjpG7CeFnhKlbqgsJ7s0qd S+r7G4y+3prKTC+r0aZA/k50Aqiqwm3qiIHnJBGGH1RQ9LnUU7UgUGUyUXntCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPvoWPEBs0+6ZVd3jCTDNZPZUA0ef4o65F82wTsjcbU=; b=XG+9inJlA4XovdgsyJwoEljVAK8EeyYfdxSrUBp78v+A2wH+xgPmdeYlvh6Hf3ZXjic4q8 wo7tEhXgAFNFBu334a4oVfclBqZk9pc6dzB5Ifh7IlVq6qSHdCkoY5yBntOGWYJTfUn+gX rUdIb5mov9Zx4FAS8+gkPx4OnzjrAxIGJeh8rH+8d+yZIBs/sSv/31aCJeDvqtVOyZquiR 6uUaqKOAXCzNw+71MEEqi/9ue+eD3gjk7mhAZJl9Rx0dnL2B4cczvPaieWf1sqm1aiX3S/ PQrrLKy4SKWp6ZIrzHCJeN8zBvAK6saOH2XhoEQS2u7QBxCmgjrI6T4Fz2scgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH534Rsz18xL; Wed, 18 Oct 2023 14:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEX5Ha091748; Wed, 18 Oct 2023 14:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX5qd091745; Wed, 18 Oct 2023 14:33:05 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:05 GMT Message-Id: <202310181433.39IEX5qd091745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 83dcc494a7fa - stable/14 - iicbus: conf: Fix pcf8574 entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83dcc494a7fa20a0e5fa76c060422b47a02a1c99 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=83dcc494a7fa20a0e5fa76c060422b47a02a1c99 commit 83dcc494a7fa20a0e5fa76c060422b47a02a1c99 Author: Emmanuel Vadot AuthorDate: 2023-09-19 08:39:26 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:12 +0000 iicbus: conf: Fix pcf8574 entry It lives in the gpio subdirectory Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41912 (cherry picked from commit 918a10c9f792d2c2f78b75626f7bf2abc85a0fff) --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 87a82d61bd09..086143f3d93d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1820,7 +1820,6 @@ dev/iicbus/mux/ltc430x.c optional ltc430x dev/iicbus/mux/pca954x.c optional pca954x iicbus iicmux dev/iicbus/ofw_iicbus.c optional fdt iicbus dev/iicbus/ofw_iicbus_if.m optional fdt iicbus -dev/iicbus/pcf8574.c optional pcf8574 dev/iicbus/rtc/ds1307.c optional ds1307 dev/iicbus/rtc/ds13rtc.c optional ds13rtc | ds133x | ds1374 dev/iicbus/rtc/ds1672.c optional ds1672 @@ -1831,6 +1830,7 @@ dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt dev/iicbus/rtc/rtc8583.c optional rtc8583 dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt dev/iicbus/rtc/s35390a.c optional s35390a +dev/iicbus/gpio/pcf8574.c optional pcf8574 dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt dev/iicbus/pmic/silergy/sy8106a.c optional sy8106a fdt From nobody Wed Oct 18 14:33:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH7489cz4x61s; Wed, 18 Oct 2023 14:33: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 4S9YH65wbKz3QRg; Wed, 18 Oct 2023 14:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1rAeRi/lo2JvYnXZCeQ6cSGTKeoV5U0DbuoqUaRjN8=; b=W7jdKLy1syuopdBHhvBD6JtdiuS9a0Ggo+pAGDwpuBoOe69eRDDJMqXmcpDBA5wugti0jf aLbPVxdrb0GEdciBrJ3xP1nU3gDFfQzsRUPhL0IEUOwwA7AQlLer4dROxoqdsY5n+fNkKW mta5pOM0RI3k/kqg8Wwcjz/4yauNeDk+mpstQtT9tvgRTZpOCbVuqwiiPWenmNBLVs4r0n 01W+cJ9ENDB/DKkKufxJ7+SrqM18IGsF+kVg4TvGWYeW42WVXpit/rwu/DYqF5WlX9bBpw RRjf4tH2LOrWeqrbkAuXkmXoQKl9Vk6MvlUskGNq3eSexHp6EOwbE4SIKlrG/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639586; a=rsa-sha256; cv=none; b=tT/CuDASL91wXYXAn45lzjiCtcxSpHWmCTnAs30XW/IFz3qBUDFpP/vlM6liTLreqNgHFE kO+AwwztCQXEgK6PwIikv1lE6NJTrsIf93bWEnArZ/mXQtIU7H4JTqDoRovE/9U74Hs6MN V219ynh66vO1lfqoGw6mh6wValxitSY9rKfnenf6bPd5YO79AvJDzE2ibYv/tOaT+74xB2 1cEmIFr4tN+PB/naToSW5Z0MWHTuRNxnDAHPAzyF41VHYzs3p7e4Yb3dE7FfYqA2Q+mthl /++oUxemVJ/y1D+iYAwvFXTiU/8PuCEKdr2SK1FTBq/4GKh27JjgjeIjWg+oQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o1rAeRi/lo2JvYnXZCeQ6cSGTKeoV5U0DbuoqUaRjN8=; b=I6EXJ9+2rLJyPgaHU1B6TREBubY2Qu/03Zz/NX2QsxuwBmCXJAxDZVMnLlbBNH3uK4TPfk FNTngOahFZsWCyFMlF0SSvg0kqXzWVJgGVBjayBGzP4jos0+lWOMgkfTzLfYAAZNiuHccu HgsRt7b7TjngGQhBNkUr/COlosr2h7CyFPNdpV0KLXi/YiIOSkTWKy8pOGknrl74e8p7wJ X3Kt+hkWkKJQFB+iV8Wk70k6/Nno43M9FKN9alr6jrjMi+5l3s//tUQzKjhdYp2w/MNRND 1MVahTVkFnUe7E9wiBLKJCXfexjs8PXMab6IRnjlC/MD8NS8iq20O6zHt202HA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH646p3z19GL; Wed, 18 Oct 2023 14:33: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 39IEX6ol091803; Wed, 18 Oct 2023 14:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX6bi091800; Wed, 18 Oct 2023 14:33:06 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:06 GMT Message-Id: <202310181433.39IEX6bi091800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 96edbfe36b05 - stable/14 - iicbus: Move i2c sensors drivers into new sensor subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 96edbfe36b0534c94998f0ae0decf01bbc6bd756 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=96edbfe36b0534c94998f0ae0decf01bbc6bd756 commit 96edbfe36b0534c94998f0ae0decf01bbc6bd756 Author: Emmanuel Vadot AuthorDate: 2023-09-19 09:51:40 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:14 +0000 iicbus: Move i2c sensors drivers into new sensor subdirectory No reason that they should live directly under iicbus Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41913 (cherry picked from commit 7c569caa0a6fffa7e1cc0a7f61e986dbc7c59074) --- sys/conf/files | 6 +++--- sys/conf/files.powerpc | 6 +++--- sys/dev/iicbus/{ => sensor}/ds1631.c | 0 sys/dev/iicbus/{ => sensor}/ds1775.c | 0 sys/dev/iicbus/{ => sensor}/htu21.c | 0 sys/dev/iicbus/{ => sensor}/lm75.c | 0 sys/dev/iicbus/{ => sensor}/max44009.c | 0 sys/dev/iicbus/{ => sensor}/max6690.c | 0 sys/dev/iicbus/{ => sensor}/tmp461.c | 0 sys/modules/i2c/htu21/Makefile | 2 +- sys/modules/i2c/max44009/Makefile | 2 +- sys/modules/i2c/tmp461/Makefile | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 086143f3d93d..44646cb8f6bf 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1792,7 +1792,6 @@ dev/ida/ida.c optional ida dev/ida/ida_disk.c optional ida dev/ida/ida_pci.c optional ida pci dev/iicbus/acpi_iicbus.c optional acpi iicbus | acpi compat_linuxkpi -dev/iicbus/htu21.c optional htu21 dev/iicbus/icee.c optional icee dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic @@ -1808,8 +1807,6 @@ dev/iicbus/iicsmb.c optional iicsmb \ dev/iicbus/iicoc.c optional iicoc dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci -dev/iicbus/lm75.c optional lm75 -dev/iicbus/max44009.c optional max44009 dev/iicbus/adc/ad7418.c optional ad7418 dev/iicbus/adc/ads111x.c optional ads111x dev/iicbus/adc/pcf8591.c optional pcf8591 @@ -1830,6 +1827,9 @@ dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt dev/iicbus/rtc/rtc8583.c optional rtc8583 dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt dev/iicbus/rtc/s35390a.c optional s35390a +dev/iicbus/sensor/htu21.c optional htu21 +dev/iicbus/sensor/lm75.c optional lm75 +dev/iicbus/sensor/max44009.c optional max44009 dev/iicbus/gpio/pcf8574.c optional pcf8574 dev/iicbus/gpio/tca64xx.c optional tca64xx fdt gpio dev/iicbus/pmic/fan53555.c optional fan53555 fdt | tcs4525 fdt diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 76a0f4d707f3..0293efd28fbe 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -40,14 +40,14 @@ dev/hwpmc/hwpmc_mpc7xxx.c optional hwpmc dev/hwpmc/hwpmc_power8.c optional hwpmc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/hwpmc/hwpmc_ppc970.c optional hwpmc -dev/iicbus/ds1631.c optional ds1631 powermac -dev/iicbus/ds1775.c optional ds1775 powermac -dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/adc/ad7417.c optional ad7417 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/iicbus/ofw_iicbus_if.m optional iicbus aim dev/iicbus/pwm/adm1030.c optional powermac windtunnel | adm1030 powermac dev/iicbus/pwm/adt746x.c optional adt746x powermac +dev/iicbus/sensor/ds1631.c optional ds1631 powermac +dev/iicbus/sensor/ds1775.c optional ds1775 powermac +dev/iicbus/sensor/max6690.c optional max6690 powermac dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_opal.c optional powernv ipmi dev/ice/if_ice_iflib.c optional ice pci powerpc64 | ice pci powerpc64le \ diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/sensor/ds1631.c similarity index 100% rename from sys/dev/iicbus/ds1631.c rename to sys/dev/iicbus/sensor/ds1631.c diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/sensor/ds1775.c similarity index 100% rename from sys/dev/iicbus/ds1775.c rename to sys/dev/iicbus/sensor/ds1775.c diff --git a/sys/dev/iicbus/htu21.c b/sys/dev/iicbus/sensor/htu21.c similarity index 100% rename from sys/dev/iicbus/htu21.c rename to sys/dev/iicbus/sensor/htu21.c diff --git a/sys/dev/iicbus/lm75.c b/sys/dev/iicbus/sensor/lm75.c similarity index 100% rename from sys/dev/iicbus/lm75.c rename to sys/dev/iicbus/sensor/lm75.c diff --git a/sys/dev/iicbus/max44009.c b/sys/dev/iicbus/sensor/max44009.c similarity index 100% rename from sys/dev/iicbus/max44009.c rename to sys/dev/iicbus/sensor/max44009.c diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/sensor/max6690.c similarity index 100% rename from sys/dev/iicbus/max6690.c rename to sys/dev/iicbus/sensor/max6690.c diff --git a/sys/dev/iicbus/tmp461.c b/sys/dev/iicbus/sensor/tmp461.c similarity index 100% rename from sys/dev/iicbus/tmp461.c rename to sys/dev/iicbus/sensor/tmp461.c diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile index a7108d62fd0b..e049139c20cf 100644 --- a/sys/modules/i2c/htu21/Makefile +++ b/sys/modules/i2c/htu21/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= htu21 SRCS= htu21.c diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile index 42c96bbbf883..c4342b5819aa 100644 --- a/sys/modules/i2c/max44009/Makefile +++ b/sys/modules/i2c/max44009/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= max44009 SRCS= max44009.c diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile index 4cd5be59fd18..9c4d6518d596 100644 --- a/sys/modules/i2c/tmp461/Makefile +++ b/sys/modules/i2c/tmp461/Makefile @@ -1,5 +1,5 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD = tmp461 SRCS = tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h From nobody Wed Oct 18 14:33:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH83vxHz4x6Ns; Wed, 18 Oct 2023 14:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YH761x8z3Qcx; Wed, 18 Oct 2023 14:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8ZqiJ6vjaW6qH6ynI+9EvYunou8TdF+cpVvsHeOSRY=; b=x2+mlXzyAxflkqgJj1kImS4F/mYpsmsBFtPYINp0BKIhAUpsNjM602JSB+d/8fvnR0TwkK Zv+2ftEzLdBscbS53yjUugnGU+R5RS+8X4IbI3C+Lz6eOBGQYk2hympjB9jgqCOD5Dy2CG u0t/tsd69dOUxlbF6Enk8kytnVxKUITsgJKNY3xtPw9fcII4SFYWLoGyR5HL/ImbCrJveY vrIEXdEynLg81txz9ZxfizBdvSwZd8JzOdnqwh7oLJK/h6z4nrHhRa8jCfjSDlCCuaoeL/ BDA1GJNrgd00a5H6S6gm0HdQHw41KZ29QHYkHkZxBawyGlJn3+bV1QUaY2dkPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639587; a=rsa-sha256; cv=none; b=Io9ZdMMC6H2Xa/UbMuxvv2sRUTePsW/i5i6vi2KBJ+MF99rr//1sIhd0rwD3XCHa3A7TFn KJdS0xzO1yQEL14sKKkF4GGJfQjyJiWDMR7UUZ6a7BzW0379v82MHzZgp9lnQMyzILLCNR z4KL6mKd847om7zp0Ko0VppNrshXcJoj7XxKETfWBfDI9z1aeo7OscbsjBsoQY652Q4dDm L0wcdz48pUDVC8LyrFYr6uCaXiHofmekf/f49Hcc4aLLrEsxrfqwB8/X455le4RLgCj6gi 5swABFcJp8pVZ5hk8Vs6NRyJ0FtNxkJncSYAFYwBv+zSK0+HluIjmzlANt2tLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8ZqiJ6vjaW6qH6ynI+9EvYunou8TdF+cpVvsHeOSRY=; b=iT0J72FEonaIhjOyAggQ3NOuy9O/dUIWIjqOtCd0Q2ZEVSih+4Wn7GS5SUe5nkn8jf9uSA W7+5p8FUmwaL0dhoju60V7a+7WxsbW9/WVuKb70tflZUloOeKi2usLi9NdlP7WVsKSN+JE saNRnAw1Gt0udETl/F5YIptuYoyPwbrZ79kzFingJVwlmAa3s1VinrdZ57bpSaFQ1fFvJr 9EkfdAqfDAkflv+i/8mPdiWzv2Hhl9ilPfEMMeYGLhw6OO9LbtMCIbXmyS892dIiVBP6FI y86sKubqDaf6GjXw9Tp0am4LPDnljlrEiJb4vrbj0qO5khXr2aof2kjCf+QZtg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH757k6z18rr; Wed, 18 Oct 2023 14:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEX7Fk091857; Wed, 18 Oct 2023 14:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX7Pf091854; Wed, 18 Oct 2023 14:33:07 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:07 GMT Message-Id: <202310181433.39IEX7Pf091854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: c1335891057c - stable/14 - iicbus: Move opencores i2c driver into controller subdirectory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c1335891057c90000ab185c1c1fbd893a809fa8b Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c1335891057c90000ab185c1c1fbd893a809fa8b commit c1335891057c90000ab185c1c1fbd893a809fa8b Author: Emmanuel Vadot AuthorDate: 2023-09-19 10:06:32 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:15 +0000 iicbus: Move opencores i2c driver into controller subdirectory Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41914 (cherry picked from commit 125f5c5b48b1fdccf364b821ce48bfdbd9687ed1) --- sys/conf/files | 6 +++--- sys/dev/iicbus/{ => controller/opencores}/iicoc.c | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc.h | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc_fdt.c | 0 sys/dev/iicbus/{ => controller/opencores}/iicoc_pci.c | 0 sys/modules/i2c/controllers/iicoc/Makefile | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 44646cb8f6bf..f113794ab68a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1804,12 +1804,12 @@ dev/iicbus/iichid.c optional iichid acpi hid iicbus dev/iicbus/iiconf.c optional iicbus | compat_linuxkpi dev/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" -dev/iicbus/iicoc.c optional iicoc -dev/iicbus/iicoc_fdt.c optional iicoc fdt -dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/adc/ad7418.c optional ad7418 dev/iicbus/adc/ads111x.c optional ads111x dev/iicbus/adc/pcf8591.c optional pcf8591 +dev/iicbus/controller/opencores/iicoc.c optional iicoc +dev/iicbus/controller/opencores/iicoc_fdt.c optional iicoc fdt +dev/iicbus/controller/opencores/iicoc_pci.c optional iicoc pci dev/iicbus/mux/iicmux.c optional iicmux dev/iicbus/mux/iicmux_if.m optional iicmux dev/iicbus/mux/iic_gpiomux.c optional iic_gpiomux fdt diff --git a/sys/dev/iicbus/iicoc.c b/sys/dev/iicbus/controller/opencores/iicoc.c similarity index 100% rename from sys/dev/iicbus/iicoc.c rename to sys/dev/iicbus/controller/opencores/iicoc.c diff --git a/sys/dev/iicbus/iicoc.h b/sys/dev/iicbus/controller/opencores/iicoc.h similarity index 100% rename from sys/dev/iicbus/iicoc.h rename to sys/dev/iicbus/controller/opencores/iicoc.h diff --git a/sys/dev/iicbus/iicoc_fdt.c b/sys/dev/iicbus/controller/opencores/iicoc_fdt.c similarity index 100% rename from sys/dev/iicbus/iicoc_fdt.c rename to sys/dev/iicbus/controller/opencores/iicoc_fdt.c diff --git a/sys/dev/iicbus/iicoc_pci.c b/sys/dev/iicbus/controller/opencores/iicoc_pci.c similarity index 100% rename from sys/dev/iicbus/iicoc_pci.c rename to sys/dev/iicbus/controller/opencores/iicoc_pci.c diff --git a/sys/modules/i2c/controllers/iicoc/Makefile b/sys/modules/i2c/controllers/iicoc/Makefile index f6902f1f864a..f86a6513ad22 100644 --- a/sys/modules/i2c/controllers/iicoc/Makefile +++ b/sys/modules/i2c/controllers/iicoc/Makefile @@ -1,4 +1,4 @@ -.PATH: ${SRCTOP}/sys/dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus/controller/opencores KMOD = iicoc SRCS = device_if.h bus_if.h iicbus_if.h \ From nobody Wed Oct 18 14:33:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YH92ld7z4x6Lf; Wed, 18 Oct 2023 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YH86pJcz3QRt; Wed, 18 Oct 2023 14:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nunIye2v7kiQehDi45DAS0BQQEPDQhgj2SlaKCRgvMo=; b=PAsdNZPisY6bKFoelccCdqEgahC00M1ezahBBItw/kJUu0J9FfRN5QgO/1vgKtg8G4UEnf NaszqZc4jDG+Q4GUIbMjvNbhfkdRj7TWkBKlTI5egkbKK5xb7LY1jij/5yBwQKcUXlw6q8 0/BJqDAIrGvvuBL0WKMF2qBUIuffsTtgvSOEHwFtUoiU2FACr89VrwFuXG09wn0WU3PgcX IchNrcWuYem1FQo4wO++mJF5HzLwEKh4h2upoNQcdFtuWayhq2B4WBbbt3wKvDCoqaXyaP ScNo0sOvlGP80CwR+/ZMtjvt83/1ZK6UgTpeHhTtowQM6Kdx4Nqvp6NnnBJcJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639588; a=rsa-sha256; cv=none; b=g8P4UHIKYgdeAlwxwKw1wv8Ut2maTxQ9+xiKaCHLZdH6lMe0dxwrOLq1SZemWB/uMwXTgy 4PpFnvLjEH5Jns5bFTyQxyv2IhezRVAU8vhodIrBus6gYZcdkRN2mA/z7Ph67xSEo3wH72 cb/8g9JY1Wg0TYIWZMjRDrIL8+ME6bWWLpCG2lhbXftK+yD5YrPH+O6eluJIGDHeZUn9jk QVFEWg0URcVUzR5qxFDoHfuiOhiJm2YbKQ9xqgsJelDK6zGn0jewoUJy0/ygrOAOh51wpA LrdmJNgb/9X8iokcQVQIsFaSu0xt/vMN+v6mgdLRrQ+CjL1LA1a94spjSJp/lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nunIye2v7kiQehDi45DAS0BQQEPDQhgj2SlaKCRgvMo=; b=W/9jrmsjEUmiHlyOphym56HwKzYisr/bflpYD37WQb5Ruyy9AUqGEoD8a057MpksH3ito8 +R64Y6C1SDvUvTT1haZiBdkdUwMa7cMbjC78idIxUV55O9k47nqXdpgNa7Kvz9d5Q5QJWv 4Y8TR45CMvTHTzq1fv36bQR4fqU1WEjYVsA/R8S7iBD5GLtDtEgn3s8YA21hn03sEdOluJ VPqrFQGi1bxAVG+z8IS9tz7H0JtQOIhFPrNH4PaNp7MkG+HiuhmMcT3sonotUpVqxkFAK7 qITBudxMYYJixFL2eZd15BUqDpEc6Uy0HI05oa/Xah7YXkhlpOLIKpEw3K9P2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH85rmzz19GM; Wed, 18 Oct 2023 14:33: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 39IEX8gG091909; Wed, 18 Oct 2023 14:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX8rw091906; Wed, 18 Oct 2023 14:33:08 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:08 GMT Message-Id: <202310181433.39IEX8rw091906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 7b824791e7a3 - stable/14 - i2c: Add cadence iic driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b824791e7a3008aeab39186610da41d28fd8eaf Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7b824791e7a3008aeab39186610da41d28fd8eaf commit 7b824791e7a3008aeab39186610da41d28fd8eaf Author: Emmanuel Vadot AuthorDate: 2023-09-27 05:34:38 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:17 +0000 i2c: Add cadence iic driver This IP is found in Xilinx SoC, it only been tested on ZynqMP (arm64) so only enable it there for now. Differential Revision: https://reviews.freebsd.org/D41994 (cherry picked from commit 137b58e4d2044adc200d13c8989d3746a0a4bd7f) --- sys/arm64/conf/std.xilinx | 3 + sys/conf/files.arm64 | 1 + sys/dev/iicbus/controller/cadence/cdnc_i2c.c | 707 +++++++++++++++++++++++++++ 3 files changed, 711 insertions(+) diff --git a/sys/arm64/conf/std.xilinx b/sys/arm64/conf/std.xilinx index cc89e8575336..50ebf5ade53b 100644 --- a/sys/arm64/conf/std.xilinx +++ b/sys/arm64/conf/std.xilinx @@ -16,4 +16,7 @@ device cgem # Cadence GEM Gigabit Ethernet device # MMC/SD/SDIO Card slot support device sdhci +# IICBUS +device cdnc_i2c + options FDT diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index d8adc54763fc..baf8734fb38f 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -696,6 +696,7 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt +dev/iicbus/controller/cadence/cdnc_i2c.c optional cdnc_i2c iicbus soc_xilinx_zynq fdt dev/usb/controller/xlnx_dwc3.c optional xhci soc_xilinx_zynq fdt dev/firmware/xilinx/zynqmp_firmware.c optional fdt soc_xilinx_zynq dev/firmware/xilinx/zynqmp_firmware_if.m optional fdt soc_xilinx_zynq diff --git a/sys/dev/iicbus/controller/cadence/cdnc_i2c.c b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c new file mode 100644 index 000000000000..dd525071caa2 --- /dev/null +++ b/sys/dev/iicbus/controller/cadence/cdnc_i2c.c @@ -0,0 +1,707 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019-2020 Thomas Skibo + * + * 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. + */ + +/* Cadence / Zynq i2c driver. + * + * Reference: Zynq-7000 All Programmable SoC Technical Reference Manual. + * (v1.12.2) July 1, 2018. Xilinx doc UG585. I2C Controller is documented + * in Chapter 20. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include + +#include "iicbus_if.h" + +#ifdef I2CDEBUG +#define DPRINTF(...) do { printf(__VA_ARGS__); } while (0) +#else +#define DPRINTF(...) do { } while (0) +#endif + +#if 0 +#define HWTYPE_CDNS_R1P10 1 +#endif +#define HWTYPE_CDNS_R1P14 2 + +static struct ofw_compat_data compat_data[] = { +#if 0 + {"cdns,i2c-r1p10", HWTYPE_CDNS_R1P10}, +#endif + {"cdns,i2c-r1p14", HWTYPE_CDNS_R1P14}, + {NULL, 0} +}; + +struct cdnc_i2c_softc { + device_t dev; + device_t iicbus; + struct mtx sc_mtx; + struct resource *mem_res; + struct resource *irq_res; + void *intrhandle; + + uint16_t cfg_reg_shadow; + uint16_t istat; + clk_t ref_clk; + uint32_t ref_clock_freq; + uint32_t i2c_clock_freq; + + int hwtype; + int hold; + + /* sysctls */ + unsigned int i2c_clk_real_freq; + unsigned int interrupts; + unsigned int timeout_ints; +}; + +#define I2C_SC_LOCK(sc) mtx_lock(&(sc)->sc_mtx) +#define I2C_SC_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) +#define I2C_SC_LOCK_INIT(sc) \ + mtx_init(&(sc)->sc_mtx, device_get_nameunit((sc)->dev), NULL, MTX_DEF) +#define I2C_SC_LOCK_DESTROY(sc) mtx_destroy(&(sc)->sc_mtx) +#define I2C_SC_ASSERT_LOCKED(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED) + +#define RD2(sc, off) (bus_read_2((sc)->mem_res, (off))) +#define WR2(sc, off, val) (bus_write_2((sc)->mem_res, (off), (val))) +#define RD1(sc, off) (bus_read_1((sc)->mem_res, (off))) +#define WR1(sc, off, val) (bus_write_1((sc)->mem_res, (off), (val))) + +/* Cadence I2C controller device registers. */ +#define CDNC_I2C_CR 0x0000 /* Config register. */ +#define CDNC_I2C_CR_DIV_A_MASK (3 << 14) +#define CDNC_I2C_CR_DIV_A_SHIFT 14 +#define CDNC_I2C_CR_DIV_A(a) ((a) << 14) +#define CDNC_I2C_CR_DIV_A_MAX 3 +#define CDNC_I2C_CR_DIV_B_MASK (0x3f << 8) +#define CDNC_I2C_CR_DIV_B_SHIFT 8 +#define CDNC_I2C_CR_DIV_B(b) ((b) << 8) +#define CDNC_I2C_CR_DIV_B_MAX 63 +#define CDNC_I2C_CR_CLR_FIFO (1 << 6) +#define CDNC_I2C_CR_SLVMON_MODE (1 << 5) +#define CDNC_I2C_CR_HOLD (1 << 4) +#define CDNC_I2C_CR_ACKEN (1 << 3) +#define CDNC_I2C_CR_NEA (1 << 2) +#define CDNC_I2C_CR_MAST (1 << 1) +#define CDNC_I2C_CR_RNW (1 << 0) + +#define CDNC_I2C_SR 0x0004 /* Status register. */ +#define CDNC_I2C_SR_BUS_ACTIVE (1 << 8) +#define CDNC_I2C_SR_RX_OVF (1 << 7) +#define CDNC_I2C_SR_TX_VALID (1 << 6) +#define CDNC_I2C_SR_RX_VALID (1 << 5) +#define CDNC_I2C_SR_RXRW (1 << 3) + +#define CDNC_I2C_ADDR 0x0008 /* i2c address register. */ +#define CDNC_I2C_DATA 0x000C /* i2c data register. */ + +#define CDNC_I2C_ISR 0x0010 /* Int status register. */ +#define CDNC_I2C_ISR_ARB_LOST (1 << 9) +#define CDNC_I2C_ISR_RX_UNDF (1 << 7) +#define CDNC_I2C_ISR_TX_OVF (1 << 6) +#define CDNC_I2C_ISR_RX_OVF (1 << 5) +#define CDNC_I2C_ISR_SLV_RDY (1 << 4) +#define CDNC_I2C_ISR_XFER_TMOUT (1 << 3) +#define CDNC_I2C_ISR_XFER_NACK (1 << 2) +#define CDNC_I2C_ISR_XFER_DATA (1 << 1) +#define CDNC_I2C_ISR_XFER_DONE (1 << 0) +#define CDNC_I2C_ISR_ALL 0x2ff +#define CDNC_I2C_TRANS_SIZE 0x0014 /* Transfer size. */ +#define CDNC_I2C_PAUSE 0x0018 /* Slv Monitor Pause reg. */ +#define CDNC_I2C_TIME_OUT 0x001C /* Time-out register. */ +#define CDNC_I2C_TIME_OUT_MIN 31 +#define CDNC_I2C_TIME_OUT_MAX 255 +#define CDNC_I2C_IMR 0x0020 /* Int mask register. */ +#define CDNC_I2C_IER 0x0024 /* Int enable register. */ +#define CDNC_I2C_IDR 0x0028 /* Int disable register. */ + +#define CDNC_I2C_FIFO_SIZE 16 +#define CDNC_I2C_DEFAULT_I2C_CLOCK 400000 /* 400Khz default */ + +#define CDNC_I2C_ISR_ERRS (CDNC_I2C_ISR_ARB_LOST | CDNC_I2C_ISR_RX_UNDF | \ + CDNC_I2C_ISR_TX_OVF | CDNC_I2C_ISR_RX_OVF | CDNC_I2C_ISR_XFER_TMOUT | \ + CDNC_I2C_ISR_XFER_NACK) + +/* Configure clock dividers. */ +static int +cdnc_i2c_set_freq(struct cdnc_i2c_softc *sc) +{ + uint32_t div_a, div_b, err, clk_out; + uint32_t best_div_a, best_div_b, best_err; + + best_div_a = 0; + best_div_b = 0; + best_err = ~0U; + + /* + * The i2c controller has a two-stage clock divider to create + * the "clock enable" signal used to sample the incoming SCL and + * SDA signals. The Clock Enable signal is divided by 22 to create + * the outgoing SCL signal. + * + * Try all div_a values and pick best match. + */ + for (div_a = 0; div_a <= CDNC_I2C_CR_DIV_A_MAX; div_a++) { + div_b = sc->ref_clock_freq / (22 * sc->i2c_clock_freq * + (div_a + 1)); + if (div_b > CDNC_I2C_CR_DIV_B_MAX) + continue; + clk_out = sc->ref_clock_freq / (22 * (div_a + 1) * + (div_b + 1)); + err = clk_out > sc->i2c_clock_freq ? + clk_out - sc->i2c_clock_freq : + sc->i2c_clock_freq - clk_out; + if (err < best_err) { + best_err = err; + best_div_a = div_a; + best_div_b = div_b; + } + } + + if (best_err == ~0U) { + device_printf(sc->dev, "cannot configure clock divider.\n"); + return (EINVAL); /* out of range */ + } + + clk_out = sc->ref_clock_freq / (22 * (best_div_a + 1) * + (best_div_b + 1)); + + DPRINTF("%s: ref_clock_freq=%d i2c_clock_freq=%d\n", __func__, + sc->ref_clock_freq, sc->i2c_clock_freq); + DPRINTF("%s: div_a=%d div_b=%d real-freq=%d\n", __func__, best_div_a, + best_div_b, clk_out); + + sc->cfg_reg_shadow &= ~(CDNC_I2C_CR_DIV_A_MASK | + CDNC_I2C_CR_DIV_B_MASK); + sc->cfg_reg_shadow |= CDNC_I2C_CR_DIV_A(best_div_a) | + CDNC_I2C_CR_DIV_B(best_div_b); + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow); + + sc->i2c_clk_real_freq = clk_out; + + return (0); +} + +/* Initialize hardware. */ +static int +cdnc_i2c_init_hw(struct cdnc_i2c_softc *sc) +{ + + /* Reset config register and clear FIFO. */ + sc->cfg_reg_shadow = 0; + WR2(sc, CDNC_I2C_CR, CDNC_I2C_CR_CLR_FIFO); + sc->hold = 0; + + /* Clear and disable all interrupts. */ + WR2(sc, CDNC_I2C_ISR, CDNC_I2C_ISR_ALL); + WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_ALL); + + /* Max out bogus time-out register. */ + WR1(sc, CDNC_I2C_TIME_OUT, CDNC_I2C_TIME_OUT_MAX); + + /* Set up clock dividers. */ + return (cdnc_i2c_set_freq(sc)); +} + +static int +cdnc_i2c_errs(struct cdnc_i2c_softc *sc, uint16_t istat) +{ + + DPRINTF("%s: istat=0x%x\n", __func__, istat); + + /* XXX: clean up after errors. */ + + /* Reset config register and clear FIFO. */ + sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK; + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO); + sc->hold = 0; + + if (istat & CDNC_I2C_ISR_XFER_TMOUT) + return (IIC_ETIMEOUT); + else if (istat & CDNC_I2C_ISR_RX_UNDF) + return (IIC_EUNDERFLOW); + else if (istat & (CDNC_I2C_ISR_RX_OVF | CDNC_I2C_ISR_TX_OVF)) + return (IIC_EOVERFLOW); + else if (istat & CDNC_I2C_ISR_XFER_NACK) + return (IIC_ENOACK); + else if (istat & CDNC_I2C_ISR_ARB_LOST) + return (IIC_EBUSERR); /* XXX: ???? */ + else + /* Should not happen */ + return (IIC_NOERR); +} + +static int +cdnc_i2c_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr) +{ + struct cdnc_i2c_softc *sc = device_get_softc(dev); + int error; + + DPRINTF("%s: speed=%d addr=0x%x\n", __func__, speed, addr); + + I2C_SC_LOCK(sc); + + sc->i2c_clock_freq = IICBUS_GET_FREQUENCY(sc->iicbus, speed); + + error = cdnc_i2c_init_hw(sc); + + I2C_SC_UNLOCK(sc); + + return (error ? IIC_ENOTSUPP : IIC_NOERR); +} + +static void +cdnc_i2c_intr(void *arg) +{ + struct cdnc_i2c_softc *sc = (struct cdnc_i2c_softc *)arg; + uint16_t status; + + I2C_SC_LOCK(sc); + + sc->interrupts++; + + /* Read active interrupts. */ + status = RD2(sc, CDNC_I2C_ISR) & ~RD2(sc, CDNC_I2C_IMR); + + /* Clear interrupts. */ + WR2(sc, CDNC_I2C_ISR, status); + + if (status & CDNC_I2C_ISR_XFER_TMOUT) + sc->timeout_ints++; + + sc->istat |= status; + + if (status) + wakeup(sc); + + I2C_SC_UNLOCK(sc); +} + +static int +cdnc_i2c_xfer_rd(struct cdnc_i2c_softc *sc, struct iic_msg *msg) +{ + int error = IIC_NOERR; + uint16_t flags = msg->flags; + uint16_t len = msg->len; + int idx = 0, nbytes, last, first = 1; + uint16_t statr; + + DPRINTF("%s: flags=0x%x len=%d\n", __func__, flags, len); + +#if 0 + if (sc->hwtype == HWTYPE_CDNS_R1P10 && (flags & IIC_M_NOSTOP)) + return (IIC_ENOTSUPP); +#endif + + I2C_SC_ASSERT_LOCKED(sc); + + /* Program config register. */ + sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK; + sc->cfg_reg_shadow |= CDNC_I2C_CR_HOLD | CDNC_I2C_CR_ACKEN | + CDNC_I2C_CR_NEA | CDNC_I2C_CR_MAST | CDNC_I2C_CR_RNW; + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO); + sc->hold = 1; + + while (len > 0) { + nbytes = MIN(CDNC_I2C_FIFO_SIZE - 2, len); + WR1(sc, CDNC_I2C_TRANS_SIZE, nbytes); + + last = nbytes == len && !(flags & IIC_M_NOSTOP); + if (last) { + /* Clear HOLD bit on last transfer. */ + sc->cfg_reg_shadow &= ~CDNC_I2C_CR_HOLD; + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow); + sc->hold = 0; + } + + /* Writing slv address for a start or repeated start. */ + if (first && !(flags & IIC_M_NOSTART)) + WR2(sc, CDNC_I2C_ADDR, msg->slave >> 1); + first = 0; + + /* Enable FIFO interrupts and wait. */ + if (last) + WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DONE | + CDNC_I2C_ISR_ERRS); + else + WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DATA | + CDNC_I2C_ISR_ERRS); + + error = mtx_sleep(sc, &sc->sc_mtx, 0, "cdi2c", hz); + + /* Disable FIFO interrupts. */ + WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_XFER_DATA | + CDNC_I2C_ISR_XFER_DONE | CDNC_I2C_ISR_ERRS); + + if (error == EWOULDBLOCK) + error = cdnc_i2c_errs(sc, CDNC_I2C_ISR_XFER_TMOUT); + else if (sc->istat & CDNC_I2C_ISR_ERRS) + error = cdnc_i2c_errs(sc, sc->istat); + sc->istat = 0; + + if (error != IIC_NOERR) + break; + + /* Read nbytes from FIFO. */ + while (nbytes-- > 0) { + statr = RD2(sc, CDNC_I2C_SR); + if (!(statr & CDNC_I2C_SR_RX_VALID)) { + printf("%s: RX FIFO underflow?\n", __func__); + break; + } + msg->buf[idx++] = RD2(sc, CDNC_I2C_DATA); + len--; + } + } + + return (error); +} + +static int +cdnc_i2c_xfer_wr(struct cdnc_i2c_softc *sc, struct iic_msg *msg) +{ + int error = IIC_NOERR; + uint16_t flags = msg->flags; + uint16_t len = msg->len; + int idx = 0, nbytes, last, first = 1; + + DPRINTF("%s: flags=0x%x len=%d\n", __func__, flags, len); + + I2C_SC_ASSERT_LOCKED(sc); + + /* Program config register. */ + sc->cfg_reg_shadow &= CDNC_I2C_CR_DIV_A_MASK | CDNC_I2C_CR_DIV_B_MASK; + sc->cfg_reg_shadow |= CDNC_I2C_CR_HOLD | CDNC_I2C_CR_ACKEN | + CDNC_I2C_CR_NEA | CDNC_I2C_CR_MAST; + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow | CDNC_I2C_CR_CLR_FIFO); + sc->hold = 1; + + while (len > 0) { + /* Put as much data into fifo as you can. */ + nbytes = MIN(len, CDNC_I2C_FIFO_SIZE - + RD1(sc, CDNC_I2C_TRANS_SIZE) - 1); + len -= nbytes; + while (nbytes-- > 0) + WR2(sc, CDNC_I2C_DATA, msg->buf[idx++]); + + last = len == 0 && !(flags & IIC_M_NOSTOP); + if (last) { + /* Clear HOLD bit on last transfer. */ + sc->cfg_reg_shadow &= ~CDNC_I2C_CR_HOLD; + WR2(sc, CDNC_I2C_CR, sc->cfg_reg_shadow); + sc->hold = 0; + } + + /* Perform START if this is start or repeated start. */ + if (first && !(flags & IIC_M_NOSTART)) + WR2(sc, CDNC_I2C_ADDR, msg->slave >> 1); + first = 0; + + /* Enable FIFO interrupts. */ + WR2(sc, CDNC_I2C_IER, CDNC_I2C_ISR_XFER_DONE | + CDNC_I2C_ISR_ERRS); + + /* Wait for end of data transfer. */ + error = mtx_sleep(sc, &sc->sc_mtx, 0, "cdi2c", hz); + + /* Disable FIFO interrupts. */ + WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_XFER_DONE | + CDNC_I2C_ISR_ERRS); + + if (error == EWOULDBLOCK) + error = cdnc_i2c_errs(sc, CDNC_I2C_ISR_XFER_TMOUT); + else if (sc->istat & CDNC_I2C_ISR_ERRS) + error = cdnc_i2c_errs(sc, sc->istat); + sc->istat = 0; + if (error) + break; + } + + return (error); +} + +static int +cdnc_i2c_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs) +{ + struct cdnc_i2c_softc *sc = device_get_softc(dev); + int i, error = IIC_NOERR; + + DPRINTF("%s: nmsgs=%d\n", __func__, nmsgs); + + I2C_SC_LOCK(sc); + + for (i = 0; i < nmsgs; i++) { + DPRINTF("%s: msg[%d]: hold=%d slv=0x%x flags=0x%x len=%d\n", + __func__, i, sc->hold, msgs[i].slave, msgs[i].flags, + msgs[i].len); + + if (!sc->hold && (msgs[i].flags & IIC_M_NOSTART)) + return (IIC_ENOTSUPP); + + if (msgs[i].flags & IIC_M_RD) { + error = cdnc_i2c_xfer_rd(sc, &msgs[i]); + if (error != IIC_NOERR) + break; + } else { + error = cdnc_i2c_xfer_wr(sc, &msgs[i]); + if (error != IIC_NOERR) + break; + } + } + + I2C_SC_UNLOCK(sc); + + return (error); +} + +static void +cdnc_i2c_add_sysctls(device_t dev) +{ + struct cdnc_i2c_softc *sc = device_get_softc(dev); + struct sysctl_ctx_list *ctx; + struct sysctl_oid_list *child; + + ctx = device_get_sysctl_ctx(dev); + child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev)); + + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "i2c_clk_real_freq", CTLFLAG_RD, + &sc->i2c_clk_real_freq, 0, "i2c clock real frequency"); + + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "_interrupts", CTLFLAG_RD, + &sc->interrupts, 0, "interrupt calls"); + SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "_timeouts", CTLFLAG_RD, + &sc->timeout_ints, 0, "hardware timeout interrupts"); +} + + +static int +cdnc_i2c_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "Cadence I2C Controller"); + + return (BUS_PROBE_DEFAULT); +} + + +static int cdnc_i2c_detach(device_t); + +static int +cdnc_i2c_attach(device_t dev) +{ + struct cdnc_i2c_softc *sc; + int rid, err; + phandle_t node; + pcell_t cell; + uint64_t freq; + + sc = device_get_softc(dev); + sc->dev = dev; + sc->hwtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data; + + I2C_SC_LOCK_INIT(sc); + + /* Get ref-clock and i2c-clock properties. */ + node = ofw_bus_get_node(dev); + if (OF_getprop(node, "ref-clock", &cell, sizeof(cell)) > 0) + sc->ref_clock_freq = fdt32_to_cpu(cell); + else if (clk_get_by_ofw_index(dev, node, 0, &sc->ref_clk) == 0) { + if ((err = clk_enable(sc->ref_clk)) != 0) + device_printf(dev, "Cannot enable clock. err=%d\n", + err); + else if ((err = clk_get_freq(sc->ref_clk, &freq)) != 0) + device_printf(dev, + "Cannot get clock frequency. err=%d\n", err); + else + sc->ref_clock_freq = freq; + } + else { + device_printf(dev, "must have ref-clock property\n"); + return (ENXIO); + } + if (OF_getprop(node, "clock-frequency", &cell, sizeof(cell)) > 0) + sc->i2c_clock_freq = fdt32_to_cpu(cell); + else + sc->i2c_clock_freq = CDNC_I2C_DEFAULT_I2C_CLOCK; + + /* Get memory resource. */ + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) { + device_printf(dev, "could not allocate memory resources.\n"); + cdnc_i2c_detach(dev); + return (ENOMEM); + } + + /* Allocate IRQ. */ + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->irq_res == NULL) { + device_printf(dev, "could not allocate IRQ resource.\n"); + cdnc_i2c_detach(dev); + return (ENOMEM); + } + + /* Activate the interrupt. */ + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + NULL, cdnc_i2c_intr, sc, &sc->intrhandle); + if (err) { + device_printf(dev, "could not setup IRQ.\n"); + cdnc_i2c_detach(dev); + return (err); + } + + /* Configure the device. */ + err = cdnc_i2c_init_hw(sc); + if (err) { + cdnc_i2c_detach(dev); + return (err); + } + + sc->iicbus = device_add_child(dev, "iicbus", -1); + + cdnc_i2c_add_sysctls(dev); + + /* Probe and attach iicbus when interrupts work. */ + return (bus_delayed_attach_children(dev)); +} + +static int +cdnc_i2c_detach(device_t dev) +{ + struct cdnc_i2c_softc *sc = device_get_softc(dev); + + if (device_is_attached(dev)) + bus_generic_detach(dev); + + if (sc->ref_clk != NULL) { + clk_release(sc->ref_clk); + sc->ref_clk = NULL; + } + + /* Delete iic bus. */ + if (sc->iicbus) + device_delete_child(dev, sc->iicbus); + + /* Disable hardware. */ + if (sc->mem_res != NULL) { + sc->cfg_reg_shadow = 0; + WR2(sc, CDNC_I2C_CR, CDNC_I2C_CR_CLR_FIFO); + + /* Clear and disable all interrupts. */ + WR2(sc, CDNC_I2C_ISR, CDNC_I2C_ISR_ALL); + WR2(sc, CDNC_I2C_IDR, CDNC_I2C_ISR_ALL); + } + + /* Teardown and release interrupt. */ + if (sc->irq_res != NULL) { + if (sc->intrhandle) + bus_teardown_intr(dev, sc->irq_res, sc->intrhandle); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + + /* Release memory resource. */ + if (sc->mem_res != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(sc->mem_res), sc->mem_res); + sc->mem_res = NULL; + } + + I2C_SC_LOCK_DESTROY(sc); + + return (0); +} + + +static phandle_t +cdnc_i2c_get_node(device_t bus, device_t dev) +{ + + return (ofw_bus_get_node(bus)); +} + +static device_method_t cdnc_i2c_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, cdnc_i2c_probe), + DEVMETHOD(device_attach, cdnc_i2c_attach), + DEVMETHOD(device_detach, cdnc_i2c_detach), + + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_node, cdnc_i2c_get_node), + + /* iicbus methods */ + DEVMETHOD(iicbus_callback, iicbus_null_callback), + DEVMETHOD(iicbus_reset, cdnc_i2c_reset), + DEVMETHOD(iicbus_transfer, cdnc_i2c_transfer), + + DEVMETHOD_END +}; + +static driver_t cdnc_i2c_driver = { + "cdnc_i2c", + cdnc_i2c_methods, + sizeof(struct cdnc_i2c_softc), +}; + +DRIVER_MODULE(cdnc_i2c, simplebus, cdnc_i2c_driver, NULL, NULL); +DRIVER_MODULE(ofw_iicbus, cdnc_i2c, ofw_iicbus_driver, NULL, NULL); +MODULE_DEPEND(cdnc_i2c, iicbus, 1, 1, 1); +MODULE_DEPEND(cdnc_i2c, ofw_iicbus, 1, 1, 1); +SIMPLEBUS_PNP_INFO(compat_data); From nobody Wed Oct 18 14:33:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YHB2PGrz4x6Lh; Wed, 18 Oct 2023 14:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YHB0Bsrz3Qgg; Wed, 18 Oct 2023 14:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4opqLC63kENw+BgmfYoIrdaVKH780KHNtfkbcd6uzO4=; b=WYmgB/fma9hgMnU92bENBelYXJGO1YYArZYr+/udiJOUAODo0egKe92bYhZwHsvE2ufFio 3GGd9yxYzzqX/wQ9/p0UkwW7P6MhsYLylGKNT2ejS31+e93DWemMuoW00YXNQ2Tk442dBO 3LfyGumE44YF1RnjhWbA+vJehf28z9mZ83u1yCaoBLS4Qul69/Vk/WXOniy6x9Qjy8u+hA m0nQrY9LMr1MKEG8VFBNObhb0yeSc+PBUK/OFrjO8BR3eB0KJgYTYgogDbWJD/Jbasq+ui X450wYIhgO4s1svoCUBiS2YRtX8aQICsP+mGCXPIhAPb3R3pkpE5eF1Qb+Pysg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639590; a=rsa-sha256; cv=none; b=YfB1IN8yd7qGCz23Hpu1S5s+dxiO4ZwJVeGeXFMUklYeWnzZdkSTWZzzdilD0olqqwLkUU KlRv2a4UUFSAmDlNa9S4j9yXLrsEpIQg9rUjQscl7MF1HxCiPtx4doZTkzkjbaVu9QSRj+ UK1uGSMOlrIjHfmerAjp/nU52xbHr3js5LHeF+PGFoQb9IUfSn/5OQiFHZ4WgueTNSM/VR /vCGyFxdHy0qbvTOLRkwRUEb7exbl/s/otOXyvPl9+NVM7+VWJNsDBJb7kc5E3C8iJx3bm aod9pIXvr3Fh7o+gmOJdLKN8YEQx6vaUnu4UeXp82KiOvYL7h8EuL/8IuO0fEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4opqLC63kENw+BgmfYoIrdaVKH780KHNtfkbcd6uzO4=; b=Q/7QkxtE41cz8iYw8kmRZLtjL6lYFFfNulMtsp2qLGNWe/HSGdEPb2O6OW7qdGxH+DZO3e iOFJ3EV3gfJ05fb6JihjnkSFoQEMxAPQJwy0DOqBZx/aSv8ZSA6UPqU6XB9JAb2eUOYE8N AiR24xuw4My7Mz7Q3XqFN4OtTy7OJX4MxEenxpZq1L89975iUrxgWkIDd6vVrq0ZzYex6O DZTlzM0yIJJ9Da69pT5TFfLQSoMjwIplvadT9UhKGlCFmnKkz6H0CwDbTdPLjFTpBNfPYL BLTRQxCdxXiYUW83zPkjoy2OzdZ+PB87BIiPE2iPOqNCzmy37KRgsSzG1a3Fjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YH96QZ2z18pD; Wed, 18 Oct 2023 14:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEX9A5091956; Wed, 18 Oct 2023 14:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEX9MK091953; Wed, 18 Oct 2023 14:33:09 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:09 GMT Message-Id: <202310181433.39IEX9MK091953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: b4cd14485a8e - stable/14 - i2c: Add Microcrystal RV3032 RTC driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4cd14485a8efaf98d497351e9b88ad0ccca8c97 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b4cd14485a8efaf98d497351e9b88ad0ccca8c97 commit b4cd14485a8efaf98d497351e9b88ad0ccca8c97 Author: Emmanuel Vadot AuthorDate: 2023-09-27 07:58:52 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:19 +0000 i2c: Add Microcrystal RV3032 RTC driver This is a simple RTC driver for the rv3032 from Microcrystal. Just the basic functionality is implemented (no timer, alarm etc ..). Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D41995 (cherry picked from commit 1d6a6a524409662992ca96bc91ae69b2a2a5ff35) --- sys/conf/files | 1 + sys/dev/iicbus/rtc/rv3032.c | 455 ++++++++++++++++++++++++++++++++++++++++ sys/modules/i2c/Makefile | 3 +- sys/modules/i2c/rv3032/Makefile | 13 ++ 4 files changed, 471 insertions(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index f113794ab68a..f2a31eb24f25 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1825,6 +1825,7 @@ dev/iicbus/rtc/isl12xx.c optional isl12xx dev/iicbus/rtc/nxprtc.c optional nxprtc | pcf8563 dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt dev/iicbus/rtc/rtc8583.c optional rtc8583 +dev/iicbus/rtc/rv3032.c optional rv3032 iicbus fdt dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt dev/iicbus/rtc/s35390a.c optional s35390a dev/iicbus/sensor/htu21.c optional htu21 diff --git a/sys/dev/iicbus/rtc/rv3032.c b/sys/dev/iicbus/rtc/rv3032.c new file mode 100644 index 000000000000..67805dcb7939 --- /dev/null +++ b/sys/dev/iicbus/rtc/rv3032.c @@ -0,0 +1,455 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Beckhoff Automation GmbH & Co. KG + * + * 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 "opt_platform.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include "clock_if.h" +#include "iicbus_if.h" + +/* Date registers */ +#define RV3032_SECS_100TH 0x00 +#define RV3032_SECS 0x01 +#define RV3032_MINS 0x02 +#define RV3032_HOURS 0x03 +#define RV3032_WEEKDAY 0x04 +#define RV3032_DATE 0x05 +#define RV3032_MONTH 0x06 +#define RV3032_YEAR 0x07 + +/* Alarm registers */ +#define RV3032_ALARM_MINUTES 0x08 +#define RV3032_ALARM_HOURS 0x09 +#define RV3032_ALARM_DATE 0x0A + +/* Periodic countdown timer registers */ +#define RV3032_TIMER_VALUE0 0x0B +#define RV3032_TIMER_VALUE1 0x0C + +/* Status register */ +#define RV3032_STATUS 0x0D +#define RV3032_STATUS_VLF (1 << 0) /* Voltage Low Flag */ +#define RV3032_STATUS_PORF (1 << 1) /* Power On Reset Flag */ +#define RV3032_STATUS_EVF (1 << 2) /* External eVent Flag */ +#define RV3032_STATUS_AF (1 << 3) /* Alarm Flag */ +#define RV3032_STATUS_TF (1 << 4) /* periodic countdown Timer Flag */ +#define RV3032_STATUS_UF (1 << 5) /* periodic time Update Flag */ +#define RV3032_STATUS_TLF (1 << 6) /* Temperature Low Flag */ +#define RV3032_STATUS_THF (1 << 7) /* Temperature High Flag */ + +/* Temperature registers */ +#define RV3032_TEMP_LSB 0x0E +#define RV3032_TEMP_LSB_BSF (1 << 0) +#define RV3032_TEMP_LSB_CLKF (1 << 1) +#define RV3032_TEMP_LSB_EEBUSY (1 << 2) +#define RV3032_TEMP_LSB_EEF (1 << 3) +#define RV3032_TEMP_LSB_MASK (0xF0) +#define RV3032_TEMP_LSB_SHIFT 4 + +#define RV3032_TEMP_MSB 0x0F + +#define TEMP_DIV 16 +#define TEMP_C_TO_K 273 + +/* Control registers */ +#define RV3032_CTRL1 0x10 +#define RV3032_CTRL1_TD_MASK 0x3 /* Timer clock frequency */ +#define RV3032_CTRL1_TD_SHIFT 0 +#define RV3032_CTRL1_TD_4096 0 +#define RV3032_CTRL1_TD_64 1 +#define RV3032_CTRL1_TD_1 2 +#define RV3032_CTRL1_TD_1_60 3 +#define RV3032_CTRL1_EERD (1 << 2) /* EEPROM memory refresh disable bit */ +#define RV3032_CTRL1_TE (1 << 3) /* Periodic countdown timer enable bit */ +#define RV3032_CTRL1_USEL (1 << 4) /* Update interrupt select bit */ +#define RV3032_CTRL1_GP0 (1 << 5) /* General Purpose bit 0 */ + +#define RV3032_CTRL2 0x11 +#define RV3032_CTRL2_STOP (1 << 0) /* Stop bit */ +#define RV3032_CTRL2_GP1 (1 << 1) /* General Purpose bit 1 */ +#define RV3032_CTRL2_EIE (1 << 2) /* External event interrupt enable bit */ +#define RV3032_CTRL2_AIE (1 << 3) /* Alarm interrupt enable bit */ +#define RV3032_CTRL2_TIE (1 << 4) /* Periodic countdown timer interrupt enable bit */ +#define RV3032_CTRL2_UIE (1 << 5) /* Periodic time update interrupt enable bit */ +#define RV3032_CTRL2_CLKIE (1 << 6) /* Interrupt Controlled Clock Output Enable bit */ +#define RV3032_CTRL3 0x12 +#define RV3032_CTRL3_TLIE (1 << 0) /* Temperature Low Interrupt Enable bit */ +#define RV3032_CTRL3_THIE (1 << 1) /* Temperature High Interrupt Enable bit */ +#define RV3032_CTRL3_TLE (1 << 2) /* Temperature Low Enable bit */ +#define RV3032_CTRL3_THE (1 << 3) /* Temperature High Enable bit */ +#define RV3032_CTRL3_BSIE (1 << 4) /* Backup Switchover Interrupt Enable bit */ + +/* EEPROM registers */ +#define RV3032_EEPROM_ADDRESS 0x3D +#define RV3032_EEPROM_DATA 0x3E +#define RV3032_EEPROM_COMMAND 0x3F +#define RV3032_EEPROM_CMD_UPDATE 0x11 +#define RV3032_EEPROM_CMD_REFRESH 0x12 +#define RV3032_EEPROM_CMD_WRITE_ONE 0x21 +#define RV3032_EEPROM_CMD_READ_ONE 0x22 + +/* PMU register */ +#define RV3032_EEPROM_PMU 0xC0 +#define RV3032_PMU_TCM_MASK 0x3 +#define RV3032_PMU_TCM_SHIFT 0 +#define RV3032_PMU_TCM_OFF 0 +#define RV3032_PMU_TCM_175V 1 +#define RV3032_PMU_TCM_30V 2 +#define RV3032_PMU_TCM_45V 3 +#define RV3032_PMU_TCR_MASK 0x3 +#define RV3032_PMU_TCR_SHIFT 2 +#define RV3032_PMU_TCR_06K 0 +#define RV3032_PMU_TCR_2K 1 +#define RV3032_PMU_TCR_7K 2 +#define RV3032_PMU_TCR_12K 3 +#define RV3032_PMU_BSM_MASK 0x3 +#define RV3032_PMU_BSM_SHIFT 4 +#define RV3032_PMU_BSM_OFF 0 +#define RV3032_PMU_BSM_DSM 1 +#define RV3032_PMU_BSM_LSM 2 +#define RV3032_PMU_BSM_OFF2 3 +#define RV3032_PMU_NCLKE (1 << 6) + +struct rv3032_softc { + device_t dev; + device_t busdev; + struct intr_config_hook init_hook; +}; + +struct rv3032_timeregs { + uint8_t secs; + uint8_t mins; + uint8_t hours; + uint8_t weekday; + uint8_t date; + uint8_t month; + uint8_t year; +}; + +static struct ofw_compat_data compat_data[] = { + {"microcrystal,rv3032", 1}, + {NULL, 0}, +}; + +static int +rv3032_update_register(struct rv3032_softc *sc, uint8_t reg, uint8_t value, uint8_t mask) +{ + int rv; + uint8_t data; + + if ((rv = iicdev_readfrom(sc->dev, reg, &data, 1, IIC_WAIT)) != 0) + return (rv); + data &= mask; + data |= value; + if ((rv = iicdev_writeto(sc->dev, reg, &data, 1, IIC_WAIT)) != 0) + return (rv); + return (0); +} + +static int +rv3032_eeprom_wait(struct rv3032_softc *sc) +{ + int rv, timeout; + uint8_t data; + + for (timeout = 1000; timeout > 0; timeout--) { + if ((rv = iicdev_readfrom(sc->dev, RV3032_TEMP_LSB, &data, sizeof(data), IIC_WAIT)) != 0) + return (rv); + if ((data & RV3032_TEMP_LSB_EEBUSY) == 0) { + break; + } + } + if (timeout == 0) { + device_printf(sc->dev, "Timeout updating the eeprom\n"); + return (ETIMEDOUT); + } + /* Wait 1ms before allowing another eeprom access */ + DELAY(1000); + + return (0); +} + +static int +rv3032_eeprom_disable(struct rv3032_softc *sc) +{ + int rv; + + if ((rv = rv3032_update_register(sc, RV3032_CTRL1, RV3032_CTRL1_EERD, ~RV3032_CTRL1_EERD)) != 0) + return (rv); + /* Wait 1ms before checking EBUSY */ + DELAY(1000); + return (rv3032_eeprom_wait(sc)); +} + +static int +rv3032_eeprom_update(struct rv3032_softc *sc) +{ + int rv; + uint8_t data; + + data = RV3032_EEPROM_CMD_UPDATE; + if ((rv = iicdev_writeto(sc->dev, RV3032_EEPROM_COMMAND, &data, sizeof(data), IIC_WAIT)) != 0) + return (rv); + /* Wait 1ms before checking EBUSY */ + DELAY(1000); + return (rv3032_eeprom_wait(sc)); +} + +static int +rv3032_eeprom_enable(struct rv3032_softc *sc) +{ + int rv; + + /* Restore eeprom refresh */ + if ((rv = rv3032_update_register(sc, RV3032_CTRL1, 0, ~RV3032_CTRL1_EERD)) != 0) + return (rv); + DELAY(1000); + + return (0); +} + +static int +rv3032_update_cfg(struct rv3032_softc *sc) +{ + int rv; + + if ((rv = rv3032_eeprom_disable(sc)) != 0) + return (rv); + + /* Save configuration in eeprom and re-enable it */ + if ((rv = rv3032_eeprom_update(sc)) != 0) + return (rv); + return (rv3032_eeprom_enable(sc)); +} + +static int +rv3032_temp_read(struct rv3032_softc *sc, int *temp) +{ + int rv, temp2; + uint8_t data[2]; + + if ((rv = iicdev_readfrom(sc->dev, RV3032_TEMP_LSB, &data, sizeof(data), IIC_WAIT)) != 0) + return (rv); + + /* Wait for temp to be stable */ + *temp = (((data[0] & RV3032_TEMP_LSB_MASK) >> RV3032_TEMP_LSB_SHIFT) | + (data[1] << RV3032_TEMP_LSB_SHIFT)); + do { + temp2 = *temp; + *temp = (((data[0] & RV3032_TEMP_LSB_MASK) >> RV3032_TEMP_LSB_SHIFT) | + (data[1] << RV3032_TEMP_LSB_SHIFT)); + } while (temp2 != *temp); + *temp = (*temp / TEMP_DIV) + TEMP_C_TO_K; + return (0); +} + +static int +rv3032_temp_sysctl(SYSCTL_HANDLER_ARGS) +{ + int error, temp; + struct rv3032_softc *sc; + + sc = (struct rv3032_softc *)arg1; + if (rv3032_temp_read(sc, &temp) != 0) + return (EIO); + error = sysctl_handle_int(oidp, &temp, 0, req); + + return (error); +} + +static void +rv3032_init(void *arg) +{ + struct rv3032_softc *sc; + struct sysctl_ctx_list *ctx; + struct sysctl_oid *tree_node; + struct sysctl_oid_list *tree; + int rv; + + sc = (struct rv3032_softc*)arg; + config_intrhook_disestablish(&sc->init_hook); + + /* Set direct switching mode */ + rv3032_update_register(sc, + RV3032_EEPROM_PMU, + RV3032_PMU_BSM_DSM << RV3032_PMU_BSM_SHIFT, + RV3032_PMU_BSM_MASK); + if ((rv = rv3032_update_cfg(sc)) != 0) { + device_printf(sc->dev, "Cannot set to DSM mode (%d)\n", rv); + return; + } + + /* Register as clock source */ + clock_register_flags(sc->dev, 1000000, CLOCKF_SETTIME_NO_ADJ); + clock_schedule(sc->dev, 1); + + ctx = device_get_sysctl_ctx(sc->dev); + tree_node = device_get_sysctl_tree(sc->dev); + tree = SYSCTL_CHILDREN(tree_node); + SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "temperature", + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0, + rv3032_temp_sysctl, "IK0", "Current temperature"); + return; +} + +static int +rv3032_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) { + device_set_desc(dev, "Microcrystal RV3032"); + return (BUS_PROBE_DEFAULT); + } + return (ENXIO); +} + +static int +rv3032_attach(device_t dev) +{ + struct rv3032_softc *sc; + + sc = device_get_softc(dev); + sc->dev = dev; + sc->busdev = device_get_parent(sc->dev); + + sc->init_hook.ich_func = rv3032_init; + sc->init_hook.ich_arg = sc; + if (config_intrhook_establish(&sc->init_hook) != 0) + return (ENOMEM); + + return (0); +} + +static int +rv3032_detach(device_t dev) +{ + + clock_unregister(dev); + return (0); +} + +static int +rv3032_gettime(device_t dev, struct timespec *ts) +{ + struct rv3032_softc *sc; + struct rv3032_timeregs time_regs; + struct clocktime ct; + uint8_t status; + int rv; + + sc = device_get_softc(dev); + + if ((rv = iicdev_readfrom(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0) + return (rv); + if (status & (RV3032_STATUS_PORF | RV3032_STATUS_VLF)) + return (EINVAL); + if ((rv = iicdev_readfrom(sc->dev, RV3032_SECS, &time_regs, sizeof(time_regs), IIC_WAIT)) != 0) + return (rv); + + bzero(&ct, sizeof(ct)); + ct.sec = FROMBCD(time_regs.secs & 0x7f); + ct.min = FROMBCD(time_regs.mins & 0x7f); + ct.hour = FROMBCD(time_regs.hours & 0x3f); + ct.day = FROMBCD(time_regs.date & 0x3f); + ct.mon = FROMBCD(time_regs.month & 0x1f) - 1; + ct.year = FROMBCD(time_regs.year) + 2000; + + return (clock_ct_to_ts(&ct, ts)); +} + +static int +rv3032_settime(device_t dev, struct timespec *ts) +{ + struct rv3032_softc *sc; + struct rv3032_timeregs time_regs; + struct clocktime ct; + uint8_t status; + int rv; + + sc = device_get_softc(dev); + if ((rv = iicdev_readfrom(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0) + return (rv); + + clock_ts_to_ct(ts, &ct); + + time_regs.secs = TOBCD(ct.sec); + time_regs.mins = TOBCD(ct.min); + time_regs.hours = TOBCD(ct.hour); + time_regs.date = TOBCD(ct.day); + time_regs.month = TOBCD(ct.mon + 1); + time_regs.year = TOBCD(ct.year - 2000); + + if ((rv = iicdev_writeto(sc->dev, RV3032_SECS, &time_regs, sizeof(time_regs), IIC_WAIT)) != 0) + return (rv); + + /* Force a power on reset event so rv3032 reload the registers */ + status &= ~(RV3032_STATUS_PORF | RV3032_STATUS_VLF); + if ((rv = iicdev_writeto(sc->dev, RV3032_STATUS, &status, sizeof(status), IIC_WAIT)) != 0) + return (rv); + return (0); +} + +static device_method_t rv3032_methods[] = { + /* device_if methods */ + DEVMETHOD(device_probe, rv3032_probe), + DEVMETHOD(device_attach, rv3032_attach), + DEVMETHOD(device_detach, rv3032_detach), + + /* clock_if methods */ + DEVMETHOD(clock_gettime, rv3032_gettime), + DEVMETHOD(clock_settime, rv3032_settime), + + DEVMETHOD_END, +}; + +static driver_t rv3032_driver = { + "rv3032", + rv3032_methods, + sizeof(struct rv3032_softc), +}; + +DRIVER_MODULE(rv3032, iicbus, rv3032_driver, NULL, NULL); +MODULE_VERSION(rv3032, 1); +MODULE_DEPEND(rv3032, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); +IICBUS_FDT_PNP_INFO(compat_data); diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile index b0b002b2309a..abbb390b0e07 100644 --- a/sys/modules/i2c/Makefile +++ b/sys/modules/i2c/Makefile @@ -28,7 +28,8 @@ SUBDIR = \ smbus \ .if !empty(OPT_FDT) -SUBDIR += rx8803 \ +SUBDIR += rv3032 \ + rx8803 \ tca64xx \ tmp461 .endif diff --git a/sys/modules/i2c/rv3032/Makefile b/sys/modules/i2c/rv3032/Makefile new file mode 100644 index 000000000000..7d3f8ac47aa6 --- /dev/null +++ b/sys/modules/i2c/rv3032/Makefile @@ -0,0 +1,13 @@ + +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc +KMOD= rv3032 +SRCS= rv3032.c + +SRCS+= bus_if.h \ + clock_if.h \ + device_if.h \ + iicbus_if.h \ + opt_platform.h \ + ofw_bus_if.h + +.include From nobody Wed Oct 18 14:33:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YHC2JZZz4x6JF; Wed, 18 Oct 2023 14:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YHC118mz3QSP; Wed, 18 Oct 2023 14:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aom9ZGSj1Oj1eddWcweSOIcyGKA2ivav8HVfT/P2aW8=; b=IklDoOfwrNLq0pwvl998NaKi4T7Nqu1eF3xNvLNVMOrawfej50FJhqOuaYpd5cSvz7g1Q0 00e5KO70YBSv/1QMah3nxD/Jt4TjVb16D6SLRXGD8hKY8oOPDs+N38ag9q78eT8hMLwsOt k9JqEhQaCcxMEJXRr39D8FLXoSf1pdEFE6vJJoeOmpv9oXrsy0rHzViv+ZEMCMH45T+9Nx 49yNvoNtbZ1glbvGL7YvRbYiP37HChL8ULKKYI3oc3+tgnEPMdfe3R/ozWfjdQdw/zYx74 YaFT/HFIXSyGeO8y2HIieYj0LHD1bcWkcb1PYd25rHcbiPl4QC6zTvC84J4OFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639591; a=rsa-sha256; cv=none; b=EDWNTVOkRmnDKn5RLDbroE/Ip4HqztXxK19A4y6g6bgIiYT7YTaF/qhBS7JvDZF++KHqDk tCnqtOE0glzPZId1uqSq9PSndb5wB58za1BYyl2FDKisHejs7awB1VCgBWo2neeQOrtoBx UBmgChtzT8U7lIVc8CTL5nd3xfQaymb4aMQ72P5hiLs0a7+WzsCDdWLIlganPWgXRFcAMP R+dfsk4ztDN2JmR/X2Pk2S+V39oregp/41xqyET/oxqpWOHOoXbmTeFvZvcLrWq1AgLc8V ixa6LjnlTo6hqtvyNLJ/SqiBgp2BGyp1PvMwhYx+hj3zC3JCrRbiCN5naoQ1+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Aom9ZGSj1Oj1eddWcweSOIcyGKA2ivav8HVfT/P2aW8=; b=oqpwLSLjGC0pUDcCpJ5Lp4HXxa0d0DRagmbcKN91Y8fm2nFtqksuhupm/5tNpcTGGhuadn LNvW09dB6bZIiItz435Mput3GRDue9rmfB9TCWmGeJ8mgP1jj+QO607aaFQQAKVSGXVXZQ bFmZ4beGkHr5gaUgVZPH/+AhPQSQxkooLvaleEdlbAjtt01gfDz4Vk+sYyFmi6u3JeawHr rkmSfHxa8B9SSlXjawDwlmDe6S7CdCNLHC8NyVNjRZnfEyKLG6PXTo9SrZyRGWZ9+XNSSr R9fS1wRqjD30uEeOBN4VkOg3LqJNnh7P3EovKMR6v5cCFgnQP+KQMiQc01sFnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YHC078Xz18vH; Wed, 18 Oct 2023 14:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEXA01092011; Wed, 18 Oct 2023 14:33:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEXAWm092007; Wed, 18 Oct 2023 14:33:10 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:33:10 GMT Message-Id: <202310181433.39IEXAWm092007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 26bf8fff64e5 - stable/14 - xilinx: reset: Remove debug printfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 26bf8fff64e5d4ede9c4772a698ca2540cffccab Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=26bf8fff64e5d4ede9c4772a698ca2540cffccab commit 26bf8fff64e5d4ede9c4772a698ca2540cffccab Author: Emmanuel Vadot AuthorDate: 2023-10-12 07:32:32 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:32:37 +0000 xilinx: reset: Remove debug printfs Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 257405d707d77bc55b38e7c2bb83b8a9247a86ae) --- sys/dev/clk/xilinx/zynqmp_reset.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/clk/xilinx/zynqmp_reset.c b/sys/dev/clk/xilinx/zynqmp_reset.c index 484f19c229c5..52074d4c62af 100644 --- a/sys/dev/clk/xilinx/zynqmp_reset.c +++ b/sys/dev/clk/xilinx/zynqmp_reset.c @@ -183,7 +183,6 @@ zynqmp_reset_assert(device_t dev, intptr_t id, bool reset) if (id > ZYNQMP_RESET_MAX) return (EINVAL); sc = device_get_softc(dev); - device_printf(dev, "%s called for id = %ld, reset =%d\n", __func__, id, reset); rv = ZYNQMP_FIRMWARE_RESET_ASSERT(sc->parent, id, reset); return (rv); } @@ -197,7 +196,6 @@ zynqmp_reset_is_asserted(device_t dev, intptr_t id, bool *reset) if (id > ZYNQMP_RESET_MAX) return (EINVAL); sc = device_get_softc(dev); - device_printf(dev, "%s called for id = %ld\n", __func__, id); rv = ZYNQMP_FIRMWARE_RESET_GET_STATUS(sc->parent, id, reset); return (rv); From nobody Wed Oct 18 14:34:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJX70x9z4x6JR; Wed, 18 Oct 2023 14:34: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 4S9YJX6Gzbz3TTh; Wed, 18 Oct 2023 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1qrHWi6HHah0Yry6stdIDFaMibFncCenFGCbFf6BKg=; b=TSvz4cHVDjUn3pgZ+dhwVP8jqH6iT686Kktatq5Vs/CM2xQIOKqfkgdNnejMV4eksGyX9a uswtYQ96xq8aEtA/J/MX8Kzb8iomelX5uD2ktYRzL7Ya+rGoO7H8G4DK0RT/tUFYeQZALa gGG0ZX8S5vyZGkxS4TY1MtjPalAuLuElfKJaPX2og0tO+RhqtxmfFz06WlIrq/jeqisF1o u/1mwUIRlgSpvFQBWGqGYvJ9wBYApc7hnIwG2xZIgF0Dc1OxnRShWJmv1vi5a9+nG+VQ2B GKHJmhCjhtiiRj2IOqompauwg1YUGEeU2rqCcrEAtLIvmBeKFXFhcgJ77v54kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639660; a=rsa-sha256; cv=none; b=MdCnqVFZSMFCFqSXNQvEUlyG4310LMLvtUzNwpO1gRYbNP22AELWE+k2EUFkxtnCY4vIzg 1PpNkmqtQt0b2Jasn7LlsO6ulzGZmSouktX1R89+wINxeN+igfngjuM4LDYMdq0mf1x6wK Djd6rkDUej3qgE9PGfszBNTaR1weAeXhJTYor9nPRp1mp4SdiwJO7BOvVfDZh/AyEodJiW 4qAnI0S26Ctd67dhrAijkNnL/5m/EiqVk2L65cw0vDaNSaLlPE3Ok1qIU2q91YEOIi8q3g wffD2usXBVy/HlDIutnUvb1oo1io4Kxi7LBY6XAAdnS4eaLHylqRbrf8nbg78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1qrHWi6HHah0Yry6stdIDFaMibFncCenFGCbFf6BKg=; b=CXvCDEBVIq8QjifxAnyrLKhpvvtcHuDoAzjjnVW3L2yvT5s5bwLV4uaMeGHKD/+H7KERFL nwjq2i5vyhok0P0RxOgWFaV5T8gjPmQuOrjlD7VosbnEcbkDNBCB/PvAm0JdagoU2OAcoF Qvi5gflMYbrbw7oDd7//pq18f4q/N1hky7MZ8BXGuXRpzdV0xvJNL8OU7PAQns9IY1GgjM sGzQHqA9Z1ffpytpN63yVyJCssimEIVfXlsFyoHVX6YMxZWoHDnOPH/q3QFKPaYjFQUpsx Wsz9lDf3YXI0Jj9j+ztpaeN+Zu6dClTv2SvB+M6B4R1bntQdtf092vsgFSXHpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJX5M2Kz18rw; Wed, 18 Oct 2023 14:34: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 39IEYKQW092385; Wed, 18 Oct 2023 14:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYKMV092382; Wed, 18 Oct 2023 14:34:20 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:20 GMT Message-Id: <202310181434.39IEYKMV092382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: dda809fb31a7 - stable/14 - arm64: rockchip: clk: Define PLIST macro in rk_cru.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb commit dda809fb31a7d4049aa5b1bc8adc1743a5ac92fb Author: Emmanuel Vadot AuthorDate: 2023-09-19 15:59:34 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:25 +0000 arm64: rockchip: clk: Define PLIST macro in rk_cru.h We use it in all clock drivers so no need to define it everywhere (cherry picked from commit 8ae54db63970e9370d3d88f6eb57c102e085a128) --- sys/arm64/rockchip/clk/rk3288_cru.c | 1 - sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 1 - sys/arm64/rockchip/clk/rk_cru.h | 4 ++++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/arm64/rockchip/clk/rk3288_cru.c index cadb1f586a1a..e35481e94c13 100644 --- a/sys/arm64/rockchip/clk/rk3288_cru.c +++ b/sys/arm64/rockchip/clk/rk3288_cru.c @@ -525,7 +525,6 @@ static struct rk_clk_armclk_rates rk3288_armclk_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin24m", "xin32k"}; PLIST(armclk_p)= {"apll_core", "gpll_core"}; PLIST(ddrphy_p) = {"dpll_ddr", "gpll_ddr"}; diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index f969c8d758a5..1f48ce6c23a2 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -636,8 +636,6 @@ static struct rk_clk_pll_rate rk3328_pll_frac_rates[] = { }; /* Clock parents */ -#define PLIST(_name) static const char *_name[] - PLIST(pll_src_p) = {"xin24m"}; PLIST(xin24m_rtc32k_p) = {"xin24m", "clk_rtc32k"}; diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/arm64/rockchip/clk/rk3399_cru.c index 3d43d832792f..3bff0e64ea34 100644 --- a/sys/arm64/rockchip/clk/rk3399_cru.c +++ b/sys/arm64/rockchip/clk/rk3399_cru.c @@ -695,7 +695,6 @@ static struct rk_clk_armclk_rates rk3399_cpu_b_rates[] = { }, \ } -#define PLIST(_name) static const char *_name[] PLIST(pll_src_p) = {"xin24m", "xin32k"}; PLIST(armclkl_p) = {"clk_core_l_lpll_src", "clk_core_l_bpll_src", diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index b00e987abcfa..55f230036199 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -42,6 +42,10 @@ #include /* Macro for defining various types of clocks. */ + +/* Parent list */ +#define PLIST(_name) static const char *_name[] + /* Pure gate */ #define GATE(_idx, _clkname, _pname, _o, _s) \ { \ From nobody Wed Oct 18 14:34:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJZ4V3Qz4x6Ls; Wed, 18 Oct 2023 14:34: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 4S9YJY73YLz3TMW; Wed, 18 Oct 2023 14:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3amgQ87tP+JtP7hge5qZwZ+0/bC9EBGwfN2s5bPXUfQ=; b=VaI/CO0R7wwNe5aXVG3V4Sfr9k6qP5d2bVd7feTCV2DWTKXeJ5SrTW8FdMLdts5xg5tRPz dA6xEKfZGLPwufoiR840mmXJdv1Rd7LnR1ZvyTn0yocJYDw2XjJcMdE8s/f2RmwIFBmULG D+E+Wltt/+SkQej27aNgCsIApV6weZyGMFn+om/GpQteuhackEslDKBpGnXJPJ8RmJVDxw 2LkXIQM0qN2mEpUVSdi+1zoNldm5fwq4TAWrsYtHgbHFRAtv8YwU3dnA0yFHn9enmXqTwS 2XBeOQXqkjV52FItrlxEpyCPUjjt/pUZ/SfY89+xXoiP7AC3TN/95cG7ixjiEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639662; a=rsa-sha256; cv=none; b=Pazl/wHIwJaDGGmDGsVNAW919U5+YFAM6TMyQh2J0GrjDBBrKlrB0iS07PuiU1K5H7mh31 iONulHxWiv0GYObuuqQAVJBrXpOYx1t8g2Ze5wVUXZLn0D158ccs//1RfdEieytSqlWejL b8LV2Zcm6YSdiMnnJP1ID4ZrKJErB6ET59l2RnQRKFZilFmz19XnRrpJgO9mvqlsCgHYEP 09Xb+VshGiTELv/DqAmkcDD4O7A27Qo3eD28Fzp95eNftRozdndOXyZhAxNnTAVypwAmEZ 2aUS6S4MbMI5cy2bT+HVc3FWCfMT3so6xJCny1e3eC0vxjdvFBiTEEixpaXQ4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3amgQ87tP+JtP7hge5qZwZ+0/bC9EBGwfN2s5bPXUfQ=; b=a9kC3HxiLZx/JQXoFvSMgSZs4AWLA0Ub8z2ZhRbEk7NJB2tLGWcE5A1XgpkAf23xO0GucP touYrXOSLo8qJn4LW6rIdeDbw+fm6/kV3N5gdZBU1sVT0vMe4b293+g4x1MY0gt+yP3wXp m0O/Vc6QCceSqJByVqv1Be0YBhSuRTwuH3lTWko4qaonMCOkJrc3F3lPhJ6PUvH/6gVsFe 190ZH+zzYXvLRYFmqCFRPQyzL7TBXGyLDZ2bxO5vrnqwrqhZNFNxNra7zmYapYM3tbFz8v 0R8gbX7YnsrCJrzZ01DOW2WZQe4oZHf0PEphZez0YO69gq3wpVNa6tWaI7576Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJY639Lz18vJ; Wed, 18 Oct 2023 14:34: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 39IEYLCA092424; Wed, 18 Oct 2023 14:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYLS4092422; Wed, 18 Oct 2023 14:34:21 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:21 GMT Message-Id: <202310181434.39IEYLS4092422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 90b135d8c292 - stable/14 - arm64: rockchip: rk3568_pmucru: Rewrite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 90b135d8c2926254eea2a6e71a40590f728dbfc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=90b135d8c2926254eea2a6e71a40590f728dbfc3 commit 90b135d8c2926254eea2a6e71a40590f728dbfc3 Author: Emmanuel Vadot AuthorDate: 2023-08-15 10:16:57 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:26 +0000 arm64: rockchip: rk3568_pmucru: Rewrite Rewrite correctly the clocks for pmucru : - Export all clocks - Use names from the TRM - Respect clock topology Fixes: a48301a5e094 ("Add initial clocks support for Rockchip RK3568 SoC.") (cherry picked from commit 7b6ae431cf70cd8683270b3e315a14e61d666522) --- sys/arm64/rockchip/clk/rk3568_pmucru.c | 304 +++++++++++++-------------------- 1 file changed, 115 insertions(+), 189 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3568_pmucru.c b/sys/arm64/rockchip/clk/rk3568_pmucru.c index ee75a4c18927..f93864851e0a 100644 --- a/sys/arm64/rockchip/clk/rk3568_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3568_pmucru.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021, 2022 Soren Schmidt + * Copyright (c) 2023, Emmanuel Vadot * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,12 +47,11 @@ #include -#define RK3568_PLLSEL_CON(x) ((x) * 0x20) -#define RK3568_CLKSEL_CON(x) ((x) * 0x4 + 0x100) -#define RK3568_CLKGATE_CON(x) ((x) * 0x4 + 0x180) -#define RK3568_SOFTRST_CON(x) ((x) * 0x4 + 0x200) +#define CRU_PLLSEL_CON(x) ((x) * 0x20) +#define CRU_CLKSEL_CON(x) ((x) * 0x4 + 0x100) +#define CRU_CLKGATE_CON(x) ((x) * 0x4 + 0x180) -#define PNAME(_name) static const char *_name[] +#define PLIST(_name) static const char *_name[] /* PLL clock */ #define RK_PLL(_id, _name, _pnames, _off, _shift) \ @@ -63,131 +63,32 @@ .clkdef.parent_names = _pnames, \ .clkdef.parent_cnt = nitems(_pnames), \ .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .base_offset = RK3568_PLLSEL_CON(_off), \ + .base_offset = CRU_PLLSEL_CON(_off), \ .mode_reg = 0x80, \ .mode_shift = _shift, \ .rates = rk3568_pll_rates, \ }, \ } -/* Composite */ -#define RK_COMPOSITE(_id, _name, _pnames, _o, _ms, _mw, _ds, _dw, _go, _gw, _f)\ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no mux */ -#define RK_COMPNOMUX(_id, _name, _pname, _o, _ds, _dw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Fixed factor mux/div */ -#define RK_FACTOR(_id, _name, _pname, _mult, _div) \ -{ \ - .type = RK_CLK_FIXED, \ - .clk.fixed = &(struct clk_fixed_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .mult = _mult, \ - .div = _div, \ - }, \ -} - -/* Fractional */ -#define RK_FRACTION(_id, _name, _pname, _o, _go, _gw, _f) \ -{ \ - .type = RK_CLK_FRACT, \ - .clk.fract = &(struct rk_clk_fract_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_FRACT_HAVE_GATE | _f, \ - }, \ -} - -/* Multiplexer */ -#define RK_MUX(_id, _name, _pnames, _o, _ms, _mw, _f) \ -{ \ - .type = RK_CLK_MUX, \ - .clk.mux = &(struct rk_clk_mux_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .shift = _ms, \ - .width = _mw, \ - .mux_flags = _f, \ - }, \ -} - -#define RK_GATE(_id, _name, _pname, _o, _s) \ -{ \ - .id = _id, \ - .name = _name, \ - .parent_name = _pname, \ - .offset = RK3568_CLKGATE_CON(_o), \ - .shift = _s, \ -} - extern struct rk_clk_pll_rate rk3568_pll_rates[]; /* Parent clock defines */ -PNAME(mux_pll_p) = { "xin24m" }; -PNAME(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; -PNAME(sclk_uart0_p) = { "sclk_uart0_div", "sclk_uart0_frac", "xin24m" }; -PNAME(clk_rtc32k_pmu_p) = { "clk_32k_pvtm", "xin32k", "clk_rtc32k_frac" }; -PNAME(ppll_usb480m_cpll_gpll_p) = { "ppll", "usb480m", "cpll", "gpll"}; -PNAME(clk_usbphy0_ref_p) = { "clk_ref24m", "xin_osc0_usbphy0_g" }; -PNAME(clk_usbphy1_ref_p) = { "clk_ref24m", "xin_osc0_usbphy1_g" }; -PNAME(clk_mipidsiphy0_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy0_g" }; -PNAME(clk_mipidsiphy1_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy1_g" }; -PNAME(clk_wifi_p) = { "clk_wifi_osc0", "clk_wifi_div" }; -PNAME(clk_pciephy0_ref_p) = { "clk_pciephy0_osc0", "clk_pciephy0_div" }; -PNAME(clk_pciephy1_ref_p) = { "clk_pciephy1_osc0", "clk_pciephy1_div" }; -PNAME(clk_pciephy2_ref_p) = { "clk_pciephy2_osc0", "clk_pciephy2_div" }; -PNAME(clk_hdmi_ref_p) = { "hpll", "hpll_ph0" }; -PNAME(clk_pdpmu_p) = { "ppll", "gpll" }; -PNAME(clk_pwm0_p) = { "xin24m", "clk_pdpmu" }; +PLIST(mux_pll_p) = { "xin24m" }; +PLIST(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; +PLIST(sclk_uart0_p) = { "sclk_uart0_div", "sclk_uart0_frac", "xin24m" }; +PLIST(sclk_uart0_div_p) = { "ppll", "usb480m", "cpll", "gpll" }; +PLIST(clk_rtc32k_pmu_p) = { "clk_32k_pvtm", "xin32k", "clk_osc0_div32k" }; +PLIST(clk_usbphy0_ref_p) = { "clk_ref24m", "xin_osc0_usbphy0_g" }; +PLIST(clk_usbphy1_ref_p) = { "clk_ref24m", "xin_osc0_usbphy1_g" }; +PLIST(clk_mipidsiphy0_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy0_g" }; +PLIST(clk_mipidsiphy1_ref_p) = { "clk_ref24m", "xin_osc0_mipidsiphy1_g" }; +PLIST(clk_wifi_p) = { "clk_wifi_osc0", "clk_wifi_div" }; +PLIST(clk_pciephy0_ref_p) = { "clk_pciephy0_osc0", "clk_pciephy0_div" }; +PLIST(clk_pciephy1_ref_p) = { "clk_pciephy1_osc0", "clk_pciephy1_div" }; +PLIST(clk_pciephy2_ref_p) = { "clk_pciephy2_osc0", "clk_pciephy2_div" }; +PLIST(clk_hdmi_ref_p) = { "hpll", "hpll_ph0" }; +PLIST(clk_pdpmu_p) = { "ppll", "gpll" }; +PLIST(clk_pwm0_p) = { "xin24m", "clk_pdpmu" }; /* CLOCKS */ static struct rk_clk rk3568_clks[] = { @@ -198,83 +99,108 @@ static struct rk_clk rk3568_clks[] = { LINK("usb480m"), LINK("clk_32k_pvtm"), - /* SRC_CLK */ - RK_MUX(CLK_RTC_32K, "clk_rtc_32k", clk_rtc32k_pmu_p, 0, 6, 2, 0), - RK_MUX(0, "sclk_uart0_mux", sclk_uart0_p, 4, 10, 2, 0), + /* Fixed clocks */ + FFACT(0, "ppll_ph0", "ppll", 1, 2), + FFACT(0, "ppll_ph180", "ppll", 1, 2), + FFACT(0, "hpll_ph0", "hpll", 1, 2), /* PLL's */ RK_PLL(PLL_PPLL, "ppll", mux_pll_p, 0, 0), RK_PLL(PLL_HPLL, "hpll", mux_pll_p, 2, 2), - /* PD_PMU */ - RK_FACTOR(0, "ppll_ph0", "ppll", 1, 2), - RK_FACTOR(0, "ppll_ph180", "ppll", 1, 2), - RK_FACTOR(0, "hpll_ph0", "hpll", 1, 2), - RK_MUX(CLK_PDPMU, "clk_pdpmu", clk_pdpmu_p, 2, 15, 1, 0), - RK_COMPNOMUX(PCLK_PDPMU, "pclk_pdpmu", "clk_pdpmu", 2, 0, 5, 0, 2, 0), - RK_COMPNOMUX(CLK_I2C0, "clk_i2c0", "clk_pdpmu", 3, 0, 7, 1, 1, 0), - RK_FRACTION(CLK_RTC32K_FRAC, "clk_rtc32k_frac", "xin24m", 1, 0, 1, 0), - RK_COMPNOMUX(XIN_OSC0_DIV, "xin_osc0_div", "xin24m", 0, 0, 5, 0, 0, 0), - RK_COMPOSITE(CLK_UART0_DIV, "sclk_uart0_div", - ppll_usb480m_cpll_gpll_p, 4, 8, 2, 0, 7, 1, 3, 0), - RK_FRACTION(CLK_UART0_FRAC, "sclk_uart0_frac", - "sclk_uart0_div", 5, 1, 4, 0), - RK_MUX(DBCLK_GPIO0, "dbclk_gpio0_c", xin24m_32k_p, 6, 15, 1, 0), - RK_COMPOSITE(CLK_PWM0, "clk_pwm0", clk_pwm0_p, 6, 7, 1, 0, 7, 1, 7, 0), - RK_COMPNOMUX(CLK_REF24M, "clk_ref24m", "clk_pdpmu", 7, 0, 6, 2, 0, 0), - RK_MUX(CLK_USBPHY0_REF, "clk_usbphy0_ref", - clk_usbphy0_ref_p, 8, 0, 1, 0), - RK_MUX(CLK_USBPHY1_REF, "clk_usbphy1_ref", - clk_usbphy1_ref_p, 8, 1, 1, 0), - RK_MUX(CLK_MIPIDSIPHY0_REF, "clk_mipidsiphy0_ref", - clk_mipidsiphy0_ref_p, 8, 2, 1, 0), - RK_MUX(CLK_MIPIDSIPHY1_REF, "clk_mipidsiphy1_ref", - clk_mipidsiphy1_ref_p, 8, 3, 1, 0), - RK_COMPNOMUX(CLK_WIFI_DIV, "clk_wifi_div", - "clk_pdpmu", 8, 8, 6, 2, 5, 0), - RK_MUX(CLK_WIFI, "clk_wifi", clk_wifi_p, 8, 15, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY0_DIV, "clk_pciephy0_div", - "ppll_ph0", 9, 0, 3, 2, 7, 0), - RK_MUX(CLK_PCIEPHY0_REF, "clk_pciephy0_ref", - clk_pciephy0_ref_p, 9, 3, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY1_DIV, "clk_pciephy1_div", - "ppll_ph0", 9, 4, 3, 2, 9, 0), - RK_MUX(CLK_PCIEPHY1_REF, "clk_pciephy1_ref", - clk_pciephy1_ref_p, 9, 7, 1, 0), - RK_COMPNOMUX(CLK_PCIEPHY2_DIV, "clk_pciephy2_div", - "ppll_ph0", 9, 8, 3, 2, 11, 0), - RK_MUX(CLK_PCIEPHY2_REF, "clk_pciephy2_ref", - clk_pciephy2_ref_p, 9, 11, 1, 0), - RK_MUX(CLK_HDMI_REF, "clk_hdmi_ref", clk_hdmi_ref_p, 8, 7, 1, 0), + /* PMUCRU_PMUCLKSEL_CON00 */ + CDIV(0, "xin_osc0_div_div", "xin24m", 0, 0, 0, 5), + MUX(0, "clk_rtc_32k_mux", clk_rtc32k_pmu_p, 0, 0, 6, 2), + + /* PMUCRU_PMUCLKSEL_CON01 */ + FRACT(0, "clk_osc0_div32k", "xin24m", 0, 1), + + /* PMUCRU_PMUCLKSEL_CON02 */ + CDIV(0, "pclk_pdpmu_pre", "clk_pdpmu", 0, 2, 0, 5), + MUX(CLK_PDPMU, "clk_pdpmu", clk_pdpmu_p, 0, 2, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON03 */ + CDIV(0, "clk_i2c0_div", "clk_pdpmu", 0, 3, 0, 7), + + /* PMUCRU_PMUCLKSEL_CON04 */ + CDIV(0, "sclk_uart0_div_div", "sclk_uart0_div_sel", 0, 4, 0, 7), + MUX(0, "sclk_uart0_div_sel", sclk_uart0_div_p, 0, 4, 8, 2), + MUX(0, "sclk_uart0_mux", sclk_uart0_p, 0, 4, 10, 2), + + /* PMUCRU_PMUCLKSEL_CON05 */ + FRACT(0, "sclk_uart0_frac_div", "sclk_uart0_div", 0, 5), + + /* PMUCRU_PMUCLKSEL_CON06 */ + CDIV(0, "clk_pwm0_div", "clk_pwm0_sel", 0, 6, 0, 7), + MUX(0, "clk_pwm0_sel", clk_pwm0_p, 0, 6, 7, 1), + MUX(0, "dbclk_gpio0_sel", xin24m_32k_p, 0, 6, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON07 */ + CDIV(0, "clk_ref24m_div", "clk_pdpmu", 0, 7, 0, 6), + + /* PMUCRU_PMUCLKSEL_CON08 */ + MUX(CLK_USBPHY0_REF, "clk_usbphy0_ref", clk_usbphy0_ref_p, 0, 8, 0, 1), + MUX(CLK_USBPHY1_REF, "clk_usbphy1_ref", clk_usbphy1_ref_p, 0, 8, 1, 1), + MUX(CLK_MIPIDSIPHY0_REF, "clk_mipidsiphy0_ref", clk_mipidsiphy0_ref_p, 0, 8, 2, 1), + MUX(CLK_MIPIDSIPHY1_REF, "clk_mipidsiphy1_ref", clk_mipidsiphy1_ref_p, 0, 8, 3, 1), + MUX(CLK_HDMI_REF, "clk_hdmi_ref", clk_hdmi_ref_p, 0, 8, 7, 1), + CDIV(0, "clk_wifi_div_div", "clk_pdpmu", 0, 8, 8, 6), + MUX(CLK_WIFI, "clk_wifi", clk_wifi_p, 0, 8, 15, 1), + + /* PMUCRU_PMUCLKSEL_CON09 */ + CDIV(0, "clk_pciephy0_div_div", "ppll_ph0", 0, 9, 0, 3), + MUX(CLK_PCIEPHY0_REF, "clk_pciephy0_ref", + clk_pciephy0_ref_p, 0, 9, 3, 1), + CDIV(0, "clk_pciephy1_div_div", "ppll_ph0", 0, 9, 4, 3), + MUX(CLK_PCIEPHY1_REF, "clk_pciephy1_ref", + clk_pciephy1_ref_p, 0, 9, 7, 1), + CDIV(0, "clk_pciephy2_div_div", "ppll_ph0", 0, 9, 8, 3), + MUX(CLK_PCIEPHY2_REF, "clk_pciephy2_ref", + clk_pciephy2_ref_p, 0, 9, 11, 1), }; /* GATES */ static struct rk_cru_gate rk3568_gates[] = { - RK_GATE(PCLK_PMU, "pclk_pmu", "pclk_pdpmu", 0, 6), - RK_GATE(DBCLK_GPIO0, "dbclk_gpio0", "dbclk_gpio0_c", 1, 10), - RK_GATE(CLK_PMU, "clk_pmu", "xin24m", 0, 7), - RK_GATE(PCLK_I2C0, "pclk_i2c0", "pclk_pdpmu", 1, 0), - RK_GATE(PCLK_UART0, "pclk_uart0", "pclk_pdpmu", 1, 2), - RK_GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 1, 5), - RK_GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pdpmu", 1, 9), - RK_GATE(PCLK_PWM0, "pclk_pwm0", "pclk_pdpmu", 1, 6), - RK_GATE(CLK_CAPTURE_PWM0_NDFT, "clk_capture_pwm0_ndft", "xin24m", 1, 8), - RK_GATE(PCLK_PMUPVTM, "pclk_pmupvtm", "pclk_pdpmu", 1, 11), - RK_GATE(CLK_PMUPVTM, "clk_pmupvtm", "xin24m", 1, 12), - RK_GATE(CLK_CORE_PMUPVTM, "clk_core_pmupvtm", "xin24m", 1, 13), - RK_GATE(XIN_OSC0_USBPHY0_G, "xin_osc0_usbphy0_g", "xin24m", 2, 1), - RK_GATE(XIN_OSC0_USBPHY1_G, "xin_osc0_usbphy1_g", "xin24m", 2, 2), - RK_GATE(XIN_OSC0_MIPIDSIPHY0_G, "xin_osc0_mipidsiphy0_g", - "xin24m", 2, 3), - RK_GATE(XIN_OSC0_MIPIDSIPHY1_G, "xin_osc0_mipidsiphy1_g", - "xin24m", 2, 4), - RK_GATE(CLK_WIFI_OSC0, "clk_wifi_osc0", "xin24m", 2, 6), - RK_GATE(CLK_PCIEPHY0_OSC0, "clk_pciephy0_osc0", "xin24m", 2, 8), - RK_GATE(CLK_PCIEPHY1_OSC0, "clk_pciephy1_osc0", "xin24m", 2, 10), - RK_GATE(CLK_PCIEPHY2_OSC0, "clk_pciephy2_osc0", "xin24m", 2, 12), - RK_GATE(CLK_PCIE30PHY_REF_M, "clk_pcie30phy_ref_m", "ppll_ph0", 2, 13), - RK_GATE(CLK_PCIE30PHY_REF_N, "clk_pcie30phy_ref_n", "ppll_ph180", 2,14), - RK_GATE(XIN_OSC0_EDPPHY_G, "xin_osc0_edpphy_g", "xin24m", 2, 15), + /* PMUCRU_PMUGATE_CON00 */ + GATE(XIN_OSC0_DIV, "xin_osc0_div", "xin_osc0_div_div", 0, 0), + GATE(CLK_RTC_32K, "clk_rtc_32k", "clk_rtc_32k_mux", 0, 1), + GATE(PCLK_PDPMU, "pclk_pdpmu", "pclk_pdpmu_pre", 0, 2), + GATE(PCLK_PMU, "pclk_pmu", "pclk_pdpmu", 0, 6), + GATE(CLK_PMU, "clk_pmu", "xin24m", 0, 7), + + /* PMUCRU_PMUGATE_CON01 */ + GATE(PCLK_I2C0, "pclk_i2c0", "pclk_pdpmu", 1, 0), + GATE(CLK_I2C0, "clk_i2c0", "clk_i2c0_div", 1, 1), + GATE(PCLK_UART0, "pclk_uart0", "pclk_pdpmu", 1, 2), + GATE(CLK_UART0_DIV, "sclk_uart0_div", "sclk_uart0_div_div", 1, 3), + GATE(CLK_UART0_FRAC, "sclk_uart0_frac", "sclk_uart0_frac_div", 1, 4), + GATE(SCLK_UART0, "sclk_uart0", "sclk_uart0_mux", 1, 5), + GATE(PCLK_PWM0, "pclk_pwm0", "pclk_pdpmu", 1, 6), + GATE(CLK_PWM0, "clk_pwm0", "clk_pwm0_div", 1, 7), + GATE(CLK_CAPTURE_PWM0_NDFT, "clk_capture_pwm0_ndft", "xin24m", 1, 8), + GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_pdpmu", 1, 9), + GATE(DBCLK_GPIO0, "dbclk_gpio0", "dbclk_gpio0_sel", 1, 10), + GATE(PCLK_PMUPVTM, "pclk_pmupvtm", "pclk_pdpmu", 1, 11), + GATE(CLK_PMUPVTM, "clk_pmupvtm", "xin24m", 1, 12), + GATE(CLK_CORE_PMUPVTM, "clk_core_pmupvtm", "xin24m", 1, 13), + + /* PMUCRU_PMUGATE_CON02 */ + GATE(CLK_REF24M, "clk_ref24m", "clk_ref24m_div", 2, 0), + GATE(XIN_OSC0_USBPHY0_G, "xin_osc0_usbphy0_g", "xin24m", 2, 1), + GATE(XIN_OSC0_USBPHY1_G, "xin_osc0_usbphy1_g", "xin24m", 2, 2), + GATE(XIN_OSC0_MIPIDSIPHY0_G, "xin_osc0_mipidsiphy0_g", "xin24m", 2, 3), + GATE(XIN_OSC0_MIPIDSIPHY1_G, "xin_osc0_mipidsiphy1_g", "xin24m", 2, 4), + GATE(CLK_WIFI_DIV, "clk_wifi_div", "clk_wifi_div_div", 2, 5), + GATE(CLK_WIFI_OSC0, "clk_wifi_osc0", "xin24m", 2, 6), + GATE(CLK_PCIEPHY0_DIV, "clk_pciephy0_div", "clk_pciephy0_div_div", 2, 7), + GATE(CLK_PCIEPHY0_OSC0, "clk_pciephy0_osc0", "xin24m", 2, 8), + GATE(CLK_PCIEPHY1_DIV, "clk_pciephy1_div", "clk_pciephy1_div_div", 2, 9), + GATE(CLK_PCIEPHY1_OSC0, "clk_pciephy1_osc0", "xin24m", 2, 10), + GATE(CLK_PCIEPHY2_DIV, "clk_pciephy2_div", "clk_pciephy2_div_div", 2, 11), + GATE(CLK_PCIEPHY2_OSC0, "clk_pciephy2_osc0", "xin24m", 2, 12), + GATE(CLK_PCIE30PHY_REF_M, "clk_pcie30phy_ref_m", "ppll_ph0", 2, 13), + GATE(CLK_PCIE30PHY_REF_N, "clk_pcie30phy_ref_n", "ppll_ph180", 2, 14), + GATE(XIN_OSC0_EDPPHY_G, "xin_osc0_edpphy_g", "xin24m", 2, 15), }; static int From nobody Wed Oct 18 14:34:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJb0wN4z4x6Wx; Wed, 18 Oct 2023 14:34: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 4S9YJb0Z16z3TMp; Wed, 18 Oct 2023 14:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QFf5pjf4FuJhR6bWlTNB7a9RnMizasp8/DdBXu2EJiE=; b=FfCN6lql74XlTvOrHDQYUC9FqjjwmdgUG7zYVJxbAaZ81eEekCmUe2aGzkRdNJKNrwYkA4 m/Gbh1njPClzLBrJ2C84Tx0E71gzXBEKR15cpD4i+bRHlMuubMhPm786LO29Lt/kSKvFRf SMQeNAojEe36qStTRhE9nYPkI8iiYHGsvJh8SG6vS/imLELGoF8JysO7pccoGFCMUm4xLp XYba0bHhjjO42sNZ/jmkOZN0UF4nUsPfwKnIQZAD/rLm6QVvxUqJ4GCNROBg8bHlXR8/Mw 5sr1/keTi47i3Obgm9N+h9zAVIfcoQ7cE7b3HtLBKnef4lo780TxvYMp9925dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639663; a=rsa-sha256; cv=none; b=iFK195GsnUhTmSzQnXwbUGwo5W+IH2bMk3HKAarVx9aoStMKIz+VFLKSzIz4CiQgL12Gik WibdtRsrYmDTzClUfvEX57Lv6Rou1LDmAWak0ZQ2IoTODN6VeKSJNr3spJDgxByWtSx3qB vg2HglwTopX6Fy/vHN9HntpNz4jVXhYkqRUguy6++WS62efOJgJc7UPpA3pqHlfxmff/y0 z919/wOa5FKchs+PUtxJYKkQPd6zlHwRLoctkHhntNplD/ByVr3fRvhIodwSJyen7I4KbY eRyP76U+4MZ1+Q4SLAbHkAq0bLI053VCCql5IaQhD+PlNDfVPgfn00j6yrU/jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QFf5pjf4FuJhR6bWlTNB7a9RnMizasp8/DdBXu2EJiE=; b=byPv2XnLnvG7mTCk8uDe4+uior7Ta4QFHW6GmPwBEUfs/lJIctmZSiBvrlbOHdLw9gbbr6 g9rFaZDwdwpvSMWjvz1R5CQ549LI1k1Z+NBcN0YH0FDi30UqaXLTWVW5oKSWFqHCzHF0g2 ZQOFED8LUz0393UxhZGtqMjIUYmeCJBS+X6X5O4NO6pyk+KJSolgsIRxzeEM1eB0211rG6 tu5uCEXMcgYyrmdJF0ty50bXM16plW3ZSeyIA1dnRJt+Ax9a8y+xePxbhGKn1tZxAgfpTn VbUVmBlRGzPelJyaQB0EDzyQx+ZVBlIejcXSgGG0t/XvpB5UfW9Un7ZV2KRV8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJZ6jkwz18bn; Wed, 18 Oct 2023 14:34: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 39IEYMsg092463; Wed, 18 Oct 2023 14:34:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYMMP092460; Wed, 18 Oct 2023 14:34:22 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:22 GMT Message-Id: <202310181434.39IEYMMP092460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4bb49357e094 - stable/14 - arm64: rockchip: rk3568_cru: Rewrite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4bb49357e094afad2d616197e150c4788a9ab0ed Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb49357e094afad2d616197e150c4788a9ab0ed commit 4bb49357e094afad2d616197e150c4788a9ab0ed Author: Emmanuel Vadot AuthorDate: 2023-08-15 08:26:29 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:28 +0000 arm64: rockchip: rk3568_cru: Rewrite Rewrite correctly the clocks for cru : - Export all clocks - Use names from the TRM - Respect clock topology Fixes: a48301a5e094 ("Add initial clocks support for Rockchip RK3568 SoC.") (cherry picked from commit 50a0f1ce28b7f04fc23915fb06124242632a013c) --- sys/arm64/rockchip/clk/rk3568_cru.c | 1991 +++++++++++++++++++------------- sys/arm64/rockchip/clk/rk3568_pmucru.c | 2 - 2 files changed, 1184 insertions(+), 809 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3568_cru.c b/sys/arm64/rockchip/clk/rk3568_cru.c index 4b91e066dcf0..f5992323c3bd 100644 --- a/sys/arm64/rockchip/clk/rk3568_cru.c +++ b/sys/arm64/rockchip/clk/rk3568_cru.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021, 2022 Soren Schmidt + * Copyright (c) 2023, Emmanuel Vadot * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,12 +48,10 @@ #define RK3568_PLLSEL_CON(x) ((x) * 0x20) -#define RK3568_CLKSEL_CON(x) ((x) * 0x4 + 0x100) -#define RK3568_CLKGATE_CON(x) ((x) * 0x4 + 0x300) +#define CRU_CLKSEL_CON(x) ((x) * 0x4 + 0x100) +#define CRU_CLKGATE_CON(x) ((x) * 0x4 + 0x300) #define RK3568_SOFTRST_CON(x) ((x) * 0x4 + 0x400) -#define PNAME(_name) static const char *_name[] - #define RK_PLLRATE(_hz, _ref, _fb, _post1, _post2, _dspd) \ { \ .freq = _hz, \ @@ -80,165 +79,6 @@ }, \ } -/* Clock for ARM core(s) */ -#define RK_ARMDIV(_id, _nm, _pn, _r, _off, _ds, _dw, _ms, _mw, _mp, _ap)\ -{ \ - .type = RK_CLK_ARMCLK, \ - .clk.armclk = &(struct rk_clk_armclk_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _nm, \ - .clkdef.parent_names = _pn, \ - .clkdef.parent_cnt = nitems(_pn), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_off), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .main_parent = _mp, \ - .alt_parent = _ap, \ - .rates = _r, \ - .nrates = nitems(_r), \ - }, \ -} - -/* Composite */ -#define RK_COMPOSITE(_id, _name, _pnames, _o, _ms, _mw, _ds, _dw, _go, _gw,_f)\ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no mux */ -#define RK_COMPNOMUX(_id, _name, _pname, _o, _ds, _dw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite no div */ -#define RK_COMPNODIV(_id, _name, _pnames, _o, _ms, _mw, _go, _gw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .mux_shift = _ms, \ - .mux_width = _mw, \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_COMPOSITE_HAVE_MUX | \ - RK_CLK_COMPOSITE_HAVE_GATE | _f, \ - }, \ -} - -/* Composite div only */ -#define RK_COMPDIV(_id, _name, _pname, _o, _ds, _dw, _f) \ -{ \ - .type = RK_CLK_COMPOSITE, \ - .clk.composite = &(struct rk_clk_composite_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .muxdiv_offset = RK3568_CLKSEL_CON(_o), \ - .div_shift = _ds, \ - .div_width = _dw, \ - .flags = _f, \ - }, \ -} - - -/* Fixed factor mux/div */ -#define RK_FACTOR(_id, _name, _pname, _mult, _div) \ -{ \ - .type = RK_CLK_FIXED, \ - .clk.fixed = &(struct clk_fixed_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .mult = _mult, \ - .div = _div, \ - }, \ -} - -/* Fractional */ -#define RK_FRACTION(_id, _name, _pname, _o, _go, _gw, _f) \ -{ \ - .type = RK_CLK_FRACT, \ - .clk.fract = &(struct rk_clk_fract_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = (const char *[]){_pname}, \ - .clkdef.parent_cnt = 1, \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .gate_offset = RK3568_CLKGATE_CON(_go), \ - .gate_shift = _gw, \ - .flags = RK_CLK_FRACT_HAVE_GATE | _f, \ - }, \ -} - -/* Multiplexer */ -#define RK_MUX(_id, _name, _pnames, _o, _ms, _mw, _f) \ -{ \ - .type = RK_CLK_MUX, \ - .clk.mux = &(struct rk_clk_mux_def) { \ - .clkdef.id = _id, \ - .clkdef.name = _name, \ - .clkdef.parent_names = _pnames, \ - .clkdef.parent_cnt = nitems(_pnames), \ - .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = RK3568_CLKSEL_CON(_o), \ - .shift = _ms, \ - .width = _mw, \ - .mux_flags = _f, \ - }, \ -} - -#define RK_GATE(_id, _name, _pname, _o, _s) \ -{ \ - .id = _id, \ - .name = _name, \ - .parent_name = _pname, \ - .offset = RK3568_CLKGATE_CON(_o), \ - .shift = _s, \ -} - struct rk_clk_pll_rate rk3568_pll_rates[] = { /* _mhz, _refdiv, _fbdiv, _postdiv1, _postdiv2, _dsmpd */ RK_PLLRATE(2208000000, 1, 92, 1, 1, 1), @@ -322,113 +162,113 @@ static struct rk_clk_armclk_rates rk3568_armclk_rates[] = { }; /* Parent clock defines */ -PNAME(mux_pll_p) = { "xin24m" }; -PNAME(mux_usb480m_p) = { "xin24m", "usb480m_phy", "clk_rtc_32k" }; -PNAME(mux_armclk_p) = { "apll", "gpll" }; -PNAME(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", +PLIST(mux_pll_p) = { "xin24m" }; +PLIST(mux_usb480m_p) = { "xin24m", "usb480m_phy", "clk_rtc_32k" }; +PLIST(mux_armclk_p) = { "apll", "gpll" }; +PLIST(clk_i2s0_8ch_tx_p) = { "clk_i2s0_8ch_tx_src", "clk_i2s0_8ch_tx_frac", "i2s0_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", +PLIST(clk_i2s0_8ch_rx_p) = { "clk_i2s0_8ch_rx_src", "clk_i2s0_8ch_rx_frac", "i2s0_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s1_8ch_tx_p) = { "clk_i2s1_8ch_tx_src", "clk_i2s1_8ch_tx_frac", +PLIST(clk_i2s1_8ch_tx_p) = { "clk_i2s1_8ch_tx_src", "clk_i2s1_8ch_tx_frac", "i2s1_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s1_8ch_rx_p) = { "clk_i2s1_8ch_rx_src", "clk_i2s1_8ch_rx_frac", +PLIST(clk_i2s1_8ch_rx_p) = { "clk_i2s1_8ch_rx_src", "clk_i2s1_8ch_rx_frac", "i2s1_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s2_2ch_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", +PLIST(clk_i2s2_2ch_p) = { "clk_i2s2_2ch_src", "clk_i2s2_2ch_frac", "i2s2_mclkin", "xin_osc0_half"}; -PNAME(clk_i2s3_2ch_tx_p) = { "clk_i2s3_2ch_tx_src", "clk_i2s3_2ch_tx_frac", +PLIST(clk_i2s3_2ch_tx_p) = { "clk_i2s3_2ch_tx_src", "clk_i2s3_2ch_tx_frac", "i2s3_mclkin", "xin_osc0_half" }; -PNAME(clk_i2s3_2ch_rx_p) = { "clk_i2s3_2ch_rx_src", "clk_i2s3_2ch_rx_frac", +PLIST(clk_i2s3_2ch_rx_p) = { "clk_i2s3_2ch_rx_src", "clk_i2s3_2ch_rx_frac", "i2s3_mclkin", "xin_osc0_half" }; -PNAME(mclk_spdif_8ch_p) = { "mclk_spdif_8ch_src", "mclk_spdif_8ch_frac" }; -PNAME(sclk_audpwm_p) = { "sclk_audpwm_src", "sclk_audpwm_frac" }; -PNAME(sclk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; -PNAME(sclk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; -PNAME(sclk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; -PNAME(sclk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; -PNAME(sclk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; -PNAME(sclk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; -PNAME(sclk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; -PNAME(sclk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; -PNAME(sclk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; -PNAME(mpll_gpll_cpll_npll_p) = { "mpll", "gpll", "cpll", "npll" }; -PNAME(gpll_cpll_npll_p) = { "gpll", "cpll", "npll" }; -PNAME(npll_gpll_p) = { "npll", "gpll" }; -PNAME(cpll_gpll_p) = { "cpll", "gpll" }; -PNAME(gpll_cpll_p) = { "gpll", "cpll" }; -PNAME(gpll_cpll_npll_vpll_p) = { "gpll", "cpll", "npll", "vpll" }; -PNAME(apll_gpll_npll_p) = { "apll", "gpll", "npll" }; -PNAME(sclk_core_pre_p) = { "sclk_core_src", "npll" }; -PNAME(gpll150_gpll100_gpll75_xin24m_p) = { "gpll_150m", "gpll_100m", "gpll_75m", +PLIST(mclk_spdif_8ch_p) = { "mclk_spdif_8ch_src", "mclk_spdif_8ch_frac" }; +PLIST(sclk_audpwm_p) = { "sclk_audpwm_src", "sclk_audpwm_frac" }; +PLIST(sclk_uart1_p) = { "clk_uart1_src", "clk_uart1_frac", "xin24m" }; +PLIST(sclk_uart2_p) = { "clk_uart2_src", "clk_uart2_frac", "xin24m" }; +PLIST(sclk_uart3_p) = { "clk_uart3_src", "clk_uart3_frac", "xin24m" }; +PLIST(sclk_uart4_p) = { "clk_uart4_src", "clk_uart4_frac", "xin24m" }; +PLIST(sclk_uart5_p) = { "clk_uart5_src", "clk_uart5_frac", "xin24m" }; +PLIST(sclk_uart6_p) = { "clk_uart6_src", "clk_uart6_frac", "xin24m" }; +PLIST(sclk_uart7_p) = { "clk_uart7_src", "clk_uart7_frac", "xin24m" }; +PLIST(sclk_uart8_p) = { "clk_uart8_src", "clk_uart8_frac", "xin24m" }; +PLIST(sclk_uart9_p) = { "clk_uart9_src", "clk_uart9_frac", "xin24m" }; +PLIST(mpll_gpll_cpll_npll_p) = { "mpll", "gpll", "cpll", "npll" }; +PLIST(gpll_cpll_npll_p) = { "gpll", "cpll", "npll" }; +PLIST(npll_gpll_p) = { "npll", "gpll" }; +PLIST(cpll_gpll_p) = { "cpll", "gpll" }; +PLIST(gpll_cpll_p) = { "gpll", "cpll" }; +PLIST(gpll_cpll_npll_vpll_p) = { "gpll", "cpll", "npll", "vpll" }; +PLIST(apll_gpll_npll_p) = { "apll", "gpll", "npll" }; +PLIST(sclk_core_pre_p) = { "sclk_core_src", "npll" }; +PLIST(gpll150_gpll100_gpll75_xin24m_p) = { "clk_gpll_div_150m", "clk_gpll_div_100m", "clk_gpll_div_75m", "xin24m" }; -PNAME(clk_gpu_pre_mux_p) = { "clk_gpu_src", "gpu_pvtpll_out" }; -PNAME(clk_npu_pre_ndft_p) = { "clk_npu_src", "dummy"}; -PNAME(clk_npu_p) = { "clk_npu_pre_ndft", "npu_pvtpll_out" }; -PNAME(dpll_gpll_cpll_p) = { "dpll", "gpll", "cpll" }; -PNAME(clk_ddr1x_p) = { "clk_ddrphy1x_src", "dpll" }; -PNAME(gpll200_gpll150_gpll100_xin24m_p) = { "gpll_200m", "gpll_150m", - "gpll_100m", "xin24m" }; -PNAME(gpll100_gpll75_gpll50_p) = { "gpll_100m", "gpll_75m", "cpll_50m" }; -PNAME(i2s0_mclkout_tx_p) = { "clk_i2s0_8ch_tx", "xin_osc0_half" }; -PNAME(i2s0_mclkout_rx_p) = { "clk_i2s0_8ch_rx", "xin_osc0_half" }; -PNAME(i2s1_mclkout_tx_p) = { "clk_i2s1_8ch_tx", "xin_osc0_half" }; -PNAME(i2s1_mclkout_rx_p) = { "clk_i2s1_8ch_rx", "xin_osc0_half" }; -PNAME(i2s2_mclkout_p) = { "clk_i2s2_2ch", "xin_osc0_half" }; -PNAME(i2s3_mclkout_tx_p) = { "clk_i2s3_2ch_tx", "xin_osc0_half" }; -PNAME(i2s3_mclkout_rx_p) = { "clk_i2s3_2ch_rx", "xin_osc0_half" }; -PNAME(mclk_pdm_p) = { "gpll_300m", "cpll_250m", "gpll_200m", "gpll_100m" }; -PNAME(clk_i2c_p) = { "gpll_200m", "gpll_100m", "xin24m", "cpll_100m" }; -PNAME(gpll200_gpll150_gpll100_p) = { "gpll_200m", "gpll_150m", "gpll_100m" }; -PNAME(gpll300_gpll200_gpll100_p) = { "gpll_300m", "gpll_200m", "gpll_100m" }; -PNAME(clk_nandc_p) = { "gpll_200m", "gpll_150m", "cpll_100m", "xin24m" }; -PNAME(sclk_sfc_p) = { "xin24m", "cpll_50m", "gpll_75m", "gpll_100m", - "cpll_125m", "gpll_150m" }; -PNAME(gpll200_gpll150_cpll125_p) = { "gpll_200m", "gpll_150m", "cpll_125m" }; -PNAME(cclk_emmc_p) = { "xin24m", "gpll_200m", "gpll_150m", "cpll_100m", - "cpll_50m", "clk_osc0_div_375k" }; -PNAME(aclk_pipe_p) = { "gpll_400m", "gpll_300m", "gpll_200m", "xin24m" }; -PNAME(gpll200_cpll125_p) = { "gpll_200m", "cpll_125m" }; -PNAME(gpll300_gpll200_gpll100_xin24m_p) = { "gpll_300m", "gpll_200m", - "gpll_100m", "xin24m" }; -PNAME(clk_sdmmc_p) = { "xin24m", "gpll_400m", "gpll_300m", "cpll_100m", - "cpll_50m", "clk_osc0_div_750k" }; -PNAME(cpll125_cpll50_cpll25_xin24m_p) = { "cpll_125m", "cpll_50m", "cpll_25m", +PLIST(clk_gpu_pre_mux_p) = { "clk_gpu_src", "gpu_pvtpll_out" }; +PLIST(clk_npu_pre_ndft_p) = { "clk_npu_src", "clk_npu_np5"}; +PLIST(clk_npu_p) = { "clk_npu_pre_ndft", "npu_pvtpll_out" }; +PLIST(dpll_gpll_cpll_p) = { "dpll", "gpll", "cpll" }; +PLIST(clk_ddr1x_p) = { "clk_ddrphy1x_src", "dpll" }; +PLIST(gpll200_gpll150_gpll100_xin24m_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(gpll100_gpll75_gpll50_p) = { "clk_gpll_div_100m", "clk_gpll_div_75m", "clk_cpll_div_50m" }; +PLIST(i2s0_mclkout_tx_p) = { "clk_i2s0_8ch_tx", "xin_osc0_half" }; +PLIST(i2s0_mclkout_rx_p) = { "clk_i2s0_8ch_rx", "xin_osc0_half" }; +PLIST(i2s1_mclkout_tx_p) = { "clk_i2s1_8ch_tx", "xin_osc0_half" }; +PLIST(i2s1_mclkout_rx_p) = { "clk_i2s1_8ch_rx", "xin_osc0_half" }; +PLIST(i2s2_mclkout_p) = { "clk_i2s2_2ch", "xin_osc0_half" }; +PLIST(i2s3_mclkout_tx_p) = { "clk_i2s3_2ch_tx", "xin_osc0_half" }; +PLIST(i2s3_mclkout_rx_p) = { "clk_i2s3_2ch_rx", "xin_osc0_half" }; +PLIST(mclk_pdm_p) = { "clk_gpll_div_300m", "clk_cpll_div_250m", "clk_gpll_div_200m", "clk_gpll_div_100m" }; +PLIST(clk_i2c_p) = { "clk_gpll_div_200m", "clk_gpll_div_100m", "xin24m", "clk_cpll_div_100m" }; +PLIST(gpll200_gpll150_gpll100_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_gpll_div_100m" }; +PLIST(gpll300_gpll200_gpll100_p) = { "clk_gpll_div_300m", "clk_gpll_div_200m", "clk_gpll_div_100m" }; +PLIST(clk_nandc_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_100m", "xin24m" }; +PLIST(sclk_sfc_p) = { "xin24m", "clk_cpll_div_50m", "clk_gpll_div_75m", "clk_gpll_div_100m", + "clk_cpll_div_125m", "clk_gpll_div_150m" }; +PLIST(gpll200_gpll150_cpll125_p) = { "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_125m" }; +PLIST(cclk_emmc_p) = { "xin24m", "clk_gpll_div_200m", "clk_gpll_div_150m", "clk_cpll_div_100m", + "clk_cpll_div_50m", "clk_osc0_div_375k" }; +PLIST(aclk_pipe_p) = { "clk_gpll_div_400m", "clk_gpll_div_300m", "clk_gpll_div_200m", "xin24m" }; +PLIST(gpll200_cpll125_p) = { "clk_gpll_div_200m", "clk_cpll_div_125m" }; +PLIST(gpll300_gpll200_gpll100_xin24m_p) = { "clk_gpll_div_300m", "clk_gpll_div_200m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(clk_sdmmc_p) = { "xin24m", "clk_gpll_div_400m", "clk_gpll_div_300m", "clk_cpll_div_100m", + "clk_cpll_div_50m", "clk_osc0_div_750k" }; +PLIST(cpll125_cpll50_cpll25_xin24m_p) = { "clk_cpll_div_125m", "clk_cpll_div_50m", "clk_cpll_div_25m", "xin24m" }; -PNAME(clk_gmac_ptp_p) = { "cpll_62p5", "gpll_100m", "cpll_50m", "xin24m" }; -PNAME(cpll333_gpll300_gpll200_p) = { "cpll_333m", "gpll_300m", "gpll_200m" }; -PNAME(cpll_gpll_hpll_p) = { "cpll", "gpll", "hpll" }; -PNAME(gpll_usb480m_xin24m_p) = { "gpll", "usb480m", "xin24m", "xin24m" }; -PNAME(gpll300_cpll250_gpll100_xin24m_p) = { "gpll_300m", "cpll_250m", - "gpll_100m", "xin24m" }; -PNAME(cpll_gpll_hpll_vpll_p) = { "cpll", "gpll", "hpll", "vpll" }; -PNAME(hpll_vpll_gpll_cpll_p) = { "hpll", "vpll", "gpll", "cpll" }; -PNAME(gpll400_cpll333_gpll200_p) = { "gpll_400m", "cpll_333m", "gpll_200m" }; -PNAME(gpll100_gpll75_cpll50_xin24m_p) = { "gpll_100m", "gpll_75m", "cpll_50m", +PLIST(clk_gmac_ptp_p) = { "clk_cpll_div_62P5m", "clk_gpll_div_100m", "clk_cpll_div_50m", "xin24m" }; +PLIST(cpll333_gpll300_gpll200_p) = { "clk_cpll_div_333m", "clk_gpll_div_300m", "clk_gpll_div_200m" }; +PLIST(cpll_gpll_hpll_p) = { "cpll", "gpll", "hpll" }; +PLIST(gpll_usb480m_xin24m_p) = { "gpll", "usb480m", "xin24m", "xin24m" }; +PLIST(gpll300_cpll250_gpll100_xin24m_p) = { "clk_gpll_div_300m", "clk_cpll_div_250m", + "clk_gpll_div_100m", "xin24m" }; +PLIST(cpll_gpll_hpll_vpll_p) = { "cpll", "gpll", "hpll", "vpll" }; +PLIST(hpll_vpll_gpll_cpll_p) = { "hpll", "vpll", "gpll", "cpll" }; +PLIST(gpll400_cpll333_gpll200_p) = { "clk_gpll_div_400m", "clk_cpll_div_333m", "clk_gpll_div_200m" }; +PLIST(gpll100_gpll75_cpll50_xin24m_p) = { "clk_gpll_div_100m", "clk_gpll_div_75m", "clk_cpll_div_50m", "xin24m" }; -PNAME(xin24m_gpll100_cpll100_p) = { "xin24m", "gpll_100m", "cpll_100m" }; -PNAME(gpll_cpll_usb480m_p) = { "gpll", "cpll", "usb480m" }; -PNAME(gpll100_xin24m_cpll100_p) = { "gpll_100m", "xin24m", "cpll_100m" }; -PNAME(gpll200_xin24m_cpll100_p) = { "gpll_200m", "xin24m", "cpll_100m" }; -PNAME(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; -PNAME(cpll500_gpll400_gpll300_xin24m_p) = { "cpll_500m", "gpll_400m", - "gpll_300m", "xin24m" }; -PNAME(gpll400_gpll300_gpll200_xin24m_p) = { "gpll_400m", "gpll_300m", - "gpll_200m", "xin24m" }; -PNAME(xin24m_cpll100_p) = { "xin24m", "cpll_100m" }; -PNAME(mux_gmac0_p) = { "clk_mac0_2top", "gmac0_clkin" }; -PNAME(mux_gmac0_rgmii_speed_p) = { "clk_gmac0", "clk_gmac0", +PLIST(xin24m_gpll100_cpll100_p) = { "xin24m", "clk_gpll_div_100m", "clk_cpll_div_100m" }; +PLIST(gpll_cpll_usb480m_p) = { "gpll", "cpll", "usb480m" }; +PLIST(gpll100_xin24m_cpll100_p) = { "clk_gpll_div_100m", "xin24m", "clk_cpll_div_100m" }; +PLIST(gpll200_xin24m_cpll100_p) = { "clk_gpll_div_200m", "xin24m", "clk_cpll_div_100m" }; +PLIST(xin24m_32k_p) = { "xin24m", "clk_rtc_32k" }; +PLIST(cpll500_gpll400_gpll300_xin24m_p) = { "clk_cpll_div_500m", "clk_gpll_div_400m", + "clk_gpll_div_300m", "xin24m" }; +PLIST(gpll400_gpll300_gpll200_xin24m_p) = { "clk_gpll_div_400m", "clk_gpll_div_300m", + "clk_gpll_div_200m", "xin24m" }; +PLIST(xin24m_cpll100_p) = { "xin24m", "clk_cpll_div_100m" }; +PLIST(mux_gmac0_p) = { "clk_mac0_2top", "gmac0_clkin" }; +PLIST(mux_gmac0_rgmii_speed_p) = { "clk_gmac0", "clk_gmac0", "clk_gmac0_tx_div50", "clk_gmac0_tx_div5" }; -PNAME(mux_gmac0_rmii_speed_p) = { "clk_gmac0_rx_div20", "clk_gmac0_rx_div2" }; -PNAME(mux_gmac0_rx_tx_p) = { "clk_gmac0_rgmii_speed", "clk_gmac0_rmii_speed", +PLIST(mux_gmac0_rmii_speed_p) = { "clk_gmac0_rx_div20", "clk_gmac0_rx_div2" }; +PLIST(mux_gmac0_rx_tx_p) = { "clk_gmac0_rgmii_speed", "clk_gmac0_rmii_speed", "clk_gmac0_xpcs_mii" }; -PNAME(mux_gmac1_p) = { "clk_mac1_2top", "gmac1_clkin" }; -PNAME(mux_gmac1_rgmii_speed_p) = { "clk_gmac1", "clk_gmac1", +PLIST(mux_gmac1_p) = { "clk_mac1_2top", "gmac1_clkin" }; +PLIST(mux_gmac1_rgmii_speed_p) = { "clk_gmac1", "clk_gmac1", "clk_gmac1_tx_div50", "clk_gmac1_tx_div5" }; -PNAME(mux_gmac1_rmii_speed_p) = { "clk_gmac1_rx_div20", "clk_gmac1_rx_div2" }; -PNAME(mux_gmac1_rx_tx_p) = { "clk_gmac1_rgmii_speed", "clk_gmac1_rmii_speed", +PLIST(mux_gmac1_rmii_speed_p) = { "clk_gmac1_rx_div20", "clk_gmac1_rx_div2" }; +PLIST(mux_gmac1_rx_tx_p) = { "clk_gmac1_rgmii_speed", "clk_gmac1_rmii_speed", "clk_gmac1_xpcs_mii" }; -PNAME(clk_mac_2top_p) = { "cpll_125m", "cpll_50m", "cpll_25m", "ppll" }; -PNAME(aclk_rkvdec_pre_p) = { "gpll", "cpll" }; -PNAME(clk_rkvdec_core_p) = { "gpll", "cpll", "npll", "vpll" }; +PLIST(clk_mac_2top_p) = { "clk_cpll_div_125m", "clk_cpll_div_50m", "clk_cpll_div_25m", "ppll" }; +PLIST(aclk_rkvdec_pre_p) = { "gpll", "cpll" }; +PLIST(clk_rkvdec_core_p) = { "gpll", "cpll", "npll", "vpll" }; /* CLOCKS */ static struct rk_clk rk3568_clks[] = { @@ -436,7 +276,7 @@ static struct rk_clk rk3568_clks[] = { LINK("xin24m"), LINK("clk_rtc_32k"), LINK("usb480m_phy"), - LINK("mpll"), // SOS SCRU + LINK("mpll"), /* It lives in SCRU */ LINK("i2s0_mclkin"), LINK("i2s1_mclkin"), LINK("i2s2_mclkin"), @@ -456,563 +296,1100 @@ static struct rk_clk rk3568_clks[] = { RK_PLL(PLL_CPLL, "cpll", mux_pll_p, 3, 4), RK_PLL(PLL_NPLL, "npll", mux_pll_p, 4, 10), RK_PLL(PLL_VPLL, "vpll", mux_pll_p, 5, 12), - RK_ARMDIV(ARMCLK, "armclk", mux_armclk_p, rk3568_armclk_rates, 0, 0, 5, + ARMDIV(ARMCLK, "armclk", mux_armclk_p, rk3568_armclk_rates, 0, 0, 5, 6, 1, 0, 1), - RK_FACTOR(0, "clk_osc0_div_375k", "clk_osc0_div_750k", 1, 2), - RK_FACTOR(0, "xin_osc0_half", "xin24m", 1, 2), - RK_MUX(USB480M, "usb480m", mux_usb480m_p, -16, 14, 2, 0), + FFACT(0, "clk_osc0_div_375k", "clk_osc0_div_750k", 1, 2), + FFACT(0, "xin_osc0_half", "xin24m", 1, 2), + MUX(USB480M, "usb480m", mux_usb480m_p, 0, -16, 14, 2), /* Clocks */ - RK_COMPNOMUX(0, "gpll_400m", "gpll", 75, 0, 5, 35, 0, 0), - RK_COMPNOMUX(0, "gpll_300m", "gpll", 75, 8, 5, 35, 1, 0), - RK_COMPNOMUX(0, "gpll_200m", "gpll", 76, 0, 5, 35, 2, 0), - RK_COMPNOMUX(0, "gpll_150m", "gpll", 76, 8, 5, 35, 3, 0), - RK_COMPNOMUX(0, "gpll_100m", "gpll", 77, 0, 5, 35, 4, 0), - RK_COMPNOMUX(0, "gpll_75m", "gpll", 77, 8, 5, 35, 5, 0), - RK_COMPNOMUX(0, "gpll_20m", "gpll", 78, 0, 6, 35, 6, 0), - RK_COMPNOMUX(CPLL_500M, "cpll_500m", "cpll", 78, 8, 5, 35, 7, 0), - RK_COMPNOMUX(CPLL_333M, "cpll_333m", "cpll", 79, 0, 5, 35, 8, 0), - RK_COMPNOMUX(CPLL_250M, "cpll_250m", "cpll", 79, 8, 5, 35, 9, 0), - RK_COMPNOMUX(CPLL_125M, "cpll_125m", "cpll", 80, 0, 5, 35, 10, 0), - RK_COMPNOMUX(CPLL_100M, "cpll_100m", "cpll", 82, 0, 5, 35, 11, 0), - RK_COMPNOMUX(CPLL_62P5M, "cpll_62p5", "cpll", 80, 8, 5, 35, 12, 0), - RK_COMPNOMUX(CPLL_50M, "cpll_50m", "cpll", 81, 0, 5, 35, 13, 0), - RK_COMPNOMUX(CPLL_25M, "cpll_25m", "cpll", 81, 8, 6, 35, 14, 0), - RK_COMPNOMUX(0, "clk_osc0_div_750k", "xin24m", 82, 8, 6, 35, 15, 0), - RK_COMPOSITE(0, "sclk_core_src", apll_gpll_npll_p, 2, 8, 2, 0, 4, 0, - 5, 0), - RK_COMPNODIV(0, "sclk_core", sclk_core_pre_p, 2, 15, 1, 0, 7, 0), - RK_COMPNOMUX(0, "atclk_core", "armclk", 3, 0, 5, 0, 8, 0), - RK_COMPNOMUX(0, "gicclk_core", "armclk", 3, 8, 5, 0, 9, 0), - RK_COMPNOMUX(0, "pclk_core_pre", "armclk", 4, 0, 5, 0, 10, 0), - RK_COMPNOMUX(0, "periphclk_core_pre", "armclk", 4, 8, 5, 0, 11, 0), - RK_COMPNOMUX(0, "tsclk_core", "periphclk_core_pre", 5, 0, 4, 0, 14, 0), - RK_COMPNOMUX(0, "cntclk_core", "periphclk_core_pre", 5, 4, 4, 0, 15, 0), - RK_COMPNOMUX(0, "aclk_core", "sclk_core", 5, 8, 5, 1, 0, 0), - RK_COMPNODIV(ACLK_CORE_NIU2BUS, "aclk_core_niu2bus", - gpll150_gpll100_gpll75_xin24m_p, 5, 14, 2, 1, 2, 0), - RK_COMPOSITE(CLK_GPU_SRC, "clk_gpu_src", mpll_gpll_cpll_npll_p, 6, 6, 2, - 0, 4, 2, 0, 0), - RK_MUX(CLK_GPU_PRE_MUX, "clk_gpu_pre_mux", clk_gpu_pre_mux_p, 6, 11, - 1, 0), - RK_COMPDIV(ACLK_GPU_PRE, "aclk_gpu_pre", "clk_gpu_pre_mux", 6, 8, 2, 0), - RK_COMPDIV(PCLK_GPU_PRE, "pclk_gpu_pre", "clk_gpu_pre_mux", 6, 12, 4,0), - RK_COMPOSITE(CLK_NPU_SRC, "clk_npu_src", npll_gpll_p, 7, 6, 1, 0, 4, 3, - 0, 0), - RK_MUX(CLK_NPU_PRE_NDFT, "clk_npu_pre_ndft", clk_npu_pre_ndft_p, 7, 8, - 1, 0), - RK_MUX(CLK_NPU, "clk_npu", clk_npu_p, 7, 15, 1, 0), - RK_COMPNOMUX(HCLK_NPU_PRE, "hclk_npu_pre", "clk_npu", 8, 0, 4, 3, 2, 0), - RK_COMPNOMUX(PCLK_NPU_PRE, "pclk_npu_pre", "clk_npu", 8, 4, 4, 3, 3, 0), - RK_COMPOSITE(CLK_DDRPHY1X_SRC, "clk_ddrphy1x_src", dpll_gpll_cpll_p, 9, - 6, 2, 0, 5, 4, 0, 0), - RK_MUX(CLK_DDR1X, "clk_ddr1x", clk_ddr1x_p, 9, 15, 1, - RK_CLK_COMPOSITE_GRF), - RK_COMPNOMUX(CLK_MSCH, "clk_msch", "clk_ddr1x", 10, 0, 2, 4, 2, 0), - RK_COMPNODIV(ACLK_GIC_AUDIO, "aclk_gic_audio", - gpll200_gpll150_gpll100_xin24m_p, 10, 8, 2, 5, 0, 0), - RK_COMPNODIV(HCLK_GIC_AUDIO, "hclk_gic_audio", - gpll150_gpll100_gpll75_xin24m_p, 10, 10, 2, 5, 1, 0), - RK_COMPNODIV(DCLK_SDMMC_BUFFER, "dclk_sdmmc_buffer", - gpll100_gpll75_gpll50_p, 10, 12, 2, 5, 9, 0), - RK_COMPOSITE(CLK_I2S0_8CH_TX_SRC, "clk_i2s0_8ch_tx_src", - gpll_cpll_npll_p, 11, 8, 2, 0, 7, 6, 0, 0), - RK_MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, 11, 10, - 2, 0), - RK_FRACTION(CLK_I2S0_8CH_TX_FRAC, "clk_i2s0_8ch_tx_frac", - "clk_i2s0_8ch_tx_src", 12, 6, 1, 0), - RK_COMPNODIV(I2S0_MCLKOUT_TX, "i2s0_mclkout_tx", i2s0_mclkout_tx_p, 11, - 15, 1, 6, 3, 0), - RK_COMPOSITE(CLK_I2S0_8CH_RX_SRC, "clk_i2s0_8ch_rx_src", - gpll_cpll_npll_p, 13, 8, 2, 0, 7, 6, 4, 0), - RK_MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, 13, 10, - 2, 0), - RK_FRACTION(CLK_I2S0_8CH_RX_FRAC, "clk_i2s0_8ch_rx_frac", - "clk_i2s0_8ch_rx_src", 14, 6, 5, 0), - RK_COMPNODIV(I2S0_MCLKOUT_RX, "i2s0_mclkout_rx", i2s0_mclkout_rx_p, 13, - 15, 1, 6, 7, 0), - RK_COMPOSITE(CLK_I2S1_8CH_TX_SRC, "clk_i2s1_8ch_tx_src", - gpll_cpll_npll_p, 15, 8, 2, 0, 7, 6, 8, 0), - RK_MUX(CLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", clk_i2s1_8ch_tx_p, 15, 10, - 2, 0), - RK_FRACTION(CLK_I2S1_8CH_TX_FRAC, "clk_i2s1_8ch_tx_frac", - "clk_i2s1_8ch_tx_src", 16, 6, 9, 0), - RK_COMPNODIV(I2S1_MCLKOUT_TX, "i2s1_mclkout_tx", i2s1_mclkout_tx_p, 15, - 15, 1, 6, 11, 0), - RK_COMPOSITE(CLK_I2S1_8CH_RX_SRC, "clk_i2s1_8ch_rx_src", - gpll_cpll_npll_p, 17, 8, 2, 0, 7, 6, 12, 0), - RK_MUX(CLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", clk_i2s1_8ch_rx_p, 17, 10, - 2, 0), - RK_FRACTION(CLK_I2S1_8CH_RX_FRAC, "clk_i2s1_8ch_rx_frac", - "clk_i2s1_8ch_rx_src", 18, 6, 13, 0), - RK_COMPNODIV(I2S1_MCLKOUT_RX, "i2s1_mclkout_rx", i2s1_mclkout_rx_p, 17, - 15, 1, 6, 15, 0), - RK_COMPOSITE(CLK_I2S2_2CH_SRC, "clk_i2s2_2ch_src", gpll_cpll_npll_p, 19, - 8, 2, 0, 7, 7, 0, 0), - RK_MUX(CLK_I2S2_2CH, "clk_i2s2_2ch", clk_i2s2_2ch_p, 19, 10, 2, 0), - RK_FRACTION(CLK_I2S2_2CH_FRAC, "clk_i2s2_2ch_frac", "clk_i2s2_2ch_src", - 20, 7, 1, 0), - RK_COMPNODIV(I2S2_MCLKOUT, "i2s2_mclkout", i2s2_mclkout_p, 19, 15, 1, 7, - 3, 0), - RK_COMPOSITE(CLK_I2S3_2CH_TX_SRC, "clk_i2s3_2ch_tx_src", - gpll_cpll_npll_p, 21, 8, 2, 0, 7, 7, 4, 0), - RK_MUX(CLK_I2S3_2CH_TX, "clk_i2s3_2ch_tx", clk_i2s3_2ch_tx_p, 21, 10, - 2, 0), - RK_FRACTION(CLK_I2S3_2CH_TX_FRAC, "clk_i2s3_2ch_tx_frac", - "clk_i2s3_2ch_tx_src", 22, 7, 5, 0), - RK_COMPNODIV(I2S3_MCLKOUT_TX, "i2s3_mclkout_tx", i2s3_mclkout_tx_p, 21, - 15, 1, 7, 7, 0), - RK_COMPOSITE(CLK_I2S3_2CH_RX_SRC, "clk_i2s3_2ch_rx_src", - gpll_cpll_npll_p, 83, 8, 2, 0, 7, 7, 8, 0), - RK_MUX(CLK_I2S3_2CH_RX, "clk_i2s3_2ch_rx", clk_i2s3_2ch_rx_p, 83, 10, - 2, 0), - RK_FRACTION(CLK_I2S3_2CH_RX_FRAC, "clk_i2s3_2ch_rx_frac", - "clk_i2s3_2ch_rx_src", 84, 7, 9, 0), - RK_COMPNODIV(I2S3_MCLKOUT_RX, "i2s3_mclkout_rx", i2s3_mclkout_rx_p, 83, - 15, 1, 7, 11, 0), - RK_COMPNODIV(MCLK_PDM, "mclk_pdm", mclk_pdm_p, 23, 8, 2, 5, 15, 0), - RK_COMPOSITE(MCLK_SPDIF_8CH_SRC, "mclk_spdif_8ch_src", cpll_gpll_p, 23, - 14, 1, 0, 7, 7, 14, 0), - RK_MUX(MCLK_SPDIF_8CH, "mclk_spdif_8ch", mclk_spdif_8ch_p, 23, 15, 1,0), - RK_FRACTION(MCLK_SPDIF_8CH_FRAC, "mclk_spdif_8ch_frac", - "mclk_spdif_8ch_src", 24, 7, 15, 0), - RK_COMPOSITE(SCLK_AUDPWM_SRC, "sclk_audpwm_src", gpll_cpll_p, 25, 14, 1, - 0, 6, 8, 1, 0), - RK_MUX(SCLK_AUDPWM, "sclk_audpwm", sclk_audpwm_p, 25, 15, 1, 0), - RK_FRACTION(SCLK_AUDPWM_FRAC, "sclk_audpwm_frac", "sclk_audpwm_src", 26, - 8, 2, 0), - RK_COMPNODIV(CLK_ACDCDIG_I2C, "clk_acdcdig_i2c", clk_i2c_p, 23, 10, 2, - 8, 4, 0), - RK_COMPNODIV(ACLK_SECURE_FLASH, "aclk_secure_flash", - gpll200_gpll150_gpll100_xin24m_p, 27, 0, 2, 8, 7, 0), - RK_COMPNODIV(HCLK_SECURE_FLASH, "hclk_secure_flash", - gpll150_gpll100_gpll75_xin24m_p, 27, 2, 2, 8, 8, 0), - RK_COMPNODIV(CLK_CRYPTO_NS_CORE, "clk_crypto_ns_core", - gpll200_gpll150_gpll100_p, 27, 4, 2, 8, 13, 0), - RK_COMPNODIV(CLK_CRYPTO_NS_PKA, "clk_crypto_ns_pka", - gpll300_gpll200_gpll100_p, 27, 6, 2, 8, 14, 0), - RK_COMPNODIV(NCLK_NANDC, "nclk_nandc", clk_nandc_p, 28, 0, 2, 9, 1, 0), - RK_COMPNODIV(SCLK_SFC, "sclk_sfc", sclk_sfc_p, 28, 4, 3, 9, 4, 0), - RK_COMPNODIV(BCLK_EMMC, "bclk_emmc", gpll200_gpll150_cpll125_p, 28, 8, - 2, 9, 7, 0), - RK_COMPNODIV(CCLK_EMMC, "cclk_emmc", cclk_emmc_p, 28, 12, 3, 9, 8, 0), - RK_COMPNODIV(ACLK_PIPE, "aclk_pipe", aclk_pipe_p, 29, 0, 2, 10, 0, 0), - RK_COMPNOMUX(PCLK_PIPE, "pclk_pipe", "aclk_pipe", 29, 4, 4, 10, 1, 0), - RK_COMPNODIV(CLK_USB3OTG0_SUSPEND, "clk_usb3otg0_suspend", xin24m_32k_p, - 29, 8, 1, 10, 10, 0), - RK_COMPNODIV(CLK_USB3OTG1_SUSPEND, "clk_usb3otg1_suspend", xin24m_32k_p, - 29, 9, 1, 10, 14, 0), - RK_COMPNODIV(CLK_XPCS_EEE, "clk_xpcs_eee", gpll200_cpll125_p, 29, 13, 1, - 10, 4, 0), - RK_COMPNODIV(ACLK_PHP, "aclk_php", gpll300_gpll200_gpll100_xin24m_p, 30, - 0, 2, 14, 8, 0), - RK_COMPNODIV(HCLK_PHP, "hclk_php", gpll150_gpll100_gpll75_xin24m_p, 30, - 2, 2, 14, 9, 0), - RK_COMPNOMUX(PCLK_PHP, "pclk_php", "aclk_php", 30, 4, 4, 14, 10, 0), - RK_COMPNODIV(CLK_SDMMC0, "clk_sdmmc0", clk_sdmmc_p, 30, 8, 3, 15, 1, 0), - RK_COMPNODIV(CLK_SDMMC1, "clk_sdmmc1", clk_sdmmc_p, 30, 12, 3, 15, 3,0), - RK_COMPNODIV(CLK_MAC0_2TOP, "clk_mac0_2top", clk_mac_2top_p, 31, 8, 2, - 15, 7, 0), - RK_COMPNODIV(CLK_MAC0_OUT, "clk_mac0_out", - cpll125_cpll50_cpll25_xin24m_p, 31, 14, 2, 15, 8, 0), - RK_COMPNODIV(CLK_GMAC0_PTP_REF, "clk_gmac0_ptp_ref", clk_gmac_ptp_p, 31, - 12, 2, 15, 4, 0), - RK_MUX(SCLK_GMAC0, "clk_gmac0", mux_gmac0_p, 31, 2, 1, 0), - RK_FACTOR(0, "clk_gmac0_tx_div5", "clk_gmac0", 1, 5), - RK_FACTOR(0, "clk_gmac0_tx_div50", "clk_gmac0", 1, 50), - RK_FACTOR(0, "clk_gmac0_rx_div2", "clk_gmac0", 1, 2), - RK_FACTOR(0, "clk_gmac0_rx_div20", "clk_gmac0", 1, 20), - RK_MUX(SCLK_GMAC0_RGMII_SPEED, "clk_gmac0_rgmii_speed", - mux_gmac0_rgmii_speed_p, 31, 4, 2, 0), - RK_MUX(SCLK_GMAC0_RMII_SPEED, "clk_gmac0_rmii_speed", - mux_gmac0_rmii_speed_p, 31, 3, 1, 0), - RK_MUX(SCLK_GMAC0_RX_TX, "clk_gmac0_rx_tx", mux_gmac0_rx_tx_p, 31, 0, - 2, 0), - RK_COMPNODIV(ACLK_USB, "aclk_usb", gpll300_gpll200_gpll100_xin24m_p, 32, - 0, 2, 16, 0, 0), - RK_COMPNODIV(HCLK_USB, "hclk_usb", gpll150_gpll100_gpll75_xin24m_p, 32, - 2, 2, 16, 1, 0), - RK_COMPNOMUX(PCLK_USB, "pclk_usb", "aclk_usb", 32, 4, 4, 16, 2, 0), - RK_COMPNODIV(CLK_SDMMC2, "clk_sdmmc2", clk_sdmmc_p, 32, 8, 3, 17, 1, 0), - RK_COMPNODIV(CLK_MAC1_2TOP, "clk_mac1_2top", clk_mac_2top_p, 33, 8, 2, - 17, 5, 0), - RK_COMPNODIV(CLK_MAC1_OUT, "clk_mac1_out", - cpll125_cpll50_cpll25_xin24m_p, 33, 14, 2, 17, 6, 0), - RK_COMPNODIV(CLK_GMAC1_PTP_REF, "clk_gmac1_ptp_ref", clk_gmac_ptp_p, 33, - 12, 2, 17, 2, 0), - RK_MUX(SCLK_GMAC1, "clk_gmac1", mux_gmac1_p, 33, 2, 1, 0), - RK_FACTOR(0, "clk_gmac1_tx_div5", "clk_gmac1", 1, 5), - RK_FACTOR(0, "clk_gmac1_tx_div50", "clk_gmac1", 1, 50), - RK_FACTOR(0, "clk_gmac1_rx_div2", "clk_gmac1", 1, 2), - RK_FACTOR(0, "clk_gmac1_rx_div20", "clk_gmac1", 1, 20), - RK_MUX(SCLK_GMAC1_RGMII_SPEED, "clk_gmac1_rgmii_speed", - mux_gmac1_rgmii_speed_p, 33, 4, 2, 0), - RK_MUX(SCLK_GMAC1_RMII_SPEED, "clk_gmac1_rmii_speed", - mux_gmac1_rmii_speed_p, 33, 3, 1, 0), - RK_MUX(SCLK_GMAC1_RX_TX, "clk_gmac1_rx_tx", mux_gmac1_rx_tx_p, 33, 0, - 2, 0), - RK_COMPNODIV(ACLK_PERIMID, "aclk_perimid", - gpll300_gpll200_gpll100_xin24m_p, 10, 4, 2, 14, 0, 0), - RK_COMPNODIV(HCLK_PERIMID, "hclk_perimid", - gpll150_gpll100_gpll75_xin24m_p, 10, 6, 2, 14, 1, 0), - RK_COMPNODIV(ACLK_VI, "aclk_vi", gpll400_gpll300_gpll200_xin24m_p, 34, - 0, 2, 18, 0, 0), - RK_COMPNOMUX(HCLK_VI, "hclk_vi", "aclk_vi", 34, 4, 4, 18, 1, 0), - RK_COMPNOMUX(PCLK_VI, "pclk_vi", "aclk_vi", 34, 8, 4, 18, 2, 0), - RK_COMPNODIV(DCLK_VICAP, "dclk_vicap", cpll333_gpll300_gpll200_p, 34, - 14, 2, 18, 11, 0), - RK_COMPOSITE(CLK_ISP, "clk_isp", cpll_gpll_hpll_p, 35, 6, 2, 0, 5, 19, - 2, 0), - RK_COMPOSITE(CLK_CIF_OUT, "clk_cif_out", gpll_usb480m_xin24m_p, 35, 14, - 2, 8, 6, 19, 8, 0), - RK_COMPOSITE(CLK_CAM0_OUT, "clk_cam0_out", gpll_usb480m_xin24m_p, 36, 6, - 2, 0, 6, 19, 9, 0), - RK_COMPOSITE(CLK_CAM1_OUT, "clk_cam1_out", gpll_usb480m_xin24m_p, 36, - 14, 2, 8, 6, 19, 10, 0), - RK_COMPNODIV(ACLK_VO, "aclk_vo", gpll300_cpll250_gpll100_xin24m_p, 37, - 0, 2, 20, 0, 0), - RK_COMPNOMUX(HCLK_VO, "hclk_vo", "aclk_vo", 37, 8, 4, 20, 1, 0), - RK_COMPNOMUX(PCLK_VO, "pclk_vo", "aclk_vo", 37, 12, 4, 20, 2, 0), - RK_COMPOSITE(ACLK_VOP_PRE, "aclk_vop_pre", cpll_gpll_hpll_vpll_p, 38, 6, - 2, 0, 5, 20, 6, 0), - RK_COMPOSITE(DCLK_VOP0, "dclk_vop0", hpll_vpll_gpll_cpll_p, 39, 10, 2, - 0, 8, 20, 10, 0), - RK_COMPOSITE(DCLK_VOP1, "dclk_vop1", hpll_vpll_gpll_cpll_p, 40, 10, 2, - 0, 8, 20, 11, 0), - RK_COMPOSITE(DCLK_VOP2, "dclk_vop2", hpll_vpll_gpll_cpll_p, 41, 10, 2, - 0, 8, 20, 12, 0), - RK_COMPNODIV(CLK_EDP_200M, "clk_edp_200m", gpll200_gpll150_cpll125_p, - 38, 8, 2, 21, 9, 0), - RK_COMPOSITE(ACLK_VPU_PRE, "aclk_vpu_pre", gpll_cpll_p, 42, 7, 1, 0, 5, - 22, 0, 0), - RK_COMPNOMUX(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 42, 8, 4, 22, - 1, 0), - RK_COMPNODIV(ACLK_RGA_PRE, "aclk_rga_pre", - gpll300_cpll250_gpll100_xin24m_p, 43, 0, 2, 23, 0, 0), - RK_COMPNOMUX(HCLK_RGA_PRE, "hclk_rga_pre", "aclk_rga_pre", 43, 8, 4, 23, - 1, 0), - RK_COMPNOMUX(PCLK_RGA_PRE, "pclk_rga_pre", "aclk_rga_pre", 43, 12, 4, - 22, 12, 0), - RK_COMPNODIV(CLK_RGA_CORE, "clk_rga_core", gpll300_gpll200_gpll100_p, - 43, 2, 2, 23, 6, 0), - RK_COMPNODIV(CLK_IEP_CORE, "clk_iep_core", gpll300_gpll200_gpll100_p, - 43, 4, 2, 23, 9, 0), - RK_COMPNODIV(DCLK_EBC, "dclk_ebc", gpll400_cpll333_gpll200_p, 43, 6, 2, - 23, 11, 0), - RK_COMPOSITE(ACLK_RKVENC_PRE, "aclk_rkvenc_pre", gpll_cpll_npll_p, 44, - 6, 2, 0, 5, 24, 0, 0), - RK_COMPNOMUX(HCLK_RKVENC_PRE, "hclk_rkvenc_pre", "aclk_rkvenc_pre", 44, - 8, 4, 24, 1, 0), - RK_COMPOSITE(CLK_RKVENC_CORE, "clk_rkvenc_core", gpll_cpll_npll_vpll_p, - 45, 14, 2, 0, 5, 24, 8, 0), - RK_COMPOSITE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", aclk_rkvdec_pre_p, 47, - 7, 1, 0, 5, 25, 0, 0), - RK_COMPNOMUX(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 47, - 8, 4, 25, 1, 0), - RK_COMPOSITE(CLK_RKVDEC_CA, "clk_rkvdec_ca", gpll_cpll_npll_vpll_p, 48, - 6, 2, 0, 5, 25, 6, 0), - RK_COMPOSITE(CLK_RKVDEC_CORE, "clk_rkvdec_core", clk_rkvdec_core_p, 49, - 14, 2, 8, 5, 25, 7, 0), - RK_COMPOSITE(CLK_RKVDEC_HEVC_CA, "clk_rkvdec_hevc_ca", - gpll_cpll_npll_vpll_p, 49, 6, 2, 0, 5, 25, 8, 0), - RK_COMPNODIV(ACLK_BUS, "aclk_bus", gpll200_gpll150_gpll100_xin24m_p, 50, - 0, 2, 26, 0, 0), - RK_COMPNODIV(PCLK_BUS, "pclk_bus", gpll100_gpll75_cpll50_xin24m_p, 50, - 4, 2, 26, 1, 0), - RK_COMPOSITE(CLK_TSADC_TSEN, "clk_tsadc_tsen", xin24m_gpll100_cpll100_p, - 51, 4, 2, 0, 3, 26, 5, 0), - RK_COMPNOMUX(CLK_TSADC, "clk_tsadc", "clk_tsadc_tsen", 51, 8, 7, 26, - 6, 0), - RK_COMPOSITE(CLK_UART1_SRC, "clk_uart1_src", gpll_cpll_usb480m_p, 52, 8, - 2, 0, 7, 27, 13, 0), - RK_FRACTION(CLK_UART1_FRAC, "clk_uart1_frac", "clk_uart1_src", 53, 27, - 14, 0), - RK_MUX(0, "sclk_uart1_mux", sclk_uart1_p, 52, 12, 2, 0), - RK_COMPOSITE(CLK_UART2_SRC, "clk_uart2_src", gpll_cpll_usb480m_p, 54, 8, - 2, 0, 7, 28, 1, 0), - RK_FRACTION(CLK_UART2_FRAC, "clk_uart2_frac", "clk_uart2_src", 55, 28, - 2, 0), - RK_MUX(0, "sclk_uart2_mux", sclk_uart2_p, 54, 12, 2, 0), - RK_COMPOSITE(CLK_UART3_SRC, "clk_uart3_src", gpll_cpll_usb480m_p, 56, 8, - 2, 0, 7, 28, 5, 0), - RK_FRACTION(CLK_UART3_FRAC, "clk_uart3_frac", "clk_uart3_src", 57, 28, - 6, 0), - RK_MUX(0, "sclk_uart3_mux", sclk_uart3_p, 56, 12, 2, 0), - RK_COMPOSITE(CLK_UART4_SRC, "clk_uart4_src", gpll_cpll_usb480m_p, 58, 8, - 2, 0, 7, 28, 9, 0), - RK_FRACTION(CLK_UART4_FRAC, "clk_uart4_frac", "clk_uart4_src", 59, 28, - 10, 0), - RK_MUX(0, "sclk_uart4_mux", sclk_uart4_p, 58, 12, 2, 0), - RK_COMPOSITE(CLK_UART5_SRC, "clk_uart5_src", gpll_cpll_usb480m_p, 60, 8, - 2, 0, 7, 28, 13, 0), - RK_FRACTION(CLK_UART5_FRAC, "clk_uart5_frac", "clk_uart5_src", 61, 28, - 14, 0), - RK_MUX(0, "sclk_uart5_mux", sclk_uart5_p, 60, 12, 2, 0), - RK_COMPOSITE(CLK_UART6_SRC, "clk_uart6_src", gpll_cpll_usb480m_p, 62, 8, - 2, 0, 7, 29, 1, 0), - RK_FRACTION(CLK_UART6_FRAC, "clk_uart6_frac", "clk_uart6_src", 63, 29, - 2, 0), - RK_MUX(0, "sclk_uart6_mux", sclk_uart6_p, 62, 12, 2, 0), - RK_COMPOSITE(CLK_UART7_SRC, "clk_uart7_src", gpll_cpll_usb480m_p, 64, 8, - 2, 0, 7, 29, 5, 0), - RK_FRACTION(CLK_UART7_FRAC, "clk_uart7_frac", "clk_uart7_src", 65, 29, - 6, 0), - RK_MUX(0, "sclk_uart7_mux", sclk_uart7_p, 64, 12, 2, 0), - RK_COMPOSITE(CLK_UART8_SRC, "clk_uart8_src", gpll_cpll_usb480m_p, 66, 8, - 2, 0, 7, 29, 9, 0), - RK_FRACTION(CLK_UART8_FRAC, "clk_uart8_frac", "clk_uart8_src", 67, 29, - 10, 0), - RK_MUX(0, "sclk_uart8_mux", sclk_uart8_p, 66, 12, 2, 0), - RK_COMPOSITE(CLK_UART9_SRC, "clk_uart9_src", gpll_cpll_usb480m_p, 68, 8, - 2, 0, 7, 29, 13, 0), - RK_FRACTION(CLK_UART9_FRAC, "clk_uart9_frac", "clk_uart9_src", 69, 29, - 14, 0), - RK_MUX(0, "sclk_uart9_mux", sclk_uart9_p, 68, 12, 2, 0), - RK_COMPOSITE(CLK_CAN0, "clk_can0", gpll_cpll_p, 70, 7, 1, 0, 5, 27, - 6, 0), - RK_COMPOSITE(CLK_CAN1, "clk_can1", gpll_cpll_p, 70, 15, 1, 8, 5, 27, - 8, 0), - RK_COMPOSITE(CLK_CAN2, "clk_can2", gpll_cpll_p, 71, 7, 1, 0, 5, 27, - 10, 0), - RK_COMPNODIV(CLK_I2C, "clk_i2c", clk_i2c_p, 71, 8, 2, 32, 10, 0), - RK_COMPNODIV(CLK_SPI0, "clk_spi0", gpll200_xin24m_cpll100_p, 72, 0, 1, - 30, 11, 0), - RK_COMPNODIV(CLK_SPI1, "clk_spi1", gpll200_xin24m_cpll100_p, 72, 2, 1, - 30, 13, 0), - RK_COMPNODIV(CLK_SPI2, "clk_spi2", gpll200_xin24m_cpll100_p, 72, 4, 1, - 30, 15, 0), - RK_COMPNODIV(CLK_SPI3, "clk_spi3", gpll200_xin24m_cpll100_p, 72, 6, 1, - 31, 1, 0), - RK_COMPNODIV(CLK_PWM1, "clk_pwm1", gpll100_xin24m_cpll100_p, 72, 8, 1, - 31, 11, 0), - RK_COMPNODIV(CLK_PWM2, "clk_pwm2", gpll100_xin24m_cpll100_p, 72, 10, 1, - 31, 14, 0), - RK_COMPNODIV(CLK_PWM3, "clk_pwm3", gpll100_xin24m_cpll100_p, 72, 12, 1, - 32, 1, 0), - RK_COMPNODIV(DBCLK_GPIO, "dbclk_gpio", xin24m_32k_p, 72, 14, 1, 32, - 11, 0), - RK_COMPNODIV(ACLK_TOP_HIGH, "aclk_top_high", - cpll500_gpll400_gpll300_xin24m_p, 73, 0, 2, 33, 0, 0), - RK_COMPNODIV(ACLK_TOP_LOW, "aclk_top_low", - gpll400_gpll300_gpll200_xin24m_p, 73, 4, 2, 33, 1, 0), - RK_COMPNODIV(HCLK_TOP, "hclk_top", gpll150_gpll100_gpll75_xin24m_p, 73, - 8, 2, 33, 2, 0), - RK_COMPNODIV(PCLK_TOP, "pclk_top", gpll100_gpll75_cpll50_xin24m_p, 73, - 12, 2, 33, 3, 0), - RK_COMPNODIV(CLK_OPTC_ARB, "clk_optc_arb", xin24m_cpll100_p, 73, 15, 1, - 33, 9, 0), + + /* CRU_CLKSEL_CON00 */ + /* 0:4 clk_core0_div DIV */ + /* 5 Reserved */ + /* 6 clk_core_i_sel MUX */ + /* 7 clk_core_ndft_sel MUX */ + /* 8:12 clk_core1_div DIV */ + /* 13:14 Reserved */ + /* 15 clk_core_ndft_mux_sel MUX */ + + /* CRU_CLKSEL_CON01 */ + /* 0:4 clk_core2_div DIV */ + /* 5:7 Reserved */ + /* 8:12 clk_core3_div DIV */ + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON02 */ + COMP(0, "sclk_core_src_c", apll_gpll_npll_p, 0, 2, 0, 4, 8, 2), + /* 4:7 Reserved */ + /* 10:14 Reserved */ + MUX(0, "sclk_core_pre_sel", sclk_core_pre_p, 0, 2, 15, 1), + + /* CRU_CLKSEL_CON03 */ + CDIV(0, "atclk_core_div", "armclk", 0, 3, 0, 5), + /* 5:7 Reserved */ + CDIV(0, "gicclk_core_div", "armclk", 0, 3, 8, 5), + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON04 */ + CDIV(0, "pclk_core_pre_div", "armclk", 0, 4, 0, 5), + /* 5:7 Reserved */ + CDIV(0, "periphclk_core_pre_div", "armclk", 0, 4, 8, 5), + /* 13:15 Reserved */ + + /* CRU_CLKSEL_CON05 */ + /* 0:7 Reserved */ + /* 8:12 aclk_core_ndft_div DIV */ + /* 13 Reserved */ + /* 14:15 aclk_core_biu2bus_sel MUX */ + + /* CRU_CLKSEL_CON06 */ + COMP(0, "clk_gpu_pre_c", mpll_gpll_cpll_npll_p, 0, 6, 0, 4, 6, 2), + /* 4:5 Reserved */ + CDIV(0, "aclk_gpu_pre_div", "clk_gpu_pre_c", 0, 6, 8, 2), + /* 10 Reserved */ + MUX(CLK_GPU_PRE_MUX, "clk_gpu_pre_mux_sel", clk_gpu_pre_mux_p, 0, 6, 11, 1), + CDIV(0, "pclk_gpu_pre_div", "clk_gpu_pre_c", 0, 6, 12, 4), + + /* CRU_CLKSEL_CON07 */ + COMP(0, "clk_npu_src_c", npll_gpll_p, 0, 7, 0, 4, 6, 1), + COMP(0, "clk_npu_np5_c", npll_gpll_p, 0, 7, 4, 2, 7, 1), + MUX(CLK_NPU_PRE_NDFT, "clk_npu_pre_ndft", clk_npu_pre_ndft_p, 0, 7, + 8, 1), + /* 9:14 Reserved */ + MUX(CLK_NPU, "clk_npu", clk_npu_p, 0, 7, 15, 1), + + /* CRU_CLKSEL_CON08 */ + CDIV(0, "hclk_npu_pre_div", "clk_npu", 0, 8, 0, 4), + CDIV(0, "pclk_npu_pre_div", "clk_npu", 0, 8, 4, 4), + /* 8:15 Reserved */ + + /* CRU_CLKSEL_CON09 */ + COMP(0, "clk_ddrphy1x_src_c", dpll_gpll_cpll_p, 0, 9, 0, 5, 6, 2), + /* 5 Reserved */ + /* 8:14 Reserved */ + MUX(CLK_DDR1X, "clk_ddr1x", clk_ddr1x_p, RK_CLK_COMPOSITE_GRF, 9, + 15, 1), + + /* CRU_CLKSEL_CON10 */ + CDIV(0, "clk_msch_div", "clk_ddr1x", 0, 10, 0, 2), + MUX(0, "aclk_perimid_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 10, 4, 2), + MUX(0, "hclk_perimid_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 10, 6, 2), + MUX(0, "aclk_gic_audio_sel", gpll200_gpll150_gpll100_xin24m_p, 0, 10, 8, 2), + MUX(0, "hclk_gic_audio_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 10, 10, 2), + MUX(0, "dclk_sdmmc_buffer_sel", gpll100_gpll75_gpll50_p, 0, 10, 12, 2), + /* 14:15 Reserved */ + + /* CRU_CLKSEL_CON11 */ + COMP(0, "clk_i2s0_8ch_tx_src_c", gpll_cpll_npll_p, 0, 11, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S0_8CH_TX, "clk_i2s0_8ch_tx", clk_i2s0_8ch_tx_p, 0, 11, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s0_mclkout_tx_sel", i2s0_mclkout_tx_p, 0, 11, 15, 1), + + /* CRU_CLKSEL_CON12 */ + FRACT(0, "clk_i2s0_8ch_tx_frac_div", "clk_i2s0_8ch_tx_src", 0, 12), + + /* CRU_CLKSEL_CON13 */ + COMP(0, "clk_i2s0_8ch_rx_src_c", gpll_cpll_npll_p, 0, 13, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S0_8CH_RX, "clk_i2s0_8ch_rx", clk_i2s0_8ch_rx_p, 0, 13, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s0_mclkout_rx_sel", i2s0_mclkout_rx_p, 0, 13, 15, 1), + + /* CRU_CLKSEL_CON14 */ + FRACT(0, "clk_i2s0_8ch_rx_frac_div", "clk_i2s0_8ch_rx_src", 0, 14), + + /* CRU_CLKSEL_CON15 */ + COMP(0, "clk_i2s1_8ch_tx_src_c", gpll_cpll_npll_p, 0, 15, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S1_8CH_TX, "clk_i2s1_8ch_tx", clk_i2s1_8ch_tx_p, 0, 15, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s1_mclkout_tx_sel", i2s1_mclkout_tx_p, 0, 11, 15, 1), + + /* CRU_CLKSEL_CON16 */ + FRACT(0, "clk_i2s1_8ch_tx_frac_div", "clk_i2s1_8ch_tx_src", 0, 16), + + /* CRU_CLKSEL_CON17 */ + COMP(0, "clk_i2s1_8ch_rx_src_c", gpll_cpll_npll_p, 0, 17, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S1_8CH_RX, "clk_i2s1_8ch_rx", clk_i2s1_8ch_rx_p, 0, 17, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s1_mclkout_rx_sel", i2s1_mclkout_rx_p, 0, 17, 15, 1), + + /* CRU_CLKSEL_CON18 */ + FRACT(0, "clk_i2s1_8ch_rx_frac_div", "clk_i2s1_8ch_rx_src", 0, 18), + + /* CRU_CLKSEL_CON19 */ + COMP(0, "clk_i2s2_2ch_src_c", gpll_cpll_npll_p, 0, 19, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S2_2CH, "clk_i2s2_2ch", clk_i2s2_2ch_p, 0, 19, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s2_mclkout_sel", i2s2_mclkout_p, 0, 19, 15, 1), + + /* CRU_CLKSEL_CON20 */ + FRACT(0, "clk_i2s2_2ch_frac_div", "clk_i2s2_2ch_src", 0, 20), + + /* CRU_CLKSEL_CON21 */ + COMP(0, "clk_i2s3_2ch_tx_src_c", gpll_cpll_npll_p, 0, 21, 0, 7, 8, 2), + /* 7 Reserved */ + MUX(CLK_I2S3_2CH_TX, "clk_i2s3_2ch_tx", clk_i2s3_2ch_tx_p, 0, 21, 10, + 2), + /* 12:14 Reserved */ + MUX(0, "i2s3_mclkout_tx_sel", i2s3_mclkout_tx_p, 0, 21, 15, 1), + + /* CRU_CLKSEL_CON22 */ + FRACT(0, "clk_i2s3_2ch_tx_frac_div", "clk_i2s3_2ch_tx_src", 0, 22), + + /* CRU_CLKSEL_CON23 */ + COMP(0, "mclk_spdif_8ch_src_c", cpll_gpll_p, 0, 23, 0, 7, 14, 1), + /* 7 Reserved */ + MUX(0, "mclk_pdm_sel", mclk_pdm_p, 0, 23, 8, 2), + MUX(0, "clk_acdcdig_i2c_sel", clk_i2c_p, 0, 23, 10, 2), + /* 12:13 Reserved */ + MUX(MCLK_SPDIF_8CH, "mclk_spdif_8ch", mclk_spdif_8ch_p, 0, 23, 15, + 1), + + /* CRU_CLKSEL_CON24 */ + FRACT(0, "mclk_spdif_8ch_frac_div", "mclk_spdif_8ch_src", 0, 24), + + /* CRU_CLKSEL_CON25 */ + COMP(0, "sclk_audpwm_src_c", gpll_cpll_p, 0, 25, 0, 5, 14, 1), + /* 6:13 Reserved */ + MUX(SCLK_AUDPWM, "sck_audpwm_sel", sclk_audpwm_p, 0, 25, 15, 1), + + /* CRU_CLKSEL_CON26 */ + FRACT(0, "sclk_audpwm_frac_frac", "sclk_audpwm_src", 0, 26), + + /* CRU_CLKSEL_CON27 */ + MUX(0, "aclk_secure_flash_sel", gpll200_gpll150_gpll100_xin24m_p, 0, 27, 0, 2), + MUX(0, "hclk_secure_flash_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 27, 2, 2), + MUX(0, "clk_crypto_ns_core_sel", gpll200_gpll150_gpll100_p, 0, 27, 4, 2), + MUX(0, "clk_crypto_ns_pka_sel", gpll300_gpll200_gpll100_p, 0, 27, 6, 2), + /* 8:15 Reserved */ + + /* CRU_CLKSEL_CON28 */ + MUX(0, "nclk_nandc_sel", clk_nandc_p, 0, 28, 0, 2), + /* 2:3 Reserved */ + MUX(0, "sclk_sfc_sel", sclk_sfc_p, 0, 28, 4, 3), + /* 7 Reserved */ + MUX(0, "bclk_emmc_sel", gpll200_gpll150_cpll125_p, 0, 28, 8, 2), + /* 10:11 Reserved */ + MUX(0, "cclk_emmc_sel", cclk_emmc_p, 0, 28, 12, 3), + /* 15 Reserved */ + + /* CRU_CLKSEL_CON29 */ + MUX(0, "aclk_pipe_sel", aclk_pipe_p, 0, 29, 0, 2), + /* 2:3 Reserved */ + CDIV(0, "pclk_pipe_div", "aclk_pipe", 0, 29, 4, 4), + MUX(0, "clk_usb3otg0_suspend_sel", xin24m_32k_p, 0, 29, 8, 1), + MUX(0, "clk_usb3otg1_suspend_sel", xin24m_32k_p, 0, 29, 9, 1), + /* 10:12 Reserved */ + MUX(0, "clk_xpcs_eee_sel", gpll200_cpll125_p, 0, 29, 13, 1), + /* 14:15 Reserved */ + + /* CRU_CLKSEL_CON30 */ + MUX(0, "aclk_php_sel", gpll300_gpll200_gpll100_xin24m_p, 0, 30, 0, 2), + MUX(0, "hclk_php_sel", gpll150_gpll100_gpll75_xin24m_p, 0, 30, 2, 2), + CDIV(0, "pclk_php_div", "aclk_php", 0, 30, 4, 4), + MUX(0, "clk_sdmmc0_sel", clk_sdmmc_p, 0, 30, 8, 3), + /* 11 Reserved */ + MUX(0, "clk_sdmmc1_sel", clk_sdmmc_p, 0, 30, 12, 3), + /* 15 Reserved */ + + /* CRU_CLKSEL_CON31 */ *** 1111 LINES SKIPPED *** From nobody Wed Oct 18 14:34:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJc28m2z4x6M0; Wed, 18 Oct 2023 14:34: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 4S9YJc1gV9z3Tk3; Wed, 18 Oct 2023 14:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2M2uKKXuZUhYQChBPP3kb2i8lGXU3I39zJoZbe0vWxc=; b=rTkhCfLPT9ieWW04KmMCjGd7jqgPNGb3npr7CQOKLYjsWervk8jNy6+6x4qKtcWTANd7mc e/HJcRE4VZnpdED/lA1FJSAqPGZKeIl4Jkctqmi/7ARgqO7uHPOSFdl/Vb8VFRQ3HMmKSJ 53AVnOARa5GcPwEUfHiFRmIdhQKsbCovGXUPnf1eDWbOGBLRaN9vVQE5FIGuwX+ygrxFt2 KoKPwDYxrsVBRfOuBF36upoVMv0FhbIZ2xZ/FJUlWJJ55ZHx7pn8ooNSUNE1OJtJP/2EVd N1gWduWOkuekVvthLZxKxI3zwjraIdZaFHh/lmp/O9UuiD2QDadMi+03ZCw8pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639664; a=rsa-sha256; cv=none; b=lmkEdAeSSVutXXQSeW7SRfUuWcryGoSgo0v7tW/RMkM782D+sZsmlcFz1C2AXYKztwq0GJ OCNjXlyGSeUn9LbSAmYSFh4uQoOo0FhculZKo2x6gu2Fo2QiC+iQBvc1k+pMRhbnzAXjFf hftH7h2NBAIJWtyELymWu4Ov2pRF3X5WVXovdonSVjhYx4VkXQ/qX4PwYluxYsAhzsOoLL HQJ6j+9QrtyqXlpwr8gsjH56DSjaLcdNeeSIb4u9pUP0K7RbuOYQK22gEkvHlMvLq8oNPo J11w+qKCQ7WucOvTkC7vtC9zN12cd6RaZKANtAFkuz+HIXihLBvwnt6zwMjlZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2M2uKKXuZUhYQChBPP3kb2i8lGXU3I39zJoZbe0vWxc=; b=gx+pNngH8tVsoKrw/PWOahwuWQFJ5DeixpXDGH6dNCIXa38VfEHj1T4vXPxsbuyikXXP7z kGvIyi2o9bfaIpiBQJ6OQRexEhpPo4Teic58A2+gJMSY1bXCjv7MXldRS27AuEvhFvbr18 98HL1vzW5Y2+ejvCX342oHrCmEbvYxU5YfT8OoK9o8ODvwPD2aIbSZFL4knMA0VbYREgVe X+oWoo6Xat0gmiVvJc7wJ29ge5hzsCubeC+YOt7K9OrJ1FP8VwgmqSAVAJPhUt7QHcJf/x vYcq5chB470t4/w/M0Vi/0MHTCQmk/qGo+ty9N/oS1fA/qwDIF6d7BiNW8EdnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJc0ZNzz18vK; Wed, 18 Oct 2023 14:34: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 39IEYOgo092508; Wed, 18 Oct 2023 14:34:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYO69092505; Wed, 18 Oct 2023 14:34:24 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:24 GMT Message-Id: <202310181434.39IEYO69092505@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 14652ce3f542 - stable/14 - arm64: rockchip: rk3328_cru: Use GATE macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14652ce3f5427daffd5dc4db910db95325d5e06f Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=14652ce3f5427daffd5dc4db910db95325d5e06f commit 14652ce3f5427daffd5dc4db910db95325d5e06f Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:55:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:29 +0000 arm64: rockchip: rk3328_cru: Use GATE macro It make it easier to read the code and the register number (cherry picked from commit 7c6c426f29831799d1eae1ca5d4036a219b52fca) --- sys/arm64/rockchip/clk/rk3328_cru.c | 389 ++++++++++++++++++------------------ 1 file changed, 195 insertions(+), 194 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index 1f48ce6c23a2..cde5bb3f55b6 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -46,6 +46,7 @@ #include #define CRU_CLKSEL_CON(x) (0x100 + (x) * 0x4) +#define CRU_CLKGATE_CON(x) (0x200 + (x) * 0x4) /* Registers */ #define RK3328_GRF_SOC_CON4 0x410 @@ -250,100 +251,100 @@ static struct rk_cru_gate rk3328_gates[] = { /* CRU_CLKGATE_CON0 */ - CRU_GATE(0, "core_apll_clk", "apll", 0x200, 0) - CRU_GATE(0, "core_dpll_clk", "dpll", 0x200, 1) - CRU_GATE(0, "core_gpll_clk", "gpll", 0x200, 2) + GATE(0, "core_apll_clk", "apll", 0, 0), + GATE(0, "core_dpll_clk", "dpll", 0, 1), + GATE(0, "core_gpll_clk", "gpll", 0, 2), /* Bit 3 bus_src_clk_en */ /* Bit 4 clk_ddrphy_src_en */ /* Bit 5 clk_ddrpd_src_en */ /* Bit 6 clk_ddrmon_en */ /* Bit 7-8 unused */ /* Bit 9 testclk_en */ - CRU_GATE(SCLK_WIFI, "sclk_wifi", "sclk_wifi_c", 0x200, 10) - CRU_GATE(SCLK_RTC32K, "clk_rtc32k", "clk_rtc32k_c", 0x200, 11) - CRU_GATE(0, "core_npll_clk", "npll", 0x200, 12) + GATE(SCLK_WIFI, "sclk_wifi", "sclk_wifi_c", 0, 10), + GATE(SCLK_RTC32K, "clk_rtc32k", "clk_rtc32k_c", 0, 11), + GATE(0, "core_npll_clk", "npll", 0, 12), /* Bit 13-15 unused */ /* CRU_CLKGATE_CON1 */ /* Bit 0 unused */ - CRU_GATE(0, "clk_i2s0_div", "clk_i2s0_div_c", 0x204, 1) - CRU_GATE(0, "clk_i2s0_frac", "clk_i2s0_frac_f", 0x204, 2) - CRU_GATE(SCLK_I2S0, "clk_i2s0", "clk_i2s0_mux", 0x204, 3) - CRU_GATE(0, "clk_i2s1_div", "clk_i2s1_div_c", 0x204, 4) - CRU_GATE(0, "clk_i2s1_frac", "clk_i2s1_frac_f", 0x204, 5) - CRU_GATE(SCLK_I2S1, "clk_i2s1", "clk_i2s1_mux", 0x204, 6) - CRU_GATE(0, "clk_i2s1_out", "clk_i2s1_mux", 0x204, 7) - CRU_GATE(0, "clk_i2s2_div", "clk_i2s2_div_c", 0x204, 8) - CRU_GATE(0, "clk_i2s2_frac", "clk_i2s2_frac_f", 0x204, 9) - CRU_GATE(SCLK_I2S2, "clk_i2s2", "clk_i2s2_mux", 0x204, 10) - CRU_GATE(0, "clk_i2s2_out", "clk_i2s2_mux", 0x204, 11) - CRU_GATE(0, "clk_spdif_div", "clk_spdif_div_c", 0x204, 12) - CRU_GATE(0, "clk_spdif_frac", "clk_spdif_frac_f", 0x204, 13) - CRU_GATE(0, "clk_uart0_div", "clk_uart0_div_c", 0x204, 14) - CRU_GATE(0, "clk_uart0_frac", "clk_uart0_frac_f", 0x204, 15) + GATE(0, "clk_i2s0_div", "clk_i2s0_div_c", 1, 1), + GATE(0, "clk_i2s0_frac", "clk_i2s0_frac_f", 1, 2), + GATE(SCLK_I2S0, "clk_i2s0", "clk_i2s0_mux", 1, 3), + GATE(0, "clk_i2s1_div", "clk_i2s1_div_c", 1, 4), + GATE(0, "clk_i2s1_frac", "clk_i2s1_frac_f", 1, 5), + GATE(SCLK_I2S1, "clk_i2s1", "clk_i2s1_mux", 1, 6), + GATE(0, "clk_i2s1_out", "clk_i2s1_mux", 1, 7), + GATE(0, "clk_i2s2_div", "clk_i2s2_div_c", 1, 8), + GATE(0, "clk_i2s2_frac", "clk_i2s2_frac_f", 1, 9), + GATE(SCLK_I2S2, "clk_i2s2", "clk_i2s2_mux", 1, 10), + GATE(0, "clk_i2s2_out", "clk_i2s2_mux", 1, 11), + GATE(0, "clk_spdif_div", "clk_spdif_div_c", 1, 12), + GATE(0, "clk_spdif_frac", "clk_spdif_frac_f", 1, 13), + GATE(0, "clk_uart0_div", "clk_uart0_div_c", 1, 14), + GATE(0, "clk_uart0_frac", "clk_uart0_frac_f", 1, 15), /* CRU_CLKGATE_CON2 */ - CRU_GATE(0, "clk_uart1_div", "clk_uart1_div_c", 0x208, 0) - CRU_GATE(0, "clk_uart1_frac", "clk_uart1_frac_f", 0x208, 1) - CRU_GATE(0, "clk_uart2_div", "clk_uart2_div_c", 0x208, 2) - CRU_GATE(0, "clk_uart2_frac", "clk_uart2_frac_f", 0x208, 3) - CRU_GATE(SCLK_CRYPTO, "clk_crypto", "clk_crypto_c", 0x208, 4) - CRU_GATE(SCLK_TSP, "clk_tsp", "clk_tsp_c", 0x208, 5) - CRU_GATE(SCLK_TSADC, "clk_tsadc_src", "clk_tsadc_c", 0x208, 6) - CRU_GATE(SCLK_SPI, "clk_spi", "clk_spi_c", 0x208, 7) - CRU_GATE(SCLK_PWM, "clk_pwm", "clk_pwm_c", 0x208, 8) - CRU_GATE(SCLK_I2C0, "clk_i2c0_src", "clk_i2c0_c", 0x208, 9) - CRU_GATE(SCLK_I2C1, "clk_i2c1_src", "clk_i2c1_c", 0x208, 10) - CRU_GATE(SCLK_I2C2, "clk_i2c2_src", "clk_i2c2_c", 0x208, 11) - CRU_GATE(SCLK_I2C3, "clk_i2c3_src", "clk_i2c3_c", 0x208, 12) - CRU_GATE(SCLK_EFUSE, "clk_efuse", "clk_efuse_c", 0x208, 13) - CRU_GATE(SCLK_SARADC, "clk_saradc", "clk_saradc_c", 0x208, 14) - CRU_GATE(SCLK_PDM, "clk_pdm", "clk_pdm_c", 0x208, 15) + GATE(0, "clk_uart1_div", "clk_uart1_div_c", 2, 0), + GATE(0, "clk_uart1_frac", "clk_uart1_frac_f", 2, 1), + GATE(0, "clk_uart2_div", "clk_uart2_div_c", 2, 2), + GATE(0, "clk_uart2_frac", "clk_uart2_frac_f", 2, 3), + GATE(SCLK_CRYPTO, "clk_crypto", "clk_crypto_c", 2, 4), + GATE(SCLK_TSP, "clk_tsp", "clk_tsp_c", 2, 5), + GATE(SCLK_TSADC, "clk_tsadc_src", "clk_tsadc_c", 2, 6), + GATE(SCLK_SPI, "clk_spi", "clk_spi_c", 2, 7), + GATE(SCLK_PWM, "clk_pwm", "clk_pwm_c", 2, 8), + GATE(SCLK_I2C0, "clk_i2c0_src", "clk_i2c0_c", 2, 9), + GATE(SCLK_I2C1, "clk_i2c1_src", "clk_i2c1_c", 2, 10), + GATE(SCLK_I2C2, "clk_i2c2_src", "clk_i2c2_c", 2, 11), + GATE(SCLK_I2C3, "clk_i2c3_src", "clk_i2c3_c", 2, 12), + GATE(SCLK_EFUSE, "clk_efuse", "clk_efuse_c", 2, 13), + GATE(SCLK_SARADC, "clk_saradc", "clk_saradc_c", 2, 14), + GATE(SCLK_PDM, "clk_pdm", "clk_pdm_c", 2, 15), /* CRU_CLKGATE_CON3 */ - CRU_GATE(SCLK_MAC2PHY_SRC, "clk_mac2phy_src", "clk_mac2phy_src_c", 0x20c, 0) - CRU_GATE(SCLK_MAC2IO_SRC, "clk_mac2io_src", "clk_mac2io_src_c", 0x20c, 1) - CRU_GATE(ACLK_GMAC, "aclk_gmac", "aclk_gmac_c", 0x20c, 2) + GATE(SCLK_MAC2PHY_SRC, "clk_mac2phy_src", "clk_mac2phy_src_c", 3, 0), + GATE(SCLK_MAC2IO_SRC, "clk_mac2io_src", "clk_mac2io_src_c", 3, 1), + GATE(ACLK_GMAC, "aclk_gmac", "aclk_gmac_c", 3, 2), /* Bit 3 gmac_gpll_src_en Unused ? */ /* Bit 4 gmac_vpll_src_en Unused ? */ - CRU_GATE(SCLK_MAC2IO_OUT, "clk_mac2io_out", "clk_mac2io_out_c", 0x20c, 5) + GATE(SCLK_MAC2IO_OUT, "clk_mac2io_out", "clk_mac2io_out_c", 3, 5), /* Bit 6-7 unused */ - CRU_GATE(SCLK_OTP, "clk_otp", "clk_otp_c", 0x20c, 8) + GATE(SCLK_OTP, "clk_otp", "clk_otp_c", 3, 8), /* Bit 9-15 unused */ /* CRU_CLKGATE_CON4 */ - CRU_GATE(0, "periph_gclk_src", "gpll", 0x210, 0) - CRU_GATE(0, "periph_cclk_src", "cpll", 0x210, 1) - CRU_GATE(0, "hdmiphy_peri", "hdmiphy", 0x210, 2) - CRU_GATE(SCLK_SDMMC, "clk_mmc0_src", "clk_sdmmc_c", 0x210, 3) - CRU_GATE(SCLK_SDIO, "clk_sdio_src", "clk_sdio_c", 0x210, 4) - CRU_GATE(SCLK_EMMC, "clk_emmc_src", "clk_emmc_c", 0x210, 5) - CRU_GATE(SCLK_REF_USB3OTG_SRC, "clk_ref_usb3otg_src", "clk_ref_usb3otg_src_c", 0x210, 6) - CRU_GATE(SCLK_USB3OTG_REF, "clk_usb3_otg0_ref", "xin24m", 0x210, 7) - CRU_GATE(SCLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", "clk_usb3otg_suspend_c", 0x210, 8) + GATE(0, "periph_gclk_src", "gpll", 4, 0), + GATE(0, "periph_cclk_src", "cpll", 4, 1), + GATE(0, "hdmiphy_peri", "hdmiphy", 4, 2), + GATE(SCLK_SDMMC, "clk_mmc0_src", "clk_sdmmc_c", 4, 3), + GATE(SCLK_SDIO, "clk_sdio_src", "clk_sdio_c", 4, 4), + GATE(SCLK_EMMC, "clk_emmc_src", "clk_emmc_c", 4, 5), + GATE(SCLK_REF_USB3OTG_SRC, "clk_ref_usb3otg_src", "clk_ref_usb3otg_src_c", 4, 6), + GATE(SCLK_USB3OTG_REF, "clk_usb3_otg0_ref", "xin24m", 4, 7), + GATE(SCLK_USB3OTG_SUSPEND, "clk_usb3otg_suspend", "clk_usb3otg_suspend_c", 4, 8), /* Bit 9 clk_usb3phy_ref_25m_en */ - CRU_GATE(SCLK_SDMMC_EXT, "clk_sdmmc_ext", "clk_sdmmc_ext_c", 0x210, 10) + GATE(SCLK_SDMMC_EXT, "clk_sdmmc_ext", "clk_sdmmc_ext_c", 4, 10), /* Bit 11-15 unused */ /* CRU_CLKGATE_CON5 */ - CRU_GATE(ACLK_RGA_PRE, "aclk_rga_pre", "aclk_rga_pre_c", 0x214, 0) - CRU_GATE(SCLK_RGA, "sclk_rga", "sclk_rga_c", 0x214, 0) - CRU_GATE(ACLK_VIO_PRE, "aclk_vio_pre", "aclk_vio_pre_c", 0x214, 2) - CRU_GATE(SCLK_CIF_OUT, "clk_cif_src", "clk_cif_src_c", 0x214, 3) - CRU_GATE(SCLK_HDMI_SFC, "clk_hdmi_sfc", "xin24m", 0x214, 4) - CRU_GATE(ACLK_VOP_PRE, "aclk_vop_pre", "aclk_vop_pre_c", 0x214, 5) - CRU_GATE(DCLK_LCDC_SRC, "vop_dclk_src", "vop_dclk_src_c", 0x214, 6) + GATE(ACLK_RGA_PRE, "aclk_rga_pre", "aclk_rga_pre_c", 5, 0), + GATE(SCLK_RGA, "sclk_rga", "sclk_rga_c", 5, 0), + GATE(ACLK_VIO_PRE, "aclk_vio_pre", "aclk_vio_pre_c", 5, 2), + GATE(SCLK_CIF_OUT, "clk_cif_src", "clk_cif_src_c", 5, 3), + GATE(SCLK_HDMI_SFC, "clk_hdmi_sfc", "xin24m", 5, 4), + GATE(ACLK_VOP_PRE, "aclk_vop_pre", "aclk_vop_pre_c", 5, 5), + GATE(DCLK_LCDC_SRC, "vop_dclk_src", "vop_dclk_src_c", 5, 6), /* Bit 7-15 unused */ /* CRU_CLKGATE_CON6 */ - CRU_GATE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", "aclk_rkvdec_c", 0x218, 0) - CRU_GATE(SCLK_VDEC_CABAC, "sclk_cabac", "sclk_cabac_c", 0x218, 1) - CRU_GATE(SCLK_VDEC_CORE, "sclk_vdec_core", "sclk_vdec_core_c", 0x218, 2) - CRU_GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_rkvenc_c", 0x218, 3) - CRU_GATE(SCLK_VENC_CORE, "sclk_venc", "sclk_venc_c", 0x218, 4) - CRU_GATE(ACLK_VPU_PRE, "aclk_vpu_pre", "aclk_vpu_pre_c", 0x218, 5) - CRU_GATE(0, "aclk_gpu_pre", "aclk_gpu_pre_c", 0x218, 6) - CRU_GATE(SCLK_VENC_DSP, "sclk_venc_dsp", "sclk_venc_dsp_c", 0x218, 7) + GATE(ACLK_RKVDEC_PRE, "aclk_rkvdec_pre", "aclk_rkvdec_c", 6, 0), + GATE(SCLK_VDEC_CABAC, "sclk_cabac", "sclk_cabac_c", 6, 1), + GATE(SCLK_VDEC_CORE, "sclk_vdec_core", "sclk_vdec_core_c", 6, 2), + GATE(ACLK_RKVENC, "aclk_rkvenc", "aclk_rkvenc_c", 6, 3), + GATE(SCLK_VENC_CORE, "sclk_venc", "sclk_venc_c", 6, 4), + GATE(ACLK_VPU_PRE, "aclk_vpu_pre", "aclk_vpu_pre_c", 6, 5), + GATE(0, "aclk_gpu_pre", "aclk_gpu_pre_c", 6, 6), + GATE(SCLK_VENC_DSP, "sclk_venc_dsp", "sclk_venc_dsp_c", 6, 7), /* Bit 8-15 unused */ /* CRU_CLKGATE_CON7 */ @@ -355,42 +356,42 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 5-15 unused */ /* CRU_CLKGATE_CON8 */ - CRU_GATE(ACLK_BUS_PRE, "aclk_bus_pre", "aclk_bus_pre_c", 0x220, 0) - CRU_GATE(HCLK_BUS_PRE, "hclk_bus_pre", "hclk_bus_pre_c", 0x220, 1) - CRU_GATE(PCLK_BUS_PRE, "pclk_bus_pre", "pclk_bus_pre_c", 0x220, 2) - CRU_GATE(0, "pclk_bus", "pclk_bus_pre", 0x220, 3) - CRU_GATE(0, "pclk_phy", "pclk_bus_pre", 0x220, 4) - CRU_GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 0x220, 5) - CRU_GATE(SCLK_TIMER1, "sclk_timer1", "xin24m", 0x220, 6) - CRU_GATE(SCLK_TIMER2, "sclk_timer2", "xin24m", 0x220, 7) - CRU_GATE(SCLK_TIMER3, "sclk_timer3", "xin24m", 0x220, 8) - CRU_GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 0x220, 9) - CRU_GATE(SCLK_TIMER5, "sclk_timer5", "xin24m", 0x220, 10) + GATE(ACLK_BUS_PRE, "aclk_bus_pre", "aclk_bus_pre_c", 8, 0), + GATE(HCLK_BUS_PRE, "hclk_bus_pre", "hclk_bus_pre_c", 8, 1), + GATE(PCLK_BUS_PRE, "pclk_bus_pre", "pclk_bus_pre_c", 8, 2), + GATE(0, "pclk_bus", "pclk_bus_pre", 8, 3), + GATE(0, "pclk_phy", "pclk_bus_pre", 8, 4), + GATE(SCLK_TIMER0, "sclk_timer0", "xin24m", 8, 5), + GATE(SCLK_TIMER1, "sclk_timer1", "xin24m", 8, 6), + GATE(SCLK_TIMER2, "sclk_timer2", "xin24m", 8, 7), + GATE(SCLK_TIMER3, "sclk_timer3", "xin24m", 8, 8), + GATE(SCLK_TIMER4, "sclk_timer4", "xin24m", 8, 9), + GATE(SCLK_TIMER5, "sclk_timer5", "xin24m", 8, 10), /* Bit 11-15 unused */ /* CRU_CLKGATE_CON9 */ - CRU_GATE(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 0x224, 0) - CRU_GATE(SCLK_MAC2PHY_RXTX, "clk_gmac2phy_rx", "clk_mac2phy", 0x224, 1) - CRU_GATE(SCLK_MAC2PHY_OUT, "clk_mac2phy_out", "clk_mac2phy_out_c", 0x224, 2) - CRU_GATE(SCLK_MAC2PHY_REF, "clk_gmac2phy_ref", "clk_mac2phy", 0x224, 3) - CRU_GATE(SCLK_MAC2IO_RX, "clk_gmac2io_rx", "clk_mac2io", 0x224, 4) - CRU_GATE(SCLK_MAC2IO_TX, "clk_gmac2io_tx", "clk_mac2io", 0x224, 5) - CRU_GATE(SCLK_MAC2IO_REFOUT, "clk_gmac2io_refout", "clk_mac2io", 0x224, 6) - CRU_GATE(SCLK_MAC2IO_REF, "clk_gmac2io_ref", "clk_mac2io", 0x224, 7) + GATE(PCLK_GMAC, "pclk_gmac", "aclk_gmac", 9, 0), + GATE(SCLK_MAC2PHY_RXTX, "clk_gmac2phy_rx", "clk_mac2phy", 9, 1), + GATE(SCLK_MAC2PHY_OUT, "clk_mac2phy_out", "clk_mac2phy_out_c", 9, 2), + GATE(SCLK_MAC2PHY_REF, "clk_gmac2phy_ref", "clk_mac2phy", 9, 3), + GATE(SCLK_MAC2IO_RX, "clk_gmac2io_rx", "clk_mac2io", 9, 4), + GATE(SCLK_MAC2IO_TX, "clk_gmac2io_tx", "clk_mac2io", 9, 5), + GATE(SCLK_MAC2IO_REFOUT, "clk_gmac2io_refout", "clk_mac2io", 9, 6), + GATE(SCLK_MAC2IO_REF, "clk_gmac2io_ref", "clk_mac2io", 9, 7), /* Bit 8-15 unused */ /* CRU_CLKGATE_CON10 */ - CRU_GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 0x228, 0) - CRU_GATE(HCLK_PERI, "hclk_peri", "hclk_peri_c", 0x228, 1) - CRU_GATE(PCLK_PERI, "pclk_peri", "pclk_peri_c", 0x228, 2) + GATE(ACLK_PERI, "aclk_peri", "aclk_peri_pre", 10, 0), + GATE(HCLK_PERI, "hclk_peri", "hclk_peri_c", 10, 1), + GATE(PCLK_PERI, "pclk_peri", "pclk_peri_c", 10, 2), /* Bit 3-15 unused */ /* CRU_CLKGATE_CON11 */ - CRU_GATE(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 0x22C, 0) + GATE(HCLK_RKVDEC_PRE, "hclk_rkvdec_pre", "aclk_rkvdec_pre", 11, 0), /* Bit 1-3 unused */ - CRU_GATE(HCLK_RKVENC, "hclk_rkvenc", "aclk_rkvenc", 0x22C, 4) + GATE(HCLK_RKVENC, "hclk_rkvenc", "aclk_rkvenc", 11, 4), /* Bit 5-7 unused */ - CRU_GATE(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 0x22C, 8) + GATE(HCLK_VPU_PRE, "hclk_vpu_pre", "aclk_vpu_pre", 11, 8), /* Bit 9-15 unused */ /* CRU_CLKGATE_CON12 */ @@ -402,64 +403,64 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 2-15 unused */ /* CRU_CLKGATE_CON14 */ - CRU_GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 0x238, 0) - CRU_GATE(0, "aclk_gpu_niu", "aclk_gpu_pre", 0x238, 1) + GATE(ACLK_GPU, "aclk_gpu", "aclk_gpu_pre", 14, 0), + GATE(0, "aclk_gpu_niu", "aclk_gpu_pre", 14, 1), /* Bit 2-15 unused */ /* CRU_CLKGATE_CON15*/ /* Bit 0 aclk_intmem_en Unused */ /* Bit 1 aclk_dmac_bus_en Unused */ /* Bit 2 hclk_rom_en Unused */ - CRU_GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 0x23C, 3) - CRU_GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 0x23C, 4) - CRU_GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 0x23C, 5) - CRU_GATE(HCLK_SPDIF_8CH, "hclk_spdif_8ch", "hclk_bus_pre", 0x23C, 6) - CRU_GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 0x23C, 7) - CRU_GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 0x23C, 8) - CRU_GATE(0, "pclk_efuse", "pclk_bus", 0x23C, 9) - CRU_GATE(PCLK_I2C0, "pclk_i2c0", "pclk_bus", 0x23C, 10) - CRU_GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_pre", 0x23C, 11) - CRU_GATE(0, "aclk_bus_niu", "aclk_bus_pre", 0x23C, 12) - CRU_GATE(0, "hclk_bus_niu", "hclk_bus_pre", 0x23C, 13) - CRU_GATE(0, "pclk_bus_niu", "pclk_bus_pre", 0x23C, 14) - CRU_GATE(0, "pclk_phy_niu", "pclk_phy", 0x23C, 14) + GATE(HCLK_I2S0_8CH, "hclk_i2s0_8ch", "hclk_bus_pre", 15, 3), + GATE(HCLK_I2S1_8CH, "hclk_i2s1_8ch", "hclk_bus_pre", 15, 4), + GATE(HCLK_I2S2_2CH, "hclk_i2s2_2ch", "hclk_bus_pre", 15, 5), + GATE(HCLK_SPDIF_8CH, "hclk_spdif_8ch", "hclk_bus_pre", 15, 6), + GATE(HCLK_CRYPTO_MST, "hclk_crypto_mst", "hclk_bus_pre", 15, 7), + GATE(HCLK_CRYPTO_SLV, "hclk_crypto_slv", "hclk_bus_pre", 15, 8), + GATE(0, "pclk_efuse", "pclk_bus", 15, 9), + GATE(PCLK_I2C0, "pclk_i2c0", "pclk_bus", 15, 10), + GATE(ACLK_DCF, "aclk_dcf", "aclk_bus_pre", 15, 11), + GATE(0, "aclk_bus_niu", "aclk_bus_pre", 15, 12), + GATE(0, "hclk_bus_niu", "hclk_bus_pre", 15, 13), + GATE(0, "pclk_bus_niu", "pclk_bus_pre", 15, 14), + GATE(0, "pclk_phy_niu", "pclk_phy", 15, 14), /* Bit 15 pclk_phy_niu_en */ /* CRU_CLKGATE_CON16 */ - CRU_GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 0x240, 0) - CRU_GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 0x240, 1) - CRU_GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 0x240, 2) - CRU_GATE(PCLK_TIMER, "pclk_timer0", "pclk_bus", 0x240, 3) - CRU_GATE(0, "pclk_stimer", "pclk_bus", 0x240, 4) - CRU_GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 0x240, 5) - CRU_GATE(PCLK_PWM, "pclk_pwm", "pclk_bus", 0x240, 6) - CRU_GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 0x240, 7) - CRU_GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 0x240, 8) - CRU_GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 0x240, 9) - CRU_GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_bus", 0x240, 10) - CRU_GATE(PCLK_UART0, "pclk_uart0", "pclk_bus", 0x240, 11) - CRU_GATE(PCLK_UART1, "pclk_uart1", "pclk_bus", 0x240, 12) - CRU_GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 0x240, 13) - CRU_GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 0x240, 14) - CRU_GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 0x240, 15) + GATE(PCLK_I2C1, "pclk_i2c1", "pclk_bus", 16, 0), + GATE(PCLK_I2C2, "pclk_i2c2", "pclk_bus", 16, 1), + GATE(PCLK_I2C3, "pclk_i2c3", "pclk_bus", 16, 2), + GATE(PCLK_TIMER, "pclk_timer0", "pclk_bus", 16, 3), + GATE(0, "pclk_stimer", "pclk_bus", 16, 4), + GATE(PCLK_SPI, "pclk_spi", "pclk_bus", 16, 5), + GATE(PCLK_PWM, "pclk_pwm", "pclk_bus", 16, 6), + GATE(PCLK_GPIO0, "pclk_gpio0", "pclk_bus", 16, 7), + GATE(PCLK_GPIO1, "pclk_gpio1", "pclk_bus", 16, 8), + GATE(PCLK_GPIO2, "pclk_gpio2", "pclk_bus", 16, 9), + GATE(PCLK_GPIO3, "pclk_gpio3", "pclk_bus", 16, 10), + GATE(PCLK_UART0, "pclk_uart0", "pclk_bus", 16, 11), + GATE(PCLK_UART1, "pclk_uart1", "pclk_bus", 16, 12), + GATE(PCLK_UART2, "pclk_uart2", "pclk_bus", 16, 13), + GATE(PCLK_TSADC, "pclk_tsadc", "pclk_bus", 16, 14), + GATE(PCLK_DCF, "pclk_dcf", "pclk_bus", 16, 15), /* CRU_CLKGATE_CON17 */ - CRU_GATE(PCLK_GRF, "pclk_grf", "pclk_bus", 0x244, 0) + GATE(PCLK_GRF, "pclk_grf", "pclk_bus", 17, 0), /* Bit 1 unused */ - CRU_GATE(PCLK_USB3_GRF, "pclk_usb3grf", "pclk_phy", 0x244, 2) - CRU_GATE(0, "pclk_ddrphy", "pclk_phy", 0x244, 3) - CRU_GATE(0, "pclk_cru", "pclk_bus", 0x244, 4) - CRU_GATE(PCLK_ACODECPHY, "pclk_acodecphy", "pclk_phy", 0x244, 5) - CRU_GATE(0, "pclk_sgrf", "pclk_bus", 0x244, 6) - CRU_GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_phy", 0x244, 7) - CRU_GATE(0, "pclk_vdacphy", "pclk_bus", 0x244, 8) + GATE(PCLK_USB3_GRF, "pclk_usb3grf", "pclk_phy", 17, 2), + GATE(0, "pclk_ddrphy", "pclk_phy", 17, 3), + GATE(0, "pclk_cru", "pclk_bus", 17, 4), + GATE(PCLK_ACODECPHY, "pclk_acodecphy", "pclk_phy", 17, 5), + GATE(0, "pclk_sgrf", "pclk_bus", 17, 6), + GATE(PCLK_HDMIPHY, "pclk_hdmiphy", "pclk_phy", 17, 7), + GATE(0, "pclk_vdacphy", "pclk_bus", 17, 8), /* Bit 9 unused */ - CRU_GATE(0, "pclk_sim", "pclk_bus", 0x244, 10) - CRU_GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 0x244, 11) - CRU_GATE(ACLK_TSP, "aclk_tsp", "aclk_bus_pre", 0x244, 12) + GATE(0, "pclk_sim", "pclk_bus", 17, 10), + GATE(HCLK_TSP, "hclk_tsp", "hclk_bus_pre", 17, 11), + GATE(ACLK_TSP, "aclk_tsp", "aclk_bus_pre", 17, 12), /* Bit 13 clk_hsadc_0_tsp_en Depend on a gpio clock ? */ - CRU_GATE(PCLK_USB2_GRF, "pclk_usb2grf", "pclk_phy", 0x244, 14) - CRU_GATE(PCLK_SARADC, "pclk_saradc", "pclk_bus", 0x244, 15) + GATE(PCLK_USB2_GRF, "pclk_usb2grf", "pclk_phy", 17, 14), + GATE(PCLK_SARADC, "pclk_saradc", "pclk_bus", 17, 15), /* CRU_CLKGATE_CON18 */ /* Bit 0 unused */ @@ -473,81 +474,81 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 8-15 unused */ /* CRU_CLKGATE_CON19 */ - CRU_GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 0x24C, 0) - CRU_GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 0x24C, 1) - CRU_GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 0x24C, 2) + GATE(HCLK_SDMMC, "hclk_sdmmc", "hclk_peri", 19, 0), + GATE(HCLK_SDIO, "hclk_sdio", "hclk_peri", 19, 1), + GATE(HCLK_EMMC, "hclk_emmc", "hclk_peri", 19, 2), /* Bit 3-5 unused */ - CRU_GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 0x24C, 6) - CRU_GATE(HCLK_HOST0_ARB, "hclk_host0_arg", "hclk_peri", 0x24C, 7) - CRU_GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 0x24C, 8) - CRU_GATE(HCLK_OTG_PMU, "hclk_otg_pmu", "hclk_peri", 0x24C, 9) + GATE(HCLK_HOST0, "hclk_host0", "hclk_peri", 19, 6), + GATE(HCLK_HOST0_ARB, "hclk_host0_arg", "hclk_peri", 19, 7), + GATE(HCLK_OTG, "hclk_otg", "hclk_peri", 19, 8), + GATE(HCLK_OTG_PMU, "hclk_otg_pmu", "hclk_peri", 19, 9), /* Bit 10 unused */ - CRU_GATE(0, "aclk_peri_niu", "aclk_peri", 0x24C, 11) - CRU_GATE(0, "hclk_peri_niu", "hclk_peri", 0x24C, 12) - CRU_GATE(0, "pclk_peri_niu", "hclk_peri", 0x24C, 13) - CRU_GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 0x24C, 14) - CRU_GATE(HCLK_SDMMC_EXT, "hclk_sdmmc_ext", "hclk_peri", 0x24C, 15) + GATE(0, "aclk_peri_niu", "aclk_peri", 19, 11), + GATE(0, "hclk_peri_niu", "hclk_peri", 19, 12), + GATE(0, "pclk_peri_niu", "hclk_peri", 19, 13), + GATE(ACLK_USB3OTG, "aclk_usb3otg", "aclk_peri", 19, 14), + GATE(HCLK_SDMMC_EXT, "hclk_sdmmc_ext", "hclk_peri", 19, 15), /* CRU_CLKGATE_CON20 */ /* unused */ /* CRU_CLKGATE_CON21 */ /* Bit 0-1 unused */ - CRU_GATE(ACLK_VOP, "aclk_vop", "aclk_vop_pre", 0x254, 2) - CRU_GATE(HCLK_VOP, "hclk_vop", "hclk_vio_pre", 0x254, 3) - CRU_GATE(0, "aclk_vop_niu", "aclk_vop_pre", 0x254, 4) - CRU_GATE(0, "hclk_vop_niu", "hclk_vio_pre", 0x254, 5) - CRU_GATE(ACLK_IEP, "aclk_iep", "aclk_vio_pre", 0x254, 6) - CRU_GATE(HCLK_IEP, "hclk_iep", "hclk_vio_pre", 0x254, 7) - CRU_GATE(ACLK_CIF, "aclk_cif", "aclk_vio_pre", 0x254, 8) - CRU_GATE(HCLK_CIF, "hclk_cif", "hclk_vio_pre", 0x254, 9) - CRU_GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 0x254, 10) - CRU_GATE(HCLK_RGA, "hclk_rga", "hclk_vio_pre", 0x254, 11) - CRU_GATE(0, "hclk_ahb1tom", "hclk_vio_pre", 0x254, 12) - CRU_GATE(0, "pclk_vio_h2p", "hclk_vio_pre", 0x254, 13) - CRU_GATE(0, "hclk_vio_h2p", "hclk_vio_pre", 0x254, 14) - CRU_GATE(ACLK_HDCP, "aclk_hdcp", "aclk_vio_pre", 0x254, 15) + GATE(ACLK_VOP, "aclk_vop", "aclk_vop_pre", 21, 2), + GATE(HCLK_VOP, "hclk_vop", "hclk_vio_pre", 21, 3), + GATE(0, "aclk_vop_niu", "aclk_vop_pre", 21, 4), + GATE(0, "hclk_vop_niu", "hclk_vio_pre", 21, 5), + GATE(ACLK_IEP, "aclk_iep", "aclk_vio_pre", 21, 6), + GATE(HCLK_IEP, "hclk_iep", "hclk_vio_pre", 21, 7), + GATE(ACLK_CIF, "aclk_cif", "aclk_vio_pre", 21, 8), + GATE(HCLK_CIF, "hclk_cif", "hclk_vio_pre", 21, 9), + GATE(ACLK_RGA, "aclk_rga", "aclk_rga_pre", 21, 10), + GATE(HCLK_RGA, "hclk_rga", "hclk_vio_pre", 21, 11), + GATE(0, "hclk_ahb1tom", "hclk_vio_pre", 21, 12), + GATE(0, "pclk_vio_h2p", "hclk_vio_pre", 21, 13), + GATE(0, "hclk_vio_h2p", "hclk_vio_pre", 21, 14), + GATE(ACLK_HDCP, "aclk_hdcp", "aclk_vio_pre", 21, 15), /* CRU_CLKGATE_CON22 */ - CRU_GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vio_pre", 0x258, 0) - CRU_GATE(0, "hclk_vio_niu", "hclk_vio_pre", 0x258, 1) - CRU_GATE(0, "aclk_vio_niu", "aclk_vio_pre", 0x258, 2) - CRU_GATE(0, "aclk_rga_niu", "aclk_rga_pre", 0x258, 3) - CRU_GATE(PCLK_HDMI, "pclk_hdmi", "hclk_vio_pre", 0x258, 4) - CRU_GATE(PCLK_HDCP, "pclk_hdcp", "hclk_vio_pre", 0x258, 5) + GATE(HCLK_HDCP, "hclk_hdcp", "hclk_vio_pre", 22, 0), + GATE(0, "hclk_vio_niu", "hclk_vio_pre", 22, 1), + GATE(0, "aclk_vio_niu", "aclk_vio_pre", 22, 2), + GATE(0, "aclk_rga_niu", "aclk_rga_pre", 22, 3), + GATE(PCLK_HDMI, "pclk_hdmi", "hclk_vio_pre", 22, 4), + GATE(PCLK_HDCP, "pclk_hdcp", "hclk_vio_pre", 22, 5), /* Bit 6-15 unused */ /* CRU_CLKGATE_CON23 */ - CRU_GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_pre", 0x25C, 0) - CRU_GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", 0x25C, 1) - CRU_GATE(0, "aclk_vpu_niu", "aclk_vpu_pre", 0x25C, 2) - CRU_GATE(0, "hclk_vpu_niu", "hclk_vpu_pre", 0x25C, 3) + GATE(ACLK_VPU, "aclk_vpu", "aclk_vpu_pre", 23, 0), + GATE(HCLK_VPU, "hclk_vpu", "hclk_vpu_pre", 23, 1), + GATE(0, "aclk_vpu_niu", "aclk_vpu_pre", 23, 2), + GATE(0, "hclk_vpu_niu", "hclk_vpu_pre", 23, 3), /* Bit 4-15 unused */ /* CRU_CLKGATE_CON24 */ - CRU_GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pre", 0x260, 0) - CRU_GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", 0x260, 1) - CRU_GATE(0, "aclk_rkvdec_niu", "aclk_rkvdec_pre", 0x260, 2) - CRU_GATE(0, "hclk_rkvdec_niu", "hclk_rkvdec_pre", 0x260, 3) + GATE(ACLK_RKVDEC, "aclk_rkvdec", "aclk_rkvdec_pre", 24, 0), + GATE(HCLK_RKVDEC, "hclk_rkvdec", "hclk_rkvdec_pre", 24, 1), + GATE(0, "aclk_rkvdec_niu", "aclk_rkvdec_pre", 24, 2), + GATE(0, "hclk_rkvdec_niu", "hclk_rkvdec_pre", 24, 3), /* Bit 4-15 unused */ /* CRU_CLKGATE_CON25 */ - CRU_GATE(0, "aclk_rkvenc_niu", "aclk_rkvenc", 0x264, 0) - CRU_GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 0x264, 1) - CRU_GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 0x264, 2) - CRU_GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 0x264, 3) - CRU_GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 0x264, 4) - CRU_GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 0x264, 5) - CRU_GATE(0, "aclk_axisram", "hclk_rkvenc", 0x264, 6) + GATE(0, "aclk_rkvenc_niu", "aclk_rkvenc", 25, 0), + GATE(0, "hclk_rkvenc_niu", "hclk_rkvenc", 25, 1), + GATE(ACLK_H265, "aclk_h265", "aclk_rkvenc", 25, 2), + GATE(PCLK_H265, "pclk_h265", "hclk_rkvenc", 25, 3), + GATE(ACLK_H264, "aclk_h264", "aclk_rkvenc", 25, 4), + GATE(HCLK_H264, "hclk_h264", "hclk_rkvenc", 25, 5), + GATE(0, "aclk_axisram", "hclk_rkvenc", 25, 6), /* Bit 7-15 unused */ /* CRU_CLKGATE_CON26 */ - CRU_GATE(ACLK_MAC2PHY, "aclk_gmac2phy", "aclk_gmac", 0x268, 0) - CRU_GATE(PCLK_MAC2PHY, "pclk_gmac2phy", "pclk_gmac", 0x268, 1) - CRU_GATE(ACLK_MAC2IO, "aclk_gmac2io", "aclk_gmac", 0x268, 2) - CRU_GATE(PCLK_MAC2IO, "pclk_gmac2io", "pclk_gmac", 0x268, 3) - CRU_GATE(0, "aclk_gmac_niu", "aclk_gmac", 0x268, 4) - CRU_GATE(0, "pclk_gmac_niu", "pclk_gmac", 0x268, 5) + GATE(ACLK_MAC2PHY, "aclk_gmac2phy", "aclk_gmac", 26, 0), + GATE(PCLK_MAC2PHY, "pclk_gmac2phy", "pclk_gmac", 26, 1), + GATE(ACLK_MAC2IO, "aclk_gmac2io", "aclk_gmac", 26, 2), + GATE(PCLK_MAC2IO, "pclk_gmac2io", "pclk_gmac", 26, 3), + GATE(0, "aclk_gmac_niu", "aclk_gmac", 26, 4), + GATE(0, "pclk_gmac_niu", "pclk_gmac", 26, 5), /* Bit 6-15 unused */ /* CRU_CLKGATE_CON27 */ @@ -555,11 +556,11 @@ static struct rk_cru_gate rk3328_gates[] = { /* Bit 1 clk4x_ddrphy_en */ /* CRU_CLKGATE_CON28 */ - CRU_GATE(HCLK_PDM, "hclk_pdm", "hclk_bus_pre", 0x270, 0) - CRU_GATE(PCLK_USB3PHY_OTG, "pclk_usb3phy_otg", "pclk_phy", 0x270, 1) - CRU_GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy", 0x270, 2) - CRU_GATE(0, "pclk_pmu", "pclk_bus", 0x270, 3) - CRU_GATE(0, "pclk_otp", "pclk_bus", 0x270, 4) + GATE(HCLK_PDM, "hclk_pdm", "hclk_bus_pre", 28, 0), + GATE(PCLK_USB3PHY_OTG, "pclk_usb3phy_otg", "pclk_phy", 28, 1), + GATE(PCLK_USB3PHY_PIPE, "pclk_usb3phy_pipe", "pclk_phy", 28, 2), + GATE(0, "pclk_pmu", "pclk_bus", 28, 3), + GATE(0, "pclk_otp", "pclk_bus", 28, 4) /* Bit 5-15 unused */ }; From nobody Wed Oct 18 14:34:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJd4MHsz4x6Tx; Wed, 18 Oct 2023 14:34: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 4S9YJd2vcZz3Tkj; Wed, 18 Oct 2023 14:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFsh0/9LqS8Db+KmDd4TrBYhK+R6yiFQdtZ3Xmj751U=; b=pLXWIKRFY8BRurm6OdOlzmXEoBQTrrN7HZp9V1BuBKFXKPwko7URkp6pXjWBW+vjkNKVpQ NK5cUxHAXeQ+AbDAFf17TPXRnTvW6cryd0JO2IjsXd3VHUPhnhJLvZxuTBt36EC5FOW/hy jVYMY2oMSw0WPrWklPR/Ye/+nfLNAOsK+HrzEZd6bQJLn7k+UaIe5flF/ooHiVby1JSWgI /OCW4HdOrtbxeeYYqq5CBNslX10IGVImiQ1TyKi++huIxR8yz1xVYIvS6vZBa6ph7cHbzu gIi8xSHEKF5JFIj3WPJUIlE90Hxa4HEg6VV8V4du8AlG/rm+gUDIY73VSgwDYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639665; a=rsa-sha256; cv=none; b=VSG1ZAO5Ff/iWGnURX5Nii22nvIzaGsj1cMny4HTnOtCNTwAy1aIrSryaudxw9g6pWZidx ouUtKXq7Sf9HdbCAJdpLDpuXYz5tEfjSOnpKEwVRZjhFpwQ8WbAwaLFFW9S0mzbWjsfY5O wiWefbVYMm2KcUlCDOivYoIu2dqGnKfNfiDQRdnbRjEBOLuKdAdFoy3qRqEkUtanAlS6hz QZ2X9GSr3qZuMIClcHs52w3jfsok9iJP+K5d97SZNZMC4ACBDISqU+uMXc4J7F9pa0Yqx7 w8XVH2F/ZuR4tkGvy3XEvn9v7oHQAeUwh2Mvt6VYtfNowbKYUkbAIlHdy+OdyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFsh0/9LqS8Db+KmDd4TrBYhK+R6yiFQdtZ3Xmj751U=; b=hXm5V77O+VRIjnBE20K7LN/XtIuZvF0LE1Pnrl0UwykUl0giGUrcF+aXAG6va72TiDMFg6 n4gj+FXXxZe9DAGnppyzpaKXKrP8idwCw+VFM2zXJNnPqvtPXtP0tr5thqoZ2MMrfGFEGG +cgPmpi0s0Hr/6H5FdBFLMp0mljq7TDP/RyDILQRjIq4OlnVlRl9WI8kjMZbKTKcuqilSb byZmaxROunsKKtgTe+KCwkmGhSey0VUe9j+/RXymt10GWOwbcBti4HA67rifPDGblgtQC8 YTcd2JzlCO/Y6sSbrbjQSUQZW4Gc2ctXOY2LI3T6dnZPqAA7tBmxDYvm1uZlZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJd1YJmz19GP; Wed, 18 Oct 2023 14:34: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 39IEYPwx092560; Wed, 18 Oct 2023 14:34:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYPuY092557; Wed, 18 Oct 2023 14:34:25 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:25 GMT Message-Id: <202310181434.39IEYPuY092557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 1469218c9ca2 - stable/14 - arm64: rockchip: rk3399_pmucru: Use GATE macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1469218c9ca2bd137ae978d5ae93ebbedefc52bb Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1469218c9ca2bd137ae978d5ae93ebbedefc52bb commit 1469218c9ca2bd137ae978d5ae93ebbedefc52bb Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:58:48 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:31 +0000 arm64: rockchip: rk3399_pmucru: Use GATE macro It make it easier to read the code and the register number (cherry picked from commit 3d2ccc352db54b9fb11c4c1373a577e3e9d25114) --- sys/arm64/rockchip/clk/rk3399_pmucru.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 64df47468efd..9af438254a02 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -46,6 +46,8 @@ #include +#define CRU_CLKGATE_CON(x) (0x100 + (x) * 0x4) + /* GATES */ #define PCLK_PMU 20 @@ -58,13 +60,13 @@ static struct rk_cru_gate rk3399_pmu_gates[] = { /* PMUCRU_CLKGATE_CON1 */ - CRU_GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 0x104, 0) - CRU_GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 0x104, 3) - CRU_GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 0x104, 4) - CRU_GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 0x104, 7) - CRU_GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 0x104, 8) - CRU_GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 0x104, 9) - CRU_GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 0x104, 10) + GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 1, 0), + GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 1, 3), + GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 1, 4), + GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 1, 7), + GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 1, 8), + GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 1, 9), + GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10) }; /* From nobody Wed Oct 18 14:34:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJf4RSwz4x6R9; Wed, 18 Oct 2023 14:34: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 4S9YJf3TfZz3Tds; Wed, 18 Oct 2023 14:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5umgWnP531/SgNhty6Wfz0pmA6bjFKQJWpLoEOblvcQ=; b=ssqFRxvpMNKMLs9B6oCpTp3laBpRyWqiN5AAtcVCCIsTpclbN3XRbCtVkLydJtWko92DVl OBheifoI/MM4VRZo4SvoTj6d7FeiMKEDknw4Q4aIImbdqMRHwR79xUcXPWPhvczgeVzKub RWu6IQCJuPMbQO9ahuaWZGRSWEu6aHiPflEv8ZH4T9dm6AQfF5clPIC2QyPnFzZvYs/w8o Ar1UJrcLTdqoMIB5dts7t9ySXgJuMcbpNzjj6EMEnzt4bM4vkalPc+kN+m5VEyq3/Q9wvm 3KSl3up78+maE0XCExjM8ZM/VmT+9r5ow4R/6wFbsPNnIqkhe6XiFuGJqvjnpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639666; a=rsa-sha256; cv=none; b=P2aYaoViAxu86hSnCc56OV3SF3DLnlAxO0BmnWAhXuMXVOah4sjFwxtLlS8BIKHGrIiacA IRuPV0sUIn7ZV+YaQB7J2GwS5TTjgyhDdBWvhLxne253aeVl0nJ8UGMB5nxLlf0YJlG0i0 Fv89LPONoNpe/rFMhz/Y6dliVtPHZigYq+2Cr+Xq0/bgh96553NzY1+nzDGu6kiKFLBPVL s+W7Ss+mW38N9va2Ohzn3ylKIQ8OHGRxi2A7MlzpG2QL19Xw0D3zsj+wkhc5zzPpw/X1p3 MhtRHu0jH8M/4pFDuqVyZNfvzht+JJjTTydgX7f5K6bq8GG1z2GrH1qQg+2ffg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5umgWnP531/SgNhty6Wfz0pmA6bjFKQJWpLoEOblvcQ=; b=TVw1l1TzcVV7rS1GUdBN/Ltt6eWTcihIP8GLkK6NDoPbo9p97AoDhQo1jkSoN7AUgnBQq5 RvzCOcSo0uQCzb7d4/WOUWSovN34DNUUKscTnrEGwhZwG92UFmfEO9bDjAYid0Ojsqv4ML VWh6iEvCdvwrYPiwvBNQ4yp+cdyIvSeysE8SIAMaMoMSdJVxNWyinwLUSMgTWooxmQI/2b b0poYS/bdMHDMOYA3RhCMUL7tNnNlHZGFDT59c2Xw0Ql91uO295D5QalfA+125oohUCzFo saWqFvSLPWkwv+QR+83S57VyniRlxLysygP5FhsfHyPouYQrsS9HUYCZ6UoRFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJf2Q0kz18pF; Wed, 18 Oct 2023 14:34: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 39IEYQKV092602; Wed, 18 Oct 2023 14:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYQEn092599; Wed, 18 Oct 2023 14:34:26 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:26 GMT Message-Id: <202310181434.39IEYQEn092599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 66765585ab7b - stable/14 - arm64: rockchip: Remove CRU_GATE macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 66765585ab7bbd70c5f39906fedca472b348629a Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=66765585ab7bbd70c5f39906fedca472b348629a commit 66765585ab7bbd70c5f39906fedca472b348629a Author: Emmanuel Vadot AuthorDate: 2023-09-21 10:59:26 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:32 +0000 arm64: rockchip: Remove CRU_GATE macro It's unused now (cherry picked from commit 5b7fe78032a0d07995c1c1c005d82c3a1fe8a056) --- sys/arm64/rockchip/clk/rk_cru.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index 55f230036199..5d45dc6ab859 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -216,15 +216,6 @@ struct rk_cru_gate { uint32_t shift; }; -#define CRU_GATE(idx, clkname, pname, o, s) \ - { \ - .id = idx, \ - .name = clkname, \ - .parent_name = pname, \ - .offset = o, \ - .shift = s, \ - }, - enum rk_clk_type { RK_CLK_UNDEFINED = 0, RK3066_CLK_PLL, From nobody Wed Oct 18 14:34:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJh2l82z4x6V9; Wed, 18 Oct 2023 14:34: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 4S9YJg4B6Bz3Tsc; Wed, 18 Oct 2023 14:34:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8/3PCloyOJE7Il3bGfEFABLqxfnguKrB7A+XKs6aqM=; b=VqtAuQZerV5uBW3Q8vsV9lGpBrYSmtJrXXywDWTjjdqkBDMuX0B4NULhhnuyJHbWQyFumB 56VVDKEw65YgTiRjYq3sJ2Jpajuc1QLapI4J/ASsQp9iy4q4UC13iasqVs+DenGx/ZHEd/ /0v3PH360f1KumnNIJZTS/e+qdS9PPQ+YbNZaCTrGMeXmx4OK8KSHoSLeBfhfx5rz5Fmvd VNuJn/1i/K+RvQxSozoGeOr1T3rh+9oFf71GXnN75A7LvUlNyWoFulmVkgbcWK3IV73zNJ RfhQ19JSE64ptuF3E7H5V35DlemaLuFAcIQcw8nyHGbgx8N2C1QyiutCjTyUHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639667; a=rsa-sha256; cv=none; b=vEa2ZUQpdINjdd6qZySYtPwCXQY3hnrnX30coE46XiZAHav0zLz+kdQlqpu1eYGEkE1fhV qwDm52CNA2zvQEodPT1KtYqnAbIrbX555jlNIIcV+kLfHxEO75XxXAntOfAz12QkD5zueO sjG5DHpTfCuXf9lQaNCO0Hn4XMnchSWf7sGJCCioTccP+rj2LyWNbm/ErV8zUziKM4AaV7 bRMYie5NfXbVCCwsSkR3O8NJdFhDVXYRDYHWCp7nH9/wgeHdWok3zMjM9xDUQDmSbjEIWP pQV2buwH1OFVG0cTsZ0V9weYmoJomrYa6h2+4bCB8vjhEHNz0ZK27FElQDBrfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8/3PCloyOJE7Il3bGfEFABLqxfnguKrB7A+XKs6aqM=; b=aMhbrqjxiob9Fyi/VsYYaQnYnZBPF4XWsPFAKlzN196klwbXdguR/OYu+vTzn4IzEHSF6P S/dIj9/QtSEuYJGk3WaCv8NOxwsJaMCxRqh4ArzOcIQVJQDQLNztQ71cMZ7Gn8NoDWJbKY 9Cg4GXjsFv/KZdXfrhAMz3DlCjYCskzMYZlRX7ojLKWPsGUeDm5v45qyCaKTVKIXSaWU3z ZGmtsZM226wGbru9JTXhPxnHO1twgteRkULbC93gmiZd/p6+pBkzCFUqh6PcFKHVL3i+0s 5DvvdyToBUIqRdWbCeWcUufuCeiXW0i/o6OQO8bC7pj8we/7tLNWHESk6rFRgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJg3HShz19GQ; Wed, 18 Oct 2023 14:34: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 39IEYRl3092653; Wed, 18 Oct 2023 14:34:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYRRw092650; Wed, 18 Oct 2023 14:34:27 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:27 GMT Message-Id: <202310181434.39IEYRRw092650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 57209137eb7e - stable/14 - arm64: rockchip: rk3399_pmucru: Finish exporting all clocks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 57209137eb7e57b3f820655431d4d42fb8c6464e Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=57209137eb7e57b3f820655431d4d42fb8c6464e commit 57209137eb7e57b3f820655431d4d42fb8c6464e Author: Emmanuel Vadot AuthorDate: 2023-09-21 14:49:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:33 +0000 arm64: rockchip: rk3399_pmucru: Finish exporting all clocks - All used clocks are now exported. - Use the macros from rk_cru.h so code is similar to other rk clock drivers. (cherry picked from commit 829b06ad8f6f3317777c2395a090a898fdcd550c) --- sys/arm64/rockchip/clk/rk3399_pmucru.c | 211 +++++++++++++++++---------------- 1 file changed, 110 insertions(+), 101 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 9af438254a02..276905ae4561 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -46,35 +46,96 @@ #include +#define CRU_CLKSEL_CON(x) (0x80 + (x) * 0x4) #define CRU_CLKGATE_CON(x) (0x100 + (x) * 0x4) -/* GATES */ - +#define PLL_PPLL 1 +#define SCLK_32K_SUSPEND_PMU 2 +#define SCLK_SPI3_PMU 3 +#define SCLK_TIMER12_PMU 4 +#define SCLK_TIMER13_PMU 5 +#define SCLK_UART4_PMU 6 +#define SCLK_PVTM_PMU 7 +#define SCLK_WIFI_PMU 8 +#define SCLK_I2C0_PMU 9 +#define SCLK_I2C4_PMU 10 +#define SCLK_I2C8_PMU 11 + +#define PCLK_PMU_SRC 19 #define PCLK_PMU 20 +#define PCLK_PMUGRF_PMU 21 +#define PCLK_INTMEM1_PMU 22 #define PCLK_GPIO0_PMU 23 #define PCLK_GPIO1_PMU 24 +#define PCLK_SGRF_PMU 25 +#define PCLK_NOC_PMU 26 #define PCLK_I2C0_PMU 27 #define PCLK_I2C4_PMU 28 #define PCLK_I2C8_PMU 29 #define PCLK_RKPWM_PMU 30 +#define PCLK_SPI3_PMU 31 +#define PCLK_TIMER_PMU 32 +#define PCLK_MAILBOX_PMU 33 +#define PCLK_UART4_PMU 34 +#define PCLK_WDT_M0_PMU 35 + +#define FCLK_CM0S_SRC_PMU 44 +#define FCLK_CM0S_PMU 45 +#define SCLK_CM0S_PMU 46 +#define HCLK_CM0S_PMU 47 +#define DCLK_CM0S_PMU 48 +#define PCLK_INTR_ARB_PMU 49 +#define HCLK_NOC_PMU 50 +/* GATES */ static struct rk_cru_gate rk3399_pmu_gates[] = { + /* PMUCRU_CLKGATE_CON0 */ + /* 0 Reserved */ + /* 1 fclk_cm0s_pmu_ppll_src_en */ + GATE(SCLK_SPI3_PMU, "clk_spi3_pmu", "clk_spi3_c", 0, 2), + GATE(SCLK_TIMER12_PMU, "clk_timer0_pmu", "clk_timer_sel", 0, 3), + GATE(SCLK_TIMER13_PMU, "clk_timer1_pmu", "clk_timer_sel", 0, 4), + GATE(SCLK_UART4_PMU, "clk_uart4_pmu", "clk_uart4_sel", 0, 5), + GATE(0, "clk_uart4_frac", "clk_uart4_frac_frac", 0, 6), + /* 7 clk_pvtm_pmu_en */ + GATE(SCLK_WIFI_PMU, "clk_wifi_pmu", "clk_wifi_sel", 0, 8), + GATE(SCLK_I2C0_PMU, "clk_i2c0_src", "clk_i2c0_div", 0, 9), + GATE(SCLK_I2C4_PMU, "clk_i2c4_src", "clk_i2c4_div", 0, 10), + GATE(SCLK_I2C8_PMU, "clk_i2c8_src", "clk_i2c8_div", 0, 11), + /* 12:15 Reserved */ + /* PMUCRU_CLKGATE_CON1 */ GATE(PCLK_PMU, "pclk_pmu", "pclk_pmu_src", 1, 0), + /* 1 pclk_pmugrf_en */ + /* 2 pclk_intmem1_en */ GATE(PCLK_GPIO0_PMU, "pclk_gpio0_pmu", "pclk_pmu_src", 1, 3), GATE(PCLK_GPIO1_PMU, "pclk_gpio1_pmu", "pclk_pmu_src", 1, 4), + /* 5 pclk_sgrf_en */ + /* 6 pclk_noc_pmu_en */ GATE(PCLK_I2C0_PMU, "pclk_i2c0_pmu", "pclk_pmu_src", 1, 7), GATE(PCLK_I2C4_PMU, "pclk_i2c4_pmu", "pclk_pmu_src", 1, 8), GATE(PCLK_I2C8_PMU, "pclk_i2c8_pmu", "pclk_pmu_src", 1, 9), - GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10) + GATE(PCLK_RKPWM_PMU, "pclk_rkpwm_pmu", "pclk_pmu_src", 1, 10), + GATE(PCLK_SPI3_PMU, "pclk_spi3_pmu", "pclk_pmu_src", 1, 11), + GATE(PCLK_TIMER_PMU, "pclk_timer_pmu", "pclk_pmu_src", 1, 12), + GATE(PCLK_MAILBOX_PMU, "pclk_mailbox_pmu", "pclk_pmu_src", 1, 13), + /* 14 pclk_uartm0_en */ + /* 15 pclk_wdt_m0_pmu_en */ + + /* PMUCRU_CLKGATE_CON2 */ + /* 0 fclk_cm0s_en */ + /* 1 sclk_cm0s_en */ + /* 2 hclk_cm0s_en */ + /* 3 dclk_cm0s_en */ + /* 4 Reserved */ + /* 5 hclk_noc_pmu_en */ + /* 6:15 Reserved */ }; /* * PLLs */ -#define PLL_PPLL 1 - static struct rk_clk_pll_rate rk3399_pll_rates[] = { { .freq = 2208000000, @@ -695,124 +756,72 @@ static struct rk_clk_pll_rate rk3399_pll_rates[] = { {}, }; -static const char *pll_parents[] = {"xin24m"}; +PLIST(xin24m_p) = {"xin24m"}; +PLIST(xin24m_xin32k_p) = {"xin24m", "xin32k"}; +PLIST(xin24m_ppll_p) = {"xin24m", "ppll"}; +PLIST(uart4_p) = {"clk_uart4_c", "clk_uart4_frac", "xin24m"}; +PLIST(wifi_p) = {"clk_wifi_c", "clk_wifi_frac"}; static struct rk_clk_pll_def ppll = { .clkdef = { .id = PLL_PPLL, .name = "ppll", - .parent_names = pll_parents, - .parent_cnt = nitems(pll_parents), + .parent_names = xin24m_p, + .parent_cnt = nitems(xin24m_p), }, .base_offset = 0x00, .rates = rk3399_pll_rates, }; -static const char *pmu_parents[] = {"ppll"}; - -#define PCLK_PMU_SRC 19 - -static struct rk_clk_composite_def pclk_pmu_src = { - .clkdef = { - .id = PCLK_PMU_SRC, - .name = "pclk_pmu_src", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, - /* PMUCRU_CLKSEL_CON0 */ - .muxdiv_offset = 0x80, - - .div_shift = 0, - .div_width = 5, -}; - -#define SCLK_I2C0_PMU 9 -#define SCLK_I2C4_PMU 10 -#define SCLK_I2C8_PMU 11 +static struct rk_clk rk3399_pmu_clks[] = { + /* Linked clocks */ + LINK("xin32k"), -static struct rk_clk_composite_def i2c0 = { - .clkdef = { - .id = SCLK_I2C0_PMU, - .name = "clk_i2c0_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), + { + .type = RK3399_CLK_PLL, + .clk.pll = &ppll }, - /* PMUCRU_CLKSEL_CON2 */ - .muxdiv_offset = 0x88, - - .div_shift = 0, - .div_width = 7, - - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 9, - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + /* PMUCRU_CLKSEL_CON0 */ + CDIV(PCLK_PMU_SRC, "pclk_pmu_src", "ppll", 0, 0, 0, 5), + /* 5:7 Reserved */ + /* 8:12 cm0s_div */ + /* 13:14 Reserved */ + /* 15 cm0s_clk_pll_sel */ + + /* PMUCRU_CLKSEL_CON1 */ + COMP(0, "clk_spi3_c", xin24m_ppll_p, 0, 1, 0, 7, 7, 1), + COMP(0, "clk_wifi_c", xin24m_ppll_p, 0, 1, 8, 5, 13, 1), + MUX(0, "clk_wifi_sel", wifi_p, 0, 1, 14, 1), + MUX(0, "clk_timer_sel", xin24m_xin32k_p, 0, 1, 15, 1), -static struct rk_clk_composite_def i2c8 = { - .clkdef = { - .id = SCLK_I2C8_PMU, - .name = "clk_i2c8_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, /* PMUCRU_CLKSEL_CON2 */ - .muxdiv_offset = 0x88, - - .div_shift = 8, - .div_width = 7, - - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 11, - - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + CDIV(0, "clk_i2c0_div", "ppll", 0, 2, 0, 7), + /* 7 Reserved */ + CDIV(0, "clk_i2c8_div", "ppll", 0, 2, 8, 7), + /* 15 Reserved */ -static struct rk_clk_composite_def i2c4 = { - .clkdef = { - .id = SCLK_I2C4_PMU, - .name = "clk_i2c4_pmu", - .parent_names = pmu_parents, - .parent_cnt = nitems(pmu_parents), - }, /* PMUCRU_CLKSEL_CON3 */ - .muxdiv_offset = 0x8c, + CDIV(0, "clk_i2c4_div", "ppll", 0, 3, 0, 7), + /* 7:15 Reserved */ - .div_shift = 0, - .div_width = 7, + /* PMUCRU_CLKSEL_CON4 */ + /* 0:9 clk_32k_suspend_div */ + /* 10:14 Reserved */ + /* 15 clk_32k_suspend_sel */ - /* PMUCRU_CLKGATE_CON0 */ - .gate_offset = 0x100, - .gate_shift = 10, + /* PMUCRU_CLKSEL_CON5 */ + COMP(0, "clk_uart4_c", xin24m_ppll_p, 0, 5, 0, 7, 10, 1), + /* 7 Reserved */ + MUX(0, "clk_uart4_sel", uart4_p, 0, 5, 8, 2), + /* 11:15 Reserved */ - .flags = RK_CLK_COMPOSITE_HAVE_GATE, -}; + /* PMUCRU_CLKFRAC_CON0 / PMUCRU_CLKSEL_CON6 */ + FRACT(0, "clk_uart4_frac_frac", "clk_uart4_sel", 0, 6), -static struct rk_clk rk3399_pmu_clks[] = { - { - .type = RK3399_CLK_PLL, - .clk.pll = &ppll - }, - - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &pclk_pmu_src - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c0 - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c4 - }, - { - .type = RK_CLK_COMPOSITE, - .clk.composite = &i2c8 - }, + /* PMUCRU_CLKFRAC_CON1 / PMUCRU_CLKSEL_CON7 */ + FRACT(0, "clk_wifi_frac", "clk_wifi_c", 0, 7), }; static int From nobody Wed Oct 18 14:34:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJh6VsPz4x64p; Wed, 18 Oct 2023 14:34: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 4S9YJh5Ckbz3TfV; Wed, 18 Oct 2023 14:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhvd4aYWEcLxjql0hGKC1BlwZ5XGtaIOt1LXzQi7trU=; b=mtgbg6GdImT3A4BBX+I5j5SSLT+ldEKq6eo2vvAbNgNz70oPJdRxUKnz228S8i2pizIr+7 Upw5jE4DY84x+fPxotSn7oKCeHITuW1jHO/K9fIZ8hnXcc3o8eD0Tq7q3/YXO1UXsJjsks kfddPzW/Dk/yOdjUhk4wt5S8WBeJSKyfGLHB+IFtq5aUoftX7bYncYKzEKm/0bhQ31667/ HtWQzwwu3gY2nnf3yLfu+MeHD/4JWttb+FXBq91oYtqy/MwZ45E4Uy09HUDiO8Dv1K2nj4 0ojNnzilOaEe6sEAUrTTX53FUJ7VXCAQAqnCbtwCwIuR2VeLBVUqkn4Yk4KLdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639668; a=rsa-sha256; cv=none; b=mLcWwJpOpz22CyRdn7t6180QBJuEjGokuMYvho+ViY8mFv6zZ/sZQnQrx0YdgV714Au0CB lZzIwM4X27uF2iZK8sgiALngvaZQomj+MTU/bEnsjdJKvyqhwfljmqi4PvQdF5NqpjSBDp BzbEAuxlE8nrnWCamAvO3YLe/k54Y8WUDFH+ydWpjUTIIiZ3QtGkufYwyeuL4e4wresBcv 1StyuXXqEjhvFo6i7tRHnuEhWKinQJnpMZmFfifQc+MmoVpUCnjpg8rv9qmLnNOPoIxMzJ Xqt2w6rgLVOxSp6/3SMzvPZe4AOkIE4zJ4q3MXkuYSxIRzXkk/R46C8Yb3Tb3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhvd4aYWEcLxjql0hGKC1BlwZ5XGtaIOt1LXzQi7trU=; b=qhHP2u9xhdVl9LG+HoyqcNEI43VnGdtP2Uj+MHUeuyW/3nUBHRpW28kmMigtm3dfd1DAF6 usdu9Xb9c6xAKbQ7c4F8z46Z5+lYMvAHQtYp0V0cN3xobsIk4pvfiK65f0Fb1+sEYkFAKI Xus7TNTQSu/Koy9MPQ35Mu55YSvDCoQkXOim9skzZca9x+JcXEqQ9A8BF7pf+6QUCGB/KA 1A1jYKHI3+d9dk0irTaMCdAsmspM6N9qgdaQdaUOKQH8cjOn0x3t0ldj+T6PgTsvGKKdOU u+5KYgfH4IDhBk06m7WYDFVcLzltMnXpBNJzhkOPafeZs0uhz8IfVA/PMD2lLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJh4KCWz18xM; Wed, 18 Oct 2023 14:34: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 39IEYSbR092699; Wed, 18 Oct 2023 14:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYSou092696; Wed, 18 Oct 2023 14:34:28 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:28 GMT Message-Id: <202310181434.39IEYSou092696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: fd4760cbda85 - stable/14 - arm64: rockchip: rk_clk_composite: Remove gate code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fd4760cbda85016b1bc551458f09c5f51814e586 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=fd4760cbda85016b1bc551458f09c5f51814e586 commit fd4760cbda85016b1bc551458f09c5f51814e586 Author: Emmanuel Vadot AuthorDate: 2023-09-21 14:56:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:35 +0000 arm64: rockchip: rk_clk_composite: Remove gate code It was a bad idea to have composite clock directly managing gates. All clocks drivers have been rewrite to not use this functionality and directly export the gate. We can now remove this code. (cherry picked from commit db34f02028f30bbf099bf1bce7ce66184f51b332) --- sys/arm64/rockchip/clk/rk_clk_composite.c | 31 ------------------------------- sys/arm64/rockchip/clk/rk_clk_composite.h | 8 ++------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/arm64/rockchip/clk/rk_clk_composite.c index a04b3aa2193c..a30dadbaf811 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.c +++ b/sys/arm64/rockchip/clk/rk_clk_composite.c @@ -48,9 +48,6 @@ struct rk_clk_composite_sc { uint32_t div_width; uint32_t div_mask; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; struct syscon *grf; @@ -145,30 +142,6 @@ rk_clk_composite_init(struct clknode *clk, device_t dev) return (0); } -static int -rk_clk_composite_set_gate(struct clknode *clk, bool enable) -{ - struct rk_clk_composite_sc *sc; - uint32_t val = 0; - - sc = clknode_get_softc(clk); - - if ((sc->flags & RK_CLK_COMPOSITE_HAVE_GATE) == 0) - return (0); - - dprintf("%sabling gate\n", enable ? "En" : "Dis"); - if (!enable) - val |= 1 << sc->gate_shift; - dprintf("sc->gate_shift: %x\n", sc->gate_shift); - val |= (1 << sc->gate_shift) << RK_CLK_COMPOSITE_MASK_SHIFT; - dprintf("Write: gate_offset=%x, val=%x\n", sc->gate_offset, val); - DEVICE_LOCK(clk); - WRITE4(clk, sc->gate_offset, val); - DEVICE_UNLOCK(clk); - - return (0); -} - static int rk_clk_composite_set_mux(struct clknode *clk, int index) { @@ -320,7 +293,6 @@ rk_clk_composite_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, static clknode_method_t rk_clk_composite_clknode_methods[] = { /* Device interface */ CLKNODEMETHOD(clknode_init, rk_clk_composite_init), - CLKNODEMETHOD(clknode_set_gate, rk_clk_composite_set_gate), CLKNODEMETHOD(clknode_set_mux, rk_clk_composite_set_mux), CLKNODEMETHOD(clknode_recalc_freq, rk_clk_composite_recalc), CLKNODEMETHOD(clknode_set_freq, rk_clk_composite_set_freq), @@ -355,9 +327,6 @@ rk_clk_composite_register(struct clkdom *clkdom, sc->div_width = clkdef->div_width; sc->div_mask = ((1 << clkdef->div_width) - 1) << sc->div_shift; - sc->gate_offset = clkdef->gate_offset; - sc->gate_shift = clkdef->gate_shift; - sc->flags = clkdef->flags; clknode_register(clkdom, clk); diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.h b/sys/arm64/rockchip/clk/rk_clk_composite.h index 79cd3777c84b..22a052da22c2 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.h +++ b/sys/arm64/rockchip/clk/rk_clk_composite.h @@ -41,17 +41,13 @@ struct rk_clk_composite_def { uint32_t div_shift; uint32_t div_width; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; }; #define RK_CLK_COMPOSITE_HAVE_MUX 0x0001 -#define RK_CLK_COMPOSITE_HAVE_GATE 0x0002 -#define RK_CLK_COMPOSITE_DIV_EXP 0x0004 /* Register 0, 1, 2, 2, ... */ +#define RK_CLK_COMPOSITE_DIV_EXP 0x0002 /* Register 0, 1, 2, 2, ... */ /* Divider 1, 2, 4, 8, ... */ -#define RK_CLK_COMPOSITE_GRF 0x0008 /* Use syscon registers instead of CRU's */ +#define RK_CLK_COMPOSITE_GRF 0x0004 /* Use syscon registers instead of CRU's */ int rk_clk_composite_register(struct clkdom *clkdom, struct rk_clk_composite_def *clkdef); From nobody Wed Oct 18 14:34:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJk02zHz4x6Jd; Wed, 18 Oct 2023 14:34: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 4S9YJj66m2z3Tfv; Wed, 18 Oct 2023 14:34:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XU/uO0Is/dhni1PePKv0Kumgbos+xDsfpRznjvp4PdY=; b=h8ZSTUsFgT7B7wvI8Hj1Si3BrDTugHgszN/iimyF9V6TWE2CKD/TuxN6d9F4/XL9e8Bfpl GnAOMEbxTepZOk2b4VcLtZDz17okO0yAzygWeZ3t4MyltSMp+j0HqXTNClgGklLKQbZBBd C/RUSkQ8TAOuP5LuNLqKq30CjVpBqicF+tiVE2CdwZeB+aYNp2Uv6VDgkyz4l+kmVx89qJ 1WbfMV0qtoKVIKcxC/+OkJvAXVdk8vWwaWqwu+kFzd3kEfq3OKXK5ogjzZWA/WyydF13ax VC++CDjuzGczrz+54foyE5VMJdVkmpep+RTfGLHW1BL7FpjC5YOcTEYhUPOXyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639669; a=rsa-sha256; cv=none; b=Oa1GjM5+hxDShHJHqPRPe/KKLyaQ/F1/8SRUBXrHmUzqvzpWT7Orm0FpZzU51pJKpiY+9+ gAyj6g/bpM4oLK3w5MiQaSLcVncVOXmLhNp3WX+UjmlK+8i+GF/pB0PQsV0tfUUCLTjcLJ Ll0/5ausldlLM6KHHaeFZhF/66liJ/xpsETFMAYCh4SqOutsRzI676tYeBtOSkU5VCU3VP wclLI/NTGnTn0PS0+ASPW/6JD2Y/AUmccKeFPq5DorkLYafCNKpHkpOarI2X5HC61RT7qY xhUbcfruuJPlZymxUaD6R7Iu5ptjivFnSuqFscU5aLjWoAldD9JlST/0WXn1kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XU/uO0Is/dhni1PePKv0Kumgbos+xDsfpRznjvp4PdY=; b=jpLzICCdvdMPzBdB4QkA83/zB/A3LkvGBoWQ2BsLoBoaMgHjqOj/K6Uwgtr2hbWNNfE1tz gYk6/DKCXZkB1wFamWMKfTeb19UslE8CqH3bTorO0BEloz+oZgK0jVd8+LhvqqRGW7hfLY 4JzuwxmOig2hAUgA+r7flPRyBiz/urdXyrS+4TIlc75QJ11+4sRWlENG+zsayJ+SSDpE9s YNzGLQcumjACBz63aqI2tStemwkm1cgRum0HFNbTCjr07yAnpIbRlQENPVOr0K6c4tbMHH /PZ2l1yxi/XfQ9z4v3obsWVGBD1vaakJOhd0vccGN9PI0kOPicm17DoF7RhOOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJj5708z19GR; Wed, 18 Oct 2023 14:34: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 39IEYT2E092747; Wed, 18 Oct 2023 14:34:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYTtJ092744; Wed, 18 Oct 2023 14:34:29 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:29 GMT Message-Id: <202310181434.39IEYTtJ092744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d10e2facd6de - stable/14 - arm64: dtb: Add rk3566-quartz64-a.dts to the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d10e2facd6deb9bbb0d6dfd22a91e0891c3855fb Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d10e2facd6deb9bbb0d6dfd22a91e0891c3855fb commit d10e2facd6deb9bbb0d6dfd22a91e0891c3855fb Author: Emmanuel Vadot AuthorDate: 2023-08-15 05:58:05 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:37 +0000 arm64: dtb: Add rk3566-quartz64-a.dts to the build We can boot on this board. (cherry picked from commit 2303980cfcb1e709c17b108ce66a25a8e7eea337) --- sys/modules/dtb/rockchip/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 79ce7f2c7407..8f747738e6b1 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -16,7 +16,8 @@ DTS= \ rockchip/rk3328-rock-pi-e.dts \ rockchip/rk3328-rock64.dts \ rockchip/rk3399-firefly.dts \ - rockchip/rk3399-rockpro64.dts + rockchip/rk3399-rockpro64.dts \ + rockchip/rk3566-quartz64-a.dts DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ From nobody Wed Oct 18 14:34:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJl11Y2z4x6VN; Wed, 18 Oct 2023 14:34: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 4S9YJl0Jwdz3V27; Wed, 18 Oct 2023 14:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KOXp8FZpuM+p81ib5VDult5dlAE2GDASJ8nGCKnGBps=; b=KqdymkWimwB8e5rj2yDmq+IMUZS089ag1OfQiNQab2QYzvyZFvfleMzHu7ssdOjfElyADU I1qOLyWxhcvW8PWVu0/rO03sYs4z5ym2MARTjXpPE4WpBe7Br4LgionInaU+9pLm2BtNSd N9v94s3X6/CUWGvx9VbsALH6BQE6GQ9zVlIBO1Y8JGblzlnHymsU1AVzmcKcoufLl5CTYy dTDuN4fE0NFoJ0obFSL18PAFvzlDvdLsISEm1XB6xjIuaAd9TTNaoF0v20BR3c8bdaZILN P7Qh1KIsft+tgJNSVTeGBUXnGfvNeBiKalkWit7kiKd1Iq1q750QqfyefD4M+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639671; a=rsa-sha256; cv=none; b=nwD8qy9Txu5Aj7TBFZqfsmey13yfcEXIyd5foAYnVJAEnglYtk3ER4ZiWKyfz76FOvn60m IrbgxBFygc0mXStaFJtvRlp73Gm8s3GhWDOhF35gcraT1wEcx2rp8xlAfonen5suGpyMBl xr5Ol7/vsMN0EMx/7ScmobS5DrwJlJp67nXoWV7h1H7X0UqemZLXvRhDifA7be1i6W59Nc nbNBNfxS14bzq4kDQgjf3t9/dbOgceFVgw9sehKymQOOGfqhqtSSKjoBre8FD2WzvGi1x/ E9FMZ6tUHWUt/wU8mSs55qHPechwlxHEOqlsOfcxIwzMmrDg2CqY0VVQnqR8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KOXp8FZpuM+p81ib5VDult5dlAE2GDASJ8nGCKnGBps=; b=App12hwyYJxHQQeRmD4PcOF3xcwb+tO4fQzs2Rj63TSllRK06fAGNtMLZb+oz1hpWBPc3B xL+AEhEDv018k8GzoXsIdGnMPFaadS+IH9I97trmktnuZHGuCWSQh1jGp+TJv/09fcjImn P928KPJ7qY9ZSMSYGYtfcD5Y5x9w56zWBb/X/AdzcM0yxqhqUUE4rKb2EsKDVPTcH+tVuV VgfDeBH2RtXqAWUReymqMGqa76UCKmJkLXrSqX5wIaL9NRtTXvUOw+JDQv8tAeIAFvEy6z gH8pBMwIB3G46oVBRQywR9YC25VtXxJ3iLd5voHg5TaGY2c1UabI7erQbUdHyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJk64chz18pG; Wed, 18 Oct 2023 14:34: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 39IEYUIa092805; Wed, 18 Oct 2023 14:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYUAh092802; Wed, 18 Oct 2023 14:34:30 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:30 GMT Message-Id: <202310181434.39IEYUAh092802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: d7d51aad8fc6 - stable/14 - iicbus: pmic: rk8xx: Fix logic in clock-output-names detection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 commit d7d51aad8fc6b8428c8de442faab4a49e5f4c5b9 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:47:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:38 +0000 iicbus: pmic: rk8xx: Fix logic in clock-output-names detection Pointy hat to: manu (probably) (cherry picked from commit 66946511380bf088c96a7517ba9b018c943655c6) --- sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c index a51937da0060..a2ea1e5bb4ba 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c +++ b/sys/dev/iicbus/pmic/rockchip/rk8xx_clocks.c @@ -112,7 +112,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 0; - clkidef.name = (nclks = 2) ? clknames[0] : "clk32kout1"; + clkidef.name = (nclks == 2) ? clknames[0] : "clk32kout1"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_0, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); @@ -124,7 +124,7 @@ rk8xx_attach_clocks(struct rk8xx_softc *sc) memset(&clkidef, 0, sizeof(clkidef)); clkidef.id = 1; - clkidef.name = (nclks = 2) ? clknames[1] : "clk32kout2"; + clkidef.name = (nclks == 2) ? clknames[1] : "clk32kout2"; clk = clknode_create(clkdom, &rk8xx_clk_clknode_class_1, &clkidef); if (clk == NULL) { device_printf(sc->dev, "Cannot create '%s'.\n", clkidef.name); From nobody Wed Oct 18 14:34:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJm3rKrz4x6XG; Wed, 18 Oct 2023 14:34: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 4S9YJm14MTz3V13; Wed, 18 Oct 2023 14:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bKSGCbph7xAupBO0+o+CrXlYF6m0LIvOclKcDSSqGE=; b=YJaJM1MHSg0DDkVczjKdSSR6lWgE+Xj0GzvG4Z3n/vEzOgLT32UUg5sNDZksD2nwZfKE2z /DIuUN9XHuJSeePd9VRfIMfVPCbaWIU5JEwbA8R0tOw1p9Y1v6XeIt76j1ipsvXHmw0oG6 u9VlDBaQBMd+nouXVQjX2uhpgjQMHI81JR283OI035SZheT1/8je8CL4FtAby64LDt5+S8 sqPetJ+iEjVDZuS4oM/dRzJCwlqwWXtJ0GQuiM/1VezHjRNwD9f156hi3jZbhqoidXkIvv tNMw3KFZcA8ZaHplxtnoh+btREv9+NX3oF7B+6DWWUYW9WC8adks8I/WwbZfxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639672; a=rsa-sha256; cv=none; b=Bu+Y30XiaaGzaWtLhfks5Bwt2I/HDdvoBhJ7NIpgwklDiwrOa1c9uOIU2if63kgGbSeEL/ SDteTPczmvzzOe7GwC5ivRoFdXJxV2u1cM8n3Vbzo142buFsrHgTg7e6YGsZt1iCbVJDJu wDzu8cUJcmc4ZoAFWdtTY1S/F0vctqLcDXm1YH0PHdxnaY94bemXp2IiBmP4ObriHtzsR8 ibe+2qAJXa5QwWtyh5EeH0QJ7DmoVc3F+1eKVhOAtA7I4lF1M/bkNEG0xQTh8nbAktezDH hfCMgYzJQmCSjCGikvsXyY7MPLUiz4HgZL5FgisC7xdCbZK7UiebtY53j/3oUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8bKSGCbph7xAupBO0+o+CrXlYF6m0LIvOclKcDSSqGE=; b=Ce6jmcYcV6RaNnXx0rgA4HgBhezQH8Sna5ORxlgbEBbumYyeu4/OWkmjlecmcwou9LY2j1 hPqYmB1ejwGJYYgZZqP6/QwKP2Pr7AzHXj0zbKAHucW5F1m/BsRjyG0EJGYNigxBqm1PS1 j6s+Tulnm3dGHC+AlFcultRut+9erxqdGzLNSS0TvqaKKl7ovyUKBQxupZb23oZ/wX3NjQ pfrY8dL0ssHd19qMW0jI3nXYqw31yAKiV3x7WSlGZAhbwSnLR0VG1nwCqs47PdAaEq/bUv 1yu2vk7KiojuX2WHl5JCK59qUYOhvabJAbdxC0GMLnA9rkBVot5tH51MATcCNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJm05Gdz18rx; Wed, 18 Oct 2023 14:34: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 39IEYVKV092857; Wed, 18 Oct 2023 14:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYV3f092854; Wed, 18 Oct 2023 14:34:31 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:31 GMT Message-Id: <202310181434.39IEYV3f092854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 8cb78c56a6bb - stable/14 - arm64: dtb: Add rk3568-nanopi-r5s.dts to the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cb78c56a6bbf6b7ad0611ba6131ae208c3889c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8cb78c56a6bbf6b7ad0611ba6131ae208c3889c4 commit 8cb78c56a6bbf6b7ad0611ba6131ae208c3889c4 Author: Emmanuel Vadot AuthorDate: 2023-09-22 16:50:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:40 +0000 arm64: dtb: Add rk3568-nanopi-r5s.dts to the build We can boot on this board. (cherry picked from commit f9e26e7853399e7b80ea033fa7fd72e8afe6d061) --- sys/modules/dtb/rockchip/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/modules/dtb/rockchip/Makefile b/sys/modules/dtb/rockchip/Makefile index 8f747738e6b1..f8796ebb17af 100644 --- a/sys/modules/dtb/rockchip/Makefile +++ b/sys/modules/dtb/rockchip/Makefile @@ -17,7 +17,8 @@ DTS= \ rockchip/rk3328-rock64.dts \ rockchip/rk3399-firefly.dts \ rockchip/rk3399-rockpro64.dts \ - rockchip/rk3566-quartz64-a.dts + rockchip/rk3566-quartz64-a.dts \ + rockchip/rk3568-nanopi-r5s.dts DTSO= rk3328-analog-sound.dtso \ rk3328-i2c0.dtso \ From nobody Wed Oct 18 14:34:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YJn3hvlz4x6VT; Wed, 18 Oct 2023 14:34: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 4S9YJn2bf6z3V2Y; Wed, 18 Oct 2023 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=74dfhVTdlJhej0GFDSAamd+E9l9HjjWsljRPV8MLqEw=; b=USqrlyCP4JuoR0sRUF3d9c/xlkzfBDsdTzCQlkMeyweIHg8wwdtI8bGZ6AWLR+VmfJG0uw vBwZHe8p29rKfyZ3LVNn9Ww7mt3pvmKrXzRHAEHm/lqV4zSuSJL0SgSlqGBtEyIgW567JW VuB2l22JPmq9exNgyunLVc91yq2kHukrBK37PSONSAWNTb8MZ+ULLmbCBiajxwszwrERMA wdeK50gD0A6El6PUcFh4H9gAqmBdGZnHXQP+fxdXynJJEWOkhVOyeqMpEDBCu5l5r/+f6I 5E8N8e5WLk4aOTG70X6LloF0HSr3HrG4QTnz+U9J5t87v+RQDZnTZ7c3OzxstQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639673; a=rsa-sha256; cv=none; b=wixWJru9slurYJTkbV322X8jHdbyA741AtIPOqrtOU+SGaoQgw8g4tFjXZRe0pRfLfFsiT eH9Sn5lH0iZb1CQDl1XF7LJQZXsMYycm7vNjjLd/pMiNGH+kelKj63THjSUggCUNXOIV3q Jbzm4GFJItyue1XTFMrB3/dCv5k+zya3EihYjzQN+OJj8zmyqpYGTsorDN70RQJA/CNy12 RhjGUyNOVTrFZ44WqhR9t4el0uvrHzWVM1ivl5CnXekOzjvechB7Dw9Ee48iMVpCYytAKw FTDXl4+NF8qZHmfwy0j56Y7mERketfJKSw900XBxMWrM/Knf/62ve/HgNykMcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=74dfhVTdlJhej0GFDSAamd+E9l9HjjWsljRPV8MLqEw=; b=AP3rMn/mncSu+DSg6WqMQ4lh3uHBLxTVowrUGNH0LQUR2sWUBc5Fzkl9DjwrdNaC3hu3fY 7VDuLYV+3i/7PidjzjHvzDNs5B7KGcu+jC8yr6P1FfuhyZoOqQ3QcJTz11+z4n3A+PJipk 53T+FNcpWz6pIeO/3do0QBLhSiE51FXstWT2+ymN+vZJd+nPoEA8kJV9mFPXngNMHJFIU0 xnC8jDA77S0/9q9e0p+aGt6whtTO2n9ecf03cHB/6jCw2FTuJoSrHfo+tGgr9LnyINGXX6 PZjyks6/SpYLu5KaOOZaaSsc0CHrKyB5oEoCHei8XoQ+X0TKh48108Ds7gyS0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YJn0slJz18ry; Wed, 18 Oct 2023 14:34: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 39IEYXTm092905; Wed, 18 Oct 2023 14:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEYX71092902; Wed, 18 Oct 2023 14:34:33 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:34:33 GMT Message-Id: <202310181434.39IEYX71092902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: e8d7fd8991bf - stable/14 - i2c: rtc: Add module for hym8563 driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8d7fd8991bf5de5d2526a21ae8924315ecca563 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d7fd8991bf5de5d2526a21ae8924315ecca563 commit e8d7fd8991bf5de5d2526a21ae8924315ecca563 Author: Emmanuel Vadot AuthorDate: 2023-10-06 19:20:00 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:33:53 +0000 i2c: rtc: Add module for hym8563 driver It's used in the nanopi-r5s (cherry picked from commit 03205a8cd57feb95752142d899d026ff8f45f3e6) --- sys/modules/i2c/Makefile | 3 ++- sys/modules/i2c/hym8563/Makefile | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile index abbb390b0e07..6c976e9303f1 100644 --- a/sys/modules/i2c/Makefile +++ b/sys/modules/i2c/Makefile @@ -28,7 +28,8 @@ SUBDIR = \ smbus \ .if !empty(OPT_FDT) -SUBDIR += rv3032 \ +SUBDIR += hym8563 \ + rv3032 \ rx8803 \ tca64xx \ tmp461 diff --git a/sys/modules/i2c/hym8563/Makefile b/sys/modules/i2c/hym8563/Makefile new file mode 100644 index 000000000000..e64190887610 --- /dev/null +++ b/sys/modules/i2c/hym8563/Makefile @@ -0,0 +1,13 @@ + +.PATH: ${SRCTOP}/sys/dev/iicbus/rtc +KMOD= hym8563 +SRCS= hym8563.c + +SRCS+= bus_if.h \ + clock_if.h \ + device_if.h \ + iicbus_if.h \ + opt_platform.h \ + ofw_bus_if.h + +.include From nobody Wed Oct 18 14:36:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YLk1flcz4x6fK; Wed, 18 Oct 2023 14:36: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 4S9YLk19Jtz3XMJ; Wed, 18 Oct 2023 14:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBUcYvBoo6zL1G9H6qpOTxC9VQEk1DPyGhzt7/H7YRQ=; b=wG2DNjvJgM4WTrUh85e0oAgmsaiehPE64P3dtPZ5HZ7NRXbj5F7S1f0jbW5HgjqKxZTxis W82FcB6u5Ca+1Vf01381OHaFoMEgv6jTBioeb0wmnyBVRyCRoTvscS4niTnFblE1Br81CI jZNrjT/E0aDEGGIA7k8qcvsU87bdp78zlzZViFpr/dsQE6yBbBnnumSMJjOdZZ/cL3mIge Pl4FhsQAd4xq3bpdl1j6dx2a67B2+1JGRZIO7sqVc9jSGvzz8o9JLKI3dc+JVNKjc0xUd1 deEc3V4n0jaj9hfONTkX3WI5Q6SOvy/IaMxnMac+IdaZc2uPf5yIBMnZafTPrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639774; a=rsa-sha256; cv=none; b=Zjla1S7Orh4IuwMmrY9dI1cVkdYY5o/znJdk2kmA7F8w7/VhLmpiszT8qpgua27GkhOGc3 YI7JNaQPSsvO2H+VhKwl2CabrWNXCZ9a8lYU0iszpkQ+D5BIzvEhc19fHKuctfPMOSfs/R dh+7SSHvfhfR5Wt0oMvxRQGGpv815Pt3WaQxyY9i1oPVAxzSoNKGYAD8AHbnm5SNbYn84L RLA9mV3u95lCzMKBDeBuJGwqgsz5NSNxw0S8YXfuDWY8R5+xXit6Zd/eQAUjUf3wqasn4F Of2/3ko2TP00dA729MUhZCEn/ok3fpcyHYrdOmtiL3hgFx+F7HW/Mi+LdCh4QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rBUcYvBoo6zL1G9H6qpOTxC9VQEk1DPyGhzt7/H7YRQ=; b=F2dFthSpI3gecUEh9LYS1M9xlh/1rrsFYINW4Zm2bApjeXWd3BGCM02vsSoz1KGr19TaVT lnCGaSjvRMK9voma0lczJ0DmsT02sIXmQAzkDXTY20u5jJSYw9JPxbBhjvHU1jYvjyfMnM ZqPCLUDmhLkZ/zC1r3mux3EPDImTOS1z+1P8eU7LEeY2jVOag5hOZuzhYqE5+KX+bLZUjA Pg+nk4BOzbl31e7UPFur6gcRXl+pM4PP+TGz29HDH0twlLwUPV4GkbhPU/lLfdKR/h/tVb hQQaDGia6qVzR7ChZqU+eOwtsjhWoA8Zoc7yxEDokpx2Epu4/cqAEoAnA+T2pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YLk0GZZz19GV; Wed, 18 Oct 2023 14:36: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 39IEaDFJ093333; Wed, 18 Oct 2023 14:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEaDKb093330; Wed, 18 Oct 2023 14:36:13 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:36:13 GMT Message-Id: <202310181436.39IEaDKb093330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 23ddec9e8f6b - stable/14 - mtree: Add missing sound entry for /usr/examples List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23ddec9e8f6bde711ff65e48b7345757516189d8 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=23ddec9e8f6bde711ff65e48b7345757516189d8 commit 23ddec9e8f6bde711ff65e48b7345757516189d8 Author: Emmanuel Vadot AuthorDate: 2023-10-09 09:21:53 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:35:56 +0000 mtree: Add missing sound entry for /usr/examples Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit af5e348c61dac360de7774fc0ecbf53ae056177c) mtree: Fix entry Fixes: af5e348c61da ("mtree: Add missing sound entry for /usr/examples") (cherry picked from commit fee14577d59013f2277a4b0f4b2f4108e417e7c3) --- etc/mtree/BSD.usr.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index f434946e4b4f..396afdb2aec1 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -350,6 +350,8 @@ print .. .. + sound + .. sunrpc dir .. From nobody Wed Oct 18 14:36:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YMF2zmpz4x6h5; Wed, 18 Oct 2023 14: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 4S9YMF2RZqz3XqF; Wed, 18 Oct 2023 14:36:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N2ulWq3sOhL2j122wKJ5TFgVz6eZw3gCCqHnskO45pw=; b=XMfRkE3+rK/wrpf+EUdILKIgKF/1d1xjrg8c8QAmCGwPuWETljNL1hH9Vp5vDjN2m9ogNf ddNgMTGwdL8z3XOndt7tcROTSxZnCS7sTMpTOXQLTfW05On2UPcd8Zyqsb8rEo0MDGnEDc ccJuTjgKQrQ+eG6Mx7PmVYm1ViVPYrZpzCxaeOaH8QN6pRHnFQ9EVlfV4HKs8eXc8NFGnh HYVMXe0GrCDGGFvWgPKAJO23JrVaxNNNSfanRMLs9Tx8dhIfg2bbulIxedZ2uOVe5EvQ3B xi7vEY2M/rI0M4+7n/rXDghnPkTtkU8INEtNeyYw9uMyIe4/e9MQWtxRT80aBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639801; a=rsa-sha256; cv=none; b=f5W5jtnQy9msbXyhUciYyBNxfvBGpP/j8/h6sC6JC3GjftoJBszFtHEau/hnV2nhbCNIpR rKJsM5JIa3/Y+uK4SSg7Y3Z07wMKmnpbLdRp4dgn2GjwqCyx5gKImqUlsRwp0BYqdMZJXb go7YtkQhi5ZpzZ7tGv5EyRF61nPiNnBXvgXNziW+ADgssTj81jXFwazlEh9DvGNr9sLiWR vopHaHPCn65QoGZrKfhLiVtjbAIUyixaeD9fXuR0pOcWjdmRQwZavkOH+3L4FJzfKhGpeM IvfdDoSH1v6lkOOWHK5urIs+rUaaB2MeIf3Da8nci+UH0UHdQwhJlOeVInqCBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N2ulWq3sOhL2j122wKJ5TFgVz6eZw3gCCqHnskO45pw=; b=iqO/uwjPd4EydpAsX3Rrdh3ZSUWw6EIFsyWNNZWG6IBHlFxBzwzkZ26YgiIRCxeJL8F+SH D0+pytBYdWeMqqVTVBxR60KnoPXiEqJK8sPkTeBgRkF+Z3NMlgzUTiDilXPRy7dPsI4Lge Yu9EGDTMBzM+kIdjUe8DamnB8ji8OTpQRqumtE65OwyVwTpNSkLSvkzLcOoHEvXJwzaxsY X/SHJvW67WMzn6EGaxytGHVo0L9XJd4rjo5hJ4jsguOdAu/p0rn0xDGNuNjviKhH8M4PQR mLqRMAMerQHF6BSnsvHQH1/a4x9IeQiamPzas090h01/Q2BnVmehsIncWFfSmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YMF18Sxz18YR; Wed, 18 Oct 2023 14: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 39IEafdr093551; Wed, 18 Oct 2023 14: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 39IEafJ3093548; Wed, 18 Oct 2023 14:36:41 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:36:41 GMT Message-Id: <202310181436.39IEafJ3093548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: a01e703e5018 - stable/14 - pkgbase: Move blacklist utilities to a new package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a01e703e50185cf30f9b7d0566656c7d08e55a67 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=a01e703e50185cf30f9b7d0566656c7d08e55a67 commit a01e703e50185cf30f9b7d0566656c7d08e55a67 Author: Emmanuel Vadot AuthorDate: 2023-10-10 14:41:52 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:36:27 +0000 pkgbase: Move blacklist utilities to a new package Unbloat a bit FreeBSD-utilities. The only package that will depends on this new one is FreeBSD-ssh which not anyone have in some setup. And this will allow to have small pkgbase setup with ssh without having to bring the bloated FreeBSD-utilities package Name the package blocklist to reflect upstream futur changes. Sponsored by: Beckhoff Automation GmbH & Co. KG Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42148 (cherry picked from commit 0983e80a9addbd65603a430e186d2a50b4e15e29) --- lib/libblacklist/Makefile | 1 + release/packages/Makefile.package | 2 ++ usr.sbin/blacklistctl/Makefile | 2 ++ usr.sbin/blacklistd/Makefile | 2 ++ 4 files changed, 7 insertions(+) diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile index e8d25ac7f1b8..932e186e3172 100644 --- a/lib/libblacklist/Makefile +++ b/lib/libblacklist/Makefile @@ -3,6 +3,7 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/lib ${BLACKLIST_DIR}/include +PACKAGE= blocklist LIB= blacklist SHLIB_MAJOR= 0 diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index cf91873fd8cf..255ef648329d 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -17,6 +17,8 @@ bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils +blocklist_COMMENT= Blocklist Utilities +blocklist_DESC= Blocklist Utilities bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile index effba6761154..1e4778bf0953 100644 --- a/usr.sbin/blacklistctl/Makefile +++ b/usr.sbin/blacklistctl/Makefile @@ -2,6 +2,8 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +PACKAGE= blocklist + PROG= blacklistctl SRCS= blacklistctl.c conf.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile index a33ea1d285b1..b6d1e236911e 100644 --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -2,6 +2,8 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +PACKAGE= blocklist + CONFS= blacklistd.conf PROG= blacklistd SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \ From nobody Wed Oct 18 14:36:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YMG5qCmz4x6Xy; Wed, 18 Oct 2023 14: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 4S9YMG3My1z3XhX; Wed, 18 Oct 2023 14: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=1697639802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TQgtysWqvQFHp5oTqV6jLQHzxB/3S1wt0ckBYkMxRU=; b=CsPfunEy75OH6TeCj4tx6kEYwqs4EpqehGSQERE3vvLUwCbL7S0zs2uXl9q+flYAlHQkrU 9TMdlu95U7ML+wVaiXtK2XwTsM0biVFIDUPT+j6F6RSTiBKb2jkJycn9b8sFLvbkI0raZM RK79q9cKUqeeGh2IXFVObEgi4M88m/pdDoZUmU56L8Xt6VMip3Af8bozwhJpUbeotvsLDC HMbQeKQeMqBJhfgcYtz7ZTJx2HoRmNMNqMsdMsJ+AGI8qXDwCmbsrxndosCL5j1ma7enKH 3HI1H2bKuEvGlYxz4sonHLrG0IsKQu54CY1pKFYiw6sdrjC3Z6GMJOFBrQ/oMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639802; a=rsa-sha256; cv=none; b=RKua6c7awOlbvg1B5nad84jtzEQqO6Vz6XE2CnvJEsOKemCafDxlBsamyv8VBBWojtFFZ4 T/C2yuovQLWsv092sOX+15rS5nW6FfwZqJ+D93Rxfjtcn5N4mNWdKhsq4/jpxlxjWpFn/s acEEFXPahBygmw2Luii8AFF/YvenHtEYWU+VW5vHysOGF1+O2PwXp4AaPYOjkPb1cuvU5s 2xn1a6F+iE+1aQT6+/sefNQAiFjAEe0XWLKN3D3zyHHm6KuX2hZv1xSvz1ekLGUPhbATpJ zn62YiaLcDiXUQX8YgfLKlzMrO5/xzc9Y6AUGIgvge96S7K1M7nCJL0jqxaT+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2TQgtysWqvQFHp5oTqV6jLQHzxB/3S1wt0ckBYkMxRU=; b=Z/Mlh+8pGt0lxWX/7L1C1YWVMObnOYLJbExOcLKMVGVK3i/fT44iBQxBt0Gh83IhG84rWH ycrwDkxfZVrvnjFC+W1qU82ltGZ/gPNfhdNRM9YEqiNkdwUBMEwmN/wKNE1+JF4q1IG6va k0KHOJYqCZEETR25d6Bem8D3gY9NMZZmizWuRTQIkGKYCqEVqKHRVbSecwrBNKFlLQ7gL3 Rr3h9s2n48IZ/UjXugvRurnMdykxShC4wdWBNuhQ2lu9GL8wC6Bo2ul19wulkRzZy0ZlK7 8oIBpNC4MkIqZuPg2LvcYdJpabvA98A0YO9wIc0WuivAbnN4hc05VwifAevDcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YMG2QYWz18vV; Wed, 18 Oct 2023 14:36: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 39IEagik093597; Wed, 18 Oct 2023 14:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEagNG093594; Wed, 18 Oct 2023 14:36:42 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:36:42 GMT Message-Id: <202310181436.39IEagNG093594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 08e6279a9f6f - stable/14 - pkgbase: Move uuidgen to runtime package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 08e6279a9f6f5a41fbeaeb3cc3ff93dc0a4d7d38 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=08e6279a9f6f5a41fbeaeb3cc3ff93dc0a4d7d38 commit 08e6279a9f6f5a41fbeaeb3cc3ff93dc0a4d7d38 Author: Emmanuel Vadot AuthorDate: 2023-10-10 16:56:20 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:36:30 +0000 pkgbase: Move uuidgen to runtime package This is useful to have a valid /etc/hostid and /etc/machine-id for small mfsroot based setup and not needing to install FreeBSD-utilities Sponsored by: Beckhoff Automation GmbH & Co. KG Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42149 (cherry picked from commit 6a804af4c0e3ce3574e23695f587c11f5958bcbb) --- bin/uuidgen/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile index f0c4ce2e3538..234ee20300eb 100644 --- a/bin/uuidgen/Makefile +++ b/bin/uuidgen/Makefile @@ -1,4 +1,5 @@ +PACKAGE= runtime PROG= uuidgen .include From nobody Wed Oct 18 14:36:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YMH4vrwz4x6Y0; Wed, 18 Oct 2023 14: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 4S9YMH4KZ3z3Xfj; Wed, 18 Oct 2023 14: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=1697639803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8p6KO+W5l2RDVmD+WU2ZBlPZ1qWaOlvZMpWQ3kHbMc=; b=VFLWof9CD7MOePLP6HzasvY9BiZ3hZYu8ve2j2wa2nG1WpOF0ZmWOCF2nUHL5eWQadgis7 ZOFrP83R7oQSh92NwlPG7IFsl2Z3mHjLrqop4kqjec4LYTVCYHA4f/oV08XyEyPkaQB2q5 S4j5r0bChRlGZSgCutLwhrtzmOdF7pCU3UD2UxXdeYjsy2p5suyFbK4Cu+6oXCKjR1Fto5 DoS+C0MVBClti7SU3uuV6XuH8i8jfyWBN/7uVhCb+91p1DrGuh0xtV8v0vCnzq4G5X1JYy NsSXDqRCYMHHTWTpkl+V9HBB55D81ranXN9FN7Wet8dLuH1BV2W23poPut8qoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639803; a=rsa-sha256; cv=none; b=lj2ewFDlbL240ZwmhUW2p9S5aXhMJc7CtZcdhLa7qy4Fwmn9v52bOm7Hx98jLxkYy3U2u5 8MtAJrrqOSFnS0B/jZLt1Ix+3YS2UeR92KmDICwHglBUevUxeEm7xuG1ZZi//Yn4o80oWc BjycSgN4QrUAdh+f16uxyvE9dp1Zrqz6QPIiidx+JHTeRXCicNvBubv25Gu2QxlPb/YuKR omHiIFjgduyCcjYsU04wgGzZaItWo1GTZ3icrucFeDjVGhu+RyEz+nqY3uSGRdjJEIFmP6 D7Dewo8BdoqKTZpWCAQvE6GB/5E5hwfgyAFAKpyd77uo+gCLc0KFuTzDtzR5Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8p6KO+W5l2RDVmD+WU2ZBlPZ1qWaOlvZMpWQ3kHbMc=; b=huj2ixGgFmTCIXZg3TX3nQmTkh7XcaFFleSppvHXgCQyO+k0mfoAimaG2jq3i2C2NrDuEE vC2+ydDy2PgGxF9GeGtp7TNHwv8h6vTbJbUHfvoBV0ayNLNVmM5su82fF+L/3Sl6nH4CDN XoN79KgXzrHCBa8RtkYmJ/v69cML2YR4c0o3PfguXu6z1pJVuYnUFMtqlouyKLmbpDumJG 96cDISncvLAYznSIpw2m4shNqFWzEAqD2l7diIzRtGr+2ncazPt+uTUM70cQuIfL/mqiEm yt6HawgR0jvrvlS2kSVCvvTHSvUVjGEsSdw4xqh5JxZHTstYgTLyqxLdBx+aNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YMH3QQtz18vW; Wed, 18 Oct 2023 14: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 39IEahXI093649; Wed, 18 Oct 2023 14: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 39IEahnw093646; Wed, 18 Oct 2023 14:36:43 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:36:43 GMT Message-Id: <202310181436.39IEahnw093646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 3469786f2035 - stable/14 - pkgbase: Put atf_python files in FreeBSD-tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3469786f20357f45a0e07878f5e4623d139d6e0f Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=3469786f20357f45a0e07878f5e4623d139d6e0f commit 3469786f20357f45a0e07878f5e4623d139d6e0f Author: Emmanuel Vadot AuthorDate: 2023-10-12 17:41:38 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:36:31 +0000 pkgbase: Put atf_python files in FreeBSD-tests Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 944223076fbcb681a8eb3e118ddafab79b21ac3d) --- tests/atf_python/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/atf_python/Makefile b/tests/atf_python/Makefile index 889cdcdf9592..6b7c39948b0a 100644 --- a/tests/atf_python/Makefile +++ b/tests/atf_python/Makefile @@ -2,6 +2,8 @@ .PATH: ${.CURDIR} +PACKAGE= tests + FILES= __init__.py atf_pytest.py ktest.py utils.py SUBDIR= sys From nobody Wed Oct 18 14:37:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YNj4rvVz4x6hW; Wed, 18 Oct 2023 14:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YNj4CMdz3YZ3; Wed, 18 Oct 2023 14:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHDMdcoOoPmHOvz1QE+klaZxYUyH03+PGl77QAy8HOI=; b=mQ3InmqySZWbkrjEgFIT/uogFn6fTem2eMUIOTd9W9oNtxI4y7XaeubPYgMdeQXVJG1l8r d7nZzDFI0KtubmwJ1SyWXTZ+SMAmodNwO9OT8QFF397VHdc6i9fq9NN4Un1v1/uZ9o84fJ 36QQE5JVVuLE3Q5/oh/3luqK6XbP01k7lUmQLH9D+nxdVjsmgKLbCk0m4Qf/1aGzEVG5GP 2/wAtWBEb0ZUv8CURlcb3S0BELWftjxp/gjVTCwyTAjLztQxnixQHYW71gtLiVTUt7VPxi vyvOfR81DDo0LpOj/PWQz5PJ5zZrTZPxV85aeJzcYZy39mf2bF9+xHmi/Oje4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639877; a=rsa-sha256; cv=none; b=lJvqllxuaoD8BqerCHoZa49zxhAvyCZV0Z5QKJA31BMIdTHMZLaczlyt/KNk2FxKSDjMUo yE8rAGSNeuiUTNDdxNMMvN16F/QfR588CCMKunqGGgrw+JLroGh3eV9HUwzexolj9P0WWm pdJkjrV2oSu+DgMefp9smL3OLgAedzEWTmmpwM9ZBgn6cPlQVzcYABvNPiRbpwZcXWDXfL 68CZEsKjCtiL2KAR9JmN5nZwW0Xbk/BM3oTyxCH+0IHH3ANHRuP1X7t9o7X68dMFyB3ro0 FrhSASyk+XWfjmua/4VyxM1+Vnlh6mZMnVn9Db2ZgkqUUA1g/W8OmozoiAOePw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHDMdcoOoPmHOvz1QE+klaZxYUyH03+PGl77QAy8HOI=; b=jzFMBeqyflBcOUhPzhzHyiKNeyfsAkH+RpL4oxQ4roUW58Hukg8RtvUhlopRcnaAZm9fHl MSP0it08+rMpUNDA6G+hauEA8+jdCp33zQJ5l3rCyaX1DeB/v1OAFur6V/jYsrjVpkXdjs BfMZ1Dnwqx3MUWPizwEsv20iul2AXfOHdb8Tnu8hb94Q4QIi0d9amRXUyX0O4yfgcwh7cf kEc4DxMSU2oDEIfEfOoxdzsvJK0fxbR69Q6wG7qg4UzO6HOAXN/7/JDemBmGxEhCs7KEIr gZ6JP9dkoziN0blXTWM+R7Q6Aw5QOoG0ZVb7MidZM1uNQNG4oc8okpvYsv2slQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YNj3C0Qz18YT; Wed, 18 Oct 2023 14:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IEbvYM093952; Wed, 18 Oct 2023 14:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEbvcb093949; Wed, 18 Oct 2023 14:37:57 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:37:57 GMT Message-Id: <202310181437.39IEbvcb093949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 141fe209e367 - stable/14 - arm/allwinner: fix variables initialization in clkng List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 141fe209e367de8a1c251e9ec34e10ee64ef8263 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=141fe209e367de8a1c251e9ec34e10ee64ef8263 commit 141fe209e367de8a1c251e9ec34e10ee64ef8263 Author: Nicolas Provost AuthorDate: 2023-09-20 08:49:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:37:35 +0000 arm/allwinner: fix variables initialization in clkng Signed-off-by: Nicolas Provost Pull-Request: https://github.com/freebsd/freebsd-src/pull/849 (cherry picked from commit e39e6bef6725bde54f94aac7f0cda47c2170dc48) --- sys/arm/allwinner/clkng/aw_clk_m.c | 2 +- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/allwinner/clkng/aw_clk_m.c b/sys/arm/allwinner/clkng/aw_clk_m.c index 1d3d5a9878f7..2728ff230a9f 100644 --- a/sys/arm/allwinner/clkng/aw_clk_m.c +++ b/sys/arm/allwinner/clkng/aw_clk_m.c @@ -135,7 +135,7 @@ static uint64_t aw_clk_m_find_best(struct aw_clk_m_sc *sc, uint64_t fparent, uint64_t *fout, uint32_t *factor_m) { - uint64_t cur, best; + uint64_t cur, best = 0; uint32_t m, max_m, min_m; *factor_m = 0; diff --git a/sys/arm/allwinner/clkng/aw_clk_nm.c b/sys/arm/allwinner/clkng/aw_clk_nm.c index a1cba2db5f76..61592eb04de1 100644 --- a/sys/arm/allwinner/clkng/aw_clk_nm.c +++ b/sys/arm/allwinner/clkng/aw_clk_nm.c @@ -136,7 +136,7 @@ static uint64_t aw_clk_nm_find_best(struct aw_clk_nm_sc *sc, uint64_t fparent, uint64_t *fout, uint32_t *factor_n, uint32_t *factor_m) { - uint64_t cur, best; + uint64_t cur, best = 0; uint32_t m, n, max_m, max_n, min_m, min_n; *factor_n = *factor_m = 0; From nobody Wed Oct 18 14:38:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YPF3qGJz4x6bZ; Wed, 18 Oct 2023 14:38: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 4S9YPF3GMtz3YdT; Wed, 18 Oct 2023 14:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXA4UhNJ2sCmOCNv7yul6vuvSGQkWsfdAuMNyyCmx74=; b=i+JYsChQ3PLand5bt7QAu7pbVy9srU5pRkvHvvbEWt3d9swKPoh0H0P6mHRUdgbojyKVfz +HHyqNus7HMgyz+FWAUhiP5nbKeUAFCHwvczsGdEBX/s2/ocVfsxYhH7pULadX6C87SJco luTA216fPOi/1xV0BAuyJBrHxIq65hZl7Z3QxBksNTT1CYQLysocrfpHc5DwNVsMktA5jl UH9j62E7xKEP5EqSEXc1KVPYYkojBG3zqjMQMJMhSOwOHJfgj0jwEo04ts5eTBLsEFtGzK iy6EhFGqbDoogOsITItonPIzfF2DgXgOxG+ux8v8X1VDdqSXhduyTq/4qFuWZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697639905; a=rsa-sha256; cv=none; b=a8xem96dhJNCrNANeNiNVBF/31UYZkXPZGW8cmf2DTmX8B7lPwDjQvB6xDAttt8ivOYaUg mj1RRbO6yFnO150a/zX/tqyIgMHCltP3T12F2q86lUiHQnYm3L2apCAlpeOhKWp8On2xtL LFbWBdsqhqitV0Iv+1IgBYq9tM7jmqbGKUYhghjg2VAEzA9jeVN7mUGw6zEuIO2pGn7M9X TkKSdxHRJU6ZPbORjV9J+SUxC4mHbemPGpXTdLFXqZB/sm+6tHfkgz8meQTOgnaO1eOJwo syde9LNniiNcvKIyxuDMZdgEHSfXTh3INqmQgAWvtbQvWBMaSG3/uNNdkw/BVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697639905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pXA4UhNJ2sCmOCNv7yul6vuvSGQkWsfdAuMNyyCmx74=; b=UuAzWAVFOMmMXZgRJ0nPIDI8/41fNEPQoIpiKM5S3V6IMwBYXMsDgK+xPC5d3quMcWGxAX p5Wb9oY+oA3LUMrpQP2Xy5479q1D6vaoHH+YEnAj/VI7kFLWgZIbv9LmM35EfvaY7s3RyX D2+ByW81B95Cs5T1pc0b6aF7TgSfCPvSbvRZ17L5FWH3sv5M+nHQWrod8/RGTuQ19ryXcT OQDdBS2qh1hSTpAJpy82HEG61X7CA+CUzBfsK0VGLHDOoCucV2K14t+3n4lL2gFw13XKUv KZmGAGTIksuYmRLCB+8N/SNQoOJMU+h3pfpXuafaAMFxVMIot8iGiqJwM/4OxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YPF2Cnyz18s4; Wed, 18 Oct 2023 14:38: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 39IEcPP1094135; Wed, 18 Oct 2023 14:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEcPac094132; Wed, 18 Oct 2023 14:38:25 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:38:25 GMT Message-Id: <202310181438.39IEcPac094132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 03ef42bbe15a - stable/14 - pkgbase: Fix ucl for libcompiler_rt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03ef42bbe15aed9226939daf2f3b0e10183dea7e Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=03ef42bbe15aed9226939daf2f3b0e10183dea7e commit 03ef42bbe15aed9226939daf2f3b0e10183dea7e Author: Mikaël Urankar AuthorDate: 2023-09-22 09:41:09 +0000 Commit: Emmanuel Vadot CommitDate: 2023-10-18 14:38:10 +0000 pkgbase: Fix ucl for libcompiler_rt It's only a -dev package now so add it to the list of -dev package that don't have non-dev package. PR: 273859 (cherry picked from commit 36468371ce9565bf8989ad8e561e041bfe9cb80f) --- release/packages/generate-ucl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh index de3fec3f0ca7..aef08e50c037 100755 --- a/release/packages/generate-ucl.sh +++ b/release/packages/generate-ucl.sh @@ -47,11 +47,11 @@ main() { # -dev packages that have no corresponding non-dev package # as a dependency. - libcompat-dev|liby-dev) + libcompat-dev|libcompiler_rt-dev|liby-dev) outname=${outname%%-dev} _descr="Development Files" ;; - libcompat-lib32_dev|liby-lib32_dev) + libcompat-lib32_dev|libcompiler_rt-lib32_dev|liby-lib32_dev) outname=${outname%%-lib32_dev} _descr="32-bit Libraries, Development Files" ;; From nobody Wed Oct 18 14:44:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YWs51YYz4x6wr; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@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 4S9YWs4QWtz3ZBt; Wed, 18 Oct 2023 14:44:09 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; h=from:from:reply-to:subject: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:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=pp3zoiBAeQpknlG/dH57w8Y38dMSkYt6kZC7ULV6bjHxXMNdv3g7/hnZpSNI+64JEP3xQC UNVDaAlCfiYIPSlPz3crIxiVnETVcBuetA8P1gsr+RWXAsC4OxKSoimWPgIWocnYVnujup za0nwVtFWfnmwY17Km+lgBlJB7pQURPE7ajSWlMEBbTl/EaGdjW/KXW4kMiRO450DukBBZ nQK+Lyp8gK0Go8FDxKDynIwlVAIefsPyD2KA/kHZDOjpRywsPk4tCkygJe4Cqfm1Oif/Gb 1OsKe3UGOM44pSF435FhAx6wbgg8yp2m91yAZySUQH5wTYurlAYw7jiKathNqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640249; a=rsa-sha256; cv=none; b=t44Mv1wvqxlofx1EkDHR7V/krA3TD8Sd7u4Hge0Vwm2F1vWdQvz8WWxhPY0aOAuHQegwDC WG9m9DycmluHaNko/PVEAvCaMfv+7y/mGTCy0X2UffcHPyLX/K4IP7L9d2kdUmnejPUjLr 2iw6QSlp84Vw8OH9J4aMPBhfkslkF9mM6EpRSU1ElCeE0xqeZQjFIzPukQQ6OxaFGy9G3Y OLGOkP9RjjY/Do1DkT7rZDDfYQFW0YaUO4SuP18kdRKXHVACFq6sg/DrLNN1lsazX/n7G5 BYMDuJX0NGhUz4Rj5ZuCCY+AFLfwxjmlSUQSQWUNXN8cc3im6HTehMj0ijvoGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640249; h=from:from:reply-to:subject: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:autocrypt:autocrypt; bh=oO3DccGcplq+sNVR/y0ZjV68DkXeCRrq3eMxmQn0/Do=; b=iDB4DQFs1sRuNuxSigZpiwzhlasgglIsLNlE7x5MD+VOyIYnGEHSAWrh1ObmpwyqyoTAYH CPg41lVSsTe6ajJj0JRQ6W+eTPwiK1fTOIWVnchKBSyNTkDm4ys/fs/zlbPk0rsDavC/rM ac+Jk2Caw7amUhD8tf+BYlnUpgZd/kW1k2J4+8yZLvj27mJGw/UuyQfbpJTmhhpIKV+IQJ e/Ez4NciocPdO1l1F6aojuDY6LpGEKY+gWmPRLm8upI0hI+glOI48lo2HmNtS4YLy19TfV kV/Egksly+SbaNsBcdHOJJrSyGW4p11vXIeSF48GQ0e5oEMFuFZoW0LK0/uAPw== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4S9YWr6Zb0z94N; Wed, 18 Oct 2023 14:44:08 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: <587cce35-35d1-4e5e-8ab0-5df8cc8fa670@freebsd.org> Date: Wed, 18 Oct 2023 11:44:07 -0300 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3a338c534154 - main - Add the BBR and RACK stacks to the LINT kernel. Content-Language: en-CA To: =?UTF-8?Q?Dag-Erling_Sm=C3=B8rgrav?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310181413.39IEDXce057484@gitrepo.freebsd.org> From: Mitchell Horne Autocrypt: addr=mhorne@freebsd.org; keydata= xsBNBFyS2dQBCADdiXBG8hBVLmYbxu7aSzbwLwUf3HkGFz3rooS1kwyy+SfmjZ4UKNnl9WMx WKrJ7OAZpiNH6bLQ5nsqfx09OnpWL8c/QuPbhNdUywQoqqYpRI0K8GEn//nS9Gs0KTYwVpWb XlrzP+jf3Uh/9L5mcQmStLIH4zaaqMYHW+pMuPrvBmLIHTvLj2QjOkxslrcUdord9uvxe5Ht LU8RuTpQpHOKz705Z9/v7twFdi2HtKzpLwO6SzVyu351di1J+GihsVpcT5josQV5cHbIP3Un x+kmtKBEEc/jl/zBglF7ruWUtwgbryID+2ZPEaO1Mj+RResX4LFVMusq3uUpWRb5WJXxABEB AAHNI01pdGNoZWxsIEhvcm5lIDxtaG9ybmVARnJlZUJTRC5vcmc+wsCUBBMBCgA+AhsDBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDpUFCQtC z0EACgkQi/gnTOdUid8IsQf+N8IptrrCgifT5Z0/WUVFfnHThFOKf4zBjaGswsIM8+VKsKnF 15jCWHODUHP6s+dcQ4nQi81PHPsnMfBSkGPvN/X3ess2/1KUVkH+6tAJbqXDjXhD8HT+i0NM QEFIXlLnotpgIKW3yOHjKv3ZvKw9LCvUjyNY9vOJmLk/6AbbkFh+INo65nXtQWb/hM5FVEHW S+zUoU8AqZRJoVAQfj9wmIfg/HdsxeDGKL0zkv5AwKpccvb8VJNGJbCVMgoy5uQYcUeXxcie cg0VlbFLshNQTfyhVQ85vyuHahARrUWs/k8KiYODoBnW1ChtyF8yM6VZTzSYx7pINqPq2YZy i/Htd87ATQRcktnUAQgA3zt4M4ecoQqfxpjliNLujt9klDqvmkJvWmzMuMXdzlPgGRJ0doio 9YIeEdkOt6xN0pPTK/ReCZ8WqFQ8zo23u1pwGuo0CnR58XF19wyxyUuKu/PHbt+56mC8tNHm AXsMyXQmlDqWvn/WzLY7euNRtNS4QQIwtxfM5EC4GGa5KQwxn0kM7dkUSOE/cxr+/kNbHHzb gagZR4cnNUqtPPr3dYXcibCTzgz96Lyt3/qMLXX9RTBRzu+O6E+byxWOe8ar/ZlwY2b4wTQG mhgNttkSxKtxMpZnd8+DGV/bI1P5Ct/K2GeCwNyupQGON5ymn6o7jTch+qmFX0ItkBWO4zn4 9QARAQABwsB8BBgBCgAmAhsMFiEEkp/cYPcfabAiQvACi/gnTOdUid8FAmIyDtwFCQtCz4gA CgkQi/gnTOdUid/i5gf/aQ75pJR4TJFM2vVVr6PDIwTdl0b5EchB4w4s4g/zE84XNbMOQanb BginLYEhAacLQVAvM3XdvUEhwrhaMQdjdSEB1krResL3/mbxrtKwdHSMbHA3IS3XdvxFWTB7 P5JjUSPsW6hqgoidbn4w3OxaNHhs45H2b0Nx5QiKcSyepmCZuB52gCEHnEnrdaz8TFQMXOLq 94WbTmZeIjChW3FB61m1gTf0UEFjoZAfTAUB+pbwoCa4AykIeZnDC19vjsruVU9Gy5rLglwd bjsZNfXIJGOZNEvdF8FOBwM7DlXx7SYvTJcUNoNJjOKtQ0bYGVgGqYOB/y2mTjVuKeU0eOkN Uw== In-Reply-To: <202310181413.39IEDXce057484@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 10/18/23 11:13, Dag-Erling Smørgrav wrote: > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3a338c534154164504005beb00a3c6feb03756cc > > commit 3a338c534154164504005beb00a3c6feb03756cc > Author: Dag-Erling Smørgrav > AuthorDate: 2023-10-18 14:13:12 +0000 > Commit: Dag-Erling Smørgrav > CommitDate: 2023-10-18 14:13:12 +0000 > > Add the BBR and RACK stacks to the LINT kernel. > > While here, drop the EXTRA_TCP_STACKS option, which serves no purpose and > should never have been added. Instead, build bbr and rack as long as > either or both of INET and INET6 is enabled. There is no risk to anyone > who doesn't load one or both and then twiddle the relevant sysctls. > > Differential Revision: https://reviews.freebsd.org/D42088 > --- > share/man/man5/src.conf.5 | 2 -- > sys/conf/NOTES | 4 +++- > sys/conf/files | 7 +++++++ > sys/conf/kern.opts.mk | 1 - > sys/conf/kern.post.mk | 4 ---- > sys/conf/options | 2 ++ > sys/modules/tcp/Makefile | 7 ++----- > 7 files changed, 14 insertions(+), 13 deletions(-) Hi, There is a leftover description file, tools/build/options/WITH_EXTRA_TCP_STACKS. Mitchell > > diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 > index 9d26531e515b..bc94d5c62234 100644 > --- a/share/man/man5/src.conf.5 > +++ b/share/man/man5/src.conf.5 > @@ -641,8 +641,6 @@ Avoid installing examples to > .Pa /usr/share/examples/ . > .It Va WITH_EXPERIMENTAL > Include experimental features in the build. > -.It Va WITH_EXTRA_TCP_STACKS > -Build extra TCP stack modules. > .It Va WITHOUT_FDT > Do not build Flattened Device Tree support as part of the base system. > This includes the device tree compiler (dtc) and libfdt support library. > diff --git a/sys/conf/NOTES b/sys/conf/NOTES > index a5ed60792a1f..b12d5def2d57 100644 > --- a/sys/conf/NOTES > +++ b/sys/conf/NOTES > @@ -681,7 +681,6 @@ options TCP_OFFLOAD # TCP offload support. > options TCP_RFC7413 # TCP Fast Open > > options TCPHPTS > -makeoptions WITH_EXTRA_TCP_STACKS=1 # RACK and BBR TCP kernel modules > > # In order to enable IPSEC you MUST also add device crypto to > # your kernel configuration > @@ -693,6 +692,9 @@ options IPSEC #IP security (requires device crypto) > options IPSEC_SUPPORT > #options IPSEC_DEBUG #debug for IP security > > +# Alternative TCP stacks > +options TCP_BBR > +options TCP_RACK > > # TLS framing and encryption/decryption of data over TCP sockets. > options KERN_TLS # TLS transmit and receive offload > diff --git a/sys/conf/files b/sys/conf/files > index 8c3bdca61905..c127ce7e7103 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -4361,6 +4361,13 @@ netinet/tcp_pcap.c optional inet tcppcap | inet6 tcppcap \ > compile-with "${NORMAL_C} ${NO_WNONNULL}" > netinet/tcp_reass.c optional inet | inet6 > netinet/tcp_sack.c optional inet | inet6 > +netinet/tcp_stacks/bbr.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_bbr -DSTACKNAME=bbr" > +netinet/tcp_stacks/rack.c optional inet tcp_bbr | inet6 tcp_bbr \ > + compile-with "${NORMAL_C} -DMODNAME=tcp_rack -DSTACKNAME=rack" > +netinet/tcp_stacks/rack_bbr_common.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/sack_filter.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > +netinet/tcp_stacks/tailq_hash.c optional inet tcp_bbr | inet tcp_rack | inet6 tcp_bbr | inet6 tcp_rack > netinet/tcp_stats.c optional stats inet | stats inet6 > netinet/tcp_subr.c optional inet | inet6 > netinet/tcp_syncache.c optional inet | inet6 > diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk > index f908f761b21e..cc6f8a1d8755 100644 > --- a/sys/conf/kern.opts.mk > +++ b/sys/conf/kern.opts.mk > @@ -56,7 +56,6 @@ __DEFAULT_YES_OPTIONS = \ > > __DEFAULT_NO_OPTIONS = \ > BHYVE_SNAPSHOT \ > - EXTRA_TCP_STACKS \ > KERNEL_RETPOLINE \ > RATELIMIT \ > REPRODUCIBLE_BUILD \ > diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk > index a4eb2e94a47b..bea29507a736 100644 > --- a/sys/conf/kern.post.mk > +++ b/sys/conf/kern.post.mk > @@ -33,10 +33,6 @@ MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}" > MKMODULESENV+= WITH_CTF="${WITH_CTF}" > .endif > > -.if defined(WITH_EXTRA_TCP_STACKS) > -MKMODULESENV+= WITH_EXTRA_TCP_STACKS="${WITH_EXTRA_TCP_STACKS}" > -.endif > - > .if !empty(KCSAN_ENABLED) > MKMODULESENV+= KCSAN_ENABLED="yes" > .endif > diff --git a/sys/conf/options b/sys/conf/options > index 4e74c4ab3a70..d2f31272d189 100644 > --- a/sys/conf/options > +++ b/sys/conf/options > @@ -231,6 +231,8 @@ SW_WATCHDOG opt_watchdog.h > TCPHPTS opt_inet.h > TCP_REQUEST_TRK opt_global.h > TCP_ACCOUNTING opt_global.h > +TCP_BBR opt_inet.h > +TCP_RACK opt_inet.h > # > # TCP SaD Detection is an experimental Sack attack Detection (SaD) > # algorithm that uses "normal" behaviour with SACK's to detect > diff --git a/sys/modules/tcp/Makefile b/sys/modules/tcp/Makefile > index 8f89977b5b69..364c0326c40d 100644 > --- a/sys/modules/tcp/Makefile > +++ b/sys/modules/tcp/Makefile > @@ -8,13 +8,10 @@ SUBDIR= \ > ${_tcp_rack} \ > ${_tcpmd5} \ > > -.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES) > -_tcp_bbr= bbr > -_tcp_rack= rack > -.endif > - > .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ > defined(ALL_MODULES) > +_tcp_bbr= bbr > +_tcp_rack= rack > .if ${KERN_OPTS:MIPSEC_SUPPORT} && !${KERN_OPTS:MTCP_SIGNATURE} > _tcpmd5= tcpmd5 > .endif From nobody Wed Oct 18 14:54:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YlD3fR3z4x7cw; Wed, 18 Oct 2023 14:54: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 4S9YlD38fsz3bTM; Wed, 18 Oct 2023 14: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=1697640840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ErViBt9fAfp3gmouH3VTbuVTnvES2Sh9g5RfeByptw=; b=sIQNjXog7vB4CtfNzoS+3l9f3s5nYuDt/DOY56MhmNm+gPXr+6CQhiircDlumT0H9V2fgU b66tOJhPbtMy4cNG4FMjwkWrMXlM0FIYB52zzO7Pe+I8uo12fzMGLvdaVn/3a8c48QNEQW cY63be8BP+jKQBuRCvo3nISaIS66WqxFB8X7HmGj530d5CZEcQfSzntytL5tV20YKpl78e twGqW+3ss+wcFB0B7y06rvlpofnrBi8PNWPOz26XdqIwBlccCw9m9GgWN9djYrfi79NY3H wAhN6eWap02bPIx5UvzsSpID6joG/9hYZe4OwS+M26eglMg/UIBgPh58RnmmCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640840; a=rsa-sha256; cv=none; b=fSAc5EEKr9KadJlH9AyivYog3MUc1vJapsC0BZOXwqt2Rw+KnRQOPS8bjcspKqfynwUk9X Vx3PVqlvkTKgwLB0xOUeKisLS9LLVqw40vRFf5WWCYrLskgAqx8Zu+X/dDXuGXXEe280Hd 5ET7Fu7XLVbQWawXHgVy0r9GwcCwD8MeYazlyPDZx0nCZdXfy0wuKiTnVXkwraAieef9cU sooo0ADKE5eIYBjjJYxnIgYfcbhE1GpkOTekr2iv7429XTY31cOPIKr021fHpdEHoIn8I0 7hj7Bg7ObZk9bgwERGspED/ByDpP1oWrdsg4CiG6MkOqpr2jGgdRcGa+AqzcQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ErViBt9fAfp3gmouH3VTbuVTnvES2Sh9g5RfeByptw=; b=dbmLIfPDh9EW/aP9Ic99CVruNNB/YmlFAsZQ30tiQWJ2j37QOcOcsd3eHtg/KwH1WpULhC /8HoTKH183Kd5Bgi6qsnk5CoFu32iNEwaLDj5DS2cEoW+r/CJb6B9CmHj/lo7DhGUewHet RRTLQnFI6QgOVrNtdTaGJ2CpWNEBXDr7Sm+800oLdpEY06wjHQJPEG+ZE94Kv5ilaUyhpk fGE/ICEjM32O+HO6BIYfrd2RGY+vzYz0facO//vdPqIUrPhKtbSoD0eyWvtRUrfbpmHY9C 2A1tY+5yDJbhFR/UqlTT9ewRB89pOAZcW2ImEdy8nM5sDM39C8wl+yIafzi8Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YlD2BbWz19jV; Wed, 18 Oct 2023 14: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 39IEs0MM026439; Wed, 18 Oct 2023 14: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 39IEs0sF026436; Wed, 18 Oct 2023 14:54:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:54:00 GMT Message-Id: <202310181454.39IEs0sF026436@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: c0f52443166a - main - freebsd-update: handle directories changing to files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0f52443166ae7ecd512ab0350469d9c3648788c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c0f52443166ae7ecd512ab0350469d9c3648788c commit c0f52443166ae7ecd512ab0350469d9c3648788c Author: Ed Maste AuthorDate: 2023-09-12 02:59:30 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:48:58 +0000 freebsd-update: handle directories changing to files Further to f6d37c9ca13f ("freebsd-update: handle file -> directory on upgrade"), handle the reverse case of a directory changing to a file. We may not encounter this case on upgradess (before freebsd-update is retired) but it is needed to support rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41945 --- usr.sbin/freebsd-update/freebsd-update.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 438e13a51154..30e78f9bffa2 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2894,6 +2894,15 @@ backup_kernel () { set +f } +# Check for and remove an existing directory that conflicts with the file or +# symlink that we are going to install. +dir_conflict () { + if [ -d "$1" ]; then + echo "Removing conflicting directory $1" + rm -rf -- "$1" + fi +} + # Install new files install_from_index () { # First pass: Do everything apart from setting file flags. We @@ -2914,6 +2923,7 @@ install_from_index () { -m ${PERM} ${BASEDIR}/${FPATH} ;; f) + dir_conflict "${BASEDIR}/${FPATH}" if [ -z "${LINK}" ]; then # Create a file, without setting flags. gunzip < files/${HASH}.gz > ${HASH} @@ -2926,6 +2936,7 @@ install_from_index () { fi ;; L) + dir_conflict "${BASEDIR}/${FPATH}" # Create a symlink ln -sfh ${HASH} ${BASEDIR}/${FPATH} ;; @@ -2962,10 +2973,14 @@ install_delete () { rmdir ${BASEDIR}/${FPATH} ;; f) - rm ${BASEDIR}/${FPATH} + if [ -f "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; L) - rm ${BASEDIR}/${FPATH} + if [ -L "${BASEDIR}/${FPATH}" ]; then + rm "${BASEDIR}/${FPATH}" + fi ;; esac done < killfiles From nobody Wed Oct 18 14:54:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YlF4vfXz4x7R6; Wed, 18 Oct 2023 14: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 4S9YlF4Jglz3b9s; Wed, 18 Oct 2023 14:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=kM6SvDW8HyYNavLqbDiHV9ZdLiuLR1BCmNoEKwKvP4PkR3Z9qarTHGn5ec6/IN3A5y7AWz NmrIO64E3KctjaEq6Zvhlog8Q9Ewuw8D0lQVC39TwEKzRsfXzXc4ZAsi5j5nS2DHGjIhM4 8am3bxDP2fkG+oo4p6qPD+gcbwDSvQYzvFgHxY0Gi/fYyfbynHBatGmhr6XLYIZYPAl37Z ClcBKt0MjOUlo/qtwRlZgyxppb7Bf5EBkVfePA7Dx1XErXP6Fk1t1fffHY+/UhCtMnOb+2 zTJksX6lf7xpCk2GFyEzeqV1fibPgUXN7d4FiNsbrRf7FW5JVPBq7IQnsMEivg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697640841; a=rsa-sha256; cv=none; b=RHF9i09y7+1ZEqQB3dLWG+rZaofYsyxF1TU/tTcKYNPLvCd4i/HSKqLVqc+wtMykV93SIw kBb6JC50vc7hevU6qCDceFz9IaDMB2eTRM9yPaCc+LnRjUtAI2nQ/21EnfVsSrR2DUTE2q +1Dddw6neWCv23AzwQYiXIk+t0N4iJAVGGRImV1QU9mW3oJxckyKAeUgoLTR54LcOEB5PD 0m4mVh8ppfpvEHsQ4WyV1+6XgV5unb+Z/BkbWds4ttjnEWsKB56Bi5JbkAs/RwMVS27qcq OZ2nQNzjFFNaW0rBDzvIBcujVcIpjUK2HGkfIqdyvrkSmtvT9w7k2mLSHtIvtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697640841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZvahCM05lpcnWkkowY2vGguw/ZqNkR+QgCI3PAoxQQ=; b=PYLvuKttg6nhqWiKNUUa8WGO8yxr/KlwJ/tV6fsqd+WG+ahLqpJdNf99MMPprPmoGhcqGg e30+gyi1FsL68VBDv/NG/o30M0LByyH6vSeC/H+DOgJwKwQT5y6ekcS/zyqXiRZqUK2qZ5 bVsgc+KpiH/p2ih/Fb/Zlr0Mhl34kn7KhIhLit8A0Uu734DNdpjSLrmu3r/AJWtY8EnyJu GjLPYWUrDI7CV0kwC/NOeTvAcgL3/yniMscHdF/dPts3p0cDhD4Zg9sqR/N8fw/UvCKawD hSEcQEV4caDRddupr4hFNdTAT/TKFJediwTmQDt3X2y2fYeKjkYGjg5qi7c1Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YlF3Bkbz19Nf; Wed, 18 Oct 2023 14:54: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 39IEs1ZW026484; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IEs1wP026481; Wed, 18 Oct 2023 14:54:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 14:54:01 GMT Message-Id: <202310181454.39IEs1wP026481@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: 6b27e1f2eaab - main - freebsd-update: for rollback, first create directories List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b27e1f2eaab9360a796c943da9d206515e1742b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b27e1f2eaab9360a796c943da9d206515e1742b commit 6b27e1f2eaab9360a796c943da9d206515e1742b Author: Ed Maste AuthorDate: 2023-09-29 15:28:35 +0000 Commit: Ed Maste CommitDate: 2023-10-18 14:52:59 +0000 freebsd-update: for rollback, first create directories rollback_files() tried to install files before creating the directories for those files. In some cases this is due to special handling to install certain classes of files earlier than others. Just create all directories up front when performing rollback. PR: 273950 Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42020 --- usr.sbin/freebsd-update/freebsd-update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 30e78f9bffa2..4866514c321e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3191,6 +3191,11 @@ rollback_setup_rollback () { # Install old files, delete new files, and update linker.hints rollback_files () { + # Create directories first. They may be needed by files we will + # install in subsequent steps (PR273950). + awk -F \| '{if ($2 == "d") print }' $1/INDEX-OLD > INDEX-OLD + install_from_index INDEX-OLD || return 1 + # Install old shared library files which don't have the same path as # a new shared library file. grep -vE '^/boot/' $1/INDEX-NEW | From nobody Wed Oct 18 15:03:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9YyY5hjcz4x87D; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9YyY5CVkz3d8k; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697641429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBHoJFJBrI/5rwy+njnmoWc9xHMxVlfeCGQEb2pf2Js=; b=pZAp4Gli3M6ZuvA+PJ/eqoIywiKeWB93nVdt2yg1WuKoCMn7raXMF/uf0oTzSQyHy3NR48 Yx30nCoVFOnqx7So7PHxfkkiJL1Ere9kvke4x5SrpSlzCG0xwbsntrl9b9f5eQRCXWZrSy mlz7tIMGN0DRlOx18X18tlXMzuFq0OdkJirUblNyfLVVLLBUg1SxqT0FGhP957/IOHRUd5 jsWUVoZEldXwZxhTh5xWggS8R9CWzgD0U7F/OAPtKpel4nBbNo84kwYBjgeQ4IxDVXfISv dEwntBstQFvo24gftPnUFYKlugLQ75BsZzF1eVKyAifel+jBfETDfcF4TebILA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697641429; a=rsa-sha256; cv=none; b=YRdljUVq/E64zgUqxDcmWZEgLOWK7dBLnuFHpx2Epc6qFhQu5bdXbmkSwDlXs/iwiZhxw9 homrauJZDQLsCw3/NloAWOujKyv75HOsnWCD/CdJZFg4ftTccV/Vucm/Mrva4LF+ln3pnc VVtaAEAovcNbjCjtzVwfrLAqO78k4u34983V/+sv9ht0NMz8nVVv4H2DgCcJS6L2knzebm sRPGY/T2vtnW8ecWp8Kop71EOCsFgeUVd9qlwU/1ddvxPuITwslO8PViu2YPxxbuUkOee4 flxtlzVtKLkeuRAqbvtzHvVZGMgq3BH3ihvs439mpYTYdtu1NLNDNixUQn9E5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697641429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBHoJFJBrI/5rwy+njnmoWc9xHMxVlfeCGQEb2pf2Js=; b=KBiOe/Qja/50OXUYN97ES6unQM2unkg/1e4VNKpxsNkou7Q4sI0JIq0/gXUL6HWHJ4OfRQ Eeob48rcC3OXlSeSgxS3R6PUWqhoN1nFRY9bgNHpXripNtipIU7+ERHvm3PHckb1NITM2g xDDwzU0mMPqLSIRGr6dMwb1Ig2yhHSVM/P8KyzkxML5tVFUjmlgEn/uL729YYJrRNOxpMg W94d3i3CskOdUPxk3RI2cZXme/SJP7mu23ZdR498My5rFrOqyOJSC2l7xiezuag4Uu/7v0 jx7KMwr4SsAWz0ly4HN9Y+aIDNjhLBXoMl+owoIS+9pdnipUsK8eRhtElzgAlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9YyY4GbPz1B6C; Wed, 18 Oct 2023 15:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39IF3n97044706; Wed, 18 Oct 2023 15:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IF3n5a044703; Wed, 18 Oct 2023 15:03:49 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:03:49 GMT Message-Id: <202310181503.39IF3n5a044703@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: f2ffadeb03e6 - main - rm description of EXTRA_TCP_STACKS option. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 commit f2ffadeb03e6a995ea43cabed1d5308c6cd5fb84 Author: Dag-Erling Smørgrav AuthorDate: 2023-10-18 15:00:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-18 15:02:05 +0000 rm description of EXTRA_TCP_STACKS option. Fixes: 3a338c534154 Reported by: mhorne --- tools/build/options/WITH_EXTRA_TCP_STACKS | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/build/options/WITH_EXTRA_TCP_STACKS b/tools/build/options/WITH_EXTRA_TCP_STACKS deleted file mode 100644 index ca30b52a5903..000000000000 --- a/tools/build/options/WITH_EXTRA_TCP_STACKS +++ /dev/null @@ -1 +0,0 @@ -Build extra TCP stack modules. From nobody Wed Oct 18 15:18:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZHc2d2Jz4x981; Wed, 18 Oct 2023 15:18: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 4S9ZHc29bQz3fj8; Wed, 18 Oct 2023 15:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZdfn9AQMbCcwvnA69z6MsUsxcpx9FYI3058poP4uhg=; b=kf+v9gfo1g3M0ECSRYHtR5jGZLNiTQnshz3Wp7C3wP0ECxIGfnkqYFlyJOvBIPbXwxMTVs i8bG+2+mTnbI6TCpz3M+IOeo0Rn6ZSbsUI3vly3+icLIBcXHkRX/gW9crBob6vbiEvni4d FmwAJ64rdqXJnFTH3kWGlYtm7myy8rcBwTKyX3l6X76DQardmN4/pGpT149QTsRunj8QAt Aw6u8rASbwa+mOUfGc5MeJYerk62Nr1zz1kUjX4G7CAWw6Araf69sIdVSF2w++pSafGRwl 4X1fnPUfT2zJARqRCAwLU42rl36y8xjHXto+W79yu1jH8wdCp615jZfMlT6iOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642316; a=rsa-sha256; cv=none; b=Po+xpomfhyT+BYs1Zo+1xTcZ4PW2FVacw32c61uQwvsjw24uUDNjo5/ywdre+Af+3HeyYp TWa5DBKqSzYU3gyCqkPiCiymmX69Dj1THhqxqkKZeKMYlIFqSn2qkqoZaFgkxYe8aENkpP jPgNsM/b31DjQ3enMugwxiHcUOj6y6/9HQVAq3t7kC44dJnkt5Hm/r/+wM+a5xPzKmyqQg yz95QyyVBmfgt/3KKLAZ5aUM39RaF05Zf/B2r9qDTMM7pdk6mMS1MPZ+Sj1g31EKrZ7EaB UXi6jcxPnEheEoQwCpo8A/SbeaC5Apd9dEEzjbkNGF6u2WtIdmabr1rSg4UYwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZdfn9AQMbCcwvnA69z6MsUsxcpx9FYI3058poP4uhg=; b=pJFuRISj+bxWlROmxsaNpsGTx/ztfcKyzoKEiLMxKpC22VU62orNDMsd6iV68fJRbLUDmw HP0NGpK0IEeoydk7cU6uqCzyilyltfTnQS5cBNdhSmy0h9hT4nNGTWD0pdxVsgXIwfpRpD 86MFVIxzM2XIDQAa6OfXB5pWdRQ+efrwi+ZZS6LzKDZlyw4rNvITYEn8wD7YBmGmJkm98U 57xN5RnySaknSMKclcCXK50c3+w/owchlxNuPE97PktssZRGdyUDEwGDcSZpTyTmQ1rm0N yBrcVHYT+VXMvhGh814Fi3m3UoOWRwuVCqeGixWvb2aYxen0spNddhlRRGDCLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZHc1CqWz1BGX; Wed, 18 Oct 2023 15:18: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 39IFIaLI061550; Wed, 18 Oct 2023 15:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFIadZ061547; Wed, 18 Oct 2023 15:18:36 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:18:36 GMT Message-Id: <202310181518.39IFIadZ061547@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: 3b5c9845727a - main - Remove $FreeBSD$: one line sh-pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b5c9845727a1b95098379f66223525e85e8a73f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5c9845727a1b95098379f66223525e85e8a73f commit 3b5c9845727a1b95098379f66223525e85e8a73f Author: Jose Luis Duran AuthorDate: 2023-10-18 15:14:33 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:15:18 +0000 Remove $FreeBSD$: one line sh-pattern Remove the $FreeBSD$ pattern added to the tests, as well as fixing the mkimg_test.sh script to stop adding it when we rebase the tests. Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/870 --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/mkimg_test.sh | 4 +--- 29 files changed, 1 insertion(+), 31 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex index 01ceaae1963c..0de167c0e198 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex index 25e961888b80..bd8601eccc50 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex index 1ff8880a897b..35b354c7310b 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex index 857c7ea3e4f0..796166f430ee 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex index 76e76c3155c9..93b291550be0 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex index 044e0bc66181..51da710db535 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex index c3b9496e2870..0103906c9fa2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex index 6b4ec6c575d6..36210d5dd44d 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex index 2a44596b10fe..bf6ba8b9560e 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex index 31451cfb320e..94fbb99cbdb9 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex index dbaed6ce1606..3ee432909549 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex index 2ec42edb497d..8311d98ee9c0 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh index 74680c5d2be7..7c6593b219ef 100755 --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -86,9 +86,7 @@ mkimg_rebase() fi if test $update = yes; then - # Prevent keyword expansion when writing the keyword. - (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline - cat $result >> $baseline + cat $result > $baseline fi rm $image $result _tmp-* From nobody Wed Oct 18 15:29:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZWg4srhz4x9b9; Wed, 18 Oct 2023 15:29: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 4S9ZWg4LLDz4BNd; Wed, 18 Oct 2023 15:29:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+a0+vFCJz9Z5CwqZKHSeKuyNVnlvrhwXFZ+7AyP/t8=; b=oqw2loUqLQ137QlLIcBhATwZy0g3xoS6Bg38XbZ9jWQn4vb5/QdmUTigbCXNGeOeyCRVTv x+EI9V90k0MOMVd5bym1tco6/D/qYWvhDJKzXr5JS0gTxApBmoKQUAV38vX5vZS5KUTfmS k4cPPXA1XYKFrCwgNJNE+m+3ONhGKrU781ZXuE8OsEjIRrbeCyUwK+zQ8zvRGrMaZtNZ4g fAkP1SNW8GyeuLAA1jGgcE1134VFnjrqxK6C8Gd+NOh288WvxN0GPgvknnXtLsPczqS+c3 QmMSJfY3fZA6uti0TPkeINFuS/YiqaRrSM4n0vEedJDqwLpuklqYPKijibOp7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642943; a=rsa-sha256; cv=none; b=dBlVT75HGqJj8SRuCwAz0lw1nQBOYchWziI/zJduMXz5C56LK47ewuDnmyVzsnlvxmzlgD hf41ZzT4JX4XcYKqS37xEkWXTwP44ZzEwEpMpi9JOFjQRM54WZaRzt42J7jGPzm1E5AC5+ 8KW7sTAuTctR0hd0uU3HlFfT434S/NlXLTKhodDhi0IkDPOzaX7BQbElb8RFlGyPNtxDMV qIGv2si9VWDvLfx8C0RTvsNQVwtvy6J3zZsSoDW8uieGEHOHSocwHoog5HnTwCdEqGYWo5 JX9UAyWVpeJrw+l6AJR7BOEN7lQ6341e5MQB0z9Ff8FJjoBEmkXVwIqo7ExRIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642943; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0+a0+vFCJz9Z5CwqZKHSeKuyNVnlvrhwXFZ+7AyP/t8=; b=Y0tvcB8rIx9cfGaZ6o9OeDwlAb6tqvfrI9COrcy46nmxtaU6r2/eZzoHIT4y+E80d8bPX3 ChDHx5VVQ0SiiAjKzZGf4/xhdN3WkXfq/ImIbmuQCeDiRaiiTNwjhNEq23Ge9BPfCSeyhe wIKz+x1qDJTm7t9ciVBrtcmhadXh7oLRmP1rAMNoZ0jHY4HQv9tJa0fAWNIfPWE4POXyKe ky7zdnyy4ggUg74Ir96sro5KTHlJmqLSWu92Pqyd1YxXL8jSWmSE/iX2VIrZB13vdr2KwK pxeyhXa+th4+XME1cgigxSap7wKrCwipZaPHAbXR2lGcgtyyT5kuY43H0vbtkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZWg3NhWz1BVj; Wed, 18 Oct 2023 15:29: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 39IFT3hT078240; Wed, 18 Oct 2023 15:29:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFT3kK078237; Wed, 18 Oct 2023 15:29:03 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:29:03 GMT Message-Id: <202310181529.39IFT3kK078237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5401ebd33cf5 - stable/14 - mkimg: Ensure GPT Entry Array is at least 16k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5401ebd33cf5073e8c0f095527504d38f74a926b Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5401ebd33cf5073e8c0f095527504d38f74a926b commit 5401ebd33cf5073e8c0f095527504d38f74a926b Author: Warner Losh AuthorDate: 2023-10-18 15:23:40 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:23:40 +0000 mkimg: Ensure GPT Entry Array is at least 16k UEFI v2.10 Section 5.3 documentes that the minimum reserved space after the GPT header be at least 16kB. Enforce this minimum. Before, we'd only set the number of entries to be the unpadded size. gpart's selective enforcement of aspects of the GPT standard meant that these images would work, but couldn't be changed (to add a partition or grow the size of a partition). This ensures that gpart's overly picky standards don't cause problems for people wishing to, for example, resize release images. MFC after: 1 day (we want this in 14.0) PR: 274312 Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42245 (cherry picked from commit 9b42d3e12ffc6896fcb4e60c1b239ddf60705831) --- sys/sys/disk/gpt.h | 7 +++++++ usr.bin/mkimg/gpt.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index e48b13684814..596a5cba1681 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -82,6 +82,13 @@ struct gpt_hdr { CTASSERT(offsetof(struct gpt_hdr, padding) == 92); #endif +/* + * The GPT standard (section 5.3 of UEFI standard version 2.10) requires + * we reserve at least 16k after the PMBR and the GPT header for the GPT + * Array Entries. + */ +#define GPT_MIN_RESERVED 16384 + struct gpt_ent { gpt_uuid_t ent_type; gpt_uuid_t ent_uuid; diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 59c51a6a177b..ed3f008c394f 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include @@ -124,13 +124,21 @@ crc32(const void *buf, size_t sz) return (crc ^ ~0U); } +/* + * Return the number of sectors needed to store the partition table. + */ static u_int gpt_tblsz(void) { - u_int ents; + u_int eps; /* Entries per Sector */ - ents = secsz / sizeof(struct gpt_ent); - return ((nparts + ents - 1) / ents); + /* + * Count the number of sectors needed for the GPT Entry Array to store + * the number of partitions defined for this image. Enforce the 16kB + * minimum space for the GPT Entry Array per UEFI v2.10 Section 5.3. + */ + eps = secsz / sizeof(struct gpt_ent); + return (MAX(howmany(GPT_MIN_RESERVED, secsz), howmany(nparts, eps))); } static lba_t From nobody Wed Oct 18 15:29:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZWh5mKgz4x9bF; Wed, 18 Oct 2023 15:29: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 4S9ZWh5X0jz3gqX; Wed, 18 Oct 2023 15:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=maqRrSEnfDUz3K4/PYg0oLzhlRx8Qvk8uKab7rwLjNI=; b=jA8f7lrcx61HtCRsJX+O77Rf2xGZW4cSiHHiNjUdlR0JVtbPvWjXSYcmwkyUCu56/dD9Qp Ds28IB8Y3m13lNo2g0Zi6vwoZ71gsaeW9eEvxrjZvNp3U+TuGHefhz0XY9AFD5oDkuvJzG 82hxHZJd1NnPaArrQFg5meaQMSnj/LLNGyVPjgx5TzZPsqsV+UlvtnIMJ1pvVsVscXJA+V 4Uj6heJRON3O6xhB3qyGDULwq+5yojb4svL8+UF+7YRPwxVwO7dLQWfdVwCnHCgA8W622E GRlICH5b1iK/qIHNQbH+mu2ZLx1dnj//GxUBG0nKi4Sh6TWurLKyv1iQx26yvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642944; a=rsa-sha256; cv=none; b=xmmp66Kvfuw1X3UedT8w8jHznGsIgJ/hdLU6krtu5eIRAW/RjL0uqVSQjKFO5D5QNzQ0Yj a67rit2dly+zk9iMMMC0kE+CXOa6DSITWd1DLDmFYpL5wW91bWitsHlgbVIqga8C4abDRA 6Vgq52YD9HAu0+PaLR/5af5JXs5h9SowaLE6A1d77iskvjBNwOBW+3+FdFYzEJ3x3Q4W4Y 3PWssKpuwI2AaUjMheU27YwFeKs1tszDVVXaCPjGIJZ6vzbvhhNpvZXrUBCArGnGDU2x2q Gsd0MMEmc9m85HlR/faCHM2zq3JH5o/mHRrOXTeWlu3KKHvriBdNnb4hqGjjng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=maqRrSEnfDUz3K4/PYg0oLzhlRx8Qvk8uKab7rwLjNI=; b=EeFBtU8tckMkHkcN1/LIsKU4FAgmJjDkLepO06TcJAsbRYNLireNFCaj4IQL2GTqG9UbuA 8Rh6rQOTh9QVI5uQdzyDACeyWjXNOokO515nCmx/iVuCoc7nL2d/nTuxDaGjmrYApF1/J7 lyJP1iuDouGsIe4C/abHzERHGAhBw2kU2xeMnO5//SJ+zKbm6ohbxwxl/pWsVvWMGrRv4V pZ9xoLBmxq6R5wT3nZE3E3Nl4vjzvyKYS+WnTWWfVm4f4u+RRTyYUcv4ddPe+gqFB6nPDX sq1WOVTgzIocRk4poWBy2663/VoyUls1GM05usyuatXJ0yE236PDl6YszkhimA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZWh4bTlz1B7f; Wed, 18 Oct 2023 15:29: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 39IFT469078288; Wed, 18 Oct 2023 15:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFT49w078285; Wed, 18 Oct 2023 15:29:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:29:04 GMT Message-Id: <202310181529.39IFT49w078285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4a3cdf416895 - stable/14 - mkimg_test: remove vtoc8 images, they aren't needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a3cdf4168953c01b8b0e6a9ca72804ef2860309 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3cdf4168953c01b8b0e6a9ca72804ef2860309 commit 4a3cdf4168953c01b8b0e6a9ca72804ef2860309 Author: Warner Losh AuthorDate: 2023-10-18 15:23:41 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:23:41 +0000 mkimg_test: remove vtoc8 images, they aren't needed vtoc8 support expired with sparc64 removal, so remove them all. Sponsored by: Netflix (cherry picked from commit 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc) --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.hex | 550 --------------------- .../mkimg/tests/img-63x255-4096-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.hex | 324 ------------ usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.hex | 550 --------------------- usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.hex | 324 ------------ 28 files changed, 4472 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex deleted file mode 100644 index 93afee83d903..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex +++ /dev/null @@ -1,544 +0,0 @@ -00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 10 00 |.............B..| -00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| -00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00001000 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 |...... .......0.| -00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| -00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00005010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00005090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000050c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000051a0 00 00 00 00 0e 10 21 08 00 00 00 00 00 00 00 00 |......!.........| -000051b0 21 08 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000051c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000051d0 00 00 21 08 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000051e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000051f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 3f |.............."?| -00005200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00405200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00406000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex deleted file mode 100644 index dba435854881..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex +++ /dev/null @@ -1,72 +0,0 @@ -00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| -00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| -00000030 00 00 00 00 00 02 00 00 00 00 00 01 00 00 00 00 |................| -00000040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 80 00 00 00 00 03 00 00 00 00 00 00 00 00 00 00 |................| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 |................| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 80 00 00 00 00 05 00 00 80 00 00 00 00 06 00 00 |................| -00030010 80 00 00 00 00 07 00 00 80 00 00 00 00 08 00 00 |................| -00030020 80 00 00 00 00 09 00 00 80 00 00 00 00 0a 00 00 |................| -00030030 80 00 00 00 00 0b 00 00 80 00 00 00 00 0c 00 00 |................| -00030040 80 00 00 00 00 0d 00 00 80 00 00 00 00 0e 00 00 |................| -00030050 80 00 00 00 00 0f 00 00 80 00 00 00 00 10 00 00 |................| -00030060 80 00 00 00 00 11 00 00 80 00 00 00 00 12 00 00 |................| -00030070 80 00 00 00 00 13 00 00 80 00 00 00 00 14 00 00 |................| -00030080 80 00 00 00 00 15 00 00 80 00 00 00 00 16 00 00 |................| -00030090 80 00 00 00 00 17 00 00 80 00 00 00 00 18 00 00 |................| -000300a0 80 00 00 00 00 19 00 00 80 00 00 00 00 1a 00 00 |................| -000300b0 80 00 00 00 00 1b 00 00 80 00 00 00 00 1c 00 00 |................| -000300c0 80 00 00 00 00 1d 00 00 80 00 00 00 00 1e 00 00 |................| -000300d0 80 00 00 00 00 1f 00 00 80 00 00 00 00 20 00 00 |............. ..| -000300e0 80 00 00 00 00 21 00 00 80 00 00 00 00 22 00 00 |.....!......."..| -000300f0 80 00 00 00 00 23 00 00 80 00 00 00 00 24 00 00 |.....#.......$..| -00030100 80 00 00 00 00 25 00 00 80 00 00 00 00 26 00 00 |.....%.......&..| -00030110 80 00 00 00 00 27 00 00 80 00 00 00 00 28 00 00 |.....'.......(..| -00030120 80 00 00 00 00 29 00 00 80 00 00 00 00 2a 00 00 |.....).......*..| -00030130 80 00 00 00 00 2b 00 00 80 00 00 00 00 2c 00 00 |.....+.......,..| -00030140 80 00 00 00 00 2d 00 00 80 00 00 00 00 2e 00 00 |.....-..........| -00030150 80 00 00 00 00 2f 00 00 80 00 00 00 00 30 00 00 |...../.......0..| -00030160 80 00 00 00 00 31 00 00 80 00 00 00 00 32 00 00 |.....1.......2..| -00030170 80 00 00 00 00 33 00 00 80 00 00 00 00 34 00 00 |.....3.......4..| -00030180 80 00 00 00 00 35 00 00 80 00 00 00 00 36 00 00 |.....5.......6..| -00030190 80 00 00 00 00 37 00 00 80 00 00 00 00 38 00 00 |.....7.......8..| -000301a0 80 00 00 00 00 39 00 00 80 00 00 00 00 3a 00 00 |.....9.......:..| -000301b0 80 00 00 00 00 3b 00 00 80 00 00 00 00 3c 00 00 |.....;.......<..| -000301c0 80 00 00 00 00 3d 00 00 80 00 00 00 00 3e 00 00 |.....=.......>..| -000301d0 80 00 00 00 00 3f 00 00 80 00 00 00 00 40 00 00 |.....?.......@..| -000301e0 80 00 00 00 00 41 00 00 80 00 00 00 00 42 00 00 |.....A.......B..| -000301f0 80 00 00 00 00 43 00 00 80 00 00 00 00 44 00 00 |.....C.......D..| -00030200 80 00 00 00 00 45 00 00 00 00 00 00 00 00 00 00 |.....E..........| -00030210 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 |................| -* -00040080 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 00 |................| -00040090 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00050010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00050090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000500c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000501a0 00 00 00 00 0e 10 21 80 00 00 00 00 00 00 00 00 |......!.........| -000501b0 21 80 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000501c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000501d0 00 00 21 80 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000501e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000501f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 b7 |..............".| -00050200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00450200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00460000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex deleted file mode 100644 index ffa27d117070..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex +++ /dev/null @@ -1,20 +0,0 @@ -00000000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 21 01 00 00 00 00 00 00 00 00 |......!.........| -000001b0 21 01 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 21 01 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 36 |.............."6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00420200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex deleted file mode 100644 index 00828a72a331..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex +++ /dev/null @@ -1,52 +0,0 @@ -00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00000030 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00000040 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00000050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 63 78 73 70 61 72 73 65 ff ff ff ff ff ff ff ff |cxsparse........| -00000210 00 00 00 00 00 00 06 00 00 01 00 00 00 00 00 03 |................| -00000220 00 20 00 00 ff ff f4 74 00 00 00 00 00 00 00 00 |. .....t........| -00000230 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 00 00 00 04 00 00 10 05 00 00 20 06 ff ff ff ff |.......... .....| -00000610 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00000a00 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000a10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000a80 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000a90 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000aa0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000ab0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -00000ac0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000ba0 00 00 00 00 0e 10 21 34 00 00 00 00 00 00 00 00 |......!4........| -00000bb0 21 34 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!4..............| -00000bc0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -00000bd0 00 00 21 34 00 00 00 00 00 00 00 00 00 00 00 00 |..!4............| -00000be0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000bf0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 03 |..............".| -00000c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00200a00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00200c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400c00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00400e00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00401000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00600e00 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00600e10 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00600e20 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00600e30 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00600e40 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00600e50 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00600e60 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00601000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex deleted file mode 100644 index d55109faaec5..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex +++ /dev/null @@ -1,28 +0,0 @@ -00000000 46 72 65 65 42 53 44 35 4d 00 00 00 00 00 00 00 |FreeBSD5M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 28 00 00 00 00 00 00 00 00 00 |......(.........| -000001b0 28 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |(...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 |..(.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 2b 36 |..............+6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00500010 ff ff ff ff ff ff ff ff 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00500020 00 02 00 00 57 69 32 6b 00 00 00 00 00 50 00 00 |....Wi2k.....P..| -00500030 00 00 00 00 00 50 00 00 00 96 04 11 00 00 00 02 |.....P..........| -00500040 ff ff ef b4 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00500050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00500060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex deleted file mode 100644 index 76c4d5313850..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex +++ /dev/null @@ -1,71 +0,0 @@ -00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 68 65 61 64 64 db 05 73 00 00 00 00 00 00 00 00 |headd..s........| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00010050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 68 65 61 64 13 47 fd f1 01 00 00 00 00 00 00 00 |head.G..........| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00020050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00030010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00030020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00030030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00030040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00030050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00040010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00040020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00040030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00040040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00040050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00200000 6d 65 74 61 64 61 74 61 00 00 05 00 00 00 00 00 |metadata........| -00200010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00200020 37 67 a1 ca 36 fa 43 4d b3 b6 33 f0 aa 44 e7 6b |7g..6.CM..3..D.k| -00200030 00 00 01 00 08 00 00 00 04 00 00 00 00 00 00 00 |................| -00200040 24 42 a5 2f 1b cd 76 48 b2 11 5d be d8 3b f4 b8 |$B./..vH..]..;..| -00200050 08 00 01 00 08 00 00 00 06 00 00 00 00 00 00 00 |................| -00200060 ab 12 ca be e6 b2 23 45 93 ef c3 09 e0 00 c7 46 |......#E.......F| -00200070 10 00 01 00 10 00 00 00 06 00 00 00 00 00 00 00 |................| -00200080 1d bf 41 81 6f a9 09 47 ba 47 f2 33 a8 fa ab 5f |..A.o..G.G.3..._| -00200090 20 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 | ...............| -002000a0 c7 48 a3 cd 5d 44 71 44 9c c9 e9 88 52 51 c5 56 |.H..]DqD....RQ.V| -002000b0 24 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 |$...............| -002000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00210000 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 00 |................| -00210010 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00210020 00 02 00 00 00 10 00 00 00 00 00 00 00 00 00 00 |................| -00210030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00300000 06 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 |..@.............| -00300010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400000 46 72 65 65 42 53 44 31 36 4d 00 00 00 00 00 00 |FreeBSD16M......| -00400010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00400090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -004000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -004001a0 00 00 00 00 0e 10 80 00 00 00 00 00 00 00 00 00 |................| -004001b0 80 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |................| -004001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -004001d0 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be f8 7f |................| -00400200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00800200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -01400000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex deleted file mode 100644 index 865769bcea7e..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex +++ /dev/null @@ -1,314 +0,0 @@ -00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| -00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| -00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| -00000030 0b 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 |................| -00000040 20 00 00 00 00 00 00 00 00 0a 20 0d 0a 00 00 00 | ......... .....| -00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 23 20 44 69 73 6b 20 44 65 73 63 72 69 70 74 6f |# Disk Descripto| -00000210 72 46 69 6c 65 0a 76 65 72 73 69 6f 6e 3d 31 0a |rFile.version=1.| -00000220 43 49 44 3d 30 30 30 30 30 30 30 30 0a 70 61 72 |CID=00000000.par| -00000230 65 6e 74 43 49 44 3d 66 66 66 66 66 66 66 66 0a |entCID=ffffffff.| -00000240 63 72 65 61 74 65 54 79 70 65 3d 22 6d 6f 6e 6f |createType="mono| -00000250 6c 69 74 68 69 63 53 70 61 72 73 65 22 0a 23 20 |lithicSparse".# | -00000260 45 78 74 65 6e 74 20 64 65 73 63 72 69 70 74 69 |Extent descripti| -00000270 6f 6e 0a 52 57 20 31 30 32 34 30 20 53 50 41 52 |on.RW 10240 SPAR| -00000280 53 45 20 22 22 0a 23 20 54 68 65 20 44 69 73 6b |SE "".# The Disk| -00000290 20 44 61 74 61 20 42 61 73 65 0a 23 44 44 42 0a | Data Base.#DDB.| -000002a0 64 64 62 2e 61 64 61 70 74 65 72 54 79 70 65 20 |ddb.adapterType | -000002b0 3d 20 22 69 64 65 22 0a 64 64 62 2e 67 65 6f 6d |= "ide".ddb.geom| -000002c0 65 74 72 79 2e 63 79 6c 69 6e 64 65 72 73 20 3d |etry.cylinders =| -000002d0 20 22 31 30 32 34 30 22 0a 64 64 62 2e 67 65 6f | "10240".ddb.geo| -000002e0 6d 65 74 72 79 2e 68 65 61 64 73 20 3d 20 22 31 |metry.heads = "1| -000002f0 22 0a 64 64 62 2e 67 65 6f 6d 65 74 72 79 2e 73 |".ddb.geometry.s| -00000300 65 63 74 6f 72 73 20 3d 20 22 31 22 0a 00 00 00 |ectors = "1"....| -00000310 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000400 03 00 00 00 07 00 00 00 00 00 00 00 00 00 00 00 |................| -00000410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 20 00 00 00 30 00 00 00 40 00 00 00 50 00 00 00 | ...0...@...P...| -00000610 60 00 00 00 70 00 00 00 80 00 00 00 90 00 00 00 |`...p...........| -00000620 a0 00 00 00 b0 00 00 00 c0 00 00 00 d0 00 00 00 |................| -00000630 e0 00 00 00 f0 00 00 00 00 01 00 00 10 01 00 00 |................| -00000640 20 01 00 00 30 01 00 00 40 01 00 00 50 01 00 00 | ...0...@...P...| -00000650 60 01 00 00 70 01 00 00 80 01 00 00 90 01 00 00 |`...p...........| -00000660 a0 01 00 00 b0 01 00 00 c0 01 00 00 d0 01 00 00 |................| -00000670 e0 01 00 00 f0 01 00 00 00 02 00 00 10 02 00 00 |................| -00000680 20 02 00 00 30 02 00 00 40 02 00 00 50 02 00 00 | ...0...@...P...| -00000690 60 02 00 00 70 02 00 00 80 02 00 00 90 02 00 00 |`...p...........| -000006a0 a0 02 00 00 b0 02 00 00 c0 02 00 00 d0 02 00 00 |................| -000006b0 e0 02 00 00 f0 02 00 00 00 03 00 00 10 03 00 00 |................| -000006c0 20 03 00 00 30 03 00 00 40 03 00 00 50 03 00 00 | ...0...@...P...| -000006d0 60 03 00 00 70 03 00 00 80 03 00 00 90 03 00 00 |`...p...........| -000006e0 a0 03 00 00 b0 03 00 00 c0 03 00 00 d0 03 00 00 |................| -000006f0 e0 03 00 00 f0 03 00 00 00 04 00 00 10 04 00 00 |................| -00000700 20 04 00 00 30 04 00 00 40 04 00 00 50 04 00 00 | ...0...@...P...| -00000710 60 04 00 00 70 04 00 00 80 04 00 00 90 04 00 00 |`...p...........| -00000720 a0 04 00 00 b0 04 00 00 c0 04 00 00 d0 04 00 00 |................| -00000730 e0 04 00 00 f0 04 00 00 00 05 00 00 10 05 00 00 |................| -00000740 20 05 00 00 30 05 00 00 40 05 00 00 50 05 00 00 | ...0...@...P...| -00000750 60 05 00 00 70 05 00 00 80 05 00 00 90 05 00 00 |`...p...........| -00000760 a0 05 00 00 b0 05 00 00 c0 05 00 00 d0 05 00 00 |................| -00000770 e0 05 00 00 f0 05 00 00 00 06 00 00 10 06 00 00 |................| -00000780 20 06 00 00 30 06 00 00 40 06 00 00 50 06 00 00 | ...0...@...P...| -00000790 60 06 00 00 70 06 00 00 80 06 00 00 90 06 00 00 |`...p...........| -000007a0 a0 06 00 00 b0 06 00 00 c0 06 00 00 d0 06 00 00 |................| -000007b0 e0 06 00 00 f0 06 00 00 00 07 00 00 10 07 00 00 |................| -000007c0 20 07 00 00 30 07 00 00 40 07 00 00 50 07 00 00 | ...0...@...P...| -000007d0 60 07 00 00 70 07 00 00 80 07 00 00 90 07 00 00 |`...p...........| -000007e0 a0 07 00 00 b0 07 00 00 c0 07 00 00 d0 07 00 00 |................| -000007f0 e0 07 00 00 f0 07 00 00 00 08 00 00 10 08 00 00 |................| -00000800 20 08 00 00 30 08 00 00 40 08 00 00 50 08 00 00 | ...0...@...P...| -00000810 60 08 00 00 70 08 00 00 80 08 00 00 90 08 00 00 |`...p...........| -00000820 a0 08 00 00 b0 08 00 00 c0 08 00 00 d0 08 00 00 |................| -00000830 e0 08 00 00 f0 08 00 00 00 09 00 00 10 09 00 00 |................| -00000840 20 09 00 00 30 09 00 00 40 09 00 00 50 09 00 00 | ...0...@...P...| -00000850 60 09 00 00 70 09 00 00 80 09 00 00 90 09 00 00 |`...p...........| -00000860 a0 09 00 00 b0 09 00 00 c0 09 00 00 d0 09 00 00 |................| -00000870 e0 09 00 00 f0 09 00 00 00 0a 00 00 10 0a 00 00 |................| -00000880 20 0a 00 00 30 0a 00 00 40 0a 00 00 50 0a 00 00 | ...0...@...P...| -00000890 60 0a 00 00 70 0a 00 00 80 0a 00 00 90 0a 00 00 |`...p...........| -000008a0 a0 0a 00 00 b0 0a 00 00 c0 0a 00 00 d0 0a 00 00 |................| -000008b0 e0 0a 00 00 f0 0a 00 00 00 0b 00 00 10 0b 00 00 |................| -000008c0 20 0b 00 00 30 0b 00 00 40 0b 00 00 50 0b 00 00 | ...0...@...P...| -000008d0 60 0b 00 00 70 0b 00 00 80 0b 00 00 90 0b 00 00 |`...p...........| -000008e0 a0 0b 00 00 b0 0b 00 00 c0 0b 00 00 d0 0b 00 00 |................| -000008f0 e0 0b 00 00 f0 0b 00 00 00 0c 00 00 10 0c 00 00 |................| -00000900 20 0c 00 00 30 0c 00 00 40 0c 00 00 50 0c 00 00 | ...0...@...P...| -00000910 60 0c 00 00 70 0c 00 00 80 0c 00 00 90 0c 00 00 |`...p...........| -00000920 a0 0c 00 00 b0 0c 00 00 c0 0c 00 00 d0 0c 00 00 |................| -00000930 e0 0c 00 00 f0 0c 00 00 00 0d 00 00 10 0d 00 00 |................| -00000940 20 0d 00 00 30 0d 00 00 40 0d 00 00 50 0d 00 00 | ...0...@...P...| -00000950 60 0d 00 00 70 0d 00 00 80 0d 00 00 90 0d 00 00 |`...p...........| -00000960 a0 0d 00 00 b0 0d 00 00 c0 0d 00 00 d0 0d 00 00 |................| -00000970 e0 0d 00 00 f0 0d 00 00 00 0e 00 00 10 0e 00 00 |................| -00000980 20 0e 00 00 30 0e 00 00 40 0e 00 00 50 0e 00 00 | ...0...@...P...| -00000990 60 0e 00 00 70 0e 00 00 80 0e 00 00 90 0e 00 00 |`...p...........| -000009a0 a0 0e 00 00 b0 0e 00 00 c0 0e 00 00 d0 0e 00 00 |................| -000009b0 e0 0e 00 00 f0 0e 00 00 00 0f 00 00 10 0f 00 00 |................| -000009c0 20 0f 00 00 30 0f 00 00 40 0f 00 00 50 0f 00 00 | ...0...@...P...| -000009d0 60 0f 00 00 70 0f 00 00 80 0f 00 00 90 0f 00 00 |`...p...........| -000009e0 a0 0f 00 00 b0 0f 00 00 c0 0f 00 00 d0 0f 00 00 |................| -000009f0 e0 0f 00 00 f0 0f 00 00 00 10 00 00 10 10 00 00 |................| -00000a00 20 10 00 00 30 10 00 00 40 10 00 00 50 10 00 00 | ...0...@...P...| -00000a10 60 10 00 00 70 10 00 00 80 10 00 00 90 10 00 00 |`...p...........| -00000a20 a0 10 00 00 b0 10 00 00 c0 10 00 00 d0 10 00 00 |................| -00000a30 e0 10 00 00 f0 10 00 00 00 11 00 00 10 11 00 00 |................| -00000a40 20 11 00 00 30 11 00 00 40 11 00 00 50 11 00 00 | ...0...@...P...| -00000a50 60 11 00 00 70 11 00 00 80 11 00 00 90 11 00 00 |`...p...........| -00000a60 a0 11 00 00 b0 11 00 00 c0 11 00 00 d0 11 00 00 |................| -00000a70 e0 11 00 00 f0 11 00 00 00 12 00 00 10 12 00 00 |................| -00000a80 20 12 00 00 30 12 00 00 40 12 00 00 50 12 00 00 | ...0...@...P...| -00000a90 60 12 00 00 70 12 00 00 80 12 00 00 90 12 00 00 |`...p...........| -00000aa0 a0 12 00 00 b0 12 00 00 c0 12 00 00 d0 12 00 00 |................| -00000ab0 e0 12 00 00 f0 12 00 00 00 13 00 00 10 13 00 00 |................| -00000ac0 20 13 00 00 30 13 00 00 40 13 00 00 50 13 00 00 | ...0...@...P...| -00000ad0 60 13 00 00 70 13 00 00 80 13 00 00 90 13 00 00 |`...p...........| -00000ae0 a0 13 00 00 b0 13 00 00 c0 13 00 00 d0 13 00 00 |................| -00000af0 e0 13 00 00 f0 13 00 00 00 14 00 00 10 14 00 00 |................| *** 3702 LINES SKIPPED *** From nobody Wed Oct 18 15:29:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZWk12gqz4x9jy; Wed, 18 Oct 2023 15:29: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 4S9ZWk06VMz3gv6; Wed, 18 Oct 2023 15:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6RawHyDlI1sng+hq0HEzOUMUNb6ufO3BWy5RiUw1ys=; b=UjVlS0GtpTNfKC+bQgQVEEapqP8RIkS1C+d5FX073waQLfy+PHzPJzfEmdMo0+Wc1Wukz1 dVuFoZ+QKU1lPUSvMHDbuUlwPqZ17bIJAAn0DplWIRr0pt+eneJ1+iLuT825G3f3T4NZZi BiMQEtFklbSlwnm0vLnXu3Kc0uc5PTFjgZ39B2Bm/mD2OnR4rTJ7Xs43DR02wgLhQa7iX9 9qhp8LDLqZxSaLb9ycnZYDOrANq+5P/H6v6xTVaKE5yuSBdhomdFw9UKgDeXAo7bXze086 VaCLPUfMmNtwB9mg6nbW5aP49xeXdWJRrVoyp7Ur5aKGVv96Tif8vXDYwq/PUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642946; a=rsa-sha256; cv=none; b=Ttn+5u/p42ci+qQJfLXggCLuqlf4wlMrIh+d1c4jlgWJ4OaR2qQ5NZE/lO/A4bczK83wcy 8mfVnpU8BH8+VK2AZ1fPKr6Z++OH6ivRetd34IpSm4V1B3vtjUWerGGdTr4EJ4r6Y0Zjvl dolMthZP5GIr+EWRQcIDdnm2NOqHXXelKvgL9C2WtsEAn3obYu06Zy6i0OMP9nEAeg7fP2 FAP3Z1O/Uh35vWQA40ZCsBgVORPHjOC/UrvYKhp65W92GAb6DH34lggbx3aUGeaWvqbHH3 DWFhpvD9onDaC+K+XYtYYFqLbk4qtF4hWjFWgfBo2ujMkd+MH/HaLBOtQ3c4Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6RawHyDlI1sng+hq0HEzOUMUNb6ufO3BWy5RiUw1ys=; b=EHHwsb8+ipJfqwA327/PsLDgA+2zS6QQDDFEuEsd1ztpb2HkUddcRLg30S+MtUIULB90gp bRR8Ojp86PdXQmA1WDyVPuoUWSXihE1tE6Mw8ZH1TG4TxQk1X83JDdsaHLYRl/TD9RVcdM 2u0tk3Emz4r6uYRyAu06UZWA0/PUxFK6ID/qY4/1yO7TVzkn4QLFT+ayGdB5FRaKP6xESt MULpW94dOcdGEQhAIGnaproks07agA+p5TxyUAAbKkB6LzubC2FMQwx+Hg9v5bTm7O4yxf YMcjlQcBK4u6qnUX3ieZGXNvcl8+HHvpi6alVriPKxDwCAQDSY9E/wMHP47Ftw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZWj6JSKz1BV9; Wed, 18 Oct 2023 15:29: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 39IFT5cG078343; Wed, 18 Oct 2023 15:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFT5rb078340; Wed, 18 Oct 2023 15:29:05 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:29:05 GMT Message-Id: <202310181529.39IFT5rb078340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 524225dde0b5 - stable/14 - mkimg: Regenerate all the tests for gpt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 524225dde0b5a4f346644670f22fcd11fe13c1f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=524225dde0b5a4f346644670f22fcd11fe13c1f2 commit 524225dde0b5a4f346644670f22fcd11fe13c1f2 Author: Warner Losh AuthorDate: 2023-10-18 15:23:41 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:23:41 +0000 mkimg: Regenerate all the tests for gpt Recent changes to mkimg has changed the generated GPT images to be more correct. Use make rebase to regenerate the baseline. Sponsored by: Netflix (cherry picked from commit d2abbfede5342b19f3e5994140cdb6622c95ef66) --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 569 +++++------ 28 files changed, 3798 insertions(+), 3754 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index a974400ad2e8..ae764c000ae7 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,5 +1,6 @@ +# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 20 00 |.............B .| +00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| 00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * @@ -7,569 +8,573 @@ 00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| 00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 00 00 |......P.........| +00002010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 60 00 |..............`.| +00002030 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| +00002040 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| +00002050 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| +00002060 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| +00002070 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| +00002080 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| +00002090 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| +000020a0 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| +000020b0 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| +000020c0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| +000020d0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| +000020e0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| +000020f0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| +00002100 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| +00002110 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| +00002120 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| +00002130 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| +00002140 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| +00002150 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| +00002160 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| +00002170 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| +00002180 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| +00002190 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| +000021a0 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| +000021b0 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| +000021c0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| +000021d0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| +000021e0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| +000021f0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| +00002200 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| +00002210 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| +00002220 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| +00002230 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| +00002240 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| +00002250 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| +00002260 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| +00002270 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| +00002280 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| +00002290 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| +000022a0 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| +000022b0 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| +000022c0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| +000022d0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| +000022e0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| +000022f0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| +00002300 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| +00002310 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| +00002320 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| +00002330 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| +00002340 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| +00002350 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| +00002360 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| +00002370 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| +00002380 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| +00002390 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| +000023a0 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| +000023b0 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| +000023c0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| +000023d0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| +000023e0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| +000023f0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| +00002400 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| +00002410 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| +00002420 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| +00002430 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| +00002440 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| +00002450 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| +00002460 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| +00002470 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| +00002480 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| +00002490 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| +000024a0 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| +000024b0 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| +000024c0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| +000024d0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| +000024e0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| +000024f0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| +00002500 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| +00002510 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| +00002520 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| +00002530 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| +00002540 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| +00002550 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| +00002560 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| +00002570 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| +00002580 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| +00002590 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| +000025a0 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| +000025b0 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| +000025c0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| +000025d0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| +000025e0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| +000025f0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| +00002600 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| +00002610 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| +00002620 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| +00002630 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| +00002640 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| +00002650 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| +00002660 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| +00002670 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| +00002680 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| +00002690 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| +000026a0 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| +000026b0 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| +000026c0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| +000026d0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| +000026e0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| +000026f0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| +00002700 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| +00002710 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| +00002720 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| +00002730 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| +00002740 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| +00002750 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| +00002760 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| +00002770 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| +00002780 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| +00002790 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| +000027a0 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| +000027b0 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| +000027c0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| +000027d0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| +000027e0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| +000027f0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| +00002800 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| +00002810 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| +00002820 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| +00002830 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| +00002840 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| +00002850 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| +00002860 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| +00002870 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| +00002880 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| +00002890 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| +000028a0 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| +000028b0 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| +000028c0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| +000028d0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| +000028e0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| +000028f0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| +00002900 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| +00002910 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| +00002920 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| +00002930 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| +00002940 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| +00002950 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| +00002960 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| +00002970 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| +00002980 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| +00002990 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| +000029a0 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| +000029b0 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| +000029c0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| +000029d0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| +000029e0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| +000029f0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| +00002a00 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| +00002a10 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| +00002a20 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| +00002a30 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| +00002a40 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| +00002a50 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| +00002a60 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| +00002a70 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| +00002a80 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| +00002a90 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| +00002aa0 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| +00002ab0 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| +00002ac0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| +00002ad0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| +00002ae0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| +00002af0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| +00002b00 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| +00002b10 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| +00002b20 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| +00002b30 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| +00002b40 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| +00002b50 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| +00002b60 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| +00002b70 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| +00002b80 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| +00002b90 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| +00002ba0 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| +00002bb0 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| +00002bc0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| +00002bd0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| +00002be0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| +00002bf0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| +00002c00 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| +00002c10 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| +00002c20 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| +00002c30 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| +00002c40 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| +00002c50 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| +00002c60 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| +00002c70 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| +00002c80 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| +00002c90 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| +00002ca0 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| +00002cb0 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| +00002cc0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| +00002cd0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| +00002ce0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| +00002cf0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| +00002d00 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| +00002d10 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| +00002d20 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| +00002d30 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| +00002d40 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| +00002d50 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| +00002d60 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| +00002d70 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| +00002d80 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| +00002d90 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| +00002da0 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| +00002db0 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| +00002dc0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| +00002dd0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| +00002de0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| +00002df0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| +00002e00 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| +00002e10 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| +00002e20 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| +00002e30 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| +00002e40 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| +00002e50 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| +00002e60 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| +00002e70 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| +00002e80 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| +00002e90 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| +00002ea0 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| +00002eb0 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| +00002ec0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| +00002ed0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| +00002ee0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| +00002ef0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| +00002f00 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| +00002f10 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| +00002f20 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| +00002f30 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| +00002f40 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| +00002f50 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| +00002f60 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| +00002f70 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| +00002f80 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| +00002f90 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| +00002fa0 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| +00002fb0 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| +00002fc0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| +00002fd0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| +00002fe0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| +00002ff0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| +00003000 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| +00003010 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| +00003020 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| +00003030 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| +00003040 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| +00003050 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| +00003060 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| +00003070 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| +00003080 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| +00003090 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| +000030a0 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| +000030b0 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| +000030c0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| +000030d0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| +000030e0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| +000030f0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| +00003100 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| +00003110 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| +00003120 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| +00003130 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| +00003140 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| +00003150 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| +00003160 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| +00003170 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| +00003180 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| +00003190 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| +000031a0 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| +000031b0 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| +000031c0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| +000031d0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| +000031e0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| +000031f0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| +00003200 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| +00003210 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| +00003220 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| +00003230 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| +00003240 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| +00003250 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| +00003260 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| +00003270 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| +00003280 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| +00003290 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| +000032a0 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| +000032b0 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| +000032c0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| +000032d0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| +000032e0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| +000032f0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| +00003300 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| +00003310 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| +00003320 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| +00003330 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| +00003340 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| +00003350 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| +00003360 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| +00003370 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| +00003380 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| +00003390 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| +000033a0 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| +000033b0 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| +000033c0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| +000033d0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| +000033e0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| +000033f0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| +00003400 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| +00003410 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| +00003420 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| +00003430 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| +00003440 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| +00003450 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| +00003460 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| +00003470 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| +00003480 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| +00003490 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| +000034a0 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| +000034b0 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| +000034c0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| +000034d0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| +000034e0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| +000034f0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| +00003500 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| +00003510 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| +00003520 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| +00003530 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| +00003540 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| +00003550 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| +00003560 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| +00003570 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| +00003580 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| +00003590 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| +000035a0 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| +000035b0 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| +000035c0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| +000035d0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| +000035e0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| +000035f0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| +00003600 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| +00003610 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| +00003620 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| +00003630 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| +00003640 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| +00003650 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| +00003660 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| +00003670 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| +00003680 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| +00003690 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| +000036a0 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| +000036b0 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| +000036c0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| +000036d0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| +000036e0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| +000036f0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| +00003700 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| +00003710 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| +00003720 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| +00003730 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| +00003740 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| +00003750 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| +00003760 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| +00003770 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| +00003780 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| +00003790 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| +000037a0 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| +000037b0 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| +000037c0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| +000037d0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| +000037e0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| +000037f0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| +00003800 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| +00003810 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| +00003820 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| +00003830 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| +00003840 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| +00003850 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| +00003860 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| +00003870 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| +00003880 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| +00003890 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| +000038a0 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| +000038b0 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| +000038c0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| +000038d0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| +000038e0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| +000038f0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| +00003900 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| +00003910 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| +00003920 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| +00003930 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| +00003940 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| +00003950 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| +00003960 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| *** 7603 LINES SKIPPED *** From nobody Wed Oct 18 15:29:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9ZWl3xBhz4x9Q4; Wed, 18 Oct 2023 15:29: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 4S9ZWl1bsRz4D2f; Wed, 18 Oct 2023 15:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zGolTNNVuB9h6ba0/lV13MtqnpSEK6fIjxhYM6al3M=; b=uAFEY2Obzc661r4WzoWa4emoLvuylCyyD01TLtU7TLc9JrXm4qcUpTJXlXd9GrajQFpRW5 kIZx1BLWVZwZl0w1s0AGJ3u7Y4AQpAN3jZWZSVbZ681UKPN21fhKGthoT+ZQp3UDpXZOrG a08//+0TQrS0nYkMaR4HFad1+8hWjGfCzKLlxQK9oyRAVA5CXDQKMLz/nI/pkcQVURw2+c Y169UVjiyk/v5384NhQbSX3Nhnh2RIfZTMBLuSxlw5SUnSiZ/B0segB2IbEPtaAAck+j0a 7fWxbInnWwbM3BxR+ggT6hGVmfH27ub2lyH9LgSKr0e1IP7lnqcmn8RTjfvETw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697642947; a=rsa-sha256; cv=none; b=Nt17fvVnorZuxqZVuwWc2FjVQD8aiL5htsm4YEQYDgajHxayzVU2OSqFxJ90YTr2aZCUyE t2yhv1uiQNOslaqTZnGCqg7RQgMGETNQZk44y/QJPgT9hI01OlReJlKLTcs8Y701nNxLHR zHMyDrnM/BQy8zmr/P2GT6tC1I1HLRv8olRiKOlM3n776AmoaJEoHgOmT+DySvNbI+LOuQ mmNf4/cY1GSqTrj/EgJrm/kMtvla+sSBoR9U4H11biyiezFZrkbDq9s6VssJLz0OJpa/e6 BKo6ydbhZAATjcPug7XVyezSUo1RqQihpn2DcA0CSK+EufS0tl1M+KByzx8lGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697642947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zGolTNNVuB9h6ba0/lV13MtqnpSEK6fIjxhYM6al3M=; b=PW10adH33qyLqcuEUDkiBCZep278/ce4uw58xaSLUB3Tetr/TzDGLBaRdI0gna2ZbTduDT z2LEgh20q1CXfQws9Wgz4BA0JCzle7L5EPyXz+TYZqgA7FN+azUXMoZELVIoqFWtUoiU9q ooHquHLWYFMe/E8Lzn8ruOaZ8X0t3Ai2XHtHjdzMPMKAkBXphdnPeBw5NvnqwR574bYz0y zMZ04q5w3SHSJ2gtuqQUNqMeOfaozEc0NiyMaqU7WvIjDY+4Td4edi9cxPoFK9HP1AyE/K ham9VEivC2luPOqpIJXGuhnieabVy3NJjU8EtCKxYe0l2bR1SO7x/sy7EBtMIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9ZWk72LVz19j3; Wed, 18 Oct 2023 15:29: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 39IFT6UW078385; Wed, 18 Oct 2023 15:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IFT6ad078382; Wed, 18 Oct 2023 15:29:06 GMT (envelope-from git) Date: Wed, 18 Oct 2023 15:29:06 GMT Message-Id: <202310181529.39IFT6ad078382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 9ed4f43bc4c3 - stable/14 - Remove $FreeBSD$: one line sh-pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ed4f43bc4c39dc5ed2ce1bf6003e4dcb4160bfc Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9ed4f43bc4c39dc5ed2ce1bf6003e4dcb4160bfc commit 9ed4f43bc4c39dc5ed2ce1bf6003e4dcb4160bfc Author: Jose Luis Duran AuthorDate: 2023-10-18 15:24:00 +0000 Commit: Warner Losh CommitDate: 2023-10-18 15:24:00 +0000 Remove $FreeBSD$: one line sh-pattern Remove the $FreeBSD$ pattern added to the tests, as well as fixing the mkimg_test.sh script to stop adding it when we rebase the tests. Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/870 (cherry picked from commit 3b5c9845727a1b95098379f66223525e85e8a73f) --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/mkimg_test.sh | 4 +--- 29 files changed, 1 insertion(+), 31 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex index 01ceaae1963c..0de167c0e198 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex index 25e961888b80..bd8601eccc50 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex index 1ff8880a897b..35b354c7310b 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex index 857c7ea3e4f0..796166f430ee 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex index 76e76c3155c9..93b291550be0 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex index 044e0bc66181..51da710db535 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex index c3b9496e2870..0103906c9fa2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex index 6b4ec6c575d6..36210d5dd44d 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex index 2a44596b10fe..bf6ba8b9560e 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex index 31451cfb320e..94fbb99cbdb9 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex index dbaed6ce1606..3ee432909549 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex index 2ec42edb497d..8311d98ee9c0 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh index 74680c5d2be7..7c6593b219ef 100755 --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -86,9 +86,7 @@ mkimg_rebase() fi if test $update = yes; then - # Prevent keyword expansion when writing the keyword. - (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline - cat $result >> $baseline + cat $result > $baseline fi rm $image $result _tmp-* From nobody Wed Oct 18 16:17:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9bc41mPJz4xDd8; Wed, 18 Oct 2023 16:17: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 4S9bc41HYMz4K0R; Wed, 18 Oct 2023 16:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697645876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=YCMlHyUUB88LzhS0cFoHDSdBszJ/E1rEO+KvdDLgft5vfO6BdPPkh+hEf0PT2Lep7dz1P4 kFKlxe8mu7lMxhBtF8I+teVAYOCqyu+FPA2GdbyjEA4dG1t12HoW97g7a0H8cH4FLsXX99 q1MM7ThG13nPw0Gh16eFDiJI553JBEI+HUq8JPSUp5DzrERKM3eLPBSEFz5FHZtMOuhzqv xjUurvLF68B9TKPjs66oxnHQGnCw08+mcVmoMDt3rQGbFo1kvjXmmmLmlZZqT1QxM0hE91 QcwIS/P/jGgyYResWclkZPdNekQRTD4JpG+3lpvBcymrscuSzHKwgv0cHiykVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697645876; a=rsa-sha256; cv=none; b=IHiKmIKHZMPBsgHAwiNC/lYrBNJfHtoFZcLaZWdUXRgNh2aP2R6H8fm+6Xyp4pNYIvBEAk ZaB5UbvYweswH2HViDholUca9OaFiD6+af6xTJIrz7g6XfyiJnGWJA+QaYfXiDZAOuau5D QxjAsXOgo4Edno51RlEVqKZMvI0OIq28cs9wDrpyvF2qTvruZGDnPvYJndH78fVL7MA0XN VWXxff/oOpZJHeym9/j1LRX+1O1DnCpjG7eOP7TVrQ00KfS4dIszbtN2PjOV1DbMCa5ts2 5P6/h+oRA7WxFH1mXwwVi5y1yA5x+XvBiFtHJUHKF18XrW0GIyl/TgluoNXitQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697645876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gSfGcZO5o3fMSmkzpN7ooySgF/WTssTra4BiCYKONFI=; b=EDgkx1UUUnB24oHohFIJarTmmu0ca40tnvRyQnx6UKpk8ZpK2svncxRNgkk9ikX22DHT7g Bx1amE4mc1AUaZJjBJZXlDgzxz3fwUjwuZ6XpHV7Cs6uZB9hGEqeKVFJadrj7hBI6lrvi9 lJsXGDT7VUNBScVM921FnC0mpm5LXlOdHGQeTuDu4paxBJDKrB8jDDgaSy/a5Tua+hl/DO cutYamJWkjhYkOyW9FMpZGJrIm7RgBgl4L2KZwB2YXDfJoctOhMOMqJosr6hJPlrtg9J5o IQq/qMR6KKGa9tgUVNeIYdr+gqODPdAM2dGyj4mMwyUwptwKl73cczkL9x4oNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9bc40Kwjz1Cmc; Wed, 18 Oct 2023 16:17: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 39IGHtQn061691; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IGHtLv061687; Wed, 18 Oct 2023 16:17:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 16:17:55 GMT Message-Id: <202310181617.39IGHtLv061687@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: 3d4424154617 - main - freebsd-update: allow user to break out of conflict resolution loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d44241546173de00852ab5e22263ba538cd8759 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d44241546173de00852ab5e22263ba538cd8759 commit 3d44241546173de00852ab5e22263ba538cd8759 Author: Ed Maste AuthorDate: 2023-03-03 17:32:51 +0000 Commit: Ed Maste CommitDate: 2023-10-18 16:17:33 +0000 freebsd-update: allow user to break out of conflict resolution loop When a conflict marker is found during update allow the user to confirm they want it to remain in the file. Suggested by: Tim Hogard Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: ceb5f28ba5fc ("freebsd-update: re-edit files if merge confli...") Differential Revision: https://reviews.freebsd.org/D38896 --- usr.sbin/freebsd-update/freebsd-update.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4866514c321e..551d40418240 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2544,7 +2544,11 @@ Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... EOF while true; do - read dummy /dev/null; then + echo + break + fi ${EDITOR} `pwd`/merge/new/${F} < /dev/tty if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then @@ -2555,7 +2559,8 @@ manually... Merge conflict markers remain in: ${F} These must be resolved for the system to be functional. -Press Enter to return to editing this file. +Press Enter to return to editing this file, or type "ACCEPT" to carry on with +these lines remaining in the file. EOF done done < failed.merges From nobody Wed Oct 18 16:29:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9bsv2Hn5z4xF5D; Wed, 18 Oct 2023 16:29: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 4S9bsv1mj4z4NPH; Wed, 18 Oct 2023 16:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697646595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0L8xJtFgX6Wy8HL4+7+X6dzg3NaK/xNsTrq10GJOIo=; b=ukZVgnzT7eXDvWDO1+yT9CLQTXyS72bB1WXhNY7yh990+yTUIiR2N0hYX3ZF3r9YVBRmRU WfgwwnWs4pBqx7TEdI/F/vu9+IbFt9jvVRjPdhXxMDX0mXTm15c27WQoUom2Uqq3m230oJ XMgjksIf/6HB+o5xfmo61Q79XFgOYVnHhOO/Q6NnsrfYCXBUe1uoBv1hMJyvGBB7myLCBK njPp9OSi22SURb8ukiEnzcy2yoljLwAx3AfN2YrKESAVq8hy3XR9cadfa/VoKrBvn1xVlr Zu7WVa9lgOhUkp9lfjdhxQvyLTRWOYgTPG2zjVH5s3o9awpeCA1M8n059pPPHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697646595; a=rsa-sha256; cv=none; b=Xyox5IxpEEry1yT7Xs+bMBazF26G4xZ6EwQSZBkcGpDZnbh62XjNX9LeKepm3nw5yfIKze EcVQKEKp/laCUPIzFiAxXe5OE1Xh5AA/RPwzqRDan3CVeQJ7Iwi8+ggIAvuwUqjluIr8pd uTWli08nnyq2mm7qvyeZGVD45Jx2UiKcvG2t1aT07cZoSzhmYTBLpAlioV0pwfJLkJdIpT a4mmVOdnaS/iQUOFz/n/kJsV0Kx72iP6mryHDgQt9bz/dhSKT4LW1sID7nrk6tO6qx0vrt 2KFpmXqx+Du2pgl7iVONLDNcaM7HfarmoZy79q03o+TR9rPFBRw30ckDvHCLJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697646595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0L8xJtFgX6Wy8HL4+7+X6dzg3NaK/xNsTrq10GJOIo=; b=PJlQeswxJXXeZ02yWwPfGNR3jMh1ijtfb3bMSXv1/LbyUY67KwnyrbcPyv+nM/XHjGwf02 RrhY2I+Hq65NBHx0NRmxL1o2nUU6IyDbZZxfrhnPnWMUY9Q/vcqgQESGTOjML0T/E2pmXa wgt/AYT9eP1+DjrOOdv8ewWe4m1iw+f2WPyAjaQ8nF8CIz1ztHrO9A9rQSe+VFJkmgL02q XIVypygGB9FdBZyO9lcYEG69+K53ILwuUsJZzaZQG2XZixobRApKSuAgIqVK4/zr50mY2P +Gt3SP5mGKeYmmXrHgQguuohyJ0VGv2h+/7TxsXgRkPCCbUqWqmCLq38xiLzrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9bsv0XVRz1Cst; Wed, 18 Oct 2023 16:29: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 39IGTso6078066; Wed, 18 Oct 2023 16:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IGTsBY078063; Wed, 18 Oct 2023 16:29:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 16:29:54 GMT Message-Id: <202310181629.39IGTsBY078063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 07c60e63237e - stable/14 - Make cr_bsd_visible()'s sub-functions internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07c60e63237e1d4657cfbd6b03116c4913827e8c Auto-Submitted: auto-generated The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=07c60e63237e1d4657cfbd6b03116c4913827e8c commit 07c60e63237e1d4657cfbd6b03116c4913827e8c Author: Olivier Certner AuthorDate: 2023-08-17 23:54:39 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 16:24:48 +0000 Make cr_bsd_visible()'s sub-functions internal cr_canseeotheruids(), cr_canseeothergids() and cr_canseejailproc() should not be used directly now. cr_bsd_visible() has to be called instead. Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40629 (cherry picked from commit 91e9d669b475d1900e8dc01a49ad90a621c4a068) --- sys/kern/kern_prot.c | 10 +++++++--- sys/sys/proc.h | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 14b19837d5dc..00eb2fccdeef 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -91,6 +91,10 @@ static void crfree_final(struct ucred *cr); static void crsetgroups_locked(struct ucred *cr, int ngrp, gid_t *groups); +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2); +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2); + #ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; @@ -1371,7 +1375,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_uids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2) { @@ -1401,7 +1405,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { if (!see_other_gids) { @@ -1440,7 +1444,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { if (see_jail_proc || /* Policy deactivated. */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8609bbd124ad..0b91b2a1a0b5 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1166,9 +1166,6 @@ struct thread *choosethread(void); int cr_bsd_visible(struct ucred *u1, struct ucred *u2); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); -int cr_canseeothergids(struct ucred *u1, struct ucred *u2); -int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); -int cr_canseejailproc(struct ucred *u1, struct ucred *u2); int cr_cansignal(struct ucred *cred, struct proc *proc, int signum); int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess); From nobody Wed Oct 18 18:03:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dy43LDJz4xL1k; Wed, 18 Oct 2023 18:03: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 4S9dy42kVBz4WlQ; Wed, 18 Oct 2023 18:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5Mmdtz+xO17AXLm8f5rWGl9568tdRHuMQzQt1RTu3Q=; b=NroT/QUYReyUWPCjHCorZrzliqgtK68C8xq29n5ewA1Yzbaa/l80cU658TZ8NbE6v9D6yi 0Nae0c90M/m2n6x/K4HgpOPCEh0INuONZ4nqtFgnoXcz+IaTSlIeZ+aFD5BVl0iO6ELox6 m2Ks5JdfCZEGroGrZcQqH4SLXi/FleIBaGIDQYGGZlfcp7amGZF1L62u6yLPSkMsiG2cwB 2UhYE9OfV1cC/Zy7C6RNO3hsnXZK96xIW/5mgRNIUngAk6vul4uVKQti4K8XJsEXSEuOln JOf2ypbQ2LIjEMvw515RChLDCsbKd4rXhbGGvwIkKOMlcj+DkzIfBq3IkSumiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652220; a=rsa-sha256; cv=none; b=DCoxlIMARBctyn7s8IsuKhyQS1JOW28/nuJkf/2iLTvZNQAY6aC7qrLt9IixzVavit0T3t vYWl4ieeRiyTT0nBe9GZFbjD5Hjf1Yyo+ekoKYTyBLi2TlUh8qCmhFTr/bj3YLVLZ6eJBu OjmpwlXYM98GJzQaY8mDvsnDBouIQAALNesVN0osaWoNWqN1ZOoYOf7h63FmTO4CsYMLDE Yg+oqCR48O233+SQcEU1BczxcDWDOnXUhA8Tpt9wC7xVnvkuv9udxSkkeFiSuT6AW8QMBM iDztA5+7uaSPz6QycuxPn6TJ0P+rtoJiAMiulQc9CI2b7ak80/dGpZWpy8Ob6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5Mmdtz+xO17AXLm8f5rWGl9568tdRHuMQzQt1RTu3Q=; b=koPwpZ6q7ekDptv9w3uq6O/D1EFY71mp0RaGHi6eQYzGWSUtoKoqA4ULXbmsBEdnjCtYh3 ti67YjSH/OAUgsW82tQndbxdPUuT1kRlvBU+SGDZ8hNAAIv1sBmvJjPgtCw6C4vlUox6ZV Iy7ssBVXHZESznwtevECNs9z6JQNAQcublu2A4jvieHhQ4hBYY35lfQK9+UPclFkkMfDkK RyZ2Zch5vs2yD3E2zomfCr4xjUrg7RefEIYknPN5oIWHvWmE0UTYjXHf3UqvIEm3SXwv/+ oRGQA2GceJ4+wEAG5EfhI0aHnqh5ES8GEjrpBdvoKW9B7kNvXlbuW0ZraA75og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dy41p6mz24m; Wed, 18 Oct 2023 18:03: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 39II3eJC044314; Wed, 18 Oct 2023 18:03:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3eRl044311; Wed, 18 Oct 2023 18:03:40 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:40 GMT Message-Id: <202310181803.39II3eRl044311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 63c01c18a8d3 - releng/14.0 - cr_canseejailproc(): New privilege, no direct check for UID 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 63c01c18a8d3feb957a4f91171aaac1f92ce5955 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=63c01c18a8d3feb957a4f91171aaac1f92ce5955 commit 63c01c18a8d3feb957a4f91171aaac1f92ce5955 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:37 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 17:59:09 +0000 cr_canseejailproc(): New privilege, no direct check for UID 0 Use priv_check_cred() with a new privilege (PRIV_SEEJAILPROC) instead of explicitly testing for UID 0 (the former has been the rule for almost 20 years). As a consequence, cr_canseejailproc() now abides by the 'security.bsd.suser_enabled' sysctl and MAC policies. Update the MAC policies Biba and LOMAC, and prison_priv_check() so that they don't deny this privilege. This preserves the existing behavior (the 'root' user is not restricted, even when jailed, unless 'security.bsd.suser_enabled' is not 0) and is consistent with what is done for the related policies/privileges (PRIV_SEEOTHERGIDS, PRIV_SEEOTHERUIDS). Approved by: re (gjb) Reviewed by: emaste (earlier version), mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40626 (cherry picked from commit 7974ca1cdbee949f5e453eea112be265b425c407) (cherry picked from commit bedaf8af51c96cef025c13c41ba420163824e8cb) --- sys/kern/kern_jail.c | 1 + sys/kern/kern_prot.c | 7 +++++-- sys/security/mac_biba/mac_biba.c | 1 + sys/security/mac_lomac/mac_lomac.c | 1 + sys/sys/priv.h | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 39bdcaf5ef0e..57e6024a9939 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3938,6 +3938,7 @@ prison_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: /* * Jail implements inter-process debugging limits already, so diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 19e0b78c6709..ed15cb566499 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1426,9 +1426,12 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { - if (u1->cr_uid == 0) + if (see_jail_proc || /* Policy deactivated. */ + u1->cr_prison == u2->cr_prison || /* Same jail. */ + priv_check_cred(u1, PRIV_SEEJAILPROC) == 0) /* Privileged. */ return (0); - return (!see_jail_proc && u1->cr_prison != u2->cr_prison ? ESRCH : 0); + + return (ESRCH); } /*- diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 6948548503e1..5d66e2fd4b9b 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -1924,6 +1924,7 @@ biba_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 05bd0da06960..aa9abf458721 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -1702,6 +1702,7 @@ lomac_priv_check(struct ucred *cred, int priv) */ case PRIV_SEEOTHERGIDS: case PRIV_SEEOTHERUIDS: + case PRIV_SEEJAILPROC: break; /* diff --git a/sys/sys/priv.h b/sys/sys/priv.h index 45cb5bab4275..a61de8d32fe0 100644 --- a/sys/sys/priv.h +++ b/sys/sys/priv.h @@ -105,6 +105,7 @@ #define PRIV_CRED_SETRESGID 58 /* setresgid. */ #define PRIV_SEEOTHERGIDS 59 /* Exempt bsd.seeothergids. */ #define PRIV_SEEOTHERUIDS 60 /* Exempt bsd.seeotheruids. */ +#define PRIV_SEEJAILPROC 61 /* Exempt from bsd.see_jail_proc. */ /* * Debugging privileges. From nobody Wed Oct 18 18:03:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dy55KRRz4xKhF; Wed, 18 Oct 2023 18:03: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 4S9dy54Jcqz4X9Z; Wed, 18 Oct 2023 18:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1V6Jx9+9LDWAlwx/qsSy4X6v0sqNujcc2lZr2m54ls=; b=kIjs/fwPpg8vQ1+Hd9GhP0GqhlHXYg7EqJ/LJ3nEPOAa7/51lw6NSV/YD+FcaMU9vx8iCY emakbQbZqmx2RemO54FHWYEVJr1VSg9A3u+lc7drjdNlbQgViqEQfLgRjz+/5CT2Kset+U gj2zzh3oUUV6QQe5mb3elhx2g6hVreiKU1KgsDXoWIleDSjzGSCHpMM7ow1Q2IXKfh9vXH JUvZxwmk/yOS9gRxGF7z71bxXkey7D2p5Ui4iAYBCp2YFU5mMhvmdzTaJwz6Oi89yYJ7YF hy1Tlac8vCZo30XTPmTsPVuo7PMh6IjAOwbg9Y9/Dsh8/hCkXMJt9NKJvoMOug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652221; a=rsa-sha256; cv=none; b=GZa4ZpzQ4rqcYIUxB0yCAuYoSP7DrpUjzfEO7nvhBjPDAzbMb5voKGfBGIqDRctUvjZ3Av KDNddg6bIk9Vo3e1SJb15a4grrc1lTwJfiMfwCmBnGcc1zYeA7Xkw1IR4jypNHvcd/YOEe 9zb/qno5CJVGExwqVBFoJMM8HRXWWAoZ/8VcWdpp41jk7N4/2MrlpkFR9WIB8D1Oo4KJdm mqoh1O1v9K2/iMf9HcmM09DkktsmSWtTyshuIc5lLq7TZNNTnRKiTif0CnEuoy7iYnEMJV djUWdiGQw53kMBZJqrTSKycJfQyF9zV2nsJvrlAZWVRgd7HhIP0xDlFKem97Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1V6Jx9+9LDWAlwx/qsSy4X6v0sqNujcc2lZr2m54ls=; b=DgF99RNbbXtWvLXiYH/mLr8e4yzkx+HMjlB9mgTmR10okF5nIayLSVWpgtEdZMUfkD29Bm qivLBeK1qwEZAuJojN6JJ4TRLhfrhia4VRcL/3H5wNvyUHykz5x3FNDNBuS1FBiefo6pnP vDxL9ZaHitYJcDlGlPnXC3xukELGROWcrG3raUJsWiVUHFyM5FNM12RraPeLRu34d8WDat D3rQCMnYimaLOc0rDv8oDaxXyr2nwEFk+ec9ROexs12cHGxEmyzBuZPdOVllnt8SlrN8jv KCWLgP00OrPVGofr+yvcZPRIDUYsRkQhfqh+UhnJMBh/u9E9/G7e5uxyS/kR/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 4S9dy52qp5z2RB; Wed, 18 Oct 2023 18:03: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 39II3fls044365; Wed, 18 Oct 2023 18:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3fl0044362; Wed, 18 Oct 2023 18:03:41 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:41 GMT Message-Id: <202310181803.39II3fl0044362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 768fe2300987 - releng/14.0 - New cr_bsd_visible(): Whether BSD policies deny seeing subjects/objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 768fe23009877b42a9f45b0ca9e9c05f9db76649 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=768fe23009877b42a9f45b0ca9e9c05f9db76649 commit 768fe23009877b42a9f45b0ca9e9c05f9db76649 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:38 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 17:59:34 +0000 New cr_bsd_visible(): Whether BSD policies deny seeing subjects/objects This is a new helper function that leverages existing code: It calls successively cr_canseeotheruids(), cr_canseeothergids() and cr_canseejailproc() (as long as the previous didn't deny access). Will be used in a subsequent commit. Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40627 (cherry picked from commit e4a7b4f99cfd4931468c0866da4ae8b49cf5badb) (cherry picked from commit 4a78431a52e9e65c6181a943bca2430633350db1) --- sys/kern/kern_prot.c | 19 +++++++++++++++++++ sys/sys/proc.h | 1 + 2 files changed, 20 insertions(+) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index ed15cb566499..1e6073b554e4 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1434,6 +1434,25 @@ cr_canseejailproc(struct ucred *u1, struct ucred *u2) return (ESRCH); } +/* + * Helper for cr_cansee*() functions to abide by system-wide security.bsd.see_* + * policies. Determines if u1 "can see" u2 according to these policies. + * Returns: 0 for permitted, ESRCH otherwise + */ +int +cr_bsd_visible(struct ucred *u1, struct ucred *u2) +{ + int error; + + if ((error = cr_canseeotheruids(u1, u2))) + return (error); + if ((error = cr_canseeothergids(u1, u2))) + return (error); + if ((error = cr_canseejailproc(u1, u2))) + return (error); + return (0); +} + /*- * Determine if u1 "can see" the subject specified by u2. * Returns: 0 for permitted, an errno value otherwise diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3102cae7add0..8609bbd124ad 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1163,6 +1163,7 @@ void ast_sched(struct thread *td, int tda); void ast_unsched_locked(struct thread *td, int tda); struct thread *choosethread(void); +int cr_bsd_visible(struct ucred *u1, struct ucred *u2); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); int cr_canseeothergids(struct ucred *u1, struct ucred *u2); From nobody Wed Oct 18 18:03:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dy70RBfz4xL1q; Wed, 18 Oct 2023 18:03: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 4S9dy64kLfz4Wx4; Wed, 18 Oct 2023 18:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mmNYfBFsf7+xfnN5tMKK8esNZ3YEUzCd1GxBJvV2q8=; b=KIZBwroBDXWleFOpInEFMVCUVbsozNVWTJyXlkOWoCFIIJP1LbNdTaWYE8oz/lCcEhsMZ4 yEwO6UXK5GUED4oVxoQ2AamvesKBD/ITyFtGqRBUn3FO5fZMqz0K36bti+Ej9s9bJrBXap J2nZAvNZRRQ9ve7Psjt4Rvs0SiUu0FMShUpX6Qq3PVvrqmmuXK3Nl5LkbZLnfuiLb2jkIS m7Q0n3tUqRnxVE6A5ajxpGmrB5nTR9pYfQaQgc7OFzRDvtWNjpdPl+z04b13VtUuV6j0jn 1VxyeU5HVYPz2lHkbdRBKmeHfWujBLy7I6+NMQZNcWVY8SWXW0XyB4Vbod8tyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652222; a=rsa-sha256; cv=none; b=WbndPBb80+170aeGGANUAcasVlsBcahd4++j/ju+qf1cqDS5iXcGC2jUAeFUMkXAnAI+gV 3YaEdwN3UbygNzdHGqmOBL/XbqAQiUZQCLW9x6xCMOnmeXEpDsSZyEczgxZDHwx8Ajx7JE XtY8o/dpTEBtB8wMp/CfV1KlZU1/9ryr49etRrNpAcOxBoIsYM++NuHRGVPHloPJWhIkv8 IkvW0/YjMuuvBjsufslMZfat2o2zun232WI+ld0kcFsZv8268WAWqo2QvZ5SQMszzKCUdS Q4vZhBhFwjU8LbuYIieReE/zN/jZsAsUN6IDdUsZaflCaLelGvkHn/IdVp9kww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9mmNYfBFsf7+xfnN5tMKK8esNZ3YEUzCd1GxBJvV2q8=; b=vkTh9uazi9zaizXIsMo8CP6UImXt1nnk0JrqjaNmgKUpCDqn2BUXCTNVQae3C8+/xEs3Uo 8jBbQyO496Y9C6m74dhVpzptX8Zs6qubWPT7Sap5pUm6LvL+LfA8WOJDDwlj/PQ+c8Nl6c PAxVN5mUdBaxt8HnXB4ox/EOzjUSrnVZFHJZDVpEfaf/CKazT5Yz6zaayJbgv5ocU8IdVm Dqyl9weOorTbXeayXu/cxJRi9J4QKKQa1qVjnOA54bXbNSWEJDeJlO9CE297mWaAQEc1d/ qFjSZl/Szpgpn2IH8kUYe4h7Z0nXmkZhiHvF4Pi4ovD+jN3s4fnNRbiAM39yog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dy63qBcz27H; Wed, 18 Oct 2023 18:03: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 39II3g36044413; Wed, 18 Oct 2023 18:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3g3a044410; Wed, 18 Oct 2023 18:03:42 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:42 GMT Message-Id: <202310181803.39II3g3a044410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7e21c691f295 - releng/14.0 - Fix 'security.bsd.see_jail_proc' by using cr_bsd_visible() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7e21c691f295b3babc8c57c0aeafa19faf1371b6 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7e21c691f295b3babc8c57c0aeafa19faf1371b6 commit 7e21c691f295b3babc8c57c0aeafa19faf1371b6 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:38 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 17:59:51 +0000 Fix 'security.bsd.see_jail_proc' by using cr_bsd_visible() As implemented, this security policy would only prevent seeing processes in sub-jails, but would not prevent sending signals to, changing priority of or debugging processes in these, enabling attacks where unprivileged users could tamper with random processes in sub-jails in particular circumstances (conflated UIDs) despite the policy being enforced. Approved by: re (gjb) PR: 272092 Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40628 (cherry picked from commit 5817169bc4a06a35aa5ef7f5ed18f6cb35037e18) (cherry picked from commit abfcae344feb89c635616769d12150f84c96c003) --- sys/kern/kern_prot.c | 25 +++++++------------------ sys/netinet/in_prot.c | 4 +--- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 1e6073b554e4..648c067dc528 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1471,11 +1471,7 @@ cr_cansee(struct ucred *u1, struct ucred *u2) if ((error = mac_cred_check_visible(u1, u2))) return (error); #endif - if ((error = cr_canseeotheruids(u1, u2))) - return (error); - if ((error = cr_canseeothergids(u1, u2))) - return (error); - if ((error = cr_canseejailproc(u1, u2))) + if ((error = cr_bsd_visible(u1, u2))) return (error); return (0); } @@ -1536,9 +1532,7 @@ cr_cansignal(struct ucred *cred, struct proc *proc, int signum) if ((error = mac_proc_check_signal(cred, proc, signum))) return (error); #endif - if ((error = cr_canseeotheruids(cred, proc->p_ucred))) - return (error); - if ((error = cr_canseeothergids(cred, proc->p_ucred))) + if ((error = cr_bsd_visible(cred, proc->p_ucred))) return (error); /* @@ -1653,10 +1647,9 @@ p_cansched(struct thread *td, struct proc *p) if ((error = mac_proc_check_sched(td->td_ucred, p))) return (error); #endif - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) - return (error); - if ((error = cr_canseeothergids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); + if (td->td_ucred->cr_ruid != p->p_ucred->cr_ruid && td->td_ucred->cr_uid != p->p_ucred->cr_ruid) { error = priv_check(td, PRIV_SCHED_DIFFCRED); @@ -1723,9 +1716,7 @@ p_candebug(struct thread *td, struct proc *p) if ((error = mac_proc_check_debug(td->td_ucred, p))) return (error); #endif - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) - return (error); - if ((error = cr_canseeothergids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); /* @@ -1815,9 +1806,7 @@ cr_canseesocket(struct ucred *cred, struct socket *so) if (error) return (error); #endif - if (cr_canseeotheruids(cred, so->so_cred)) - return (ENOENT); - if (cr_canseeothergids(cred, so->so_cred)) + if (cr_bsd_visible(cred, so->so_cred)) return (ENOENT); return (0); @@ -1847,7 +1836,7 @@ p_canwait(struct thread *td, struct proc *p) #endif #if 0 /* XXXMAC: This could have odd effects on some shells. */ - if ((error = cr_canseeotheruids(td->td_ucred, p->p_ucred))) + if ((error = cr_bsd_visible(td->td_ucred, p->p_ucred))) return (error); #endif diff --git a/sys/netinet/in_prot.c b/sys/netinet/in_prot.c index 222e39c6bcd2..204f4f60456e 100644 --- a/sys/netinet/in_prot.c +++ b/sys/netinet/in_prot.c @@ -67,9 +67,7 @@ cr_canseeinpcb(struct ucred *cred, struct inpcb *inp) if (error) return (error); #endif - if (cr_canseeotheruids(cred, inp->inp_cred)) - return (ENOENT); - if (cr_canseeothergids(cred, inp->inp_cred)) + if (cr_bsd_visible(cred, inp->inp_cred)) return (ENOENT); return (0); From nobody Wed Oct 18 18:03:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dy76FvJz4xKdh; Wed, 18 Oct 2023 18:03: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 4S9dy75cV9z4WxK; Wed, 18 Oct 2023 18:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DiuR+23CAmKL0Vdge64pw/H3rhpiUpypd6zE5mfoVqM=; b=ho3lJk/FH2kUh813LLeBxQLpKvVo4ouHB805wvs38R4W3cTTM75ufAHj8+j1uPHrGwqsYA LmImZJyBk9GjfqKYzlYiAmHNXXVsyiKlCBCNWCSyxl579IizA7n6gg4x1hzJdVyRkk6K8U DMmg6szmIs+7+zcb+M/Tn+UNx0axy0U3dr35LZjAB9ZXPjmxnJmJrKoNvffbsEAZpCpnAS AfFWk9NdJYykx6TTpZjc+bEnrzNXTRUbnvUurQhHkvn18VLOrE+W24BS2G20tXv3bO6YKO +yifztl058DuQ1XU6Fen19x4dBdWrE6vPKMVvUg2H/jbpZiIVWd1tpIuseoByw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652223; a=rsa-sha256; cv=none; b=YonA+d1GMuclN8P/Y8WEIWwBYBPElIOUqr7qzve436r60Y0WN7Zo0Mt47grHct0MYfvTMQ 8ZSsoVqTO8sQx25UblAniq5enoNyiclhQ/sI51vVKYGsCJJtjZCHMC5QPP1MNgtgqotgrm GL7QeOs+bGDmAasLIUeLWemrLeoCrLsBRjwy0wit/vlTg8Crjq3YyGDEsFEfo+xpEkt2a9 W3ctN4XM4vxLHRBbgFPl3zW3t3ngkrbV370D56Tb0PT0fnUyjLmgL3DetgRgTcrjq/WofX Uy8Fh51JREdDomW9CvfQ1vaxA+LaZ16h7GZvNk6SlRibNO4cq8mT5M100wcs8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DiuR+23CAmKL0Vdge64pw/H3rhpiUpypd6zE5mfoVqM=; b=NgRPmf1OxZsC3YRG7b2hMD1PTLxEQarnxNGE//G2jP+lwki/pSXwYOVNh+im+YgxP1U6/Q MXDIt7fhom0Rmb5ApM7aY7N/+jnZcwov16mEGZpplneW3lI0N1b5/WVW/0avTPyPLzbfpP AgQid4frmVRtykHs2UcpvfMpikA8bf+BEt00DRedAumB03UW/AcFOFbJDPe7egqKTxp6CL Qu6jj+DnktnSCte7uxmLLFX00MwN7yV6GHXYWm2PNXkx2ZTX1j2f2MDcpMjXkHLYrP+DX5 qLUsWvXge6tdMH11Bn6ilJvlwK+I43sH+ULwNv9MpoNtzdl62T2wTQw3xj5EFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dy74jqXz1tR; Wed, 18 Oct 2023 18:03: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 39II3hZb044465; Wed, 18 Oct 2023 18:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3h63044462; Wed, 18 Oct 2023 18:03:43 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:43 GMT Message-Id: <202310181803.39II3h63044462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 0f353091c3f9 - releng/14.0 - cr_canseeotheruids(), cr_canseeothergids(): Man pages: Impacts of rename List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0f353091c3f9190ba282ea57d5dd2dd87fccf6bd Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0f353091c3f9190ba282ea57d5dd2dd87fccf6bd commit 0f353091c3f9190ba282ea57d5dd2dd87fccf6bd Author: Olivier Certner AuthorDate: 2023-08-17 23:54:39 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 17:59:59 +0000 cr_canseeotheruids(), cr_canseeothergids(): Man pages: Impacts of rename When these functions were renamed 7 years ago, their man pages were not. Rename the latter in accordance and fix the names inside them. Fix references to them as well. Add the old man pages to the list of obsolete files. Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40630 (cherry picked from commit c59ab75c04fa32bc6d292596ff5e4593a05a6b1b) (cherry picked from commit 50cb6641921f9bab29b8404af2c86da79ff0e451) --- ObsoleteFiles.inc | 4 ++++ share/man/man9/Makefile | 4 ++-- share/man/man9/cr_cansee.9 | 8 ++++---- share/man/man9/{cr_seeothergids.9 => cr_canseeothergids.9} | 8 ++++---- share/man/man9/{cr_seeotheruids.9 => cr_canseeotheruids.9} | 8 ++++---- share/man/man9/p_candebug.9 | 8 ++++---- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 589f6b968e9d..cff13e3d7478 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20231013: Man pages renamed to match the actual functions +OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz +OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz + # 20230906: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index eb670c924077..08ad811fa901 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -69,9 +69,9 @@ MAN= accept_filter.9 \ counter.9 \ cpuset.9 \ cr_cansee.9 \ + cr_canseeothergids.9 \ + cr_canseeotheruids.9 \ critical_enter.9 \ - cr_seeothergids.9 \ - cr_seeotheruids.9 \ crypto.9 \ crypto_buffer.9 \ crypto_driver.9 \ diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9 index 8e058eb4e3e5..4824a231170b 100644 --- a/share/man/man9/cr_cansee.9 +++ b/share/man/man9/cr_cansee.9 @@ -50,9 +50,9 @@ variables and .Va security.bsd.see_other_uids , as per the description in -.Xr cr_seeothergids 9 +.Xr cr_canseeothergids 9 and -.Xr cr_seeotheruids 9 +.Xr cr_canseeotheruids 9 respectively. .Sh RETURN VALUES This function returns zero if the object with credential @@ -84,7 +84,7 @@ does not belong to the same jail as The MAC subsystem denied visibility. .El .Sh SEE ALSO -.Xr cr_seeothergids 9 , -.Xr cr_seeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseeotheruids 9 , .Xr mac 9 , .Xr p_cansee 9 diff --git a/share/man/man9/cr_seeothergids.9 b/share/man/man9/cr_canseeothergids.9 similarity index 94% rename from share/man/man9/cr_seeothergids.9 rename to share/man/man9/cr_canseeothergids.9 index bd8eb5d2e9d9..79269533ae5c 100644 --- a/share/man/man9/cr_seeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -26,14 +26,14 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 11, 2003 -.Dt CR_SEEOTHERGIDS 9 +.Dt CR_CANSEEOTHERGIDS 9 .Os .Sh NAME -.Nm cr_seeothergids +.Nm cr_canseeothergids .Nd determine visibility of objects given their group memberships .Sh SYNOPSIS .Ft int -.Fn cr_seeothergids "struct ucred *u1" "struct ucred *u2" +.Fn cr_canseeothergids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION This function determines the visibility of objects in the kernel based on the group IDs in the credentials @@ -76,5 +76,5 @@ or .Er ESRCH otherwise. .Sh SEE ALSO -.Xr cr_seeotheruids 9 , +.Xr cr_canseeotheruids 9 , .Xr p_candebug 9 diff --git a/share/man/man9/cr_seeotheruids.9 b/share/man/man9/cr_canseeotheruids.9 similarity index 94% rename from share/man/man9/cr_seeotheruids.9 rename to share/man/man9/cr_canseeotheruids.9 index 2cefd0f9dc8e..80acc2d7a6ca 100644 --- a/share/man/man9/cr_seeotheruids.9 +++ b/share/man/man9/cr_canseeotheruids.9 @@ -26,14 +26,14 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .Dd November 11, 2003 -.Dt CR_SEEOTHERUIDS 9 +.Dt CR_CANSEEOTHERUIDS 9 .Os .Sh NAME -.Nm cr_seeotheruids +.Nm cr_canseeotheruids .Nd determine visibility of objects given their user credentials .Sh SYNOPSIS .Ft int -.Fn cr_seeotheruids "struct ucred *u1" "struct ucred *u2" +.Fn cr_canseeotheruids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION This function determines the visibility of objects in the kernel based on the real user IDs in the credentials @@ -76,5 +76,5 @@ or .Er ESRCH otherwise. .Sh SEE ALSO -.Xr cr_seeothergids 9 , +.Xr cr_canseeothergids 9 , .Xr p_candebug 9 diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9 index ffa4fedb6172..e80d313de55c 100644 --- a/share/man/man9/p_candebug.9 +++ b/share/man/man9/p_candebug.9 @@ -113,9 +113,9 @@ Process is not visible to thread .Fa td as determined by -.Xr cr_seeotheruids 9 +.Xr cr_canseeotheruids 9 or -.Xr cr_seeothergids 9 . +.Xr cr_canseeothergids 9 . .It Bq Er ESRCH Thread .Fa td @@ -129,8 +129,8 @@ The MAC subsystem denied debuggability. .Sh SEE ALSO .Xr jail 2 , .Xr sysctl 8 , -.Xr cr_seeothergids 9 , -.Xr cr_seeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseeotheruids 9 , .Xr mac 9 , .Xr p_cansee 9 , .Xr prison_check 9 From nobody Wed Oct 18 18:03:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dy86w3bz4xKm3; Wed, 18 Oct 2023 18:03: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 4S9dy86MNmz4XHD; Wed, 18 Oct 2023 18:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bTxSVcIZGMPeNw34d6JyYP1SsFRR+CWwvgiKYX6Z48=; b=jkBJBADqLL0CloTOaE7l+J+7+Hyby0vzipcLf3zsJXaI9qOtgitGs8MvsB/zmZCwKZhhgf //LCNdhuLFj7L2hQNSUgyF6zs/uNMYT+By45M5XGSF5sFMpbt7EzOVo7UOyb3MEM9g2Ci/ xNqL6BNIZUFr//e+7lU40FKJ3rodRqhOtIL9hH4Iw58p2/vMb4mFL+0Nh/hBNaU5UVRYMn 4lbmpKCgpqg2NWT1o7ShDt6VeY3ml+A/Y9kTSUprZ/fdf9Sdk6NR/uqx4loAIrtqOnF1fG c3WP3ynrEqwFa2aWbx/0xccsoTD9uB1umW0z4ls7Gw1UtYwdHOUteFP9XLAMuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652224; a=rsa-sha256; cv=none; b=BoEYvtp15KSCVL9BDSGKDqSdOw5UvMbIAk/QXtDlJ16MmWuSqaECOBbKT2phGPGUnFKQNB 7SMNg39nXrzRmR+tDE9qipZGn80jq76J0mXY/srqugBJeBYe191amF8lO510FFZtdmt4xs PP0F5lFwz3olEuRiz45hSWBoExio6x/GrRnJvchBMIYaTP4ha3uD3IUEa6vxangI4Tr4jp Ap5A8zK9PXMJoMtBAEk3/zoFdVKriu9kzk+NE4AlUlIkyYpqHsBHxedKsSq/Rw+xv5dnrr VKSzkjqsCtlvVZKgGdunDnDkcSuhcjRhQydEDYuGduFcoOzKWnbhAQOQEWwCTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/bTxSVcIZGMPeNw34d6JyYP1SsFRR+CWwvgiKYX6Z48=; b=s5i9xE8/WblhyyHc6ltGbQQ8X6/VIeBJRv6Yc/8SI+P8c0FRuCiklRe05elGvJgdnTgBCK xuvqEgFKfk3Q+EfidE+Mrvgz9CZivSHdz336V7ljaQt2bv14ruWh7XTyy5/CU4wN4V8b9o hh2DsS+od3JziBLHfA7WRHI36AlwdOsaQh6KkLGLka/1GMDc2GGHg3QefaAacdYKqkQaFL BoFMUuWB9DillX7vEYkAkTdWgk1p72qKHzAsw9b02fp7KEB7cCEwgtu/V2273+lOlKhm1F x9xmYfgqrLWdpNb/0/Y5CDQpIJtdXCS6a26wt9Bb44r1+RWoAUfSm2E++AhJbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dy85Ssfz1nd; Wed, 18 Oct 2023 18:03: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 39II3iHM044504; Wed, 18 Oct 2023 18:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3iVC044501; Wed, 18 Oct 2023 18:03:44 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:44 GMT Message-Id: <202310181803.39II3iVC044501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7b1a21deb3d3 - releng/14.0 - cr_canseejailproc(9): New man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7b1a21deb3d39281c05b14363e8528ee09680689 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7b1a21deb3d39281c05b14363e8528ee09680689 commit 7b1a21deb3d39281c05b14363e8528ee09680689 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:40 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:00:05 +0000 cr_canseejailproc(9): New man page Approved by: re (gjb) Reviewed by: pauamma_gundo.com, mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40631 (cherry picked from commit 29d863bb7ffc692998f21fa3e7a91afa1151cf1c) (cherry picked from commit 66eb6431479d1de3764228104ddd7a5f15ebf377) --- share/man/man9/Makefile | 1 + share/man/man9/cr_canseejailproc.9 | 81 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 08ad811fa901..71a11a7cc6c0 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -69,6 +69,7 @@ MAN= accept_filter.9 \ counter.9 \ cpuset.9 \ cr_cansee.9 \ + cr_canseejailproc.9 \ cr_canseeothergids.9 \ cr_canseeotheruids.9 \ critical_enter.9 \ diff --git a/share/man/man9/cr_canseejailproc.9 b/share/man/man9/cr_canseejailproc.9 new file mode 100644 index 000000000000..775c76722b05 --- /dev/null +++ b/share/man/man9/cr_canseejailproc.9 @@ -0,0 +1,81 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Olivier Certner +.\" +.\" 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 DEVELOPERS ``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 DEVELOPERS 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. +.\" +.Dd August 18, 2023 +.Dt CR_CANSEEJAILPROC 9 +.Os +.Sh NAME +.Nm cr_canseejailproc +.Nd determine if subjects may see entities in sub-jails +.Sh SYNOPSIS +.Ft int +.Fn cr_canseejailproc "struct ucred *u1" "struct ucred *u2" +.Sh DESCRIPTION +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials +.Fa u1 +is denied seeing a subject or object associated to credentials +.Fa u2 +by a policy that requires both credentials to be associated to the same jail. +This is a restriction to the baseline jail policy that a subject can see +subjects or objects in its own jail or any sub-jail of it. +.Pp +This policy is active if and only if the +.Xr sysctl 8 +variable +.Va security.bsd.see_jail_proc +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . +.Sh RETURN VALUES +The +.Fn cr_canseejailproc +function returns 0 if the policy is disabled, both credentials are associated to +the same jail, or if +.Fa u1 +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . +.Sh SEE ALSO +.Xr cr_bsd_visible 9 , +.Xr priv_check_cred 9 +.Sh AUTHORS +This manual page was written by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Wed Oct 18 18:03:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyB14Wxz4xKyD; Wed, 18 Oct 2023 18:03: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 4S9dyB0VkKz4XQ6; Wed, 18 Oct 2023 18:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zt/h0B3ri+IXH9PGSMYS3rlear8QNo/t6LF5+D5VCpA=; b=H0bWak0OdLXqT87+uzaioClXzz9C1Tx0eSpdjClbnyefjorTOIbsyRrH1CHPvqC36eXBAI fprCsI5q/JrcM3y/kTSNuXmckmpLR1bXKIRh39RReBLxSbL+gZ5vtAlzgdtQBEr3mzUDq9 3mnFwNqQMLxNG5IlUUpE2TC/woNcRdQIdD28h3QnyMjCfhaEPrJItl8DBjxs+jlTgq5R1P e2K0ArjQWKHc/3xcOGpzCKcBz5XvDDrIkOsGY2o+Hf8XHU7n2qgR2LA4QbpIqIbNArje+K R31Z125MCrV77Ef78k6jSowkDhZkdmJDvjGACaEh3aUPTvtprw1GPiCyt9m8ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652226; a=rsa-sha256; cv=none; b=wxLHNbUWxSKUNonNrkKfD2q8VR+Jhm9ZXl194p1dIpHRf2bpAx8uH6KsMeqwD0JMZagsRd 3UfBCIqxX+hqepr3hciv/S0N75MH/o5176hX+3WlqprjCB2DQRCbByioZuTTw/L3S0UotU oSGMkl5q5Kz0K5SfcjNvBPZrgBJMpWdJoQ7HxQdUqIEjY5ZYM1AOFpFZOpDJBYl5TjGWVr KU5BQsbVtt47wl9wyJKJJ334LVC0KuBDFJ6mB0yhGGKX1TJX078bVXc+d2TCjwzkbMKdEr aXnkeTsFo10zXyUme15oT8POU4S/gZtn6HHu01VDhNR9cXwWcLGYIXpBotC1pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zt/h0B3ri+IXH9PGSMYS3rlear8QNo/t6LF5+D5VCpA=; b=Pd4lHPol8t4z41KozRdsYIsk2pAKKjPQqrsHCVLWoanUd+dan63+tcWPlN2FlXmY2PWkoH t1mp39iLT+FjTCaHXmw08T0Vee7dzVvxHCISQV4b/PY5odqGi1ddBJpLd3R0a7co6Q7uff ggkbWiFioBCb0ddnE9ZQzbvmwO8747Lh6lzZkFZZcj4zBDzjKR6O6VOu0z8tJArkb4JNiG cAvtLZgjTwMade3WYTk14IejHG+tnBHAyfWbNKqRwU02vmzxUSPrgZ428f6EPz9NQkL8vX hIB49tVmtGV8BJYCLl7W9GkkRiwBTMNvC++2KMhH1bTWg/7ia3quxN8K5sI+gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dy96jNlz2RC; Wed, 18 Oct 2023 18:03: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 39II3jTS044543; Wed, 18 Oct 2023 18:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3jQF044540; Wed, 18 Oct 2023 18:03:45 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:45 GMT Message-Id: <202310181803.39II3jQF044540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 789e43a68797 - releng/14.0 - cr_bsd_visible(9): New man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 789e43a68797f6feb478722d7c63f03a30110c4a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=789e43a68797f6feb478722d7c63f03a30110c4a commit 789e43a68797f6feb478722d7c63f03a30110c4a Author: Olivier Certner AuthorDate: 2023-08-17 23:54:40 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:00:11 +0000 cr_bsd_visible(9): New man page Approved by: re (gjb) Reviewed by: bcr, pauamma_gundo.com Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40632 (cherry picked from commit 0d6bf73c4f20e6ed719c29c1b382d24bb0a81a2f) (cherry picked from commit 3fa9a2a9177c5b4d8af7afecf0d74f345534a82c) --- share/man/man9/Makefile | 1 + share/man/man9/cr_bsd_visible.9 | 117 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 71a11a7cc6c0..c3c81719b7d2 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -68,6 +68,7 @@ MAN= accept_filter.9 \ copy.9 \ counter.9 \ cpuset.9 \ + cr_bsd_visible.9 \ cr_cansee.9 \ cr_canseejailproc.9 \ cr_canseeothergids.9 \ diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9 new file mode 100644 index 000000000000..bd676e6f5705 --- /dev/null +++ b/share/man/man9/cr_bsd_visible.9 @@ -0,0 +1,117 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2023 Olivier Certner +.\" +.\" 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 DEVELOPERS ``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 DEVELOPERS 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. +.\" +.Dd August 18, 2023 +.Dt CR_BSD_VISIBLE 9 +.Os +.Sh NAME +.Nm cr_bsd_visible +.Nd determine if subjects may see entities according to BSD security policies +.Sh SYNOPSIS +.In sys/proc.h +.Ft int +.Fn cr_bsd_visible "struct ucred *u1" "struct ucred *u2" +.Sh DESCRIPTION +This function determines if a subject with credentials +.Fa u1 +is denied seeing an object or subject associated to credentials +.Fa u2 +by the following policies and associated +.Xr sysctl 8 +knobs: +.Bl -tag -width indent +.It Va security.bsd.seeotheruids +If set to 0, subjects cannot see other subjects or objects if they are not +associated with the same real user ID. +The corresponding internal function is +.Xr cr_canseeotheruids 9 . +.It Va security.bsd.seeothergids +If set to 0, subjects cannot see other subjects or objects if they are not both +a member of at least one common group. +The corresponding internal function is +.Xr cr_canseeothergids 9 . +.It Va security.bsd.see_jail_proc +If set to 0, subjects cannot see other subjects or objects that are not +associated with the same jail as they are. +The corresponding internal function is +.Xr cr_canseejailproc 9 . +.El +.Pp +As usual, the superuser (effective user ID 0) is exempt from any of these +policies provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . +.Pp +This function is intended to be used as a helper to implement +.Xr cr_cansee 9 +and similar functions. +.Sh RETURN VALUES +This function returns zero if a subject with credentials +.Fa u1 +may see a subject or object with credentials +.Fa u2 +by the active above-mentioned policies, or +.Er ESRCH +otherwise. +.Sh ERRORS +.Bl -tag -width Er +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +do not have the same real user ID. +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +are not members of any common group +.Po +as determined by +.Xr groupmember 9 +.Pc . +.It Bq Er ESRCH +Credentials +.Fa u1 +and +.Fa u2 +are not in the same jail. +.El +.Sh SEE ALSO +.Xr cr_canseeotheruids 9 , +.Xr cr_canseeothergids 9 , +.Xr cr_canseejailproc 9 , +.Xr priv_check_cred 9 , +.Xr cr_cansee 9 +.Sh AUTHORS +This function and its manual page were written by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Wed Oct 18 18:03:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyC52Qmz4xKhR; Wed, 18 Oct 2023 18:03: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 4S9dyC1XDYz4XNJ; Wed, 18 Oct 2023 18:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QDZFRZIVZbH2tBUn7To4WT5d3z4j/C33sOJ0tLsBfec=; b=eVX/H4wZ5A7Ew5gAKh1fi9ZEM3iK82amG/rzFLjdKpaTduCxUtgD+MgXu5/rwjyjbgNYqv /5g7Sz992FdJMgfKPnQlsRjIztWlurklVl2EEPm6l4QsXZ2IcPYJnTaxZy0GApZLOG4Yfy pm34fwrWADUXOBRjh9L/Eo05L2Uep0BBKOMgLlNBUYO9IwrPKex2Z2tm6651s05AUwiIuD NQm4bEK+JrgWx09H0as9C7fVJG9FNFfJSbYMFhCbi/GkYyyJ+pTJ1fVQ3xOrgNEDixNQNo 4RroMwj6KhWUeoTNHA1paJpbEZ1nZ706w/3zKG6GC3F2udkWhttiy3WlxtwYrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652227; a=rsa-sha256; cv=none; b=yuZCRj4QgzKS8Id0sbgAKNQmE9utyi2BU+2ty1Nhn/6uZrAP5sHwqVpLvO2fF1k0+3NKZY JxgJg6VjTTAByIarSh+VkkDOP5q8Dx2R9ov9u1ILFk+pRm1I2pVhA329G9lm5fQXU2eF5o 5uEEK9E7cZHdBRq0Gy63l086x8Tz4BDmvvFQbEdnteeEwQZGNnczUM1idcJnR3vY/MJU9E 7cCzZ8kN2wrUXYsevcTL1NIjj37D08KGpH3G9A4SfkIuxFIoaWFaVSF/U0PsDJ7loBs+5o vOt1IgmzKaz8Upyqj87OzSQ85APM1465Dbvnt3xcEQcH850ouCwt8/xEcn6SwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QDZFRZIVZbH2tBUn7To4WT5d3z4j/C33sOJ0tLsBfec=; b=XqCJgMNKzhTz2gpq9HSeiDNryUHA99HqmOiMACzqhPJPcEbbWXOlsKEhminzqiv9UoLfvn 0UqLlpdTeSCgUqYG17zxZRS2E1Mk+ejDsE/mFQ7hEEFRA1jnh1rg8LeGnLnboaHtG0JnTD DnA1EX2x24rWOkWsdV7dZXAeOVJMpHpXqp9oxheZiJVMo1u83jrNlSSk26VvO7Mq8ETt2e d+sBvSuj37WsereJkL2K9D1mhZARH5AhQqVQzvmzeC8c4ZBvfR8Xji/K66JaFe9/TD1gvl /2LXecKfjGIArNj3OK+W80qJqu2QPxO22+xT8Sbso0kLr5qms56iPaFmnoU+qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyC0c38z24n; Wed, 18 Oct 2023 18:03:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II3kAb044588; Wed, 18 Oct 2023 18:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3kxE044585; Wed, 18 Oct 2023 18:03:46 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:46 GMT Message-Id: <202310181803.39II3kxE044585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b6b628ed96b3 - releng/14.0 - cr_canseeothergids(9): Revamp, mark as internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: b6b628ed96b3e829cff0cedc77f16e9277a99a96 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b6b628ed96b3e829cff0cedc77f16e9277a99a96 commit b6b628ed96b3e829cff0cedc77f16e9277a99a96 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:00:19 +0000 cr_canseeothergids(9): Revamp, mark as internal Significantly clarify. Replace references to cr_canseeotheruids(9) by ones to cr_bsd_visible(9). Approved by: re (gjb) Reviewed by: pauamma_gundo.com, mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40633 (cherry picked from commit 3fe9ea4d2d04d48a249b2e6161d416bb4d5b364e) (cherry picked from commit 15d2ead9623dc2b0a560fc0fd6ba89ca16715597) --- share/man/man9/cr_canseeothergids.9 | 77 +++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/share/man/man9/cr_canseeothergids.9 b/share/man/man9/cr_canseeothergids.9 index 79269533ae5c..f0c1e5c4e726 100644 --- a/share/man/man9/cr_canseeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,56 +26,58 @@ .\" (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 November 11, 2003 +.Dd August 18, 2023 .Dt CR_CANSEEOTHERGIDS 9 .Os .Sh NAME .Nm cr_canseeothergids -.Nd determine visibility of objects given their group memberships +.Nd determine if subjects may see entities in a disjoint group set .Sh SYNOPSIS .Ft int .Fn cr_canseeothergids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the group IDs in the credentials +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials .Fa u1 -and +is denied seeing a subject or object associated to credentials .Fa u2 -associated with them. +by a policy that requires both credentials to have at least one group in common. +For this determination, the effective and supplementary group IDs are used, but +not the real group IDs, as per +.Xr groupmember 9 . .Pp -The visibility of objects is influenced by the +This policy is active if and only if the .Xr sysctl 8 variable -.Va security.bsd.see_other_gids . -If this variable is non-zero then all objects in the kernel -are visible to each other irrespective of their group membership. -If this variable is zero then the object with credentials -.Fa u2 -is visible to the object with credentials -.Fa u1 -if either -.Fa u1 -is the super-user credential, or if at least one of -.Fa u1 Ns 's -group IDs is present in -.Fa u2 Ns 's -group set. -.Sh SYSCTL VARIABLES -.Bl -tag -width indent -.It Va security.bsd.see_other_gids -Must be non-zero if objects with unprivileged credentials are to be -able to see each other. -.El +.Va security.bsd.see_other_gids +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . .Sh RETURN VALUES -This function returns zero if the object with credential +The +.Fn cr_canseeothergids +function returns 0 if the policy is disabled, the credentials share at least one +common group, or if .Fa u1 -can -.Dq see -the object with credential -.Fa u2 , -or -.Er ESRCH -otherwise. +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . .Sh SEE ALSO -.Xr cr_canseeotheruids 9 , -.Xr p_candebug 9 +.Xr cr_bsd_visible 9 , +.Xr groupmember 9 , +.Xr priv_check_cred 9 From nobody Wed Oct 18 18:03:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyD3NTQz4xKk2; Wed, 18 Oct 2023 18:03: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 4S9dyD2Vysz4XCd; Wed, 18 Oct 2023 18:03:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6HHhb1VdSmVWdIVkbCVsFvsulmWtJTUHTiERJWxbA4=; b=SJS7dEjts2kJXgO2H5UXutBVrwVCrRSasTfIaOvodnT5XqdUx/AJcuh8/m+VSVhz/yAR2y crCz+6jvEdjlFAmHIYxIZxcLTR2PtIcRijr3ksBpHzxLGMTgA1SA+aJzgIQlh+YLurJ3kc Q3O0qWbJWtAMV44TNoC4bYlhIXCP5Kv+7VRqMoL8rmHIi6K4yvwtHYKpTEecx4RpFvzRie z//rgPy4MtolbFBpgiMXgz+GqAm5KpSL/EXPicX46wr72lO2laDBaBBMn6p8AOIBJgFa/7 Db/Sj9l9xLWiPY924nMl2FyWUEm1HYI2qsS2u0sdNyLv24J/voqEGaGxzkS6Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652228; a=rsa-sha256; cv=none; b=E+yIph3Idpus3BMb6rrrjGuKNNIxS56n2exYXhwLFZTAZpZjRQPmfk5x9OUbIvq847SnIO tcsdQggM1KPwMZ4CgF3/5EVyrjRhhvTgtg6Ir6WprIi8U+99ZuxcgJLwVArhwGBVBHoHak XTTyyZx2y+qWZA2pz9jeztCITxL29I8vJXizWLTfdZBG8x05boSS6f8HblkmqfV21DCTRR 0rg0uhUEh9H33MHmUF3yCTqQ6BBqH/4phVYE6AFUv8ddqoVE5wN2ib7llJ9K3G16+4/CQL x65q+wg3ltvj5vpohZc2qo/vJRHMUWYEn6hni+fKUkSVRfq8Yhnsb6M0AWpg9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v6HHhb1VdSmVWdIVkbCVsFvsulmWtJTUHTiERJWxbA4=; b=IBZPExLkcsnQHK4VKZufm80mWHVIARP+Dpn/vnhuyWKLAzU+41/VEvI7sREIcjtVuEqjGf 7e7+jbA6PIPP4o0d6Qb56UB8Um2Ro8X9IWM8BlV4fIyNpX7qAfnby69evpHfIALc7EOVec Uw5GVDFEXjMwp6Zv809XZl/iSv6OIZvaPMMHe0fV04oazdGD94w4tUoJJqmoNfHcH2Cnwl jgONAXo0/7IAoFOY0amwwBVaZuEQCz3bLPLyolFFp33amPvwg7Hg72mbmIjABdRiBWBY5Y 9TJL2nXJDKdzle7pjo0mDy3GRnhx3mFKMBOabUROsC453zDOY4N3PM8BeH+i9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyD1cCmz1tS; Wed, 18 Oct 2023 18:03: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 39II3m7L044637; Wed, 18 Oct 2023 18:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3mdL044633; Wed, 18 Oct 2023 18:03:48 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:48 GMT Message-Id: <202310181803.39II3mdL044633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 7dd1f9f9c949 - releng/14.0 - groupmember(9): Detail which groups are considered, simplify List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 7dd1f9f9c949bb16c7897374cf7051c3ced7c16e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=7dd1f9f9c949bb16c7897374cf7051c3ced7c16e commit 7dd1f9f9c949bb16c7897374cf7051c3ced7c16e Author: Olivier Certner AuthorDate: 2023-08-17 23:54:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:00:23 +0000 groupmember(9): Detail which groups are considered, simplify Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40634 (cherry picked from commit 75a45ca3b34062fe793ae326ad9da614a1a06df1) (cherry picked from commit d4cb91af0c93055740f33566c5f97f9dc1ec8e5d) --- share/man/man9/groupmember.9 | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index d447bf64c482..3a516622efce 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (C) 2001 Chad David . All rights reserved. +.\" Copyright (C) 2023 Olivier Certner .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -24,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd July 9, 2001 +.Dd August 18, 2023 .Dt GROUPMEMBER 9 .Os .Sh NAME .Nm groupmember -.Nd checks group set for a group ID +.Nd checks if credentials mandate some group membership .Sh SYNOPSIS .In sys/param.h .In sys/ucred.h @@ -38,21 +39,26 @@ .Sh DESCRIPTION The .Fn groupmember -function checks to see if the given -.Fa gid -is in the group set of the credentials. +function checks if credentials +.Fa cred +indicate that the associated subject or object is a member of the group +designated by the group ID +.Fa gid . .Pp -Its arguments are: -.Bl -tag -width ".Fa cred" -.It Fa gid -The group ID to check for. -.It Fa cred -The credentials to search for the group in. -.El +Considered groups in +.Fa cred +are the effective and supplementary groups. +The real group is not taken into account. .Sh RETURN VALUES If the .Fa gid -is found, 1 is returned; otherwise, 0 is returned. +is found, 1 is returned, otherwise 0. +.Sh SEE ALSO +.Xr getgroups 2 +.Xr setgroups 2 .Sh AUTHORS -This manual page was written by -.An Chad David Aq Mt davidc@acns.ab.ca . +This manual page was initially written by +.An -nosplit +.An Chad David Aq Mt davidc@acns.ab.ca +and was revised by +.An Olivier Certner Aq Mt olce.freebsd@certner.fr . From nobody Wed Oct 18 18:03:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyF3X3sz4xKm8; Wed, 18 Oct 2023 18:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9dyF2rGRz4XRZ; Wed, 18 Oct 2023 18:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDt1mUoydXI4DPEBjIHmzV3BYUwV6cDoie6XiGBSH+Q=; b=I4IswAgHBQNrECYmZ/srv6nSC07Ik41rCWcuIqvfM8ATT70sgZgWqtHAz2KwmUMBnI3Uds 598X8KZhMwKcNpLjC9K39Qe7N7JXmnlkGbEPAwOM+MSpd6q8jPS+rtIfyitQSL5fhogkVB DmVH2YT2/+UT4G042q3W9bCbFqOo3eaZrVX4cunaIGwE1wrPAhX0kCf99Jr/c8jphPfQL1 KImUZmGbV3snlc4yIWINsim5pDmKcmevh0KiE2vGsyqeUNlERo6dAdWDQrg1wAIy5SRdbS zNgMdqTSc8HNUkRbGvTiE6jyUn0ftAsV/UdFstQshwnbx1J1CvPHhYQLceFkgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652229; a=rsa-sha256; cv=none; b=oHRNeXj4I8lIw9p+QvkGI9X2pjZxrp4fqyzzvSWA6gGsfMvMQrci9PJ6hvoRz4seGPuncN 9cT+kNntdFiEATV+MroLKtXX4nXR+yCy3t8IGa/IV3HH+6+JaLNjkeEZAD96+8z5L/lyOh BN9kJ5/O/NrsX/uWqQ0Ubpw6pVyIvlHblGbDM95HLWP3OC5B337muIIIDC2C8dRBdme9xl zcKQ+7jAIYfkJdBzgfScrSybzDNVtp6e37iGyvterK8btwxdkO1NnVK8kXCHCzAoa+kDJV SR0DIxBYkSm6SdWo8WnKaUSLb2wOtdEdweMirPewI6g34/Pj2KvFQvjjaF4Deg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rDt1mUoydXI4DPEBjIHmzV3BYUwV6cDoie6XiGBSH+Q=; b=VyNA4L6cruGvPuvkW+YStVXB8un/yhLkS0u+jY/8ny4z7q2oQ0tIK5I2WS9+MLM+RdNMmh AQ8gPXVFFDIBrGoaOT+OfrhZD8UfY1OoHiVibavsSab/q4jA6rajH9xVob6uH+4l42fFV0 UNNEJoOoL2hYKc8iRxqp3uEFZTLApNkqrKS+cN5gIChQAPrHyd7ollwroPPGrl+pwoB74S ZjN0KIbnc25SW4jLpeHukVDmAusHxeaLeUWj190smrf8/4U9sWw1MFqdyINmF6pu6ccdwG U8C/53+hau4YpBEvplu1YO2pggBFoHpn1fxL36rP+4KDjf5nRZ2QcixeuIyzLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyF1xZ9z2Rw; Wed, 18 Oct 2023 18:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II3nPc044684; Wed, 18 Oct 2023 18:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3nKO044681; Wed, 18 Oct 2023 18:03:49 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:49 GMT Message-Id: <202310181803.39II3nKO044681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: e0180be23e62 - releng/14.0 - cr_canseeotheruids(9): Revamp, mark as internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e0180be23e62ee92bb15db22dc6bdc00886d8ecd Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e0180be23e62ee92bb15db22dc6bdc00886d8ecd commit e0180be23e62ee92bb15db22dc6bdc00886d8ecd Author: Olivier Certner AuthorDate: 2023-08-17 23:54:42 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:09 +0000 cr_canseeotheruids(9): Revamp, mark as internal Significantly clarify. Replace references to cr_canseeothergids(9) by ones to cr_bsd_visible(9). Approved by: re (gjb) Reviewed by: bcr, mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40635 (cherry picked from commit 4ddd253b38dff8725555355cc1b5238b1bbfd380) (cherry picked from commit d05ed9a37b84f277cbc06447b322930fe678b00e) --- share/man/man9/cr_canseeotheruids.9 | 73 ++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/share/man/man9/cr_canseeotheruids.9 b/share/man/man9/cr_canseeotheruids.9 index 80acc2d7a6ca..230c5ea59b78 100644 --- a/share/man/man9/cr_canseeotheruids.9 +++ b/share/man/man9/cr_canseeotheruids.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,56 +26,54 @@ .\" (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 November 11, 2003 +.Dd August 18, 2023 .Dt CR_CANSEEOTHERUIDS 9 .Os .Sh NAME .Nm cr_canseeotheruids -.Nd determine visibility of objects given their user credentials +.Nd determine if subjects may see entities with differing user ID .Sh SYNOPSIS .Ft int .Fn cr_canseeotheruids "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the real user IDs in the credentials +.Bf -emphasis +This function is internal. +Its functionality is integrated into the function +.Xr cr_bsd_visible 9 , +which should be called instead. +.Ef +.Pp +This function checks if a subject associated to credentials .Fa u1 -and +is denied seeing a subject or object associated to credentials .Fa u2 -associated with them. +by a policy that requires both credentials to have the same real user ID. .Pp -The visibility of objects is influenced by the +This policy is active if and only if the .Xr sysctl 8 variable -.Va security.bsd.see_other_uids . -If this variable is non-zero then all objects in the kernel -are visible to each other irrespective of their user IDs. -If this variable is zero then the object with credentials -.Fa u2 -is visible to the object with credentials -.Fa u1 -if either -.Fa u1 -is the super-user credential, or if -.Fa u1 -and -.Fa u2 -have the same real user ID. -.Sh SYSCTL VARIABLES -.Bl -tag -width indent -.It Va security.bsd.see_other_uids -Must be non-zero if objects with unprivileged credentials are to be -able to see each other. -.El +.Va security.bsd.see_other_uids +is set to zero. +.Pp +As usual, the superuser (effective user ID 0) is exempt from this policy +provided that the +.Xr sysctl 8 +variable +.Va security.bsd.suser_enabled +is non-zero and no active MAC policy explicitly denies the exemption +.Po +see +.Xr priv_check_cred 9 +.Pc . .Sh RETURN VALUES -This function returns zero if the object with credential +The +.Fn cr_canseeotheruids +function returns 0 if the policy is disabled, both credentials have the same +real user ID, or if .Fa u1 -can -.Dq see -the object with credential -.Fa u2 , -or -.Er ESRCH -otherwise. +has privilege exempting it from the policy. +Otherwise, it returns +.Er ESRCH . .Sh SEE ALSO -.Xr cr_canseeothergids 9 , -.Xr p_candebug 9 +.Xr cr_bsd_visible 9 , +.Xr priv_check_cred 9 From nobody Wed Oct 18 18:03:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyG4nRXz4xLBk; Wed, 18 Oct 2023 18:03: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 4S9dyG4B8fz4XZs; Wed, 18 Oct 2023 18:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1BcFiZ+sPfTPiDVV+5EXG1eSGov00fwNbe92wuQbNU=; b=Kjm77lOc3rLl13QkB8XGz72vwxkPAViFjJkGVN3ofMMsW7YShH+SGnyayJ/zeu5VfH8J60 muj0cNDOmSPKRSdaI3BJ7wMEvokLZRKy45xRfhmJ8cvL5dqgN3Ib2d0Tyclw8ISO5CF7zD UBE4KKKbE717ILBaQFN2dt6dU9ClVPO3avUXJxVGl27oX8omczVUew50k/K4LJlpv9rSK6 fOz6dLf9IfpfHg6TRNVE8ET8EeTEve85jQJmI+Ta+/Ltk9VGdTne0bRRQNPguHwIE4mF9a yEhhjsq695vS5DeEQxmnm8yYEfCtgvq1+/qFJ7EcYs9gQ2Dy9fdvsU/0EiOlrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652230; a=rsa-sha256; cv=none; b=KPqXBCbs8ks1ICd6FmkTcKjSU0gjOBvY/31QB3t4JP6FKvaoHxqkTpekruqOBJMJGuxKmm Newi8xJx6/aFCo0yA18qoUxNExOsr+udtj5sfSWkN2p7Uxw6VOthsfXJA+WUf5GNyln/g3 YuV6Z2DFBPx21jWRVDMoZWZx+DmH7gsrDeHo7c/KPF27CWZg8jDmXLIBlLvb3RPgTCqOTK Nm6+VfnlMBK6yayoH93Co58zvBBakuekMR6Idq0iLvA6qnKXbp5KUio2qnlf8fWLMc7jxH 03XCuQfGFtO36rTST+m3bVCpYKhE1Mg1EvSOA5ruh1mfnXZgd9dYeauOGrkIlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1BcFiZ+sPfTPiDVV+5EXG1eSGov00fwNbe92wuQbNU=; b=BTSN0uwn/ONjbOgqtJcjQk7yPqJ3UOkZyyS4saCI/mmVhr4q6+5l8txbJeBIm4TeNWr62/ 231l0B9bNhWSr3ylYSLPD+C2NYDp9F9IsbXgX95WlaV01XcsUYg+m29pf9wuWnfXRhI5dF nJEZi7BRHIwFoQpgV0tLKNKCRNw5pfgYKTvqLRR1TZFFS4glYi1r/a/f0Ib4yztMXjunfO I/v/JFu4mwcCzibyG0dK/V82WCSA4O7Bwm4OLmBl3HYt6Kx/LFKyMuG39GjXyGZbFQLooz ePNMldUYcKiS23ya7pxFccHTGUbbCGdKJr67D/gjk+QWTTsfU8YUJ5xUeo15eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyG3875z2L1; Wed, 18 Oct 2023 18:03: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 39II3o0v044733; Wed, 18 Oct 2023 18:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3oiW044730; Wed, 18 Oct 2023 18:03:50 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:50 GMT Message-Id: <202310181803.39II3oiW044730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f7cee2431fb2 - releng/14.0 - cr_cansee(9): cr_bsd_visible() impacts, simplifications List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f7cee2431fb2c195250cfedc9f4efaca07afd223 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f7cee2431fb2c195250cfedc9f4efaca07afd223 commit f7cee2431fb2c195250cfedc9f4efaca07afd223 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:42 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:16 +0000 cr_cansee(9): cr_bsd_visible() impacts, simplifications Remove references to cr_canseeothergids(9) and cr_canseeotheruids(9). Defer to cr_bsd_visible() for controlling sysctl(8) variables. Approved by: re (gjb) Reviewed by: bcr, mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40636 (cherry picked from commit 82f9bc9ea8ed660c61050ad1d92f1a64108c7004) (cherry picked from commit 0d8de5b2dd61ad550afa86688e61cf546507dca6) --- share/man/man9/cr_cansee.9 | 61 ++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/share/man/man9/cr_cansee.9 b/share/man/man9/cr_cansee.9 index 4824a231170b..d5cdfdd6f8e5 100644 --- a/share/man/man9/cr_cansee.9 +++ b/share/man/man9/cr_cansee.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2006 Ceri Davies +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -23,43 +24,39 @@ .\" (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 November 19, 2006 +.Dd August 18, 2023 .Dt CR_CANSEE 9 .Os .Sh NAME .Nm cr_cansee .Nd "determine visibility of objects given their user credentials" .Sh SYNOPSIS -.In sys/param.h -.In sys/systm.h -.In sys/ucred.h +.In sys/proc.h .Ft int .Fn cr_cansee "struct ucred *u1" "struct ucred *u2" .Sh DESCRIPTION -This function determines the visibility of objects in the -kernel based on the real user IDs and group IDs in the credentials +This function determines if a subject with credential .Fa u1 -and -.Fa u2 -associated with them. +can see a subject or object associated to credential +.Fa u2 . .Pp -The visibility of objects is influenced by the +Specific types of subjects may need to submit to additional or different +restrictions. +As an example, for processes, see +.Xr p_cansee 9 , +which calls this function. +.Pp +The implementation relies on +.Xr cr_bsd_visible 9 +and consequently the .Xr sysctl 8 -variables -.Va security.bsd.see_other_gids -and -.Va security.bsd.see_other_uids , -as per the description in -.Xr cr_canseeothergids 9 -and -.Xr cr_canseeotheruids 9 -respectively. +variables referenced in its manual page influence the result. .Sh RETURN VALUES -This function returns zero if the object with credential +This function returns zero if the subject with credential .Fa u1 can .Dq see -the object with credential +the subject or object with credential .Fa u2 , or .Er ESRCH @@ -67,24 +64,20 @@ otherwise. .Sh ERRORS .Bl -tag -width Er .It Bq Er ESRCH -The object with credential -.Fa u1 -cannot -.Dq see -the object with credential -.Fa u2 . -.It Bq Er ESRCH -The object with credential +The subject with credential .Fa u1 -has been jailed and the object with credential +has been jailed and the subject or object with credential .Fa u2 -does not belong to the same jail as -.Fa u1 . +does not belong to the same jail or one of its sub-jails, as determined by +.Xr prison_check 9 . .It Bq Er ESRCH The MAC subsystem denied visibility. +.It Bq Er ESRCH +.Xr cr_bsd_visible 9 +denied visibility according to the BSD security policies in force. .El .Sh SEE ALSO -.Xr cr_canseeothergids 9 , -.Xr cr_canseeotheruids 9 , +.Xr prison_check 9 , .Xr mac 9 , +.Xr cr_bsd_visible 9 , .Xr p_cansee 9 From nobody Wed Oct 18 18:03:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyH5tyXz4xLBr; Wed, 18 Oct 2023 18:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9dyH5P8lz4Xj7; Wed, 18 Oct 2023 18:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FD4H3I6eTrFW1yTak2Fvlr2lJEZZ3uH6CJo1cOooZUA=; b=BBT7AcDSIbaL2uNAuIsBqH9iYgfgV2dVd8be15GKaq6wqSHBRwsZg82vnkaLp+r/k5FMip v+j5Bx1bqg+pqTQhNRVwDLywJHqfnvaUhESeBlENc9yhHVR107xB7antuodl+WdKtWutHP YKDyA6rx9kJy+gWtqnVSe1SClC06HpilzFNU79C3ZlS9BwPC2xkeeNMiME13Jjj5ShBz16 Znaa/1IFqMut8TW/BlJcYfPz2/HvOh72zoVtKDKrkJqVDfuqt/BkmB9b0zMT0jHQoJk/6I dX6cs1/7XsgKBEm+//XRGCLDxidWpMpH2h1JbgIryy29k1TAemTmnerGOqTmUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652231; a=rsa-sha256; cv=none; b=sG3I+72eGs2uvLLVZgVETF1kKVC9RfNDhmxYVKSf6EAjgpAAZZdAQTZb2xNY6J0kGoWR6T BXOeT4C9bSGYzwez2+a/4cmdF50APNzxPPOVLKbbK9xBebXcHyrwg+5VMEZu1SAszusZOP fPv0YJIaKy7CEVJyEJnSimWNT6IDBjrE6LsloiQYwujP0vvtVrkrfrPITWx2HBxX0K1ihl UJojVSXbS0f1bpgW0rEg6W0xmDIEuZECPFzNqSL3LrYbXEp6QGjcgXyzO7+oGhLOVKmNkt co9BgOeNjNZF+iGewgxGM1Bz0GukMIKtGdvJ2Y51UCLjSYNhDgSqtIdlnB5fnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FD4H3I6eTrFW1yTak2Fvlr2lJEZZ3uH6CJo1cOooZUA=; b=OYI1XJgw80ZDqgEQm8vBKAHWNyUmQvKtYZAhwL/dSXjrmZ+1/G6yVKCtHOyeGgvcSz7IlB 5HLtWPmAfw7RSFBZkSUDC2iNfFmP0K2jK3xFuoDQoSM+M141shMrvD6WFd8c2k5IrSQ8qg t/k0uAqKX36o6oTl/QCZ6isxOhMFApVdusQeIidAj13nN49THxZ9PD0FU8Ar5KV1pGkOxQ fyjOncmojT2kXB4th1w4bHkG2/JoC8Nm39/59ftfH1U+ugfPKkME8GtJJkuCkN8D7Esfe2 jFWHK20coDyakaj2W3J8q64yQ3Y3L4p3uaXnmZKsORHuLzXbmjsPJTSLRvgTOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyH4Bw1z2RD; Wed, 18 Oct 2023 18:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II3pN5044776; Wed, 18 Oct 2023 18:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3pkA044773; Wed, 18 Oct 2023 18:03:51 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:51 GMT Message-Id: <202310181803.39II3pkA044773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a8afbde0e81b - releng/14.0 - p_cansee(9): Bring up-to-date, misc fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: a8afbde0e81b27a7a3f50157d7b3a6c8de578a26 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a8afbde0e81b27a7a3f50157d7b3a6c8de578a26 commit a8afbde0e81b27a7a3f50157d7b3a6c8de578a26 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:43 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:20 +0000 p_cansee(9): Bring up-to-date, misc fixes Essentially defer to cr_cansee(9), except for the specifics. Be more specific on the return codes. Approved by: re (gjb) Reviewed by: bcr, pauamma_gundo.com Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40637 (cherry picked from commit 2ede38aff5d4c91a17ab6d093f2e8cce24b5418b) (cherry picked from commit 57d0cc50cd2878fcca8a9a4bf931abee0260b48d) --- share/man/man9/p_cansee.9 | 44 ++++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/share/man/man9/p_cansee.9 b/share/man/man9/p_cansee.9 index 84287dac951b..9fdce460dfea 100644 --- a/share/man/man9/p_cansee.9 +++ b/share/man/man9/p_cansee.9 @@ -24,19 +24,18 @@ .\" (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 November 19, 2006 +.Dd August 18, 2023 .Dt P_CANSEE 9 .Os .Sh NAME .Nm p_cansee .Nd determine visibility of a process .Sh SYNOPSIS -.In sys/param.h .In sys/proc.h .Ft int .Fn p_cansee "struct thread *td" "struct proc *p" .Sh DESCRIPTION -This function can be used to determine if a given process +This function determines if a given process .Fa p is visible to the thread .Fa td , @@ -45,13 +44,14 @@ where the notion of may be read as .Dq "awareness of existence" . .Pp -The function is implemented using -.Xr cr_cansee 9 , -and the dependencies on -.Xr sysctl 8 -variables documented in the -.Xr cr_cansee 9 -manual page apply. +This function explicitly allows a thread to always see its own process, +even with pending credentials changes +.Po +see +.Xr ucred 9 +.Pc . +Otherwise, it simply defers to +.Xr cr_cansee 9 . .Sh RETURN VALUES The .Fn p_cansee @@ -62,30 +62,18 @@ if the process denoted by .Fa p is visible by thread .Fa td , -or a non-zero error return value otherwise. +or ESRCH otherwise. .Sh ERRORS .Bl -tag -width Er .It Bq Er ESRCH -Process -.Fa p -is not visible to thread -.Fa td -as determined by -.Xr cr_cansee 9 . -.It Bq Er ESRCH Thread .Fa td -has been jailed and process +is not part of process .Fa p -does not belong to the same jail as -.Fa td . -.It Bq Er ESRCH -The MAC subsystem denied visibility. +and cannot see it as determined by +.Xr cr_cansee 9 . .El .Sh SEE ALSO -.Xr jail 2 , -.Xr sysctl 8 , +.Xr ucred 9 , .Xr cr_cansee 9 , -.Xr mac 9 , -.Xr p_candebug 9 , -.Xr prison_check 9 +.Xr p_candebug 9 From nobody Wed Oct 18 18:03:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyK1FC7z4xKyQ; Wed, 18 Oct 2023 18:03: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 4S9dyJ5kVyz4Xdm; Wed, 18 Oct 2023 18:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTdETYJsSVgzVjtMcwERNCaXXLm/A/NZDmhK1MzoPlg=; b=YiArP/M/1NqbT+2hcjrzH8Wl8upJ5QKtcpGZMut9MZYq+oVAjoX7vgcPrLZSaVHHFrDcdN Cv/R0bu4hrAezNnVZb8zRcTDPJxOBYcHIUKlNylGk5y90e6zgVXFJmBJD1YpXpRCGbCALj 1dfiqnk6csotil4pDwiQbyR722u+NKgebJ7ku5SMX2OzUofJj6DU0wyqIpPzkLHlkesIry IOwT7R/mSz6RMg5AZ3lf2MRTDrtP/AIPwlY/fawo1Btm/Wih0p/Ho1RcMkEyaNIEUJcV8A bRnXDc4csZ9dDfuFoblIm8vm3y2svoiGtD4S+EY0o67BsunaeJvqp3X2tTRbOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652232; a=rsa-sha256; cv=none; b=PUlpOYlPw7Phj4vZjCRZT0Ka9ieZA1n5VvBksqtJToaEKG65e1AzFHbsmdAySt66uPp1N5 WvgQMFVYNyCmjrgGK6Lzp0hPFygnD3xvTYiv5e3DEntpJ1YPqyKZwXtNO9Y4W0hh+BsrK8 b7YeQOKa1fiBp/sCVcBLSjgV/PJ2GURQoFP7Z7WtRiZ5wanUhWzBDvEhJRa2rfpdJ3L+qd uWcI+q/XJZR4wNiXFnZfMHWar8sKE3rZVMwtVE6Mx2JoheleFbobnb9wbgmZLq0xHr5YaZ AKlUOIysL/pzOPfKhK8oBLTeLx154/Fa6t0Afn/qoO9jv/cN1kwvyC5pUTB1Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aTdETYJsSVgzVjtMcwERNCaXXLm/A/NZDmhK1MzoPlg=; b=U8xgwhYtlNTtU73KYoJWbU5TH1+nqtLkkkHf5VcHKndwTxNnC5399EwTS68WYJ/Eke5T/X w0XmJaiLf741SjQ7I0ViNdloDbTSyU+UfsuTjF0LjtNGWc12V/88JjQa8Om03+iaezR/AP 91jYepTCKZCwsvaVI1jdTfdng4HEaTLpUw6vcK9/j/rKPnAIV2UT5LTvaMXUmX4nPdXiFS 9YVlyMj6N5GwjFiRU2fqiOpN/QfwT16S2NN/YzBREp2PVDgxxMkmXOTxKY4s9c3Er8jVb3 paRNecjRYEUYFRUo9nyGacyqb5WFLx6HYckfaqZhcpHNqVp0Wm+MV8bpBD4gqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyJ4qn2z2RF; Wed, 18 Oct 2023 18:03: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 39II3qqR044818; Wed, 18 Oct 2023 18:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3qFo044815; Wed, 18 Oct 2023 18:03:52 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:52 GMT Message-Id: <202310181803.39II3qFo044815@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: daf8ad192942 - releng/14.0 - p_candebug(9): cr_bsd_visible() impacts, misc fixes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: daf8ad192942f6d9da1affca6a0ea9d3da42101f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=daf8ad192942f6d9da1affca6a0ea9d3da42101f commit daf8ad192942f6d9da1affca6a0ea9d3da42101f Author: Olivier Certner AuthorDate: 2023-08-17 23:54:43 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:26 +0000 p_candebug(9): cr_bsd_visible() impacts, misc fixes Mention cr_bsd_visible(9). Remove references to cr_canseeothergids(9) and cr_canseeotheruids(9), as well as indirect references not immediately useful. Fix description of credentials checks to match reality. Re-order errors to match code's check order. Approved by: re (gjb) Reviewed by: bcr, pauamma_gundo.com Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40638 (cherry picked from commit eb94f24fab4b44f13ca045370d9fcf12ca8835f2) (cherry picked from commit c29ee9e238b36ef8a7c4508582d4512cda885192) --- share/man/man9/p_candebug.9 | 103 ++++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/share/man/man9/p_candebug.9 b/share/man/man9/p_candebug.9 index e80d313de55c..c824db974154 100644 --- a/share/man/man9/p_candebug.9 +++ b/share/man/man9/p_candebug.9 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2003 Joseph Koshy +.\" Copyright (c) 2023 Olivier Certner .\" .\" All rights reserved. .\" @@ -25,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 19, 2006 +.Dd August 18, 2023 .Dt P_CANDEBUG 9 .Os .Sh NAME @@ -37,24 +38,27 @@ .Ft int .Fn p_candebug "struct thread *td" "struct proc *p" .Sh DESCRIPTION -This function can be used to determine if a given process +This function determines if a given process .Fa p -is debuggable by the thread +is debuggable by some thread .Fa td . -.Sh SYSCTL VARIABLES +.Pp The following .Xr sysctl 8 variables directly influence the behaviour of .Fn p_candebug : .Bl -tag -width indent +.It Va security.bsd.unprivileged_proc_debug +Must be set to a non-zero value to allow unprivileged processes +access to the kernel's debug facilities. .It Va kern.securelevel Debugging of the init process is not allowed if this variable is .Li 1 or greater. -.It Va security.bsd.unprivileged_proc_debug -Must be set to a non-zero value to allow unprivileged processes -access to the kernel's debug facilities. .El +.Pp +Other such variables indirectly influence it; see +.Xr cr_bsd_visible 9 . .Sh RETURN VALUES The .Fn p_candebug @@ -68,35 +72,45 @@ is debuggable by thread or a non-zero error return value otherwise. .Sh ERRORS .Bl -tag -width Er -.It Bq Er EACCESS -The MAC subsystem denied debuggability. -.It Bq Er EAGAIN -Process -.Fa p -is in the process of being -.Fn exec Ns 'ed. .It Bq Er EPERM +An unprivileged process attempted to debug another process but the system is +configured to deny it +.Po +see +.Xr sysctl 8 +variable +.Va security.bsd.unprivileged_proc_debug +above +.Pc . +.It Bq Er ESRCH Thread .Fa td -lacks super-user credentials and process -.Fa p -is executing a set-user-ID or set-group-ID executable. +has been jailed and the process to debug does not belong to the same jail or one +of its sub-jails, as determined by +.Xr prison_check 9 . +.It Bq Er ESRCH +.Xr cr_bsd_visible 9 +denied visibility according to the BSD security policies in force. .It Bq Er EPERM Thread .Fa td -lacks super-user credentials and process +lacks superuser credentials and its (effective) group set is not a superset of +process .Fa p Ns 's -group set is not a subset of -.Fa td Ns 's -effective group set. +whole group set +.Pq "including real, effective and saved group IDs" . .It Bq Er EPERM Thread .Fa td -lacks super-user credentials and process -.Fa p Ns 's -user IDs do not match thread -.Fa td Ns 's -effective user ID. +lacks superuser credentials and its (effective) user ID does not match all user +IDs of process +.Fa p . +.It Bq Er EPERM +Thread +.Fa td +lacks superuser credentials and process +.Fa p +is executing a set-user-ID or set-group-ID executable. .It Bq Er EPERM Process .Fa p @@ -107,30 +121,25 @@ and the variable .Va kern.securelevel is greater than zero. -.It Bq Er ESRCH +.It Bq Er EBUSY Process .Fa p -is not visible to thread -.Fa td -as determined by -.Xr cr_canseeotheruids 9 -or -.Xr cr_canseeothergids 9 . -.It Bq Er ESRCH -Thread -.Fa td -has been jailed and process +is in the process of being +.Fn exec Ns 'ed. +.It Bq Er EPERM +Process .Fa p -does not belong to the same jail as -.Fa td . -.It Bq Er ESRCH -The MAC subsystem denied debuggability. +denied debuggability +.Po +see +.Xr procctl 2 , +command +.Dv PROC_TRACE_CTL +.Pc . .El .Sh SEE ALSO -.Xr jail 2 , -.Xr sysctl 8 , -.Xr cr_canseeothergids 9 , -.Xr cr_canseeotheruids 9 , +.Xr prison_check 9 , .Xr mac 9 , -.Xr p_cansee 9 , -.Xr prison_check 9 +.Xr cr_bsd_visible 9 , +.Xr procctl 2 , +.Xr p_cansee 9 From nobody Wed Oct 18 18:03:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyL0lGFz4xLC0; Wed, 18 Oct 2023 18:03: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 4S9dyL0CVbz4XmJ; Wed, 18 Oct 2023 18:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xThS009oNuNpA49MRyndRLpeu39lWS8vrGyBoIRwYOQ=; b=uhZRzDXRKWJe1USMzcDv57TDTvQdKJHGkc7//NyiBEjN2xnEJINgYLWdTFW+xRmRabp8aI DeHZkyaSsld5kNt/XVpywT99B2kpKLrptNz5Txvr9sgyliO8Vg7b7wSFbCo8Ix19Ecb18t Alq5wgPW1iIe5aLlnTohe7fKRsWdPG9WwFBbEdOLUr9phSDWMnbt2jOE8KM3MAYcXi4CNv NXqJR5GDlTepjUJVOYMjZKoKe0jhJuAchKOAmA6ZtSN6g6uj/Qzlkju+J7HsFJ9GaijJQ6 RLQsKQDfc37E8TUkahfspraSOFwVVyFcR+zRkRX7Obrxs1SV1afYtdH73FJpOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652234; a=rsa-sha256; cv=none; b=cpoTnprxDma1vCkIUW4DWMgDNW/B0X/BPirnSr6JNiQZgY+ahFbYhaYLxFKIlbDYS3uhUT nb32THlS1bLo9jlbaVn2RlrMCXhP5ngiF3zedbNu7nDX3WHJ7BZIWaTQNsfKcBk4431uoI STd/T0UwDV2uSbJPr+TIFnCTY85IOrmMLGwEGiykaYiVuMABVdj3oOfG07GikdUlaUxgjc UdDkm0R+9bTarmkrJhvab5TSTzur3QUMpuSexiRDeUX6NbvyPrwg92ZWisA3ZP/grHxrcv w3Ju8Ynbb5ipk3qlnxyNkH+/Hy+h2GmxDASkkMEYKDrDlorDHaXIb1dRqbz8Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xThS009oNuNpA49MRyndRLpeu39lWS8vrGyBoIRwYOQ=; b=Nm9vv6Rox8ruzr9NHW1mv2FowAZgpx7LEShuik+v0Akpo/xxcf2CXsRSdtI9IWLJwjasAF 1vIE/bgE5XZfFBqK6omsdOgMfqgVpK1m3Utm2ms3O9A09Rtkb97jKg19m3X2phZP6Hc4Ed YRIGXlda7OyXl3EFodESeg2FdI0hiJXASiURNPu4G/8pxxF+dsS4TbqDlOuEu9ee4QufvY ig163Mgo/VYnouW4hQoFuErbeedM7a4SUBSQ3t77Ly4RRUqEtEEX73MwIUN5cuxMVpeW8Z vKRYC/8EZsAe59ZryDNGkYLbJuX8fqa2KI2l6+VwNhB0aTLy3PitEhAWhCcM8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyK6FGwz2RG; Wed, 18 Oct 2023 18:03: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 39II3rOZ044864; Wed, 18 Oct 2023 18:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3rBO044860; Wed, 18 Oct 2023 18:03:53 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:53 GMT Message-Id: <202310181803.39II3rBO044860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 67d1f6f40a55 - releng/14.0 - prison_check(9): Bring up-to-date with hierarchical jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 67d1f6f40a555b7099034283da481a92c53f4f3f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=67d1f6f40a555b7099034283da481a92c53f4f3f commit 67d1f6f40a555b7099034283da481a92c53f4f3f Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:33 +0000 prison_check(9): Bring up-to-date with hierarchical jails Approved by: re (gjb) Reviewed by: bcr, emaste, pauamma_gundo.com, mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40639 (cherry picked from commit e9fdd494537ca45b14e0917e8bb1595b6460f3a3) (cherry picked from commit a2d43cef988b9f2cf3d0edf6608a0dd5f2e2b9bc) --- share/man/man9/prison_check.9 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/share/man/man9/prison_check.9 b/share/man/man9/prison_check.9 index b3bdcf6b4571..7f174e3ceb2e 100644 --- a/share/man/man9/prison_check.9 +++ b/share/man/man9/prison_check.9 @@ -25,22 +25,23 @@ .\" (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 December 11, 2003 +.Dd August 18, 2023 .Dt PRISON_CHECK 9 .Os .Sh NAME .Nm prison_check -.Nd determine if two credentials belong to the same jail +.Nd determine if subjects may see entities according to jail restrictions .Sh SYNOPSIS .In sys/jail.h .Ft int .Fn prison_check "struct ucred *cred1" "struct ucred *cred2" .Sh DESCRIPTION -This function can be used to determine if the two credentials +This function determines if a subject with credentials .Fa cred1 -and +is denied access to subjects or objects with credentials .Fa cred2 -belong to the same jail. +according to the policy that a subject can see subjects or objects in its own +jail or any sub-jail of it. .Sh RETURN VALUES The .Fn prison_check @@ -48,12 +49,9 @@ function returns .Er ESRCH if -.Fa cred1 -has been jailed, and -.Fa cred1 -and .Fa cred2 -do not belong to the same jail. +is not in the same jail or a sub-jail of that of +.Fa cred1 . In all other cases, .Fn prison_check returns zero. From nobody Wed Oct 18 18:03:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyM1xjtz4xKmK; Wed, 18 Oct 2023 18:03: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 4S9dyM1WxKz4Xxf; Wed, 18 Oct 2023 18:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxdrLAPIjgtXEZcrULPDyTxm9oEAAyEH2rd0aSDDKyQ=; b=Ys8GPl7cyX0gBwUoGn+IiqR0cV6bO7TBWbWkmMzAhsp++0+6UyP2WwD1rRGXLs80RKc+JV 9JaIG4YRtPoZKeaZWJkt/bQjSvTgHi/nyuQW/wPc7zA4waTPM64ocS5/FW23AHkapzBQp3 PFME5FIkVSb6QsrVyc2FedTZ+7sh6JPGJzhEnRBieo9GL3CKX0J+/uNnOcS2+9bmOZC+3H NgL2A6DTaZyIyyF9RCYCqqeK2dyFcQSvrlhmKcCVSLrAjOA7PmCwTZ6icACOAE0/k3RxmO /drF322sYQELtPsFEg9LH3SxOnOcqXIHyZjtldKwk+xJ8UqC0f4wITI6WzZxGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652235; a=rsa-sha256; cv=none; b=d04wu7ngOPdWOikx/bc6lsdRI4pGeivZcUEyXk176AhfPFPSddx44qQmJQMJ7wrC8+wWbT bVMP1TdvXRqn4rF6y1FZpOogF33968a19Z8W1PJZlR0rkEudyBI2vE0jSMWD3gMmIiHe7g TTITw4HgfFh75R5ZXJ6Jyi3+xZbSjbiEVk/6htARhk9fdRqf8YUpr2TdpXq4N3KnQaNU5V l7RKEOIA0fzW/NFFsCyG9QKWWdESHUo5K/32dBGf6THS/f5ke2anedgtnJZahuJiY4wl80 Ta7ujaoe2lAl3gRlcHeBLzvKpOptS8duldv2pDD2TSYmPC/m/Qmqaba4tarafg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nxdrLAPIjgtXEZcrULPDyTxm9oEAAyEH2rd0aSDDKyQ=; b=C7/dqwcFNRzwr8WyUpPA5cMy1m+aOb+u/Xi/GZ6Rl/k+c+fV1I0shbjciWcgB+Zc80rrIr PXamsuas4wupFdrmcLboS8zAq5KZq8hgl5ELgzBUjPkJf0KHV43USZhHOUgsBzZ1vCC9r2 TytHhO335C6MtxQbv3j52a8iMGvOCr7rlMc89RvIjKD6zM4+2orSA071MJSxG2RC+mtZ5W tRQiiUwg9Ea7Xnw6Ujj35NNzg1tE+EbiGbLDezyQgqAwveoDHwFNQWj2Tpf62BJdjDBnjB lLg7ivYmOskGvzni0SWwgpMBkS7Sri3RthOuU617rBHwUTaKmycstfz5FNkRmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyM0Ftsz1nf; Wed, 18 Oct 2023 18:03: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 39II3sx4044926; Wed, 18 Oct 2023 18:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3s0E044923; Wed, 18 Oct 2023 18:03:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:54 GMT Message-Id: <202310181803.39II3s0E044923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f373119badd8 - releng/14.0 - groupmember(): Extract the supplementary group search in a separate function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f373119badd89f81401c8599869749d4a0fd4a8e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f373119badd89f81401c8599869749d4a0fd4a8e commit f373119badd89f81401c8599869749d4a0fd4a8e Author: Olivier Certner AuthorDate: 2023-08-17 23:54:44 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:38 +0000 groupmember(): Extract the supplementary group search in a separate function This is in preparation for the introduction of the new realgroupmember() function, which does the same search into supplementary groups as groupmember(). Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40640 (cherry picked from commit b725f232f3b09b4bcbc426854fe1545234c66965) (cherry picked from commit 9fc5dbab5163b1e18776ac216691cc7eb8566a6f) --- sys/kern/kern_prot.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 648c067dc528..21f5e5d3bc16 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1273,36 +1273,43 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) } /* - * Check if gid is a member of the group set. + * Returns whether gid designates a supplementary group in cred. */ -int -groupmember(gid_t gid, struct ucred *cred) +static int +supplementary_group_member(gid_t gid, struct ucred *cred) { - int l; - int h; - int m; - - if (cred->cr_groups[0] == gid) - return(1); + int l, h, m; /* - * If gid was not our primary group, perform a binary search - * of the supplemental groups. This is possible because we - * sort the groups in crsetgroups(). + * Perform a binary search of the supplemental groups. This is possible + * because we sort the groups in crsetgroups(). */ l = 1; h = cred->cr_ngroups; + while (l < h) { - m = l + ((h - l) / 2); + m = l + (h - l) / 2; if (cred->cr_groups[m] < gid) - l = m + 1; + l = m + 1; else - h = m; + h = m; } - if ((l < cred->cr_ngroups) && (cred->cr_groups[l] == gid)) + + return (l < cred->cr_ngroups && cred->cr_groups[l] == gid); +} + +/* + * Check if gid is a member of the (effective) group set (i.e., effective and + * supplementary groups). + */ +int +groupmember(gid_t gid, struct ucred *cred) +{ + + if (cred->cr_groups[0] == gid) return (1); - return (0); + return (supplementary_group_member(gid, cred)); } /* From nobody Wed Oct 18 18:03:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyN2q93z4xKkG; Wed, 18 Oct 2023 18:03: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 4S9dyN2KlHz4Y1M; Wed, 18 Oct 2023 18:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y3RgR83c265FGGrmXnHEZADkYK59WfmeyAw35w5+TRU=; b=vA3S4eeqMl4nRxHmLXadSPv58tuDc2UuxAQAgrV7c03YKvGgiu8MF3y9s9L+I0d3/YUVM4 Tv+VLasR39CRDh6N/vA3BTErMHaoxMfcqXlqyk+cDFONWVvM0ZI3z/z7OW889qUTnliU4W NRRBmC2JaeSshKOa1CjbqIsZ5h3/wul0vhMu6scnjJeNphrbwl3Nm7zfq6EJP4qs+LW2Ip 8SOLMQty5kGSDRVGBip3bQ84NezJSxtYy8wXQ4yNRac+0yzDJvBXEVy2HuE0a5TCD4Jcho qypBraF+j+H1vgMkzpjUbZ5sxVdv7CjUwEj89UcX3keree7xZxys9k9kFlzWSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652236; a=rsa-sha256; cv=none; b=g/+pd3bFrvWmG1BALj6dRFfYRhPpXp43tYpSvRFogGlfWRFAavT180E1+7F4Epcj026BQc sKHfbSvykBLZkzM1YiYaLGvh3EvwzOTEskgKU9THps7MW28qdrIKzIkWRZqJwNJjn09LTT GukGWXFTswMu/M6cRuxEHIv23GQjitTeSKQoaMnhIoK36+ZCgmfPhvNzOlU9bcKqT08Mg/ /YTJEhFuxqJp8b804u3ZTf60CE7RYmbKEwiJds2CFd2e8m3T3hSoQgTBU3qC4CaSnQT+k+ stNSOA4iaobeYEjKTaedFMufYJcWEzDFoylUhEp4Oq2Ft4W3KA1YyDdV7/U/nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y3RgR83c265FGGrmXnHEZADkYK59WfmeyAw35w5+TRU=; b=u17aSqaxNndNT33UJiKICdEuCb7Wlwxx3m78ENiJMK5W2QsrhrbjS2WxixmwH+oNpezCnZ NEhv+8oq9WQO0C/nUXsBsMQk6w16vHN2oTYAPT30twixVOlxvSedM5OPQTYaafryZ6dmQX 8QW7b8qIde4PykOZnooZdUifpcrDKz1t6bMX3CkBYDsdpgBA6prj/Xin84CryxaycVWifF M0rjsZBxjxL6/1iIE5cCT3Aeum1jsH0df1LwVjtXtMzM72S3ygBF1YgwPUnW3jEM4yQFn5 g80H7QfAEretWH0YKjw2+KOoG15K0hhA4MPjbSxKD5VWx/On2Fwzs8fDKEo4hA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyN1JSLz24p; Wed, 18 Oct 2023 18:03: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 39II3uiH044959; Wed, 18 Oct 2023 18:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3uSv044956; Wed, 18 Oct 2023 18:03:56 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:56 GMT Message-Id: <202310181803.39II3uSv044956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 4750f117a060 - releng/14.0 - New realgroupmember() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4750f117a060c835c327aebf8e76ba6abeef16e5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=4750f117a060c835c327aebf8e76ba6abeef16e5 commit 4750f117a060c835c327aebf8e76ba6abeef16e5 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:44 +0000 New realgroupmember() Like groupmember(), but taking into account the real group instead of the effective group. Leverages the new supplementary_group_member() function. Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40641 Differential Revision: https://reviews.freebsd.org/D40643 (cherry picked from commit 2a2bfa6ad92e9c82dcc55733ad2fd58fd2ea7559) (cherry picked from commit 5d9f38405a10fdcd9fc108c940dcf2642e9f1833) (cherry picked from commit cbe88592ab88c3940bedc3b2a651eb4556f4bbd8) --- share/man/man9/Makefile | 1 + share/man/man9/groupmember.9 | 7 +++++++ sys/kern/kern_prot.c | 13 +++++++++++++ sys/sys/ucred.h | 1 + 4 files changed, 22 insertions(+) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index c3c81719b7d2..2122f8d6ea8c 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1157,6 +1157,7 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 MLINKS+=gone_in.9 gone_in_dev.9 +MLINKS+=groupmember.9 realgroupmember.9 MLINKS+=hash.9 hash32.9 \ hash.9 hash32_buf.9 \ hash.9 hash32_str.9 \ diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index 3a516622efce..ae7ccd477955 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -36,6 +36,8 @@ .In sys/ucred.h .Ft int .Fn groupmember "gid_t gid" "struct ucred *cred" +.Ft int +.Fn realgroupmember "gid_t gid" "struct ucred *cred" .Sh DESCRIPTION The .Fn groupmember @@ -49,6 +51,11 @@ Considered groups in .Fa cred are the effective and supplementary groups. The real group is not taken into account. +.Pp +Function +.Fn realgroupmember +works the same except that it considers instead the real and supplementary +groups, and not the effective one. .Sh RETURN VALUES If the .Fa gid diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 21f5e5d3bc16..23bd2009582b 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1312,6 +1312,19 @@ groupmember(gid_t gid, struct ucred *cred) return (supplementary_group_member(gid, cred)); } +/* + * Check if gid is a member of the real group set (i.e., real and supplementary + * groups). + */ +int +realgroupmember(gid_t gid, struct ucred *cred) +{ + if (gid == cred->cr_rgid) + return (1); + + return (supplementary_group_member(gid, cred)); +} + /* * Test the active securelevel against a given level. securelevel_gt() * implements (securelevel > level). securelevel_ge() implements diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index eb92776c158a..633bf436fcd4 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -159,6 +159,7 @@ void cru2x(struct ucred *cr, struct xucred *xcr); void cru2xt(struct thread *td, struct xucred *xcr); void crsetgroups(struct ucred *cr, int n, gid_t *groups); int groupmember(gid_t gid, struct ucred *cred); +int realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */ From nobody Wed Oct 18 18:03:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyP5w4Gz4xL3T; Wed, 18 Oct 2023 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9dyP3Pr0z4Y1n; Wed, 18 Oct 2023 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yv7kSF23FuxMUuHqsWea3AD1a634NxiqpxtSBL64gzg=; b=E6ixf48i7hwr4SxjV6y+UzLEu+Bga9hSsW7FM87V0hReDZlq+xu+iRNDsI7Gnd/6YW8Ujf CQ12DME5k2MJL7FlMDXo68YyISRZFU/4iImzIbqMhagLnqm2K5uWXj+7V1cjNM2xP8WSC+ YKf7iT5sxJ3OFdG65t2WAt6/+0lMhtLpjwYTuaUcx1wbbrAMgEl7sriWJBJOOUGdbIq3f9 jmrU1Ibw7nCFIzqVHhWgu87Zz+ttYjsD/Vmt6QW1M1YCfOHXP5r3Uzld1Sgu/mNSL/Bj/T fFP4EEk/zKxL+I5x5zxEhf7c+hyDa+4isgtXH49DJlJmaojnMteB1JcuRQNl4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652237; a=rsa-sha256; cv=none; b=ciCrGkU+L/f/eTPivendQtrlzPNHB5jdA2je+iVcKduqSX9kgq40IwPLUlVoruzhExkNPg we4rU7TtNQAtxR13SS6UAdcA2bV2K9TSW5JnBGgr29Kj6nIB1YyZ6N6u8OGOtsPLWibTB9 6yTi/Q1v0Od4/CyYQiJtbWVIgHA2bGRUpEBivhZlC+XPTbXKwRKytNgGtMvyZgm5WNSPfl AR1JtF2fApFSVtzwmJE0avEOdevO4z2yePIlk39WNJfHIOBVfFB0fC4sUOcyF8HdTCxfWC kD6ZVlced45prVNAoS/Ugq5I556d9hJGkQ3fcwkM392VG5KK/Mgwi6XRxv0Knw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Yv7kSF23FuxMUuHqsWea3AD1a634NxiqpxtSBL64gzg=; b=YeCea29tTcwKnOcYqT7l3YpZlGJOHbZklz31haQBMkZgLruuVgDosDoAXGLcF7Wlll0sq7 Qh9ZNLkoAPpqgz78w1gosIL4630VUw51GzkDkcRT47BL5Y4kq3Svo2z8eI7CEFr0LTjb2N 6MJM9dxwRjRbc26sO3YbMELLHpD8ZVQu/0SNO9IXHvcHiJ/gsxyVk7vcCZrnfZeOvDSKII 4RLm6gmNTXRLoQRoiulZnCI14kQ/z3TBza9uL9zvGaf99ZA7tLCn4O2ZhMj0lEOID/8wA1 r7ysnoud2942m3L6v46co7qBRYjZpegxC8u0XD4CC8CcWOQNCxt6vtc+o92wgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyP2T1pz27J; Wed, 18 Oct 2023 18:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II3vRS045012; Wed, 18 Oct 2023 18:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3vrm045009; Wed, 18 Oct 2023 18:03:57 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:57 GMT Message-Id: <202310181803.39II3vrm045009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 26ff4836c888 - releng/14.0 - cr_canseeothergids(): Use real instead of effective group membership List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 26ff4836c88812b9ee03c4cc127ba2b467173a0e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=26ff4836c88812b9ee03c4cc127ba2b467173a0e commit 26ff4836c88812b9ee03c4cc127ba2b467173a0e Author: Olivier Certner AuthorDate: 2023-08-17 23:54:45 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:49 +0000 cr_canseeothergids(): Use real instead of effective group membership Using the effective group and not the real one when testing membership has the consequence that unprivileged processes cannot see setuid commands they launch until these have relinquished their privileges. This is also in contradiction with how the similar cr_canseeotheruids() works, i.e., by taking into account real user IDs. Fix this by substituting groupmember() with realgroupmember(). While here, simplify the code. Approved by: re (gjb) PR: 272093 Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40642 Differential Revision: https://reviews.freebsd.org/D40644 (cherry picked from commit 91658080f1a598ddda03943a783c9a941199f7d2) (cherry picked from commit 0452dd841336cea7cd979b13ef12b6ea5e992eff) (cherry picked from commit 4e7cea61051abc476c64e4a996397235f5a881bc) --- share/man/man9/cr_bsd_visible.9 | 2 +- share/man/man9/cr_canseeothergids.9 | 8 ++++---- sys/kern/kern_prot.c | 23 ++++++++++------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/share/man/man9/cr_bsd_visible.9 b/share/man/man9/cr_bsd_visible.9 index bd676e6f5705..f2d42f3835dc 100644 --- a/share/man/man9/cr_bsd_visible.9 +++ b/share/man/man9/cr_bsd_visible.9 @@ -97,7 +97,7 @@ and are not members of any common group .Po as determined by -.Xr groupmember 9 +.Xr realgroupmember 9 .Pc . .It Bq Er ESRCH Credentials diff --git a/share/man/man9/cr_canseeothergids.9 b/share/man/man9/cr_canseeothergids.9 index f0c1e5c4e726..109d41a8545d 100644 --- a/share/man/man9/cr_canseeothergids.9 +++ b/share/man/man9/cr_canseeothergids.9 @@ -48,9 +48,9 @@ This function checks if a subject associated to credentials is denied seeing a subject or object associated to credentials .Fa u2 by a policy that requires both credentials to have at least one group in common. -For this determination, the effective and supplementary group IDs are used, but -not the real group IDs, as per -.Xr groupmember 9 . +For this determination, the real and supplementary group IDs are used, but +not the effective group IDs, as per +.Xr realgroupmember 9 . .Pp This policy is active if and only if the .Xr sysctl 8 @@ -79,5 +79,5 @@ Otherwise, it returns .Er ESRCH . .Sh SEE ALSO .Xr cr_bsd_visible 9 , -.Xr groupmember 9 , +.Xr realgroupmember 9 , .Xr priv_check_cred 9 diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 23bd2009582b..43fc3100bfa7 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1404,21 +1404,18 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW, int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { - int i, match; - if (!see_other_gids) { - match = 0; - for (i = 0; i < u1->cr_ngroups; i++) { - if (groupmember(u1->cr_groups[i], u2)) - match = 1; - if (match) - break; - } - if (!match) { - if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0) - return (ESRCH); - } + if (realgroupmember(u1->cr_rgid, u2)) + return (0); + + for (int i = 1; i < u1->cr_ngroups; i++) + if (realgroupmember(u1->cr_groups[i], u2)) + return (0); + + if (priv_check_cred(u1, PRIV_SEEOTHERGIDS) != 0) + return (ESRCH); } + return (0); } From nobody Wed Oct 18 18:03:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyQ57n5z4xL3X; Wed, 18 Oct 2023 18:03: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 4S9dyQ4ZNYz4Xr4; Wed, 18 Oct 2023 18:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCSh6wqlJHqgmMU81Lkn8l57ruQhzY3DdRqm4b+17SA=; b=q8mb+sYn8OH1w/XWx0gddSLyU+HATR+PKmkMEx4tONsgbznbp5W8hbzxVbbOARz27+wC/p W9rynX4GKQ805UZZBaW8Mlewibv/PVVxBij5fX+L4rfUanAUxHhIgZXf7V46Sn4RdvFjsY PxALZ3V2WZQaeCZcqvm79z/Xakel16WpKaynPJRC6JnVmWJhvzqH+Fu6ZPf0Rxly2ZehlT 7Qt7EZeXqZzfeHGrIF8YeuMXZvgx5vKjtpxKAQUcENj08GyD2ObPQQW4EeLfx1a4iOR+ly 64zjozfmDfYVYT3t+G+TZxsMhiOMX6Sh8MJgYXkQZ2Q9opb21/WkHSIfUmfvIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652238; a=rsa-sha256; cv=none; b=Nu5UidYSywY25cF5IvAw3pb+EYUXtv3uN6ndHjlJ1dvE5bgfblnoHGty9k1hn/9yaEKyb4 pvKargu+iEzP74VziGwpfROZDlroD2REV6B8VNqaBlVExSMUEu6at8Debc56xGDRIRgwHs 5eLKBP+K7mJjx75Ruovu7nkZMs4cBHO5dMZukc/uXTIesxFgwtQpN+vV0Wr/AVvcNyC9S5 OE7nv46wQ8leZ9xIp0TtIZOTVcOoKctrCnApeOjuLErGoIBpDsUGKqTKbp3UVc8lxUmGMS lNZUZmlHJQFpwwhDb3cbfViXZodsENaSWwI2kONLuZo5Y/i8Vu8ZQ6t1FZyH5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xCSh6wqlJHqgmMU81Lkn8l57ruQhzY3DdRqm4b+17SA=; b=iiiFDv6ExaEdcup6jkT0gv7eSAQ7//DJLF4ji+O/G34/ra9ikMGi4O/l24b+SlJpExkn4S EYeBzGGM7dIkIwy+dY4BV6/hOjCQ5Ne/vQdLAyGP7v/fWVixYBD1EsJDZ38N8D7a8vWOJV LfbnioxBqKedSeUyo80XivXWZ1Dhl27FIjbem1FKC5QckFiiY+bCvi6QM45hB4onQW0xbt QwrkgijtqhOPDeYBwhWUdiB73qOJaykcTt0Ok7CtTsvdzya1VX2s6xK4u00MGKbkVeCTgS TZroVbWl4uqLdnsgHgGQzeZD9qK+ZIf9Aaop1C1p59GPVlY4zyKGGlHDHYj+Mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyQ3gdcz1qX; Wed, 18 Oct 2023 18:03: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 39II3wNF045066; Wed, 18 Oct 2023 18:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3wjE045063; Wed, 18 Oct 2023 18:03:58 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:58 GMT Message-Id: <202310181803.39II3wjE045063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 007d864f061d - releng/14.0 - groupmember(), realgroupmember(): Return a bool instead of an int List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 007d864f061deef350f337ad835050526c68d4a7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=007d864f061deef350f337ad835050526c68d4a7 commit 007d864f061deef350f337ad835050526c68d4a7 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:47 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:01:57 +0000 groupmember(), realgroupmember(): Return a bool instead of an int Approved by: re (gjb) Requested by: mhorne Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40958 Differential Revision: https://reviews.freebsd.org/D40959 (cherry picked from commit ffd3ef8ee0253ffaf214cf711251d112f6a2bcf6) (cherry picked from commit 845b7c80887ac84c82ee776836ef86d68ea71c94) (cherry picked from commit 8cfce55f8f949869378c06279e4409beeddbea4e) --- share/man/man9/groupmember.9 | 18 +++++++++++++----- sys/kern/kern_prot.c | 12 ++++++------ sys/sys/ucred.h | 4 ++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9 index ae7ccd477955..b7865a35fdc9 100644 --- a/share/man/man9/groupmember.9 +++ b/share/man/man9/groupmember.9 @@ -34,9 +34,9 @@ .Sh SYNOPSIS .In sys/param.h .In sys/ucred.h -.Ft int +.Ft bool .Fn groupmember "gid_t gid" "struct ucred *cred" -.Ft int +.Ft bool .Fn realgroupmember "gid_t gid" "struct ucred *cred" .Sh DESCRIPTION The @@ -57,9 +57,17 @@ Function works the same except that it considers instead the real and supplementary groups, and not the effective one. .Sh RETURN VALUES -If the -.Fa gid -is found, 1 is returned, otherwise 0. +The +.Fn groupmember +and +.Fn realgroupmember +functions return +.Dv true +if the given credentials indicate membership of the group +.Fa gid , +or +.Dv false +otherwise. .Sh SEE ALSO .Xr getgroups 2 .Xr setgroups 2 diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 43fc3100bfa7..14b19837d5dc 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1275,7 +1275,7 @@ sys___setugid(struct thread *td, struct __setugid_args *uap) /* * Returns whether gid designates a supplementary group in cred. */ -static int +static bool supplementary_group_member(gid_t gid, struct ucred *cred) { int l, h, m; @@ -1302,12 +1302,12 @@ supplementary_group_member(gid_t gid, struct ucred *cred) * Check if gid is a member of the (effective) group set (i.e., effective and * supplementary groups). */ -int +bool groupmember(gid_t gid, struct ucred *cred) { - if (cred->cr_groups[0] == gid) - return (1); + if (gid == cred->cr_groups[0]) + return (true); return (supplementary_group_member(gid, cred)); } @@ -1316,11 +1316,11 @@ groupmember(gid_t gid, struct ucred *cred) * Check if gid is a member of the real group set (i.e., real and supplementary * groups). */ -int +bool realgroupmember(gid_t gid, struct ucred *cred) { if (gid == cred->cr_rgid) - return (1); + return (true); return (supplementary_group_member(gid, cred)); } diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h index 633bf436fcd4..7c9e46e47774 100644 --- a/sys/sys/ucred.h +++ b/sys/sys/ucred.h @@ -158,8 +158,8 @@ void crcowfree(struct thread *td); void cru2x(struct ucred *cr, struct xucred *xcr); void cru2xt(struct thread *td, struct xucred *xcr); void crsetgroups(struct ucred *cr, int n, gid_t *groups); -int groupmember(gid_t gid, struct ucred *cred); -int realgroupmember(gid_t gid, struct ucred *cred); +bool groupmember(gid_t gid, struct ucred *cred); +bool realgroupmember(gid_t gid, struct ucred *cred); #endif /* _KERNEL */ #endif /* !_SYS_UCRED_H_ */ From nobody Wed Oct 18 18:03:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyR6bNGz4xL3l; Wed, 18 Oct 2023 18:03: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 4S9dyR5mjtz4Y4X; Wed, 18 Oct 2023 18:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvoHkJnVr+KDmWqMfgsCYtft80MZj1I6RsPij63FPFI=; b=qliiviOCpbSRCPINJG75FMdL82CJfCNNoWdAAUXQlPARW6Sb3CZaRek3eUT1qEuCO4QKRz 1yQ4zR4MXZn6C1S4Q6U1cJ0U2R2LyRFONAJfoagVTThdoR1/2c5+s3k4aaoLoQ/x1m8qsh cdFvbEguDI+wq3XgPjVyL7v4oMffZ3+h1TpiJV+GxC4S7fs4mgXNKgOaMwGqS1YlfMDlGE HzMDQltNVimqiRN58ygsXR70QhKe+uM2P+fTkF9vIRE0i74+wJ0IlzOxBa1mGv2bXJGaY8 NncGhspAVkACOB5V2R+cvoERmsdVj+BTCWcd7gP3DhVAcjxoC0qpU1wZq8/wUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652239; a=rsa-sha256; cv=none; b=BuQAOMtyvY4JzC79MNhr3DTW/dnPmBrFwTT7I4R5i+4sSD4rUps4UDcdMm5h2SEsG0qbMv cGx7e6WTqsI2OtQzW4+TQeCjMKZ43L8kyn5A0oUVzXv8duZ7CPKPjcUza2uZZrMWBbkOhu zh5NNd1hY4wkIT72ty0NQasSXRtifZvRPkK12KHZERjEA672xJb6E1NDbIta0MNroH/Jin V5M+M/OC9CW/rbKw1/JCyJsHxzDUQpREMWd8U/22dEXClRwlelwWNvDlZLjWgDlkzEsRD3 0nK8XKm0R2re8aWV+nV6INm8/pCJHRPb90mtASXLvEGtVWqfH2DwTFmW6zhohw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvoHkJnVr+KDmWqMfgsCYtft80MZj1I6RsPij63FPFI=; b=LDhN6H7LwJBM+rK6mJvD0QouDv3NEZYXv5KWqPDecnok/blAMBa0MKyVCr/NGKklM9EZmQ qiGQTHmqhwwi+FSQt4Z8+y5lS8Elukc73SIUhy4H0sUO8FIWWJMkgc6LHZxa/x56IIcwjr yofdRmKgsvneIposhueP616WHmcAf3smsKtrmgTzUEJSz57YIk1u8++OmTlJ0Lfz3PI2Ly g1O5CEndERGr+fCDz1ge/ciSAy2GbQtNZMPk2upr/6VepSuLwTxfiQ23rSdI2u6bhLawfz Q1C38f3piXJmEJ6t7PF6BRlgy9TuMFzVs1z9j+dfvB3l1RCzBK3+aebD7PUJ6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyR4r83z27K; Wed, 18 Oct 2023 18:03: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 39II3xYD045112; Wed, 18 Oct 2023 18:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II3xGd045108; Wed, 18 Oct 2023 18:03:59 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:03:59 GMT Message-Id: <202310181803.39II3xGd045108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 22e1db5995e6 - releng/14.0 - security(7): security.bsd.see*: Be more accurate List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 22e1db5995e605f8b99eba6779ae153e49557b5d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=22e1db5995e605f8b99eba6779ae153e49557b5d commit 22e1db5995e605f8b99eba6779ae153e49557b5d Author: Olivier Certner AuthorDate: 2023-08-17 23:54:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:02:07 +0000 security(7): security.bsd.see*: Be more accurate Approved by: re (gjb) Reviewed by: mhorne, pauamma_gundo.com Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41108 (cherry picked from commit 61b6e00bee1d39e9c688e728fbf3a4efcdb61e66) (cherry picked from commit 74f2fb1778e815bfd982ca8a09f5b31dd93ccd0f) --- share/man/man7/security.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index ebe5e66e22af..a48e3607f0e5 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -959,16 +959,18 @@ Backwards compatibility shims for the interim sysctls under will not be added. .Bl -tag -width security.bsd.unprivileged_proc_debug .It Dv security.bsd.see_other_uids -Controls visibility of processes owned by different uid. +Controls visibility and reachability of subjects (e.g., processes) and objects +(e.g., sockets) owned by a different uid. The knob directly affects the .Dv kern.proc sysctls filtering of data, which results in restricted output from utilities like .Xr ps 1 . .It Dv security.bsd.see_other_gids -Same, for processes owned by different gid. +Same, for subjects and objects owned by a different gid. .It Dv security.bsd.see_jail_proc -Same, for processes belonging to a jail. +Same, for subjects and objects belonging to a different jail, including +sub-jails. .It Dv security.bsd.conservative_signals When enabled, unprivileged users are only allowed to send job control and usual termination signals like From nobody Wed Oct 18 18:04:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyT0q2Gz4xLC7; Wed, 18 Oct 2023 18:04: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 4S9dyT0JZYz4Y0G; Wed, 18 Oct 2023 18:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N2rQCzdHqXwcKr90nmBV8ELgB711fRZD7ck4laxJLyw=; b=YiKhyulHJAHotLXU9ChMzqlg69xulYjbcdVk4Ap6xTfI8kkDZV4BvZC1R9RwxFmISYtq9o UmWceTiaTxMm61k1n5eVW4uvO/XmShoTd8KxxljMDbuUTSmveKXuXeqir1SjfpWLiOBDIn 0WxDg+C2Hl/uUUGadxULsHD9HOv1zTmD7gsocRyiNRqoK/qBKb8RpuPH4wmsn3oQds7sAK 73gj/HSjDrWb7jXcJIIjdbqGocD+ZD/hOq+e/LsvJPwBnRp5k4OeMAOKm96HG8YkoeAvCh WFMak2S9zw5L7+5q24fo5fzv0oGDVRl/5So/z6kilk5jztdOwEEwhTmGFg9q+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652241; a=rsa-sha256; cv=none; b=m+4XMGkf3CNqndjWEWvXbIv9BmIvZ/yq8sHqVwkLCeIhCaWfJPq5mQEMqwy6VDQD+0Mzta RgvABjfWH+H+XYhuoppPxp5XKCD+VpM4IQBXYQpRUl/mj5aeNavNFoFu5xVmurvGk5pz74 kcLkUIIiqnlkPb8ErJLTxxeE4FI6cRS3ibUE4atccsE/y/FLYEzemKPXKB4UNMqJ8+HawW gaUoybLnNqcnJ7XfJJNEc4YvCxAVmTc3unaNaHKKKUDlFSv7PEL2PtzBsBihEUyUkMTZv2 VVFr1hdZXA13zWOy+itgWh/vJFQoEikOCnIpR+RknxPwpiW7oEaW7sNN0oGK1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N2rQCzdHqXwcKr90nmBV8ELgB711fRZD7ck4laxJLyw=; b=Z3Prd3hW9B5WxbbIEPd39VAw+UmocflQyIuYA/e3lGTvOtz9+Dex3bmkSo8B66en0BNvtp r++8XY6ThE+8exTSUypz4xUfJpXxpgZ+SLj76U7wGAXoTp9cAsuJPyRXDJ8hKKbsgnkPae Zsy6w9UFnVGLmuYTnmq++Tv/oyUV+ypbgQk0B6f2TNYNqADPQL9VOFkdtuMH5t9ZR7TAXV BFB75AQcs9tHOhl9Hzvyp5EkYB+Cme9xX3szM2z56+8n5t9gpPYW4pCWVkrvZy5Z4hwrt2 DrQk9+IqRUxoYxvlCnt5/WbI4Hh7+nGcO8Y4mSoUDt2NcCa4tp7rGf36ycL8/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 4S9dyS63Xxz1tT; Wed, 18 Oct 2023 18:04: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 39II40GO045166; Wed, 18 Oct 2023 18:04:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II40nQ045163; Wed, 18 Oct 2023 18:04:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:04:00 GMT Message-Id: <202310181804.39II40nQ045163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 664a0fc4aa9e - releng/14.0 - ptrace(2): Disabling: Describe influence of security.bsd.see_jail_proc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 664a0fc4aa9e8ee861fbb6de167bdf480b308bde Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=664a0fc4aa9e8ee861fbb6de167bdf480b308bde commit 664a0fc4aa9e8ee861fbb6de167bdf480b308bde Author: Olivier Certner AuthorDate: 2023-08-17 23:54:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:02:12 +0000 ptrace(2): Disabling: Describe influence of security.bsd.see_jail_proc Approved by: re (gjb) Reviewed by: mhorne, emaste, pauamma_gundo.com Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41109 (cherry picked from commit d952820105d6a2ad87ddf3bdc6c5fc5215d13b87) (cherry picked from commit 7c069dbe8e561436b4b2a0d6cf2c2483bd4e0fa3) --- lib/libc/sys/ptrace.2 | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2 index d7d244b1d84a..ae1770315aa5 100644 --- a/lib/libc/sys/ptrace.2 +++ b/lib/libc/sys/ptrace.2 @@ -1,7 +1,7 @@ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. -.Dd December 15, 2022 +.Dd August 18, 2023 .Dt PTRACE 2 .Os .Sh NAME @@ -149,31 +149,37 @@ its scope. The following controls are provided for this: .Bl -tag -width security.bsd.unprivileged_proc_debug .It Dv security.bsd.allow_ptrace -Setting this sysctl to zero value makes +Setting this sysctl to zero makes .Nm return .Er ENOSYS always as if the syscall is not implemented by the kernel. .It Dv security.bsd.unprivileged_proc_debug -Setting this sysctl to zero disallows use of +Setting this sysctl to zero disallows the use of .Fn ptrace by unprivileged processes. .It Dv security.bsd.see_other_uids -Setting this sysctl to zero value disallows +Setting this sysctl to zero prevents .Fn ptrace -requests from targeting processes with the real user identifier different -from the real user identifier of the caller. -The requests return -.Er ESRCH -if policy is not met. +requests from targeting processes with a real user identifier different +from the caller's. +These requests will fail with error +.Er ESRCH . .It Dv security.bsd.see_other_gids -Setting this sysctl to zero value disallows +Setting this sysctl to zero disallows .Fn ptrace -requests from process belonging to a group that is not also one of -the group of the target process. -The requests return -.Er ESRCH -if policy is not met. +requests from processes that have no groups in common with the target process, +considering their sets of real and supplementary groups. +These requests will fail with error +.Er ESRCH . +.It Dv security.bsd.see_jail_proc +Setting this sysctl to zero disallows +.Fn ptrace +requests from processes belonging to a different jail than that of the target +process, even if the requesting process' jail is an ancestor of the target +process'. +These requests will fail with error +.Er ESRCH . .It Dv securelevel and init The .Xr init 1 From nobody Wed Oct 18 18:04:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyV2ZmNz4xL8R; Wed, 18 Oct 2023 18:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9dyV15Mkz4Y0p; Wed, 18 Oct 2023 18:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fENJ+K4zbYypa1pXaSBS9gUTSahQwHsedxA1St9uzAA=; b=jEb3LNL/zBTjhUK800Upgvn2+h+7Er20fkd1Mq2D8GLI3WuNhiDshGZovdMD20IQYPqDSD NBjiXjrBMqFHVW+i9aONL452z3NWmE6w0/ZAVzg/gOctEEykl6zKiUnvgeJaS1ymie7TR1 ueBFIXc2feXfReRkazP2Z9TrvaMQ/sz+xVexf8W/nXPzh6s5MP6SC0MohmKpBMnl3iyE2V Zd8kAtc1hAHqkg+Rx3pWBdyxnZHnpdUWa5Iv5nRc94Z/skL6eRLBuI4GC6tYL2LwGwKVVl P9aecAC4XkvLqv70w6CATn1MpeStwKbTOhQrfvt7YjVH7DOtzCrtgy7zNEHrsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652242; a=rsa-sha256; cv=none; b=Xz6qcnaDD/4aE0UzWXJph0zdQ+N+vwJ6Po3I9mf0ZdK21NzmzRIPX2Y1gNCtSVylSPcTKz hF3v9GYW24RwFKICnWDs/QcuZfVmI9KR3wCULs2IRSdA1NXoY5GXVQ/9C3lhXoElhFtoGc UhP+lkMmJiEJJdx8I7C4/SicQwq5oEsrps+PW0LxFCQXq9K7YlmhHe4oxSajfOYM7PWGkj E20fPqYdnT52UX9rQZ3sCzH323ZWije+axhPA/i+cexv4TmJWzBrkq9SQP2R8oLsd13Vnl f3/NKpm9A0AODOKwvLFwrOwEm+8l/WEvjr/N0CRNRCKc2vZhA/gGf6eKGQkw6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fENJ+K4zbYypa1pXaSBS9gUTSahQwHsedxA1St9uzAA=; b=Dg5Vg405j0PUEiqz1NCd7wcdl9flDObi+ZlLi7HebPbgNS5MbcGg58NBK5lB4gsc1BAls3 CrT3Tr3pDpC1ARST3HaWOB4ltKuQOL94ewleTJnb0Ufi+u0v16D/GK5r7znhgmSgvX8H/H QzmhYznl++0uF+QUC4jDZb+81ytM6ozXZXJmZQcPxO5q23RgZYyrfUH2hdLpJstUmU2jVk +CEdeO3jmPvId/3kf9KUfO92PtiEzVC+WEq/+oxJDV1H3SGz1vIXEbtj68p6JhSq1szgYH ScizbG/Ktx5lmtIYHjyNTn3eLSCewdj2X2rfaZlQv9AXWgklpnBPO4dhzdkZoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyV08r4z2RH; Wed, 18 Oct 2023 18:04:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39II41nv045217; Wed, 18 Oct 2023 18:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II41Nx045214; Wed, 18 Oct 2023 18:04:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:04:01 GMT Message-Id: <202310181804.39II41Nx045214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: b0a30eed2426 - releng/14.0 - sysctl(8): Mention more security.bsd knobs; Refer to security(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: b0a30eed2426188697a6096f2c78686d90aa6225 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b0a30eed2426188697a6096f2c78686d90aa6225 commit b0a30eed2426188697a6096f2c78686d90aa6225 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:49 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:02:20 +0000 sysctl(8): Mention more security.bsd knobs; Refer to security(7) Approved by: re (gjb) Reviewed by: mhorne, pauamma_gundo.com, emaste Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D41113 (cherry picked from commit 8d7a48d367ffde2a29419ef943c4099984e3af4d) (cherry picked from commit 0e480eda041122ec8571d14ed1ebe8787a384972) --- sbin/sysctl/sysctl.8 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index 3e995e40131b..ed768510eb6c 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" -.Dd December 24, 2022 +.Dd August 18, 2023 .Dt SYSCTL 8 .Os .Sh NAME @@ -194,7 +194,9 @@ for more information on which tunables are available and how to set them. .Pp The string and integer information is summarized below. For a detailed description of these variables see -.Xr sysctl 3 . +.Xr sysctl 3 +and +.Xr security 7 . .Pp The changeable column indicates whether a process with appropriate privilege can change the value. @@ -231,6 +233,8 @@ String and integer values can be set using .It "kern.logsigexit integer yes" .It "security.bsd.suser_enabled integer yes" .It "security.bsd.see_other_uids integer yes" +.It "security.bsd.see_other_gids integer yes" +.It "security.bsd.see_jail_proc integer yes" .It "security.bsd.unprivileged_proc_debug integer yes" .It "security.bsd.unprivileged_read_msgbuf integer yes" .It "vm.loadavg struct no" @@ -320,6 +324,7 @@ option has been deprecated and is silently ignored. .Xr sysctl 3 , .Xr loader.conf 5 , .Xr sysctl.conf 5 , +.Xr security 7, .Xr loader 8 .Sh HISTORY A From nobody Wed Oct 18 18:04:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9dyW4CBqz4xL8S; Wed, 18 Oct 2023 18:04: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 4S9dyW23Drz4Y5h; Wed, 18 Oct 2023 18:04:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOUuaJqnOtI36tgmtwO8UDoZt9ar123t1mkyoQePzOk=; b=UJqiaLiTHDOezPTYpuljmDuyOsufH9F9O6P7GtNaSHo2z2ovSVEfZ3Zq71/61/IlQwT3O7 jA+oUC53aoELQ+vs3bjlXCr5CR22U/Zxi8QFNZD86nr+NRVzG1lJbU4akfvlN4YfTsJO8r Jr5jevqai+u5iLKxaFSVjG3y5LlCHLvPSdLxGgNCQzCB3FufRGickkW5dr7XKGLVoflM0t swLhYBeINdjttuNO6vayO+gvOxXJenODHmN21alHcYdWR1F5oUJ+HxQ2Iq6Z4dyS7XTz4K MCRSc5f5u4Ds+BIAQE0iO8qEwkPqCbHXIineWpHedvtMtois99aSqXZGHGX9Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652243; a=rsa-sha256; cv=none; b=dhnwIYXoGVXc/DLym+VaXn4iQ5cDbyIIV/0fM30CTAirVLougx2N6zHMdTVHpYdGEeIMbq Bh54rYe0MBsf3lgPeZxkAvnsaDkdy87qZB3x/1IZKHSvi7GGgjyjn+bYv44O2XM7gJ6mi3 oSuwH+jrxNPQ0E0d0J8vIIxgLYmuvsHMEWZFYbObIFbzLx7rCKFumwmRkXb6bBqKq+NTTl a6ZQ6wr3J4LxJe1eBCiB42ohKGNluAtYSpKUxzxnKV90J51OScuV74TzydF5gSsVgjW2FI Q5KDAfuTZO6gcYZRLorIidHm230+4FX4YVsDS9UYwvHE74+4H5jzQugDfnR5mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOUuaJqnOtI36tgmtwO8UDoZt9ar123t1mkyoQePzOk=; b=w/yvcMii19AvJCZ1Dh7/TMrK9k6p9dticuWZEMFs03CJNvXGHRs7pqYSF5vj9g8wRaYlhb BtNSc0+IuwrsLe+Skqa53yOUXlBElMDwsMEJJGrYK64cMy9U6XKQyqqA1msp4CZrb3uSaw qgqqlfPzHyTmJuWro6Fbt2n1vNpRlnSesjtUOSmTgvglsLEs7Dyol2674OCFZqY1KXoTfi iP+pHvN7nPm5n48L66tD0F4wS9WeCmjlVNXHt5shNwV7GQ1H4xwEy/j3RW4QjB4uBaogIi DhJeHn4JLTWFmwjHOzvopJWazBv8MU0XsiLybhlK5HrUsVrZmUy/qA4emhWsJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9dyW19B6z2Rx; Wed, 18 Oct 2023 18:04: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 39II430d045260; Wed, 18 Oct 2023 18:04:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II43VY045257; Wed, 18 Oct 2023 18:04:03 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:04:03 GMT Message-Id: <202310181804.39II43VY045257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3b14e215dd68 - releng/14.0 - Make cr_bsd_visible()'s sub-functions internal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3b14e215dd6805544afeb336352e8724b0ceff51 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3b14e215dd6805544afeb336352e8724b0ceff51 commit 3b14e215dd6805544afeb336352e8724b0ceff51 Author: Olivier Certner AuthorDate: 2023-08-17 23:54:39 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:02:25 +0000 Make cr_bsd_visible()'s sub-functions internal cr_canseeotheruids(), cr_canseeothergids() and cr_canseejailproc() should not be used directly now. cr_bsd_visible() has to be called instead. Approved by: re (gjb) Reviewed by: mhorne Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40629 (cherry picked from commit 91e9d669b475d1900e8dc01a49ad90a621c4a068) (cherry picked from commit 07c60e63237e1d4657cfbd6b03116c4913827e8c) --- sys/kern/kern_prot.c | 10 +++++++--- sys/sys/proc.h | 3 --- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 14b19837d5dc..00eb2fccdeef 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -91,6 +91,10 @@ static void crfree_final(struct ucred *cr); static void crsetgroups_locked(struct ucred *cr, int ngrp, gid_t *groups); +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2); +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2); + #ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; @@ -1371,7 +1375,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_uids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeotheruids(struct ucred *u1, struct ucred *u2) { @@ -1401,7 +1405,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_other_gids, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseeothergids(struct ucred *u1, struct ucred *u2) { if (!see_other_gids) { @@ -1440,7 +1444,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_jail_proc, CTLFLAG_RW, * References: *u1 and *u2 must not change during the call * u1 may equal u2, in which case only one reference is required */ -int +static int cr_canseejailproc(struct ucred *u1, struct ucred *u2) { if (see_jail_proc || /* Policy deactivated. */ diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 8609bbd124ad..0b91b2a1a0b5 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1166,9 +1166,6 @@ struct thread *choosethread(void); int cr_bsd_visible(struct ucred *u1, struct ucred *u2); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); -int cr_canseeothergids(struct ucred *u1, struct ucred *u2); -int cr_canseeotheruids(struct ucred *u1, struct ucred *u2); -int cr_canseejailproc(struct ucred *u1, struct ucred *u2); int cr_cansignal(struct ucred *cred, struct proc *proc, int signum); int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess); From nobody Wed Oct 18 18:05:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0k5DqQz4xLCn; Wed, 18 Oct 2023 18:05: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 4S9f0k4WsQz4dtH; Wed, 18 Oct 2023 18:05:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQU1+t/qiqHTdWs+EwgcH2PDgfic+6XHrQZzSFuQrMA=; b=PMEs6sGmPe1W0+hyYeKeecMHOdGthifYv9f88PORuOvTn5rNI28w25d6RmkU5REeeB2BA7 J1WPOfCodMkM/IvKgsgWqk+nd81uQjsOegL8dqzNvF//tg00jZH43KFCmxgT1xTdu/+Saz s0a5FIG7o93vPb64Gm4vlwMONZXOpsbcHQzRQf9L2WnY+xexuFn3CCIf++q9AnYeaQ6Tkh y1Q4HOWW0Sg62YIzXQusARZoBe7EJJaBzx6t0Lb7+v0FChBh25dIIfFVMrzGmhevQD8StH IiKf01bMt3iwj/v+2hS/hmGFGuYEe8grqYMknBKruiT0uLsr+GmoJZzARbLkag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652358; a=rsa-sha256; cv=none; b=eJenwygW69r27kd7kOsjJwoDoP61ZEEMEjKcjLFMujjGEG0d30m8Kh7w+7rpZc0sSgSquT 3z2W39m3jDAdGHo4pL9u4fOA5Ien47mKI+8YqpKhzogN/q+MEsIxi73dA2UjGi5hddBmEx p4DsJWvCOroUJ1T+lMRSMQ9YV2wjFhgLw7iXjlUSKijKqOQQS+sMx6uVE4EKycjWN/8tz5 9C6giN6za74Hlz8rrzScwQQGd+e8Fi0SrlA8u8c7g4ruNW4eIMwZ8iwZj5D+ciRKFQCz7h oantsPYvRANQ4pWp6RA1q1/HFGVuDYAInuEmvW+a7USBgQC7PBm/J0tLMoy/qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQU1+t/qiqHTdWs+EwgcH2PDgfic+6XHrQZzSFuQrMA=; b=Y/0TZCJ7bYmBQEUB9GqGWUCF/4ezgC1/LNfKRY+M0W/Cisd8RMgN+X4hB8gnJYLMrIeIf+ hiVbcRL+ryBeXMg0AaLIRe4gaPtR+bUGfqNiQ4EccHVbuxqAxzOZXUwJZEgBTKVtpbR2lL Yie/nun26eKyewtGZOEA3oQB4vzNZOZOXhtiNsDF57i0WcKjQ3qCHIYQkcr8xN88rz2D9m Fe2VIak9A6DHaF4YPkGdSwd+nPiM08NO/WbId2FOTwEnXkbZnZ66l7BKX51hQvEeB+S29D cSLGVpBQ+FIdlJ1mWMCJw43kyyvsFkWEqr+bUgaTVQmsj50F/PQ2qScDjuwvCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0k3994z2S3; Wed, 18 Oct 2023 18:05: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 39II5wBx045778; Wed, 18 Oct 2023 18:05:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II5wAL045775; Wed, 18 Oct 2023 18:05:58 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:05:58 GMT Message-Id: <202310181805.39II5wAL045775@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: 90a6ea5ca0b1 - main - hwpmc: tidy pcd_finalize methods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90a6ea5ca0b1b578e265d2479511bd04347f9510 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=90a6ea5ca0b1b578e265d2479511bd04347f9510 commit 90a6ea5ca0b1b578e265d2479511bd04347f9510 Author: Mitchell Horne AuthorDate: 2023-10-18 17:50:49 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc: tidy pcd_finalize methods Make them a little bit more consistent with one another in terms of what is done: - Add/reduce assertions to what is most useful: a loop to ensure pcpu_fini freed everything - Add PMCDBG trace entries The exception is the dmc620/cmn600 classes, which behave a little differently, so leave them untouched. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41270 --- sys/dev/hwpmc/hwpmc_amd.c | 32 ++++---------------------------- sys/dev/hwpmc/hwpmc_arm64.c | 4 ++++ sys/dev/hwpmc/hwpmc_armv7.c | 4 ++++ sys/dev/hwpmc/hwpmc_core.c | 4 ++++ sys/dev/hwpmc/hwpmc_powerpc.c | 5 +++++ sys/dev/hwpmc/hwpmc_soft.c | 9 ++------- sys/dev/hwpmc/hwpmc_tsc.c | 10 ++-------- sys/dev/hwpmc/hwpmc_uncore.c | 4 ++++ 8 files changed, 29 insertions(+), 43 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index fbbaf92a1547..000958eb9945 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -1173,37 +1173,13 @@ pmc_amd_initialize(void) void pmc_amd_finalize(struct pmc_mdep *md) { -#if defined(INVARIANTS) - int classindex, i, ncpus, pmcclass; -#endif + PMCDBG0(MDP, INI, 1, "amd-finalize"); pmc_tsc_finalize(md); - KASSERT(amd_pcpu != NULL, ("[amd,%d] NULL per-cpu array pointer", - __LINE__)); - -#if defined(INVARIANTS) - switch (md->pmd_cputype) { -#if defined(__i386__) - case PMC_CPU_AMD_K7: - classindex = PMC_MDEP_CLASS_INDEX_K7; - pmcclass = PMC_CLASS_K7; - break; -#endif - default: - classindex = PMC_MDEP_CLASS_INDEX_K8; - pmcclass = PMC_CLASS_K8; - } - - KASSERT(md->pmd_classdep[classindex].pcd_class == pmcclass, - ("[amd,%d] pmc class mismatch", __LINE__)); - - ncpus = pmc_cpu_max(); - - for (i = 0; i < ncpus; i++) - KASSERT(amd_pcpu[i] == NULL, ("[amd,%d] non-null pcpu", - __LINE__)); -#endif + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(amd_pcpu[i] == NULL, + ("[amd,%d] non-null pcpu cpu %d", __LINE__, i)); free(amd_pcpu, M_PMC); amd_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 9a5debb8016b..4c38a4ae6183 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -611,5 +611,9 @@ pmc_arm64_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "arm64-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(arm64_pcpu[i] == NULL, + ("[arm64,%d] non-null pcpu cpu %d", __LINE__, i)); + free(arm64_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_armv7.c b/sys/dev/hwpmc/hwpmc_armv7.c index 5bb6c6fce291..1488af2ae54e 100644 --- a/sys/dev/hwpmc/hwpmc_armv7.c +++ b/sys/dev/hwpmc/hwpmc_armv7.c @@ -535,5 +535,9 @@ pmc_armv7_finalize(struct pmc_mdep *md) { PMCDBG0(MDP, INI, 1, "armv7-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(armv7_pcpu[i] == NULL, + ("[armv7,%d] non-null pcpu cpu %d", __LINE__, i)); + free(armv7_pcpu, M_PMC); } diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 3829a03eb729..ddaff0b5955e 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -1260,6 +1260,10 @@ pmc_core_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "core-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(core_pcpu[i] == NULL, + ("[core,%d] non-null pcpu cpu %d", __LINE__, i)); + free(core_pcpu, M_PMC); core_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c index a4bd951fab40..0380988f909f 100644 --- a/sys/dev/hwpmc/hwpmc_powerpc.c +++ b/sys/dev/hwpmc/hwpmc_powerpc.c @@ -581,6 +581,11 @@ pmc_md_initialize(void) void pmc_md_finalize(struct pmc_mdep *md) { + PMCDBG0(MDP, INI, 1, "powerpc-finalize"); + + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(powerpc_pcpu[i] == NULL, + ("[powerpc,%d] non-null pcpu cpu %d", __LINE__, i)); free(powerpc_pcpu, M_PMC); powerpc_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_soft.c b/sys/dev/hwpmc/hwpmc_soft.c index 5606164b3e0f..4679969fb45c 100644 --- a/sys/dev/hwpmc/hwpmc_soft.c +++ b/sys/dev/hwpmc/hwpmc_soft.c @@ -456,17 +456,12 @@ pmc_soft_initialize(struct pmc_mdep *md) void pmc_soft_finalize(struct pmc_mdep *md) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "soft-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(soft_pcpu[i] == NULL, ("[soft,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_CLASS_INDEX_SOFT].pcd_class == - PMC_CLASS_SOFT, ("[soft,%d] class mismatch", __LINE__)); -#endif ast_deregister(TDA_HWPMC); free(soft_pcpu, M_PMC); soft_pcpu = NULL; diff --git a/sys/dev/hwpmc/hwpmc_tsc.c b/sys/dev/hwpmc/hwpmc_tsc.c index f86b93d58bfb..5d31f8a9c61c 100644 --- a/sys/dev/hwpmc/hwpmc_tsc.c +++ b/sys/dev/hwpmc/hwpmc_tsc.c @@ -339,18 +339,12 @@ pmc_tsc_initialize(struct pmc_mdep *md, int maxcpu) void pmc_tsc_finalize(struct pmc_mdep *md __diagused) { -#ifdef INVARIANTS - int i, ncpus; + PMCDBG0(MDP, INI, 1, "tsc-finalize"); - ncpus = pmc_cpu_max(); - for (i = 0; i < ncpus; i++) + for (int i = 0; i < pmc_cpu_max(); i++) KASSERT(tsc_pcpu[i] == NULL, ("[tsc,%d] non-null pcpu cpu %d", __LINE__, i)); - KASSERT(md->pmd_classdep[PMC_MDEP_CLASS_INDEX_TSC].pcd_class == - PMC_CLASS_TSC, ("[tsc,%d] class mismatch", __LINE__)); -#endif - free(tsc_pcpu, M_PMC); tsc_pcpu = NULL; } diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index fd4266b605ef..0ee41db0658d 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -758,6 +758,10 @@ pmc_uncore_finalize(struct pmc_mdep *md) { PMCDBG0(MDP,INI,1, "uncore-finalize"); + for (int i = 0; i < pmc_cpu_max(); i++) + KASSERT(uncore_pcpu[i] == NULL, + ("[uncore,%d] non-null pcpu cpu %d", __LINE__, i)); + free(uncore_pcpu, M_PMC); uncore_pcpu = NULL; } From nobody Wed Oct 18 18:05:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0l5xjhz4xL4g; Wed, 18 Oct 2023 18:05: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 4S9f0l5HxMz4f0D; Wed, 18 Oct 2023 18:05:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIppKBkdw1cc40PXxCFTApxS7m9xQkYcqx2PZZ+wcJw=; b=UmeCdAXgtYE5Ub5G+llNAM+903x/e7UlIdfV70/Q479ci+vfBt9jcxKGCmLp4jH8TP6YCV 2SKgdjshpsSxnbgrT/mJ8QH6VoLT6czvjqRVRlnxQ5LhOeYot/gn3YNGoqvauzzArXRKhh MLkQMI+HCl6+orLPEI2gxymhhbW1L23A89Rd0rPKjpSuRH8KyhTwtRzs9P/i2JHpPUnz7L uAuGkK/vlPuCveyhDV2aDPhFz2CmLqQFMOFJrzupiFRpsmJBxPFFAHHiXDqjYjv8nSXN6U nMmKpPUc38RG6smgw5rV677DIocjGPafcIqbwbewXlaD1QNT3gzPlBp2lyFuxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652359; a=rsa-sha256; cv=none; b=TlSLLhaR/UUlH3UPI+/7nbm5Y77D+D2Yf8S4hG6zgqE+x1all/dlfrfQrXpHe1zhI1Q0up MQ5GToKbnDdZY+ZGeiKjjkBJf4bZUbvYP4GT7pFU6aQrNmWoIanrKkxYmpVSk2yeL5T/nL +FCWq2pw7bZvrTvSzcNDQPkuZZVtMWPKfY31vWq2RyrH4VZV7dVx0VLXHnJ25SR8ifwXNY qOcreooSRrlsAMZXlAHhG1C8C+BrOQOzE+MMqsp8Zer1hdU+V5cHYF5OYNvWHlvN9ZEiF+ GGwGqfSLoAN5CUhgVU6hSyt+9YmXoaKwqbKb7pFQ+LZDyD1hcR/cx1JWWJtwYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DIppKBkdw1cc40PXxCFTApxS7m9xQkYcqx2PZZ+wcJw=; b=EPxpwGpAZ40in3Xrp62GV6EdubBSew8tDmA93N3945+91Wpbgstc+Ud5Y3JZ56F1X+8YPA tfjtoLWi1+PhZCAx2reO3qZQssnxQOt/zbFwWzIc4a+azXzaomQGAsyKgSifftuTKCmPJz yP7TrAL2ih6xErEr7rivaNuJifaarpLGu+zkkbj+f8MbEB3NwwnFYoUREm7/a8eZOMiPPb C2gK5nQpHDVig7D+qiVPnoNnjeAnsjailoGiiwt5h99uUI06ZFMfUOmIPEMJgbC0BFNuag SqECqFboI2j8v2Qv8aAium7YowYOy4snn5+uytsZQdA6KZlZCT+w8qJaWQ9HLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0l4NnMz27W; Wed, 18 Oct 2023 18:05: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 39II5xuc045829; Wed, 18 Oct 2023 18:05:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II5x0U045826; Wed, 18 Oct 2023 18:05:59 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:05:59 GMT Message-Id: <202310181805.39II5x0U045826@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: 440e7cb4aca9 - main - hwpmc_core: remove two non-existent function prototypes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 commit 440e7cb4aca9b6f5662ab492bd016d8ed0f85da0 Author: Mitchell Horne AuthorDate: 2023-10-18 17:53:05 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc_core: remove two non-existent function prototypes Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41271 --- sys/dev/hwpmc/hwpmc_core.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_core.h b/sys/dev/hwpmc/hwpmc_core.h index 6fbb1cca319c..cd23055afbe2 100644 --- a/sys/dev/hwpmc/hwpmc_core.h +++ b/sys/dev/hwpmc/hwpmc_core.h @@ -198,11 +198,9 @@ int pmc_core_initialize(struct pmc_mdep *_md, int _maxcpu, void pmc_core_finalize(struct pmc_mdep *_md); int pmc_iaf_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width); -void pmc_iaf_finalize(struct pmc_mdep *_md); int pmc_iap_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width, int _flags); -void pmc_iap_finalize(struct pmc_mdep *_md); #endif /* _KERNEL */ #endif /* _DEV_HWPMC_CORE_H */ From nobody Wed Oct 18 18:06:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0m5zfsz4xLFg; Wed, 18 Oct 2023 18:06: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 4S9f0m5Ym1z4dsB; Wed, 18 Oct 2023 18:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCd6ssSgaG2cULo0K7rLixi2BnUKt9opnLNvTzLmYSg=; b=w21QiDZ6sAn6IfigAoL0Ls/NfELjZNYevbnkkxzs2kVE7JTOtsVEuOWl3bZ3gaTVBA/1Io RH2DyewIbwgQ8Vm0fw347zU6LcNyTV/0/ExXbVRw8/Y7+4F+oZpnLWqftNAdhJ08GRHR+u wvzS00I0/cWELXn081Ax4/ClALM1syC4c2qpMWLoxF8IEXJSEcR5vcuX+uNUejOcwUFrYq VLQ8OfWctB8I4uofRKNAHRbEjAE4sPEq1AJ3FDvrw6qqUBkpFCs8wBblYcYpGkF/P5HPpj +/26ryJIizOeZRPBP2daLCcqP+kkmmWqgxgSowAJMCpJgjZTYgcikw+GzaZwyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652360; a=rsa-sha256; cv=none; b=By6Z8Wz1UfJAI3uEEX53AmMo/XmTusHmrrfFLWOKxZt8SlifuCKJzEaCs41n51LAqk1nzP /IyH2XMoS27+OFasOaQOCVJTAwI8MlI3jUCjHp0WZFKntF3JM6wmepr8CXCU90czbFwbhj IBtZ2nZAROAna81tLgDExM8GufYxXn4x4aTadDVccv888vEvU+qExxtJI/E7S2vWSVfjxK BH8zZtDtNHFx1X9kTRFoHv0cxoOFP0BIE0OkKQFd2h8C0ao0R7nGKwF2l0E4iSfEUqTCWi rN79tY3natcJU/bGPjRZhGHT9Ca/nGF6dyDShe4hHMWKw9OGfYJi44FSmGUMlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MCd6ssSgaG2cULo0K7rLixi2BnUKt9opnLNvTzLmYSg=; b=irG5tp8gfFNKDNAuoyCsay7cr2sTAe/Fezehi54xvbrQcKpAN/YDUceu8N1USt7/4kOAVb M8XilaP2utiXIjxGBPGPoy3qsdpvv8CFFmjql+p0Di+AYQfVRZD778oH8Yl4QlAzZ7SKKM 2oL5P1hF1oa8zHRsFU18naunESlY9fecky1pBmhYlG29bXnczpb//XwFDsHLEZcCyQcJjN hTH9J0FOfVdTVEOZjUdC4vaYCD68q+vHD2OdnliaEAwRYW4Pr2v1gsd6XOtzwTu30PMWLu TfMYhOOlX+zwn9rfkJStyP3Tj9zZd4wCnEq4wiSVCRHtJjb/2MoiLXn1URJEAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0m4dxQz253; Wed, 18 Oct 2023 18:06: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 39II60vf045871; Wed, 18 Oct 2023 18:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II60oK045868; Wed, 18 Oct 2023 18:06:00 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:00 GMT Message-Id: <202310181806.39II60oK045868@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: d9e3fe322662 - main - hpwmc_amd.c: style improvements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9e3fe3226624c391a80b623d844bb578888cec3 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d9e3fe3226624c391a80b623d844bb578888cec3 commit d9e3fe3226624c391a80b623d844bb578888cec3 Author: Mitchell Horne AuthorDate: 2023-10-18 17:53:27 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hpwmc_amd.c: style improvements - Return style - Explicit value checks - Whitespace formatting - Comment formatting - Local variable declaration order - __unused annotations Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41272 --- sys/dev/hwpmc/hwpmc_amd.c | 280 +++++++++++++++++++--------------------------- 1 file changed, 116 insertions(+), 164 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 000958eb9945..d8ca2e094d02 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -383,23 +383,20 @@ const int amd_event_codes_size = nitems(amd_event_codes); /* * Per-processor information */ - struct amd_cpu { struct pmc_hw pc_amdpmcs[AMD_NPMCS]; }; - static struct amd_cpu **amd_pcpu; /* - * read a pmc register + * Read a PMC value from the MSR. */ - static int amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) { - enum pmc_mode mode; const struct amd_descr *pd; pmc_value_t tmp; + enum pmc_mode mode; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -411,7 +408,8 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) pd = &amd_pmcdesc[ri]; mode = PMC_TO_MODE(pm); - PMCDBG2(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class); + PMCDBG2(MDP, REA, 1, "amd-read id=%d class=%d", ri, + pd->pm_descr.pd_class); #ifdef HWPMC_DEBUG KASSERT(pd->pm_descr.pd_class == amd_pmc_class, @@ -420,7 +418,7 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) #endif tmp = rdmsr(pd->pm_perfctr); /* RDMSR serializes */ - PMCDBG2(MDP,REA,2,"amd-read (pre-munge) id=%d -> %jd", ri, tmp); + PMCDBG2(MDP, REA, 2, "amd-read (pre-munge) id=%d -> %jd", ri, tmp); if (PMC_IS_SAMPLING_MODE(mode)) { /* * Clamp value to 0 if the counter just overflowed, @@ -437,15 +435,14 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) } *v = tmp; - PMCDBG2(MDP,REA,2,"amd-read (post-munge) id=%d -> %jd", ri, *v); + PMCDBG2(MDP, REA, 2, "amd-read (post-munge) id=%d -> %jd", ri, *v); - return 0; + return (0); } /* * Write a PMC MSR. */ - static int amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) { @@ -470,24 +467,22 @@ amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) if (PMC_IS_SAMPLING_MODE(mode)) v = AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(v); - PMCDBG3(MDP,WRI,1,"amd-write cpu=%d ri=%d v=%jx", cpu, ri, v); + PMCDBG3(MDP, WRI, 1, "amd-write cpu=%d ri=%d v=%jx", cpu, ri, v); /* write the PMC value */ wrmsr(pd->pm_perfctr, v); - return 0; + return (0); } /* - * configure hardware pmc according to the configuration recorded in - * pmc 'pm'. + * Configure hardware PMC according to the configuration recorded in 'pm'. */ - static int amd_config_pmc(int cpu, int ri, struct pmc *pm) { struct pmc_hw *phw; - PMCDBG3(MDP,CFG,1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); + PMCDBG3(MDP, CFG, 1, "cpu=%d ri=%d pm=%p", cpu, ri, pm); KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -501,78 +496,65 @@ amd_config_pmc(int cpu, int ri, struct pmc *pm) __LINE__, pm, phw->phw_pmc)); phw->phw_pmc = pm; - return 0; + return (0); } /* * Retrieve a configured PMC pointer from hardware state. */ - static int amd_get_config(int cpu, int ri, struct pmc **ppm) { *ppm = amd_pcpu[cpu]->pc_amdpmcs[ri].phw_pmc; - - return 0; + return (0); } /* - * Machine dependent actions taken during the context switch in of a + * Machine-dependent actions taken during the context switch in of a * thread. */ - static int -amd_switch_in(struct pmc_cpu *pc, struct pmc_process *pp) +amd_switch_in(struct pmc_cpu *pc __pmcdbg_used, struct pmc_process *pp) { - (void) pc; - - PMCDBG3(MDP,SWI,1, "pc=%p pp=%p enable-msr=%d", pc, pp, + PMCDBG3(MDP, SWI, 1, "pc=%p pp=%p enable-msr=%d", pc, pp, (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) != 0); /* enable the RDPMC instruction if needed */ if (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) load_cr4(rcr4() | CR4_PCE); - return 0; + return (0); } /* - * Machine dependent actions taken during the context switch out of a + * Machine-dependent actions taken during the context switch out of a * thread. */ - static int -amd_switch_out(struct pmc_cpu *pc, struct pmc_process *pp) +amd_switch_out(struct pmc_cpu *pc __pmcdbg_used, + struct pmc_process *pp __pmcdbg_used) { - (void) pc; - (void) pp; /* can be NULL */ - - PMCDBG3(MDP,SWO,1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? + PMCDBG3(MDP, SWO, 1, "pc=%p pp=%p enable-msr=%d", pc, pp, pp ? (pp->pp_flags & PMC_PP_ENABLE_MSR_ACCESS) == 1 : 0); /* always turn off the RDPMC instruction */ load_cr4(rcr4() & ~CR4_PCE); - return 0; + return (0); } /* - * Check if a given allocation is feasible. + * Check if a given PMC allocation is feasible. */ - static int -amd_allocate_pmc(int cpu, int ri, struct pmc *pm, +amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, const struct pmc_op_pmcallocate *a) { - int i; + const struct pmc_descr *pd; uint64_t allowed_unitmask, caps, config, unitmask; enum pmc_event pe; - const struct pmc_descr *pd; - - (void) cpu; + int i; - KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), - ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, ("[amd,%d] illegal row index %d", __LINE__, ri)); @@ -580,26 +562,30 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, /* check class match */ if (pd->pd_class != a->pm_class) - return EINVAL; + return (EINVAL); if ((a->pm_flags & PMC_F_EV_PMU) == 0) return (EINVAL); caps = pm->pm_caps; - PMCDBG2(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps); + PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps); - if((ri >= 0 && ri < 6) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_CORE)) - return EINVAL; - if((ri >= 6 && ri < 12) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_L3_CACHE)) - return EINVAL; - if((ri >= 12 && ri < 16) && !(a->pm_md.pm_amd.pm_amd_sub_class == PMC_AMD_SUB_CLASS_DATA_FABRIC)) - return EINVAL; + /* Validate sub-class. */ + if ((ri >= 0 && ri < 6) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_CORE) + return (EINVAL); + if ((ri >= 6 && ri < 12) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_L3_CACHE) + return (EINVAL); + if ((ri >= 12 && ri < 16) && a->pm_md.pm_amd.pm_amd_sub_class != + PMC_AMD_SUB_CLASS_DATA_FABRIC) + return (EINVAL); if (strlen(pmc_cpuid) != 0) { - pm->pm_md.pm_amd.pm_amd_evsel = - a->pm_md.pm_amd.pm_amd_config; - PMCDBG2(MDP,ALL,2,"amd-allocate ri=%d -> config=0x%x", ri, a->pm_md.pm_amd.pm_amd_config); + pm->pm_md.pm_amd.pm_amd_evsel = a->pm_md.pm_amd.pm_amd_config; + PMCDBG2(MDP, ALL, 2,"amd-allocate ri=%d -> config=0x%x", ri, + a->pm_md.pm_amd.pm_amd_config); return (0); } @@ -607,7 +593,7 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, /* map ev to the correct event mask code */ config = allowed_unitmask = 0; - for (i = 0; i < amd_event_codes_size; i++) + for (i = 0; i < amd_event_codes_size; i++) { if (amd_event_codes[i].pe_ev == pe) { config = AMD_PMC_TO_EVENTMASK(amd_event_codes[i].pe_code); @@ -615,58 +601,52 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, AMD_PMC_TO_UNITMASK(amd_event_codes[i].pe_mask); break; } + } if (i == amd_event_codes_size) - return EINVAL; + return (EINVAL); unitmask = a->pm_md.pm_amd.pm_amd_config & AMD_PMC_UNITMASK; - if (unitmask & ~allowed_unitmask) /* disallow reserved bits */ - return EINVAL; + if ((unitmask & ~allowed_unitmask) != 0) /* disallow reserved bits */ + return (EINVAL); - if (unitmask && (caps & PMC_CAP_QUALIFIER)) + if (unitmask && (caps & PMC_CAP_QUALIFIER) != 0) config |= unitmask; - if (caps & PMC_CAP_THRESHOLD) + if ((caps & PMC_CAP_THRESHOLD) != 0) config |= a->pm_md.pm_amd.pm_amd_config & AMD_PMC_COUNTERMASK; - /* set at least one of the 'usr' or 'os' caps */ - if (caps & PMC_CAP_USER) + /* Set at least one of the 'usr' or 'os' caps. */ + if ((caps & PMC_CAP_USER) != 0) config |= AMD_PMC_USR; - if (caps & PMC_CAP_SYSTEM) + if ((caps & PMC_CAP_SYSTEM) != 0) config |= AMD_PMC_OS; - if ((caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0) + if ((caps & (PMC_CAP_USER | PMC_CAP_SYSTEM)) == 0) config |= (AMD_PMC_USR|AMD_PMC_OS); - if (caps & PMC_CAP_EDGE) + if ((caps & PMC_CAP_EDGE) != 0) config |= AMD_PMC_EDGE; - if (caps & PMC_CAP_INVERT) + if ((caps & PMC_CAP_INVERT) != 0) config |= AMD_PMC_INVERT; - if (caps & PMC_CAP_INTERRUPT) + if ((caps & PMC_CAP_INTERRUPT) != 0) config |= AMD_PMC_INT; pm->pm_md.pm_amd.pm_amd_evsel = config; /* save config value */ - PMCDBG2(MDP,ALL,2,"amd-allocate ri=%d -> config=0x%x", ri, config); + PMCDBG2(MDP, ALL, 2, "amd-allocate ri=%d -> config=0x%x", ri, config); - return 0; + return (0); } /* * Release machine dependent state associated with a PMC. This is a * no-op on this architecture. - * */ - -/* ARGSUSED0 */ static int -amd_release_pmc(int cpu, int ri, struct pmc *pmc) +amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) { -#ifdef HWPMC_DEBUG - const struct amd_descr *pd; -#endif + const struct amd_descr *pd __pmcdbg_used; struct pmc_hw *phw __diagused; - (void) pmc; - KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < AMD_NPMCS, @@ -677,25 +657,23 @@ amd_release_pmc(int cpu, int ri, struct pmc *pmc) KASSERT(phw->phw_pmc == NULL, ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); -#ifdef HWPMC_DEBUG +#ifdef HWPMC_DEBUG pd = &amd_pmcdesc[ri]; if (pd->pm_descr.pd_class == amd_pmc_class) KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), ("[amd,%d] PMC %d released while active", __LINE__, ri)); #endif - - return 0; + return (0); } /* - * start a PMC. + * Start a PMC. */ - static int -amd_start_pmc(int cpu, int ri, struct pmc *pm) +amd_start_pmc(int cpu __diagused, int ri, struct pmc *pm) { - uint64_t config; const struct amd_descr *pd; + uint64_t config; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] illegal CPU value %d", __LINE__, cpu)); @@ -704,7 +682,7 @@ amd_start_pmc(int cpu, int ri, struct pmc *pm) pd = &amd_pmcdesc[ri]; - PMCDBG2(MDP,STA,1,"amd-start cpu=%d ri=%d", cpu, ri); + PMCDBG2(MDP, STA, 1, "amd-start cpu=%d ri=%d", cpu, ri); KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), ("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__, @@ -713,18 +691,17 @@ amd_start_pmc(int cpu, int ri, struct pmc *pm) /* turn on the PMC ENABLE bit */ config = pm->pm_md.pm_amd.pm_amd_evsel | AMD_PMC_ENABLE; - PMCDBG1(MDP,STA,2,"amd-start config=0x%x", config); + PMCDBG1(MDP, STA, 2, "amd-start config=0x%x", config); wrmsr(pd->pm_evsel, config); - return 0; + return (0); } /* * Stop a PMC. */ - static int -amd_stop_pmc(int cpu, int ri, struct pmc *pm) +amd_stop_pmc(int cpu __diagused, int ri, struct pmc *pm) { const struct amd_descr *pd; uint64_t config; @@ -741,7 +718,7 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) ("[amd,%d] PMC%d, CPU%d \"%s\" already stopped", __LINE__, ri, cpu, pd->pm_descr.pd_name)); - PMCDBG1(MDP,STO,1,"amd-stop ri=%d", ri); + PMCDBG1(MDP, STO, 1, "amd-stop ri=%d", ri); /* turn off the PMC ENABLE bit */ config = pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE; @@ -761,7 +738,7 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) DELAY(1); } - return 0; + return (0); } /* @@ -770,23 +747,21 @@ amd_stop_pmc(int cpu, int ri, struct pmc *pm) * to sleep or do anything a 'fast' interrupt handler is not allowed * to do. */ - static int amd_intr(struct trapframe *tf) { - int i, error, retval, cpu; - uint64_t config, evsel, perfctr; - struct pmc *pm; struct amd_cpu *pac; + struct pmc *pm; pmc_value_t v; + uint64_t config, evsel, perfctr; uint32_t active = 0, count = 0; + int i, error, retval, cpu; cpu = curcpu; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] out of range CPU %d", __LINE__, cpu)); - PMCDBG3(MDP,INT,1, "cpu=%d tf=%p um=%d", cpu, (void *) tf, - TRAPF_USERMODE(tf)); + PMCDBG3(MDP, INT, 1, "cpu=%d tf=%p um=%d", cpu, tf, TRAPF_USERMODE(tf)); retval = 0; @@ -803,9 +778,7 @@ amd_intr(struct trapframe *tf) * a single interrupt. Check all the valid pmcs for * overflow. */ - for (i = 0; i < AMD_CORE_NPMCS; i++) { - if ((pm = pac->pc_amdpmcs[i].phw_pmc) == NULL || !PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) { continue; @@ -823,8 +796,8 @@ amd_intr(struct trapframe *tf) continue; /* Stop the PMC, reload count. */ - evsel = amd_pmcdesc[i].pm_evsel; - perfctr = amd_pmcdesc[i].pm_perfctr; + evsel = amd_pmcdesc[i].pm_evsel; + perfctr = amd_pmcdesc[i].pm_perfctr; v = pm->pm_sc.pm_reloadcount; config = rdmsr(evsel); @@ -852,7 +825,6 @@ amd_intr(struct trapframe *tf) * if this NMI was for a pmc overflow which was serviced * in an earlier request or should be ignored. */ - if (retval) { DPCPU_SET(nmi_counter, min(2, active)); } else { @@ -867,12 +839,12 @@ amd_intr(struct trapframe *tf) else counter_u64_add(pmc_stats.pm_intr_ignored, 1); - PMCDBG1(MDP,INT,2, "retval=%d", retval); + PMCDBG1(MDP, INT, 2, "retval=%d", retval); return (retval); } /* - * describe a PMC + * Describe a PMC. */ static int amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) @@ -891,25 +863,20 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc) strlcpy(pi->pm_name, pd->pm_descr.pd_name, sizeof(pi->pm_name)); pi->pm_class = pd->pm_descr.pd_class; - if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) { - pi->pm_enabled = TRUE; + if ((phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) != 0) { + pi->pm_enabled = true; *ppmc = phw->phw_pmc; } else { - pi->pm_enabled = FALSE; + pi->pm_enabled = false; *ppmc = NULL; } - return 0; + return (0); } /* - * i386 specific entry points + * Return the MSR address of the given PMC. */ - -/* - * return the MSR address of the given PMC. - */ - static int amd_get_msr(int ri, uint32_t *msr) { @@ -917,29 +884,27 @@ amd_get_msr(int ri, uint32_t *msr) ("[amd,%d] ri %d out of range", __LINE__, ri)); *msr = amd_pmcdesc[ri].pm_perfctr - AMD_PMC_PERFCTR_0; - return (0); } /* - * processor dependent initialization. + * Processor-dependent initialization. */ - static int amd_pcpu_init(struct pmc_mdep *md, int cpu) { - int classindex, first_ri, n; - struct pmc_cpu *pc; struct amd_cpu *pac; + struct pmc_cpu *pc; struct pmc_hw *phw; + int classindex, first_ri, n; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number %d", __LINE__, cpu)); - PMCDBG1(MDP,INI,1,"amd-init cpu=%d", cpu); + PMCDBG1(MDP, INI, 1, "amd-init cpu=%d", cpu); amd_pcpu[cpu] = pac = malloc(sizeof(struct amd_cpu), M_PMC, - M_WAITOK|M_ZERO); + M_WAITOK | M_ZERO); /* * Set the content of the hardware descriptors to a known @@ -957,33 +922,30 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu pointer", __LINE__)); for (n = 0, phw = pac->pc_amdpmcs; n < AMD_NPMCS; n++, phw++) { - phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | + phw->phw_state = PMC_PHW_FLAG_IS_ENABLED | PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n); - phw->phw_pmc = NULL; - pc->pc_hwpmcs[n + first_ri] = phw; + phw->phw_pmc = NULL; + pc->pc_hwpmcs[n + first_ri] = phw; } return (0); } - /* - * processor dependent cleanup prior to the KLD - * being unloaded + * Processor-dependent cleanup prior to the KLD being unloaded. */ - static int amd_pcpu_fini(struct pmc_mdep *md, int cpu) { - int classindex, first_ri, i; - uint32_t evsel; - struct pmc_cpu *pc; struct amd_cpu *pac; + struct pmc_cpu *pc; + uint32_t evsel; + int classindex, first_ri, i; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number (%d)", __LINE__, cpu)); - PMCDBG1(MDP,INI,1,"amd-cleanup cpu=%d", cpu); + PMCDBG1(MDP, INI, 1, "amd-cleanup cpu=%d", cpu); /* * First, turn off all PMCs on this CPU. @@ -1014,9 +976,9 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) pc = pmc_pcpu[cpu]; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu state", __LINE__)); -#if defined(__amd64__) +#ifdef __amd64__ classindex = PMC_MDEP_CLASS_INDEX_K8; -#elif defined(__i386__) +#else classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? PMC_MDEP_CLASS_INDEX_K8 : PMC_MDEP_CLASS_INDEX_K7; #endif @@ -1025,30 +987,26 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) /* * Reset pointers in the MI 'per-cpu' state. */ - for (i = 0; i < AMD_NPMCS; i++) { + for (i = 0; i < AMD_NPMCS; i++) pc->pc_hwpmcs[i + first_ri] = NULL; - } - free(pac, M_PMC); - return (0); } /* * Initialize ourselves. */ - struct pmc_mdep * pmc_amd_initialize(void) { - int classindex, error, i, ncpus; struct pmc_classdep *pcd; - enum pmc_cputype cputype; struct pmc_mdep *pmc_mdep; + char *name; + enum pmc_cputype cputype; enum pmc_class class; + int classindex, error, i, ncpus; int family, model, stepping; - char *name; /* * The presence of hardware performance counters on the AMD @@ -1071,7 +1029,7 @@ pmc_amd_initialize(void) family, model, stepping); switch (cpu_id & 0xF00) { -#if defined(__i386__) +#ifdef __i386__ case 0x600: /* Athlon(tm) processor */ classindex = PMC_MDEP_CLASS_INDEX_K7; cputype = PMC_CPU_AMD_K7; @@ -1087,11 +1045,12 @@ pmc_amd_initialize(void) break; default: - (void) printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, (cpu_id & 0xF00) >> 8, model); - return NULL; + printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, family, + model); + return (NULL); } -#ifdef HWPMC_DEBUG +#ifdef HWPMC_DEBUG amd_pmc_class = class; #endif @@ -1100,7 +1059,7 @@ pmc_amd_initialize(void) * the MDEP structure used by MI code. */ amd_pcpu = malloc(sizeof(struct amd_cpu *) * pmc_cpu_max(), M_PMC, - M_WAITOK|M_ZERO); + M_WAITOK | M_ZERO); /* * These processors have two classes of PMCs: the TSC and @@ -1108,13 +1067,11 @@ pmc_amd_initialize(void) */ pmc_mdep = pmc_mdep_alloc(2); - pmc_mdep->pmd_cputype = cputype; - ncpus = pmc_cpu_max(); /* Initialize the TSC. */ error = pmc_tsc_initialize(pmc_mdep, ncpus); - if (error) + if (error != 0) goto error; /* Initialize AMD K7 and K8 PMC handling. */ @@ -1128,8 +1085,7 @@ pmc_amd_initialize(void) /* fill in the correct pmc name and class */ for (i = 0; i < AMD_NPMCS; i++) { - (void) snprintf(amd_pmcdesc[i].pm_descr.pd_name, - sizeof(amd_pmcdesc[i].pm_descr.pd_name), "%s-%d", + snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "%s-%d", name, i); amd_pmcdesc[i].pm_descr.pd_class = class; } @@ -1147,29 +1103,25 @@ pmc_amd_initialize(void) pcd->pcd_stop_pmc = amd_stop_pmc; pcd->pcd_write_pmc = amd_write_pmc; + pmc_mdep->pmd_cputype = cputype; pmc_mdep->pmd_intr = amd_intr; - pmc_mdep->pmd_switch_in = amd_switch_in; + pmc_mdep->pmd_switch_in = amd_switch_in; pmc_mdep->pmd_switch_out = amd_switch_out; - pmc_mdep->pmd_npmc += AMD_NPMCS; + pmc_mdep->pmd_npmc += AMD_NPMCS; - PMCDBG0(MDP,INI,0,"amd-initialize"); + PMCDBG0(MDP, INI, 0, "amd-initialize"); return (pmc_mdep); - error: - if (error) { - free(pmc_mdep, M_PMC); - pmc_mdep = NULL; - } - +error: + free(pmc_mdep, M_PMC); return (NULL); } /* * Finalization code for AMD CPUs. */ - void pmc_amd_finalize(struct pmc_mdep *md) { From nobody Wed Oct 18 18:06:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0p0QtFz4xKl8; Wed, 18 Oct 2023 18:06: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 4S9f0n6cYGz4f5N; Wed, 18 Oct 2023 18:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zEOkm1ydqhIVO1Nw7c6A43JUHCGvrTmxwASfkF+KtI=; b=DRgwSXYea36w2KNnSuM6jHg7168QK8rINm5hJm34YnSAbbbDJf2DG79znSHx2Lh3CwAiah soUOryfaMimil3gEVdU4jQTDMNi6n3jce0A5Tt/ZkvzpmjAelxi0Lmrp770KMQp+0MeuFk vROfdtuISo84FGHNFQ2wsv3Pvvdyi73rK8vmXw8WDn2isUkGBKgqYFasB7YEg0KZLXi/hZ TIyGKZ7A/edK2OwZpnYZCux7zw9u19FKZl64a2BUo5hJDCylmqoUYyVtNSdh00LauvuRzZ kcHh3aPO4mC73r2je+PT9HiAjJSZnrpdio2jAFul7hE8JpjOKTJyiWJzIQIzCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652361; a=rsa-sha256; cv=none; b=kZ6dCuR4PCBfXX1+TgubuFkUUJanVgAOr7K72tit9dvjXvo8QGtvL58rRv7MqJCy1/Rmrj CWOCMchh0Ch8pEd0aCQPZR67dyiM8Ler+R4WpJr+Do8Bnp4GeWx3UxYJAq4pgCbi8wxdOm C6kIh0wdrxGdJJ9h2TILXQ51vwEL82VLjDKMUcR5T3pca7vIpW8rp3sAtS4ePUfpqtDVym IGacxJks8ObkXAeHkFh4Ho3BfZh7LvfLESb0xYtSPH+1yxYhdjfLEYLAlror8BYnGCamJv AkJYKlhq2fKvJupwqXmCHkFD71f/E0nvT7s+FlR3gbJ1K4ZKX+W7ZskY6zDuVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2zEOkm1ydqhIVO1Nw7c6A43JUHCGvrTmxwASfkF+KtI=; b=UTcS+SmVfD3JqjKElYZSS/4TgJJJ831vWmTTXOvnkEmihP1FInRAQSlqXh32MRSDOKoqTs V4ePv1MaLzeZLPtZqELIBixoAV4vDAiDIF6UKfp2Xjd+/wVg5bCWVZTQc2Ukz0AhJK4KNS iUAQLDHFkOBX/3qBO62+BTpVnHKEKum8wfnDufhaagWKQPMGi9/AujWV4gqA26ArBdbo24 +rxqE86Xz4MgpFrJuGztp/7XcOostO2B+aQIF0SPhwu4tsswxmlJ2aSo5KyFUp3G9juNdZ uQ5xOiVSqR2gHpdHBknDS9Zf1d93DoLLvM9oDUfQmWeJX4FTj/7IdPdLVGC+2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0n5gT9z27X; Wed, 18 Oct 2023 18:06: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 39II61kY045913; Wed, 18 Oct 2023 18:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II61fi045910; Wed, 18 Oct 2023 18:06:01 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:01 GMT Message-Id: <202310181806.39II61fi045910@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: 75780146d627 - main - hwpmc_amd: simplify counter descriptor definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75780146d627ff4be978191a142da4d67be5aaa6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=75780146d627ff4be978191a142da4d67be5aaa6 commit 75780146d627ff4be978191a142da4d67be5aaa6 Author: Mitchell Horne AuthorDate: 2023-10-18 17:54:04 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:44 +0000 hwpmc_amd: simplify counter descriptor definitions No functional change intended. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41273 --- sys/dev/hwpmc/hwpmc_amd.c | 207 +++++++--------------------------------------- 1 file changed, 30 insertions(+), 177 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index d8ca2e094d02..367f9d0ceebf 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -63,184 +63,37 @@ struct amd_descr { uint32_t pm_perfctr; /* address of PERFCTR register */ }; -static struct amd_descr amd_pmcdesc[AMD_NPMCS] = +/* Counter hardware. */ +#define PMCDESC(evsel, perfctr) \ + { \ + .pm_descr = { \ + .pd_name = "", \ + .pd_class = -1, \ + .pd_caps = AMD_PMC_CAPS, \ + .pd_width = 48 \ + }, \ + .pm_evsel = (evsel), \ + .pm_perfctr = (perfctr) \ + } + +static struct amd_descr amd_pmcdesc[AMD_NPMCS] = { - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_0, - .pm_perfctr = AMD_PMC_PERFCTR_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_1, - .pm_perfctr = AMD_PMC_PERFCTR_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_2, - .pm_perfctr = AMD_PMC_PERFCTR_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_3, - .pm_perfctr = AMD_PMC_PERFCTR_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_4, - .pm_perfctr = AMD_PMC_PERFCTR_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_5, - .pm_perfctr = AMD_PMC_PERFCTR_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_3 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_4, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_4 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_L3_5, - .pm_perfctr = AMD_PMC_PERFCTR_EP_L3_5 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_0, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_0 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_1, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_1 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_2, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_2 - }, - { - .pm_descr = - { - .pd_name = "", - .pd_class = -1, - .pd_caps = AMD_PMC_CAPS, - .pd_width = 48 - }, - .pm_evsel = AMD_PMC_EVSEL_EP_DF_3, - .pm_perfctr = AMD_PMC_PERFCTR_EP_DF_3 - } + PMCDESC(AMD_PMC_EVSEL_0, AMD_PMC_PERFCTR_0), + PMCDESC(AMD_PMC_EVSEL_1, AMD_PMC_PERFCTR_1), + PMCDESC(AMD_PMC_EVSEL_2, AMD_PMC_PERFCTR_2), + PMCDESC(AMD_PMC_EVSEL_3, AMD_PMC_PERFCTR_3), + PMCDESC(AMD_PMC_EVSEL_4, AMD_PMC_PERFCTR_4), + PMCDESC(AMD_PMC_EVSEL_5, AMD_PMC_PERFCTR_5), + PMCDESC(AMD_PMC_EVSEL_EP_L3_0, AMD_PMC_PERFCTR_EP_L3_0), + PMCDESC(AMD_PMC_EVSEL_EP_L3_1, AMD_PMC_PERFCTR_EP_L3_1), + PMCDESC(AMD_PMC_EVSEL_EP_L3_2, AMD_PMC_PERFCTR_EP_L3_2), + PMCDESC(AMD_PMC_EVSEL_EP_L3_3, AMD_PMC_PERFCTR_EP_L3_3), + PMCDESC(AMD_PMC_EVSEL_EP_L3_4, AMD_PMC_PERFCTR_EP_L3_4), + PMCDESC(AMD_PMC_EVSEL_EP_L3_5, AMD_PMC_PERFCTR_EP_L3_5), + PMCDESC(AMD_PMC_EVSEL_EP_DF_0, AMD_PMC_PERFCTR_EP_DF_0), + PMCDESC(AMD_PMC_EVSEL_EP_DF_1, AMD_PMC_PERFCTR_EP_DF_1), + PMCDESC(AMD_PMC_EVSEL_EP_DF_2, AMD_PMC_PERFCTR_EP_DF_2), + PMCDESC(AMD_PMC_EVSEL_EP_DF_3, AMD_PMC_PERFCTR_EP_DF_3) }; struct amd_event_code_map { From nobody Wed Oct 18 18:06:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0q4LKwz4xL2N; Wed, 18 Oct 2023 18:06: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 4S9f0q1pBdz4dyF; Wed, 18 Oct 2023 18:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjBRFAaI3MGJeLGh956aDhJHOQ3uFW2TB1Mr40lAjVA=; b=X8LcSJjvJg6t1LsKzOsflvPIqUTUyavLdtWPgogASGMQ/NHREN3wTz1e+W6vnya+OqXiR4 cLuegyeHqhClEgxmb5F++zPKXJ7T1z1NyvbbLR4QnWaYkKMTb8RBmWZguFFB8B5kNjuYMb vmEZ9un7MlmjhEDayTNbFrZgHjsxjYvbO9MQmvd6gAenzvsHUg/O52akCzqF17upJIMAj9 Th0YKQm5lmc0uxQ8ZQEZY8cbMIyBBxEM2lIaR2fguHcRcuw+AeKMS9knnPaGatC4JA/NKV oDy9FhkHzxrjFbf4ocJH3CqalT9JUpMpD53P7NXecoxPIW2autB5Rzw4Vaq2kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652363; a=rsa-sha256; cv=none; b=ON0vpc2TbMo0gXUqv52BqxVChcl+Bf44q+lrIkd01W6SxEOH/PpbxoNCPrNazn6oolm9qj RmD1vBJU4l9MAjmZCr/OEM5rdKjN0wa0XWhOsf0A/D9oObUmwicqIYhK4uxX8qXdGATpWZ s0kfTYzs+KOznlmva4VBkvS/o2VLTaj3WXyAhGSMsMRu6Z38y5sAJk3GGtYIYK1xXg5LsU /iq7grrUb3esrA1DjRSjFrR8rG5APkMg9AcOl8A1R51s7waWnN0teNE9NTVHpxM23O0n2W c42OQPOXuR31kG1rN/PbOBiR0mB1Ger6V0dWaFyyHkMIU6tjZmcPE9op3ARiAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pjBRFAaI3MGJeLGh956aDhJHOQ3uFW2TB1Mr40lAjVA=; b=QBlp2OYQugm9wQ9SkFZQxajWnJbn+rsgKrc79nOZhL2cshzrFa2Rldi2QVK1vdxNfb0mJL zVo4R7V+94HZOSKX7VyMgMATfu6gxdO32vy2swF9Qmjaf1KYrWlsrv08CWdETs0lTfs2vz Rk0EriLfjGkB0sOaW2s27jHEp623+YEt/4QjV4yFVB3K+MkwBOtia/6kbJU3YcAyolzR4N c0t6nqy1hHBf3K1vknuA9MKi5K6KRKKx2S+bfUXaf0FFFIBP8LRsXANYq4/8k9i0vQv1Gi fvOTIw/k48cdtZaXyWTZafTsISwE3rW+8FqHR2iCzpTM7BdKHrxhgB5QzBN03w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0p6rQHz1td; Wed, 18 Oct 2023 18:06: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 39II62nZ045963; Wed, 18 Oct 2023 18:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II623k045960; Wed, 18 Oct 2023 18:06:02 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:02 GMT Message-Id: <202310181806.39II623k045960@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: 2c6f474ee824 - main - hwpmc_amd: kill off k7 support bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c6f474ee824bf0742958984e095f5633860a909 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2c6f474ee824bf0742958984e095f5633860a909 commit 2c6f474ee824bf0742958984e095f5633860a909 Author: Mitchell Horne AuthorDate: 2023-10-18 17:54:24 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 hwpmc_amd: kill off k7 support bits This is i386-only, and has been effectively disabled since 2018 when the companion support was removed from libpmc (e92a1350b50e). Remove the kernel support to simplify the AMD class. Reviewed by: jkoshy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41274 --- sys/dev/hwpmc/hwpmc_amd.c | 110 ++++++---------------------------------------- sys/dev/hwpmc/hwpmc_amd.h | 2 +- 2 files changed, 14 insertions(+), 98 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 367f9d0ceebf..01a6cf202b4d 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -30,8 +30,7 @@ * SUCH DAMAGE. */ -#include -/* Support for the AMD K7 and later processors */ +/* Support for the AMD K8 and later processors */ #include #include @@ -48,15 +47,11 @@ #include #include -#ifdef HWPMC_DEBUG -enum pmc_class amd_pmc_class; -#endif - #define OVERFLOW_WAIT_COUNT 50 DPCPU_DEFINE_STATIC(uint32_t, nmi_counter); -/* AMD K7 & K8 PMCs */ +/* AMD K8 PMCs */ struct amd_descr { struct pmc_descr pm_descr; /* "base class" */ uint32_t pm_evsel; /* address of EVSEL register */ @@ -68,7 +63,7 @@ struct amd_descr { { \ .pm_descr = { \ .pd_name = "", \ - .pd_class = -1, \ + .pd_class = PMC_CLASS_K8, \ .pd_caps = AMD_PMC_CAPS, \ .pd_width = 48 \ }, \ @@ -103,35 +98,6 @@ struct amd_event_code_map { }; const struct amd_event_code_map amd_event_codes[] = { -#if defined(__i386__) /* 32 bit Athlon (K7) only */ - { PMC_EV_K7_DC_ACCESSES, 0x40, 0 }, - { PMC_EV_K7_DC_MISSES, 0x41, 0 }, - { PMC_EV_K7_DC_REFILLS_FROM_L2, 0x42, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_DC_REFILLS_FROM_SYSTEM, 0x43, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_DC_WRITEBACKS, 0x44, AMD_PMC_UNITMASK_MOESI }, - { PMC_EV_K7_L1_DTLB_MISS_AND_L2_DTLB_HITS, 0x45, 0 }, - { PMC_EV_K7_L1_AND_L2_DTLB_MISSES, 0x46, 0 }, - { PMC_EV_K7_MISALIGNED_REFERENCES, 0x47, 0 }, - - { PMC_EV_K7_IC_FETCHES, 0x80, 0 }, - { PMC_EV_K7_IC_MISSES, 0x81, 0 }, - - { PMC_EV_K7_L1_ITLB_MISSES, 0x84, 0 }, - { PMC_EV_K7_L1_L2_ITLB_MISSES, 0x85, 0 }, - - { PMC_EV_K7_RETIRED_INSTRUCTIONS, 0xC0, 0 }, - { PMC_EV_K7_RETIRED_OPS, 0xC1, 0 }, - { PMC_EV_K7_RETIRED_BRANCHES, 0xC2, 0 }, - { PMC_EV_K7_RETIRED_BRANCHES_MISPREDICTED, 0xC3, 0 }, - { PMC_EV_K7_RETIRED_TAKEN_BRANCHES, 0xC4, 0 }, - { PMC_EV_K7_RETIRED_TAKEN_BRANCHES_MISPREDICTED, 0xC5, 0 }, - { PMC_EV_K7_RETIRED_FAR_CONTROL_TRANSFERS, 0xC6, 0 }, - { PMC_EV_K7_RETIRED_RESYNC_BRANCHES, 0xC7, 0 }, - { PMC_EV_K7_INTERRUPTS_MASKED_CYCLES, 0xCD, 0 }, - { PMC_EV_K7_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES, 0xCE, 0 }, - { PMC_EV_K7_HARDWARE_INTERRUPTS, 0xCF, 0 }, -#endif - { PMC_EV_K8_FP_DISPATCHED_FPU_OPS, 0x00, 0x3F }, { PMC_EV_K8_FP_CYCLES_WITH_NO_FPU_OPS_RETIRED, 0x01, 0x00 }, { PMC_EV_K8_FP_DISPATCHED_FPU_FAST_FLAG_OPS, 0x02, 0x00 }, @@ -264,12 +230,6 @@ amd_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) PMCDBG2(MDP, REA, 1, "amd-read id=%d class=%d", ri, pd->pm_descr.pd_class); -#ifdef HWPMC_DEBUG - KASSERT(pd->pm_descr.pd_class == amd_pmc_class, - ("[amd,%d] unknown PMC class (%d)", __LINE__, - pd->pm_descr.pd_class)); -#endif - tmp = rdmsr(pd->pm_perfctr); /* RDMSR serializes */ PMCDBG2(MDP, REA, 2, "amd-read (pre-munge) id=%d -> %jd", ri, tmp); if (PMC_IS_SAMPLING_MODE(mode)) { @@ -310,12 +270,6 @@ amd_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) pd = &amd_pmcdesc[ri]; mode = PMC_TO_MODE(pm); -#ifdef HWPMC_DEBUG - KASSERT(pd->pm_descr.pd_class == amd_pmc_class, - ("[amd,%d] unknown PMC class (%d)", __LINE__, - pd->pm_descr.pd_class)); -#endif - /* use 2's complement of the count for sampling mode PMCs */ if (PMC_IS_SAMPLING_MODE(mode)) v = AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(v); @@ -510,12 +464,6 @@ amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) KASSERT(phw->phw_pmc == NULL, ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc)); -#ifdef HWPMC_DEBUG - pd = &amd_pmcdesc[ri]; - if (pd->pm_descr.pd_class == amd_pmc_class) - KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel), - ("[amd,%d] PMC %d released while active", __LINE__, ri)); -#endif return (0); } @@ -749,7 +697,7 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) struct amd_cpu *pac; struct pmc_cpu *pc; struct pmc_hw *phw; - int classindex, first_ri, n; + int first_ri, n; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number %d", __LINE__, cpu)); @@ -764,13 +712,7 @@ amd_pcpu_init(struct pmc_mdep *md, int cpu) * state and initialize pointers in the MI per-cpu descriptor. */ pc = pmc_pcpu[cpu]; -#if defined(__amd64__) - classindex = PMC_MDEP_CLASS_INDEX_K8; -#elif defined(__i386__) - classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? - PMC_MDEP_CLASS_INDEX_K8 : PMC_MDEP_CLASS_INDEX_K7; -#endif - first_ri = md->pmd_classdep[classindex].pcd_ri; + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8].pcd_ri; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu pointer", __LINE__)); @@ -793,7 +735,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) struct amd_cpu *pac; struct pmc_cpu *pc; uint32_t evsel; - int classindex, first_ri, i; + int first_ri, i; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[amd,%d] insane cpu number (%d)", __LINE__, cpu)); @@ -829,13 +771,7 @@ amd_pcpu_fini(struct pmc_mdep *md, int cpu) pc = pmc_pcpu[cpu]; KASSERT(pc != NULL, ("[amd,%d] NULL per-cpu state", __LINE__)); -#ifdef __amd64__ - classindex = PMC_MDEP_CLASS_INDEX_K8; -#else - classindex = md->pmd_cputype == PMC_CPU_AMD_K8 ? PMC_MDEP_CLASS_INDEX_K8 : - PMC_MDEP_CLASS_INDEX_K7; -#endif - first_ri = md->pmd_classdep[classindex].pcd_ri; + first_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8].pcd_ri; /* * Reset pointers in the MI 'per-cpu' state. @@ -855,10 +791,8 @@ pmc_amd_initialize(void) { struct pmc_classdep *pcd; struct pmc_mdep *pmc_mdep; - char *name; enum pmc_cputype cputype; - enum pmc_class class; - int classindex, error, i, ncpus; + int error, i, ncpus; int family, model, stepping; /* @@ -869,7 +803,6 @@ pmc_amd_initialize(void) * field returned by CPUID for instruction family >= 6. */ - name = NULL; family = CPUID_TO_FAMILY(cpu_id); model = CPUID_TO_MODEL(cpu_id); stepping = CPUID_TO_STEPPING(cpu_id); @@ -882,31 +815,15 @@ pmc_amd_initialize(void) family, model, stepping); switch (cpu_id & 0xF00) { -#ifdef __i386__ - case 0x600: /* Athlon(tm) processor */ - classindex = PMC_MDEP_CLASS_INDEX_K7; - cputype = PMC_CPU_AMD_K7; - class = PMC_CLASS_K7; - name = "K7"; - break; -#endif case 0xF00: /* Athlon64/Opteron processor */ - classindex = PMC_MDEP_CLASS_INDEX_K8; cputype = PMC_CPU_AMD_K8; - class = PMC_CLASS_K8; - name = "K8"; break; - default: printf("pmc: Unknown AMD CPU %x %d-%d.\n", cpu_id, family, model); return (NULL); } -#ifdef HWPMC_DEBUG - amd_pmc_class = class; -#endif - /* * Allocate space for pointers to PMC HW descriptors and for * the MDEP structure used by MI code. @@ -927,20 +844,19 @@ pmc_amd_initialize(void) if (error != 0) goto error; - /* Initialize AMD K7 and K8 PMC handling. */ - pcd = &pmc_mdep->pmd_classdep[classindex]; + /* Initialize AMD K8 PMC handling. */ + pcd = &pmc_mdep->pmd_classdep[PMC_MDEP_CLASS_INDEX_K8]; pcd->pcd_caps = AMD_PMC_CAPS; - pcd->pcd_class = class; + pcd->pcd_class = PMC_CLASS_K8; pcd->pcd_num = AMD_NPMCS; pcd->pcd_ri = pmc_mdep->pmd_npmc; pcd->pcd_width = 48; /* fill in the correct pmc name and class */ for (i = 0; i < AMD_NPMCS; i++) { - snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "%s-%d", - name, i); - amd_pmcdesc[i].pm_descr.pd_class = class; + snprintf(amd_pmcdesc[i].pm_descr.pd_name, PMC_NAME_MAX, "K8-%d", + i); } pcd->pcd_allocate_pmc = amd_allocate_pmc; diff --git a/sys/dev/hwpmc/hwpmc_amd.h b/sys/dev/hwpmc/hwpmc_amd.h index eeea7536a2c5..d72fbc4878b6 100644 --- a/sys/dev/hwpmc/hwpmc_amd.h +++ b/sys/dev/hwpmc/hwpmc_amd.h @@ -31,7 +31,7 @@ #ifndef _DEV_HWPMC_AMD_H_ #define _DEV_HWPMC_AMD_H_ 1 -/* AMD K7 and K8 PMCs */ +/* AMD K8 PMCs */ #define AMD_PMC_EVSEL_0 0xC0010000 #define AMD_PMC_EVSEL_1 0xC0010001 From nobody Wed Oct 18 18:06:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0r29pZz4xL2P; Wed, 18 Oct 2023 18:06: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 4S9f0r1pDQz4f8d; Wed, 18 Oct 2023 18:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcbZaFBWsNt/wO0bB82CUt3MO9S73qfk+PeL5Goso68=; b=INz3sPje8ICa5MAe5WDnJ63J6BaExgo+0NTjjFNlxPXY8bLcRyvNLG3g2xpOXQvvNUuO4r 6b9OjsOrX9/DEd4oTi+BbFgUgXuIK/3MNTuryNcnvUaqTK9/ZQtofFnNA35BDbZyoj1knZ //kKlvFi/5cT9BbxgulSPnrLNiSzmLNAfEZ0C4W3d9y9QJm6EWRMa4xybtc2f5PK14BLVW WPm6NMh/rOSsWkbqJMSwg9X8q7q05FNzlvuBRwTpzAYeEIEQyPCfN5oghSoRJunKVRPBuF 6+KkqbIXl7yWYyUEJcQ6CB+KiDna6cZisbL7sph0hMuViZiab+0l0qGn0yAEBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652364; a=rsa-sha256; cv=none; b=yXXW6Y3DKOeGmOU2we7b36pCFmobY8xnRJTeaMGJzw9ZSsBUI36qtSLwQpVW3JVeoWI789 hQcWer4+PUKOUKeaHsO1YihmfIZtSez20wfPLO3e4HI2KulUXcVu2E3CoHKTZBzRHmZ3bZ ZqZN7ivqd2OaCTZGzo1AWtrajD24Hvfct1/iSoBU2MVOyrBMRoo5GKuNi4m6NpTmOx4HM/ ftNHIq0JaO7yTXx+1wJsfHS+tTWXqeocPIpf+BilS53K4E2RwWmYH22zpesxNm051I+Wwz LDvNGkwRJbW+uSy7B2w6pFKwzFFyS+Monp3mUXcXiCuGyBOO2kIlkftXIe7u9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EcbZaFBWsNt/wO0bB82CUt3MO9S73qfk+PeL5Goso68=; b=JoxrbL94AVcEH5vDUYtnx5MYKkCxYJn3HdUyTtkzlB7kbG30+Ov25L68Y2j0cb/nZKOMip sUmmv9khGkfK6n8kQSRQDFbA6xWP/1VX8xx9ubSTXFOwMXMoOJjR801PTfINBhgsslCeGY dhn6zAzG7+oaM+3KRgswUMJsZBorHzgxOcv6g22wc4D31eHQ0F6P6oA8nS1NNal2OHmF4X 9IaxVCcyxiIUUugG+Dsv+gLc5XHi3nOPye/axbQiXgH5TQs8LJ8pwYTF7ayCp6q9jGaphO BWXSgyuhbWQZZ/vlXwfGIifPLiIBYz0yKBvGfa0FAeLvsB8jfAEccedYBmkkug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0r0kbLz2L5; Wed, 18 Oct 2023 18:06: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 39II64JG046021; Wed, 18 Oct 2023 18:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II64VE046018; Wed, 18 Oct 2023 18:06:04 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:04 GMT Message-Id: <202310181806.39II64VE046018@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: 82d6d46d0d1d - main - pmc: remove last bits of AMD K7 CPU support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82d6d46d0d1dbdaa32c754f97e94a772d01cb26c Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=82d6d46d0d1dbdaa32c754f97e94a772d01cb26c commit 82d6d46d0d1dbdaa32c754f97e94a772d01cb26c Author: Mitchell Horne AuthorDate: 2023-10-18 17:56:41 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 pmc: remove last bits of AMD K7 CPU support This includes event definitions from sys/pmc_events.h, definitions from sys/pmc.h, and the man pages. Reviewed by: jkoshy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41275 --- ObsoleteFiles.inc | 3 + lib/libpmc/Makefile | 1 - lib/libpmc/pmc.3 | 11 +- lib/libpmc/pmc.atom.3 | 1 - lib/libpmc/pmc.atomsilvermont.3 | 1 - lib/libpmc/pmc.cmn-600.3 | 1 - lib/libpmc/pmc.core.3 | 1 - lib/libpmc/pmc.core2.3 | 1 - lib/libpmc/pmc.corei7.3 | 1 - lib/libpmc/pmc.corei7uc.3 | 1 - lib/libpmc/pmc.dmc-620.3 | 1 - lib/libpmc/pmc.haswell.3 | 1 - lib/libpmc/pmc.haswelluc.3 | 1 - lib/libpmc/pmc.haswellxeon.3 | 1 - lib/libpmc/pmc.iaf.3 | 1 - lib/libpmc/pmc.ivybridge.3 | 1 - lib/libpmc/pmc.ivybridgexeon.3 | 1 - lib/libpmc/pmc.k7.3 | 260 ------------------------------- lib/libpmc/pmc.k8.3 | 1 - lib/libpmc/pmc.sandybridge.3 | 1 - lib/libpmc/pmc.sandybridgeuc.3 | 1 - lib/libpmc/pmc.sandybridgexeon.3 | 1 - lib/libpmc/pmc.soft.3 | 1 - lib/libpmc/pmc.tsc.3 | 1 - lib/libpmc/pmc.ucf.3 | 1 - lib/libpmc/pmc.westmere.3 | 1 - lib/libpmc/pmc.westmereuc.3 | 1 - sys/dev/hwpmc/pmc_events.h | 37 +---- sys/sys/pmc.h | 4 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 - 30 files changed, 6 insertions(+), 334 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f54e13ea3d2d..749b6dfd7ca0 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20231018: pmc.k7(3) removed +OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz + # 20231018: Remove misspelled man page link OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 5deff06270f7..f4c02968e806 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -76,7 +76,6 @@ MAN+= pmc.haswellxeon.3 MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 -MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.sandybridge.3 MAN+= pmc.sandybridgeuc.3 diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3 index d2be8f6c3a6d..25e534e52b23 100644 --- a/lib/libpmc/pmc.3 +++ b/lib/libpmc/pmc.3 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 16, 2023 +.Dd June 23, 2023 .Dt PMC 3 .Os .Sh NAME @@ -130,9 +130,6 @@ enumeration. Supported CPUs include: .Pp .Bl -tag -width "Li PMC_CPU_ARMV7_CORTEX_A15" -compact -.It Li PMC_CPU_AMD_K7 -.Tn "AMD Athlon" -CPUs. .It Li PMC_CPU_AMD_K8 .Tn "AMD Athlon64" CPUs. @@ -227,10 +224,6 @@ performance measurement architecture version 2 and later. Programmable hardware counters present in CPUs conforming to the .Tn Intel performance measurement architecture version 1 and later. -.It Li PMC_CLASS_K7 -Programmable hardware counters present in -.Tn "AMD Athlon" -CPUs. .It Li PMC_CLASS_K8 Programmable hardware counters present in .Tn "AMD Athlon64" @@ -498,7 +491,6 @@ following manual pages: .It Em "PMC Class" Ta Em "Manual Page" .It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 .It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 .It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 .It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 .El @@ -551,7 +543,6 @@ Doing otherwise is unsupported. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3 index 34cd4a646e6c..0819525321f4 100644 --- a/lib/libpmc/pmc.atom.3 +++ b/lib/libpmc/pmc.atom.3 @@ -1170,7 +1170,6 @@ and the underlying hardware events used on these CPUs. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3 index 975e4310e61a..72baa6453565 100644 --- a/lib/libpmc/pmc.atomsilvermont.3 +++ b/lib/libpmc/pmc.atomsilvermont.3 @@ -508,7 +508,6 @@ The number of times the MSROM starts a flow of UOPS. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 index fc137d2df48e..1fa75a674c0b 100644 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -560,7 +560,6 @@ Average latency to form a TX TLP .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3 index 43a46633806f..4ee4b4c9235d 100644 --- a/lib/libpmc/pmc.core.3 +++ b/lib/libpmc/pmc.core.3 @@ -785,7 +785,6 @@ may not count some transitions. .Xr pmc.atom 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3 index 201867bd9ed8..45e4a4c7916d 100644 --- a/lib/libpmc/pmc.core2.3 +++ b/lib/libpmc/pmc.core2.3 @@ -1100,7 +1100,6 @@ and the underlying hardware events used. .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3 index 5f5436745478..ab7a47e79846 100644 --- a/lib/libpmc/pmc.corei7.3 +++ b/lib/libpmc/pmc.corei7.3 @@ -1579,7 +1579,6 @@ Counts number of segment register loads. .Xr pmc.core 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3 index e062302a4e43..ca4283e38c90 100644 --- a/lib/libpmc/pmc.corei7uc.3 +++ b/lib/libpmc/pmc.corei7uc.3 @@ -882,7 +882,6 @@ into a power down mode. .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 index 568ff3fab6f0..1fcd6ae9c733 100644 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -130,7 +130,6 @@ The following PMC events are available: .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3 index 736440612886..0e1a4623eda6 100644 --- a/lib/libpmc/pmc.haswell.3 +++ b/lib/libpmc/pmc.haswell.3 @@ -917,7 +917,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3 index 42d379a0cb9f..03c37995a41b 100644 --- a/lib/libpmc/pmc.haswelluc.3 +++ b/lib/libpmc/pmc.haswelluc.3 @@ -201,7 +201,6 @@ Number of requests allocated in Coherency Tracker. .Xr pmc.corei7uc 3 , .Xr pmc.haswell 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3 index 55ff8d061c3a..cd6c71fd6606 100644 --- a/lib/libpmc/pmc.haswellxeon.3 +++ b/lib/libpmc/pmc.haswellxeon.3 @@ -931,7 +931,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3 index b407f4b650c9..0757795c95af 100644 --- a/lib/libpmc/pmc.iaf.3 +++ b/lib/libpmc/pmc.iaf.3 @@ -124,7 +124,6 @@ CPU, use the event specifier .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3 index 95e4e0800650..4b88f95be21c 100644 --- a/lib/libpmc/pmc.ivybridge.3 +++ b/lib/libpmc/pmc.ivybridge.3 @@ -829,7 +829,6 @@ Dirty L2 cache lines evicted by the MLC prefetcher. .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3 index 56e901be26ca..56b2f2f62c0b 100644 --- a/lib/libpmc/pmc.ivybridgexeon.3 +++ b/lib/libpmc/pmc.ivybridgexeon.3 @@ -862,7 +862,6 @@ Dirty L2 cache lines filling the L2. .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.k7.3 b/lib/libpmc/pmc.k7.3 deleted file mode 100644 index 0c2c158cf956..000000000000 --- a/lib/libpmc/pmc.k7.3 +++ /dev/null @@ -1,260 +0,0 @@ -.\" Copyright (c) 2003-2008 Joseph Koshy. 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. -.\" -.Dd October 4, 2008 -.Dt PMC.K7 3 -.Os -.Sh NAME -.Nm pmc.k7 -.Nd measurement events for -.Tn AMD -.Tn Athlon -(K7 family) CPUs -.Sh LIBRARY -.Lb libpmc -.Sh SYNOPSIS -.In pmc.h -.Sh DESCRIPTION -AMD K7 PMCs are present in the -.Tn "AMD Athlon" -series of CPUs and are documented in: -.Rs -.%B "AMD Athlon Processor x86 Code Optimization Guide" -.%N "Publication No. 22007" -.%D "February 2002" -.%Q "Advanced Micro Devices, Inc." -.Re -.Ss PMC Features -AMD K7 PMCs are 48 bits wide. -Each K7 CPU contains 4 PMCs with the following capabilities: -.Bl -column "PMC_CAP_INTERRUPT" "Support" -.It Em Capability Ta Em Support -.It PMC_CAP_CASCADE Ta \&No -.It PMC_CAP_EDGE Ta Yes -.It PMC_CAP_INTERRUPT Ta Yes -.It PMC_CAP_INVERT Ta Yes -.It PMC_CAP_READ Ta Yes -.It PMC_CAP_PRECISE Ta \&No -.It PMC_CAP_SYSTEM Ta Yes -.It PMC_CAP_TAGGING Ta \&No -.It PMC_CAP_THRESHOLD Ta Yes -.It PMC_CAP_USER Ta Yes -.It PMC_CAP_WRITE Ta Yes -.El -.Ss Event Qualifiers -Event specifiers for AMD K7 PMCs can have the following optional -qualifiers: -.Bl -tag -width indent -.It Li count= Ns Ar value -Configure the counter to increment only if the number of configured -events measured in a cycle is greater than or equal to -.Ar value . -.It Li edge -Configure the counter to only count negated-to-asserted transitions -of the conditions expressed by the other qualifiers. -In other words, the counter will increment only once whenever a given -condition becomes true, irrespective of the number of clocks during -which the condition remains true. -.It Li inv -Invert the sense of comparison when the -.Dq Li count -qualifier is present, making the counter to increment when the -number of events per cycle is less than the value specified by -the -.Dq Li count -qualifier. -.It Li os -Configure the PMC to count events happening at privilege level 0. -.It Li unitmask= Ns Ar mask -This qualifier is used to further qualify a select few events, -.Dq Li k7-dc-refills-from-l2 , -.Dq Li k7-dc-refills-from-system -and -.Dq Li k7-dc-writebacks . -Here -.Ar mask -is a string of the following characters optionally separated by -.Ql + -characters: -.Pp -.Bl -tag -width indent -compact -.It Li m -Count operations for lines in the -.Dq Modified -state. -.It Li o -Count operations for lines in the -.Dq Owner -state. -.It Li e -Count operations for lines in the -.Dq Exclusive -state. -.It Li s -Count operations for lines in the -.Dq Shared -state. -.It Li i -Count operations for lines in the -.Dq Invalid -state. -.El -.Pp -If no -.Dq Li unitmask -qualifier is specified, the default is to count events for caches -lines in any of the above states. -.It Li usr -Configure the PMC to count events occurring at privilege levels 1, 2 -or 3. -.El -.Pp -If neither of the -.Dq Li os -or -.Dq Li usr -qualifiers were specified, the default is to enable both. -.Ss AMD K7 Event Specifiers -The event specifiers supported on AMD K7 PMCs are: -.Bl -tag -width indent -.It Li k7-dc-accesses -.Pq Event 40H -Count data cache accesses. -.It Li k7-dc-misses -.Pq Event 41H -Count data cache misses. -.It Li k7-dc-refills-from-l2 Op Li ,unitmask= Ns Ar mask -.Pq Event 42H -Count data cache refills from L2 cache. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-dc-refills-from-system Op Li ,unitmask= Ns Ar mask -.Pq Event 43H -Count data cache refills from system memory. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-dc-writebacks Op Li ,unitmask= Ns Ar mask -.Pq Event 44H -Count data cache writebacks. -This event may be further qualified using the -.Dq Li unitmask -qualifier. -.It Li k7-hardware-interrupts -.Pq Event CFH -Count the number of taken hardware interrupts. -.It Li k7-ic-fetches -.Pq Event 80H -Count instruction cache fetches. -.It Li k7-ic-misses -.Pq Event 81H -Count instruction cache misses. -.It Li k7-interrupts-masked-cycles -.Pq Event CDH -Count the number of cycles when the processor's -.Va IF -flag was zero. -.It Li k7-interrupts-masked-while-pending-cycles -.Pq Event CEH -Count the number of cycles interrupts were masked while pending due -to the processor's -.Va IF -flag being zero. -.It Li k7-l1-and-l2-dtlb-misses -.Pq Event 46H -Count L1 and L2 DTLB misses. -.It Li k7-l1-dtlb-miss-and-l2-dtlb-hits -.Pq Event 45H -Count L1 DTLB misses and L2 DTLB hits. -.It Li k7-l1-itlb-misses -.Pq Event 84H -Count L1 ITLB misses that are L2 ITLB hits. -.It Li k7-l1-l2-itlb-misses -.Pq Event 85H -Count L1 (and L2) ITLB misses. -.It Li k7-misaligned-references -.Pq Event 47H -Count misaligned data references. -.It Li k7-retired-branches -.Pq Event C2H -Count all retired branches (conditional, unconditional, exceptions -and interrupts). -.It Li k7-retired-branches-mispredicted -.Pq Event C3H -Count all mispredicted retired branches. -.It Li k7-retired-far-control-transfers -.Pq Event C6H -Count retired far control transfers. -.It Li k7-retired-instructions -.Pq Event C0H -Count all retired instructions. -.It Li k7-retired-ops -.Pq Event C1H -Count retired ops. -.It Li k7-retired-resync-branches -.Pq Event C7H -Count retired resync branches (non control transfer branches). -.It Li k7-retired-taken-branches -.Pq Event C4H -Count retired taken branches. -.It Li k7-retired-taken-branches-mispredicted -.Pq Event C5H -Count mispredicted taken branches that were retired. -.El -.Ss Event Name Aliases -The following table shows the mapping between the PMC-independent -aliases supported by -.Lb libpmc -and the underlying hardware events used. -.Bl -column "branch-mispredicts" "Description" -.It Em Alias Ta Em Event -.It Li branches Ta Li k7-retired-branches -.It Li branch-mispredicts Ta Li k7-retired-branches-mispredicted -.It Li dc-misses Ta Li k7-dc-misses -.It Li ic-misses Ta Li k7-ic-misses -.It Li instructions Ta Li k7-retired-instructions -.It Li interrupts Ta Li k7-hardware-interrupts -.It Li unhalted-cycles Ta (unsupported) -.El -.Sh SEE ALSO -.Xr pmc 3 , -.Xr pmc.atom 3 , -.Xr pmc.core 3 , -.Xr pmc.core2 3 , -.Xr pmc.iaf 3 , -.Xr pmc.k8 3 , -.Xr pmc.soft 3 , -.Xr pmc.tsc 3 , -.Xr pmclog 3 , -.Xr hwpmc 4 -.Sh HISTORY -The -.Nm pmc -library first appeared in -.Fx 6.0 . -.Sh AUTHORS -The -.Lb libpmc -library was written by -.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org . diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3 index 96cc7f5ef058..29571aa1c097 100644 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.k8.3 @@ -776,7 +776,6 @@ and the underlying hardware events used. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3 index 4f5b6c779efa..5672cfbcd958 100644 --- a/lib/libpmc/pmc.sandybridge.3 +++ b/lib/libpmc/pmc.sandybridge.3 @@ -909,7 +909,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3 index 072794bca757..080c9f31ffee 100644 --- a/lib/libpmc/pmc.sandybridgeuc.3 +++ b/lib/libpmc/pmc.sandybridgeuc.3 @@ -200,7 +200,6 @@ Counts the number of core-outgoing entries in the coherent tracker queue. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3 index f823537421f0..3d238bbad2de 100644 --- a/lib/libpmc/pmc.sandybridgexeon.3 +++ b/lib/libpmc/pmc.sandybridgexeon.3 @@ -986,7 +986,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3 index ce965caa2f02..dcbf8d904838 100644 --- a/lib/libpmc/pmc.soft.3 +++ b/lib/libpmc/pmc.soft.3 @@ -89,7 +89,6 @@ Write page fault. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 index 59fcdc1898d1..c613433eb0f1 100644 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -61,7 +61,6 @@ maps to the TSC. .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3 index d39b0e8f0db7..7604e915d384 100644 --- a/lib/libpmc/pmc.ucf.3 +++ b/lib/libpmc/pmc.ucf.3 @@ -87,7 +87,6 @@ offset C0H under device number 0 and Function 0. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3 index 1d7c206f25c3..00aaa0b74338 100644 --- a/lib/libpmc/pmc.westmere.3 +++ b/lib/libpmc/pmc.westmere.3 @@ -1372,7 +1372,6 @@ Counts number of SID integer 64 bit shift or move operations. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3 index d9574be03422..67b21ef42f84 100644 --- a/lib/libpmc/pmc.westmereuc.3 +++ b/lib/libpmc/pmc.westmereuc.3 @@ -1076,7 +1076,6 @@ disabled. .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k7 3 , .Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h index 73362baa7e9c..ab157cb05dcf 100644 --- a/sys/dev/hwpmc/pmc_events.h +++ b/sys/dev/hwpmc/pmc_events.h @@ -62,39 +62,6 @@ __PMC_EV_ALIAS("cycles", TSC_TSC) #define PMC_EV_SOFT_FIRST 0x20000 #define PMC_EV_SOFT_LAST (PMC_EV_SOFT_FIRST + PMC_EV_DYN_COUNT - 1) -/* - * AMD K7 Events, from "The AMD Athlon(tm) Processor x86 Code - * Optimization Guide" [Doc#22007K, Feb 2002] - */ - -#define __PMC_EV_K7() \ -__PMC_EV(K7, DC_ACCESSES) \ -__PMC_EV(K7, DC_MISSES) \ -__PMC_EV(K7, DC_REFILLS_FROM_L2) \ -__PMC_EV(K7, DC_REFILLS_FROM_SYSTEM) \ -__PMC_EV(K7, DC_WRITEBACKS) \ -__PMC_EV(K7, L1_DTLB_MISS_AND_L2_DTLB_HITS) \ -__PMC_EV(K7, L1_AND_L2_DTLB_MISSES) \ -__PMC_EV(K7, MISALIGNED_REFERENCES) \ -__PMC_EV(K7, IC_FETCHES) \ -__PMC_EV(K7, IC_MISSES) \ -__PMC_EV(K7, L1_ITLB_MISSES) \ -__PMC_EV(K7, L1_L2_ITLB_MISSES) \ -__PMC_EV(K7, RETIRED_INSTRUCTIONS) \ -__PMC_EV(K7, RETIRED_OPS) \ -__PMC_EV(K7, RETIRED_BRANCHES) \ -__PMC_EV(K7, RETIRED_BRANCHES_MISPREDICTED) \ -__PMC_EV(K7, RETIRED_TAKEN_BRANCHES) \ -__PMC_EV(K7, RETIRED_TAKEN_BRANCHES_MISPREDICTED) \ -__PMC_EV(K7, RETIRED_FAR_CONTROL_TRANSFERS) \ -__PMC_EV(K7, RETIRED_RESYNC_BRANCHES) \ -__PMC_EV(K7, INTERRUPTS_MASKED_CYCLES) \ -__PMC_EV(K7, INTERRUPTS_MASKED_WHILE_PENDING_CYCLES) \ -__PMC_EV(K7, HARDWARE_INTERRUPTS) - -#define PMC_EV_K7_FIRST PMC_EV_K7_DC_ACCESSES -#define PMC_EV_K7_LAST PMC_EV_K7_HARDWARE_INTERRUPTS - /* AMD K8 PMCs */ #define __PMC_EV_K8() \ @@ -2431,7 +2398,7 @@ __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF) * START #EVENTS DESCRIPTION * 0 0x1000 Reserved * 0x1000 0x0001 TSC - * 0x2000 0x0080 AMD K7 events + * 0x2000 0x0080 free (was AMD K7 events) * 0x2080 0x0100 AMD K8 events * 0x10000 0x0080 INTEL architectural fixed-function events * 0x10080 0x0F80 free (was INTEL architectural programmable events) @@ -2457,8 +2424,6 @@ __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF) #define __PMC_EVENTS() \ __PMC_EV_BLOCK(TSC, 0x01000) \ __PMC_EV_TSC() \ - __PMC_EV_BLOCK(K7, 0x02000) \ - __PMC_EV_K7() \ __PMC_EV_BLOCK(K8, 0x02080) \ __PMC_EV_K8() \ __PMC_EV_BLOCK(IAF, 0x10000) \ diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 714d8a7c65b7..5c0067121305 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -81,7 +81,6 @@ extern char pmc_cpuid[PMC_CPUID_LEN]; * Please keep the pmc(3) manual page in sync with this list. */ #define __PMC_CPUS() \ - __PMC_CPU(AMD_K7, 0x00, "AMD K7") \ __PMC_CPU(AMD_K8, 0x01, "AMD K8") \ __PMC_CPU(INTEL_CORE, 0x87, "Intel Core Solo/Duo") \ __PMC_CPU(INTEL_CORE2, 0x88, "Intel Core2") \ @@ -130,7 +129,7 @@ enum pmc_cputype { __PMC_CPUS() }; -#define PMC_CPU_FIRST PMC_CPU_AMD_K7 +#define PMC_CPU_FIRST PMC_CPU_AMD_K8 #define PMC_CPU_LAST PMC_CPU_ARMV8_CORTEX_A76 /* @@ -138,7 +137,6 @@ enum pmc_cputype { */ #define __PMC_CLASSES() \ __PMC_CLASS(TSC, 0x00, "CPU Timestamp counter") \ - __PMC_CLASS(K7, 0x01, "AMD K7 performance counters") \ __PMC_CLASS(K8, 0x02, "AMD K8 performance counters") \ __PMC_CLASS(IAF, 0x06, "Intel Core2/Atom, fixed function") \ __PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index eba077e7472c..298a3b2e403e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6810,7 +6810,6 @@ OLD_FILES+=usr/share/man/man3/pmc.haswellxeon.3.gz OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz -OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz From nobody Wed Oct 18 18:06:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9f0s2sdkz4xL2S; Wed, 18 Oct 2023 18:06: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 4S9f0s2H3Xz4f6m; Wed, 18 Oct 2023 18:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fB1p0dH9lTYqGXCKShRoKs8UczNyx0hAmNm/qCh8YtI=; b=FlPA9XHZEs3+flmCQewLGTwhTBy6MHqg6jAi3Nf4PI2nPf1vH7UvwLrmXbpO9lyzpkij/E m75NO1IzWP/8nWj//pKrX11h6fjVT4+X76mvCRwuHpTlDR1P00uIJCGFt3puJpP3KD6vSa SGnD1zu3Xh2bXiymMUEAqJj6H91KGNy3jSW7+IJpOwh7NBCdLdvsVxNMCx/arh03osuZn6 cOxvMkYtt4DciSL5LXo6O7v3mbCbhc5/rdyXiNAb/qqPPAFS4f3ACvWDR8umebhJUqzsD5 91IthgUZUC09dE/IMTcGOGkWhWFm78riceCNlKC092JkywhyTg8L1c5T3NKdog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697652365; a=rsa-sha256; cv=none; b=K85U0Gkfw3sBxbYlDErFkGxNrc+z9zHtz8ckaHh01m3+DXa12gbyzDlb/gthsn3iwHnZvc Rpc9ZIDSmcyv9PGZLhlVNwlUaaT0I+Cd/JSuHQdtgRDAfCjUbn4OP22l2krhHnhRHVgWxL qytd6XKfM3vIgaeFVNjRalon2RhfL34SByBd5zhfUiOnXjAkUsODm2g1U2NDHyuOYGBUkX rjK6e5oJjBuxUC6Mwejy2GqsqNXNySb8j88liL/HVi5DUjjN451WMmWgCWvu7G5ae1ZC3f FAVhA8GCpmEUr3buDBQFDCj5oTfDmJ+YBvwPJZ8XNoXDySMa1NV7WuOoN9lrow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697652365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fB1p0dH9lTYqGXCKShRoKs8UczNyx0hAmNm/qCh8YtI=; b=IPcr7rvmscqLwiVmw3xJxVrWFOOfT3w9xZSqDHNjBGm/BBCewuU4ERJeQ0Fuf1ZRq8RXgF hhqUpKM0d7nMuJvZe7dOCgZ2Dhv+n1EjOHKn1BgYV2Htagynug1ggtDpBvFxFoUokoa7Re 4geSnzYmYGU7vrdJpPPYsJ1RkCz/GNtqyojQ+uLMWjv8fUfC5vZIOLG1jgq7dh5s6rsxEe ylM6EDf4FVIItnB6bDuHf4j9ufj96va233AuNGyxt8klqsTq72jf1V7qwCIRNr74BcnS5M Gmz4drJpyWiL7f8RUPa3AIgU6PxKrtnTvx7HeI+64Tp5qStbqQk2EhFql+wtDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9f0s1CgFz27Z; Wed, 18 Oct 2023 18:06: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 39II65EC046061; Wed, 18 Oct 2023 18:06:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39II65jU046058; Wed, 18 Oct 2023 18:06:05 GMT (envelope-from git) Date: Wed, 18 Oct 2023 18:06:05 GMT Message-Id: <202310181806.39II65jU046058@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: b293497146fe - main - pmc.amd(3): rename from pmc.k8(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b293497146fea63d76a1c7492c3a21e4e5bf8f48 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b293497146fea63d76a1c7492c3a21e4e5bf8f48 commit b293497146fea63d76a1c7492c3a21e4e5bf8f48 Author: Mitchell Horne AuthorDate: 2023-10-18 17:57:06 +0000 Commit: Mitchell Horne CommitDate: 2023-10-18 18:05:45 +0000 pmc.amd(3): rename from pmc.k8(3) This is the first step in recognizing that the K8 microarchitecture represents a small and aged subset of AMD CPUs supported by this class. Future changes will update the code and documentation details to better reflect this. Keep the old filename as an alias. Reviewed by: jkoshy MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41279 --- lib/libpmc/Makefile | 6 +++++- lib/libpmc/pmc.3 | 4 ++-- lib/libpmc/{pmc.k8.3 => pmc.amd.3} | 5 +++-- lib/libpmc/pmc.atom.3 | 2 +- lib/libpmc/pmc.atomsilvermont.3 | 2 +- lib/libpmc/pmc.cmn-600.3 | 2 +- lib/libpmc/pmc.core.3 | 2 +- lib/libpmc/pmc.core2.3 | 2 +- lib/libpmc/pmc.corei7.3 | 2 +- lib/libpmc/pmc.corei7uc.3 | 2 +- lib/libpmc/pmc.dmc-620.3 | 2 +- lib/libpmc/pmc.haswell.3 | 2 +- lib/libpmc/pmc.haswelluc.3 | 2 +- lib/libpmc/pmc.haswellxeon.3 | 2 +- lib/libpmc/pmc.iaf.3 | 2 +- lib/libpmc/pmc.ivybridge.3 | 2 +- lib/libpmc/pmc.ivybridgexeon.3 | 2 +- lib/libpmc/pmc.sandybridge.3 | 2 +- lib/libpmc/pmc.sandybridgeuc.3 | 2 +- lib/libpmc/pmc.sandybridgexeon.3 | 2 +- lib/libpmc/pmc.soft.3 | 2 +- lib/libpmc/pmc.tsc.3 | 2 +- lib/libpmc/pmc.ucf.3 | 2 +- lib/libpmc/pmc.westmere.3 | 2 +- lib/libpmc/pmc.westmereuc.3 | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 26 files changed, 33 insertions(+), 27 deletions(-) diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index f4c02968e806..34993a428fbd 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -62,6 +62,7 @@ MAN+= pmclog.3 MAN+= pmc.soft.3 # PMC-dependent manual pages +MAN+= pmc.amd.3 MAN+= pmc.atom.3 MAN+= pmc.atomsilvermont.3 MAN+= pmc.cmn-600.3 @@ -76,7 +77,6 @@ MAN+= pmc.haswellxeon.3 MAN+= pmc.iaf.3 MAN+= pmc.ivybridge.3 MAN+= pmc.ivybridgexeon.3 -MAN+= pmc.k8.3 MAN+= pmc.sandybridge.3 MAN+= pmc.sandybridgeuc.3 MAN+= pmc.sandybridgexeon.3 @@ -112,4 +112,8 @@ MLINKS+= \ pmclog.3 pmclog_feed.3 \ pmclog.3 pmclog_read.3 +# Class aliases +MLINKS+= \ + pmc.amd.3 pmc.k8.3 + .include diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3 index 25e534e52b23..9a5b599759ff 100644 --- a/lib/libpmc/pmc.3 +++ b/lib/libpmc/pmc.3 @@ -491,7 +491,7 @@ following manual pages: .It Em "PMC Class" Ta Em "Manual Page" .It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 .It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 +.It Li PMC_CLASS_K8 Ta Xr pmc.amd 3 .It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 .El .Ss Event Name Aliases @@ -534,6 +534,7 @@ driver, applications are urged to dynamically link with the library. Doing otherwise is unsupported. .Sh SEE ALSO +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -543,7 +544,6 @@ Doing otherwise is unsupported. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.amd.3 similarity index 99% rename from lib/libpmc/pmc.k8.3 rename to lib/libpmc/pmc.amd.3 index 29571aa1c097..ee0aae26d42f 100644 --- a/lib/libpmc/pmc.k8.3 +++ b/lib/libpmc/pmc.amd.3 @@ -21,10 +21,11 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 4, 2008 -.Dt PMC.K8 3 +.Dd 24 June, 2023 +.Dt PMC.AMD 3 .Os .Sh NAME +.Nm pmc.amd .Nm pmc.k8 .Nd measurement events for .Tn AMD diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3 index 0819525321f4..480668e6e6bd 100644 --- a/lib/libpmc/pmc.atom.3 +++ b/lib/libpmc/pmc.atom.3 @@ -1166,11 +1166,11 @@ and the underlying hardware events used on these CPUs. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atomsilvermont 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3 index 72baa6453565..cacee51d0e0c 100644 --- a/lib/libpmc/pmc.atomsilvermont.3 +++ b/lib/libpmc/pmc.atomsilvermont.3 @@ -504,11 +504,11 @@ The number of times the MSROM starts a flow of UOPS. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.cmn-600.3 b/lib/libpmc/pmc.cmn-600.3 index 1fa75a674c0b..406209807301 100644 --- a/lib/libpmc/pmc.cmn-600.3 +++ b/lib/libpmc/pmc.cmn-600.3 @@ -553,6 +553,7 @@ Average latency to form a TX TLP .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -560,7 +561,6 @@ Average latency to form a TX TLP .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3 index 4ee4b4c9235d..b4fa9ab661a4 100644 --- a/lib/libpmc/pmc.core.3 +++ b/lib/libpmc/pmc.core.3 @@ -782,10 +782,10 @@ may not count some transitions. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmclog 3 , diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3 index 45e4a4c7916d..86604b7ff16c 100644 --- a/lib/libpmc/pmc.core2.3 +++ b/lib/libpmc/pmc.core2.3 @@ -1097,10 +1097,10 @@ and the underlying hardware events used. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3 index ab7a47e79846..32b28eb3db48 100644 --- a/lib/libpmc/pmc.corei7.3 +++ b/lib/libpmc/pmc.corei7.3 @@ -1575,11 +1575,11 @@ Counts number of segment register loads. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3 index ca4283e38c90..6a059d84a0f9 100644 --- a/lib/libpmc/pmc.corei7uc.3 +++ b/lib/libpmc/pmc.corei7uc.3 @@ -878,11 +878,11 @@ into a power down mode. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.dmc-620.3 b/lib/libpmc/pmc.dmc-620.3 index 1fcd6ae9c733..f9054b637c90 100644 --- a/lib/libpmc/pmc.dmc-620.3 +++ b/lib/libpmc/pmc.dmc-620.3 @@ -123,6 +123,7 @@ The following PMC events are available: .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , @@ -130,7 +131,6 @@ The following PMC events are available: .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3 index 0e1a4623eda6..495516cf45a0 100644 --- a/lib/libpmc/pmc.haswell.3 +++ b/lib/libpmc/pmc.haswell.3 @@ -909,6 +909,7 @@ Dirty L2 cache lines evicted by demand. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -917,7 +918,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3 index 03c37995a41b..a9587c3b5604 100644 --- a/lib/libpmc/pmc.haswelluc.3 +++ b/lib/libpmc/pmc.haswelluc.3 @@ -195,13 +195,13 @@ Number of requests allocated in Coherency Tracker. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.haswell 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.haswellxeon.3 b/lib/libpmc/pmc.haswellxeon.3 index cd6c71fd6606..e6cf65c5e6dc 100644 --- a/lib/libpmc/pmc.haswellxeon.3 +++ b/lib/libpmc/pmc.haswellxeon.3 @@ -922,6 +922,7 @@ Dirty L2 cache lines evicted by demand. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -931,7 +932,6 @@ Dirty L2 cache lines evicted by demand. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3 index 0757795c95af..eaf45db140f5 100644 --- a/lib/libpmc/pmc.iaf.3 +++ b/lib/libpmc/pmc.iaf.3 @@ -121,10 +121,10 @@ CPU, use the event specifier .Qq iaf-instr-retired.any,usr,anythread . .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc_cpuinfo 3 , diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3 index 4b88f95be21c..1490b896a73c 100644 --- a/lib/libpmc/pmc.ivybridge.3 +++ b/lib/libpmc/pmc.ivybridge.3 @@ -823,13 +823,13 @@ Dirty L2 cache lines evicted by the MLC prefetcher. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3 index 56b2f2f62c0b..415cdf518bd6 100644 --- a/lib/libpmc/pmc.ivybridgexeon.3 +++ b/lib/libpmc/pmc.ivybridgexeon.3 @@ -856,13 +856,13 @@ Dirty L2 cache lines filling the L2. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3 index 5672cfbcd958..77221d985ded 100644 --- a/lib/libpmc/pmc.sandybridge.3 +++ b/lib/libpmc/pmc.sandybridge.3 @@ -902,6 +902,7 @@ Split locks in SQ. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -909,7 +910,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3 index 080c9f31ffee..70ce768d9966 100644 --- a/lib/libpmc/pmc.sandybridgeuc.3 +++ b/lib/libpmc/pmc.sandybridgeuc.3 @@ -195,12 +195,12 @@ Counts the number of core-outgoing entries in the coherent tracker queue. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgexeon 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3 index 3d238bbad2de..e7bfc8c71708 100644 --- a/lib/libpmc/pmc.sandybridgexeon.3 +++ b/lib/libpmc/pmc.sandybridgexeon.3 @@ -978,6 +978,7 @@ Split locks in SQ. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , @@ -986,7 +987,6 @@ Split locks in SQ. .Xr pmc.iaf 3 , .Xr pmc.ivybridge 3 , .Xr pmc.ivybridgexeon 3 , -.Xr pmc.k8 3 , .Xr pmc.sandybridge 3 , .Xr pmc.sandybridgeuc 3 , .Xr pmc.soft 3 , diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3 index dcbf8d904838..08d5af63d02d 100644 --- a/lib/libpmc/pmc.soft.3 +++ b/lib/libpmc/pmc.soft.3 @@ -84,12 +84,12 @@ Write page fault. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , .Xr pmc.westmereuc 3 , diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 index c613433eb0f1..4834d897f90c 100644 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -57,11 +57,11 @@ The alias maps to the TSC. .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmclog 3 , .Xr hwpmc 4 diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3 index 7604e915d384..a7cea6bb57f9 100644 --- a/lib/libpmc/pmc.ucf.3 +++ b/lib/libpmc/pmc.ucf.3 @@ -81,13 +81,13 @@ offset C0H under device number 0 and Function 0. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.core2 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.westmere 3 , diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3 index 00aaa0b74338..231bc331894e 100644 --- a/lib/libpmc/pmc.westmere.3 +++ b/lib/libpmc/pmc.westmere.3 @@ -1367,12 +1367,12 @@ Counts number of SID integer 64 bit shift or move operations. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3 index 67b21ef42f84..5d6286b0e91e 100644 --- a/lib/libpmc/pmc.westmereuc.3 +++ b/lib/libpmc/pmc.westmereuc.3 @@ -1071,12 +1071,12 @@ disabled. .El .Sh SEE ALSO .Xr pmc 3 , +.Xr pmc.amd 3 , .Xr pmc.atom 3 , .Xr pmc.core 3 , .Xr pmc.corei7 3 , .Xr pmc.corei7uc 3 , .Xr pmc.iaf 3 , -.Xr pmc.k8 3 , .Xr pmc.soft 3 , .Xr pmc.tsc 3 , .Xr pmc.ucf 3 , diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 298a3b2e403e..f4eb36f50df1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6798,6 +6798,7 @@ OLD_FILES+=usr/sbin/pmcannotate OLD_FILES+=usr/sbin/pmccontrol OLD_FILES+=usr/sbin/pmcstat OLD_FILES+=usr/share/man/man3/pmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.amd.3.gz OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz OLD_FILES+=usr/share/man/man3/pmc.core.3.gz From nobody Wed Oct 18 19:01:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9gDX0gjDz4xP74; Wed, 18 Oct 2023 19:01: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 4S9gDX0Bk9z4mJ2; Wed, 18 Oct 2023 19:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697655676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ySasaTL5Gx5ZebjeaAYH87Y0EgEgQHsrAVsORRHiVk=; b=TsLRGwBVQjgkuXcnk7ERdEZmEA7Ieet0gPLPTkggXkYqjXJ2jPxQx5+Ub6C8+WBTx7ZWGw lFCCXOQ2Xsji5AZSRSMnKOtyTCgAbutEIJxwfNU/X6cqOXoMD0HQuflh9JwDGqVrii9Rom s87nzceEtSaGhPD2GdqdfNE6jKJD4kVpGn+w8PG7aKVmv4BqPVKGxIEM4MguQCtxqmGPaZ sahmiwXfJPmxKleoSxjqRSPITWR/WNZBkfviUozpmf7BcKCFP50u6XmgSkScfxGdrLNgZ9 IDcPbf+mOLEPo4xj9CNNWVrEWUPtwEvf4TTQB+eeqa4mxfTuNkdi46U1XlA0cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697655676; a=rsa-sha256; cv=none; b=FI6aIenP2fuZ9OF9EW4U/OE2KNNhI0+/82SAET1CUbHMSSqicXzr1Ew5v/ubOCs9pG7D16 w4DLi0qSorlk4akn98ZmpSNRfWO/DZ6yN8eCjCOhF1i7+TQ4fwnT7gwKQcPd1zpONlAy42 30dSPHY9g3Hnv8RWvUHGgo91yjMt6hOZtEQgtsJVa7K6E6kug4YxPJRT9LNSyPov/NXcJv BrOfVqmJYD8fbNUteNQ0usMPVqyKDOAmt3jrcgICDBpihyD3sKB+zew7n6noLTFUj80ibP IlEWVaYsjk5aciWWxQOnpqZBAsJG5uyTWPEfH/VDoaVfY8MmySLHrWSPNRq19w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697655676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ySasaTL5Gx5ZebjeaAYH87Y0EgEgQHsrAVsORRHiVk=; b=O3CvUUjf+iYmY4momA2BbAqP1A5n4UDbWF6kuoEgigkuHmfh5Xfqh1xZ5yv3cRgcprRBBX 8LVdM3v+RgpcAXlJhWNoIu68EVOPd79Yovu1eh9qcHJn7bXdnWnSCB9BUOwpNVBqTH+US2 B6ntBjG57FTXaII9HfgG2qd7cKdzFk/hBI7QeVnNU2ybAf/EpuSbHkiZl70sGaQUP1jO0J O/SvFTlmaY+ihYgoTxpIGQmOIZ4dFBMoZqGKofELM1I8sY01EuAkAl9dg0O8tWqyimlkfz LIwEhmACT6MrCQGm2Gg9pUUncLrE4BppiYqUoB3lLyBjunaAqtx2r7tLkTd9UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9gDW6Ml1z3vn; Wed, 18 Oct 2023 19:01: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 39IJ1FZm041532; Wed, 18 Oct 2023 19:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJ1FTv041529; Wed, 18 Oct 2023 19:01:15 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:01:15 GMT Message-Id: <202310181901.39IJ1FTv041529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 1abb9270dd81 - releng/14.0 - Revert "release: force PKGCONFBRANCH to use 'latest' to fix BETA1 builds" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1abb9270dd81a77490bab9a885c59fbf8701b8ab Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=1abb9270dd81a77490bab9a885c59fbf8701b8ab commit 1abb9270dd81a77490bab9a885c59fbf8701b8ab Author: Glen Barber AuthorDate: 2023-10-18 18:53:15 +0000 Commit: Glen Barber CommitDate: 2023-10-18 19:00:54 +0000 Revert "release: force PKGCONFBRANCH to use 'latest' to fix BETA1 builds" This reverts commit 4e027ca1514fc5c8d4720bec5a1ac6c71888aa38. Approved by: re (kib) --- usr.sbin/pkg/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 07a6012d9721..3e0e047382ca 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -16,7 +16,6 @@ PKGCONFBRANCH?= latest . endif . endif .endif -PKGCONFBRANCH= latest PKGCONF?= FreeBSD.conf.${PKGCONFBRANCH} CONFS= ${PKGCONF} CONFSNAME_${PKGCONF}= ${PKGCONF:C/\.conf.+$/.conf/} From nobody Wed Oct 18 19:17:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9gbj4XfVz4xQ1s; Wed, 18 Oct 2023 19:17: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 4S9gbj3kG8z4p6H; Wed, 18 Oct 2023 19:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hXBX/5EEmvkYanv3LndfMT0HWaduR3TGXn0h7deeiT0=; b=h8WqXwJFRmvbVURamTU7j4jWBwMa2ufvEnnGOptRM54XDbjFe7xf/157j2viOJpP2YSzsM jHSRnYJR0TvwyWRj6m9bY6Fua2JfFJRj9JQ7/ccjUC2zK2tWyRswBBbq3wuXLRcyoZPr/v YsK8HxTalbHNRxtpSltHyoTNQ/3LN6Om7YHgA0oNBdSWUt1hAmbzkSS9qGU6WRI8tiJwML LH1lXc34S2x75pp1OnD0GRfWpE0Ng+1HE5YKFJaDGHw8sszEvuTmdsAOuM48ZFiZWhDldN 5KspS6AxIzgQlEJBJyxqU1SkbC5k32YOivCyVNyWSmL8mJeJHyAYJ0Zqxrr8KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697656673; a=rsa-sha256; cv=none; b=NDQAJafB3LX7m6lnigoI0DPOQj1yab/ixq5NIy+wV8FqsHtGuyfEatbCHky+v4f9bTfbkp 2qNuBLP3xy9Y/jcT8EN0OIWxmz1gz58GtwXa+K34Iq5R0Ffl/Erfd8zjo9zSM8mBtjDhO6 bbQKhk5Gl8YXa9dlzvBBsp0OVucAWx7xbwKjfLPcvB06leb2V0Ff9ycgkEOyt0wMFJaY6U O667KIjzfod02KAKZCJZ1Qsm34IKRIJ5bvrTpF2nAewa/69fX6lpD8gbNJvlRmaz2i/xzU wgSnA5iEAxk//q/VWwc0Y1R7A/Y+an9DLzs+sTfeUppzVgbPi0uPwhbxJVXIUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hXBX/5EEmvkYanv3LndfMT0HWaduR3TGXn0h7deeiT0=; b=bUPQSbU+oXzi3NKLM56VTLIPWMreDEUY8yU1ffVz6cU+neQS7HLRv8XiyVUSZl6BMXSyHA kfkQr/Ayn39Bw5UDB4pWWzW0Sbst29hlbpE7d84smnIPNW25C4qi7OutO8nevhTMWSXFg4 Mgje/qYOv1P7IznZyvM28trTq91x+1FmwXB9AW01zuGVLOhR1ZmUmdo0wvFAauLEpv9Ony GJhQ1XdXfF8cBmjRMVYq+Bp1msm8IrsZiYVnVImLSNXrY3dUlFAjscfCO3YW84Ox2ppF+t HeXwJ4ca9MIlU7Unl92Gax/mfGgYIuSq0yf/85JgBBQv6kUC0l81nQLcF43BiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9gbj2q1Nz4B5; Wed, 18 Oct 2023 19:17: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 39IJHr7q062846; Wed, 18 Oct 2023 19:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJHrxi062843; Wed, 18 Oct 2023 19:17:53 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:17:53 GMT Message-Id: <202310181917.39IJHrxi062843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 754340732b9a - releng/14.0 - releng-azure: Use port name to install Azure CLI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 754340732b9af3779be8fd54d3ffdf54b7def20b Auto-Submitted: auto-generated The branch releng/14.0 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=754340732b9af3779be8fd54d3ffdf54b7def20b commit 754340732b9af3779be8fd54d3ffdf54b7def20b Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:39:11 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-18 19:17:25 +0000 releng-azure: Use port name to install Azure CLI To overcome package name changing on default Python version updates. Approved by: gjb (re), delphij (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41453 (cherry picked from commit 0fe6998d8ad0bf54c237c8f513bf00cab547b561) (cherry picked from commit 80496f42b6a9c13664f6228602fd21bf7a4500a5) --- release/Makefile.azure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index ba996bc15ac6..528371ad076e 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -38,7 +38,7 @@ azure-check-depends: . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif - env ASSUME_ALWAYS_YES=yes pkg install -y py38-azure-cli + env ASSUME_ALWAYS_YES=yes pkg install -y sysutils/py-azure-cli . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/sysutils/py-azure-cli BATCH=1 all install clean . endif From nobody Wed Oct 18 19:17:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9gbk68djz4xQ82; Wed, 18 Oct 2023 19:17: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 4S9gbk5Yx0z4nvy; Wed, 18 Oct 2023 19:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9gBP4qoeMFHNimjwyeB29eV6aqV3bzfugUQuMKfpYc=; b=W/16vAnW/smBgnZl7ODLzS1s8GoV/a+nrjpMle5DOh7oJtYsY/gEo7Bc0PVAOHFTe8i02g 85p9yYfqiCNPo10xysz2treOQdPgyon4tpy8HQLkICEywtGb2kj3gsJlbRYmWBSN1Efzkg sm6KBfid6umolBGb6QM4JDkj0lOJs6ssHiTD2WWkNB/bj4p59x2M7KPf19Uu/rT0nXO17p 6P5dhtURK+dtByZhdj8drekrg9Tab2N1fSAY8ni672e8ARYtcDFZAsWEBwptaz3pGd0n+v vMHs5pcVDirco0bvS0pz/UZRNUGwMd6vgSs77Y8II+jGJ7GCkep5QZ/1m5Lapg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697656674; a=rsa-sha256; cv=none; b=cb/GJImBe8WyxojJNpE+5WLoRjCVRdZL2Wt4X7jpAP5wYIhSaNexCrrGiE6FOmzcuW3UWo p4REVeY6f8l9Aa1ipj0GyLK9zEI4KMfupuouYNl92C/3SnqI3GImXNqFe15aKUkBIqCNuv JwQiEBdH6ixNVHDWzVhDbXk91V14cF4EN221GZ3q1Y6+wllGuS1JeCmVPvHpwRzvfz67Br c8AyxwxIcrK+uhDVP4EAfpCLXA4Eb9UhrzsyKpq6IKwAX0dCYq3lnaEoVXQGNeH9E5dlKS EY3GJXY/HJlmRjnZKN9/b4I3ihopFcsJv1Gzn49TUETIEeVJxyDpzHuJDZRL5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9gBP4qoeMFHNimjwyeB29eV6aqV3bzfugUQuMKfpYc=; b=yEhzcIp9wV1xhHGcQI9mq/bD1/2pF+/87gSjqrB/feTCj8t798S9hLFKMOd0g8k3UHIB5b gCNWqI7Ewxqyd/g2xER16Wsg5Ghlgft4I2aLkziDmHZ3LBtRmzkLJMPWcLsoz4KEZPlpk7 GSNvHdamog+yCDFCVVTmGHVgNe4daf7ajLlznrwa34KcYs7SNPyvFSS+EaDmZ1I7xLLrCr KfhKPOk+1Zi+vGghIlAVQEAN92ByY7ouYM0htP4P/pQJPviq+9pWQeqpZ+e7Dw/8hEdovL StlFrpSScg8m+fvNBQD0AUfX8zTmSVyJTa+ae9BxQ2f7jpVw2q2Lrr4uN1nAaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9gbk42jSz45P; Wed, 18 Oct 2023 19:17: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 39IJHsYq062910; Wed, 18 Oct 2023 19:17:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJHsQu062907; Wed, 18 Oct 2023 19:17:54 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:17:54 GMT Message-Id: <202310181917.39IJHsQu062907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 96e76036949f - releng/14.0 - releng-azure: Add ZFS support to Azure image buliding and uploading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 96e76036949fffb7f02a423cca6589873966b503 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=96e76036949fffb7f02a423cca6589873966b503 commit 96e76036949fffb7f02a423cca6589873966b503 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:40:39 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-18 19:17:25 +0000 releng-azure: Add ZFS support to Azure image buliding and uploading Approved by: gjb (re), delphij (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41454 (cherry picked from commit 78f901dcbd84ccad3849a8029f2320cf97079856) (cherry picked from commit 1e7218e33974089234841420bb69777a29a91c61) --- release/Makefile.azure | 18 +++++++++++------- release/Makefile.vm | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 528371ad076e..a8f59282a09c 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -4,7 +4,6 @@ # Makefile for uploading Microsoft Azure disk images. # -AZURE_IMG?= ${.OBJDIR}/azure.vhdf AZURE_UPLOAD_TGTS= azure-check-depends \ azure-do-upload CLEANFILES+= ${AZURE_UPLOAD_TGTS} @@ -19,8 +18,6 @@ AZURE${VAR}!= grep -E '^AZURE${VAR}' ${AZURE_UPLOAD_CONF} | awk -F ' ' '{print $ SNAPSHOT_DATE!= date +-${BUILDDATE} .endif -AZURE_TARGET:= ${OSRELEASE}${SNAPSHOT_DATE} - START_DATE!= date -v-1d -I -u EXPIRY_DATE!= date -v+1m -I -u @@ -44,14 +41,18 @@ azure-check-depends: . endif .endif -azure-do-upload: +.for _FS in ${AZURE_FSLIST} +AZURE_IMG_${_FS}= ${.OBJDIR}/azure.${_FS}.vhdf +AZURE_TARGET_${_FS}= ${OSRELEASE}-${_FS}${SNAPSHOT_DATE} + +azure-do-upload-${_FS}: /usr/local/bin/az storage blob upload \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --container-name ${AZURE_STORAGE} --type page \ - --file ${AZURE_IMG} --name ${AZURE_TARGET}.vhd + --file ${AZURE_IMG_${_FS}} --name ${AZURE_TARGET_${_FS}}.vhd @echo "The disk access URL with shared access signature is:" @echo - @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET}.vhd? + @echo -n https://${AZURE_ACCOUNT}.blob.core.windows.net/${AZURE_STORAGE}/${AZURE_TARGET_${_FS}}.vhd? @/usr/local/bin/az storage container generate-sas \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ --name ${AZURE_STORAGE} \ @@ -67,5 +68,8 @@ azure-do-upload: @echo @echo /usr/local/bin/az storage blob delete \ --account-name ${AZURE_ACCOUNT} --account-key ${AZURE_KEY} \ - --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET}.vhd + --container-name ${AZURE_STORAGE} --name ${AZURE_TARGET_${_FS}}.vhd @echo +.endfor + +azure-do-upload: azure-do-upload-${VMFS} diff --git a/release/Makefile.vm b/release/Makefile.vm index 09e31e3c0b6f..e1bba5271a4c 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -23,7 +23,7 @@ CLOUDWARE_TYPES?= BASIC-CI \ OCI \ VAGRANT AZURE_FORMAT= vhdf -AZURE_FSLIST= ufs +AZURE_FSLIST= ufs zfs AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST= ufs From nobody Wed Oct 18 19:17:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9gbl6PGHz4xQBS; Wed, 18 Oct 2023 19:17: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 4S9gbl5ySfz4pB0; Wed, 18 Oct 2023 19:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiWuHQkaxk3AAUo/MmNt+4upmB+Q1w2hwuOisI8PqFE=; b=vH8vOkE34I1zY9af6LQo4EfJAvnbDYmcV0SL/J6zNLRQC2IBXrXmDXRWLj7APH+TWtRvPe 8y98QjTqGZDOeskQ1OcGsvI5t27Uqh0Mq54/aS6kzrpFPsWPvu8bC5rdQVr8IGiSepBKBY JYKeGH9lsgzyID7SrZMHj2USHcn21WKXjXlsG03gASGFMLMgZwOIngZ89+KGCDVk6BQDNH LdYY6z+5EAiv3EyPH5etfMWMNRX5BqCYjPOeNH2qsLAwogMB4WEIZ4S0+K2URXDYhGXEwA EPGnMzZrLeHAj7v/kD0uwUFC8AGwyk5Rqj5lsAoqtcQcvVekd9tgOpbUFW+AuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697656675; a=rsa-sha256; cv=none; b=JRHXqoZFoPb3lDSmpd4JuuMPG9jxTse7dm+Y/vQlbTWBZst9Aj5twsLiGW3M1FU+2+mJ5K 8htx3vWKCklQEz5itNi7FIUvC6v/bbsXpQufBYkp8aDdywGcsWfAr6YIisWvc5CB7ioYSz uTiNwoLdbtve0CRcugcTYf8h12JK8wGFU19TxwyaG8tf2mZlUya/Du7K33baSAXck69XyJ yCgSOJMRvRf0TVcVWgzGJLFXwE62ZuAW3Xp09tlBQFkImnEnltxFi7moJ475GMfgR9Eeov m7YCPD7HNCLh41FRx+At79TeJj3/7JwJFsMBGfpOk8Sf9jKyqrwH0P+RFvKtAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697656675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QiWuHQkaxk3AAUo/MmNt+4upmB+Q1w2hwuOisI8PqFE=; b=Gq8TEeaoHQ3Kq3o5fMrU5iQPOBgp/p6JohSRj8FKJSCk8eisWYAmY3TLRJ2xgYV5kmJdg9 laGzQCQxtUbQ1/3hoqkgA8Z7DnGS8hqmoWrl59/9BUAIspcUhVuwbtYS8VeukJjeay/ayk KGph9Cpb6/wsvqHcGAoyjL8fStRkJlKYqeuwr4cfpd0qfvTwTD1kzEV/9wMpZHT07yi3LD hOID45kWFTKvInHnZhhBKevn48YBQjTkBwv1eeSIMBo1Q4KQjdRWaRG8hrH2N+b+/dNFfr n8FwXFfrj0Ivtfmu1/FQuf8D2LKIXoOEm3FqOmHRbxa+3OOSU/tt+hYaxyQWIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9gbl54Znz4B6; Wed, 18 Oct 2023 19:17: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 39IJHtcg062967; Wed, 18 Oct 2023 19:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJHtRF062964; Wed, 18 Oct 2023 19:17:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:17:55 GMT Message-Id: <202310181917.39IJHtRF062964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 9103c2f0ce27 - releng/14.0 - releng-gce: Add ZFS support to GCE image buliding and uploading List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 9103c2f0ce273343391a1fdf53cdee92147d2e73 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=9103c2f0ce273343391a1fdf53cdee92147d2e73 commit 9103c2f0ce273343391a1fdf53cdee92147d2e73 Author: Li-Wen Hsu AuthorDate: 2023-08-29 17:41:43 +0000 Commit: Li-Wen Hsu CommitDate: 2023-10-18 19:17:26 +0000 releng-gce: Add ZFS support to GCE image buliding and uploading Approved by: delphij (re), gjb (re) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41527 (cherry picked from commit 1b10bdf0e2fa80a485980b783469687623d3f1c3) (cherry picked from commit c892a9af7187e94f8dd6f720609e84d79c9e7d1f) --- release/Makefile.gce | 38 +++++++++++++++++++++----------------- release/Makefile.vm | 2 +- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index bdf7b31ba302..f7fb0d8dc419 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -4,7 +4,6 @@ # Makefile for uploading Google Compute Engine disk images. # -GCE_IMG?= ${.OBJDIR}/gce.raw GCE_UPLOAD_TGTS= gce-check-depends \ gce-do-package \ gce-do-upload @@ -27,10 +26,6 @@ SNAPSHOT_DATE= -v${BUILDDATE} GCE_FAMILY_SUFX= -snap .endif -# Really? Uppercase characters are not allowed? Sigh... -# And don't even get me started on the '.'. -GCE_TARGET:= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}${SNAPSHOT_DATE} - gce-upload: ${GCE_UPLOAD_TGTS} gce-check-depends: @@ -53,25 +48,34 @@ gce-check-depends: . endif .endif -gce-do-package: - @# Yes, really... Sigh. - cd ${.OBJDIR} && mv gce.raw disk.raw - cd ${.OBJDIR} && tar --format=gnutar -zcf \ - ${GCE_TARGET:S,${.OBJDIR}/,,}.tar.gz disk.raw - cd ${.OBJDIR} && mv disk.raw gce.raw - touch ${.OBJDIR}/${.TARGET} - gce-do-login: @echo "This requires human interaction, which is not yet supported." @true -gce-do-upload: +.for _FS in ${GCE_FSLIST} +GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +# Really? Uppercase characters are not allowed? Sigh... +# And don't even get me started on the '.'. +GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} + +gce-do-package-${_FS}: + @# Yes, really... Sigh. + cd ${.OBJDIR} && mv ${GCE_IMG_${_FS}} disk.raw + cd ${.OBJDIR} && tar --format=gnutar -zcf \ + ${GCE_TARGET_${_FS}:S,${.OBJDIR}/,,}.tar.gz disk.raw + cd ${.OBJDIR} && mv disk.raw ${GCE_IMG_${_FS}} + touch ${.OBJDIR}/${.TARGET} + +gce-do-upload-${_FS}: @# Fallthrough in case the bucket already exists. /usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true - /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \ + /usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET_${_FS}}.tar.gz \ gs://${GCE_BUCKET}/ - /usr/local/bin/gcloud compute images create ${GCE_TARGET} \ + /usr/local/bin/gcloud compute images create ${GCE_TARGET_${_FS}} \ --family=${GCE_FAMILY}${GCE_FAMILY_SUFX} ${GCE_LICENSE} \ - --source-uri gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz + --source-uri gs://${GCE_BUCKET}/${GCE_TARGET_${_FS}}.tar.gz touch ${.OBJDIR}/${.TARGET} +.endfor +gce-do-package: gce-do-package-${VMFS} +gce-do-upload: gce-do-upload-${VMFS} diff --git a/release/Makefile.vm b/release/Makefile.vm index e1bba5271a4c..1a58a548b9f4 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -34,7 +34,7 @@ EC2_FLAVOURS= BASE CLOUD-INIT EC2-BASE_DESC= Amazon EC2 image EC2-CLOUD-INIT_DESC= Amazon EC2 Cloud-Init image GCE_FORMAT= raw -GCE_FSLIST= ufs +GCE_FSLIST= ufs zfs GCE_DESC= Google Compute Engine image OCI_FORMAT= qcow2 OCI_FSLIST= ufs From nobody Wed Oct 18 19:43:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9h8v3v3Qz4xS0n; Wed, 18 Oct 2023 19:43: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 4S9h8v3N6Lz4sH9; Wed, 18 Oct 2023 19:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697658191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzE9wJflJZug54A7Lda2Oqjiu3nZSGwAnCTkqjXkK3s=; b=jGHUrAV6IzfzNc+7F6TEvtMmjunDLgPCqubHqO5I7Qx4+hsydfRdEj2SC24798q4j2FlHV h678iRU/nM3TnKzpENQi3mD4rp41jZgMRjdD7NqzfQyusaOnrYCXAzjbYqCEpoGzxq1Ewc TVwOl7wmYs6K4e2HTKogsWH+oa+R7nm3ZZPhDNyVxP6qoXJ1OcUuln/Qp1H7nraqn7ZPi3 /kIRTwsm4sDLV3rOMELzA9CM7f+47kUK65ni89qXWsRQqudFU8IoMurh7N4RoKcE0AeR4B GCcxSSg44UVBx8+pOdfuhtaMlSju8osuDaTGL3a15onIdB1ov3DJEdH0AQmMLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697658191; a=rsa-sha256; cv=none; b=T5JFYmvJn3FV/fhDL24xk9gP20QL2MHEjo5/EL0sRl94RZAXfl9rctk4tBGPV8T74Z09vc NvHkLIZTxiq3Ahcgu6kT2mFu0Te0PZK3Gw1q7WAzO3LwgFdr4416S42R8PCVvds0sYpGVL j5qEwP03vNC6RB9u9Jpnx4lMUp02qbke0UnxFvgSOWlLhSYfWj3th8VFCQD9jujk9MA3+L zi7989jrCjVEMhRVMGSOPXM+n9OdH0gWH6owE5He0TAdQuUTbMk9wiI+fIY8kLALXRyX0R 4OaqmP4+C/VL3Z8HNOEnSBKcwT2dHKDNXzbtxCia/ud2BXUUbif2gVCzE+vRiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697658191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzE9wJflJZug54A7Lda2Oqjiu3nZSGwAnCTkqjXkK3s=; b=VfyM9jAv2gvRBsVIzvf0qJWxip+keE7trgebpSr7QotrByklqhHWeORn8YNYJ7Qn4A37am 6xwkMHOjOkM0HZ+5ANXdPadAgAMMaKpIfwbdVi3hcJOdQ5jgTvQ6Vf28Uds9wUqMl2Webo I02zwA/Aa4SEiwZ1MXxe1HGlufXe4c3W1lTjP904aUG/fj1uCRDSGkfBrsfPNX7W6BqIVP nvvhkiQTYE4OVBB9XMCBQ7fQlCXKrYP+BrNA3eynSs6rdugUXtdMWRgm0xSFjN917PGkDF wZWMoX6F7XMh6sSWy7wrMYNv1P0Ji2HI2T79V1YxI9I4O0tVXIvHDxmBLUZY2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9h8v2PgZz4cT; Wed, 18 Oct 2023 19:43: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 39IJhBhq011428; Wed, 18 Oct 2023 19:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IJhB5F011425; Wed, 18 Oct 2023 19:43:11 GMT (envelope-from git) Date: Wed, 18 Oct 2023 19:43:11 GMT Message-Id: <202310181943.39IJhB5F011425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: c4e298251ab0 - main - nfscl: Handle the NFSERR_RETRYUNCACHEDREP error from a NFSv4 server List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4e298251ab01665f5bb3edeb740a51331818a45 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e298251ab01665f5bb3edeb740a51331818a45 commit c4e298251ab01665f5bb3edeb740a51331818a45 Author: Rick Macklem AuthorDate: 2023-10-18 19:42:12 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 19:42:12 +0000 nfscl: Handle the NFSERR_RETRYUNCACHEDREP error from a NFSv4 server In a recent email list discussion related to NFSv4 mount problems against a non-FreeBSD NFSv4 server, the reporter of the issue noted that the server had replied 10068 (NFSERR_RETRYUNCACHEDREP). This did not seem related to the mount problem, but I had never seen this error before. It indicates that an RPC retry after a new TCP connection has been established failed because the server did not cache the reply. Since this should only happen for idempotent operations, redoing the RPC should be safe. This patch modifies the NFSv4.1/4.2 client to redo the RPC instead of considering the server error fatal. It should only affect the unusual case where TCP connections to NFSv4 servers are breaking without the NFSv4 server rebooting. Reported by: J David MFC after: 2 weeks --- sys/fs/nfs/nfs_commonkrpc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 29c7cdbd671c..29fbb8dc4351 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1300,7 +1300,8 @@ tryagain: nd->nd_procnum != NFSPROC_LOCKU))) || (nd->nd_repstat == NFSERR_DELAY && (nd->nd_flag & ND_NFSV4) == 0) || - nd->nd_repstat == NFSERR_RESOURCE) { + nd->nd_repstat == NFSERR_RESOURCE || + nd->nd_repstat == NFSERR_RETRYUNCACHEDREP) { /* Clip at NFS_TRYLATERDEL. */ if (timespeccmp(&trylater_delay, &nfs_trylater_max, >)) From nobody Wed Oct 18 20:08:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hkb3svXz4xSvZ; Wed, 18 Oct 2023 20:08: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 4S9hkb3KM8z4vVZ; Wed, 18 Oct 2023 20:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697659735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xdFuUphjfEPK4RpPyNuV04eNt+TOTuukcFJvv+32lA=; b=dclEpXJCpDqB/JmBxuO8VDOfHzNa2u7NS3/voHrFopNLXBj/xncpCqKmSXRYgQTW8UBi2/ KQiThiB+ZgllPOrquUOQBPylZIr/6YsXwn0rz95wJWWkixM7QHgK1086kgv77allo2vl8C Q+Ovi9UiFH1wZGUIuzEhIRp8/kv+/odWvH7pRzqUQLvuiu6YIhf3I5auyXTkH/tH/d8Ax4 e/Gq5aY8uogpNnUeVA8XjBoRj4UvzMH2EpOq7xlFhfH9OwQYkwo898tPdVOoqUtDba0GuT 0AZtuHAnncsAaGytIkUqM/7MVjkkzLIsI94CuKR1sFV9QYSdTtuFe2M3dpCdsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697659735; a=rsa-sha256; cv=none; b=pTfSxGsoLpK0lje7GIywQdbXK1L1j4neDdf42up+c4tD+UwdXeHdgNm5KQRFptcJqB8fS9 78a/FYQ/qEC5fr0pYJbRM8SDkN29TX2fs0282wfpRGiPXivXiET6SqkA/6LuHsizUnlYJI goLiJxbNc2L+/ptltAWEBtVbIuUSpvabn8keDE6FVOyzpr7aE1DwVNDy/+OtUH3BdQoXdh M9SsKQ/dicPrUCx47QEgY9ml9NCre869waNLe+RC/bsLPK9mcts0AKuEq+eUNnyB2ruRt6 SJAL2nDcEUNjiYh8sdFERyqUR+DbBGfimeD8jM6jxkIQ+lpRH8Pm+1M98nizTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697659735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xdFuUphjfEPK4RpPyNuV04eNt+TOTuukcFJvv+32lA=; b=JQsyjqR3tXOe6ekIS3hRg5XTZ29R2cvghHJxs7JeUr+BPbUsx9MEhNCMlPzmIJF2XPIq/m ySDWP0xewEe4W7BxZWIt6OX6FgYO1I/QcljPyuFwEklwK8j1EyAsbQwR+FpdH2Ahqk+iMq AQaj63GQizNdVY+7sas5EHI0RrXSmlmTn0Mq/0todYufUlF4nmTya8FxnEqNRRe4jbabgr 4ZGhl9zT0ioUlmpJ16aV9dI1vPbHueiB+YlUmJIdbM4xo1wANb1ruilqBS9bhmQoUbzz5b aZ8/jV8iZE2JRzMq5OQbCI3GPHBfbhcbdIfWMOvEn8c/HWy/xq5zPYoxXbMn9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hkb28KPz5R9; Wed, 18 Oct 2023 20:08: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 39IK8tw4046148; Wed, 18 Oct 2023 20:08:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IK8tTp046145; Wed, 18 Oct 2023 20:08:55 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:08:55 GMT Message-Id: <202310182008.39IK8tTp046145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 57ce37f9dcd0 - main - nfscl: Make NFSv4.2 Copy set atime on infd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57ce37f9dcd0ec749e5e4512e1e44eb963565c68 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=57ce37f9dcd0ec749e5e4512e1e44eb963565c68 commit 57ce37f9dcd0ec749e5e4512e1e44eb963565c68 Author: Rick Macklem AuthorDate: 2023-10-18 20:07:39 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:07:39 +0000 nfscl: Make NFSv4.2 Copy set atime on infd RFC7862 does not specify infile atime behaviour when a NFSv4.2 Copy operation is performed. Since the collective opinion of a mailing list discussion (on freebsd-hackers@) seemed to indicate that copy_file_range(2) should update atime on the infd, even if there is no data copied, this patch attempts to ensure that behaviour. For Copy, it preceeds the Copy operation with a Setattr of TimeAccess_Set(NFSv4. speak for atime) for the invp. For the case where no data will be copied, it does a Setattr RPC to set TimeAccess_Set for the invp. A __FreeBSD_version bump will be done as a separate commit, since this patch changes the internal interface between the nfscommon and nfscl modules. MFC after: 1 month --- sys/fs/nfs/nfs_commonsubs.c | 2 +- sys/fs/nfsclient/nfs_clrpcops.c | 35 +++++++++++++++++++++++++++++++++++ sys/fs/nfsclient/nfs_clvnops.c | 21 ++++++++++++++++++--- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f2305795e53e..832713e6c1de 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -296,7 +296,7 @@ static struct { { NFSV4OP_OPEN, 8, "CreateLayGet", 12, }, { NFSV4OP_IOADVISE, 1, "Advise", 6, }, { NFSV4OP_ALLOCATE, 2, "Allocate", 8, }, - { NFSV4OP_SAVEFH, 5, "Copy", 4, }, + { NFSV4OP_SAVEFH, 6, "Copy", 4, }, { NFSV4OP_SEEK, 2, "Seek", 4, }, { NFSV4OP_SEEK, 1, "SeekDS", 6, }, { NFSV4OP_GETXATTR, 2, "Getxattr", 8, }, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 8fe9158384a0..14351d915ba2 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -8617,6 +8617,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, struct nfsrv_descript *nd = &nfsd; struct nfsmount *nmp; nfsattrbit_t attrbits; + struct vattr va; uint64_t len; nmp = VFSTONFS(outvp->v_mount); @@ -8627,14 +8628,35 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, if (len > nfs_maxcopyrange) len = nfs_maxcopyrange; NFSCL_REQSTART(nd, NFSPROC_COPY, invp, cred); + /* + * First do a Setattr of atime to the server's clock + * time. The FreeBSD "collective" was of the opinion + * that setting atime was necessary for this syscall. + * Do the Setattr before the Copy, so that it can be + * handled well if the server replies NFSERR_DELAY to + * the Setattr operation. + */ + NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); + *tl = txdr_unsigned(NFSV4OP_SETATTR); + nfsm_stateidtom(nd, instateidp, NFSSTATEID_PUTSTATEID); + VATTR_NULL(&va); + va.va_atime.tv_sec = va.va_atime.tv_nsec = 0; + va.va_vaflags = VA_UTIMES_NULL; + nfscl_fillsattr(nd, &va, invp, 0, 0); + + /* Now Getattr the invp attributes. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); + + /* Set outvp. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_PUTFH); (void)nfsm_fhtom(nmp, nd, VTONFS(outvp)->n_fhp->nfh_fh, VTONFS(outvp)->n_fhp->nfh_len, 0); + + /* Do the Copy. */ NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_COPY); nfsm_stateidtom(nd, instateidp, NFSSTATEID_PUTSTATEID); @@ -8649,12 +8671,25 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, *tl++ = newnfs_false; *tl++ = newnfs_true; *tl++ = 0; + + /* Get the outvp attributes. */ *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSWRITEGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); + error = nfscl_request(nd, invp, p, cred); if (error != 0) return (error); + /* Skip over the Setattr reply. */ + if ((nd->nd_flag & ND_NOMOREDATA) == 0) { + NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); + if (*(tl + 1) == 0) { + error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL); + if (error != 0) + goto nfsmout; + } else + nd->nd_flag |= ND_NOMOREDATA; + } if ((nd->nd_flag & ND_NOMOREDATA) == 0) { /* Get the input file's attributes. */ NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 383d45ba260b..fd88531789d9 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3889,7 +3889,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) struct vnode *outvp = ap->a_outvp; struct mount *mp; struct nfsvattr innfsva, outnfsva; - struct vattr *vap; + struct vattr va, *vap; struct uio io; struct nfsmount *nmp; size_t len, len2; @@ -3998,10 +3998,25 @@ generic_copy: * will not reply NFSERR_INVAL. * Setting "len == 0" for the RPC would be preferred, * but some Linux servers do not support that. + * If the len is being set to 0, do a Setattr RPC to + * set the server's atime. This behaviour was the + * preferred one for the FreeBSD "collective". */ - if (inoff >= vap->va_size) + if (inoff >= vap->va_size) { *ap->a_lenp = len = 0; - else if (inoff + len > vap->va_size) + VATTR_NULL(&va); + va.va_atime.tv_sec = va.va_atime.tv_nsec = 0; + va.va_vaflags = VA_UTIMES_NULL; + inattrflag = 0; + error = nfsrpc_setattr(invp, &va, NULL, + ap->a_incred, curthread, &innfsva, + &inattrflag); + if (inattrflag != 0) + ret = nfscl_loadattrcache(&invp, + &innfsva, NULL, 0, 1); + if (error == 0 && ret != 0) + error = ret; + } else if (inoff + len > vap->va_size) *ap->a_lenp = len = vap->va_size - inoff; } else error = 0; From nobody Wed Oct 18 20:15:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hsx2WHXz4xT89; Wed, 18 Oct 2023 20:15: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 4S9hsx1yLgz3C7C; Wed, 18 Oct 2023 20:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL96zT9uV/QeMHN4fMCFS7b0me9hwcqJ9vzvrPGat2c=; b=ICalZDHpQx2j3EqgCe3Z8mSa4jwcr/w+YhhQT7O4hrpMgIZi+sLJsaSU7LU3LmvLdXxKhT CAo91q4Ey/l/sAgDCrkzn/ETOvnhznbUAxjKSgpFbRRtuLArL0ohrG84rozhBF3MA9dJOb yyhf6UFdrqrjz+oZuFBP4o11nuMqxLi575tfITR1uXzszxIr+xSPhhBguLDg7NgTQn4TuD qeo6OTgTCujZjP6cFFralEZsGSGmbHYhn4fsAve/QLmGX8KFR7h5VBSaI+4jr3wReEHbag Bfn2NaWfPq/2PpAbtg8d/AQ+vxi7heDaJrVoBRcLQQbcwA52NBjR4Dxud+9a5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697660117; a=rsa-sha256; cv=none; b=xYMv4yb0mhM9hwSdEjJJHiLPR5tl0SDgMM41dNg9jsFZGHXqpQ1guNdl1b9/HzxkWnOdnE 43he6a0DmI8PWUa9yIhpLYr5TGXVl0lLlrW4XVZfAVrkHDRL2pzHN2oEA5LZF5uBferQ/c 2QUPFeE4c7pjF/F7Us9E2r/68/yF1MEmufSJ19QF++HxyUaoUieV+knQdHuyA4lMzv55A0 /+BnAswxh6dW0HJbk+K0dbe9iAsKyrVT0cBvknSFny2Y1pxYQSTjqznH2yFybCYOTZSAH8 4sB+2uocqrX5oqACVTmLVX7nkv2DCQf4VFQPA7weuLdxD8Nk9F6d+ss5vc0crQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL96zT9uV/QeMHN4fMCFS7b0me9hwcqJ9vzvrPGat2c=; b=uqD7A4K5VsoHWJjUCfKhmEB0jsueo3EVfkGabEcR0l+ep4TuJJYR0nY3x15+Fc9GADgcNC oytGer54I3TcWr/WXJ2QH5ZCKg+qFk3OF9GmOqlpRlsyRGDWZVc+8Ez67/wkT8N5AQLFpv CV0vZtoupYH5QWAYqTpWCt8gGyuLDxB07RUXdMZl2ZRLlnc2RNz6nVm+jiEAUz4KyCM4qm ERxGCpkOeK9I3lh296EOn9tGPTLqsLqXuCQY6ERPZZmwONaa3LFgTxccdNFoSYkI9b0Zeb v+WXfLOpCCaE2SHKlXvO+pwOa9ZdBiz8YO4+O4mP+oFF5oLGcaHOhPjWNzXtkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hsx1124z4tP; Wed, 18 Oct 2023 20:15: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 39IKFHbs062438; Wed, 18 Oct 2023 20:15:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IKFHlx062435; Wed, 18 Oct 2023 20:15:17 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:15:17 GMT Message-Id: <202310182015.39IKFHlx062435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 17f5e2b904af - main - param.h: Bump __FreeBSD_version for commit 57ce37f9dcd0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17f5e2b904aff8e4863199a137ee21ef0939bcf4 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=17f5e2b904aff8e4863199a137ee21ef0939bcf4 commit 17f5e2b904aff8e4863199a137ee21ef0939bcf4 Author: Rick Macklem AuthorDate: 2023-10-18 20:12:26 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:12:26 +0000 param.h: Bump __FreeBSD_version for commit 57ce37f9dcd0 Commit 57ce37f9dcc0 changed the internal KAPI between the nfscommon and nfscl modules. Both must be rebuilt from sources. --- sys/sys/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/param.h b/sys/sys/param.h index 2e4310dac111..929458626a85 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1500001 +#define __FreeBSD_version 1500002 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Oct 18 20:19:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9hyW0gt4z4xSyT; Wed, 18 Oct 2023 20:19: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 4S9hyW09Z0z3CYS; Wed, 18 Oct 2023 20:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBBBTcaD1/xKPt0MaX3lyR4pJzwdxw+8t06QkBYaddI=; b=rMu/P4fqu6IAJ9IzHTVrZK33UQ1M45PZdVqE0dPS4kZQIVEWni3oB/US+a102G9uoAykoh fJYZn2a5XVmPRYfM+diErksRdLhuIqIz+A45nKOYtdyVSJaW/67nkxJVUcoEAgjeYfnz63 /AaRUlcvnLGOKYmRFkr4YuH4jx611QNfnUqP7MIAlRUGQAjM/5rTtUGU8ht4X8NZc0EmkP jCCQPfdaDDy8O3F0pyTCzgma/StTbt6QBn+BfBMnmkfJe7Fz+xCW+Jy5vzIr88ExJG0kYg tO6/TuL/sWrvDKxVfmwnmccd/mNWt451lX/Iz+xbY/Moox8NWH0kmeWg6PlP6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697660355; a=rsa-sha256; cv=none; b=N0S6Ga5eTIWphc2uPGiVGDe94M44kZPcnIx4MtnGhjUrHe4/nR4s+gaL7gkHXmfvjGuPKx mPt0e8f4psSZxlhRsPRJEg+m1XUzGsP/lD5tn4wo5ZkMEQDFCE3qutSfuUAwwhLKA1m7s5 qfu5jXUNhRLlQsrwBTrfPvs0kyg893xX0NtFImdfclXIAqz1S7DB99IR2Zu+PRJQnMIfyy DBHV7iaaZ1aUy2BbqNR3tbOaznZfAiPIJ2DjSNDGNhsc6mH3E+OSmxqV9upJlCzwUHsJnd BqSWLtkMM2IuQbOigRtq1R0Uo+yzdL5taZphgeFN3T0/It+vQME0f6OirLJ+FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697660355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBBBTcaD1/xKPt0MaX3lyR4pJzwdxw+8t06QkBYaddI=; b=OkKC1ozHWprgJVG5oUDsHdM+WzsOuXBJcP3z8Zk9l3Co8w307sQ1AJ4Ti+r6hcoeE8Qzn4 Oyonp/imW9+/KDBCoBYwHzhDpLepRj2qxG7IMZ6pD898J4v+rcEJLsFT0xY0IZ65Sx+z+Z aQUsurFhmaLbVvbKujw5Fio2Vaghpvj3nnaKDOx7K+jq5a3Ii6sSkwt25z/oa3XTFFgHCa DBLQtkuazCU6UnH8dVmXuazuFVvG3q7dvqpCXdAaSGCn7cSRrRChaqYJB6xlOMBB3KLl2H E3Yvw/dn28/+LdiN1LUONgk7dbC3Mr91RWSiVZTo4o93+HGcknmUZKnmD9DzMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9hyV6LQMz5Sl; Wed, 18 Oct 2023 20:19: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 39IKJEk2063065; Wed, 18 Oct 2023 20:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39IKJE8f063062; Wed, 18 Oct 2023 20:19:14 GMT (envelope-from git) Date: Wed, 18 Oct 2023 20:19:14 GMT Message-Id: <202310182019.39IKJE8f063062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: fb7140b1f928 - main - UPDATING: Add entry for commit 57ce37f9dcd0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb7140b1f928a00d03ce2c11a9e6e1b7515272fe Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=fb7140b1f928a00d03ce2c11a9e6e1b7515272fe commit fb7140b1f928a00d03ce2c11a9e6e1b7515272fe Author: Rick Macklem AuthorDate: 2023-10-18 20:17:42 +0000 Commit: Rick Macklem CommitDate: 2023-10-18 20:17:42 +0000 UPDATING: Add entry for commit 57ce37f9dcd0 --- UPDATING | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPDATING b/UPDATING index b750b2b913b5..9334ebf0dd5e 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ 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".) +20231018: + Commit 57ce37f9dcd0 changed the internal KAPI between the + nfscommon and nfscl modules. Both must be rebuilt from sources. + 20231010: dialog(1) has been replaced in base by bsddialog(1), while most of the time replacing a dialog(1) call by a bsddialog(1) call works out of the From nobody Thu Oct 19 02:44:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9sWS3HHRz4xqxB; Thu, 19 Oct 2023 02:44: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 4S9sWS2mXcz3gsZ; Thu, 19 Oct 2023 02:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697683492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmAOq7wySaitB/62r9PMV9n/63f53EsWfcnpr5zgOCc=; b=CLUsubmjxavstWO93y2dSgpoYlI401yLr6Bm2wb15jGHDH8ZNruY8oBgpKt6CACWS1GJXJ OEaELNGiaX9AjE32lRdx6UWbVXX5mDIEml9a+HEvLQHdF+UQUPShmhKwX76AvGhapjE67c FGJPIsUWTq8wOoY5fV3k8qFCp/2VAjNXT9EDDeJdfqsXrC5rn7KelErkeyD36bNkB44fYc 9yulS/GmDxa3m2EcloUSFKCp/cz/eogDGxisH3HSajWm7exvYRBb5z7cZuV3E8OEZGSAEZ 5W3D1Mvt3yAK7bb7lTQgs3rQoNRPLUk2GGg/v4B3C58qJMyN84l9EGLRBYU8vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697683492; a=rsa-sha256; cv=none; b=UkViZ0kQgI7dE14c9HlxK5jcTulDZzSnvNkmbe6Cwl6hOoYaEIU2Vaa39weA/xAfPkKHHN k/2dA69GkDcTl94srMQJBDET/f7bXqi/yFGR244kKn3alp7S7HNXxwXWY9jYvx5SaDI0xM F1fNuGmwKsbGo6/s9CGeLSYK9ffzqzcn19sCDlY35HQf6bKrJ89yhYjEGd/wihj9hepVLB caNmHrpVwRC6V0yD+k7rVmLVQVDI+wMZ4iHJyyaeQeidy0s7N+qtYT2H7tj6hqrhYZasPB c4FfObMzKQ+k7xkwKeWpfRwoGXvzzXnYl2b7HI1q56UoZE3fGJupNkrhtlO3bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697683492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmAOq7wySaitB/62r9PMV9n/63f53EsWfcnpr5zgOCc=; b=Huem5Lx3Qvfye+5zwQI5/lHwR6EK3ab3BLqVyWn87wHui7AoyCjdtU1lvaQKZLkR/RepHi cMl9lAi177F3JLrHngYOJM9Ffy6W0x7FRf8fI/wLDsFK9A8c6zMwQYEEUdbguJ3s5TKiF+ iDnb/EiOg+CHcqa1lX/iMsLou8VSVYBBLBxgFublOsqMB1Hxmn197iEhyOR8NJH3SrTP4D AaSheNcBsttvTQircYsrIv9E1SSub8RAWq8yDk6ts+4vEM9nr6mIbKzknJA4BiiiGMdr4F ZUg9Jm6ZXSyQN3TPwmLqWtokX96I8sN4pb0JLP7WGtVTh62IpeDLRI5iCKFr6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9sWS1sFqzXf5; Thu, 19 Oct 2023 02:44: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 39J2iqqO010039; Thu, 19 Oct 2023 02:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J2iqva010036; Thu, 19 Oct 2023 02:44:52 GMT (envelope-from git) Date: Thu, 19 Oct 2023 02:44:52 GMT Message-Id: <202310190244.39J2iqva010036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 767c97c501ae - main - install: handle -m +X more accurately List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 767c97c501ae72eb3d74bc23ddf5a1d570d8f841 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=767c97c501ae72eb3d74bc23ddf5a1d570d8f841 commit 767c97c501ae72eb3d74bc23ddf5a1d570d8f841 Author: Kyle Evans AuthorDate: 2023-10-19 02:43:06 +0000 Commit: Kyle Evans CommitDate: 2023-10-19 02:44:05 +0000 install: handle -m +X more accurately As described by chmod(1), +X in the mode may be used to optionally set the +x bit if the file is a directory if any of the execute/search bits are set in the original mode. The latter is not applicable because we assume -m is a fresh mask, but a functional +X could be useful in the former case if we're passing along a common INSTALL_MODE that's designed to install either 0644 or 0755 depending simply on whether it's a directory or not. Reviewed by: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42273 --- usr.bin/xinstall/tests/install_test.sh | 16 ++++++++++++++++ usr.bin/xinstall/xinstall.c | 12 ++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index b42bdfd0dc60..cbe95f0dfbf3 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -481,6 +481,21 @@ set_owner_group_mode_unpriv_body() { atf_check_equal "$u:$g:10$cM" "$(stat -f"%u:%g:%p" testc)" } +atf_test_case set_optional_exec +set_optional_exec_head() { + atf_set "require.user" "unprivileged" +} +set_optional_exec_body() +{ + echo "abc" > testfile.src + + atf_check install -d -m ug+rX testdir + atf_check test -x testdir + + atf_check install -m ug+rX testfile.src testfile + atf_check test ! -x testfile +} + atf_init_test_cases() { atf_add_test_case copy_to_nonexistent atf_add_test_case copy_to_nonexistent_safe @@ -523,4 +538,5 @@ atf_init_test_cases() { atf_add_test_case mkdir_simple atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv + atf_add_test_case set_optional_exec } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index d19bacbe8c1b..1ab9cac76f2f 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -189,6 +189,7 @@ main(int argc, char *argv[]) fset = 0; iflags = 0; + set = NULL; group = owner = NULL; while ((ch = getopt(argc, argv, "B:bCcD:df:g:h:l:M:m:N:o:pSsT:Uv")) != -1) @@ -255,11 +256,10 @@ main(int argc, char *argv[]) break; case 'm': haveopt_m = 1; + free(set); if (!(set = setmode(optarg))) errx(EX_USAGE, "invalid file mode: %s", optarg); - mode = getmode(set, 0); - free(set); break; case 'N': if (!setup_getid(optarg)) @@ -301,6 +301,14 @@ main(int argc, char *argv[]) usage(); } + /* + * Default permissions based on whether we're a directory or not, since + * an +X may mean that we need to set the execute bit. + */ + if (set != NULL) + mode = getmode(set, dodir ? S_IFDIR : 0) & ~S_IFDIR; + free(set); + if (getenv("DONTSTRIP") != NULL) { warnx("DONTSTRIP set - will not strip installed binaries"); dostrip = 0; From nobody Thu Oct 19 03:06:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9t0W6Gdqz4xs9K; Thu, 19 Oct 2023 03:06: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 4S9t0W5hdxz4G0t; Thu, 19 Oct 2023 03:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697684795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldDNF1NLrGBoEK4yuDeRfIjllSsYCEa5s5XvH4C+1h0=; b=xKXELo2g8kvJQmNsY1osQSL273USc1TkK/lI6bsxbpgM/jdAn2Ul18qBDq6t3poz/OQYJx N2zYXzmnPUbvuANz4e8wgp1gJvrM9Pm2Z0wsjHItg6RdsR6e2K5heqluCxRGhvKoU4/a7p /IrSIyzD+Lhpe5he1m9iCZaao7IDOacY9nJb0+8zp1lwOBR+RazHrCBDdd9aBbMf+JoNP/ 5KeJpAyi3LCELzAxa0m99c0fwqDUcsGWMjT7eu9YVvmJ/9RVny3BSKHYobNFiOOcyYGs4K xMzTb6z7Hwm0RXsfNCUt0wTQEichyKslqeR2ENuj0C/4RSJRc+o8n6wdDOm5cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697684795; a=rsa-sha256; cv=none; b=XXV05V6f265TbehnxeEWjG0+19NJxS68I8+X+R+oqvkHcl4vBEeuhYCQjO9srba91TUZrT xtylvQ36bh8cd0B0gHhnDYjvjvKVw6cWlMK5rTr6adiBM07v0BdIc0ll+g6dba8Pa/4yvo hro+OAol1zEwBj2uhROCwQlPLyjQLa0gwumMseqi2ZN4LDghw4091q4cluWxZdPZXvD9Xq bXAm7BFoH0uWMWNzqvarELkY+mVpS5+hvuk7+n+2p45uhh1WbOsJz2XOHvBBqoRr1X3Dt2 BrgJnt/Lg8z5FVVMUAYgoCx1WRhXH+/5uk5T+DlO3AeZ9LtT/2nSETfw3yCYhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697684795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ldDNF1NLrGBoEK4yuDeRfIjllSsYCEa5s5XvH4C+1h0=; b=ec3yFn/hxL44ecplphwaSBRQco6Z7iTQkVpqMKeJ6q3ir7/wPkDn9wivmYbrU/uLjOFarb OkXDnFfFCGnjLgN9JuiFc8nkuDlwu/OfKDz3Sn2WiRErXSoZpRm0ijwlCfLZF3l73gDE2t ddD7NlPFwp7hc6CrgTcFY0znq8S43PnaOsXg59+Z55IaydwYySM40Ep1IQdPqc9pUqDxAr rq/zxInwsRcatn7Cw1H2DVhvGRwNIOAVrkCSyn6fvaqdXojlOnGCgHNn/2HG4iuelelx3k ko+9TrJrjLtsdc+0Jb/SIGF2K0Mfp/IpOI75U58DRWVp0u3lt8A6uJARn+EJzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9t0W4lcBzY0c; Thu, 19 Oct 2023 03:06: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 39J36ZEd045471; Thu, 19 Oct 2023 03:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J36ZgW045468; Thu, 19 Oct 2023 03:06:35 GMT (envelope-from git) Date: Thu, 19 Oct 2023 03:06:35 GMT Message-Id: <202310190306.39J36ZgW045468@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: b064a4c9eed5 - main - smartpqi: Drop spinlock before freeing memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 commit b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547 Author: John F. Carr AuthorDate: 2023-10-19 03:02:42 +0000 Commit: Warner Losh CommitDate: 2023-10-19 03:06:40 +0000 smartpqi: Drop spinlock before freeing memory pqisrc_free_device frees the device softc with the os spinlock held. This causes crashes when devices are removed because the memory free might sleep (which is prohibited with spin locks held). Drop the spinlock before releasing the memory. MFC After: 2 days PR: 273289 Reviewed by: imp --- sys/dev/smartpqi/smartpqi_discovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index 7e084a81cd89..ac37c2233762 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1671,11 +1671,11 @@ pqisrc_free_device(pqisrc_softstate_t * softs, pqi_scsi_dev_t *device) pqisrc_delete_softs_entry(softs, device); DBG_NOTE("Removed memory for device : B %d: T %d: L %d\n", device->bus, device->target, device->lun); + OS_RELEASE_SPINLOCK(&softs->devlist_lock); pqisrc_device_mem_free(softs, device); + } else { + OS_RELEASE_SPINLOCK(&softs->devlist_lock); } - - OS_RELEASE_SPINLOCK(&softs->devlist_lock); - } From nobody Thu Oct 19 03:24:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9tPf2bWgz4xt3y; Thu, 19 Oct 2023 03:24: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 4S9tPf25Y8z4JNb; Thu, 19 Oct 2023 03:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697685894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1G2UhIzh58uT5rLgi9LSTXhxaFL7hRGEhagzD5CJMc=; b=V0B3z3l9tt8o3CTI5CqoZknkcvDf1UOeNchzzdDrzZvysDEUPe/01vkvhoCUjrjsNRgXjR kZTpHNITNR03+X9oOqAl91a3gDTkWNllATC0c1Xq50JDvqALDobKOkIpV3Cv6N3fF6Z0/5 6CAUP1ygPpnGOnHp4B8KmV+vUE4OGdx2PmCOm810DSNqhoB+pLjHIvUifDUqdjsRxampa3 2VGcxnWC82buIuV7EQyXpNeBr9fo1ilhVsxVKnSng0z2nj/pAvjUOaamfrm1jEA330JGhF afBYg+ekRsgbiiaXxPiKyE3pw5UH0WLzkKmrDE5HaE8u0DfG4m/eSRDgyH9fEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697685894; a=rsa-sha256; cv=none; b=YRMO5jV9Lj6ytGA21SvG1Jtj1MymXUr4672rbtqCDdn3J6Tdx1OvpgPLPF/5hK+twTNR0p ChGWkGPuMkp93E4uMCCyOfeHezvJD80eHMxhkrYcLOXYgmMrKK2MI5B6E23lT8dKOTQbfm cerDRRo81u90bAUxa6WF0JDmYUZX3i2v87ymgchY+iEm/Kpygcnnt+GgB2GX7SwJ9cZqCM SHOPEEompxq6hvFNLMqbZA4tItBUxcc807mMTi9xwpRnLcjmNyiIEQRwgxsrgXLulkzlWo zCrKWSqCrdu9asI5gaeERlWKv6sNpkcjyjTPTdzONcNF/Do7DrO/IHcSoTmqNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697685894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P1G2UhIzh58uT5rLgi9LSTXhxaFL7hRGEhagzD5CJMc=; b=Hg7EBe5FTO/wU+FTWCFxdGU9ngYhAUhYghPLD+63b4LCqS6tFjBMErFjVAzOHT42GAUXUt YBnL71lWiTxqRQX/c7Kck9sJH6pm8gWzqM41FsCQ5HqF1BQF8YTmpKePG5wKGdqWC7IS7S 8nV4hlXYdX/GR9a+sqVCb3wGbkGMOHqRd/xOt0QlPHTmD4556Hhosq+T47gcpDDP7jMCci z8x2DPFmHPFV24w4Hft7hQgrhJXuqDYjoBb6gJ3yk7nazof0ZiFlqmoarLc8Cj1wZdA0Av 6b1AcBJ2o3WZ7YFa2azHsuoykNqcDUP1HanWSZVVqiAJWDyYHs+ovlYk3iYlCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9tPf18v4zYdm; Thu, 19 Oct 2023 03:24: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 39J3Os7w078939; Thu, 19 Oct 2023 03:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J3OsqK078936; Thu, 19 Oct 2023 03:24:54 GMT (envelope-from git) Date: Thu, 19 Oct 2023 03:24:54 GMT Message-Id: <202310190324.39J3OsqK078936@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: f07b267d8cc8 - main - smartpqi: Change alignment for dma tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f07b267d8cc87e88be3c78aa69504b5ebc6571ee Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f07b267d8cc87e88be3c78aa69504b5ebc6571ee commit f07b267d8cc87e88be3c78aa69504b5ebc6571ee Author: John Hall AuthorDate: 2023-10-19 03:10:58 +0000 Commit: Warner Losh CommitDate: 2023-10-19 03:12:27 +0000 smartpqi: Change alignment for dma tags Problem: Under certain I/O conditions, a program doing large block disk reads can cause a controller to crash. Root Cause: The SCSI read request and destination address in the BDMA descriptor is incorrect, causing the BDMA engine in the controller to assert. Fix: Change the alignment for creating bus_dma_tags in the driver from PAGE_SIZE (4k) to 1, which allows the controller to manage it's own address range for BDMA transactions. Risk: Medium Exposure: This reverts a change first made to support NVMe drives on Excalibur. At that time a 4k alignment was necessary. This no longer seems to be the case. PR: 259541 Reported by: Ka Ho Ng Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41619 --- sys/dev/smartpqi/smartpqi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index e79a6f0a173f..402841bbf4d6 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -629,8 +629,8 @@ smartpqi_attach(device_t dev) * Create DMA tag for mapping buffers into controller-addressable space. */ if (bus_dma_tag_create(softs->os_specific.pqi_parent_dmat,/* parent */ - PAGE_SIZE, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR,/* lowaddr */ + 1, 0, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ (bus_size_t)softs->pqi_cap.max_sg_elem*PAGE_SIZE,/* maxsize */ From nobody Thu Oct 19 05:22:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9x0t5f6Hz4y0KR; Thu, 19 Oct 2023 05:22: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 4S9x0t4tDVz4WLr; Thu, 19 Oct 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCcHEQ6izrezYl94vYTc0ehzqbWq9TjWvY+jm62Uc=; b=refzRkndTPgAlh1Ur8f5DI+nZF94e3H/t0cgeCNwTdyYDtO19qsxGkZN8HvxwpirWfjI3Q xL7lG8nMYPrvnkKfW1pTrbEC7uwgwzj6rLrmiPVQTBNAczC2i1E1TJAKxNWalRVvtvXg30 1m6Z6RzQUbQXnDcnxmpjRTI5NLWN50xNC3l8Hv2oRNW1g3qioEdmMWnJxZlVKBCG7kaOj2 cMH8sFjChM+uUFAYZPs1BWy80dVVDbIRkmVIG+JmaMh5v+rXz8cB+uU+ES1lCmCTkEH4e6 jpyg8Oxif2hoDHfmkBSUNfXI+65z8dHcELeohY9LPHCtW+Lyr/UKrZTKsuNjEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697692926; a=rsa-sha256; cv=none; b=yoBvbUY5JOsvZZcHOuUoV77Qt2I3oQ72vk2MmrMxqdfagNOt5MDsFFPhoY7ACl3EURKL6b uviZwauXEYo1+GNXRm8nI0ODYV8VzUBKmcstFp25HqCwD2bFR8oRunq5NSbfa6MuDIfnQN A4eaLy2uglcOAZ3OnaQylz2kJQ/EQcSPS2y0JNQ65lmfE8oV8qRtqOh4/s+x+SqeCUcjl7 AnAqm4KHxTVLbnaQ3cRqWs7BqGmWJbkw8MicdwzBdmIBGNS7HkMkPPDPjNmUTF2qNmsl/j UoL5RvO/Ldwviio8SrfF0rDDru11H+owyr9rNF1VcWtOo4Wscju8gj79H5d4AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCcHEQ6izrezYl94vYTc0ehzqbWq9TjWvY+jm62Uc=; b=Yql8BVZsMgnqTYCH84UYZuOQY9NykFjQhPYzHXqzmsCzAh6BagqQP6BsuVAXGM+19ycD09 xCsdqNc8mnaWd7duEmQkFNcPrQlevQXO+Q/alF78DFyPv90qkwnBlFp58orJewoYmTk7Ea cxLhqpp1kMaV9TzRqwWALYpVPSM1cBDKsvmP+RN2s/nl0DRiDKH5LH8sr6b7aHzXqL8Tb0 OljMHeVtOaY6DuoQCZ6IoAXygohUUKjxRzCLNR3IRy0cJ0hlXIZaynvtxkRRtK03PiAqEO ubcp4hYFceXPpSzKdlnUGkpIpzQos3oGAuijaG/byIKwi9AfOWT4AfvI66jSLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9x0t3wrkzcV9; Thu, 19 Oct 2023 05:22: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 39J5M6gi073749; Thu, 19 Oct 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J5M6Ln073746; Thu, 19 Oct 2023 05:22:06 GMT (envelope-from git) Date: Thu, 19 Oct 2023 05:22:06 GMT Message-Id: <202310190522.39J5M6Ln073746@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: 2d49ff1e21a7 - main - tests/netlink: mark the vlan(4) test with required module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc commit 2d49ff1e21a74b8f641752b63a59dc3ef9e38ddc Author: Gleb Smirnoff AuthorDate: 2023-10-19 05:21:53 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-19 05:21:53 +0000 tests/netlink: mark the vlan(4) test with required module --- tests/sys/netlink/test_rtnl_iface.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/netlink/test_rtnl_iface.py b/tests/sys/netlink/test_rtnl_iface.py index d34e36ee8eef..41cb4d16de94 100644 --- a/tests/sys/netlink/test_rtnl_iface.py +++ b/tests/sys/netlink/test_rtnl_iface.py @@ -317,6 +317,7 @@ class TestRtNlIface(NetlinkTestTemplate, SingleVnetTestTemplate): @pytest.mark.require_user("root") def test_create_vlan_plain(self): """Creates 802.1Q VLAN interface in vlanXX and ifX fashion""" + self.require_module("if_vlan") os_ifname = self.vnet.iface_alias_map["if1"].name ifindex = socket.if_nametoindex(os_ifname) From nobody Thu Oct 19 05:22:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9x0v70k5z4xyvY; Thu, 19 Oct 2023 05:22: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 4S9x0v6LNsz4WYf; Thu, 19 Oct 2023 05:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LT3ibNk/zVzzq9MXiJAM0C3QHH8jbo2D+Ib8qeIAtI=; b=lNBZZdkSagyaadA+RssdZiRLu+a1kITYoKjdcXM7SjfXl6ZV5UQpjjX/+oGkxJdCJAGxJQ 4qdGYgF9zkydejMVSo+ZpB29OMI3iZKFmfAOfy0kribH93c5nkxf8ZKMOnDa/ocypN2c+C zVv3neaIUWXHCJBOevO3HtrP3uQs0Iq5Z+netE1kWBEj32ezNMRy+N9nbic5tLBDx0FMKt nJ7k3fLgERb8j3NGlniNC6WYXJGD+riImOocJTHdNS/lUNCQ7KdSqwxytrSRbr2rl7O7Il ierV0zV/ZpmbvzSCbqTOcdXgVn7kCGAWRJy132Ha2OhxaAxOnEDdaDAr79A5Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697692927; a=rsa-sha256; cv=none; b=vsWL/aGxBDJBOYj7bP440OI94dDRbBdhaCOY0xx5GqJw+2Tebotp3vl5ywtbsjg48rdUKs EG7g2pWX8Sbmab23nnpRocpT/bEJLYWBOTteIhPS3BfdwK24Rj4yGPec3xlDICtztUTt3G kFdz+pa4dZAn1TUUgqYEnb2MLUgj/hT2J69tRkIArwxbiwNZMp7JIkwZGGsBSU2xtNmDB/ DhPpAAmaHyn6JGmMWwbiKfxwW9RhdktQEwhLTSBpRSERY6cjAg9WQCxswpSoS4q3cTWYGY /9Q4deu6I89pW78njvWtGj3SXkRjeBdlv5zKyacTegWW/9s5mMSdPDFcd8RHUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697692927; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/LT3ibNk/zVzzq9MXiJAM0C3QHH8jbo2D+Ib8qeIAtI=; b=WrXL90gcQOvjeq1BBpf3nbOH1s9WyrKb9UY/uwJmYG3HYVwl15caifkN7VSetIoJ/bmJJb b2Y2iw/aE0NybVWbr9uOfyTAgyI4/4DD4xdHWYaUQ6PrjhfqX0Z0OvUALDchuBXNSPspiR 6bzvylQg8QZQcx30Fuxnm9F7WZaq6me6gaGN4oGaEe7nAuWiR8DQO2FiBoTIlJQfMKdypL YBIvrbhRlnPnh3iv1GyyWMzueEYGtktRo075/skhopmtqDLGZWMNFKlGcg2SspQz6JGOKW MkJBHCIWrc9kdJ1aWQJP+p3V9wCKVryIBoLcdzeEpUbesLoUgwnHlVMlyDbzrA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9x0v58BkzcHl; Thu, 19 Oct 2023 05:22: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 39J5M7tb073794; Thu, 19 Oct 2023 05:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J5M7uk073791; Thu, 19 Oct 2023 05:22:07 GMT (envelope-from git) Date: Thu, 19 Oct 2023 05:22:07 GMT Message-Id: <202310190522.39J5M7uk073791@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: 28f6910714e3 - main - net/route: properly brace the RT_LOG() macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28f6910714e32138fa2b2950a22aac91c04bd053 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=28f6910714e32138fa2b2950a22aac91c04bd053 commit 28f6910714e32138fa2b2950a22aac91c04bd053 Author: Gleb Smirnoff AuthorDate: 2023-10-19 05:21:53 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-19 05:21:53 +0000 net/route: properly brace the RT_LOG() macro --- sys/net/route/route_debug.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/net/route/route_debug.h b/sys/net/route/route_debug.h index b00fbf1784e7..1e682bd4561b 100644 --- a/sys/net/route/route_debug.h +++ b/sys/net/route/route_debug.h @@ -107,10 +107,11 @@ SYSCTL_DECL(_net_route_debug); * Example: [nhop_neigh] nhops_update_neigh: L2 prepend update from lle/inet/valid/vtnet0/10.0.0.157 */ #define RT_LOG(_l, _fmt, ...) RT_LOG_##_l(_l, _fmt, ## __VA_ARGS__) -#define _RT_LOG(_l, _fmt, ...) if (_DEBUG_PASS_MSG(_l)) { \ - _output("[" DEBUG_PREFIX_NAME "] %s: " _fmt "\n", __func__, ##__VA_ARGS__); \ -} - +#define _RT_LOG(_l, _fmt, ...) do { \ + if (_DEBUG_PASS_MSG(_l)) \ + _output("[" DEBUG_PREFIX_NAME "] %s: " _fmt "\n", \ + __func__, ##__VA_ARGS__); \ +} while (0) /* * Wrapper logic to avoid compiling high levels of debugging messages for production systems. From nobody Thu Oct 19 08:51:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB1fX3g11z4y8pN; Thu, 19 Oct 2023 08:51: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 4SB1fX3Cd9z3Q8W; Thu, 19 Oct 2023 08:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaH71qyDL+SvNHjguFlVyeAFO9DHPGqBZiJkzaqNXgY=; b=BrIULkzt/a+gw52UQI21OegxCwTL8MIkZbX7+m3ITbYi4DxIFJz11mnQotefU2LbkfLqNT uBlhHHYgd3Wc2CuMoKyJgABTGdTD16lDGxuSptd0QW2xTU1YuQJ7z0Og5f5RMEfZAJ6hTi udlrBvo/e0h1lPaPaxsmlURlDbMLak2E+aRmV0Xl7goXQPN3SFs/8E9WNivqhBVv+9UsEt 0zysEacGY4p7n6UnUi+G5M4qSKIzduiTru+nQL+R3SKWM/NaEKGklAD4+QdOZmE0DQnQQa cjhsdj/tH2Au7Jc0ofEt3+B7DeRBlSjzbp7dYuU5sPjOtUdYKFNoNnUhwm8HiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697705492; a=rsa-sha256; cv=none; b=PRg/QwasYkAzWdSNC1ThuFRCDrl7GMhFzOZ8lDFYSE8/+7kmzJLLkQWYepyJaJOgaVEWSL J9PSQVzkX2xjTYs03WkcwNV29TQlXxVmOjlzuugjjWqY/+diJtsaYwvpLwDcntJjBa4TKH aYvJYwlkgAufXcx2kC4zI7KN1r7FrGchMUH8h/fZT5CyxCtpU50WSjTKKDENi/5eqBoA2O ePCq+H1HQkSuINwHpF6FZXmsM258NiI9Q2loQRw/YKtxS7h33BdXTfzZbq8BOPVWo2MITJ zTiUl0Ym/Hfvg75dSg2qoOXs8teCGHt3wQdlfp89pKWCCoTzuI7E/gVhoYQ0Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KaH71qyDL+SvNHjguFlVyeAFO9DHPGqBZiJkzaqNXgY=; b=wNA/iCYCX1N7LY5LhYsvAWkm2BCiIpc9vLHTIuOiKJveiHlrx+bkOV4T0M5rEKXMtmXBVM E++LbSt/PrR5KcDxCqJJrRxxjhyXedCYRr3dfx44C8qfLQkVKLznLEhFsF9FAJ12mt+IfK 3HcrQBDvhY3lIs4Uqf+mNwptJGT4UMaqqafysPRVWhcmbUPh1YZJwAF8kgqra58NoUU1VK pSs0QgbhXnIWC9b8O/N2FvjTBai4CeOCYdgwKlM7DYtcnbZiF8YhFy+vR1PmYKa962j9gd 2s+DVHTyDe8/C0euNYNPlR1vMPp12b6J2wLgwkaCZEDuGZFqWKpDNv18g7WSGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB1fX2GKZzjr4; Thu, 19 Oct 2023 08:51: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 39J8pWhm025523; Thu, 19 Oct 2023 08:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J8pW1X025520; Thu, 19 Oct 2023 08:51:32 GMT (envelope-from git) Date: Thu, 19 Oct 2023 08:51:32 GMT Message-Id: <202310190851.39J8pW1X025520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 68513b4102dc - stable/14 - pf: Free pf_rule_items when state is not created List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 68513b4102dc75a9f4ca49692f97be721e407f0c Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=68513b4102dc75a9f4ca49692f97be721e407f0c commit 68513b4102dc75a9f4ca49692f97be721e407f0c Author: Kajetan Staszkiewicz AuthorDate: 2023-10-12 17:43:04 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 07:29:05 +0000 pf: Free pf_rule_items when state is not created This addresses the issues of pf_rule_times leaking in case of stateless rules and in case of state creation failures, like hitting the state limit. Reviewed by: kp MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42169 (cherry picked from commit 4d19eceaefb7106d761bc9504bb0da737ae0d674) --- sys/netpfil/pf/pf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3dddfdd0b1a4..39d240f49dbd 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4731,6 +4731,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, struct pfi_kkif *kif, return (action); } } else { + while ((ri = SLIST_FIRST(&match_rules))) { + SLIST_REMOVE_HEAD(&match_rules, entry); + free(ri, M_PF_RULE_ITEM); + } + uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk); } @@ -4776,6 +4781,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, struct tcphdr *th = &pd->hdr.tcp; u_int16_t mss = V_tcp_mssdflt; u_short reason, sn_reason; + struct pf_krule_item *ri; /* check maximums */ if (r->max_states && @@ -4986,6 +4992,11 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, return (PF_PASS); csfailed: + while ((ri = SLIST_FIRST(match_rules))) { + SLIST_REMOVE_HEAD(match_rules, entry); + free(ri, M_PF_RULE_ITEM); + } + uma_zfree(V_pf_state_key_z, sk); uma_zfree(V_pf_state_key_z, nk); From nobody Thu Oct 19 08:52:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB1gS5QmRz4y8cW; Thu, 19 Oct 2023 08:52: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 4SB1gS4zNMz3R1h; Thu, 19 Oct 2023 08:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzvSsZ1B3M2a7JV+YSE4HipaOAXGQCqmGHotl71Shec=; b=vbt4wJwKHYxMVBbTZzSptHZPt09JnkKUideQASi4naVIUJKHycTDiq4rhTMXWiJ/cJffaK pIXPwYbnuiNgZ6YsrMnu/PXQbyKy9zHflbnmBEcMV+BrdXUMzsz3SGtqhBkh28TbL2YJIe Alg7XRdjbW/05seCali6EPtIniecV1k0D345u7X5MDRuwqltkznrEzK/K5W83qUR9DCdBo UiQUsGb0/7XoKD/fcsB3jdAKdvPTsn9uI6x1RZGTd4jqDNgNqxVpfUGCJAPAFGLPf8Rgb7 15fIfKnmBE7xwzP2zDAU5VirfMeBxBZMCDO0AG2tsUqjicIu5atbOA6Ff8+ISg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697705540; a=rsa-sha256; cv=none; b=GwfkdLtSz/H4tt9jhddYBAVogD0SEc7pR43E1bg4nvXbWX/D93RlffrImU7pjUR1ybs0YJ jFMy9WH5awEWZolhr225pA+Myi+RwIa+l1RJ3Sy5B4jzZGFjMwLvZ5gwGMcfaRCKKcI/rK u0ZL6X3pv9ruHKUnA44PffX7dhtKjGqcq4MqIiKfsvpmnsoflP4V6RvYGBSxRYHg4G9c0V 29NcacNK35uVJ9pJFDh2EGUBrMixG9aEb1bHWono3BhddGlf++RMl432KJasbc4o3aSydi /HHjt9iADPNL0r5kWh6X8jFsKmXpUIgvMtoCD6D26+goszhBBVFSOYwhe23a4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697705540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bzvSsZ1B3M2a7JV+YSE4HipaOAXGQCqmGHotl71Shec=; b=a94kCzVUienCcTcto6SGNG247blOkRcVAhJ8Ne1MqkStXg6jNAE+U+8zVdOGc1yigx8XQi WtLa2V0fWlmdeEXQfj//FGg0XyjjdN59eW3L1BOnKGhu/+HAuI2CVyU6/gQdbxdN8Ei0lX CsBsw+Zfh8UBUsA6w4O1W3e6mK2M114dkCMCtb6VFOxbKscBj/qkdPXzjA8e69fMi8mx7u dS2h5Zq1T6QVD156zuY2bjYE19uyScLcwt7rSCAd1V44eKuFt8aG18qkG8qRkDBItKyavU R7a4kzBdFg3IrESOrKG7isXYqnF1EUATx6ODp/qdKVz0KG+YixkYQpFX528sPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB1gS42L9zjrG; Thu, 19 Oct 2023 08:52: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 39J8qKmD028788; Thu, 19 Oct 2023 08:52:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J8qKqb028786; Thu, 19 Oct 2023 08:52:20 GMT (envelope-from git) Date: Thu, 19 Oct 2023 08:52:20 GMT Message-Id: <202310190852.39J8qKqb028786@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: 5ed470bdb9da - main - pf: Update documentation regarding matching, scrubbing and reassembly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ed470bdb9da6442d6030cf0a7a8493f759fbb43 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5ed470bdb9da6442d6030cf0a7a8493f759fbb43 commit 5ed470bdb9da6442d6030cf0a7a8493f759fbb43 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-19 08:41:32 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 08:41:32 +0000 pf: Update documentation regarding matching, scrubbing and reassembly Update pf documentation: - default behaviour of fragment reassembly - introduction of scrub option for filter rules - disadvantages of using the old scrub ruleset - options supported for match rules - fix missing list block end - remove duplicate description of match filter rule - update example to modern syntax Reviewed by: kp Fragments obtained from: OpenBSD Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42270 --- share/man/man5/pf.conf.5 | 149 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 103 insertions(+), 46 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 2bc57d4f7f5b..349e6c9ee4eb 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 21, 2023 +.Dd October 17, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -386,7 +386,9 @@ set limit frags 20000 .Ed .Pp sets the maximum number of entries in the memory pool used for fragment -reassembly (generated by +reassembly (generated by the +.Ar set reassemble +option or .Ar scrub rules) to 20000. Using @@ -480,6 +482,29 @@ For example: .Bd -literal -offset indent set optimization aggressive .Ed +.It Ar set reassemble yes | no Op Cm no-df +The +.Cm reassemble +option is used to enable or disable the reassembly of fragmented packets, +and can be set to +.Cm yes +or +.Cm no . +If +.Cm no-df +is also specified, fragments with the +.Dq dont-fragment +bit set are reassembled too, +instead of being dropped; +the reassembled packet will have the +.Dq dont-fragment +bit cleared. +The default value is +.Cm no . +.Pp +This option is ignored if there are pre-FreeBSD 14 +.Cm scrub +rules present. .It Ar set block-policy The .Ar block-policy @@ -753,19 +778,21 @@ Used to specify that packets must already be tagged with the given tag in order to match the rule. Inverse tag matching can also be done by specifying the ! operator before the tagged keyword. +.El .Sh TRAFFIC NORMALIZATION -Traffic normalization is used to sanitize packet content in such -a way that there are no ambiguities in packet interpretation on -the receiving side. -The normalizer does IP fragment reassembly to prevent attacks -that confuse intrusion detection systems by sending overlapping -IP fragments. -Packet normalization is invoked with the -.Ar scrub -directive. -.Pp -.Ar scrub -has the following options: +Traffic normalization is a broad umbrella term +for aspects of the packet filter which deal with +verifying packets, packet fragments, spoofed traffic, +and other irregularities. +.Ss Scrub +Scrub involves sanitising packet content in such a way +that there are no ambiguities in packet interpretation on the receiving side. +It is invoked with the +.Cm scrub +option, added to filter rules. +.Pp +Parameters are specified enclosed in parentheses. +At least one of the following parameters must be specified: .Bl -tag -width xxxx .It Ar no-df Clears the @@ -824,22 +851,8 @@ Replaces the IP identification field with random values to compensate for predictable values generated by many hosts. This option only applies to packets that are not fragmented after the optional fragment reassembly. -.It Ar fragment reassemble -Using -.Ar scrub -rules, fragments can be reassembled by normalization. -In this case, fragments are buffered until they form a complete -packet, and only the completed packet is passed on to the filter. -The advantage is that filter rules have to deal only with complete -packets, and can ignore fragments. -The drawback of caching fragments is the additional memory cost. -This is the default behaviour unless no fragment reassemble is specified. -.It Ar no fragment reassemble -Do not reassemble fragments. .It Ar reassemble tcp Statefully normalizes TCP connections. -.Ar scrub reassemble tcp -rules may not have the direction (in/out) specified. .Ar reassemble tcp performs the following normalizations: .Pp @@ -891,6 +904,41 @@ blind attacker would have to guess the timestamp as well. .Pp For example, .Bd -literal -offset indent +match in all scrub (no-df random-id max-mss 1440) +.Ed +.Ss Scrub ruleset (pre-FreeBSD 14) +In order to maintain compatibility with older releases of FreeBSD +.Ar scrub +rules can also be specified in their own ruleset. +In such case they are invoked with the +.Ar scrub +directive. +If there are such rules present they determine packet reassembly behaviour. +When no such rules are present the option +.Ar set reassembly +takes precedence. +The +.Ar scrub +rules can take all parameters specified above for a +.Ar scrub +option of filter rules and 2 more parameters controlling fragment reassembly: +.Bl -tag -width xxxx +.It Ar fragment reassemble +Using +.Ar scrub +rules, fragments can be reassembled by normalization. +In this case, fragments are buffered until they form a complete +packet, and only the completed packet is passed on to the filter. +The advantage is that filter rules have to deal only with complete +packets, and can ignore fragments. +The drawback of caching fragments is the additional memory cost. +This is the default behaviour unless no fragment reassemble is specified. +.It Ar no fragment reassemble +Do not reassemble fragments. +.El +.Pp +For example, +.Bd -literal -offset indent scrub in on $ext_if all fragment reassemble .Ed .Pp @@ -902,6 +950,14 @@ much in the same way as works in the packet filter (see below). This mechanism should be used when it is necessary to exclude specific packets from broader scrub rules. +.Pp +.Ar scrub +rules in the +.Ar scrub +ruleset are evaluated for every packet before stateful filtering. +This means excessive usage of them will cause performance penalty. +.Ar scrub reassemble tcp +rules must not have the direction (in/out) specified. .Sh QUEUEING with ALTQ The ALTQ system is currently not available in the GENERIC kernel nor as loadable modules. @@ -1479,28 +1535,21 @@ rules differ from .Ar block and .Ar pass -rules in that parameters are set every time a packet matches the rule, not only +rules in that parameters are set for every rule a packet matches, not only on the last matching rule. For the following parameters, this means that the parameter effectively becomes "sticky" until explicitly overridden: .Ar queue , .Ar dnpipe , -.Ar dnqueue +.Ar dnqueue , +.Ar rtable , +.Ar scrub . .It Ar pass The packet is passed; state is created unless the .Ar no state option is specified. -.It Ar match -Action is unaltered, the previously matched rule's action still matters. -Match rules apply queue and rtable assignments for every matched packet, -subsequent matching pass or match rules can overwrite the assignment, -if they don't specify a queue or an rtable, respectively, the previously -set value remains. -Additionally, match rules can contain log statements; the is logging done -for each and every matching match rule, so it is possible to log a single -packet multiple times. .El .Pp By default @@ -2579,6 +2628,8 @@ contain the necessary header information for the subprotocol that allows to filter on things such as TCP ports or to perform NAT. .Pp Besides the use of +.Ar set reassemble +option or .Ar scrub rules as described in .Sx TRAFFIC NORMALIZATION @@ -2587,7 +2638,11 @@ above, there are three options for handling fragments in the packet filter. One alternative is to filter individual fragments with filter rules. If no .Ar scrub -rule applies to a fragment, it is passed to the filter. +rule applies to a fragment or +.Ar set reassemble +is set to +.Cm no +, it is passed to the filter. Filter rules with matching IP header parameters decide whether the fragment is passed or blocked, in the same way as complete packets are filtered. @@ -2620,11 +2675,13 @@ rules. .Pp In most cases, the benefits of reassembly outweigh the additional memory cost, and it's recommended to use +.Ar set reassemble +option or .Ar scrub -rules to reassemble -all fragments via the +rules with the .Ar fragment reassemble -modifier. +modifier to reassemble +all fragments. .Pp The memory allocated for fragment caching can be limited using .Xr pfctl 8 . @@ -2989,12 +3046,12 @@ rdr on $ext_if proto tcp from any to any port 80 \e # (157.161.48.183, the only routable address) # and the private network is 10.0.0.0/8, for which we are doing NAT. +# Reassemble incoming traffic +set reassemble yes + # use a macro for the interface name, so it can be changed easily ext_if = \&"kue0\&" -# normalize all incoming traffic -scrub in on $ext_if all fragment reassemble - # block and log everything by default block return log on $ext_if all From nobody Thu Oct 19 10:34:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB3x22fgYz4xGsX; Thu, 19 Oct 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB3x22575z3Ymb; Thu, 19 Oct 2023 10:34:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697711654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=LsUQ8u83oGjSTLACUNCc0ycVpvHsu9jX0q7HGGg0TbS3zuzQew+8kHBeRDMPjYBL6EEVM+ MdDqA69nbAu7LrFp/+Ul/roeWYBaKBg3ZCu+pcO5B6+/RZy39217K3OwumigOEScCjtNND wx1Ygm7IHwz15wJe6S9X4Fc2YtSV5XjoxasnTmVhlPPl8CDoobgog5cfxYQMNvcT8oFXGq /t6NHj9zTwn6zftRyZUqRo/gLiM9jmQalBwyfzWPVKUF9jArtV/t5i1y5Cv5wa50yANQQB lXtmk7EH2kkPLytnVx9Brwie0Bmt1v7Pa8Dep96cOt/BBSqiqLh4F8ISqkDUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697711654; a=rsa-sha256; cv=none; b=qksVxBvQiHUsv2EZgSgaiRvuF9FtytPaQtmMy4Uph+VoKGtBo8DzRZC3AobVs+2f1iy6Cs zfZWcjf7Ym1f+gnX6Ef7GDA85sk3hQL3C5xWwIESHqgIyuylONNASZwyXGSLIn8fnY05eU KnIS/XPqmvIgbs8TaYpa9KUlosi4msgg9lSVoOw33NzF0gaXsus18O/5IZUJzx90zo3PD3 pzD593a2GQ8fQSIpza6dW986g1TE/pbmwCfMUQJ9tJ5Bli2yAU0aNyAZnwhvBA5rQGQ55F bO6Gvr3FYR+0JwJIXv5gaDSOdT3c+fAiOi29opEtuH9kjRllyNrLbiYB+7cS6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697711654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6m8UaAImprzWyzG9F1hPX+02qSkX65oWCcdcLkJyFw=; b=xUcUKzLRzD1wTbDtAoiQpqytFR6M/XTffHUMjab2ybjZ9ynj3G0xRkRhdE37pu0eKY9Uzz 24vWDOWtF9TGUaal/GA4Xz7ag0L5/L/yJCtcflDj6aZAIjlqwOhDlXlwStIaPru5pdP1Gx MhgAQzle0g8L8lWB2a0NcaWiwkL6OCPJwHuXdMLYhaP+eL2C+cArqjvJZ+zL6JN/T3geiI kgA0acCGU7JR9u+jHHU36ABZl2VRBrdI4gt1sR/bDu5IK7OrnTh/ln9IqOm1QQXXRO0G64 Q8oXmXCHze5nd42o1ZQsSPzhYa5wA3qsmBYwuMaf/KP941DRcAf6bCUr8bk2CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB3x217tXzmLg; Thu, 19 Oct 2023 10:34: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 39JAYEu0095529; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JAYEE9095527; Thu, 19 Oct 2023 10:34:14 GMT (envelope-from git) Date: Thu, 19 Oct 2023 10:34:14 GMT Message-Id: <202310191034.39JAYEE9095527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bb8ecf259f96 - main - vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb8ecf259f96510b9c2146d846403393543061b7 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bb8ecf259f96510b9c2146d846403393543061b7 commit bb8ecf259f96510b9c2146d846403393543061b7 Author: Dmitry Chagin AuthorDate: 2023-10-19 10:33:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-10-19 10:33:58 +0000 vfs cache: Fallback to namei to resolve symlinks with leading / in target for non-native ABI This is a temporary solution to fix PR before release. During 15.0 it's necessary to refactor symlinks handling between vfs & namecache. PR: 273414 Reported by: Vincent Milum Jr, Dan Kotowski, glebius Tested by: Dan Kotowski, glebius Reviewed by: Differential Revision: https://reviews.freebsd.org/D41806 MFC after: 3 days --- sys/kern/vfs_cache.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 99e293d5a873..4b51b3558739 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5426,12 +5426,14 @@ cache_fplookup_symlink(struct cache_fpl *fpl) struct nameidata *ndp; struct componentname *cnp; struct vnode *dvp, *tvp; + struct pwd *pwd; int error; ndp = fpl->ndp; cnp = fpl->cnp; dvp = fpl->dvp; tvp = fpl->tvp; + pwd = *(fpl->pwd); if (cache_fpl_islastcn(ndp)) { if ((cnp->cn_flags & FOLLOW) == 0) { @@ -5487,6 +5489,9 @@ cache_fplookup_symlink(struct cache_fpl *fpl) cache_fpl_checkpoint(fpl); return (cache_fpl_partial(fpl)); } + if (__predict_false(pwd->pwd_adir != pwd->pwd_rdir)) { + return (cache_fpl_aborted(fpl)); + } } return (0); } From nobody Thu Oct 19 11:00:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB4W73XVzz4xHs6; Thu, 19 Oct 2023 11:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB4W731Spz3dK1; Thu, 19 Oct 2023 11: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=1697713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7L151Cej8FIrzCCwm+I8WLzTkWUIubJ8+WfpwH8NUTM=; b=iWV8j419t+N4gDuv/Hi2hKVWAILgKj2BbQsaUecSayY6sLxpXlH0EAdYQ63ZRrbzGV8iIg KD0hoiwrkA/ZTFZkkM1V6cEIieDd3Rd9MmeePta3H0wdPvpdqr3xny+0Ruuj2o79Oprr43 +khny2e9vtqHWHf1/BipMs82jYuu9L5FHx+MsWY1JRnym00y/qaqwt/XqchFO1lRBX0HRR lZ8XAs1r93V7XrZOdpPhVlkEAAhrjfUtGAeQiOpXJ+325a0eeYT3/UoDsOrH80+tS4OZi8 BQEcs5NHecZLO9+BpQM69+HUFAfllcJioxoCyCRnXMSHcK1TYsn0KdVJurz3OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697713219; a=rsa-sha256; cv=none; b=cUk4H/evRWeDQVE2RcuezCktQ05CRc6806pQeiuPSPIgxmf5221qFN0Q3zh77UFVnvG41H 9uV8TuSDtzM1tjG5rrLXcY8cxtJZTLt6DtnZlOdnvUnqS4GNkPPYO04iQElR6PyR0sHmDY 74DTPdz8t3L+gfKvE6bJXYPPB+toXN3YSwdR6E7zl6NaoKpTGkzfPjvDT03g5HAEBllkZ0 hax6ZfN+S5A6YY27DqGctiUpEsXqrjMbbOL6+Vb8FyKDoboym1vU34uYUOE1s30wJDlVDY 4rTBwNIHXTAHod0OWUMXehTeggflM0gnPkRKUAPP9LFWf5gjER63Ib0C6y7McQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697713219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7L151Cej8FIrzCCwm+I8WLzTkWUIubJ8+WfpwH8NUTM=; b=R0KmERIT0sKSRAeBhUP82BuQwXU/VLQJXGNHDKfCUsw8bJPHA3kQ752DHuse0ByQ7KeiSq cyKStdccpRNhgt5kGGxDFhvdqLqU/yhR2w6foZXwviXoxfgTtUk7fqD7cz1Dc2vwPRYNca CGuzvpG44tHrg5shk4aX2+GtYdneNzvXmJb8AllzC5W/9DzMZXQruI3IJEtfFaer/RD6/P +K/tLNhM2Jem5Wt+/XwB8MKS93n+vGmbM/5w1TLNgNC+Nb92BiRhAS2d2mDCkTprLdDtcE BukYAnzfa1U92p9U/XxSddILCMeetPRcaCWMCZ/DdN3S0geC5n/VMaQi3aMHNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB4W724Sxzm2k; Thu, 19 Oct 2023 11: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 39JB0Jce039293; Thu, 19 Oct 2023 11: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 39JB0JJN039291; Thu, 19 Oct 2023 11:00:19 GMT (envelope-from git) Date: Thu, 19 Oct 2023 11:00:19 GMT Message-Id: <202310191100.39JB0JJN039291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: e44751530e04 - main - bsdinstall hostname: Restore bsdconfig API List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e44751530e04ef8326ff22c0d3f7d880c82d3395 Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=e44751530e04ef8326ff22c0d3f7d880c82d3395 commit e44751530e04ef8326ff22c0d3f7d880c82d3395 Author: Alfonso S. Siciliano AuthorDate: 2023-10-19 10:54:24 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-19 10:59:49 +0000 bsdinstall hostname: Restore bsdconfig API Restore bsdconfig API to handle hostname dialog because bsddialog 1.0 matches all features required by bsdconfig(1). Implicitly this commit restores also Xdialog(1) for this script. This commit reverts: - "bsdinstall hostname: Replace dialog with bsddialog" 6368dcb29228dd8e18d50c54c3ca1596262d4676 - "bsdinstall(8) hostname: Update for bsddialog 0.3" 5f3ec44e7e9c11f90ad1128db1116925b493fad0. The script continues to use bsddialog(1) by default via $DIALOG in bsdconfig(1). --- usr.sbin/bsdinstall/scripts/hostname | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/hostname b/usr.sbin/bsdinstall/scripts/hostname index 7aa97ef095f7..19df8885893b 100755 --- a/usr.sbin/bsdinstall/scripts/hostname +++ b/usr.sbin/bsdinstall/scripts/hostname @@ -47,8 +47,6 @@ f_include $BSDCFG_SHARE/dialog.subr ############################################################ GLOBALS -: ${BSDDIALOG_CANCEL=1} - # # Strings that should be moved to an i18n file and loaded with f_include_lang() # @@ -75,14 +73,18 @@ dialog_hostname() local hline= local value="$*" - bsddialog \ + local height width + f_dialog_inputbox_size height width \ + "$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt" "$value" "$hline" + + $DIALOG \ --title "$DIALOG_TITLE" \ --backtitle "$DIALOG_BACKTITLE" \ --hline "$hline" \ --ok-label "$msg_ok" \ --no-cancel \ --inputbox "$prompt" \ - 0 0 "$value" \ + $height $width "$value" \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD } @@ -98,7 +100,7 @@ f_dialog_backtitle "$msg_freebsd_installer" # Get user input # HOSTNAME=$( dialog_hostname "$HOSTNAME" ) -[ $? -eq $BSDDIALOG_CANCEL ] && exit 1 +[ $? -eq $DIALOG_CANCEL ] && exit 1 # # Store the user's choice From nobody Thu Oct 19 12:31:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB6Xv4v88z4xP1Z; Thu, 19 Oct 2023 12:31: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 4SB6Xv4Snnz4Hpt; Thu, 19 Oct 2023 12:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697718719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L6dsKKULn1chbLU2FbxEXvmmRodMKTF502fN2pEML+E=; b=l9xzA+f0/LnR68MoL6lMoCrfsciNAJmqk6Tq3Ht9ykA8stbDWdiHuYP4Uq9PlR30in5fSm h1JvLY86pS3OznEQKGn1ZlRULXx1mK0QbVX3pGviZ21Xx9MDnUQnrM9Llt6DrZzkFRnJP9 qxO4QHOIa+hF3GQWLEgknY4rrSkvJszXbPGpxV1PaGkRscWCrbquB+5CL4M9OwXmLSkxBw F3KNvkjjHz6sZYRqUAfqFqfPnYWONiCe0ZLKe0f8+LyOlQH81EIvGsBxgYejW3tJ80ck6t +XHFnLPvduzSC2uQgW0Hod7cSsYxhvXFA5RyY+G3/mzpga4tl18ncb/rlglImg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697718719; a=rsa-sha256; cv=none; b=b24gsa8vN9IdPrYz3fIURvahTHIV/5dDQUSqH8TO6WzdVuzXCvDJ3cqERlTlRaw9VnUBxS WBOOI4ScrmQHyFKkeZoFH4n/FI1Qw7oTG6/8viLzZK+kvi1BbUE28FdFLcxy5aQtxnlGrk JzctalPhVqJRz8CQujmZZ9QhNEYNsau4OaByaxm9zNVZVzNSRpsjmXPOED4LFLMT9ZeMKZ 5Aa1OX5h3C5CW0rT2n8AK//TAcHLKNdGVuIXrVo83FtMvTKQUN7Zf/OZSwEkRgf4APGKVK y4NLgBC2zjJVPWZku39vP4kCaaAaIqNZMbo6MIfW4KG0Cs9Q+i8MddJLv9Yf8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697718719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L6dsKKULn1chbLU2FbxEXvmmRodMKTF502fN2pEML+E=; b=TBuSnba7SC2Mg09oUReiMZo83dxDxI6DZsCa26bKx7Zwx7yxoZvsAn21Pz+mSi9A+u8k19 DcRZHcdmQgOX5UxtV+1FiHHOY/IBJLLMlqger6mTvOeXzBibr7aVnple0XBg2WF7wqn3Fl Spr6lrqE1O29xF79L4YruWeTufp8hOZjeWig3bRj7NVOr6m7LsmPsiSAOkt1dtttkclx+Q ePntqlrDsTyPVw9lXM5IVdq6TEXdx2ePfJ4M+9KfmcYVN7Guk9EPwv/alJB5R00vPf7Tc8 fNapZhtqfO6OLnWakutrwfIMkE6x7RVUbXAQQ2TKUy2muj6nRKWL4mnBQhvVSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB6Xv3X5mzpym; Thu, 19 Oct 2023 12:31: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 39JCVx0q092661; Thu, 19 Oct 2023 12:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JCVx78092658; Thu, 19 Oct 2023 12:31:59 GMT (envelope-from git) Date: Thu, 19 Oct 2023 12:31:59 GMT Message-Id: <202310191231.39JCVx78092658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1016db078351 - releng/14.0 - ifconfig: add static bridge addresses for vlan 0, not 1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1016db0783516d8ff11e1a1b580ef0799d6d9c87 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1016db0783516d8ff11e1a1b580ef0799d6d9c87 commit 1016db0783516d8ff11e1a1b580ef0799d6d9c87 Author: Kristof Provost AuthorDate: 2023-10-13 10:34:06 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 12:31:34 +0000 ifconfig: add static bridge addresses for vlan 0, not 1 Since fd7edfcdc3 ("bridge: fix lookup for untagged packets in bridge_transmit()") and b0e38a1373 ("bridge: distinguish no vlan and vlan 1") we do a better job of distinguishing between untagged and VLAN 1 traffic. However, ifconfig still defaulted to adding addresses for VLAN 1, rather than for untagged traffic. Change this to be the most common (i.e. untagged) option. Approved by: re (kib) Reviewed by: zlei, philip MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42188 (cherry picked from commit 6ace92326f3cc4bbee9b74f6b656cb13699a78a2) (cherry picked from commit ce3ab9dfee304d335b4307c35e77407771d6cc3f) --- sbin/ifconfig/ifbridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 3a97a5af3931..57ab0c6ae81c 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -407,7 +407,7 @@ setbridge_static(if_ctx *ctx, const char *val, const char *mac) memcpy(req.ifba_dst, ea->octet, sizeof(req.ifba_dst)); req.ifba_flags = IFBAF_STATIC; - req.ifba_vlan = 1; /* XXX allow user to specify */ + req.ifba_vlan = 0; /* XXX allow user to specify */ if (do_cmd(ctx, BRDGSADDR, &req, sizeof(req), 1) < 0) err(1, "BRDGSADDR %s", val); From nobody Thu Oct 19 12:37:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB6gS05Kcz4xPDy; Thu, 19 Oct 2023 12:37: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 4SB6gR6szGz4JPZ; Thu, 19 Oct 2023 12:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqfQ6C7xy/AA1msqRwpEI7Tyx3caU3u5EZB4kOCPezk=; b=OQGGeJKtdqQynz0liEUS2nzp31N2zn0ZP19h+8auIG6nyVyNM8jB/CIiPdvBsBJzeAlmgB c56KcDh0hHBakd+7Zlr+5aFpTwWdvSnqaQDHGbOp9IpCE3MW2kyusef31+KpRMWFsYGZGh wXSOwiOXMurZJknJkPomOUJ+/DgyJbYWz+jRytyQ3LmZgLib7UCLQ+Y7swr28vnMA4KP9C Im90FE6+e7zxhKzElPstwNcCSvMvfWFhXMUWiuT7dyFR8lZP6JdR650CwosLX6T5KLHBpv BaKx+P0+8SU/8FVQfmoLfg0h0tTa6c69HPZTqwV756LfEdcsoygq9uWPWjAzdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697719059; a=rsa-sha256; cv=none; b=EKVQdWirdaYMVa0KPZkH4uDSEud9JX1icYDCKbfXoV6SW+OR3EnWAY65/VwwD5v11fI2Tx uNxGP609E1JgoEL/1qHmqywupl70yBTN4Xuavq4b10S7rJAnC4C8Kp3mbYfECIhANpzZs9 Rp+tTDNCZT/C+oPkhz/TgLyr87IJ9c+v2ULAHimw+vmQUn6wNev50eE29aPaC4SCi2Mm9D QA9l2+U4LpAm3/igEymPaqDCBpPDQ8eOKd0f8b0UKgOs06m4CGtwTj2TEks6a87jDH1oZN 5mcTSXrcq3noJwQ6rLq1ShIRsvScN5wkTSliYYzdQtOe4n9CV1WGCnLheOFPbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PqfQ6C7xy/AA1msqRwpEI7Tyx3caU3u5EZB4kOCPezk=; b=V3B14zxJPKe2fIIlswdlQI4JLFJxQNMvtuKtM4Q7CgdTS158kt572vfUn7ORY7VbtNUSAl dt+qezoXcO0cWQwUqlQ8bK4u/pOjgNd//DaGylrH9wXQBOa1cusKGfDTkjIHtKzjRN0hfP m2Tm2y0RCbDdVbmsLgaOl3e/2XbJJRq3Jj+mBI5QMVl0rn7r+wRDlA11/NjoMlBMI8qzBS 6x/0ksaK9InMr/XB7HMokWyrMYCV4s2NwvF7EWGI/gqjmL2DEWNwMEH4S3a7fcpZAriCRi x0uJ32O1kNKXdbg8b8OFNwGNStwtHwX4fOYqkPK1FGLLyOpQy7vzY4MMyTLJSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB6gR5q71zpqp; Thu, 19 Oct 2023 12:37: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 39JCbdFX094557; Thu, 19 Oct 2023 12:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JCbdXp094554; Thu, 19 Oct 2023 12:37:39 GMT (envelope-from git) Date: Thu, 19 Oct 2023 12:37:39 GMT Message-Id: <202310191237.39JCbdXp094554@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: fabf705f4b5a - main - pf: fix pf divert-to loop List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 commit fabf705f4b5aff2fa2dc997c2d0afd62a6927e68 Author: Igor Ostapenko AuthorDate: 2023-10-19 10:12:15 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 10:12:15 +0000 pf: fix pf divert-to loop Resolved conflict between ipfw and pf if both are used and pf wants to do divert(4) by having separate mtags for pf and ipfw. Also fix the incorrect 'rulenum' check, which caused the reported loop. While here add a few test cases to ensure that divert-to works as expected, even if ipfw is loaded. divert(4) PR: 272770 MFC after: 3 weeks Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D42142 --- sys/netinet/ip_divert.c | 31 ++- sys/netinet/ip_var.h | 10 + sys/netpfil/pf/pf.c | 32 ++- tests/sys/netpfil/pf/Makefile | 4 + tests/sys/netpfil/pf/divapp.c | 149 ++++++++++++++ tests/sys/netpfil/pf/divert-to.sh | 413 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 625 insertions(+), 14 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index dd0a8b74c013..ad95a1ce0d76 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -171,11 +171,19 @@ divert_packet(struct mbuf *m, bool incoming) u_int16_t nport; struct sockaddr_in divsrc; struct m_tag *mtag; + uint16_t cookie; NET_EPOCH_ASSERT(); mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); - if (mtag == NULL) { + if (mtag != NULL) { + cookie = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + nport = htons((uint16_t) + (((struct ipfw_rule_ref *)(mtag+1))->info)); + } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { + cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; + nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + } else { m_freem(m); return; } @@ -216,7 +224,7 @@ divert_packet(struct mbuf *m, bool incoming) divsrc.sin_len = sizeof(divsrc); divsrc.sin_family = AF_INET; /* record matching rule, in host format */ - divsrc.sin_port = ((struct ipfw_rule_ref *)(mtag+1))->rulenum; + divsrc.sin_port = cookie; /* * Record receive interface address, if any. * But only for incoming packets. @@ -265,7 +273,6 @@ divert_packet(struct mbuf *m, bool incoming) } /* Put packet on socket queue, if any */ - nport = htons((uint16_t)(((struct ipfw_rule_ref *)(mtag+1))->info)); SLIST_FOREACH(dcb, &V_divhash[DIVHASH(nport)], dcb_next) if (dcb->dcb_port == nport) break; @@ -304,6 +311,7 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, const struct ip *ip; struct m_tag *mtag; struct ipfw_rule_ref *dt; + struct pf_divert_mtag *pfdt; int error, family; if (control) @@ -390,13 +398,30 @@ div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, return (EAFNOSUPPORT); } + mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL); + if (mtag == NULL) { + /* this should be normal */ + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag == NULL) { + m_freem(m); + return (ENOBUFS); + } + m_tag_prepend(m, mtag); + } + pfdt = (struct pf_divert_mtag *)(mtag+1); + if (sin) + pfdt->idir = sin->sin_port; + /* Reinject packet into the system as incoming or outgoing */ NET_EPOCH_ENTER(et); if (!sin || sin->sin_addr.s_addr == 0) { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT; + pfdt->ndir = PF_DIVERT_MTAG_DIR_OUT; error = div_output_outbound(family, so, m); } else { dt->info |= IPFW_IS_DIVERT | IPFW_INFO_IN; + pfdt->ndir = PF_DIVERT_MTAG_DIR_IN; error = div_output_inbound(family, so, m, sin); } NET_EPOCH_EXIT(et); diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index 06560fb52afe..a8c687682af9 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -326,6 +326,16 @@ extern void (*ip_divert_ptr)(struct mbuf *m, bool incoming); extern int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); + +/* pf specific mtag for divert(4) support */ +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +struct pf_divert_mtag { + uint16_t idir; // initial pkt direction + uint16_t ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter +}; +#define MTAG_PF_DIVERT 1262273569 + #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 39d240f49dbd..a6c7ee359416 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7628,7 +7628,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, u_short action, reason = 0; struct mbuf *m = *m0; struct ip *h = NULL; - struct m_tag *ipfwtag; + struct m_tag *mtag; struct pf_krule *a = NULL, *r = &V_pf_default_rule, *tr, *nr; struct pf_kstate *s = NULL; struct pf_kruleset *ruleset = NULL; @@ -7718,21 +7718,26 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, off = h->ip_hl << 2; if (__predict_false(ip_divert_ptr != NULL) && - ((ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { - struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(ipfwtag+1); - if (rr->info & IPFW_IS_DIVERT && rr->rulenum == 0) { + ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL)) { + struct pf_divert_mtag *dt = (struct pf_divert_mtag *)(mtag+1); + if ((dt->idir == PF_DIVERT_MTAG_DIR_IN && dir == PF_IN) || + (dt->idir == PF_DIVERT_MTAG_DIR_OUT && dir == PF_OUT)) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; goto done; } pd.pf_mtag->flags |= PF_MTAG_FLAG_PACKET_LOOPED; - m_tag_delete(m, ipfwtag); } if (pd.pf_mtag && pd.pf_mtag->flags & PF_MTAG_FLAG_FASTFWD_OURS_PRESENT) { m->m_flags |= M_FASTFWD_OURS; pd.pf_mtag->flags &= ~PF_MTAG_FLAG_FASTFWD_OURS_PRESENT; } + m_tag_delete(m, mtag); + + mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); + if (mtag != NULL) + m_tag_delete(m, mtag); } else if (pf_normalize_ip(m0, kif, &reason, &pd) != PF_PASS) { /* We do IP header normalization and packet reassembly here */ action = PF_DROP; @@ -8014,17 +8019,19 @@ done: if (__predict_false(ip_divert_ptr != NULL) && action == PF_PASS && r->divert.port && !PACKET_LOOPED(&pd)) { - ipfwtag = m_tag_alloc(MTAG_IPFW_RULE, 0, - sizeof(struct ipfw_rule_ref), M_NOWAIT | M_ZERO); - if (ipfwtag != NULL) { - ((struct ipfw_rule_ref *)(ipfwtag+1))->info = + mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, + sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); + if (mtag != NULL) { + ((struct pf_divert_mtag *)(mtag+1))->ndir = ntohs(r->divert.port); - ((struct ipfw_rule_ref *)(ipfwtag+1))->rulenum = dir; + ((struct pf_divert_mtag *)(mtag+1))->idir = + (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : + PF_DIVERT_MTAG_DIR_OUT; if (s) PF_STATE_UNLOCK(s); - m_tag_prepend(m, ipfwtag); + m_tag_prepend(m, mtag); if (m->m_flags & M_FASTFWD_OURS) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { @@ -8052,6 +8059,9 @@ done: ("pf: failed to allocate divert tag\n")); } } + /* this flag will need revising if the pkt is forwarded */ + if (pd.pf_mtag) + pd.pf_mtag->flags &= ~PF_MTAG_FLAG_PACKET_LOOPED; if (pd.act.log) { struct pf_krule *lr; diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 44fe95680dfb..c9adab5626d4 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -2,10 +2,12 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf +BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= ioctl ATF_TESTS_SH+= altq \ anchor \ + divert-to \ dup \ ether \ forward \ @@ -45,6 +47,8 @@ ATF_TESTS_PYTEST+= sctp.py # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true +PROGS= divapp + ${PACKAGE}FILES+= CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ diff --git a/tests/sys/netpfil/pf/divapp.c b/tests/sys/netpfil/pf/divapp.c new file mode 100644 index 000000000000..908c41eaa67f --- /dev/null +++ b/tests/sys/netpfil/pf/divapp.c @@ -0,0 +1,149 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Igor Ostapenko + * + * 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 PROJECT 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 PROJECT 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. + */ + +/* Used by tests like divert-to.sh */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + + +struct context { + unsigned short divert_port; + bool divert_back; + + int fd; + struct sockaddr_in sin; + socklen_t sin_len; + char pkt[IP_MAXPACKET]; + ssize_t pkt_n; +}; + +static void +init(struct context *c) +{ + c->fd = socket(PF_DIVERT, SOCK_RAW, 0); + if (c->fd == -1) + errx(EX_OSERR, "init: Cannot create divert socket."); + + memset(&c->sin, 0, sizeof(c->sin)); + c->sin.sin_family = AF_INET; + c->sin.sin_port = htons(c->divert_port); + c->sin.sin_addr.s_addr = INADDR_ANY; + c->sin_len = sizeof(struct sockaddr_in); + + if (bind(c->fd, (struct sockaddr *) &c->sin, c->sin_len) != 0) + errx(EX_OSERR, "init: Cannot bind divert socket."); +} + +static ssize_t +recv_pkt(struct context *c) +{ + fd_set readfds; + struct timeval timeout; + int s; + + FD_ZERO(&readfds); + FD_SET(c->fd, &readfds); + timeout.tv_sec = 3; + timeout.tv_usec = 0; + + s = select(c->fd + 1, &readfds, 0, 0, &timeout); + if (s == -1) + errx(EX_IOERR, "recv_pkt: select() errors."); + if (s != 1) // timeout + return -1; + + c->pkt_n = recvfrom(c->fd, c->pkt, sizeof(c->pkt), 0, + (struct sockaddr *) &c->sin, &c->sin_len); + if (c->pkt_n == -1) + errx(EX_IOERR, "recv_pkt: recvfrom() errors."); + + return (c->pkt_n); +} + +static void +send_pkt(struct context *c) +{ + ssize_t n; + char errstr[32]; + + n = sendto(c->fd, c->pkt, c->pkt_n, 0, + (struct sockaddr *) &c->sin, c->sin_len); + if (n == -1) { + strerror_r(errno, errstr, sizeof(errstr)); + errx(EX_IOERR, "send_pkt: sendto() errors: %d %s.", errno, errstr); + } + if (n != c->pkt_n) + errx(EX_IOERR, "send_pkt: sendto() sent %zd of %zd bytes.", + n, c->pkt_n); +} + +int +main(int argc, char *argv[]) +{ + struct context c; + int npkt; + + if (argc < 2) + errx(EX_USAGE, + "Usage: %s [divert-back]", argv[0]); + + memset(&c, 0, sizeof(struct context)); + + c.divert_port = (unsigned short) strtol(argv[1], NULL, 10); + if (c.divert_port == 0) + errx(EX_USAGE, "divert port is not defined."); + + if (argc >= 3 && strcmp(argv[2], "divert-back") == 0) + c.divert_back = true; + + + init(&c); + + npkt = 0; + while (recv_pkt(&c) > 0) { + if (c.divert_back) + send_pkt(&c); + npkt++; + if (npkt >= 10) + break; + } + + if (npkt != 1) + errx(EXIT_FAILURE, "%d: npkt=%d.", c.divert_port, npkt); + + return EXIT_SUCCESS; +} diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh new file mode 100644 index 000000000000..0a37cea78ad3 --- /dev/null +++ b/tests/sys/netpfil/pf/divert-to.sh @@ -0,0 +1,413 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Igor Ostapenko +# +# 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. + +# +# pf divert-to action test cases +# +# -----------| |-- |----| ----| |----------- +# ( ) inbound |pf_check_in| ) -> |host| -> ( ) |pf_check_out| outbound ) +# -----------| | |-- |----| ----| | |----------- +# | | +# \|/ \|/ +# |------| |------| +# |divapp| |divapp| +# |------| |------| +# +# The basic cases: +# - inbound > diverted | divapp terminated +# - inbound > diverted > inbound | host terminated +# - inbound > diverted > outbound | network terminated +# - outbound > diverted | divapp terminated +# - outbound > diverted > outbound | network terminated +# - outbound > diverted > inbound | e.g. host terminated +# +# When a packet is diverted, forwarded, and possibly diverted again: +# - inbound > diverted > inbound > forwarded +# > outbound | network terminated +# - inbound > diverted > inbound > forwarded +# > outbound > diverted > outbound | network terminated +# +# Test case naming legend: +# in - inbound +# div - diverted +# out - outbound +# fwd - forwarded +# ipfwon - with ipfw enabled, which allows all +# + +. $(atf_get_srcdir)/utils.subr + +divert_init() +{ + if ! kldstat -q -m ipdivert; then + atf_skip "This test requires ipdivert" + fi +} + +ipfw_init() +{ + if ! kldstat -q -m ipfw; then + atf_skip "This test requires ipfw" + fi +} + +assert_ipfw_is_off() +{ + if kldstat -q -m ipfw; then + atf_skip "This test is for the case when ipfw is not loaded" + fi +} + +atf_test_case "ipfwoff_in_div" "cleanup" +ipfwoff_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_in_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div" "cleanup" +ipfwon_in_div_head() +{ + atf_set descr 'Test inbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_body() +{ + ipfwoff_in_div_body "ipfwon" +} +ipfwon_in_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in" "cleanup" +ipfwoff_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated' + atf_set require.user root +} +ipfwoff_in_div_in_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in" "cleanup" +ipfwon_in_div_in_head() +{ + atf_set descr 'Test inbound > diverted > inbound | host terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_body() +{ + ipfwoff_in_div_in_body "ipfwon" +} +ipfwon_in_div_in_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div" "cleanup" +ipfwoff_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated' + atf_set require.user root +} +ipfwoff_out_div_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is expected to "eat" the packet + atf_check -s not-exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div" "cleanup" +ipfwon_out_div_head() +{ + atf_set descr 'Test outbound > diverted | divapp terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_body() +{ + ipfwoff_out_div_body "ipfwon" +} +ipfwon_out_div_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_out_div_out" "cleanup" +ipfwoff_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + epair=$(vnet_mkepair) + vnet_mkjail div ${epair}b + ifconfig ${epair}a 192.0.2.1/24 up + jexec div ifconfig ${epair}b 192.0.2.2/24 up + test $ipfwon && jexec div ipfw add 65534 allow all from any to any + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + jexec div pfctl -e + pft_set_rules div \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq no state" \ + "pass out inet proto icmp icmp-type echorep divert-to 127.0.0.1 port 2000 no state" + + jexec div $(atf_get_srcdir)/divapp 2000 divert-back & + divapp_pid=$! + # Wait for the divapp to be ready + sleep 1 + + # divapp is NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 192.0.2.2 + + wait $divapp_pid +} +ipfwoff_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_out_div_out" "cleanup" +ipfwon_out_div_out_head() +{ + atf_set descr 'Test outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_out_div_out_body() +{ + ipfwoff_out_div_out_body "ipfwon" +} +ipfwon_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwoff_in_div_in_fwd_out_div_out" "cleanup" +ipfwoff_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated' + atf_set require.user root +} +ipfwoff_in_div_in_fwd_out_div_out_body() +{ + local ipfwon + + pft_init + divert_init + test "$1" == "ipfwon" && ipfwon="yes" + test $ipfwon && ipfw_init || assert_ipfw_is_off + + # host router site + epair0=$(vnet_mkepair) + epair1=$(vnet_mkepair) + + vnet_mkjail router ${epair0}b ${epair1}a + ifconfig ${epair0}a 192.0.2.1/24 up + jexec router sysctl net.inet.ip.forwarding=1 + jexec router ifconfig ${epair0}b 192.0.2.2/24 up + jexec router ifconfig ${epair1}a 198.51.100.1/24 up + test $ipfwon && jexec router ipfw add 65534 allow all from any to any + + vnet_mkjail site ${epair1}b + jexec site ifconfig ${epair1}b 198.51.100.2/24 up + jexec site route add default 198.51.100.1 + test $ipfwon && jexec site ipfw add 65534 allow all from any to any + + route add -net 198.51.100.0/24 192.0.2.2 + + # Sanity check + atf_check -s exit:0 -o ignore ping -c3 192.0.2.2 + + # Should be routed without pf + atf_check -s exit:0 -o ignore ping -c3 198.51.100.2 + + jexec router pfctl -e + pft_set_rules router \ + "pass all" \ + "pass in inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2001 no state" \ + "pass out inet proto icmp icmp-type echoreq divert-to 127.0.0.1 port 2002 no state" + + jexec router $(atf_get_srcdir)/divapp 2001 divert-back & + indivapp_pid=$! + jexec router $(atf_get_srcdir)/divapp 2002 divert-back & + outdivapp_pid=$! + # Wait for the divappS to be ready + sleep 1 + + # Both divappS are NOT expected to "eat" the packet + atf_check -s exit:0 -o ignore ping -c1 198.51.100.2 + + wait $indivapp_pid && wait $outdivapp_pid +} +ipfwoff_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_test_case "ipfwon_in_div_in_fwd_out_div_out" "cleanup" +ipfwon_in_div_in_fwd_out_div_out_head() +{ + atf_set descr 'Test inbound > diverted > inbound > forwarded > outbound > diverted > outbound | network terminated, with ipfw enabled' + atf_set require.user root +} +ipfwon_in_div_in_fwd_out_div_out_body() +{ + ipfwoff_in_div_in_fwd_out_div_out_body "ipfwon" +} +ipfwon_in_div_in_fwd_out_div_out_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "ipfwoff_in_div" + atf_add_test_case "ipfwoff_in_div_in" + atf_add_test_case "ipfwon_in_div" + atf_add_test_case "ipfwon_in_div_in" + + atf_add_test_case "ipfwoff_out_div" + atf_add_test_case "ipfwoff_out_div_out" + atf_add_test_case "ipfwon_out_div" + atf_add_test_case "ipfwon_out_div_out" + + atf_add_test_case "ipfwoff_in_div_in_fwd_out_div_out" + atf_add_test_case "ipfwon_in_div_in_fwd_out_div_out" +} From nobody Thu Oct 19 13:37:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB80V212mz4xSHN; Thu, 19 Oct 2023 13:37: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 4SB80V1X3mz4PZq; Thu, 19 Oct 2023 13:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697722650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4hMG7lrr0x4FKTLf/i61B7j5DxBLUnSuGaPdOkDARY=; b=FqdwTN5k+j1qOcLUeLKcAV5RbkRWh3fknvHPNBB0Ie98JvEvmXSrPVZg/l4DOC504p6yeb AJfWIy38JWrqHMDrFWCZ8f53k7QCPJzRafIDHEui3OgQqZbB3NsCdAlyrmKzAO62zDEBxK 5Ne/sUL6nZh0XXv6r4zsWcHqSItWeZ0Jg1V5omx1hRq1KE7OXGNhpTR5OGiDnzhEINVJdC /BOEC7hybuLXT8ydUnwN4Q0Jl9LbgSMm5hYOBvhQYoP3+4JDcxLiNX0dLOZ1g3KtRyxbnC zNSqdrQ2auJ1HtqrdivqmxDA/8xMQ3EuJcsL35iM2jAr63FP3RjilXdIhYdQIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697722650; a=rsa-sha256; cv=none; b=xi007rkqbqjGIphekw6xlazx+XuO+cxnmETKcVSRDtN24ega5wo/sPvfG8Z6qFlKZ9z2OR rqJ7bSa2b8HQrz9MuHEWQv7eCx3U+1xM7R1BEJPNmrtW4xd6hI6mN40yO5RDjzixsQK4lI xxovitIHQtLNnUKpAc+mtUat9AMFGI40Q/YiZKRLfFZoPxwQ4OFTMvmk0pVnGEPH393lIt cr9S9kdRz/ImvGXFsP+LBkaZbD+Y4pdknTFcggG1/3GmewCkCARWy+w8WGjkM7GSQpp78p uLpEqFhyD3rQ1davvqhJhWqyZwn5IZWIKImySFt3i/7Stb2Kpimj9XKfJ34Sxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697722650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4hMG7lrr0x4FKTLf/i61B7j5DxBLUnSuGaPdOkDARY=; b=vveNK6cGkRHHBje6zZmj+yGPeCRggTTGBaUoAOpiL1F2E+6gGv8HG+Ce6z0st74dwtl4F5 oJzVpFk5uv+UKJv0DNObC+5EJB08quhz/0HgCV1JjqgVVT8gyJDYPGq6SaQ4K9v4dtqGhf iraQprbjWmAYBKgvNl2NxgFgUazFAk7fFk732oMY8gKheF6mEN9klAzcGE+Z+QwiOeGvkx fgcMQZXcA4JTJ9Jy8/lS2fLlRWPspDEufzfmgi2aW+wkuGHXhSa/5Ef7AzsKfrZ1BSdhT+ USw9GPO0IqCSraBCGjuKcomoVc94dx8h5dz/ukspya/NRCYTryhYrzqIUQ0LVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB80V0VTkzrmj; Thu, 19 Oct 2023 13:37: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 39JDbTr6094503; Thu, 19 Oct 2023 13:37:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JDbTv3094500; Thu, 19 Oct 2023 13:37:29 GMT (envelope-from git) Date: Thu, 19 Oct 2023 13:37:29 GMT Message-Id: <202310191337.39JDbTv3094500@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: 24fe0cb84d71 - main - ping tests: Fix test on i386 platforms List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24fe0cb84d71a0e9d648c43f92b5c3a730c3855a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24fe0cb84d71a0e9d648c43f92b5c3a730c3855a commit 24fe0cb84d71a0e9d648c43f92b5c3a730c3855a Author: Jose Luis Duran AuthorDate: 2023-10-17 11:35:38 +0000 Commit: Mark Johnston CommitDate: 2023-10-19 13:35:39 +0000 ping tests: Fix test on i386 platforms Actually use INT_MAX (0x7fffffff), not UINT_MAX (0xffffffff) to avoid overflowing time_t and missing the test. Reported by: Jenkins Reviewed by: markj Fixes: 5b8af90fe332 ("ping: Add ATF-Python tests") Pull Request: https://github.com/freebsd/freebsd-src/pull/874 Differential Revision: https://reviews.freebsd.org/D42268 --- sbin/ping/tests/test_ping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 900fbf45d52d..3c66e6c54c4d 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -51,7 +51,7 @@ def build_response_packet(echo, ip, icmp, oip_ihl, special): # Build a package with a timestamp of INT_MAX # (time-warped package) payload_no_timestamp = sc.bytes_hex(load)[16:] - load = (b"\xff" * 8) + sc.hex_bytes(payload_no_timestamp) + load = b"\x7f" + (b"\xff" * 7) + sc.hex_bytes(payload_no_timestamp) if special == "wrong": # Build a package with a wrong last byte payload_no_last_byte = sc.bytes_hex(load)[:-2] From nobody Thu Oct 19 14:00:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8WG1kJWz4xTgK; Thu, 19 Oct 2023 14:00: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 4SB8WG1KHxz4RGl; Thu, 19 Oct 2023 14:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XHygmyW0eZABPaYgj7uRln4rnvzva0mfKM80HcLRyg=; b=QihMHgYsCFvNpXMqhnqcwN1RoDaAtkudrDDHfpUaU4NGuzEM1RRhrHq/EjTp6xQkPJveeB dhk9Wd2/77ZQWD3Ep+ykeqTebQ+Hmj6uRKDdbSI5Zm+a/Uw42ZgNjqn/S2QlkyR4CtN2lD psDwyFWzxdAUdivpaJzoMn2Q3mFaHqBnAI6/mRb/y8WaAL5PCO/MU8DIgFlnxBTp/MRXhc Fh9sp7ILL6xL4/iXSgUCfyg49lHIrhv0RsVj6JLC4DeN+DDlD3XzaNE9pB9mVBtXuKNolp 0JaLV4tAoteHJNIRfcsaIO3K0VNJloTeIx/TcdXuSgBY3YCg2DXESn0BySMr9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724042; a=rsa-sha256; cv=none; b=tUplEBHkj49uHVUy7UxRa/DeJHLTryTpIiTrYTei1kZ34mTLA/QxxTBj1IeX3BfzElDMQH /jv70zWziXr+Lo9c4lXEcClxjPoXywtWBogL07qoF2NGbpCVE9yCRI0pkaVZfJz5p6DNXj 8gf+4QCl5/R+VhM1DbAHW4oMOeaekQaF/NzxTNL+saMHb82Cdn7YEfS3jUvYi5CmaKJufd laBmTe1SjTAjhyUlxlQCP06kSvz5jpu1p/u5nivk8WH9ybe+EHFCuZHaWMKmYoFPFsnjTr v1nFtiBQ0IngA1Vl+FUUtHNigN7EPe5K5gLk+hHMUtQ/4bKdXYAnKjuBLBxbiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6XHygmyW0eZABPaYgj7uRln4rnvzva0mfKM80HcLRyg=; b=R5aZkXzZOri5md+ikWzHdnLbuueJX9pFLQdlfUr34FyS68lWu9DKgiFnEjlyYdDpMEAZLW 0ge+HI9jAvnSJRbyMt0V404IsLmCMXema5mpqA2fdF1HxogVKHUupvAGkrVF/QjsioF2tT YxnCQ0F1S/FTSHrbRhvdz5iro5Nt2/j+wyIt57GIqTc5tyk2BKqjMUImU/74pcKpYJZ576 5wRdVSOU0tT5X3KYyk8xbzLt3niPXEbDm/kPtROQr/HAUMK+Kcgucr9120vyvI2m5qFmvq rEeggBu7nZIQjcgPbdamjaK4RMZZY/U7ZHXt0GDtUwkuxqVMCb/eEyuCgG7H4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8WG0P1NzsHD; Thu, 19 Oct 2023 14:00: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 39JE0f3t037736; Thu, 19 Oct 2023 14:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE0fLC037733; Thu, 19 Oct 2023 14:00:41 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:00:41 GMT Message-Id: <202310191400.39JE0fLC037733@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: b5437d6c65e0 - main - hwpmc_amd: remove an unused variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 commit b5437d6c65e0dfd7b9d681aedbc1d382e092b3d3 Author: Mitchell Horne AuthorDate: 2023-10-19 13:58:48 +0000 Commit: Mitchell Horne CommitDate: 2023-10-19 14:00:31 +0000 hwpmc_amd: remove an unused variable This should fix the LINT builds. Reported by: Jenkins Sponsored by: The FreeBSD Foundation Fixes: 2c6f474ee824 ("hwpmc_amd: kill of k7 support bits") --- sys/dev/hwpmc/hwpmc_amd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index 01a6cf202b4d..d2fb17549990 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -451,7 +451,6 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm, static int amd_release_pmc(int cpu, int ri, struct pmc *pmc __unused) { - const struct amd_descr *pd __pmcdbg_used; struct pmc_hw *phw __diagused; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), From nobody Thu Oct 19 14:02:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8Yg040Pz4xTGb; Thu, 19 Oct 2023 14:02: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 4SB8Yf6S54z4RrV; Thu, 19 Oct 2023 14:02:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLB0iRUerOkcK3BbPMk/46ES3MLZgzduEQzRfn2p2Bs=; b=ItoHUWRyI5dFIRcWdWaz0Sc5XtEuYyqLIVZaseZmetGknZ3Hmsl9u092qEmsl0gB/gzyc2 EVvqkUVZoJ1QQ4NvnYdQXvOToWh9cNmmEqRhm55RIcUgxuBqLFXAvcedFl5Fbu3m9cZPNG uJAdjeVW6syI50azw4qRzmwXlUIIHrNrm+DEmPc/iScQyfBSejfIIFL9UB1eEWy9KWLGCE sLvERobpKe2QAW/GYDbudpvziT2fHz+45KTv/tW3+1JBsXy0pf/tcLlgOmnQFo+2LieBvG TW5/MFfsrN7O67I25jr8bjvykZQL6GBoIaejVLVZiNK2Y5xKQ7hyc2BS4zrTdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724166; a=rsa-sha256; cv=none; b=Bmtm9xgDB59hXYfXv0pd9Gh/r6J5j1a3YhkeFEVNxyHBujkVANayzF7j9HE+s4W3RXnGmc t1D14J8ed3S+0Hq+zjE6XjhQWLGRU4Ed+GRIhTC3bs7S5K5fcTuNPjRZ6G5MPJsvt+pexT ttk1iKtaQLJWTI/+rV1+P9h3kPuC27xVvAy1eZLZKr6oGsfOhcLJs6q04faZhv3D3mHWWU wC7ckmZgKS0TpNt41hxO0n2f9wAvFvFxsUi0WpXsyopN/fhMORbETzb5w/vMZfcWJD9p1e lvpLCx24J/y4VkaSsY+ZePBPv068zx42AjoDpgIaI3UwpPwc5ZSV6NJEBW1G7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLB0iRUerOkcK3BbPMk/46ES3MLZgzduEQzRfn2p2Bs=; b=e3gecCuD3woP/4qXjEcJsYKoHOHytNleqG61EvcQSZEqni9deY/PyO8c6qbT6cJGeX/Ffr JR3UYi+Kzbmizbf06nEp+WyQI5ZshOD8heRRTXHXqi/hA8a0vkf+VpZlzYVaMmp+87bMsV MOsGvxieKYlYEolOQKhOzs7id70xCtOV8okVAizoV4IdjoRVZzLqskEfV9brSV3YSAkoNi dL77IYSMrwmthlRTeZx6NXL2X4fJFy9xPTGWNOg9hRoAcnPrGOJfcz4xjcdEFzoze/Ij0X dEwBTcvS2PcDyz4rHkmwm2UUOjHwu6kWawrZziLuEvbDGGZWyX19H151xmFTfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8Yf5WfmzsR7; Thu, 19 Oct 2023 14:02: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 39JE2kjN044746; Thu, 19 Oct 2023 14:02:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2kGh044743; Thu, 19 Oct 2023 14:02:46 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:46 GMT Message-Id: <202310191402.39JE2kGh044743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c525ec74b44f - stable/14 - boottrace: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c525ec74b44f471261b0e67eaa254e05fdef3d05 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c525ec74b44f471261b0e67eaa254e05fdef3d05 commit c525ec74b44f471261b0e67eaa254e05fdef3d05 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:50 +0000 boottrace: Add corresponding sysctl knob for loader tunable The loader tunable 'kern.boottrace.table_size' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit 51dc362d1a148362dc4cfacaa3629db928523204) --- sys/kern/kern_boottrace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_boottrace.c b/sys/kern/kern_boottrace.c index cb013d4e8be1..86fee4f47fbe 100644 --- a/sys/kern/kern_boottrace.c +++ b/sys/kern/kern_boottrace.c @@ -158,6 +158,10 @@ SYSCTL_INT(_kern_boottrace, OID_AUTO, shutdown_trace_threshold, CTLFLAG_RWTUN, &shutdown_trace_threshold, 0, "Tracing threshold (ms) below which tracing is ignored"); +SYSCTL_UINT(_kern_boottrace, OID_AUTO, table_size, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &bt.size, 0, + "Boot-time tracing table size"); + /* * Dump a trace to buffer or if buffer is NULL to console. * From nobody Thu Oct 19 14:02:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8Yh158wz4xTgY; Thu, 19 Oct 2023 14:02: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 4SB8Yh0Hspz4Rs9; Thu, 19 Oct 2023 14:02:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWfeeH9iiSfY556+aEo8GF8K9q6QRI0iSIxi7GsMxPM=; b=BVIHCGn4kUrNzauAqEpDqkTAsBvCI//TfzSN5V5uZVqUgEpcdRG3DW5tAdHvOnv9t/D7Bn XZxtizq2dVz8vkjVAeAEfS+RBgIel5xgvIws/GdgdfhJGMD2xWM2qVNVgzPQJXPhCUO2Mf 65+i3tSYv5TBYd6/3Z6iZp+nHav8CskVytS5RTp0T/nYjiBVrCGzAbyHdgQvSEDdD90AoO PGrXx+YakvVzumFdD4FZTmXQd52F6j3/iUDdYDEUvcNe0dHc/Qzr61olbktYmA0ngw9uK+ iL82rYLoDz4rPhcCcP8FCA3WzdD9+/8btKfTLDf/xrr9nUACjFpDAizQBrz2Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724168; a=rsa-sha256; cv=none; b=AgX5pch244pLbN3XX6MmiYO2VLtW2gvY+R62bnRDnh8r+ikBIeT6GXL9GLHLUZzQFmdkK1 EsGsOUEggBvygSLCmB+89QTf/k7FHHZJgFtASHDdq3AMlgUxvhIO+BlcY+Z5acQb/XEwPv f0/bBf3lmzlSq7mdvGXol849LpwO7Au90Qrg1cX8E3d4A/LyRxBRHZvTNs7cDtw2USFmyZ 4+Grkj8cERuiq5MIlzTEp2QYnvk3gGUYlKC/RZmLTKoS55oRJwYMCCYeIsK9puEDo9gJvf cstA7Iu6hGnA9kKxoOzH49VbqoG3iIYw+rp9Iu4E8sVFmV9JRJ1JyALR1t7LcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KWfeeH9iiSfY556+aEo8GF8K9q6QRI0iSIxi7GsMxPM=; b=pNYw3jCB+CuOYGdcz5v4zlPKmUSnIYoffLjk6TI+1tRKzXmzXbkUIzxqkb7T18LY5sf4tm jL3mqBmlGufxYh4M9PTSIwMd6iqdgRB36OvLLakNC50czCM08Jhm53dOFSju9AdFT4K8YW t93YlyZPKmhtYSffj91RHIqh3C+G7adk1v0EOVFz0CPnZ5tnVdzZpmqnjd/PccTwNFKXwa 8Z3joW2WBv0scPhGjPC3wCE/TxGcuhHuxnE8WZwmYwwie/SEk/2mee9qPJJYVISFKbz+oz RXHbl06VfBwcifeIKBgSYll4skJpZbLNztCv9GcNr2rpBWY2LDD8CE5DWRGQlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8Yg6GFBzsc3; Thu, 19 Oct 2023 14:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JE2lLN044804; Thu, 19 Oct 2023 14:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2lMH044801; Thu, 19 Oct 2023 14:02:47 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:47 GMT Message-Id: <202310191402.39JE2lMH044801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 6f8ef4d6e44e - stable/14 - kasan: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7 commit 6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:56 +0000 kasan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kasan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit db5d0bc868be669ed6588ebeccf8c02e76aabc41) --- sys/kern/subr_asan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 44c96435a499..c3664d9cf6c2 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); -static bool kasan_enabled __read_mostly = false; +#define kasan_enabled (!kasan_disabled) +static bool kasan_disabled __read_mostly = true; +SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kasan_disabled, 0, "KASAN is disabled"); /* -------------------------------------------------------------------------- */ @@ -136,7 +139,7 @@ kasan_init(void) kasan_md_init(); /* Now officially enabled. */ - kasan_enabled = true; + kasan_disabled = false; } void @@ -180,7 +183,7 @@ kasan_code_name(uint8_t code) #define REPORT(f, ...) do { \ if (panic_on_violation) { \ - kasan_enabled = false; \ + kasan_disabled = true; \ panic(f, __VA_ARGS__); \ } else { \ struct stack st; \ From nobody Thu Oct 19 14:02:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8Yj4XL5z4xT7R; Thu, 19 Oct 2023 14:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8Yj12qyz4Ryj; Thu, 19 Oct 2023 14:02:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GuoGWudm8vV1CwfvkAldB+e98TXHAZgf0rXrvnso+84=; b=KnmiNvGPO70yFhit/GpswXcPuCEq0CGgZFlgpC2BeoURI33DnqdKNoz6JnGUja/MqyhkQz v0hz56ZMK2Dr7Tv0TpwVtNicZVHZdutH42uYHjPrtQ0NofHOV9sQ7o6OfisAx0Cd3sDlhw V9V82jg/hkbxhThD+oloxqzjL4Gv2+17eqMOHMApH50lSVXQ8pDehdkI0vRvCRIuTRi3A9 z2zW0Uwh1kufqssWaZt22K5CzqHP3KVLPsaV9vVMxhYcKQMtkluDzfW27GUgJJ/y/1LxB4 rLTQvFjRZe0rT8SHPcuVSFEHAIQ0qm5Jk8mcBzHXWSCUfKoKsZR8C4Po5Vl32A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724169; a=rsa-sha256; cv=none; b=NX3pFPQbWhmUvm5NzQezUaMl/XXNqwMKQRsn/5FfUky9FZsWfZlbUFmpUWIhdAbDQMo0kv lR8AtxRGs1yrOrIxoDqhfcnd/Ooy6T3d5zy4u+Q++YKaw+F5Th7JyzUy8zc8RM1CphLdfG 6Ted4TvI7wq7aHIUUvxPiodwTEhjUMNMQFQS4z82iMLtWB06uWOACS6LOuCDrW3r1M307M 1EHhWlC3y38bM/r3PhqEj6QSa0tTLtSp1KvEQbiDdxkR9kqYY2wDeGrI4YuQDAm8JSWuzb 2SmYSHrmgVlfLJcD343JoNJGKD9OXWq+XVjJiU1f6gfTvf8ppowxfXWP7QIKlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GuoGWudm8vV1CwfvkAldB+e98TXHAZgf0rXrvnso+84=; b=nZ7i1IzOvnz9Y5N5p4XML2QrM2/swKIP2r5jxGhY/i3crki1ODG7H2ijP8+zb4Br1VllZU /73tOGar6C5ahdDmXXlnhxVlNMn4Hmv8iJi1wZaVhs2funHbVbekq0GW1d0SUkghAzmMRR UXNKQZ3ZjnE95rdpPEanx3SndGKwvpApy813KaxxDbwL2iXzS3SEZEAKEzZbnUz/RL3cGt 6FHFlpDng0Jep/Zeehjo8BqjT/bhOnK2/7ogdzxPEics0A3phcwBj+7AH9G2BpaaKZEZ7I N88YaKp3KkmIkc7MWoViA9qgPGAdjihX5nifgSLeH+b5iCJezrUZj4JDv1vteg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8Yh74kNzsTg; Thu, 19 Oct 2023 14:02: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 39JE2mcb044859; Thu, 19 Oct 2023 14:02:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2mqN044856; Thu, 19 Oct 2023 14:02:48 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:48 GMT Message-Id: <202310191402.39JE2mqN044856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1b289728e93d - stable/14 - kmsan: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b289728e93d1000e6ca03354c8bc4209ea8da51 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1b289728e93d1000e6ca03354c8bc4209ea8da51 commit 1b289728e93d1000e6ca03354c8bc4209ea8da51 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:56 +0000 kmsan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kmsan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit 1d2b743784f7527a6840fe35ddb7e34cd41bc17a) --- sys/kern/subr_msan.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 57caeb454b42..54948370a14a 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -108,15 +108,13 @@ static uint8_t msan_dummy_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_write_shad[PAGE_SIZE] __aligned(PAGE_SIZE); static uint8_t msan_dummy_orig[PAGE_SIZE] __aligned(PAGE_SIZE); static msan_td_t msan_thread0; -static bool kmsan_enabled __read_mostly; - static bool kmsan_reporting = false; /* * Avoid clobbering any thread-local state before we panic. */ #define kmsan_panic(f, ...) do { \ - kmsan_enabled = false; \ + kmsan_disabled = true; \ panic(f, __VA_ARGS__); \ } while (0) @@ -142,6 +140,11 @@ SYSCTL_BOOL(_debug_kmsan, OID_AUTO, panic_on_violation, CTLFLAG_RWTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); +static bool kmsan_disabled __read_mostly = true; +#define kmsan_enabled (!kmsan_disabled) +SYSCTL_BOOL(_debug_kmsan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kmsan_disabled, 0, "KMSAN is disabled"); + static MALLOC_DEFINE(M_KMSAN, "kmsan", "Kernel memory sanitizer"); /* -------------------------------------------------------------------------- */ @@ -599,7 +602,7 @@ kmsan_init(void) thread0.td_kmsan = &msan_thread0; /* Now officially enabled. */ - kmsan_enabled = true; + kmsan_disabled = false; } /* -------------------------------------------------------------------------- */ From nobody Thu Oct 19 14:02:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8Yk22Rzz4xT7T; Thu, 19 Oct 2023 14:02: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 4SB8Yk1Y3cz4S8Z; Thu, 19 Oct 2023 14:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+auakrWNKwX766Y057MUEai3QqulBkNZE1mjJpQ420=; b=eVJODSSquDYd4m5uk0xyzmGFkExGDPuxIyP1RyTnb30pDbAxEUlv3+ZznjH6UkXJ2eK64G DsAouAzkShwCJNZY4sDt3VrSYNdLV/7fsggeMjchyEbvbEgMHaQ4F1281npW3Ao3fF6UrE qRsaGTwstkBjKXaN9KKSjZF0AGEbZ9shn/nHfDJedudTCYZg0GnhFjjxLjbun0EtzQHXXr SRk4lB721gWvf9jtZt8qq69xl7fFi6sZxDNgkx5F/ztTWK+E2z1JDICsnoPMvCoLeuXLU/ znC3ApHqCgOFKhWQ4E2GPrWKj5/Yfne56UNRDCi+u9aN4J3PxdGzk7JAjDuLLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724170; a=rsa-sha256; cv=none; b=jetQ2UdE9mEi6w0dhnDgl0itUxbJ0/GlSuVtPPv8TTpbGRj3NjTVhM+8TftjolJQTPoiTj M8cHXA3yiQoDu1iUrulGJmiZGo7YWyq94mftapMUDkwxKbmPbMB66x6tNIcC935C2LfTXm HTls8U1r5uZ/AZdAu86tuOaTJsUXvl+nUM2Sy8GvZTlBn42FOZzTfcu99cny+Ti4GZMqvs +5Z+yDvXdKhQ/B42LLn3tK7OZQmTo7upizpNLkIUpDhSZPqX0kuOU9PHopuMYCxQUfubN1 Z+i/e6aVwlHPgmqnAItmp9fPcc8ktyv7cTbavEfhiu8qRcO/cpBXh5vAKui+MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3+auakrWNKwX766Y057MUEai3QqulBkNZE1mjJpQ420=; b=Dt1nw6KWmZCkx1MVJjn61Uw/oZpDcafAfiwUOOGlPz+Bgq30niHudr9ETiMoCEGi3aRMS6 MfMcSHHXl/og8eLMAqRGhCY5hTRrTZHzTPXnzQMPu4ntE5K8/pfunLI6FB0usM0OwhxZcv BrWvhUmpIvhe3xiBIVB6ElkWm5uwgDB3Zz83csZ/Zxl3ZA+107p5psB7gqGGuE5FjQB4R1 SM2iTlJUphIo15KeMS4+UyLCNKFFwYqT8zls5Tcz0wuAxnzfEmXF1kAaVEPGaiFLGmlzZQ +9UVgv5pLR+bqJqSp4p4Hi+YFQWxL2UUc9J6uajq6dp9Etzixo5Jd+GsI65Ntw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8Yk0djGzsc4; Thu, 19 Oct 2023 14:02: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 39JE2nna044911; Thu, 19 Oct 2023 14:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2nRJ044908; Thu, 19 Oct 2023 14:02:49 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:49 GMT Message-Id: <202310191402.39JE2nRJ044908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: cb5bc8a748df - stable/14 - vm_page: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cb5bc8a748dfefc68e3905e8fdf17e0484844383 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cb5bc8a748dfefc68e3905e8fdf17e0484844383 commit cb5bc8a748dfefc68e3905e8fdf17e0484844383 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:57 +0000 vm_page: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.pgcache_zone_max_pcpu' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit a55fbda874db31b804490567c69502c891b6ff61) --- sys/vm/vm_page.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 4f3c4ba2d4d7..8496a39154de 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -198,6 +198,11 @@ vm_page_init(void *dummy) bogus_page = vm_page_alloc_noobj(VM_ALLOC_WIRED); } +static int pgcache_zone_max_pcpu; +SYSCTL_INT(_vm, OID_AUTO, pgcache_zone_max_pcpu, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pgcache_zone_max_pcpu, 0, + "Per-CPU page cache size"); + /* * The cache page zone is initialized later since we need to be able to allocate * pages before UMA is fully initialized. @@ -209,9 +214,8 @@ vm_page_init_cache_zones(void *dummy __unused) struct vm_pgcache *pgcache; int cache, domain, maxcache, pool; - maxcache = 0; - TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &maxcache); - maxcache *= mp_ncpus; + TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &pgcache_zone_max_pcpu); + maxcache = pgcache_zone_max_pcpu * mp_ncpus; for (domain = 0; domain < vm_ndomains; domain++) { vmd = VM_DOMAIN(domain); for (pool = 0; pool < VM_NFREEPOOL; pool++) { From nobody Thu Oct 19 14:02:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8Yl34cSz4xTWR; Thu, 19 Oct 2023 14:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8Yl2bQBz4SCn; Thu, 19 Oct 2023 14:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJ+Eu5UrtqpkEoI7ERuVY89yMFwYnFUcQZx0liz+g1I=; b=hEqg/QoaBcqKY3L0EOoTrEzvfm1IrkPeGEtRUaoEjtS5VN5YrKsqOCvldTGcJyqjSXRw5s lGMDkUd92MJl7VR+2djp1iM1tsVLmOmnBFjE310rIUbwGClI51qFh4BiVDaK5OC4EKLuaT Qnuz9/7DuoduxsmPnzZUrItoirRfJVzpIrCA6pMeZSPxqClk4X1T+eliOO23yW6C2mEcVX +5RCX5fk5G+xF5TSuNeuDY4QvSxh8bGEutVmU0F/0uqxGpdTvl52YThR9jKIoQbZjGf/Fk 08jZ5DDjPTiihwQVCUPp89UA/iSgBtnMuQIoXmKKDnjFCRCh3W9zdWixm8RZwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697724171; a=rsa-sha256; cv=none; b=WH4jol9TvfIFZygR2/GJldrVfoMYMiysLJV3NM/UkjBv9yzrvMhxfhsmnLgaOIkkYg/QZS e14FCFTQHPfA5ytiWhlKXjwawIOuGqIe1B0J2e+19XVvTPOcQM3kzNlVWX/1EdUUlDIBPP XeB6dmNJlIPoRrwMHo2SFsS+2PKEFwEJRVeS38HVoycbw0bhUZ4mC33Ar+CEcNTBkSG+o6 kSoYUUoh6q1J4ensWCqhjek8mIDng+G0qWHAoHK0MNbvaWgvkVZLabOHFwcGTeXjmnHMpM XBA1palSZ5jdJ/sZRJMhRXSoLGvOGqaVMay3PKOS/D7Jr2qzNh58clYR8aKn0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697724171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GJ+Eu5UrtqpkEoI7ERuVY89yMFwYnFUcQZx0liz+g1I=; b=P6WShYIkfD81/a2xg7ApjN+jj4di30mP1WTdWJyGKD21NPytWDvAsDHTw6NRBnMGB1E9ur djFKf5gbr85GGfWF5RWfFKQ1lEx+D6VmM44HpIkfXdW0yCZhBKLXOTAMgVFPRDURR1LBXI /ewYisTDlLM0hyED7GgTGdEN3BsET+p0340EO4/L81ZiA2VTRVko5V0yra7rpBG7pTLvem UMW42NHpZW0uWokDAG171sejeAeHqZzNHFsOxPoRlFhr0LsC3OKjw+iqFOD5F4djL55OpB OxBXTInrP7SlqvTgf32Lg6zeXTtJzQXZpe5KTuZaU8Jy7psMhBjWgc+B8C+J/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 4SB8Yl1hXbzsfm; Thu, 19 Oct 2023 14:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JE2pBo044962; Thu, 19 Oct 2023 14:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JE2poN044959; Thu, 19 Oct 2023 14:02:51 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:02:51 GMT Message-Id: <202310191402.39JE2poN044959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e26b7e8d02f6 - stable/14 - vm_phys: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e26b7e8d02f648623ad343016533487634a16698 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e26b7e8d02f648623ad343016533487634a16698 commit e26b7e8d02f648623ad343016533487634a16698 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:00:57 +0000 vm_phys: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.numa.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit c415cfc8be1b732a80f1ada6d52091e08eeb9ab5) --- sys/vm/vm_phys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 108297caac49..bc992bdfc58b 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -76,6 +76,12 @@ _Static_assert(sizeof(long long) >= sizeof(vm_paddr_t), #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; int __read_mostly *mem_locality; + +static int numa_disabled; +static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NUMA options"); +SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &numa_disabled, 0, "NUMA-awareness in the allocators is disabled"); #endif int __read_mostly vm_ndomains = 1; @@ -627,15 +633,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality) { #ifdef NUMA - int d, i; + int i; /* * For now the only override value that we support is 1, which * effectively disables NUMA-awareness in the allocators. */ - d = 0; - TUNABLE_INT_FETCH("vm.numa.disabled", &d); - if (d) + TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled); + if (numa_disabled) ndomains = 1; if (ndomains > 1) { From nobody Thu Oct 19 14:19:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8x03Gssz4xVHQ; Thu, 19 Oct 2023 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8x02K2wz4Twp; Thu, 19 Oct 2023 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKtblULYOSTB8e/1tf52Hti3WCYShLJQQkvIG4akkNs=; b=C7Li1yudK04Uh+YHxbNAmF8hHqm2eE8dm/5HYBrn5tq5WpYFiLtq0w3G6Qb/PCsWYckzin J3wFONocrOgABV2onJHyyHpUGw+AEzZhcH5RVGJM0p2bYt+0s7yDvTiGXYr4MGb5JcE6lG Ba9yxrXgVwsPDwHCA/TsJpqriWoXxgHeje/S16K6noIeVOsXX2dnKR8Qn50Knsndd1CxJ1 duw8MoN7U7qyW6XmA8jS8FEoyh18gIooIn5wqLO4x0BdW0DsJaTo4cCV8Ke6hIo6vFJUa0 Zc+EtjEpBQR3dO9qt/BgO9ejqP4Uoi/aGbNrYloXrVwsxO8VyIQu4CZUxrepEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725172; a=rsa-sha256; cv=none; b=q5MZaSwNjqgbZAz7QRnAeLbOD4oVjUM2FFt+9UprboXqloeIMOaNv8SE0w36CbE6cXIM+D CHVWm/54SZVUU/H/KXrdlFK3cMmBh08AmJGL+IpC0P2Zhc2zINlfnxJrL9S35pkCLpXfRd meczEzUfPXCWdHg8T9qGaOX9TCi50hFsW5SK+U3ZyukdDYkUK/ErjgjLSv7cedszbjtdBD 3HB2eC3FwZcMtt5UJjNYiTeAyIKi0YxoGSX0yANestjmFxCLydrImMsa5FpJh7VYfSyZ+N IP5/UzAxrdSAt/6KGOaGCeNcNrKnL4U5KSffUETsvD0HIbUrcmzA1L6mIiiCnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKtblULYOSTB8e/1tf52Hti3WCYShLJQQkvIG4akkNs=; b=t6+4qIKE/qfk+l6c0sf58niYJo6/7IPhuzN7dGMwnN1Zak83x3GLIeEcmpdC9iXRbrcdol Bvs3sTBARPaU8JupI70rSPiDgGQoja6i7UGEFIzecYQifvjq7T7R3rOlU3xVDUvOo+9fvP W/mZ5yvXwygS1EXFbBvMTtjb8X5+kPib5sK5X4ZnABH9VlEkShz7D1ntloPsTowr5/Ebz+ 4gdJ2hTTMQol1MPN6uxih9KEgI5LbISK8BqYPChA1ZLH9I97npr0XEOZDuRw1txuETi4lA spS7OZOr6MHgkliHgS50NJx0lhC1NT2SRNNfH2hyyFbMxJl3hDNVEHxJxJqb8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8x01NNjzsxd; Thu, 19 Oct 2023 14:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JEJWCp062258; Thu, 19 Oct 2023 14:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEJWvK062255; Thu, 19 Oct 2023 14:19:32 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:19:32 GMT Message-Id: <202310191419.39JEJWvK062255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c2be2c87dc21 - stable/13 - kasan: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2be2c87dc2100b107a20ddd918ed9d74b8533e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c2be2c87dc2100b107a20ddd918ed9d74b8533e3 commit c2be2c87dc2100b107a20ddd918ed9d74b8533e3 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:48 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:17:29 +0000 kasan: Add corresponding sysctl knob for loader tunable The loader tunable 'debug.kasan.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit db5d0bc868be669ed6588ebeccf8c02e76aabc41) (cherry picked from commit 6f8ef4d6e44ee27a08c14ab6a892ffccf332bcf7) --- sys/kern/subr_asan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index 1b8c52c0eb8d..9c33d0187a6d 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -92,7 +92,10 @@ SYSCTL_INT(_debug_kasan, OID_AUTO, panic_on_violation, CTLFLAG_RDTUN, &panic_on_violation, 0, "Panic if an invalid access is detected"); -static bool kasan_enabled __read_mostly = false; +#define kasan_enabled (!kasan_disabled) +static bool kasan_disabled __read_mostly = true; +SYSCTL_BOOL(_debug_kasan, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &kasan_disabled, 0, "KASAN is disabled"); /* -------------------------------------------------------------------------- */ @@ -136,7 +139,7 @@ kasan_init(void) kasan_md_init(); /* Now officially enabled. */ - kasan_enabled = true; + kasan_disabled = false; } static inline const char * @@ -174,7 +177,7 @@ kasan_code_name(uint8_t code) #define REPORT(f, ...) do { \ if (panic_on_violation) { \ - kasan_enabled = false; \ + kasan_disabled = true; \ panic(f, __VA_ARGS__); \ } else { \ struct stack st; \ From nobody Thu Oct 19 14:19:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8x142Ggz4xVMZ; Thu, 19 Oct 2023 14:19: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 4SB8x13NSyz4V73; Thu, 19 Oct 2023 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB8X6eWBzNB5PW2Ek7ViSY6UyAmHWgKbM883Yir2FYo=; b=uiI2mOu1XYpDC7tNL1LNjyElHMOhdp56ZjxrT5yDaOXOkKh54lCdshTXf8F4byH8RWrZ+p hrf5KtsL/vse7Puux+So+zTqPvLXuupovTYTy57quOleewelrNI0N0khQwvZ/rJ0nO4cgh HnXziaA0/9NYWnR7EeNa1h8Bff3M7ix9G2Fxp3FlVpYRsdN0uvSBeEb2hbQ015aAdbJSJA p2LnWuzhp6D8cIGhJjgzTNDIsLLcprRMEtZYug3cp+P0dt23du+/BQzZVpw9U3SBRdL6KP fOZw2OEFvRbRoq0wrsOROGGcsGnltteF7w+NUI2Qi27md0heVSfCmtPU92yRKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725173; a=rsa-sha256; cv=none; b=BJACmhAySUNkkwDSdxa6Ee7PIRjjmHJRM+GsCS5UoxT2HZEpOcUQMsWZkg8aiS9ijqlGsG +3bmOz7vvCV3QNZqxcRtb6rD3eTPFya4hEYOt6XBDA9AtSSRkZhEG4fOmpG8EInNGP4xKL JWa5gxVHyQFefFURlQKGD4v0PMuDQ/gYDh2r9HLvNSbGwfjsRDev12UVg32fwtgzc6K2ur H6l/6mXNVbgoAjqRSmviJgpJivsuIVJAmjpJOqhr/5dSn74/y2MX6XWXhknhin9x3LR66g 0adz1y9yxaqS6No6Kps/UKVkCltAKFkpZWaNOFpgLa/VLdL6gMfF9YqOkT5UrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rB8X6eWBzNB5PW2Ek7ViSY6UyAmHWgKbM883Yir2FYo=; b=cbVxDBqpRRa7EGupDg1priw0WoKiUCnMZkcZ/MPssD7rZ0NZ9ZvEfafTCQZHAW1MqsQY7D gJgsnI95Ja+KSAV/55XL8ugIMvFBYyXrHyqfO/SGkmgifZ8LyErj+5bKp2qC1Lhqpl3D5D tqpszCKpTPnYBAdn5sc2FfiqBNaLFw3xQiGMsrLs9DjLtVCMaGAvqCTncB84ogyPgWcert KjdTC8jc1cLrOzEJn0e2ZzPZ2ro1sdTt1hkRU77waQ7W8PTZS4Tzo6e1vp/YThkXOg3ECi SQ6S46b8MrIkDJmPzvJVy4NejMMBbd/dYUF1O8hyvia2iKbnglsdszeIvVYgRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8x12QFwzt5j; Thu, 19 Oct 2023 14:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JEJXgY062309; Thu, 19 Oct 2023 14:19:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEJXSw062306; Thu, 19 Oct 2023 14:19:33 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:19:33 GMT Message-Id: <202310191419.39JEJXSw062306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: de2b262fde2f - stable/13 - vm_page: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de2b262fde2f0955cff5cade6cca58b06fbdd37f Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=de2b262fde2f0955cff5cade6cca58b06fbdd37f commit de2b262fde2f0955cff5cade6cca58b06fbdd37f Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:17:29 +0000 vm_page: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.pgcache_zone_max_pcpu' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit a55fbda874db31b804490567c69502c891b6ff61) (cherry picked from commit cb5bc8a748dfefc68e3905e8fdf17e0484844383) --- sys/vm/vm_page.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 76c50ba676c2..d21022930396 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -198,6 +198,11 @@ vm_page_init(void *dummy) bogus_page = vm_page_alloc_noobj(VM_ALLOC_WIRED); } +static int pgcache_zone_max_pcpu; +SYSCTL_INT(_vm, OID_AUTO, pgcache_zone_max_pcpu, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pgcache_zone_max_pcpu, 0, + "Per-CPU page cache size"); + /* * The cache page zone is initialized later since we need to be able to allocate * pages before UMA is fully initialized. @@ -209,9 +214,8 @@ vm_page_init_cache_zones(void *dummy __unused) struct vm_pgcache *pgcache; int cache, domain, maxcache, pool; - maxcache = 0; - TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &maxcache); - maxcache *= mp_ncpus; + TUNABLE_INT_FETCH("vm.pgcache_zone_max_pcpu", &pgcache_zone_max_pcpu); + maxcache = pgcache_zone_max_pcpu * mp_ncpus; for (domain = 0; domain < vm_ndomains; domain++) { vmd = VM_DOMAIN(domain); for (pool = 0; pool < VM_NFREEPOOL; pool++) { From nobody Thu Oct 19 14:19:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8x24zfwz4xTxG; Thu, 19 Oct 2023 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB8x24RB5z4VB3; Thu, 19 Oct 2023 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOO+h4ehi+LumZFTE3GVmX5JkK37BQ0wYps68XFOEKs=; b=ihTmQwWArcMF/GWFh30gr743SvNP05rSYjf9tiN0M1pQRKWRVyh19GCrCCZOaQbeV5rbzb nkppsmTASFEUw2mMbSS0lkYlihAukrNTF4uKT+szi2eBiG2AIZcBN+YCqEHVuLkQa5mKb1 1Im4TocGh2Uls1vcpBWWcwh6ppRX41a0a5o1rqNIauj+XB60t4x3n0E6W3NogbtQ/0Bq/I cHIi9N/ECOgFCiYVErytaQvnrubpar8ygwimqzZeJUOTHMSZpcO6cPrejzBpXSs5LERS+5 8lnxeMBSRbwl/D8mTBoEFkWK2LPM61yEBDcQP8YdL3si+2N1Lz6JwvzxylvKTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725174; a=rsa-sha256; cv=none; b=FQ5LLlHqYtRzqtEPUmaIkJyU4fEYCh9EaKyqNlhKHDRQLdz49dpu3bqyoQ6l7fh3U5nHGV i03W+A4PG3pmi2PMeTUsxiir+8Rc3rx0ao9EFpJv/L8JJwV/EV/Vha1UQZ3yCw7cJlSc83 Ia7K2U8MlcchBxCEwbqctr8M6z6/Zwup25xtAK0ZP+ZHxy9ov5LlgM0UvUPZlPCRGRLwpI Ba4Y8yvCx+i5JEZHFDsCdo5cHnmGQ6JQe+fj9Rt0O0Q7fPv2jyqK5NtrmOo+rCGp8Z3fvk SXNGI9BtKnC+4XVkxV3Lw+NrVzKZxHgxsD8+9Q0aqjy/hDV/hvdsMo7sNql95Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wOO+h4ehi+LumZFTE3GVmX5JkK37BQ0wYps68XFOEKs=; b=C+kjUzu4d509VnSd8E0I/gpVAvyGBSG/lvLgpYiGodRuvTv6BVuqXj2gtvnUs5BrnUoaVY WzAWAw8jiaFhUseeWpjMFkV4bfQIurmdKBH7ISF9k+d+YogdmnL/tpL8H2WYSY/9gU3nQz Ekrwth8sHZhSgVb3/bV+MG19MVx7rNJ+TtfXjxhoHwtFv51SrTFNIpZHK/lGhJ+RY/t+P+ 32WEJK7nZVA3EBn0wclzltPGjiV+gOEdTj/tMWYL/ziQ/Noy2Omh4iOgple1i13iFGw+ek WCKU4vAlAPV7WBLKl+0UzLAuWumpopBgHiSNToTh5DX35pS7jdQJXzpCSJrm7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8x23Rv9zsq0; Thu, 19 Oct 2023 14:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JEJYd5062360; Thu, 19 Oct 2023 14:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEJYgC062357; Thu, 19 Oct 2023 14:19:34 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:19:34 GMT Message-Id: <202310191419.39JEJYgC062357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b180f0040f95 - stable/13 - vm_phys: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b180f0040f95973a30fa26f5435e4bbab1197e80 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b180f0040f95973a30fa26f5435e4bbab1197e80 commit b180f0040f95973a30fa26f5435e4bbab1197e80 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:17:30 +0000 vm_phys: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.numa.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit c415cfc8be1b732a80f1ada6d52091e08eeb9ab5) (cherry picked from commit e26b7e8d02f648623ad343016533487634a16698) --- sys/vm/vm_phys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 0c51bfc3e5c2..6894040cbefd 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -74,6 +74,12 @@ _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; int __read_mostly *mem_locality; + +static int numa_disabled; +static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NUMA options"); +SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &numa_disabled, 0, "NUMA-awareness in the allocators is disabled"); #endif int __read_mostly vm_ndomains = 1; @@ -622,15 +628,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality) { #ifdef NUMA - int d, i; + int i; /* * For now the only override value that we support is 1, which * effectively disables NUMA-awareness in the allocators. */ - d = 0; - TUNABLE_INT_FETCH("vm.numa.disabled", &d); - if (d) + TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled); + if (numa_disabled) ndomains = 1; if (ndomains > 1) { From nobody Thu Oct 19 14:20:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB8yN4sbDz4xVQZ; Thu, 19 Oct 2023 14:20: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 4SB8yN43DGz4Vtn; Thu, 19 Oct 2023 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=upoNxv4WwrtLFbIzAsUWUAQYSCQ4uKfx9RPDL4UJaNJuSeSONuctJMRY4MWqI2AhyWZV6v PLQLOoimeICEKNq6rX5mYNnp27FaGNbb4FZVVQ9hGdy2GA1mEDKdQHmrBhqhHI1SwTwJg3 BYTlqPzMny6+Dsj7BZRTA4m00m6Hm7cuQE5iHdQcFg1d5rZqvqWZqUdgoQIHv64BGALMpk UfpTYIfsjjpBFko59FIXChG4o3GFYcyd4PNCyJV9HrFDB44L1ly3RslpGeOlsFZpftkNiF NEXvuZR4somFkRBCrwXY0vFnz5L6x7nybHT5kF8lL6XsmyHBxAsk0gIUJasHng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725244; a=rsa-sha256; cv=none; b=XYhos5UuKztyZuR5MsnAqOl+GcHEBq5qoYEg9aWNL9HPzo+G/HflghjJi89ge8zN5tIF8j Rcpi3OmwKS8D/0NqZF7JIltZFDAMyFig5lZmNfymRUdM0R73bI0MXs7Nit9mmaMXQh0QXx 5hLtsE6RcVwGAGH7OczlsVNMXBYqOIjqlGkem8CURorpO7SZt4kExxrH0j6GG0A9CNx02D eldhVFk3IS5xSpc3ZrE+7JlFFTTI77mkBG2vhrvJfYfek6cXPtVavZP50C+MvM/uho1ogS GAsrGEsF8wv4q3bUo0CzrdDCBejAHwg75EddXI1V5/cQOrpCw1cR1TiOsaF1/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BWNEkWmM5sEcLdOqeOHS09L/jsV2ClRIUyMdw/QHo1g=; b=Py7eRciAluYBTTf5bHbO0tboEpJI5hNYkiGN9LPL1rVoc7a1LfLsy0KDQWjA4UaSbH3Xdi E8mzR3PesRvysav+/J07fh4Z1XWHa27b1GGeFY2DXDHeSoIiPpM/THTBSuEOom6o5SSSxT aMrLcYqdZ3Fk6Vuz2N+rFbQQih08h8+xh8VHZIJyDtIGBgr/P61RczWN9s7QN5dkh2UJC1 wO9oqd2iffBoqPBnG+6Cy0AQ2IKKBJKFOZiMvEmPKXj2by/U+XgiXRqL8wTzC8NqY2EUCW EAnJ3tTcz4K3OIBt6T6Q7uTjkUGbWoPVcGJ/ml+KM0rU4vvGppOaJvQv414whg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB8yN3704zsbF; Thu, 19 Oct 2023 14:20: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 39JEKiCK071111; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JEKitw071108; Thu, 19 Oct 2023 14:20:44 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:20:44 GMT Message-Id: <202310191420.39JEKitw071108@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: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 Author: Kristof Provost AuthorDate: 2023-10-19 10:06:29 +0000 Commit: Kristof Provost CommitDate: 2023-10-19 14:19:39 +0000 pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h When userspace includes pfvar.h it doesn't get the kernel's COMPAT_* defines, so we end up not having required symbols in userspace. This caused the libpfctl port to fail to build. libpfctl will be updated to use the new netlink-based state export code soon, which will also fix thix build issue. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 59579a0849d9..ec8f8293945b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1951,9 +1951,7 @@ struct pfioc_iface { #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) #define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) -#endif #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ #define DIOCSETTIMEOUT _IOWR('D', 29, struct pfioc_tm) @@ -2014,9 +2012,7 @@ struct pfioc_iface { #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) #define DIOCGIFSPEEDV0 _IOWR('D', 92, struct pf_ifspeed_v0) #define DIOCGIFSPEEDV1 _IOWR('D', 92, struct pf_ifspeed_v1) -#ifdef COMPAT_FREEBSD14 #define DIOCGETSTATESV2 _IOWR('D', 93, struct pfioc_states_v2) -#endif #define DIOCGETSYNCOOKIES _IOWR('D', 94, struct pfioc_nv) #define DIOCSETSYNCOOKIES _IOWR('D', 95, struct pfioc_nv) #define DIOCKEEPCOUNTERS _IOWR('D', 96, struct pfioc_nv) From nobody Thu Oct 19 14:27:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB96L6lpXz4xVRr; Thu, 19 Oct 2023 14:27: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 4SB96L6FzNz4Wq1; Thu, 19 Oct 2023 14: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=1697725658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EX+RtpNtSRSOYpby76WWuXzMVB5Fof19sdrIod3Al7k=; b=jHjqk8nVL9nvaZOcn3tbHwpkHbS19o+8AkP2+0HV++KIEJ7pNTXQnRm/PeEI3S+rkJowjy qi2z2y6faLAjuLZSbbb20LAb3nlOxOAUzDqAJBiVy+2y2H2OfRtscWVnh/vLpfsXPls4Zx rbHlirYGVAjiZij+CtUe8PSiSy+Z/VL8EVnTo0Jj8SqSJcZo5mwpfiOtN3zbdZ7qUqzMnG bCpWoG8QtCQUz++YVpcoZhXvvJVhJIxPvEmoj4QM8lhMPj+eyH7pV8jCyVWtnHIWpHe+aC XiBGo7xffOhHHY8Ss1nF84HN8Lll0KVJ9RhIpalYSwLvlGYQSwnCgOwVES5uuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697725658; a=rsa-sha256; cv=none; b=SibXk4TxCpwgOhnDHoKMprOj3DiZu23MpFzLPnvAKnHpmjAFn0ls3rK0J7RuclBwuueCFt HkyxpvyWI8sETwdPT+UraK6vHWp+jNNL6jJv1V0JknB9JAkXxeODoIPnkJuYwPn7z4JzPG nUKDasMVmflOa9n2OO7mXt4Emm6YcV4AcQ/3QNr5P1534GgRejswAXHF2RTTTdwNCYEb/a vPEDEUMi32uC/k7gIIvs6YTNEBPyAFnUHo4SzWPYz5xjt4hzZr67TfDZuLmFqcF1l5xBXE Zih4ToQVhJK3K5iXDsxzFZ2KjlwmICv/Ok4Fn7etOW4KNFd6JCnRFe6b0f5TBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697725658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EX+RtpNtSRSOYpby76WWuXzMVB5Fof19sdrIod3Al7k=; b=jFZ8pGxzn3xAI6u4ZgKQbk88IyQGlMCKTAOnbFKykY7KjySn7idd+IJpfhqmFLJEZ590FJ 3ciS07OmYPihzErD7ZjDV1uPdjKr6s4bxsH9HbjiS8Np2HDKAvt2PBdV7/3SK0WiK8Xbkd iCjO8GQmu9mBtmjf644Gaj74qaBnNR8vtqNqVI10/4zXMzVdSejBKjitAqUxrF8Fw/A+9U UKgK1idEsW86Bd43IjLJNcJLlYEaz5LQ/b4dA7EfmMoJJdoTFaPtZbNTPVdVNc7I1mx2Nf e8Rbupegdgzk1MVibGjHjuDWLWZPtEXfWuBugVezpdcDiXWBxXb52G9PoD6RtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB96L5C8pzshK; Thu, 19 Oct 2023 14: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 39JERcV5078876; Thu, 19 Oct 2023 14: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 39JERcvU078873; Thu, 19 Oct 2023 14:27:38 GMT (envelope-from git) Date: Thu, 19 Oct 2023 14:27:38 GMT Message-Id: <202310191427.39JERcvU078873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9aeb24e214c1 - stable/12 - vm_phys: Add corresponding sysctl knob for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9aeb24e214c19743bec202e66114aaba37896741 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9aeb24e214c19743bec202e66114aaba37896741 commit 9aeb24e214c19743bec202e66114aaba37896741 Author: Zhenlei Huang AuthorDate: 2023-10-12 10:14:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 14:26:18 +0000 vm_phys: Add corresponding sysctl knob for loader tunable The loader tunable 'vm.numa.disabled' does not have corresponding sysctl MIB entry. Add it so that it can be retrieved, and `sysctl -T` will also report it correctly. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42138 (cherry picked from commit c415cfc8be1b732a80f1ada6d52091e08eeb9ab5) (cherry picked from commit e26b7e8d02f648623ad343016533487634a16698) (cherry picked from commit b180f0040f95973a30fa26f5435e4bbab1197e80) --- sys/vm/vm_phys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 7fb92cb06220..d4e51936222c 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -76,6 +76,12 @@ _Static_assert(sizeof(long) * NBBY >= VM_PHYSSEG_MAX, #ifdef NUMA struct mem_affinity __read_mostly *mem_affinity; int __read_mostly *mem_locality; + +static int numa_disabled; +static SYSCTL_NODE(_vm, OID_AUTO, numa, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, + "NUMA options"); +SYSCTL_INT(_vm_numa, OID_AUTO, disabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, + &numa_disabled, 0, "NUMA-awareness in the allocators is disabled"); #endif int __read_mostly vm_ndomains = 1; @@ -604,15 +610,14 @@ vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality) { #ifdef NUMA - int d, i; + int i; /* * For now the only override value that we support is 1, which * effectively disables NUMA-awareness in the allocators. */ - d = 0; - TUNABLE_INT_FETCH("vm.numa.disabled", &d); - if (d) + TUNABLE_INT_FETCH("vm.numa.disabled", &numa_disabled); + if (numa_disabled) ndomains = 1; if (ndomains > 1) { From nobody Thu Oct 19 14:41:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9Qr6LCHz4xWyj for ; Thu, 19 Oct 2023 14:41:56 +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 4SB9Qr4R6kz4Xd1 for ; Thu, 19 Oct 2023 14:41:56 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4064867903cso83334365e9.2 for ; Thu, 19 Oct 2023 07:41:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697726515; x=1698331315; 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=aJcPdynuVtlnT4qNwZy5h9AXj/VZvzpoz2++U2mHWe0=; b=c5KUVQCTye0VLsYH5ohU7aA9xJxiSPcgnX16D48aCsnAW6XZdR1oDb2dhcHDwJqBnI OHiiQNEv1390W2droBv0foq/7N+6zbteBWrFurzvUhrxUNZ7E59ComJXOoNLbkVwg1S/ 01maxNaBB9XzD6ZnzA+r1JNLSKm6Mq1pMq8x+LnuPrmlGYPgT7+D7o1M+qtLs7UBd9WZ PZSN6p/VqDTQ7/V2OdBnn41qcordwmUKcsx7DUzRLbz96w8WCEYHtAGhdJgE01+QsPzj ueqgC+twwShwviADhtylfLEAahTQdbBDBd1x7aUS9NL1JnE1pfAq8GnPXkGi1sh2zWzq mKzQ== X-Gm-Message-State: AOJu0Yy0CZwL4fMi5xQlvc6ZwZ1VRpjbmNxjRlr2KBxKN0bSzqMB4W/z 0R6brT8LFxjRrcHgJI/p0qNEhg== X-Google-Smtp-Source: AGHT+IFPvOBUbeY2g2HGBXdbkUEkisGXWikmzj5RiogkeaZx8EcWrV8UsF0clAaqgbIFIOBPNW3HJw== X-Received: by 2002:a05:600c:17d3:b0:405:40ec:415d with SMTP id y19-20020a05600c17d300b0040540ec415dmr1932374wmo.39.1697726514900; Thu, 19 Oct 2023 07:41:54 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id x22-20020a05600c189600b004083a105f27sm4510684wmp.26.2023.10.19.07.41.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 07:41:54 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h From: Jessica Clarke In-Reply-To: <202310191420.39JEKitw071108@gitrepo.freebsd.org> Date: Thu, 19 Oct 2023 15:41:43 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> To: Kristof Provost X-Mailer: Apple Mail (2.3774.100.2.1.4) 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] X-Rspamd-Queue-Id: 4SB9Qr4R6kz4Xd1 On 19 Oct 2023, at 15:20, Kristof Provost wrote: >=20 > The branch main has been updated by kp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6cd830b0bc6= b815e8c4 >=20 > commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 > Author: Kristof Provost > AuthorDate: 2023-10-19 10:06:29 +0000 > Commit: Kristof Provost > CommitDate: 2023-10-19 14:19:39 +0000 >=20 > pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >=20 > When userspace includes pfvar.h it doesn't get the kernel's = COMPAT_* > defines, so we end up not having required symbols in userspace. = This > caused the libpfctl port to fail to build. >=20 > libpfctl will be updated to use the new netlink-based state export = code > soon, which will also fix thix build issue. >=20 > Sponsored by: Rubicon Communications, LLC ("Netgate") That=E2=80=99s normally a feature to stop userspace using deprecated = things. Will you be reverting this once libpfctl is fixed? One could also hack libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2=80=99= s what was done for kbdcontrol to allow it to run on old kernels). Jess From nobody Thu Oct 19 14:56:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9lZ1dlKz4xXlM; Thu, 19 Oct 2023 14:56:26 +0000 (UTC) (envelope-from kp@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 4SB9lZ13V0z4bKv; Thu, 19 Oct 2023 14:56:26 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697727386; 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=xLiJswrXTJeF9HUk9Y6A8p+5EQxcSLwVKpBv+t0RlY4=; b=PI2SQOqmZS0v0jsCHH+svPtmb7559yJuWL8r4DCEf6HQqinh/GvN9XurHETZuP+9HxTkAr FyqsM+8GYrYOqt6GFG86HMqnWqpd0GQCV/yauGj/V0XvGoTSPEkZElMoCs+xZf/5DIoevG 5o90v39eDirSNEPPcRzuxe793lb4bu2toJU8dYSPNtWH5sOze1mtoI47PuuxHdOqEeOKt+ Z7i1ICJkzAaLUp9oy6MLJ7qofANfoPMqvGhloPyTTM6jxQ8siqXM/5yVnG1aSQs8rpASLQ UmwHrD+Lixorj6w3W1M4YMda6/Dle42ugGmKim93uew9xY7V0upNsVulQgH53A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697727386; a=rsa-sha256; cv=none; b=EgK9RE1PKk+8Jm714gh+3rLJ0amZSW8N8HZGBNoSGN/4YTW6TJZHotUoG5CU5GrHkijHCl M/8qa40ENh5c2bkWEI5Mm9QGaq4cWQyKI6dsGD3y4LoEkL6FFcM8naMFUvAUKNf/Qn7Djn bKnALhKlNhZ81zQ7xaDnP1rAuoNFmFyWf2Yfx4BpNjuq9iy+uEqfJhbTZZA8JGBV3ncrb+ HizzmLWBRrjLski4inqtprv9wZGMh+kSMWzc2I+xvGsl0M2vl2JjiWaRWvOSE5BlSliK3g 1rDXV0F6+awPPDOTe/twDG2A5L+67Abje92GScyKDWoMG7FF60zxVvFjf6x1qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697727386; 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=xLiJswrXTJeF9HUk9Y6A8p+5EQxcSLwVKpBv+t0RlY4=; b=nHyuT3/CR1VkwgPFAAoDyIjkuNu9XwGdmQ+ii+LEAJbR73Yt1KF7CAxf+R8zlcdi5Uj2GJ ndMFapDUTrrtYTk9MLKddc57+F5rAHuiq7eMfy0bvTaJzCzlbpW2BORZcGczpC69Yl1pQz oLnTaabBwTkGr+/H6fi4DJyi0P26Zo9kS/nDhoeOOxfQPabMUB5vWVZwCV9wjrNsFI4j7S mZ59WZACWxcYs3N2G+FGEfTesMV9TFBl+Do9zeazDptIN6afTzDQGEK5eP7/iCtP0Fcxz2 e0m5qW5bzYxYIu/KcUvH1F/2ipWb9SUY0UE1iNrLd7MgFcl8BU4JaCgNiCBlng== 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 4SB9lY6c8zz1694; Thu, 19 Oct 2023 14:56:25 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 0F8D581D7; Thu, 19 Oct 2023 16:56:24 +0200 (CEST) From: Kristof Provost To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h Date: Thu, 19 Oct 2023 16:56:23 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 19 Oct 2023, at 16:41, Jessica Clarke wrote: > On 19 Oct 2023, at 15:20, Kristof Provost wrote: >> >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6c= d830b0bc6b815e8c4 >> >> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >> Author: Kristof Provost >> AuthorDate: 2023-10-19 10:06:29 +0000 >> Commit: Kristof Provost >> CommitDate: 2023-10-19 14:19:39 +0000 >> >> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >> >> When userspace includes pfvar.h it doesn't get the kernel's COMPAT_= * >> defines, so we end up not having required symbols in userspace. Thi= s >> caused the libpfctl port to fail to build. >> >> libpfctl will be updated to use the new netlink-based state export = code >> soon, which will also fix thix build issue. >> >> Sponsored by: Rubicon Communications, LLC ("Netgate") > > That=E2=80=99s normally a feature to stop userspace using deprecated th= ings. > Will you be reverting this once libpfctl is fixed? One could also hack > libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2=80= =99s > what was done for kbdcontrol to allow it to run on old kernels). > I wasn=E2=80=99t planning on that, no. The libpfctl port fix should land = soon, but I figured that it=E2=80=99d be better to keep the definitions, = because userspace doesn=E2=80=99t know if the kernel is built with or wit= hout COMPAT_FREEBSD14. I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea though= =2E Long-term (i.e. by freebsd 16) the plan is for all of these ioctls to go = away (so the code for them will stay in 15, but not be in 16), but that d= oes depend on me doing a fair bit of work before then. Best regards, Kristof From nobody Thu Oct 19 15:02:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB9tw4d9Nz4xY2D for ; Thu, 19 Oct 2023 15:02:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB9tw3vZzz4c6W for ; Thu, 19 Oct 2023 15:02:48 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40839807e82so5763885e9.0 for ; Thu, 19 Oct 2023 08:02:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697727767; x=1698332567; 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=GIiXoKdczDxAtPy81sfr9hQgf9DkYxIsJ1NAh9GEsNU=; b=vK5Yt5JsFVEk3s2jTZF7m32+JOfZzSl0aVJv2Wc8phZQPbI9cayHdc6baKLqJgfYa3 URkhsrpf4uFzTgBIbIVQmDY8BO1GWnw/jVp+tPh4nDP8Y65JLdvA384uCzGHzeqHMpTE dZhl2Bswq4zq4VvnAujAdhZ4pvfVuAoF1POHQ80U2LqctD2aUrLRqzoVfzaOa/TfucH0 BvpecCTpdcqtJakWqqiCKo+dCw7eFjSKPOdayWG6bCbSQvso3kNzpkphFuveItJq4AHw YZynxRdXs5XRM/goKYNOU/GhDLzv97ZMGgpN2qdTVgusK1dRdvVV4GICq3X+5t6oZIDT 1beg== X-Gm-Message-State: AOJu0Yz8dII+LI/1EryBQ2GnKPCp/qF4tqg5YZbIxYKiq5YaID8SgpNo Wvd8DKtsdlClgz6Cjt1VfyHbEDmIzD4BWg6dpsAByQ== X-Google-Smtp-Source: AGHT+IEtqPAGcADh5pXOXFCWPLERDzlM6ILACTZJSIEsHl2iiyLRTDKs+9v53FwHsJB2LUycrF9tUg== X-Received: by 2002:a05:600c:4747:b0:408:3634:b81e with SMTP id w7-20020a05600c474700b004083634b81emr2082761wmo.13.1697727766343; Thu, 19 Oct 2023 08:02:46 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id h5-20020a05600c350500b003fc0505be19sm4682425wmq.37.2023.10.19.08.02.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 08:02:45 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h From: Jessica Clarke In-Reply-To: Date: Thu, 19 Oct 2023 16:02:35 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> To: Kristof Provost X-Mailer: Apple Mail (2.3774.100.2.1.4) 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] X-Rspamd-Queue-Id: 4SB9tw3vZzz4c6W On 19 Oct 2023, at 15:56, Kristof Provost wrote: >=20 > On 19 Oct 2023, at 16:41, Jessica Clarke wrote: >> On 19 Oct 2023, at 15:20, Kristof Provost wrote: >>>=20 >>> The branch main has been updated by kp: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc6cd830b0bc6= b815e8c4 >>>=20 >>> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >>> Author: Kristof Provost >>> AuthorDate: 2023-10-19 10:06:29 +0000 >>> Commit: Kristof Provost >>> CommitDate: 2023-10-19 14:19:39 +0000 >>>=20 >>> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >>>=20 >>> When userspace includes pfvar.h it doesn't get the kernel's = COMPAT_* >>> defines, so we end up not having required symbols in userspace. = This >>> caused the libpfctl port to fail to build. >>>=20 >>> libpfctl will be updated to use the new netlink-based state export = code >>> soon, which will also fix thix build issue. >>>=20 >>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>=20 >> That=E2=80=99s normally a feature to stop userspace using deprecated = things. >> Will you be reverting this once libpfctl is fixed? One could also = hack >> libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC = that=E2=80=99s >> what was done for kbdcontrol to allow it to run on old kernels). >>=20 > I wasn=E2=80=99t planning on that, no. The libpfctl port fix should = land soon, but I figured that it=E2=80=99d be better to keep the = definitions, because userspace doesn=E2=80=99t know if the kernel is = built with or without COMPAT_FREEBSD14. > I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea = though. Indeed it doesn=E2=80=99t, because it shouldn=E2=80=99t. The thinking is = that userspace should *never* explicitly use them, only the kernel to provide compatibility with binaries built against older versions. Deliberately exposing them to userspace is quite unusual and deemed generally dodgy. Jess > Long-term (i.e. by freebsd 16) the plan is for all of these ioctls to = go away (so the code for them will stay in 15, but not be in 16), but = that does depend on me doing a fair bit of work before then. >=20 > Best regards, > Kristof From nobody Thu Oct 19 15:09:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBB2M20gfz4xY8Y; Thu, 19 Oct 2023 15:09:15 +0000 (UTC) (envelope-from kp@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 4SBB2M1Pqnz4cQr; Thu, 19 Oct 2023 15:09:15 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728155; 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=ymcvD0Llk9TgxiEpUSoJY2mC52cjwvXlV/Ss4RsmJH8=; b=kEsJAqikz8FcUENS1S9lWIviE3Q3z7UzdSGALSST05kz9NML85ywkty/TbgdV8L4VhrKhl rJhBEls+k/BltbMIowrOiQl0Rpv5/hAMhQCLF2SfVbIRNecOZh96TQg5tnWX61PZbQVENr pvTvFmi0bYYO/FnDuD/RXL2MJonq6P+Hdk/4UPuGATdFwCxf7/6ARp5KcnfsLW2Kholibf EQQ5KAOP9WT74ue7s3W9Z0VSvt+Fa1UiySKqIstNKhYCZO7qrAhaNCw47k4aljkE2U2j7a TWN2fLBRVICD51w5aEbFZF4IqT4JeSwoFF2uwDtcy6E36F88zfACL2E9Lc3tpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697728155; a=rsa-sha256; cv=none; b=mJdNKAHeRDYx4ClrT0zYqYOVvCjYKnKIcttGdb7zs1M9IFjOL/jnPli9WIa7kTshLiolpq UWnMUOijkXTLnlRWDijweqjfjNilnQnQd3kUWcE0BlrdIKqb27KkjI/2viSIdtfcU19h5Y zMHQkBzEgXAHV/CFOefJoWZdXpvhn3zq8H5iWyvCzc/8Bitr2QBuwQr5xxLEXBfoBnjcvb M6i/KKDz9C3cbCo08r7iw4kwodmSsWF8KG7I7V8Gs9XzTUCni/dICjN2qIaVYPOFoa/peC tJT03dbQC+U5CfuJLx4tMuffCbjDLFpXwM8KkrgdIF0ysUY3nsWYbTJ7NGiMNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728155; 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=ymcvD0Llk9TgxiEpUSoJY2mC52cjwvXlV/Ss4RsmJH8=; b=ZzSuRAm3VyHzj1x7H6SWVIbdz/QiRblwYkeVkwOZuYZ76XXHcngt4v8X9WthSbCxRSgzSr g0tU73v9HIHtRAHZXJWHGUeC/d0hnJ2huMyM/Cp/0iCpRE4sur50Q2cX+X9wm/YRTTunPx JcpbrYG6z1aXqmjl7wsD6LjLd/BAMcgu1+mnnd57Dit+zeT/WsvKCbh2iOvgUFu+dVdn+V maXGBCh6EK6/meo2w4wsibpObMKRaA55KN17fF/clldmTF7bpvLWusURjKGTXdU9baAjo5 5v+2hZAcYUv9/jutypdWA5EuPscRqsbAD0PIXG00Cyw3y/+psExTWEWFKcnZ2w== 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 4SBB2L6ts7z169B; Thu, 19 Oct 2023 15:09:14 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 76216843E; Thu, 19 Oct 2023 17:09:13 +0200 (CEST) From: Kristof Provost To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9eff6390718d - main - pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h Date: Thu, 19 Oct 2023 17:09:12 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> References: <202310191420.39JEKitw071108@gitrepo.freebsd.org> <1DDF7B7C-9137-48F4-80C9-FDCC82F47118@freebsd.org> <1EB17D31-16CB-44D2-A19E-6CC9699156D1@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 19 Oct 2023, at 17:02, Jessica Clarke wrote: > On 19 Oct 2023, at 15:56, Kristof Provost wrote: >> >> On 19 Oct 2023, at 16:41, Jessica Clarke wrote: >>> On 19 Oct 2023, at 15:20, Kristof Provost wrote: >>>> >>>> The branch main has been updated by kp: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D9eff6390718d0fa67dffc= 6cd830b0bc6b815e8c4 >>>> >>>> commit 9eff6390718d0fa67dffc6cd830b0bc6b815e8c4 >>>> Author: Kristof Provost >>>> AuthorDate: 2023-10-19 10:06:29 +0000 >>>> Commit: Kristof Provost >>>> CommitDate: 2023-10-19 14:19:39 +0000 >>>> >>>> pf: remove COMPAT_FREEBSD14 #ifdef from pfvar.h >>>> >>>> When userspace includes pfvar.h it doesn't get the kernel's COMPAT= _* >>>> defines, so we end up not having required symbols in userspace. Th= is >>>> caused the libpfctl port to fail to build. >>>> >>>> libpfctl will be updated to use the new netlink-based state export= code >>>> soon, which will also fix thix build issue. >>>> >>>> Sponsored by: Rubicon Communications, LLC ("Netgate") >>> >>> That=E2=80=99s normally a feature to stop userspace using deprecated = things. >>> Will you be reverting this once libpfctl is fixed? One could also hac= k >>> libpfctl instead to define COMPAT_FREEBSD14 temporarily (IIRC that=E2= =80=99s >>> what was done for kbdcontrol to allow it to run on old kernels). >>> >> I wasn=E2=80=99t planning on that, no. The libpfctl port fix should la= nd soon, but I figured that it=E2=80=99d be better to keep the definition= s, because userspace doesn=E2=80=99t know if the kernel is built with or = without COMPAT_FREEBSD14. >> I=E2=80=99m open to being persuaded that that=E2=80=99s a bad idea tho= ugh. > > Indeed it doesn=E2=80=99t, because it shouldn=E2=80=99t. The thinking i= s that userspace > should *never* explicitly use them, only the kernel to provide > compatibility with binaries built against older versions. Deliberately > exposing them to userspace is quite unusual and deemed generally dodgy.= > That makes sense. I=E2=80=99ll revert this change once the libpfctl port = update has had a chance to land and get built. Best regards, Kristof From nobody Thu Oct 19 15:18:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBBFF2f2Bz4xYSF; Thu, 19 Oct 2023 15:18: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 4SBBFF26xQz4dj9; Thu, 19 Oct 2023 15:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoh/j7g7k98S9BJy6scTid3fBx4j8rN8w81nU1xHB/M=; b=WCnJ629z3pxSoaeRYaY+tFoqlX9ER6/aqrITJDqXLAP5ldkByqrg1YSj994lAPPzirtYRd 1PGRwyISLmzrDDe327udcHYmGreVdtzcgRvZYf9XZDFpbzKy6C2YBOIs44/+rdEwU3HbWi JMbcPhW87r9pIKZmJxZMauDarP1izN9biKzUGrVr0ksmx9f5VO6tazdcK9okd+EM7yMCVX DO3TZ0mbsI7pibEF3Y/siE++DyBC3/OGn43yjmGDJu84d0Rk+XkVLFqB0h3o9lTIarM7hY Dj+4cSiZnzDUNls1q4VO8H8JSuAv535eMywo2emmLAybbQx/V20zaFzFOq/X0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697728721; a=rsa-sha256; cv=none; b=uScOesiTqARYDZ+0Uz4f1HnQp8Z821KWZuX6BoEVibG1Sjc7izn+T9Pu8r4RZQfNOGB1M/ sZ617u/5ugQoLS33qzmRs+X940SN730nG999HccElq0rt5yIKbKy6YZbIOvpFgVx0sSO3U /ppsQMEJefoDDc0x7fVje9ouBQj2VT1WCfreG3CBmKqeVCOpgxM9SYQYqlNpwNcSY858/0 n/vafn5CpzDAlzRTzl0kMDU/vm3kos9xCAe28HU7nzgAuYiSaV/X5Vgbf5gULSy9sssWft wPq6snCTNpDIcOpa9YmX45cWkWySkHcoeXmZo8kEbb0AQXGVlnLDEDkhqaqIFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697728721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hoh/j7g7k98S9BJy6scTid3fBx4j8rN8w81nU1xHB/M=; b=ay86fDeADdSFSLx540uAsS1NKkQJHBdOddhJboZxIRHWvGdzVFHQHTOBiB5Q8FjN/1ic+9 ekaI3G3KIFYL2NA8FnOUW8uh0vZ1JPmsx1TWrbbpWIfN0Z0F6oi1yNMcmClbQCFanPAkF8 f1s2AV4ZknDaia2iJ+Pur57fKWStsogSPOlilwVABCxKPXdrIwM3XStSTwGFXrTKVNyJ6k cZOjrUUWe6ht57CBehABEEFgthj20cXGBFDK+Ola18mMjAFsufvIFVrkJho/4+wvbhGhYk oesD9V1BqETpzuNEH1ATfH3Ul6gy9SIEmcUtFIi+8M+FuusnwtLD0TKXRZGVIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBBFF1BX5ztyh; Thu, 19 Oct 2023 15:18: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 39JFIfkD062437; Thu, 19 Oct 2023 15:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JFIfwD062434; Thu, 19 Oct 2023 15:18:41 GMT (envelope-from git) Date: Thu, 19 Oct 2023 15:18:41 GMT Message-Id: <202310191518.39JFIfwD062434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 7e5504d3d8ca - main - Add myself as ports committer, update mentor/mentee List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e5504d3d8ca844397e10f5266d06027d0b3b372 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5504d3d8ca844397e10f5266d06027d0b3b372 commit 7e5504d3d8ca844397e10f5266d06027d0b3b372 Author: Michael Osipov AuthorDate: 2023-10-19 13:53:11 +0000 Commit: Michael Osipov CommitDate: 2023-10-19 15:17:35 +0000 Add myself as ports committer, update mentor/mentee This completes step 5 from Committer's Guide. Approved by: jrm (mentor) Differential Review: https://reviews.freebsd.org/D42293 --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 4ce4a747cfc2..cc20d7bdbd20 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -240,6 +240,7 @@ mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] meta [label="Koichiro Iwao\nmeta@FreeBSD.org\n2018/03/19"] mfechner [label="Matthias Fechner\nmfechner@FreeBSD.org\n2018/03/01"] +michaelo [label="Michael Osipov\nmichaelo@FreeBSD.org\n2023/10/16"] mikael [label="Mikael Urankar\nmikael@FreeBSD.org\n2020/01/16"] milki [label="Jonathan Chu\nmilki@FreeBSD.org\n2013/12/15"] misha [label="Mikhail Pchelin\nmisha@FreeBSD.org\n2016/11/15"] @@ -533,6 +534,7 @@ joneum -> kai jrm -> dch jrm -> jwb +jrm -> michaelo junovitch -> tz @@ -678,6 +680,8 @@ olivier -> pizzamig osa -> otis osa -> vg +otis -> michaelo + pat -> adamw pav -> ahze From nobody Thu Oct 19 15:25:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBBNz2B5Sz4xZ1P; Thu, 19 Oct 2023 15:25: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 4SBBNz01lKz4fVT; Thu, 19 Oct 2023 15:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697729123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=TBwbAtPFGXHmuxY7enpAkhM4zFtNCoUQAgXme5BXb08T972Z97La4SAXc2A071rtFGpjUb sX83xnJO4eXFHf35azckSq/CPW+hXp9dEWPoKfLCIzsAHePbOLgLNrLocvGEbmPLOQMToy KV7mutdmxi6AX9l5+6qmLozH+iQbZXZ/vdpY1k9svKvs87HAy/BjnDCKw3jYxwe9o80eix RDC/OKCy9FCqA4oJgEVBSGba4aVJCGlK0gIJHGFams0s3RMYAZsXOXDVJ0rRQ/6SXxkpi2 QQj6jiT98FIPLQdxi4FhKwv+uTeluLCbkfMmMxLEy/mu+o4+XZ1gVym8cvoUvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697729123; a=rsa-sha256; cv=none; b=oJiUDg7X9zcEugYVF8qdJQuGaZNl1i92wNasula9oRwH8t8sbuvx3YqNzXn08ayQVAldE3 /AIaJe2hnKybJu9Zere3KxBD3Ic9bs2CYpaOKSN+ttDh0/Cex4YjfK3YUHUJy2DtwtA9xw FfmZU2+GlR4PislcM4YDb9RuCF1MC88kO+z9vLSFaJc8m/s1iKTYf8f2T2rKgCHED/HEwX yYQlu/B8rxUqQ8aORnMGOvopdG0Vtm1lIGN6SXfgjusVc3krBJVQ38xioHDvZ/a2b1VvC4 w44Y9h1iX7CWL3x1+XBwftnzTIIA8AGm/ssQbGpBkDOGLz+xffZMcpOnHGABbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697729123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1hFhkW3M+g1J+MQTkth6YUX0tL9BqwjA4DFZ42ZoLso=; b=KupId1bStDnG1oUoLHQjJdexk3eHg+nB5D0c2ZU8eoJfCMvwftZECkTSsGwzdcowJJEzRM Xd3BLpFV5DHHSxTLSaAdEgRi0oFvMXXV1kHHeL5SwqoA86kfQNEz8CLHoOyYofbkZhFzr6 uE3Fd2DNRa3FiKqPJVbkB5XoXgQ3sPJxLQgNPOaGjbSUi+NEAl4b1E5QXQheQ9pZiKqPvB GO97CJ4hh4g4NOVFeYIp9YennvAIsb5iOmm1kVVQxT9R17g1m412sNP6KpEXtxvgTlSwJu 94NfpE13M4HTPhfbh/BhH/C68c7hzzxiBbGiPrVKs/zfhkNCUK5kCEC7tZF8uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBBNy6CTDzvdr; Thu, 19 Oct 2023 15:25: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 39JFPM32078338; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JFPMtv078335; Thu, 19 Oct 2023 15:25:22 GMT (envelope-from git) Date: Thu, 19 Oct 2023 15:25:22 GMT Message-Id: <202310191525.39JFPMtv078335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: afbb8041a063 - main - amd64: Fix two typos of loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afbb8041a0633c97acb51ac895c9ae3cde4fe540 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=afbb8041a0633c97acb51ac895c9ae3cde4fe540 commit afbb8041a0633c97acb51ac895c9ae3cde4fe540 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 15:23:33 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 440c21c918be..f235d72519ae 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1480,7 +1480,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); @@ -1488,7 +1488,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable", From nobody Thu Oct 19 16:14:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCTs0qmvz4xcC8; Thu, 19 Oct 2023 16:14:41 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SBCTr6zJ6z3FGl; Thu, 19 Oct 2023 16:14:40 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 0B5A65A94D; Thu, 19 Oct 2023 09:14:40 -0700 (PDT) Date: Thu, 19 Oct 2023 09:14:39 -0700 From: Gleb Smirnoff To: Kristof Provost , Igor Ostapenko Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Message-ID: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> 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:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SBCTr6zJ6z3FGl On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: K> +++ b/sys/netinet/ip_var.h ... K> +/* pf specific mtag for divert(4) support */ K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; K> +struct pf_divert_mtag { K> + uint16_t idir; // initial pkt direction K> + uint16_t ndir; // a) divert(4) port upon initial diversion K> + // b) new direction upon pkt re-enter K> +}; This can be written as: typedef enum { PF_DIVERT_MTAG_DIR_IN = 1, PF_DIVERT_MTAG_DIR_OUT = 2, } pf_mtag_dir; struct pf_divert_mtag { pf_mtag_dir idir; /* Initial packet direction. */ union { pf_mtag_dir ndir; /* New direction after re-enter. */ uint16_t port; /* Initial divert(4) port. */ }; }; The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN instead of 1 when looking at a structure. And compilation time failure if anybody sets it to a wrong value. Using "port" instead of "ndir" when assigning a port improves readability of code. This will grow structure from 4 bytes to 8, as enum is always an int. However, uma allocator backing m_tag_alloc() will allocate same amount of memory. Sorry for not messaing that in the phabricator. -- Gleb Smirnoff From nobody Thu Oct 19 16:19:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCbS3x5pz4xcXX; Thu, 19 Oct 2023 16:19:32 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) (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 4SBCbS0Cnfz3Fly; Thu, 19 Oct 2023 16:19:32 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-57b9231e91dso4813101eaf.2; Thu, 19 Oct 2023 09:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697732371; x=1698337171; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=LjYT0TyRQFnr+Iv2YO80LBeR9NdSzi4ViPU89rFSTto=; b=PgjREPkpsO8Ri7snEI3Iw+sFNrBu1aFPW2OA5YS1dTn0k8JSV9QbTANB0nG7QkX6Gr fcc6HXnPutVq8OgOsNuBiiHzw/PeKojkCYnPfqTUNSd1ASQ+lBi1hBnt5MQCl1RG57+f P2dKJD7ond8XC6mJE1aAedVI8Mug0kbHepCkyLDULU2d1kv/9ifozBm9j59LPm17Rw35 2mkMUApQoaGXN4e16ehM04iuwtZwWKNVviXKE9HtvjxuCPuRPdN5UmycRWBLMTue6Kry +JNo//FW301ucWJWghfb9NoOEDtZQ8v/zWjqHHfTmULQAKtBmLIKC02uX+Y6+4Igu28A ULYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697732371; x=1698337171; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LjYT0TyRQFnr+Iv2YO80LBeR9NdSzi4ViPU89rFSTto=; b=nxE/HHgJLocELqIPCG0RUEqV9xwu6Ml+OwmdXm+Wf/eiyWYWXAc6i/V+NDb7Y68+30 fCCp2CANjik1mvy+yieKBQ6015WtYs4DaGZeLWXsWPkDkyf2/PpiXbPuYBK8fCy7kg9M f5x3Shb7UivuZoDSCiBXuuFzhf5HRUf4XDUdK3ujxEwhGWtR0VXRTKG1Hxh1KIAfYyhD vNuxZ7lEol/ylGx+cY9dECX30jUinxehleGnuCHJcefAd3pMfCco+7uLxC0GJ3P3o6hV QSQaoMScoTwvW1i22IJ3SIGn2SAffycdu7W6v1V3G4LkbmUgmVZQwinKVNPrxsdw51nw zitw== X-Gm-Message-State: AOJu0Yx7OvQUceCTDhBGhlKtvfMZCZov5jTNw4QuPHGkp9G//ekKpenh Jp44iPQyM/GnulslciSix/Nadm55WhdxdulDcl7s9664 X-Google-Smtp-Source: AGHT+IEk4lfo8erQpI+QZz6cz8uZYzPktXRV2ro5klksx5nvRmUv/9/jwNL1IQlAyH1vUKVUndeeziNsdylGteuLUTE= X-Received: by 2002:a4a:a708:0:b0:571:28d5:2c71 with SMTP id g8-20020a4aa708000000b0057128d52c71mr2869841oom.2.1697732370911; Thu, 19 Oct 2023 09:19:30 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:7b90:0:b0:4f0:1250:dd51 with HTTP; Thu, 19 Oct 2023 09:19:30 -0700 (PDT) In-Reply-To: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 19 Oct 2023 18:19:30 +0200 Message-ID: Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop To: Gleb Smirnoff Cc: Kristof Provost , Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" 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] X-Rspamd-Queue-Id: 4SBCbS0Cnfz3Fly On 10/19/23, Gleb Smirnoff wrote: > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; > > This can be written as: > > typedef enum { > PF_DIVERT_MTAG_DIR_IN = 1, > PF_DIVERT_MTAG_DIR_OUT = 2, > } pf_mtag_dir; > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; > > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN > instead > of 1 when looking at a structure. And compilation time failure if anybody > sets > it to a wrong value. Using "port" instead of "ndir" when assigning a port > improves readability of code. > > This will grow structure from 4 bytes to 8, as enum is always an int. > However, > uma allocator backing m_tag_alloc() will allocate same amount of memory. > > Sorry for not messaing that in the phabricator. > I don't have an opinion on employing an enum, but if going that route one can shrink it by using smaller enums -- grep for __enum_uint8 for an example. -- Mateusz Guzik From nobody Thu Oct 19 16:19:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBCbf1VgQz4xccD for ; Thu, 19 Oct 2023 16:19:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 4SBCbd5BK0z3Fqt for ; Thu, 19 Oct 2023 16:19:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2c5039d4e88so105423351fa.3 for ; Thu, 19 Oct 2023 09:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697732379; x=1698337179; 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=xgdtjIni3YroBbwgFhLV2Ql8IZk3AaaGa5qlATtt2tE=; b=qHdqVqnmPFpgP2CS4QG5x83HZk9IBHZEM3MYAhAhTKrUUVB+mP8tRHB69H7exlrGSX JYQxbUwA2yXg+8AN/LTI9HwaW9aK9wP8hK1j/92zGXveyGFyErBcOmOSeL5BpTLC96Ws rB9nKhgQq1/8ooT9S4wXAgyK5M6Ur9fxeYMn01ypNYtttx8fKsRy9qkLSiiMkBVaHNZu nWPPawgMidnO+JCwt8ugUeanTAB7kbW4yYXikdZQV4UPSTxUcrhtrsL+hxGo6LC4yfdi nmB8C9nq5oLrYCV1sRwn6sJhcihnADbiZoowJs1GL4FoAkeLoBgW6UFJEFj65AnuJ5pz s7sA== X-Gm-Message-State: AOJu0Yx63bqSflH3UY7CnvJvAOp3bLL9O5dSP03OGKp+c7AMHpROD43k QW86J5PH9PMNpzak1YdGuwH6MA== X-Google-Smtp-Source: AGHT+IHkUJNNsBJpLF2imfYWUNQK9WlTms4YADWd/oOLkQvQrLhk3elx039QGCltETAIrIA39Aqt0Q== X-Received: by 2002:a05:6512:314a:b0:503:8fa:da21 with SMTP id s10-20020a056512314a00b0050308fada21mr1876753lfi.43.1697732378874; Thu, 19 Oct 2023 09:19:38 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id q12-20020a05600c2e4c00b0040648217f4fsm4716517wmf.39.2023.10.19.09.19.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Oct 2023 09:19:38 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop From: Jessica Clarke In-Reply-To: Date: Thu, 19 Oct 2023 17:19:27 +0100 Cc: Kristof Provost , Igor Ostapenko , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <6BB48213-2480-40B5-8698-058B4ED71304@freebsd.org> References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3774.100.2.1.4) 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] X-Rspamd-Queue-Id: 4SBCbd5BK0z3Fqt On 19 Oct 2023, at 17:14, Gleb Smirnoff wrote: >=20 > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; >=20 > This can be written as: >=20 > typedef enum { > PF_DIVERT_MTAG_DIR_IN =3D 1, > PF_DIVERT_MTAG_DIR_OUT =3D 2, > } pf_mtag_dir; You don=E2=80=99t need the typedef, whether you use it or not is a = matter of taste. > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. = */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; >=20 > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN = instead > of 1 when looking at a structure. And compilation time failure if = anybody sets > it to a wrong value. Using "port" instead of "ndir" when assigning a = port > improves readability of code. >=20 > This will grow structure from 4 bytes to 8, as enum is always an int. = However, > uma allocator backing m_tag_alloc() will allocate same amount of = memory. We have __enum_uint8(_decl) these days, one could easily add a 16-bit = variant. Jess From nobody Thu Oct 19 17:01:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBDWv2ds4z4xfm3; Thu, 19 Oct 2023 17:01: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 4SBDWt6r5zz3M31; Thu, 19 Oct 2023 17:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697734891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=WPtSXNsmD9VQcn+LdXgeXw1Vz8h3V6hXtZ/SOW6ipC7ydY0Apo9fDaWGEj+LZPkUYGvxGj Fu1faCDQDZa7rK+QWJRmlQMEkts622LboxhK5nmTjDE39hYlNgA13yvt35qBTtZ+D7E1XK IIt5l8mG1EZECr7tVOCxkJTakbIKwtzSC1C7jt/6w6m2SAHbMYtpsvwtW1uJ5crpdRRui0 mr57FiTtYN5M6DOEdV92OkKa1V+0KwKcrFaMratqzQ1cvJYqJ+VDz7O7ak0Gt7YpiJqViv 5Ilo5bWrIahOuK9GNRui+UGdCldZ7yme22IgeLMmQnUCqMKq4TEAr+ito9ZdAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697734891; a=rsa-sha256; cv=none; b=CnoVuqFrgwDqfc8lbhKRRYgVIxSWGNK8+0lI3EgLm3fEcy3TEvVBV5hMSC77Oj2A7fv94f ar5GLStJxNdkC2aoOLyIU2D4cP01xNTQVysFAKmildKtKGBAq/W9COkU69lfnpDOxii6WL 93Bqw6/u7yYJrif5NbcYwY124hYF6ew7uwSuyIuBeMpapjZaSg/IEIzGgq8FiOtS+DyxQD 7BBeOL00/2dhQ7XtrTF0bfPfTAgdnGaTIf492yWoJc01XYb5QwgylGyZ1f4JQIKQ8HX2Dk Cg7iu0LwJV6YVLihtoYG6CMI7E0oJjMxcvHCxc9flw1iY3u2X/TR4X0aZm+weA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697734891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXhq+7QzcnhE4AZfMtWbexxC3ZRuq2hcF/CiwOv7VrQ=; b=ZwlV6kx16NkQHV8C8Hsn80esd5/bYdg8h0hq8H+Q/QJOZeR1pb3N6rH8fhwYqXiu33BogX v2bWFqSKg2CBhLpXWTaUaMTEqcBaGAu3aPltnKCpqO/eB7T9mVpedj5JM/DR9aq4Jjm6Rh d6YpjSrpYHNEzJQlEOftYscmgZ+ie9JhIu2hV8StZUiw0hKnyrmVjIW3CoMGaAmA4XEegf LXgpgv8ACF+Ka455h3Zagy3zj/TLPzi9ErOcVyo+RnVQcvsiuN1MnBHpG+REfmA2NZdh7K 1LIGvIm6x4ar32NoYQfCSuJnY94fLR85jysz9OmPqMw9gUiSBNRQvOuzcCsydA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBDWt5tbbzyGP; Thu, 19 Oct 2023 17:01: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 39JH1Uoa041170; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JH1UXB041167; Thu, 19 Oct 2023 17:01:30 GMT (envelope-from git) Date: Thu, 19 Oct 2023 17:01:30 GMT Message-Id: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 02320f642095 - main - pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02320f64209563e35fa371fc5eac94067f688f7f Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=02320f64209563e35fa371fc5eac94067f688f7f commit 02320f64209563e35fa371fc5eac94067f688f7f Author: Zhenlei Huang AuthorDate: 2023-10-19 17:00:31 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 17:00:31 +0000 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable since 7ff48af7040f (Allow a specific setting for pv entries) but is fetched from system environment 'vm.pmap.pv_entries'. That is inconsistent and obscure. This reverts 36e1b9702e21 (Correct the tunable name in the message). PR: 231577 Reviewed by: jhibbits, alc, kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42274 --- sys/arm/arm/pmap-v6.c | 4 ++-- sys/i386/i386/pmap.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 719851432203..92e992a4b25e 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1750,7 +1750,7 @@ pmap_init(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 6b839484e6c5..967ad48de460 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -998,7 +998,7 @@ __CONCAT(PMTYPE, init)(void) */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_max = roundup(pv_entry_max, _NPCPV); pv_entry_high_water = 9 * (pv_entry_max / 10); @@ -2519,7 +2519,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) if (ratecheck(&lastprint, &printinterval)) printf("Approaching the limit on PV entries, consider " "increasing either the vm.pmap.shpgperproc or the " - "vm.pmap.pv_entries tunable.\n"); + "vm.pmap.pv_entry_max tunable.\n"); retry: pc = TAILQ_FIRST(&pmap->pm_pvchunk); if (pc != NULL) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index fe6b95eda085..f41ea24cd30c 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1069,7 +1069,7 @@ mmu_booke_init(void) TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_cnt.v_page_count; - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Thu Oct 19 17:20:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBDxM68LNz4xgND; Thu, 19 Oct 2023 17:20: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 4SBDxM5j7dz3NLm; Thu, 19 Oct 2023 17:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kp+C//6roN8RZA5n48xUd3E4kePC7PjaydIZ3itdQRU=; b=YKcnPa/eURqFPuL/zYvUNOwtBwux8mt/HfVUWL3M6lieSxIdcWhncIXvBmwjog0CwgUfP2 xZwl1rpfZd2wqBIONWRTuoFW1bsAmkymsXCIn69FM2nrGt+ChjtvB9NiLOY+sepMp6k73B G2g3rs1+a994e+SzftTkuWOglXRKBzPw2BXaDT/4HNBmlhwQ0k4a0pVYJdwHiZ6Bi/hfB/ QyEtMWgy7XMcMP7Jbi9iOvzVJMkrekCzoSA5zelczFzJKNd9Sr0qC1PbHO4fEWL1ExyXNp 5lfqz9/TpSY/8F1qKBBayDYjwQjRBb9XLnRslK5NG3o13XoZrtT8CQXP/lUhCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697736007; a=rsa-sha256; cv=none; b=wpvv+SpwboES5IX84/UzGDe6/9BaOLRk3oIOcDyTBlcbW+GrPeBzjAl4VnOLi5fXRLUqd4 wEO3fmZ5y2B8AdlRYqXEZ1M3KuLywHLssmhUP1rwvdM+S1pkW7bLJ4l31owfp3lLE/qls5 n5FTO1rkwXrjx6wUGc6loCmhWIaHTbU0joMq3j5+QCJSQXCpDmVKZLUsxZcsj/SCWA2KzR 1ALRT6VT+n21H5KNaw1p1qJuUE8lfQ97OVAQsaR2NouYTYq+p9QscjzvIjsv4a/iG20uQL ShYy/LlNXAuNBwFsMi8mefGmp2jwdyGdupVZaYC1oTlVD3FoMErOMwDOWYAfvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kp+C//6roN8RZA5n48xUd3E4kePC7PjaydIZ3itdQRU=; b=ckA8bvhVSYbupOlywQdoD7KJsDy8vaa2A2IDDrSSmWD3m4Bhw9wilMYyjZTI+xbpVY2gDV vTIx4S28rOMGVYB7wovusg4Er0N6RMOtAVLFJI0aO8+fiB+RuOCTVh8DgVKVlVXSBiv+He oHDToGWrlin5yf/GRxnFmnaM2JSfFcvrt5Xl2fVvN052idOoYmcUuWhmXqrnEX+bNdGwvj O0ir94/EVXmgmIVOwjWLYY19mhEZmtfbJqIN5OtqLdtgxhmx8GVg+WuR9gRGaPNejLiR4G 6hcmmcgIukx2+HtObEvAo/F+EaVLY3olvCbXDlfihLJg1V8s9oua4MNzBv9Zvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBDxM4lxNzy4p; Thu, 19 Oct 2023 17:20: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 39JHK7mm065478; Thu, 19 Oct 2023 17:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JHK75n065475; Thu, 19 Oct 2023 17:20:07 GMT (envelope-from git) Date: Thu, 19 Oct 2023 17:20:07 GMT Message-Id: <202310191720.39JHK75n065475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f3ff0918ffcd - main - vmx: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 commit f3ff0918ffcdbcb4c39175f3f9be70999edb14e8 Author: Zhenlei Huang AuthorDate: 2023-10-19 17:18:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-19 17:18:25 +0000 vmx: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with different names. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to read and maintain. 1. hw.vmm.l1d_flush -> hw.vmm.vmx.l1d_flush 2. hw.vmm.l1d_flush_sw -> hw.vmm.vmx.l1d_flush_sw 3. hw.vmm.vmx.use_apic_pir -> hw.vmm.vmx.cap.posted_interrupts 4. hw.vmm.vmx.use_apic_vid -> hw.vmm.vmx.cap.virtual_interrupt_delivery 5. hw.vmm.vmx.use_tpr_shadowing -> hw.vmm.vmx.cap.tpr_shadowing Old names are kept for compatibility. Meanwhile, add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. Reviewed by: corvink, jhb, kib, #bhyve MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D42251 --- sys/amd64/vmm/intel/vmx.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 51c6afe5a7da..317ed7e5d7fb 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -192,15 +192,18 @@ SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid, 0, "Guests are allowed to use INVPCID"); static int tpr_shadowing; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, tpr_shadowing, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &tpr_shadowing, 0, "TPR shadowing support"); static int virtual_interrupt_delivery; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support"); static int posted_interrupts; -SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &posted_interrupts, 0, "APICv posted interrupt support"); static int pirvec = -1; @@ -213,10 +216,10 @@ SYSCTL_UINT(_hw_vmm_vmx, OID_AUTO, vpid_alloc_failed, CTLFLAG_RD, &vpid_alloc_failed, 0, NULL); int guest_l1d_flush; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush, 0, NULL); int guest_l1d_flush_sw; -SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RD, +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, l1d_flush_sw, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &guest_l1d_flush_sw, 0, NULL); static struct msr_entry msr_load_list[1] __aligned(16); @@ -832,8 +835,12 @@ vmx_modinit(int ipinum) &tmp); if (error == 0) { tpr_shadowing = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_tpr_shadowing", &tpr_shadowing); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.tpr_shadowing", + &tpr_shadowing); } if (tpr_shadowing) { @@ -854,8 +861,12 @@ vmx_modinit(int ipinum) procbased2_vid_bits, 0, &tmp); if (error == 0 && tpr_shadowing) { virtual_interrupt_delivery = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_vid", &virtual_interrupt_delivery); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.virtual_interrupt_delivery", + &virtual_interrupt_delivery); } if (virtual_interrupt_delivery) { @@ -881,8 +892,12 @@ vmx_modinit(int ipinum) } } else { posted_interrupts = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.vmx.use_apic_pir", &posted_interrupts); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.cap.posted_interrupts", + &posted_interrupts); } } } @@ -899,7 +914,10 @@ vmx_modinit(int ipinum) guest_l1d_flush = (cpu_ia32_arch_caps & IA32_ARCH_CAP_SKIP_L1DFL_VMENTRY) == 0; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush", &guest_l1d_flush); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush", &guest_l1d_flush); /* * L1D cache flush is enabled. Use IA32_FLUSH_CMD MSR when @@ -911,8 +929,12 @@ vmx_modinit(int ipinum) if (guest_l1d_flush) { if ((cpu_stdext_feature3 & CPUID_STDEXT3_L1D_FLUSH) == 0) { guest_l1d_flush_sw = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.vmm.l1d_flush_sw", &guest_l1d_flush_sw); +#endif + TUNABLE_INT_FETCH("hw.vmm.vmx.l1d_flush_sw", + &guest_l1d_flush_sw); } if (guest_l1d_flush_sw) { if (nmi_flush_l1d_sw <= 1) From nobody Thu Oct 19 17:28:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBF6n030qz4xgrr; Thu, 19 Oct 2023 17:28:17 +0000 (UTC) (envelope-from zlei@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 4SBF6m6VfZz3PwT; Thu, 19 Oct 2023 17:28:16 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736496; h=from:from:reply-to:subject: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=uThdu/WKdVZvlDZNe596rGZZm7DmSvHjz1U0Z5FcI1k=; b=IrudJ6YKPzMPgmVqBOdtos3FBUzL6Bghy90p5ZTTIRXKDrzVVo8ry0WfiQVWhJk7GsM/M2 gr68RsblJOAgRjoBZ6kO6L4BFF7NUb+0FYulFEyonoyET/HwWGi1EW08Byr2dcdRsjusXo slYocn6+I1+0jXLTPMt2802VfOhh2/Eb4cnQJXjYpDKUMvFN7URaQvQapl3eTml0tBF6QH voijjdc9VKA+ogZjweDX/zlTS+dr2Ov94hLxiKCT0HtrGBX5Ir/Ed/Q7oOhLPCyXZ6xOAd VUqzpxVinGqD8zpMLul6hGldnzJVjPDEUfn6BWf6G7K6jt/UheDEqMtzFWzFyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697736496; a=rsa-sha256; cv=none; b=hqYo02dqoynwMsmFl7WuDvV9X9CV5Hvdsmu0yhSOTng4R72ZmyKJX8xoU53JW5kPhG1UmO xJtyVBT6ve1kFDkJ2Wj9XAEegUvH1au+2SymS6bWaUgjlB9zwiVG0su//PfJ2vwW4c8hKH Rmhui8kaD8Dfy+y2IAQxEOedPp1MhIUE+YFCAI6o8hvuE8Yw+Zs0CCpA/nOiVqPntzQZXa fV0a/BBGoYcYImzpp5bBax7+wV5ThVVvPtLxy279Otrr83e8AYQ2gQyoa/MzTTjwj7Bwuy QjZjRVxxf0otrcfovIF5ZBvrgXlTx0urTEJrt9/ajW4kS3nc0lkZ3YPrCMPP8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697736496; h=from:from:reply-to:subject: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=uThdu/WKdVZvlDZNe596rGZZm7DmSvHjz1U0Z5FcI1k=; b=knEF83FUK3/LEWHXKTNljRXNGIzxkPZCK3szdOwJmOfVcH3dFpZRdmqfj/fFDAL3i/48jE CSD0syxpqct8iwXvcKfj+brP4QgWoZ1xaHwB9xhjAtHlZjfjk8u/D8JyQSHoCaLSPfLOWm T+7YSudNrkXs5ygXmslgmNaM/8zeCyusgHJVc6uggVHfsStOYQXPmsLYXZ2ugRSV09tv1v 797CaVTNUt3jlkrJpeVOx8lONpHzVPXS5vh/JrabFuDU8IcnqGpsMGkifDf5kTEbt74Rtd PlCgQwTl3kXQQHWpGRAvoUA/JQlnO+Gxme2VXLuywomBDvZq3349uyMFKqhVng== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SBF6l4qS4z19M1; Thu, 19 Oct 2023 17:28:15 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 02320f642095 - main - pmap: Prefer consistent naming for loader tunable Date: Fri, 20 Oct 2023 01:28:10 +0800 References: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" In-Reply-To: <202310191701.39JH1UXB041167@gitrepo.freebsd.org> Message-Id: <07922B4A-923A-41A3-8134-10BAF338564B@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) > On Oct 20, 2023, at 1:01 AM, Zhenlei Huang wrote: >=20 > The branch main has been updated by zlei: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D02320f64209563e35fa371fc5eac9406= 7f688f7f >=20 > commit 02320f64209563e35fa371fc5eac94067f688f7f > Author: Zhenlei Huang > AuthorDate: 2023-10-19 17:00:31 +0000 > Commit: Zhenlei Huang > CommitDate: 2023-10-19 17:00:31 +0000 >=20 > pmap: Prefer consistent naming for loader tunable >=20 > The sysctl knob 'vm.pmap.pv_entry_max' becomes a loader tunable = since > 7ff48af7040f (Allow a specific setting for pv entries) but is = fetched > from system environment 'vm.pmap.pv_entries'. That is inconsistent = and The 'system environment' is misleading. I meant 'kernel environment' . Sorry for fast commit. > obscure. >=20 > This reverts 36e1b9702e21 (Correct the tunable name in the = message). >=20 > PR: 231577 > Reviewed by: jhibbits, alc, kib > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D42274 > --- > sys/arm/arm/pmap-v6.c | 4 ++-- > sys/i386/i386/pmap.c | 4 ++-- > sys/powerpc/booke/pmap.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c > index 719851432203..92e992a4b25e 100644 > --- a/sys/arm/arm/pmap-v6.c > +++ b/sys/arm/arm/pmap-v6.c > @@ -1750,7 +1750,7 @@ pmap_init(void) > */ > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_max =3D roundup(pv_entry_max, _NPCPV); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > @@ -3012,7 +3012,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) > if (ratecheck(&lastprint, &printinterval)) > printf("Approaching the limit on PV entries, = consider " > "increasing either the vm.pmap.shpgperproc = or the " > - "vm.pmap.pv_entries tunable.\n"); > + "vm.pmap.pv_entry_max tunable.\n"); > retry: > pc =3D TAILQ_FIRST(&pmap->pm_pvchunk); > if (pc !=3D NULL) { > diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c > index 6b839484e6c5..967ad48de460 100644 > --- a/sys/i386/i386/pmap.c > +++ b/sys/i386/i386/pmap.c > @@ -998,7 +998,7 @@ __CONCAT(PMTYPE, init)(void) > */ > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_max =3D roundup(pv_entry_max, _NPCPV); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > @@ -2519,7 +2519,7 @@ get_pv_entry(pmap_t pmap, boolean_t try) > if (ratecheck(&lastprint, &printinterval)) > printf("Approaching the limit on PV entries, = consider " > "increasing either the vm.pmap.shpgperproc = or the " > - "vm.pmap.pv_entries tunable.\n"); > + "vm.pmap.pv_entry_max tunable.\n"); > retry: > pc =3D TAILQ_FIRST(&pmap->pm_pvchunk); > if (pc !=3D NULL) { > diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c > index fe6b95eda085..f41ea24cd30c 100644 > --- a/sys/powerpc/booke/pmap.c > +++ b/sys/powerpc/booke/pmap.c > @@ -1069,7 +1069,7 @@ mmu_booke_init(void) > TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); > pv_entry_max =3D shpgperproc * maxproc + vm_cnt.v_page_count; >=20 > - TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); > + TUNABLE_INT_FETCH("vm.pmap.pv_entry_max", &pv_entry_max); > pv_entry_high_water =3D 9 * (pv_entry_max / 10); >=20 > uma_zone_reserve_kva(pvzone, pv_entry_max); From nobody Thu Oct 19 18:36:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdl0Xjnz4xkkL; Thu, 19 Oct 2023 18: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 4SBGdl04bQz3Vlx; Thu, 19 Oct 2023 18: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=1697740603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=270yDVKUP7yfmdq55+iiH+i22zK3yMYgsfyUjTSMs5g=; b=ZvARRnklgc+WiBaQ5gnA0P78zEmzLjDsyeCTt5svXhuvdqFqJAd1OjKyQg0rhTyXp1n+y6 vFSwr2dS0AJgKDMdyE8FMDh6S2fxdwRZQv3ZXLrb4YuBoehKHoFDIZ8Laiq+Cu1KuAuUfo fjLOqofyVqLEnBkY7m7+2sLIzsV08VWxxJs5hcKDH5rPE1aJ68oLgXazBTZ/I/nNzlN225 ZeF9/UAGc0nMzUkQ7UzMFwdA2GN5+s7a5QK1IimzQZgPM1toAVWwVoTbUXhTKktwzKQzVN e2RekPvfq21JtphK/lnKr9komghcYB4Htm8b6ahq6u60ohNDv244+nf/IMAe4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740603; a=rsa-sha256; cv=none; b=kvRXNPkRPr6mv9cHljSwfp8t0VbW+shnDGLwL/NWBbna9ax2oi9d1vO9pYolpaivb+6Pze W0ts5b4lAf610zurd+GvaPgCyFjvpWuq8ADsXGkVupql1GQM5vHMrx/o7mEITYfX8KlqHH 5CZmPnqv8pRlZEHnxh4n/4d5jaQQgLanWVucxtgW3ubA/ENxU19Xmch5zFknLJ/1UWzbh4 eT1H4CeamO++tlW5KdImSjSXy/wVjAN4Vqe0jkVBH21+3NM1C2zIpwDcY9YL4ksI6YZCGC uaBW1wjN3ylhG7FLZ63WmqwopUSDoYrStrlRGKxOlKpiXGFIDA2PuT6Ts6U9fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=270yDVKUP7yfmdq55+iiH+i22zK3yMYgsfyUjTSMs5g=; b=gS9meMzdxg4ar6gSZc8Tk3nOnn07rZxkNEKqV08QWtwME9BWrFby2OCuwkOph4XWGo0jC6 UpfBi+x2UtdqkldxHdR6ZwXqNLqYfE6HWbbaIakCudDL/+JsVSHcmHzoNEveHSsMVvd5Xg uehlS8rHJq8r4eouvwHyxUym6U4s6LQKIoKOUfEFq88+3Rk5m+fAKq1EnLLbdCbZxchHSJ m5d0xZiLhJ9Mj/FqkYxT7b6S/w5QfHUGzgzxZljs1edHkyWHz0vIjt21/w3hfQkvgBAcXd lgqzc9VaxNgPvHVm/slYmGRKmwMtO/TnoI9AY5q/7kzkYeGeH3nXcBliLuZfcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdk6F8Kz10tb; Thu, 19 Oct 2023 18:36: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 39JIags6094142; Thu, 19 Oct 2023 18:36:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIagVX094139; Thu, 19 Oct 2023 18:36:42 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:42 GMT Message-Id: <202310191836.39JIagVX094139@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: 3de4f78d46c5 - main - Add support for Chacha20-Poly1305 to kernel TLS on FreeBSD. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3de4f78d46c58f23017942967ec74cbc3d2e175d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3de4f78d46c58f23017942967ec74cbc3d2e175d commit 3de4f78d46c58f23017942967ec74cbc3d2e175d Author: John Baldwin AuthorDate: 2020-12-23 22:09:51 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 Add support for Chacha20-Poly1305 to kernel TLS on FreeBSD. FreeBSD's kernel TLS supports Chacha20 for both TLS 1.2 and TLS 1.3. Obtained from: OpenSSL commit 77f3936928068bee9d7e0c6939709ac179cb1059 --- crypto/openssl/include/internal/ktls.h | 5 +++++ crypto/openssl/ssl/ktls.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/crypto/openssl/include/internal/ktls.h b/crypto/openssl/include/internal/ktls.h index 95492fd0659f..3c82cae26b47 100644 --- a/crypto/openssl/include/internal/ktls.h +++ b/crypto/openssl/include/internal/ktls.h @@ -40,6 +40,11 @@ # define OPENSSL_KTLS_AES_GCM_128 # define OPENSSL_KTLS_AES_GCM_256 # define OPENSSL_KTLS_TLS13 +# ifdef TLS_CHACHA20_IV_LEN +# ifndef OPENSSL_NO_CHACHA +# define OPENSSL_KTLS_CHACHA20_POLY1305 +# endif +# endif typedef struct tls_enable ktls_crypto_info_t; diff --git a/crypto/openssl/ssl/ktls.c b/crypto/openssl/ssl/ktls.c index ddbfd1447c54..daa758294a4c 100644 --- a/crypto/openssl/ssl/ktls.c +++ b/crypto/openssl/ssl/ktls.c @@ -37,6 +37,10 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, case SSL_AES128GCM: case SSL_AES256GCM: return 1; +# ifdef OPENSSL_KTLS_CHACHA20_POLY1305 + case SSL_CHACHA20POLY1305: + return 1; +# endif case SSL_AES128: case SSL_AES256: if (s->ext.use_etm) @@ -74,6 +78,12 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, else crypto_info->iv_len = EVP_GCM_TLS_FIXED_IV_LEN; break; +# ifdef OPENSSL_KTLS_CHACHA20_POLY1305 + case SSL_CHACHA20POLY1305: + crypto_info->cipher_algorithm = CRYPTO_CHACHA20_POLY1305; + crypto_info->iv_len = EVP_CIPHER_CTX_get_iv_length(dd); + break; +# endif case SSL_AES128: case SSL_AES256: switch (s->s3.tmp.new_cipher->algorithm_mac) { From nobody Thu Oct 19 18:36:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdm1xsPz4xkw7; Thu, 19 Oct 2023 18: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 4SBGdm1NW1z3VmN; Thu, 19 Oct 2023 18: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=1697740604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfe6mPSssggho28Rf7vsHlVQUQyjNsFYCSO8KtFdKk4=; b=YW/H3Deo3BmiAJnYLmwBcaOt2a7KIwlRPSYW/sWzc+yXueaa9nDQMRNVW+Ae4RbhiWMAg3 P5lQzsKIb05nrMI60jI0FhSExMepzT+teuweFKtbiGwkx3F/JkLCDX6z0saarr2euz+mkJ g/Nx8itzsSoEgFfibeWsFbTllI+W84bnwEqQyMB2fqmeb+nW9386Mhjddkq7N8pgY+92U7 wJlCNYo9ofby63lBu+PAaD+A7neEobYF9Sh2azyr8Onzcb+5XSrHTr2EUuIUnMkCAVs2kR ntYn9yvUsi/VefO98nAUEFELzYHBoafq5rbsx2XAQ2+UpU7ueyxs3DyITt1hXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740604; a=rsa-sha256; cv=none; b=pmdtQeVOs0RIacE+bbfzvykzW/bYAw6d4yhbDnKGAFZ/bCPJ9sXPGAJGRzF5iTesZ2I+Xs y74hG3wCeqgzcoq46q6a3AiNcU+PoqylK5HX9l4IZYurijV4T/UAD2k3zaBjbYQPfaX1yH GhMGG2p4SHJ4fLZb3MFc9eLSS078ojam6ChPEmaYQbnVBcC950yQ2BgXEn5y/2wG0KiyYT Hf+QtIZs7rB/RFGgK8EXvm5dXmy27asZY6xT+FR+xadZ1m+VPkxH4YsB+TENcG82zoXA0g dUjy/lmEOE2/T4XKC21ABbv6RiPzThSKwvwRA+R5WHTNY0hm1f53wt4rK3tfmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sfe6mPSssggho28Rf7vsHlVQUQyjNsFYCSO8KtFdKk4=; b=hpQKbqcmH859TYTEITt9TBnpAk6QHfTsA7eXJGUYQUGzUsBlI5SMNUuiOkO/Bk0zySgx1x NgGKCDKqXRqyRJnRDqmNfWhm3x34pwWfpCDCjy7Rp2gBsS8T2Oh3zJrgDn34wj/7X8MsU6 KDa00c6NpWbAeqJhrBnrkt+L+hEXNF+kfka5uXO8OhOdkfRaWkLo4h4MKiTGPaZ6SoNRO7 KfQmG5GIFW8eT/6aCpdv/DK9WPUVNhAl7mnPda0LZSIoDACegSZ7oLYf3v6iGqW/QwyFse +WS+/5t4wa0mF1uXLTTPwG1rbwJaTsZjRv7/3MNt1JnJTPy/i+qF0W1E8aXYKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdm07xzz10tc; Thu, 19 Oct 2023 18: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 39JIahsX094193; Thu, 19 Oct 2023 18: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 39JIahRU094190; Thu, 19 Oct 2023 18:36:43 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:43 GMT Message-Id: <202310191836.39JIahRU094190@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: eee55a22b202 - main - KTLS: Check for unprocessed receive records in ktls_configure_crypto. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eee55a22b20214ca41cd6b1bbea79b863c8c11ac Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eee55a22b20214ca41cd6b1bbea79b863c8c11ac commit eee55a22b20214ca41cd6b1bbea79b863c8c11ac Author: John Baldwin AuthorDate: 2022-02-24 18:12:07 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Check for unprocessed receive records in ktls_configure_crypto. KTLS implementations currently assume that the start of the in-kernel socket buffer is aligned with the start of a TLS record for the receive side. The socket option to enable KTLS specifies the TLS sequence number of this initial record. When read ahead is enabled, data can be pending in the SSL read buffer after negotiating session keys. This pending data must be examined to ensurs that the kernel's socket buffer does not contain a partial TLS record as well as to determine the correct sequence number of the first TLS record to be processed by the kernel. In preparation for enabling receive kernel offload for TLS 1.3, move the existing logic to handle read ahead from t1_enc.c into ktls.c and invoke it from ktls_configure_crypto(). Obtained from: OpenSSL commit 85773128d0e80cd8dcc772a6931d385b8cf4acd1 --- crypto/openssl/ssl/ktls.c | 100 ++++++++++++++++++++++++++++++++++------- crypto/openssl/ssl/ssl_local.h | 4 +- crypto/openssl/ssl/t1_enc.c | 66 ++------------------------- crypto/openssl/ssl/tls13_enc.c | 3 +- 4 files changed, 91 insertions(+), 82 deletions(-) diff --git a/crypto/openssl/ssl/ktls.c b/crypto/openssl/ssl/ktls.c index daa758294a4c..28bb62d236ab 100644 --- a/crypto/openssl/ssl/ktls.c +++ b/crypto/openssl/ssl/ktls.c @@ -10,6 +10,67 @@ #include "ssl_local.h" #include "internal/ktls.h" +#ifndef OPENSSL_NO_KTLS_RX + /* + * Count the number of records that were not processed yet from record boundary. + * + * This function assumes that there are only fully formed records read in the + * record layer. If read_ahead is enabled, then this might be false and this + * function will fail. + */ +static int count_unprocessed_records(SSL *s) +{ + SSL3_BUFFER *rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); + PACKET pkt, subpkt; + int count = 0; + + if (!PACKET_buf_init(&pkt, rbuf->buf + rbuf->offset, rbuf->left)) + return -1; + + while (PACKET_remaining(&pkt) > 0) { + /* Skip record type and version */ + if (!PACKET_forward(&pkt, 3)) + return -1; + + /* Read until next record */ + if (!PACKET_get_length_prefixed_2(&pkt, &subpkt)) + return -1; + + count += 1; + } + + return count; +} + +/* + * The kernel cannot offload receive if a partial TLS record has been read. + * Check the read buffer for unprocessed records. If the buffer contains a + * partial record, fail and return 0. Otherwise, update the sequence + * number at *rec_seq for the count of unprocessed records and return 1. + */ +static int check_rx_read_ahead(SSL *s, unsigned char *rec_seq) +{ + int bit, count_unprocessed; + + count_unprocessed = count_unprocessed_records(s); + if (count_unprocessed < 0) + return 0; + + /* increment the crypto_info record sequence */ + while (count_unprocessed) { + for (bit = 7; bit >= 0; bit--) { /* increment */ + ++rec_seq[bit]; + if (rec_seq[bit] != 0) + break; + } + count_unprocessed--; + + } + + return 1; +} +#endif + #if defined(__FreeBSD__) # include "crypto/cryptodev.h" @@ -59,9 +120,9 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, } /* Function to configure kernel TLS structure */ -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size) { @@ -114,11 +175,11 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, crypto_info->tls_vminor = (s->version & 0x000000ff); # ifdef TCP_RXTLS_ENABLE memcpy(crypto_info->rec_seq, rl_sequence, sizeof(crypto_info->rec_seq)); - if (rec_seq != NULL) - *rec_seq = crypto_info->rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->rec_seq)) + return 0; # else - if (rec_seq != NULL) - *rec_seq = NULL; + if (!is_tx) + return 0; # endif return 1; }; @@ -167,15 +228,20 @@ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, } /* Function to configure kernel TLS structure */ -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size) { unsigned char geniv[12]; unsigned char *iiv = iv; +# ifdef OPENSSL_NO_KTLS_RX + if (!is_tx) + return 0; +# endif + if (s->version == TLS1_2_VERSION && EVP_CIPHER_get_mode(c) == EVP_CIPH_GCM_MODE) { if (!EVP_CIPHER_CTX_get_updated_iv(dd, geniv, @@ -199,8 +265,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->gcm128.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->gcm128.rec_seq, rl_sequence, TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->gcm128.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->gcm128.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_AES_GCM_256 @@ -214,8 +280,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->gcm256.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->gcm256.rec_seq, rl_sequence, TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->gcm256.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->gcm256.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_AES_CCM_128 @@ -229,8 +295,8 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, memcpy(crypto_info->ccm128.key, key, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->ccm128.rec_seq, rl_sequence, TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->ccm128.rec_seq; + if (!is_tx && !check_rx_read_ahead(s, crypto_info->ccm128.rec_seq)) + return 0; return 1; # endif # ifdef OPENSSL_KTLS_CHACHA20_POLY1305 @@ -244,8 +310,10 @@ int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, EVP_CIPHER_get_key_length(c)); memcpy(crypto_info->chacha20poly1305.rec_seq, rl_sequence, TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE); - if (rec_seq != NULL) - *rec_seq = crypto_info->chacha20poly1305.rec_seq; + if (!is_tx + && !check_rx_read_ahead(s, + crypto_info->chacha20poly1305.rec_seq)) + return 0; return 1; # endif default: diff --git a/crypto/openssl/ssl/ssl_local.h b/crypto/openssl/ssl/ssl_local.h index 5fb1feb80163..bb5816024a17 100644 --- a/crypto/openssl/ssl/ssl_local.h +++ b/crypto/openssl/ssl/ssl_local.h @@ -2762,9 +2762,9 @@ __owur int ssl_log_secret(SSL *ssl, const char *label, /* ktls.c */ int ktls_check_supported_cipher(const SSL *s, const EVP_CIPHER *c, const EVP_CIPHER_CTX *dd); -int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, +int ktls_configure_crypto(SSL *s, const EVP_CIPHER *c, EVP_CIPHER_CTX *dd, void *rl_sequence, ktls_crypto_info_t *crypto_info, - unsigned char **rec_seq, unsigned char *iv, + int is_tx, unsigned char *iv, unsigned char *key, unsigned char *mac_key, size_t mac_secret_size); # endif diff --git a/crypto/openssl/ssl/t1_enc.c b/crypto/openssl/ssl/t1_enc.c index 91238e6457b8..26182a1cd6eb 100644 --- a/crypto/openssl/ssl/t1_enc.c +++ b/crypto/openssl/ssl/t1_enc.c @@ -98,42 +98,6 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km, size_t num) return ret; } -#ifndef OPENSSL_NO_KTLS - /* - * Count the number of records that were not processed yet from record boundary. - * - * This function assumes that there are only fully formed records read in the - * record layer. If read_ahead is enabled, then this might be false and this - * function will fail. - */ -# ifndef OPENSSL_NO_KTLS_RX -static int count_unprocessed_records(SSL *s) -{ - SSL3_BUFFER *rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); - PACKET pkt, subpkt; - int count = 0; - - if (!PACKET_buf_init(&pkt, rbuf->buf + rbuf->offset, rbuf->left)) - return -1; - - while (PACKET_remaining(&pkt) > 0) { - /* Skip record type and version */ - if (!PACKET_forward(&pkt, 3)) - return -1; - - /* Read until next record */ - if (!PACKET_get_length_prefixed_2(&pkt, &subpkt)) - return -1; - - count += 1; - } - - return count; -} -# endif -#endif - - int tls_provider_set_tls_params(SSL *s, EVP_CIPHER_CTX *ctx, const EVP_CIPHER *ciph, const EVP_MD *md) @@ -201,12 +165,7 @@ int tls1_change_cipher_state(SSL *s, int which) int reuse_dd = 0; #ifndef OPENSSL_NO_KTLS ktls_crypto_info_t crypto_info; - unsigned char *rec_seq; void *rl_sequence; -# ifndef OPENSSL_NO_KTLS_RX - int count_unprocessed; - int bit; -# endif BIO *bio; #endif @@ -473,30 +432,11 @@ int tls1_change_cipher_state(SSL *s, int which) else rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); - if (!ktls_configure_crypto(s, c, dd, rl_sequence, &crypto_info, &rec_seq, - iv, key, ms, *mac_secret_size)) + if (!ktls_configure_crypto(s, c, dd, rl_sequence, &crypto_info, + which & SSL3_CC_WRITE, iv, key, ms, + *mac_secret_size)) goto skip_ktls; - if (which & SSL3_CC_READ) { -# ifndef OPENSSL_NO_KTLS_RX - count_unprocessed = count_unprocessed_records(s); - if (count_unprocessed < 0) - goto skip_ktls; - - /* increment the crypto_info record sequence */ - while (count_unprocessed) { - for (bit = 7; bit >= 0; bit--) { /* increment */ - ++rec_seq[bit]; - if (rec_seq[bit] != 0) - break; - } - count_unprocessed--; - } -# else - goto skip_ktls; -# endif - } - /* ktls works with user provided buffers directly */ if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) { if (which & SSL3_CC_WRITE) diff --git a/crypto/openssl/ssl/tls13_enc.c b/crypto/openssl/ssl/tls13_enc.c index ddcff5eb8911..861ecdf91701 100644 --- a/crypto/openssl/ssl/tls13_enc.c +++ b/crypto/openssl/ssl/tls13_enc.c @@ -723,7 +723,8 @@ int tls13_change_cipher_state(SSL *s, int which) /* configure kernel crypto structure */ if (!ktls_configure_crypto(s, cipher, ciph_ctx, RECORD_LAYER_get_write_sequence(&s->rlayer), - &crypto_info, NULL, iv, key, NULL, 0)) + &crypto_info, which & SSL3_CC_WRITE, iv, key, + NULL, 0)) goto skip_ktls; /* ktls works with user provided buffers directly */ From nobody Thu Oct 19 18:36:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdn2Z5qz4xkf3; Thu, 19 Oct 2023 18:36: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 4SBGdn1wWPz3VsF; Thu, 19 Oct 2023 18:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBVhHzfQ8BduRX5ZoRQAQZUGnh0AzoI7v2MC8oS7qdk=; b=MofE2VL7KfwqLpFON1y2XcCes46nGbP77/cfHhyrVZCA+JNMElEXoCfsN8wv1LYEFj0uwC 69nJu+d+vAirNYYjW2m6Vuu4ZY676IQ/GprJxPhoVABwQEkO91fTTznEOa/vx2awjBMUsv OO08+H8GyGRW7HuJuxeYq+aZ0TaGFYqaB60nJt+LaTOkiFxvg0yRehesMuLxJ+Go7rjS7N WgoO6pV9m3wAi9rPUhI681FXEBx1Fd4bbvGCZdImY3NWLassbdPMnd+UpWUioQo78YuHBZ luv3h9IGFxGlxw21+GnmyGOjzSUEIPUyk28F+QtkfC3DbuJxR6y4mHj3iEhibw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740605; a=rsa-sha256; cv=none; b=RXT5enLXDxxpov08+d8d2IWHQ/HrpYAs/MMSe5+jPKtxbez1b3bugB5zEVH5kL/J3wbHQt PqsAvqYfXWzVSsnhpBUsg5oe0lRPMesOMf9w/euuzQhYghxoY+GnJJrApJP+FtjVxWsOyH TP+kB9Y4dzZM661JQz2EqFP1JznMVSKmBiLRRfRqdQXtKDiCng6VbeGEXTAg4qjlud2AZ4 JBWAy83zIkZ+/VzpOUKXvUJvnd+jWdiYtayuCk/lZKow3KRH4KcZEy8P+B9AWx9FiAzB/o hdsFCXkKQl27xiQXaph3Y1n9oWZVLuxlcJUjgwmg0tCXAEbLSm4ezBO9B51etQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BBVhHzfQ8BduRX5ZoRQAQZUGnh0AzoI7v2MC8oS7qdk=; b=A8EjZLBjU5x1ESTUz3YMd90SkZSvOgT7KH46VmWyFUns23F8qwl9Yr3PTsGmynP5RUjBOD FWWysj4ZfFqpwiRcbjRuH/3uLH9WI7S/ZTbAQQxDMzz8a8ivperbOrKMG1dRQ+XeQbJy5Z +omwn4RmRMHHKOwvagX01zoJqDQo+w+PM4MvyAvSXd4C3wUPktWkF7g8EdZTTIQbeMzcRH wZcWOfzAy2lRHU1p+AEj3QpfJbaRLSNRl521uTEQU4h3cGUQkCgdr+44mHSZZzaOQbRyvF snmCEvKhiSwCzMcWjc6xq7vzqm4h3i0bvWEoVI26YPHIRxPXh+zXwI2XLFzbiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdn0jQvz11bZ; Thu, 19 Oct 2023 18:36: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 39JIaj97094248; Thu, 19 Oct 2023 18:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIajHo094245; Thu, 19 Oct 2023 18:36:45 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:45 GMT Message-Id: <202310191836.39JIajHo094245@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: 0fc28f22d5b6 - main - KTLS: Add using_ktls helper variable in ssl3_get_record(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fc28f22d5b6a75d8a0449262a05cefe1040f982 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0fc28f22d5b6a75d8a0449262a05cefe1040f982 commit 0fc28f22d5b6a75d8a0449262a05cefe1040f982 Author: John Baldwin AuthorDate: 2022-03-08 00:55:18 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Add using_ktls helper variable in ssl3_get_record(). When KTLS receive is enabled, pending data may still be present due to read ahead. This data must still be processed the same as records received without KTLS. To ease readability (especially in consideration of additional checks which will be added for TLS 1.3), add a helper variable 'using_ktls' that is true when the KTLS receive path is being used to receive a record. Obtained from: OpenSSL commit 031132c297e54cbc20404a0bf8de6ed863196399 --- crypto/openssl/ssl/record/ssl3_record.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/crypto/openssl/ssl/record/ssl3_record.c b/crypto/openssl/ssl/record/ssl3_record.c index 3c0b1323a459..57915e1bd6e0 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -185,18 +185,23 @@ int ssl3_get_record(SSL *s) int imac_size; size_t num_recs = 0, max_recs, j; PACKET pkt, sslv2pkt; - int is_ktls_left; + int using_ktls; SSL_MAC_BUF *macbufs = NULL; int ret = -1; rr = RECORD_LAYER_get_rrec(&s->rlayer); rbuf = RECORD_LAYER_get_rbuf(&s->rlayer); - is_ktls_left = (SSL3_BUFFER_get_left(rbuf) > 0); max_recs = s->max_pipelines; if (max_recs == 0) max_recs = 1; sess = s->session; + /* + * KTLS reads full records. If there is any data left, + * then it is from before enabling ktls. + */ + using_ktls = BIO_get_ktls_recv(s->rbio) && SSL3_BUFFER_get_left(rbuf) == 0; + do { thisrr = &rr[num_recs]; @@ -409,7 +414,7 @@ int ssl3_get_record(SSL *s) #endif /* KTLS may use all of the buffer */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) len = SSL3_BUFFER_get_left(rbuf); if (thisrr->length > len) { @@ -518,11 +523,7 @@ int ssl3_get_record(SSL *s) return 1; } - /* - * KTLS reads full records. If there is any data left, - * then it is from before enabling ktls - */ - if (BIO_get_ktls_recv(s->rbio) && !is_ktls_left) + if (using_ktls) goto skip_decryption; if (s->read_hash != NULL) { @@ -734,8 +735,7 @@ int ssl3_get_record(SSL *s) * Therefore we have to rely on KTLS to check the plaintext length * limit in the kernel. */ - if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH - && (!BIO_get_ktls_recv(s->rbio) || is_ktls_left)) { + if (thisrr->length > SSL3_RT_MAX_PLAIN_LENGTH && !using_ktls) { SSLfatal(s, SSL_AD_RECORD_OVERFLOW, SSL_R_DATA_LENGTH_TOO_LONG); goto end; } From nobody Thu Oct 19 18:36:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdp3py0z4xkRJ; Thu, 19 Oct 2023 18:36: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 4SBGdp2xQ5z3VyH; Thu, 19 Oct 2023 18:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKiBtuiOx6uEw89FxFGcwPl0DUIaQGT3egm1l6/Guzs=; b=Q4WiGPOOV8V/7G1KB2hHWq74tq7WmaO4u9/1Lpx9vhxS/U1d1Lp9ZZtepX2/1i1ZOldI3y G/yAnuGzumyem5QrYULfz0zUmKCRaaV2rK/KYjmBVg1NbOJTXQCpBxWNMstD3SUD0jz55X 2YV2p4IZrYvjwwWrYnyHSz7W9l6sHc0IYj8t3WatxX3d6X+OXhqSctqtiC4uOSRC/JIuNc bzwt+ps07/1e6d7OEypMAWCMKbHFGRI+iTecOQz2k+SI5TcodA1JSUfZk/dF+YwRAmxXY5 gApe8KqrYKSvvBUrQNbQGUdMeVfdsNa4Dx39zPIfHFeL5WhlcZhU0J9gh1iUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740606; a=rsa-sha256; cv=none; b=oz5jqsfH0mzoN5V53mDomRog8RJv84trfyEqLFXzMlyyhIdvJPWVtg7UA6xM3QdG1Nuu+b 9xgcdGQ5iYfgSF9LOnmHPyW3wUhxhwHiLACl6eIaWgaOiHwPa3b+fuCKF9OuURakUnm29E 5XuZMh8sHKWVpmHwvDEW9Fbvf4MCsLy4pVJcE1jk5l17EJdzOtGkQytlynL3OQ0lZJxFy/ RuKIcjSNojXj5go0p+KvgkhfeK4iw2Dm677EVo0wDd/n/J+NjJeIBX/zocJkyRuO/liRM9 XeVeH7+udmv6Jec7A0wKZz/Uyt5HMFTTfI+90ti4j1TdmeV613qT/jwCkoifmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dKiBtuiOx6uEw89FxFGcwPl0DUIaQGT3egm1l6/Guzs=; b=rE0OdMhn7sjeL2oj8LMaMD9Dk/EqqwVTd9yxbUYBwbNsVftE4y+/DzyXuwB1xROVuZ3Wyk P0BOBRcq27Ef1ChzJOT6lctWsKhQ6uOf5g06Z3KfQ0ns9JioQai9Q8TjR7W2S5lxnwQ7Cf o1aj/BbQNz97kEdReM72YYM80sZvjncJaQ885btOirLa8iH91jfMsJPTvpbMj8TWiRoyUe W+P6OJyoHfUln1BmjzZVEM2XekdXuirAMyJxPyClevlxEfOGYgVNb9CV8+jc9gaMejBikx goe0JEF5TQ0O82nAxRSES2kP5pW8RGb/TZdF586D2SYJuj7uxDtfIhEfS73z2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdp1jSZz11Jr; Thu, 19 Oct 2023 18:36: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 39JIakMw094297; Thu, 19 Oct 2023 18:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIakvd094294; Thu, 19 Oct 2023 18:36:46 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:46 GMT Message-Id: <202310191836.39JIakvd094294@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: c085ca524579 - main - KTLS: Handle TLS 1.3 in ssl3_get_record. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c085ca5245797ae17fc69353bbdf7584acb2feaa Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c085ca5245797ae17fc69353bbdf7584acb2feaa commit c085ca5245797ae17fc69353bbdf7584acb2feaa Author: Daiki Ueno AuthorDate: 2021-10-10 06:54:07 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Handle TLS 1.3 in ssl3_get_record. - Don't unpad records, check the outer record type, or extract the inner record type from TLS 1.3 records handled by the kernel. KTLS performs all of these steps and returns the inner record type in the TLS header. - When checking the length of a received TLS 1.3 record don't allow for the extra byte for the nested record type when KTLS is used. - Pass a pointer to the record type in the TLS header to the SSL3_RT_INNER_CONTENT_TYPE message callback. For KTLS, the old pointer pointed to the last byte of payload rather than the record type. For the non-KTLS case, the TLS header has been updated with the inner type before this callback is invoked. Obtained from: OpenSSL commit a5fb9605329fb939abb536c1604d44a511741624) --- crypto/openssl/ssl/record/ssl3_record.c | 46 ++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/crypto/openssl/ssl/record/ssl3_record.c b/crypto/openssl/ssl/record/ssl3_record.c index 57915e1bd6e0..d6c0cf346723 100644 --- a/crypto/openssl/ssl/record/ssl3_record.c +++ b/crypto/openssl/ssl/record/ssl3_record.c @@ -366,7 +366,9 @@ int ssl3_get_record(SSL *s) } } - if (SSL_IS_TLS13(s) && s->enc_read_ctx != NULL) { + if (SSL_IS_TLS13(s) + && s->enc_read_ctx != NULL + && !using_ktls) { if (thisrr->type != SSL3_RT_APPLICATION_DATA && (thisrr->type != SSL3_RT_CHANGE_CIPHER_SPEC || !SSL_IS_FIRST_HANDSHAKE(s)) @@ -396,7 +398,13 @@ int ssl3_get_record(SSL *s) } if (SSL_IS_TLS13(s)) { - if (thisrr->length > SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH) { + size_t len = SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH; + + /* KTLS strips the inner record type. */ + if (using_ktls) + len = SSL3_RT_MAX_ENCRYPTED_LENGTH; + + if (thisrr->length > len) { SSLfatal(s, SSL_AD_RECORD_OVERFLOW, SSL_R_ENCRYPTED_LENGTH_TOO_LONG); return -1; @@ -689,21 +697,29 @@ int ssl3_get_record(SSL *s) if (SSL_IS_TLS13(s) && s->enc_read_ctx != NULL && thisrr->type != SSL3_RT_ALERT) { - size_t end; + /* + * The following logic are irrelevant in KTLS: the kernel provides + * unprotected record and thus record type represent the actual + * content type, and padding is already removed and thisrr->type and + * thisrr->length should have the correct values. + */ + if (!using_ktls) { + size_t end; - if (thisrr->length == 0 - || thisrr->type != SSL3_RT_APPLICATION_DATA) { - SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE); - goto end; - } + if (thisrr->length == 0 + || thisrr->type != SSL3_RT_APPLICATION_DATA) { + SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE); + goto end; + } - /* Strip trailing padding */ - for (end = thisrr->length - 1; end > 0 && thisrr->data[end] == 0; - end--) - continue; + /* Strip trailing padding */ + for (end = thisrr->length - 1; end > 0 && thisrr->data[end] == 0; + end--) + continue; - thisrr->length = end; - thisrr->type = thisrr->data[end]; + thisrr->length = end; + thisrr->type = thisrr->data[end]; + } if (thisrr->type != SSL3_RT_APPLICATION_DATA && thisrr->type != SSL3_RT_ALERT && thisrr->type != SSL3_RT_HANDSHAKE) { @@ -712,7 +728,7 @@ int ssl3_get_record(SSL *s) } if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_INNER_CONTENT_TYPE, - &thisrr->data[end], 1, s, s->msg_callback_arg); + &thisrr->type, 1, s, s->msg_callback_arg); } /* From nobody Thu Oct 19 18:36:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGdq5jKpz4xl4g; Thu, 19 Oct 2023 18:36: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 4SBGdq3cfxz3W3n; Thu, 19 Oct 2023 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6XaeGLIdyS+4pWpTUe891x6391CLivN9RCuKDcJLJY=; b=uxn11LbPIEY89tlEdmRWcIOqks5+MP66Sp3wecIKmE43b5dhJ1waiQpxlEEvpwu8RYnVyq ozY09FrOswUksO3c3yGMG5Gzct47hr7QS+Em8uje8tiFpGXuXnuhuFkuT/0+3Xm9Ax2sms XGtlctfabxbLiVWYTVn8AEI3c0dRM0UwzhUc+qxb4yeQ8XE0PhHn1xW4Wd3XznsS1fvdjl E2hQvOsEejcNt0KheP75O81LIY7ynQ6wpKogbhxZUh49D4FrzfZjJXd644vfpglrgjHKr0 XIjDvdlOpQKKX2SkOgOLNs71AHAUVuqHySnoa+yYH3A8gP3vaj9Jbn3Tzsfl3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740607; a=rsa-sha256; cv=none; b=DcCTEhxPuZB7mTiPoIS61plgRk3g+fa0OxE8aSAY7ln8fKAXg/+oWZDm0ePMmo5hqlZYbM R1rhqVOQwU7Z8+kRwCoMTHg0uIHqJkLUQHgXFA9iVjjviiioUGbYEhtH1gsecFsKaViOEg ICFRrPjZocbm99nkuPBQsWQ/azpXcquVtBS8d1Kfq1IZtxSwBJ0g+D26o7GWRE5xlSkPRk Mnlt/Plpip/1ZiHNWSzsaL3mTYpUH5JtloaQjRWewBA45tmHuB5Onq8ZxFvLczYc2TzfF9 2iRh6WBp1OYHZ1hVCsTJJdxWDasmz+G2bSCnJA3ASNYxcqnH2YVdfI1EBQo6jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e6XaeGLIdyS+4pWpTUe891x6391CLivN9RCuKDcJLJY=; b=LYvZNTjr2KybQO3Jy2ARxZjuB3sZPYuQThxCNuIRJTphADo/WKS4rKUVpKu4+YtB2gyKbp J8y9Q5Rx7pVup3L+2SXiVprmF1xrkX16GNilLiuH3zEu4w1n4aIDADuGfZsxxLRxvmV/eJ b0HfXggVnbvmwXaxmtmEfVgEdtWhOmmskUgtABHAZEdK7xnril5+wh4pQ9LoScaXxZl3MK fzCFBPfgdjdNBPp+QseRnRwFkN6HU4xwsZ4RxPF0FSzH6ytzlYeL9zqBYf9T0BPsGy1HCb 5AvuqNC8ssPpGAXv0C/oDLWRaatpbUBCAEkdOPnA9zOHQ4NhRdxWk/g2HhlZvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBGdq2kkSz10wH; Thu, 19 Oct 2023 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JIalLm094355; Thu, 19 Oct 2023 18:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JIalxJ094352; Thu, 19 Oct 2023 18:36:47 GMT (envelope-from git) Date: Thu, 19 Oct 2023 18:36:47 GMT Message-Id: <202310191836.39JIalxJ094352@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: 6ed16d17333c - main - KTLS: Enable KTLS for receiving as well in TLS 1.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ed16d17333c5b1895aff35ddc1d46834f53a9eb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6ed16d17333c5b1895aff35ddc1d46834f53a9eb commit 6ed16d17333c5b1895aff35ddc1d46834f53a9eb Author: Daiki Ueno AuthorDate: 2021-10-10 07:14:06 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:34:58 +0000 KTLS: Enable KTLS for receiving as well in TLS 1.3 This removes a guard condition that prevents KTLS being enabled for receiving in TLS 1.3. Use the correct sequence number and BIO for receive vs transmit offload. Obtained from: OpenSSL commit 7c78932b9a4330fb7c8db72b3fb37cbff1401f8b --- crypto/openssl/ssl/tls13_enc.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/crypto/openssl/ssl/tls13_enc.c b/crypto/openssl/ssl/tls13_enc.c index 861ecdf91701..39a27d926ce7 100644 --- a/crypto/openssl/ssl/tls13_enc.c +++ b/crypto/openssl/ssl/tls13_enc.c @@ -438,6 +438,7 @@ int tls13_change_cipher_state(SSL *s, int which) const EVP_CIPHER *cipher = NULL; #if !defined(OPENSSL_NO_KTLS) && defined(OPENSSL_KTLS_TLS13) ktls_crypto_info_t crypto_info; + void *rl_sequence; BIO *bio; #endif @@ -692,8 +693,7 @@ int tls13_change_cipher_state(SSL *s, int which) s->statem.enc_write_state = ENC_WRITE_STATE_VALID; #ifndef OPENSSL_NO_KTLS # if defined(OPENSSL_KTLS_TLS13) - if (!(which & SSL3_CC_WRITE) - || !(which & SSL3_CC_APPLICATION) + if (!(which & SSL3_CC_APPLICATION) || (s->options & SSL_OP_ENABLE_KTLS) == 0) goto skip_ktls; @@ -709,7 +709,10 @@ int tls13_change_cipher_state(SSL *s, int which) if (!ktls_check_supported_cipher(s, cipher, ciph_ctx)) goto skip_ktls; - bio = s->wbio; + if (which & SSL3_CC_WRITE) + bio = s->wbio; + else + bio = s->rbio; if (!ossl_assert(bio != NULL)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); @@ -717,19 +720,26 @@ int tls13_change_cipher_state(SSL *s, int which) } /* All future data will get encrypted by ktls. Flush the BIO or skip ktls */ - if (BIO_flush(bio) <= 0) - goto skip_ktls; + if (which & SSL3_CC_WRITE) { + if (BIO_flush(bio) <= 0) + goto skip_ktls; + } /* configure kernel crypto structure */ - if (!ktls_configure_crypto(s, cipher, ciph_ctx, - RECORD_LAYER_get_write_sequence(&s->rlayer), - &crypto_info, which & SSL3_CC_WRITE, iv, key, - NULL, 0)) + if (which & SSL3_CC_WRITE) + rl_sequence = RECORD_LAYER_get_write_sequence(&s->rlayer); + else + rl_sequence = RECORD_LAYER_get_read_sequence(&s->rlayer); + + if (!ktls_configure_crypto(s, cipher, ciph_ctx, rl_sequence, &crypto_info, + which & SSL3_CC_WRITE, iv, key, NULL, 0)) goto skip_ktls; /* ktls works with user provided buffers directly */ - if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) - ssl3_release_write_buffer(s); + if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) { + if (which & SSL3_CC_WRITE) + ssl3_release_write_buffer(s); + } skip_ktls: # endif #endif From nobody Thu Oct 19 18:38:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBGgH34g1z4xkkX; Thu, 19 Oct 2023 18:38:03 +0000 (UTC) (envelope-from jhb@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 4SBGgH28gGz3X98; Thu, 19 Oct 2023 18:38:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740683; h=from:from:reply-to:subject: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=aoTavFlRj5Oc5AqWkKJ8Voy1pyVf/5MrqkxrBSs2KXc=; b=SRMR6leXAfdnDl6xL6SZd4+JLQeHDpTyXt9zo/taPFpXu6dqoEDqsyTESvhbpV4cN31a3G D0sAHCL/yrM9C9isOxrhdwOZKtGZM4QIU+vpxxfYCYIyXOdnymcqm/MwXV1+nbvpg/unqk SbEbLnCaG+8upBQIPIIJ4OeV8tA+c06O4slkV9YCc2xlx3ARMdNTNANkk2NQpUV3JXASS8 H3Ny6APfbwv1smg2Ym6AvPgG9YDC5i0L2+jQp+Q868jZP15fM6aY1wX3Eg3DcSPthAbdth Cd8tMWuFbrQKFLRqMpt84PJb0J8jauphxaT8NQspEqA+xrGtOk7NB1OkfiN9gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697740683; a=rsa-sha256; cv=none; b=qVCWFjO0UnHOBWrTjTOETL5wpruaVeic0+LtEQ5RKmdU34d0WSvkBDuoUOFOcCZktwGcO8 JrjL7vdIIt8dkz9GXjzvZCQOfA09pe4C4svVe4t8zEl8dGQxfZXixTv0lXKd/IqOJkBdf0 m06hTH6a7CcNC//3bHTnIMYOvT+Y0CabkyFpSDMmEAKtFeSIx+YlwBSlRBPuS7nvkaYGhI wrMvdjb3UBAafD/EpQMvo/UmBA7n+DPkzBZIvxk65TSQ6vSG/C3lpwR7nMr75WirnFeIt5 YFbUvWlHkkTWfaMXv22r6PRzH2x6KZNjqsiXaQesLJUAq0KpJL5XQ+ruFg92qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697740683; h=from:from:reply-to:subject: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=aoTavFlRj5Oc5AqWkKJ8Voy1pyVf/5MrqkxrBSs2KXc=; b=NoAsAixYn6lQT9FBsbzvn9NUXU53rtNTrHWUzkN60F3IFK0jIGoYTwW9DGMnuKSOPypnKW ibGr6W6OOPo02CUF+ybYINqX1ZmXtIWHTYkNTTs4QzJclbGX8MmLH+2hLw9Sa+jaHqPPvh aYMAB47CWA86hfHHAVksOpqJY8h0kH9pvzDY+XySsDleM6zvXcsGaHdaRYtZBP5KlW8ikb enc4Uymr6ZSjdCr7PcUagV2YNM7BGC4KTXtihHO2fchunAnmC+LdgjVb0wyu1gPe83vdhi 2zbBzafHvj/tZcl1DAS7o39DGii0b+ArREl/2bvOOpKmZXn67Kkmom4+FKKYwg== Received: from [IPV6:2601:648:8683:39a0:a9a6:ccb4:a3d2:7302] (unknown [IPv6:2601:648:8683:39a0:a9a6:ccb4:a3d2:7302]) (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 4SBGgG5q8fz1B96; Thu, 19 Oct 2023 18:38:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <89d50de6-bce6-8dfc-1635-f298c5fc9b8c@FreeBSD.org> Date: Thu, 19 Oct 2023 11:38:00 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: git: 6ed16d17333c - main - KTLS: Enable KTLS for receiving as well in TLS 1.3 Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202310191836.39JIalxJ094352@gitrepo.freebsd.org> In-Reply-To: <202310191836.39JIalxJ094352@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/19/23 11:36 AM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6ed16d17333c5b1895aff35ddc1d46834f53a9eb > > commit 6ed16d17333c5b1895aff35ddc1d46834f53a9eb > Author: Daiki Ueno > AuthorDate: 2021-10-10 07:14:06 +0000 > Commit: John Baldwin > CommitDate: 2023-10-19 18:34:58 +0000 > > KTLS: Enable KTLS for receiving as well in TLS 1.3 > > This removes a guard condition that prevents KTLS being enabled for > receiving in TLS 1.3. Use the correct sequence number and BIO for > receive vs transmit offload. > > Obtained from: OpenSSL commit 7c78932b9a4330fb7c8db72b3fb37cbff1401f8b This series restores support for KTLS receive for TLS 1.3 previously backported from OpenSSL master into OpenSSL 1.1.1 in base. -- John Baldwin From nobody Thu Oct 19 19:23:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHgB5WY8z4xnBb; Thu, 19 Oct 2023 19:23: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 4SBHgB52Czz3cBy; Thu, 19 Oct 2023 19:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlgIspg85XvTMjJe2tPnvsL36pQX9e+4ZH/mTycK3U4=; b=JUE4Hx/kg7KNxrXTAyN0tR831lPiyscZCbE9b/Z0hWvo5Lrlw26SBX7JPNuC0XgBAKzzOj AdYmrQIkbI07wp9GGsEkZEG8NTRhFJ8GXi6h8JQHZUZdr1PHBEDNldkuY1fvEe1EPG/tLg 9sJ8rjjfhRXBT59dpQjn2VDqk6Qhmw6pJXkXkDYoa+H7ZFVMk8IyjOLtCpft/jZvZfcpsx jdlQ4bajLHcZ1PyudcfhgA9HlPftYDHt8aEs3FgO96uDie+ftZ9cBVn++67mxtjWbyoucQ uypbR5Pi5nFLC6fT0GwT00hA1IZZXJAM+CT3pFrDYfsb4aJCn0h2ap3kBxSjeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697743382; a=rsa-sha256; cv=none; b=eoLc18N+FVpsyhohLYBortqQq8ExvXzC3+UJGIH4i0FlHIxvHggGg7YPVJckSUTXlbnImX eJzo3Bd4+9p5HOt1Vfl4co7Q4xSYEQY5OCawrAiz3DI42NB8Xr0VFze9n5U2tKvGz3Fkzz z0doYL8gcE2fqqyIC8BBAFhHOqQtEb4pGhi3ZnTLigSb+76JGrsK016LHA7jqVrJm5HnDG CCRkWtber2yahPirivFxpXNxRnqy2S8sbMTyEWsUoLTu9s1T3NXvcQWzyo2kLTEwi7v0BK lERLcBbjl1op1vYTals67Byj1VqdURiUkIxluXAhHEpV0auqs9XNCm14PfP6jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hlgIspg85XvTMjJe2tPnvsL36pQX9e+4ZH/mTycK3U4=; b=MNAliUbbulBZZXN2+iVz56zfdpFliBParSUIVFtFPprXa91lAMzqmoaQ9ATsKtPaLfJw/5 v3YF5GjXLOCCmbBsmK02Lcmq+sCXKbgyDQd6DZE6D1uRz6lglorRaSubZj6qbZIiVud1tw tC0lApbWXcWizneRVT3iB5PataiNUPPR8bdNQ2IF8KVI/PUhMAgZruNjv4PDqRl/el43pJ 2Xe6JRAOviv8jMfII8bg3Lmtmp9sAsDe3Be64ge4S2HHsAnIZzYgU0mb1E0gGh1OaAv4MG eUmNp4o64bVjMpGk0hDFSfHD0didF3IADceWn4oT+nwV3I4tXkxjicR0gMqVeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHgB44jgz12mk; Thu, 19 Oct 2023 19:23: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 39JJN2sn076635; Thu, 19 Oct 2023 19:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJN2HZ076632; Thu, 19 Oct 2023 19:23:02 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:23:02 GMT Message-Id: <202310191923.39JJN2HZ076632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d99f6566d53d - releng/14.0 - mkimg: Ensure GPT Entry Array is at least 16k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d99f6566d53d86e4ec1854e0c602ea7ed7ded48d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d99f6566d53d86e4ec1854e0c602ea7ed7ded48d commit d99f6566d53d86e4ec1854e0c602ea7ed7ded48d Author: Warner Losh AuthorDate: 2023-10-18 15:23:40 +0000 Commit: Warner Losh CommitDate: 2023-10-19 18:37:44 +0000 mkimg: Ensure GPT Entry Array is at least 16k UEFI v2.10 Section 5.3 documentes that the minimum reserved space after the GPT header be at least 16kB. Enforce this minimum. Before, we'd only set the number of entries to be the unpadded size. gpart's selective enforcement of aspects of the GPT standard meant that these images would work, but couldn't be changed (to add a partition or grow the size of a partition). This ensures that gpart's overly picky standards don't cause problems for people wishing to, for example, resize release images. MFC after: 1 day (we want this in 14.0) PR: 274312 Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42245 (cherry picked from commit 9b42d3e12ffc6896fcb4e60c1b239ddf60705831) (cherry picked from commit 5401ebd33cf5073e8c0f095527504d38f74a926b) Approved-by: re (cperciva) --- sys/sys/disk/gpt.h | 7 +++++++ usr.bin/mkimg/gpt.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/sys/disk/gpt.h b/sys/sys/disk/gpt.h index e48b13684814..596a5cba1681 100644 --- a/sys/sys/disk/gpt.h +++ b/sys/sys/disk/gpt.h @@ -82,6 +82,13 @@ struct gpt_hdr { CTASSERT(offsetof(struct gpt_hdr, padding) == 92); #endif +/* + * The GPT standard (section 5.3 of UEFI standard version 2.10) requires + * we reserve at least 16k after the PMBR and the GPT header for the GPT + * Array Entries. + */ +#define GPT_MIN_RESERVED 16384 + struct gpt_ent { gpt_uuid_t ent_type; gpt_uuid_t ent_uuid; diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 59c51a6a177b..ed3f008c394f 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include +#include #include #include #include @@ -124,13 +124,21 @@ crc32(const void *buf, size_t sz) return (crc ^ ~0U); } +/* + * Return the number of sectors needed to store the partition table. + */ static u_int gpt_tblsz(void) { - u_int ents; + u_int eps; /* Entries per Sector */ - ents = secsz / sizeof(struct gpt_ent); - return ((nparts + ents - 1) / ents); + /* + * Count the number of sectors needed for the GPT Entry Array to store + * the number of partitions defined for this image. Enforce the 16kB + * minimum space for the GPT Entry Array per UEFI v2.10 Section 5.3. + */ + eps = secsz / sizeof(struct gpt_ent); + return (MAX(howmany(GPT_MIN_RESERVED, secsz), howmany(nparts, eps))); } static lba_t From nobody Thu Oct 19 19:23:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHgC6nSVz4xn1B; Thu, 19 Oct 2023 19:23: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 4SBHgC6FLvz3cKw; Thu, 19 Oct 2023 19:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ7fQcNDTwpHed5Yq3FA6lUyAzTeuSELVsxoR0XpYXA=; b=sahJNLv8cscnygdGNrjGTJUyOLe2SUQISmaK5Uk0D3K8EF7NLxySR0x/A5k1ZHgr2tztWd 6EDJlQTa1N4o2i9HvBM69X2qSWE3PYOdpKVC/3+iRR5OTvnPed/A4ntYeUeKx3CGhB3c7A 9nBu7+fz+hSKGy90T2djGzs1dKLraeNwlbTKrhWfxZZKox5aEAsWHTE/pTJWtJFR8fdzRU sF0yZ+WJ98n8XXsCH1soy5kw59bPVe5NpuNWtCc3sqAIdr5GC9ZIPFPXDlqoLpES1Z0g6I GMJgubk/wXOT/HCqMwKk/+55zZzjPiInIo9OULNfkKUf3ky/odwajYhIYjtvmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697743383; a=rsa-sha256; cv=none; b=SSEbfIkauPtw+H+Pi849tPTmWGlsl94RENjky2KzONyIxQ/hVfu4FUiGYZEBusCi3ID+QH 63NzLXMntqt2fGcydiFp+Zf1s51nzdlVPhqE6lyNgP1joL2l4c2iPI+am1sTLrQRjeFTu2 p7MGNSL07jMySGztfwFOliGv2Puty2xGbRZ2xM0XIjQEB9sfM1JWZsats7Ds/0EWVTpD4G nXoiUMIra5dTNi+7BYJ3Y3K68eQ5aTsud1775LCRaT+h7FsNIORs9Lzdd9vfs1aZCP1uV8 PTpfiJ99OYI501FalhbJZRwzYFFbM762U6G4Njj1RAKdfRjr9DzjofAnV6j8Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZ7fQcNDTwpHed5Yq3FA6lUyAzTeuSELVsxoR0XpYXA=; b=ID6oQElZY4bRPA2slb0LYdEW4silGndEqzPb3AI5OFdqVh/nxKKMGmoYtgFQEOmFEe3c49 1YZB7TiVk3eJyxhLY2T/N12vSm3XdsAbpprpp/YlV/7UL3q6W/NT4DLzBuxW/Z13YjmEfe 9x/p/51fzv2ft7bbjWn6SibP6tatBQnQtr4veX9OHXX0UJQ9sSOAmcPDDRNnluPeuJ7iSm Cm9ptxiGMN7cZP3hnkToBV8hXp1bpn5kLUaN1ESgM2y8CS45hNFhKo0+T+7budtHySNoWf OoxjTZdJeFVpxVuzk48PbNqnOt2nc76l3bQUeZtD3oiwETjvdiwgSaeYyjcLYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHgC5L0cz12ml; Thu, 19 Oct 2023 19:23: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 39JJN3OM076686; Thu, 19 Oct 2023 19:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJN365076683; Thu, 19 Oct 2023 19:23:03 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:23:03 GMT Message-Id: <202310191923.39JJN365076683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 16fda43f8423 - releng/14.0 - mkimg_test: remove vtoc8 images, they aren't needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 16fda43f84239af05728d60795e441145c48398d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=16fda43f84239af05728d60795e441145c48398d commit 16fda43f84239af05728d60795e441145c48398d Author: Warner Losh AuthorDate: 2023-10-18 15:23:41 +0000 Commit: Warner Losh CommitDate: 2023-10-19 18:37:47 +0000 mkimg_test: remove vtoc8 images, they aren't needed vtoc8 support expired with sparc64 removal, so remove them all. Sponsored by: Netflix (cherry picked from commit 83bd5a833c3a14b74736e7b3fa0be66252a5a3dc) (cherry picked from commit 4a3cdf4168953c01b8b0e6a9ca72804ef2860309) Approved-by: re (cperciva) --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow.hex | 544 -------------------- usr.bin/mkimg/tests/img-1x1-512-vtoc8.qcow2.hex | 72 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.raw.hex | 20 - usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhd.hex | 52 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdf.hex | 28 -- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vhdx.hex | 71 --- usr.bin/mkimg/tests/img-1x1-512-vtoc8.vmdk.hex | 314 ------------ usr.bin/mkimg/tests/img-63x255-4096-vtoc8.qcow.hex | 550 --------------------- .../mkimg/tests/img-63x255-4096-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-4096-vtoc8.vmdk.hex | 324 ------------ usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow.hex | 550 --------------------- usr.bin/mkimg/tests/img-63x255-512-vtoc8.qcow2.hex | 77 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.raw.hex | 22 - usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhd.hex | 59 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdf.hex | 30 -- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vhdx.hex | 73 --- usr.bin/mkimg/tests/img-63x255-512-vtoc8.vmdk.hex | 324 ------------ 28 files changed, 4472 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex deleted file mode 100644 index 93afee83d903..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow.hex +++ /dev/null @@ -1,544 +0,0 @@ -00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 10 00 |.............B..| -00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| -00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00001000 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 |...... .......0.| -00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| -00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00005010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00005080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00005090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000050b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000050c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000051a0 00 00 00 00 0e 10 21 08 00 00 00 00 00 00 00 00 |......!.........| -000051b0 21 08 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000051c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000051d0 00 00 21 08 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000051e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000051f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 3f |.............."?| -00005200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00405200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00406000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex deleted file mode 100644 index dba435854881..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.qcow2.hex +++ /dev/null @@ -1,72 +0,0 @@ -00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| -00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| -00000030 00 00 00 00 00 02 00 00 00 00 00 01 00 00 00 00 |................| -00000040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 80 00 00 00 00 03 00 00 00 00 00 00 00 00 00 00 |................| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 |................| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 80 00 00 00 00 05 00 00 80 00 00 00 00 06 00 00 |................| -00030010 80 00 00 00 00 07 00 00 80 00 00 00 00 08 00 00 |................| -00030020 80 00 00 00 00 09 00 00 80 00 00 00 00 0a 00 00 |................| -00030030 80 00 00 00 00 0b 00 00 80 00 00 00 00 0c 00 00 |................| -00030040 80 00 00 00 00 0d 00 00 80 00 00 00 00 0e 00 00 |................| -00030050 80 00 00 00 00 0f 00 00 80 00 00 00 00 10 00 00 |................| -00030060 80 00 00 00 00 11 00 00 80 00 00 00 00 12 00 00 |................| -00030070 80 00 00 00 00 13 00 00 80 00 00 00 00 14 00 00 |................| -00030080 80 00 00 00 00 15 00 00 80 00 00 00 00 16 00 00 |................| -00030090 80 00 00 00 00 17 00 00 80 00 00 00 00 18 00 00 |................| -000300a0 80 00 00 00 00 19 00 00 80 00 00 00 00 1a 00 00 |................| -000300b0 80 00 00 00 00 1b 00 00 80 00 00 00 00 1c 00 00 |................| -000300c0 80 00 00 00 00 1d 00 00 80 00 00 00 00 1e 00 00 |................| -000300d0 80 00 00 00 00 1f 00 00 80 00 00 00 00 20 00 00 |............. ..| -000300e0 80 00 00 00 00 21 00 00 80 00 00 00 00 22 00 00 |.....!......."..| -000300f0 80 00 00 00 00 23 00 00 80 00 00 00 00 24 00 00 |.....#.......$..| -00030100 80 00 00 00 00 25 00 00 80 00 00 00 00 26 00 00 |.....%.......&..| -00030110 80 00 00 00 00 27 00 00 80 00 00 00 00 28 00 00 |.....'.......(..| -00030120 80 00 00 00 00 29 00 00 80 00 00 00 00 2a 00 00 |.....).......*..| -00030130 80 00 00 00 00 2b 00 00 80 00 00 00 00 2c 00 00 |.....+.......,..| -00030140 80 00 00 00 00 2d 00 00 80 00 00 00 00 2e 00 00 |.....-..........| -00030150 80 00 00 00 00 2f 00 00 80 00 00 00 00 30 00 00 |...../.......0..| -00030160 80 00 00 00 00 31 00 00 80 00 00 00 00 32 00 00 |.....1.......2..| -00030170 80 00 00 00 00 33 00 00 80 00 00 00 00 34 00 00 |.....3.......4..| -00030180 80 00 00 00 00 35 00 00 80 00 00 00 00 36 00 00 |.....5.......6..| -00030190 80 00 00 00 00 37 00 00 80 00 00 00 00 38 00 00 |.....7.......8..| -000301a0 80 00 00 00 00 39 00 00 80 00 00 00 00 3a 00 00 |.....9.......:..| -000301b0 80 00 00 00 00 3b 00 00 80 00 00 00 00 3c 00 00 |.....;.......<..| -000301c0 80 00 00 00 00 3d 00 00 80 00 00 00 00 3e 00 00 |.....=.......>..| -000301d0 80 00 00 00 00 3f 00 00 80 00 00 00 00 40 00 00 |.....?.......@..| -000301e0 80 00 00 00 00 41 00 00 80 00 00 00 00 42 00 00 |.....A.......B..| -000301f0 80 00 00 00 00 43 00 00 80 00 00 00 00 44 00 00 |.....C.......D..| -00030200 80 00 00 00 00 45 00 00 00 00 00 00 00 00 00 00 |.....E..........| -00030210 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 00 01 00 01 00 01 00 01 00 01 00 01 00 01 00 01 |................| -* -00040080 00 01 00 01 00 01 00 01 00 01 00 01 00 00 00 00 |................| -00040090 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00050010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00050080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00050090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000500b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000500c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000501a0 00 00 00 00 0e 10 21 80 00 00 00 00 00 00 00 00 |......!.........| -000501b0 21 80 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000501c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000501d0 00 00 21 80 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000501e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000501f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 b7 |..............".| -00050200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00450200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00460000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex deleted file mode 100644 index ffa27d117070..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.raw.hex +++ /dev/null @@ -1,20 +0,0 @@ -00000000 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 21 01 00 00 00 00 00 00 00 00 |......!.........| -000001b0 21 01 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 21 01 00 00 00 00 00 00 00 00 00 00 00 00 |..!.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 36 |.............."6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00420200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex deleted file mode 100644 index 00828a72a331..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhd.hex +++ /dev/null @@ -1,52 +0,0 @@ -00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00000030 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00000040 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00000050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 63 78 73 70 61 72 73 65 ff ff ff ff ff ff ff ff |cxsparse........| -00000210 00 00 00 00 00 00 06 00 00 01 00 00 00 00 00 03 |................| -00000220 00 20 00 00 ff ff f4 74 00 00 00 00 00 00 00 00 |. .....t........| -00000230 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 00 00 00 04 00 00 10 05 00 00 20 06 ff ff ff ff |.......... .....| -00000610 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00000a00 46 72 65 65 42 53 44 34 4d 00 00 00 00 00 00 00 |FreeBSD4M.......| -00000a10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000a80 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000a90 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000aa0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000ab0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -00000ac0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000ba0 00 00 00 00 0e 10 21 34 00 00 00 00 00 00 00 00 |......!4........| -00000bb0 21 34 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |!4..............| -00000bc0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -00000bd0 00 00 21 34 00 00 00 00 00 00 00 00 00 00 00 00 |..!4............| -00000be0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00000bf0 00 00 00 00 00 00 00 00 00 00 00 00 da be 22 03 |..............".| -00000c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00200a00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00200c00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400c00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -00400e00 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00401000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00600e00 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00600e10 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00600e20 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 68 00 |....Wi2k.....Bh.| -00600e30 00 00 00 00 00 42 68 00 00 7d 04 11 00 00 00 03 |.....Bh..}......| -00600e40 ff ff f7 0e 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00600e50 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00600e60 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00601000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex deleted file mode 100644 index d55109faaec5..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdf.hex +++ /dev/null @@ -1,28 +0,0 @@ -00000000 46 72 65 65 42 53 44 35 4d 00 00 00 00 00 00 00 |FreeBSD5M.......| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00000090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -000000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -000001a0 00 00 00 00 0e 10 28 00 00 00 00 00 00 00 00 00 |......(.........| -000001b0 28 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |(...............| -000001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -000001d0 00 00 28 00 00 00 00 00 00 00 00 00 00 00 00 00 |..(.............| -000001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -000001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be 2b 36 |..............+6| -00000200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00400200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| -00500010 ff ff ff ff ff ff ff ff 01 23 45 67 2a 69 6d 67 |.........#Eg*img| -00500020 00 02 00 00 57 69 32 6b 00 00 00 00 00 50 00 00 |....Wi2k.....P..| -00500030 00 00 00 00 00 50 00 00 00 96 04 11 00 00 00 02 |.....P..........| -00500040 ff ff ef b4 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00500050 01 01 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00500060 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00500200 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex deleted file mode 100644 index 76c4d5313850..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vhdx.hex +++ /dev/null @@ -1,71 +0,0 @@ -00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010000 68 65 61 64 64 db 05 73 00 00 00 00 00 00 00 00 |headd..s........| -00010010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00010040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00010050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020000 68 65 61 64 13 47 fd f1 01 00 00 00 00 00 00 00 |head.G..........| -00020010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00020040 00 00 01 00 00 00 10 00 00 00 10 00 00 00 00 00 |................| -00020050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00030000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00030010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00030020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00030030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00030040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00030050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00040000 72 65 67 69 4c d5 3e 14 02 00 00 00 00 00 00 00 |regiL.>.........| -00040010 06 a2 7c 8b 90 47 9a 4b b8 fe 57 5f 05 0f 88 6e |..|..G.K..W_...n| -00040020 00 00 20 00 00 00 00 00 00 00 10 00 00 00 00 00 |.. .............| -00040030 66 77 c2 2d 23 f6 00 42 9d 64 11 5e 9b fd 4a 08 |fw.-#..B.d.^..J.| -00040040 00 00 30 00 00 00 00 00 00 00 10 00 00 00 00 00 |..0.............| -00040050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00200000 6d 65 74 61 64 61 74 61 00 00 05 00 00 00 00 00 |metadata........| -00200010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00200020 37 67 a1 ca 36 fa 43 4d b3 b6 33 f0 aa 44 e7 6b |7g..6.CM..3..D.k| -00200030 00 00 01 00 08 00 00 00 04 00 00 00 00 00 00 00 |................| -00200040 24 42 a5 2f 1b cd 76 48 b2 11 5d be d8 3b f4 b8 |$B./..vH..]..;..| -00200050 08 00 01 00 08 00 00 00 06 00 00 00 00 00 00 00 |................| -00200060 ab 12 ca be e6 b2 23 45 93 ef c3 09 e0 00 c7 46 |......#E.......F| -00200070 10 00 01 00 10 00 00 00 06 00 00 00 00 00 00 00 |................| -00200080 1d bf 41 81 6f a9 09 47 ba 47 f2 33 a8 fa ab 5f |..A.o..G.G.3..._| -00200090 20 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 | ...............| -002000a0 c7 48 a3 cd 5d 44 71 44 9c c9 e9 88 52 51 c5 56 |.H..]DqD....RQ.V| -002000b0 24 00 01 00 04 00 00 00 06 00 00 00 00 00 00 00 |$...............| -002000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00210000 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 00 |................| -00210010 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 |................| -00210020 00 02 00 00 00 10 00 00 00 00 00 00 00 00 00 00 |................| -00210030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00300000 06 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 |..@.............| -00300010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400000 46 72 65 65 42 53 44 31 36 4d 00 00 00 00 00 00 |FreeBSD16M......| -00400010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00400080 00 00 00 01 00 00 00 00 00 00 00 00 00 08 09 02 |................| -00400090 00 00 09 01 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000a0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004000b0 00 00 00 00 00 00 00 00 00 00 00 00 60 0d de ee |............`...| -004000c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -004001a0 00 00 00 00 0e 10 80 00 00 00 00 00 00 00 00 00 |................| -004001b0 80 00 00 00 00 01 00 01 00 00 00 00 00 00 00 01 |................| -004001c0 00 00 20 00 00 00 20 01 00 00 01 00 00 00 00 00 |.. ... .........| -004001d0 00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -004001f0 00 00 00 00 00 00 00 00 00 00 00 00 da be f8 7f |................| -00400200 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a 50 0a |P.P.P.P.P.P.P.P.| -* -00800200 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -01400000 diff --git a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex deleted file mode 100644 index 865769bcea7e..000000000000 --- a/usr.bin/mkimg/tests/img-1x1-4096-vtoc8.vmdk.hex +++ /dev/null @@ -1,314 +0,0 @@ -00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| -00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| -00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| -00000030 0b 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 |................| -00000040 20 00 00 00 00 00 00 00 00 0a 20 0d 0a 00 00 00 | ......... .....| -00000050 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000200 23 20 44 69 73 6b 20 44 65 73 63 72 69 70 74 6f |# Disk Descripto| -00000210 72 46 69 6c 65 0a 76 65 72 73 69 6f 6e 3d 31 0a |rFile.version=1.| -00000220 43 49 44 3d 30 30 30 30 30 30 30 30 0a 70 61 72 |CID=00000000.par| -00000230 65 6e 74 43 49 44 3d 66 66 66 66 66 66 66 66 0a |entCID=ffffffff.| -00000240 63 72 65 61 74 65 54 79 70 65 3d 22 6d 6f 6e 6f |createType="mono| -00000250 6c 69 74 68 69 63 53 70 61 72 73 65 22 0a 23 20 |lithicSparse".# | -00000260 45 78 74 65 6e 74 20 64 65 73 63 72 69 70 74 69 |Extent descripti| -00000270 6f 6e 0a 52 57 20 31 30 32 34 30 20 53 50 41 52 |on.RW 10240 SPAR| -00000280 53 45 20 22 22 0a 23 20 54 68 65 20 44 69 73 6b |SE "".# The Disk| -00000290 20 44 61 74 61 20 42 61 73 65 0a 23 44 44 42 0a | Data Base.#DDB.| -000002a0 64 64 62 2e 61 64 61 70 74 65 72 54 79 70 65 20 |ddb.adapterType | -000002b0 3d 20 22 69 64 65 22 0a 64 64 62 2e 67 65 6f 6d |= "ide".ddb.geom| -000002c0 65 74 72 79 2e 63 79 6c 69 6e 64 65 72 73 20 3d |etry.cylinders =| -000002d0 20 22 31 30 32 34 30 22 0a 64 64 62 2e 67 65 6f | "10240".ddb.geo| -000002e0 6d 65 74 72 79 2e 68 65 61 64 73 20 3d 20 22 31 |metry.heads = "1| -000002f0 22 0a 64 64 62 2e 67 65 6f 6d 65 74 72 79 2e 73 |".ddb.geometry.s| -00000300 65 63 74 6f 72 73 20 3d 20 22 31 22 0a 00 00 00 |ectors = "1"....| -00000310 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000400 03 00 00 00 07 00 00 00 00 00 00 00 00 00 00 00 |................| -00000410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* -00000600 20 00 00 00 30 00 00 00 40 00 00 00 50 00 00 00 | ...0...@...P...| -00000610 60 00 00 00 70 00 00 00 80 00 00 00 90 00 00 00 |`...p...........| -00000620 a0 00 00 00 b0 00 00 00 c0 00 00 00 d0 00 00 00 |................| -00000630 e0 00 00 00 f0 00 00 00 00 01 00 00 10 01 00 00 |................| -00000640 20 01 00 00 30 01 00 00 40 01 00 00 50 01 00 00 | ...0...@...P...| -00000650 60 01 00 00 70 01 00 00 80 01 00 00 90 01 00 00 |`...p...........| -00000660 a0 01 00 00 b0 01 00 00 c0 01 00 00 d0 01 00 00 |................| -00000670 e0 01 00 00 f0 01 00 00 00 02 00 00 10 02 00 00 |................| -00000680 20 02 00 00 30 02 00 00 40 02 00 00 50 02 00 00 | ...0...@...P...| -00000690 60 02 00 00 70 02 00 00 80 02 00 00 90 02 00 00 |`...p...........| -000006a0 a0 02 00 00 b0 02 00 00 c0 02 00 00 d0 02 00 00 |................| -000006b0 e0 02 00 00 f0 02 00 00 00 03 00 00 10 03 00 00 |................| -000006c0 20 03 00 00 30 03 00 00 40 03 00 00 50 03 00 00 | ...0...@...P...| -000006d0 60 03 00 00 70 03 00 00 80 03 00 00 90 03 00 00 |`...p...........| -000006e0 a0 03 00 00 b0 03 00 00 c0 03 00 00 d0 03 00 00 |................| -000006f0 e0 03 00 00 f0 03 00 00 00 04 00 00 10 04 00 00 |................| -00000700 20 04 00 00 30 04 00 00 40 04 00 00 50 04 00 00 | ...0...@...P...| -00000710 60 04 00 00 70 04 00 00 80 04 00 00 90 04 00 00 |`...p...........| -00000720 a0 04 00 00 b0 04 00 00 c0 04 00 00 d0 04 00 00 |................| -00000730 e0 04 00 00 f0 04 00 00 00 05 00 00 10 05 00 00 |................| -00000740 20 05 00 00 30 05 00 00 40 05 00 00 50 05 00 00 | ...0...@...P...| -00000750 60 05 00 00 70 05 00 00 80 05 00 00 90 05 00 00 |`...p...........| -00000760 a0 05 00 00 b0 05 00 00 c0 05 00 00 d0 05 00 00 |................| -00000770 e0 05 00 00 f0 05 00 00 00 06 00 00 10 06 00 00 |................| -00000780 20 06 00 00 30 06 00 00 40 06 00 00 50 06 00 00 | ...0...@...P...| -00000790 60 06 00 00 70 06 00 00 80 06 00 00 90 06 00 00 |`...p...........| -000007a0 a0 06 00 00 b0 06 00 00 c0 06 00 00 d0 06 00 00 |................| -000007b0 e0 06 00 00 f0 06 00 00 00 07 00 00 10 07 00 00 |................| -000007c0 20 07 00 00 30 07 00 00 40 07 00 00 50 07 00 00 | ...0...@...P...| -000007d0 60 07 00 00 70 07 00 00 80 07 00 00 90 07 00 00 |`...p...........| -000007e0 a0 07 00 00 b0 07 00 00 c0 07 00 00 d0 07 00 00 |................| -000007f0 e0 07 00 00 f0 07 00 00 00 08 00 00 10 08 00 00 |................| -00000800 20 08 00 00 30 08 00 00 40 08 00 00 50 08 00 00 | ...0...@...P...| -00000810 60 08 00 00 70 08 00 00 80 08 00 00 90 08 00 00 |`...p...........| -00000820 a0 08 00 00 b0 08 00 00 c0 08 00 00 d0 08 00 00 |................| -00000830 e0 08 00 00 f0 08 00 00 00 09 00 00 10 09 00 00 |................| -00000840 20 09 00 00 30 09 00 00 40 09 00 00 50 09 00 00 | ...0...@...P...| -00000850 60 09 00 00 70 09 00 00 80 09 00 00 90 09 00 00 |`...p...........| -00000860 a0 09 00 00 b0 09 00 00 c0 09 00 00 d0 09 00 00 |................| -00000870 e0 09 00 00 f0 09 00 00 00 0a 00 00 10 0a 00 00 |................| -00000880 20 0a 00 00 30 0a 00 00 40 0a 00 00 50 0a 00 00 | ...0...@...P...| -00000890 60 0a 00 00 70 0a 00 00 80 0a 00 00 90 0a 00 00 |`...p...........| -000008a0 a0 0a 00 00 b0 0a 00 00 c0 0a 00 00 d0 0a 00 00 |................| -000008b0 e0 0a 00 00 f0 0a 00 00 00 0b 00 00 10 0b 00 00 |................| -000008c0 20 0b 00 00 30 0b 00 00 40 0b 00 00 50 0b 00 00 | ...0...@...P...| -000008d0 60 0b 00 00 70 0b 00 00 80 0b 00 00 90 0b 00 00 |`...p...........| -000008e0 a0 0b 00 00 b0 0b 00 00 c0 0b 00 00 d0 0b 00 00 |................| -000008f0 e0 0b 00 00 f0 0b 00 00 00 0c 00 00 10 0c 00 00 |................| -00000900 20 0c 00 00 30 0c 00 00 40 0c 00 00 50 0c 00 00 | ...0...@...P...| -00000910 60 0c 00 00 70 0c 00 00 80 0c 00 00 90 0c 00 00 |`...p...........| -00000920 a0 0c 00 00 b0 0c 00 00 c0 0c 00 00 d0 0c 00 00 |................| -00000930 e0 0c 00 00 f0 0c 00 00 00 0d 00 00 10 0d 00 00 |................| -00000940 20 0d 00 00 30 0d 00 00 40 0d 00 00 50 0d 00 00 | ...0...@...P...| -00000950 60 0d 00 00 70 0d 00 00 80 0d 00 00 90 0d 00 00 |`...p...........| -00000960 a0 0d 00 00 b0 0d 00 00 c0 0d 00 00 d0 0d 00 00 |................| -00000970 e0 0d 00 00 f0 0d 00 00 00 0e 00 00 10 0e 00 00 |................| -00000980 20 0e 00 00 30 0e 00 00 40 0e 00 00 50 0e 00 00 | ...0...@...P...| -00000990 60 0e 00 00 70 0e 00 00 80 0e 00 00 90 0e 00 00 |`...p...........| -000009a0 a0 0e 00 00 b0 0e 00 00 c0 0e 00 00 d0 0e 00 00 |................| -000009b0 e0 0e 00 00 f0 0e 00 00 00 0f 00 00 10 0f 00 00 |................| -000009c0 20 0f 00 00 30 0f 00 00 40 0f 00 00 50 0f 00 00 | ...0...@...P...| -000009d0 60 0f 00 00 70 0f 00 00 80 0f 00 00 90 0f 00 00 |`...p...........| -000009e0 a0 0f 00 00 b0 0f 00 00 c0 0f 00 00 d0 0f 00 00 |................| -000009f0 e0 0f 00 00 f0 0f 00 00 00 10 00 00 10 10 00 00 |................| -00000a00 20 10 00 00 30 10 00 00 40 10 00 00 50 10 00 00 | ...0...@...P...| -00000a10 60 10 00 00 70 10 00 00 80 10 00 00 90 10 00 00 |`...p...........| -00000a20 a0 10 00 00 b0 10 00 00 c0 10 00 00 d0 10 00 00 |................| -00000a30 e0 10 00 00 f0 10 00 00 00 11 00 00 10 11 00 00 |................| -00000a40 20 11 00 00 30 11 00 00 40 11 00 00 50 11 00 00 | ...0...@...P...| -00000a50 60 11 00 00 70 11 00 00 80 11 00 00 90 11 00 00 |`...p...........| -00000a60 a0 11 00 00 b0 11 00 00 c0 11 00 00 d0 11 00 00 |................| -00000a70 e0 11 00 00 f0 11 00 00 00 12 00 00 10 12 00 00 |................| -00000a80 20 12 00 00 30 12 00 00 40 12 00 00 50 12 00 00 | ...0...@...P...| -00000a90 60 12 00 00 70 12 00 00 80 12 00 00 90 12 00 00 |`...p...........| -00000aa0 a0 12 00 00 b0 12 00 00 c0 12 00 00 d0 12 00 00 |................| -00000ab0 e0 12 00 00 f0 12 00 00 00 13 00 00 10 13 00 00 |................| -00000ac0 20 13 00 00 30 13 00 00 40 13 00 00 50 13 00 00 | ...0...@...P...| -00000ad0 60 13 00 00 70 13 00 00 80 13 00 00 90 13 00 00 |`...p...........| *** 3704 LINES SKIPPED *** From nobody Thu Oct 19 19:23:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHgF1DqKz4xn8W; Thu, 19 Oct 2023 19:23: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 4SBHgF0dB8z3cGK; Thu, 19 Oct 2023 19:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8elSFZJ2t/clPr673sOSuw+VdWw3fo5OXyjncdFxr4=; b=LDrQHnaXr1pMyoXNdIQM8+nXySkGzTH7wC8ApAFG67ljyGjy3HIJRSuBd3JsLAr5CY0sqZ 8Vc/hd8DKaIXFZtGEiIhnH8D/P5S6uWPF00eVl6P0EeECKTzDOj1djHwRLK0FsS+Xgas8P Ig5/735omHNp9Buva2lAkk5ZJ6wD8jUIw6X5xYcGAR7qVQwYALGacr3kcqRgisG4hnWqWQ IR58QdVoq8dbCVL49id/mqrveS2oIRNDXpKmiO3HZH7cKZRp00iEKr0KTh2/TPlhgAD9UF lUmDiq5FfIS3H3acF5oUV0jidvKy3xHA18VnPSLIyfnAvgS4V6FX/ac3/sqJ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697743385; a=rsa-sha256; cv=none; b=v+cGcN1i8EDJmWAk0CJ08SfcCoexKutorcFkbar/hSbeP67cCw7PgBPVe2vO2ln1cYhx0o +ooyCaTesHL9mygCi5PuJydZYu9rc90kjORH0N5R6/GOiLnF5iFIu97UPvRLANHBSeiYxw 9o5iKZgUdjtiezz/ch7WN7e/cAYB1RSMO9m3oxbOHVrMNgEKTI1Ulj3/AFys/K4PyNbH1l ueFF4Y6ekb+n9M7eQiAQuwEoWYm9Uow/a2U39+YYVoLiIwepVjEmGXxwqNmMnSTsk7sz/L KzcjYc7+fEak7lUcKKWc44wfFoXDBKnALcX49W7zlzX7FxnNLQi5WAFhgIk/eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m8elSFZJ2t/clPr673sOSuw+VdWw3fo5OXyjncdFxr4=; b=W30qfV2HnSsu/VvZOkjv3964bhB4rfMnvELwAshUZPUT1TFnWkAmxUgnvFyc8iXUiKJkoV HMVymXP/UfhTOQnJtlqYBd8V6pFu+LnLkPke1XIM1XGFx3P3v37E1isCmRWDmHFVoydnQ0 nTadGWyqQn1HZpEzhPext7bUTfc+fb+aGce2h/HQyi4f/dS/5gZtJ52ETOGlGhmlNyTPM8 XjIB65xm4uIf+10fUs3qYVjRfhbAbtX1bZLjf2UPw++THJStLNVs9S8GgVtDR2jv9PLdfl itQhZTXa3G3FIftVmcLWPUFPrQpELDgupyo1B4NHwIDW3kSkb1eqFrVOCE6Lmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHgD6pFnz12MT; Thu, 19 Oct 2023 19:23: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 39JJN4xN076741; Thu, 19 Oct 2023 19:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJN4mh076738; Thu, 19 Oct 2023 19:23:04 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:23:04 GMT Message-Id: <202310191923.39JJN4mh076738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 18bce76c334d - releng/14.0 - mkimg: Regenerate all the tests for gpt List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 18bce76c334d47ba229964c70faf252f4e5c20a1 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=18bce76c334d47ba229964c70faf252f4e5c20a1 commit 18bce76c334d47ba229964c70faf252f4e5c20a1 Author: Warner Losh AuthorDate: 2023-10-18 15:23:41 +0000 Commit: Warner Losh CommitDate: 2023-10-19 18:37:49 +0000 mkimg: Regenerate all the tests for gpt Recent changes to mkimg has changed the generated GPT images to be more correct. Use make rebase to regenerate the baseline. Sponsored by: Netflix (cherry picked from commit d2abbfede5342b19f3e5994140cdb6622c95ef66) (cherry picked from commit 524225dde0b5a4f346644670f22fcd11fe13c1f2) Approved-by: re (cperciva) --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 61 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1085 ++++++++++---------- usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 569 +++++------ usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1089 +++++++++++---------- usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 51 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 43 +- usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 569 +++++------ 28 files changed, 3798 insertions(+), 3754 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index a974400ad2e8..ae764c000ae7 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,5 +1,6 @@ +# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| -00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 20 00 |.............B .| +00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| 00000030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * @@ -7,569 +8,573 @@ 00001010 00 00 00 00 00 00 40 00 00 00 00 00 00 00 00 00 |......@.........| 00001020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 60 00 |......P.......`.| -00002010 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| -00002020 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| -00002030 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| -00002040 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| -00002050 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| -00002060 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| -00002070 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| -00002080 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| -00002090 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| -000020a0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| -000020b0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| -000020c0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| -000020d0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| -000020e0 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| -000020f0 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| -00002100 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| -00002110 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| -00002120 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| -00002130 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| -00002140 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| -00002150 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| -00002160 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| -00002170 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| -00002180 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| -00002190 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| -000021a0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| -000021b0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| -000021c0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| -000021d0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| -000021e0 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| -000021f0 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| -00002200 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| -00002210 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| -00002220 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| -00002230 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| -00002240 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| -00002250 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| -00002260 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| -00002270 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| -00002280 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| -00002290 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| -000022a0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| -000022b0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| -000022c0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| -000022d0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| -000022e0 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| -000022f0 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| -00002300 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| -00002310 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| -00002320 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| -00002330 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| -00002340 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| -00002350 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| -00002360 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| -00002370 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| -00002380 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| -00002390 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| -000023a0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| -000023b0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| -000023c0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| -000023d0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| -000023e0 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| -000023f0 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| -00002400 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| -00002410 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| -00002420 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| -00002430 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| -00002440 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| -00002450 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| -00002460 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| -00002470 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| -00002480 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| -00002490 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| -000024a0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| -000024b0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| -000024c0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| -000024d0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| -000024e0 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| -000024f0 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| -00002500 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| -00002510 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| -00002520 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| -00002530 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| -00002540 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| -00002550 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| -00002560 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| -00002570 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| -00002580 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| -00002590 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| -000025a0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| -000025b0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| -000025c0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| -000025d0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| -000025e0 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| -000025f0 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| -00002600 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| -00002610 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| -00002620 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| -00002630 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| -00002640 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| -00002650 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| -00002660 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| -00002670 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| -00002680 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| -00002690 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| -000026a0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| -000026b0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| -000026c0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| -000026d0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| -000026e0 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| -000026f0 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| -00002700 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| -00002710 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| -00002720 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| -00002730 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| -00002740 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| -00002750 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| -00002760 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| -00002770 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| -00002780 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| -00002790 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| -000027a0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| -000027b0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| -000027c0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| -000027d0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| -000027e0 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| -000027f0 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| -00002800 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| -00002810 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| -00002820 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| -00002830 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| -00002840 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| -00002850 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| -00002860 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| -00002870 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| -00002880 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| -00002890 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| -000028a0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| -000028b0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| -000028c0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| -000028d0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| -000028e0 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| -000028f0 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| -00002900 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| -00002910 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| -00002920 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| -00002930 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| -00002940 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| -00002950 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| -00002960 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| -00002970 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| -00002980 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| -00002990 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| -000029a0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| -000029b0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| -000029c0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| -000029d0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| -000029e0 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| -000029f0 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| -00002a00 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| -00002a10 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| -00002a20 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| -00002a30 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| -00002a40 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| -00002a50 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| -00002a60 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| -00002a70 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| -00002a80 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| -00002a90 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| -00002aa0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| -00002ab0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| -00002ac0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| -00002ad0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| -00002ae0 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| -00002af0 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| -00002b00 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| -00002b10 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| -00002b20 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| -00002b30 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| -00002b40 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| -00002b50 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| -00002b60 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| -00002b70 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| -00002b80 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| -00002b90 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| -00002ba0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| -00002bb0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| -00002bc0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| -00002bd0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| -00002be0 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| -00002bf0 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| -00002c00 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| -00002c10 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| -00002c20 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| -00002c30 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| -00002c40 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| -00002c50 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| -00002c60 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| -00002c70 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| -00002c80 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| -00002c90 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| -00002ca0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| -00002cb0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| -00002cc0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| -00002cd0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| -00002ce0 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| -00002cf0 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| -00002d00 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| -00002d10 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| -00002d20 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| -00002d30 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| -00002d40 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| -00002d50 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| -00002d60 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| -00002d70 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| -00002d80 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| -00002d90 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| -00002da0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| -00002db0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| -00002dc0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| -00002dd0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| -00002de0 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| -00002df0 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| -00002e00 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| -00002e10 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| -00002e20 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| -00002e30 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| -00002e40 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| -00002e50 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| -00002e60 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| -00002e70 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| -00002e80 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| -00002e90 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| -00002ea0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| -00002eb0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| -00002ec0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| -00002ed0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| -00002ee0 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| -00002ef0 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| -00002f00 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| -00002f10 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| -00002f20 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| -00002f30 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| -00002f40 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| -00002f50 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| -00002f60 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| -00002f70 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| -00002f80 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| -00002f90 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| -00002fa0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| -00002fb0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| -00002fc0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| -00002fd0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| -00002fe0 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| -00002ff0 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| -00003000 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| -00003010 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| -00003020 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| -00003030 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| -00003040 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| -00003050 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| -00003060 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| -00003070 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| -00003080 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| -00003090 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| -000030a0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| -000030b0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| -000030c0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| -000030d0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| -000030e0 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| -000030f0 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| -00003100 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| -00003110 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| -00003120 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| -00003130 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| -00003140 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| -00003150 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| -00003160 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| -00003170 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| -00003180 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| -00003190 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| -000031a0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| -000031b0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| -000031c0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| -000031d0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| -000031e0 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| -000031f0 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| -00003200 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| -00003210 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| -00003220 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| -00003230 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| -00003240 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| -00003250 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| -00003260 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| -00003270 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| -00003280 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| -00003290 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| -000032a0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| -000032b0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| -000032c0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| -000032d0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| -000032e0 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| -000032f0 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| -00003300 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| -00003310 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| -00003320 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| -00003330 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| -00003340 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| -00003350 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| -00003360 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| -00003370 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| -00003380 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| -00003390 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| -000033a0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| -000033b0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| -000033c0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| -000033d0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| -000033e0 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| -000033f0 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| -00003400 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| -00003410 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| -00003420 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| -00003430 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| -00003440 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| -00003450 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| -00003460 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| -00003470 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| -00003480 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| -00003490 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| -000034a0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| -000034b0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| -000034c0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| -000034d0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| -000034e0 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| -000034f0 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| -00003500 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| -00003510 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| -00003520 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| -00003530 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| -00003540 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| -00003550 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| -00003560 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| -00003570 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| -00003580 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| -00003590 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| -000035a0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| -000035b0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| -000035c0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| -000035d0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| -000035e0 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| -000035f0 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| -00003600 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| -00003610 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| -00003620 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| -00003630 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| -00003640 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| -00003650 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| -00003660 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| -00003670 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| -00003680 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| -00003690 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| -000036a0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| -000036b0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| -000036c0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| -000036d0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| -000036e0 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| -000036f0 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| -00003700 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| -00003710 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| -00003720 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| -00003730 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| -00003740 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| -00003750 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| -00003760 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| -00003770 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| -00003780 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| -00003790 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| -000037a0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| -000037b0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| -000037c0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| -000037d0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| -000037e0 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| -000037f0 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| -00003800 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| -00003810 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| -00003820 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| -00003830 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| -00003840 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| -00003850 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| -00003860 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| -00003870 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| -00003880 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| -00003890 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| -000038a0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| -000038b0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| -000038c0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| -000038d0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| -000038e0 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| -000038f0 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| -00003900 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| -00003910 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| -00003920 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| -00003930 00 00 00 00 00 32 b0 00 00 00 00 00 00 32 c0 00 |.....2.......2..| -00003940 00 00 00 00 00 32 d0 00 00 00 00 00 00 32 e0 00 |.....2.......2..| -00003950 00 00 00 00 00 32 f0 00 00 00 00 00 00 33 00 00 |.....2.......3..| -00003960 00 00 00 00 00 33 10 00 00 00 00 00 00 33 20 00 |.....3.......3 .| -00003970 00 00 00 00 00 33 30 00 00 00 00 00 00 33 40 00 |.....30......3@.| -00003980 00 00 00 00 00 33 50 00 00 00 00 00 00 33 60 00 |.....3P......3`.| -00003990 00 00 00 00 00 33 70 00 00 00 00 00 00 33 80 00 |.....3p......3..| -000039a0 00 00 00 00 00 33 90 00 00 00 00 00 00 33 a0 00 |.....3.......3..| -000039b0 00 00 00 00 00 33 b0 00 00 00 00 00 00 33 c0 00 |.....3.......3..| -000039c0 00 00 00 00 00 33 d0 00 00 00 00 00 00 33 e0 00 |.....3.......3..| -000039d0 00 00 00 00 00 33 f0 00 00 00 00 00 00 34 00 00 |.....3.......4..| -000039e0 00 00 00 00 00 34 10 00 00 00 00 00 00 34 20 00 |.....4.......4 .| -000039f0 00 00 00 00 00 34 30 00 00 00 00 00 00 34 40 00 |.....40......4@.| -00003a00 00 00 00 00 00 34 50 00 00 00 00 00 00 34 60 00 |.....4P......4`.| -00003a10 00 00 00 00 00 34 70 00 00 00 00 00 00 34 80 00 |.....4p......4..| -00003a20 00 00 00 00 00 34 90 00 00 00 00 00 00 34 a0 00 |.....4.......4..| -00003a30 00 00 00 00 00 34 b0 00 00 00 00 00 00 34 c0 00 |.....4.......4..| -00003a40 00 00 00 00 00 34 d0 00 00 00 00 00 00 34 e0 00 |.....4.......4..| -00003a50 00 00 00 00 00 34 f0 00 00 00 00 00 00 35 00 00 |.....4.......5..| -00003a60 00 00 00 00 00 35 10 00 00 00 00 00 00 35 20 00 |.....5.......5 .| -00003a70 00 00 00 00 00 35 30 00 00 00 00 00 00 35 40 00 |.....50......5@.| -00003a80 00 00 00 00 00 35 50 00 00 00 00 00 00 35 60 00 |.....5P......5`.| -00003a90 00 00 00 00 00 35 70 00 00 00 00 00 00 35 80 00 |.....5p......5..| -00003aa0 00 00 00 00 00 35 90 00 00 00 00 00 00 35 a0 00 |.....5.......5..| -00003ab0 00 00 00 00 00 35 b0 00 00 00 00 00 00 35 c0 00 |.....5.......5..| -00003ac0 00 00 00 00 00 35 d0 00 00 00 00 00 00 35 e0 00 |.....5.......5..| -00003ad0 00 00 00 00 00 35 f0 00 00 00 00 00 00 36 00 00 |.....5.......6..| -00003ae0 00 00 00 00 00 36 10 00 00 00 00 00 00 36 20 00 |.....6.......6 .| -00003af0 00 00 00 00 00 36 30 00 00 00 00 00 00 36 40 00 |.....60......6@.| -00003b00 00 00 00 00 00 36 50 00 00 00 00 00 00 36 60 00 |.....6P......6`.| -00003b10 00 00 00 00 00 36 70 00 00 00 00 00 00 36 80 00 |.....6p......6..| -00003b20 00 00 00 00 00 36 90 00 00 00 00 00 00 36 a0 00 |.....6.......6..| -00003b30 00 00 00 00 00 36 b0 00 00 00 00 00 00 36 c0 00 |.....6.......6..| -00003b40 00 00 00 00 00 36 d0 00 00 00 00 00 00 36 e0 00 |.....6.......6..| -00003b50 00 00 00 00 00 36 f0 00 00 00 00 00 00 37 00 00 |.....6.......7..| -00003b60 00 00 00 00 00 37 10 00 00 00 00 00 00 37 20 00 |.....7.......7 .| -00003b70 00 00 00 00 00 37 30 00 00 00 00 00 00 37 40 00 |.....70......7@.| -00003b80 00 00 00 00 00 37 50 00 00 00 00 00 00 37 60 00 |.....7P......7`.| -00003b90 00 00 00 00 00 37 70 00 00 00 00 00 00 37 80 00 |.....7p......7..| -00003ba0 00 00 00 00 00 37 90 00 00 00 00 00 00 37 a0 00 |.....7.......7..| -00003bb0 00 00 00 00 00 37 b0 00 00 00 00 00 00 37 c0 00 |.....7.......7..| -00003bc0 00 00 00 00 00 37 d0 00 00 00 00 00 00 37 e0 00 |.....7.......7..| -00003bd0 00 00 00 00 00 37 f0 00 00 00 00 00 00 38 00 00 |.....7.......8..| -00003be0 00 00 00 00 00 38 10 00 00 00 00 00 00 38 20 00 |.....8.......8 .| -00003bf0 00 00 00 00 00 38 30 00 00 00 00 00 00 38 40 00 |.....80......8@.| -00003c00 00 00 00 00 00 38 50 00 00 00 00 00 00 38 60 00 |.....8P......8`.| -00003c10 00 00 00 00 00 38 70 00 00 00 00 00 00 38 80 00 |.....8p......8..| -00003c20 00 00 00 00 00 38 90 00 00 00 00 00 00 38 a0 00 |.....8.......8..| -00003c30 00 00 00 00 00 38 b0 00 00 00 00 00 00 38 c0 00 |.....8.......8..| -00003c40 00 00 00 00 00 38 d0 00 00 00 00 00 00 38 e0 00 |.....8.......8..| -00003c50 00 00 00 00 00 38 f0 00 00 00 00 00 00 39 00 00 |.....8.......9..| -00003c60 00 00 00 00 00 39 10 00 00 00 00 00 00 39 20 00 |.....9.......9 .| -00003c70 00 00 00 00 00 39 30 00 00 00 00 00 00 39 40 00 |.....90......9@.| -00003c80 00 00 00 00 00 39 50 00 00 00 00 00 00 39 60 00 |.....9P......9`.| -00003c90 00 00 00 00 00 39 70 00 00 00 00 00 00 39 80 00 |.....9p......9..| -00003ca0 00 00 00 00 00 39 90 00 00 00 00 00 00 39 a0 00 |.....9.......9..| -00003cb0 00 00 00 00 00 39 b0 00 00 00 00 00 00 39 c0 00 |.....9.......9..| -00003cc0 00 00 00 00 00 39 d0 00 00 00 00 00 00 39 e0 00 |.....9.......9..| -00003cd0 00 00 00 00 00 39 f0 00 00 00 00 00 00 3a 00 00 |.....9.......:..| -00003ce0 00 00 00 00 00 3a 10 00 00 00 00 00 00 3a 20 00 |.....:.......: .| -00003cf0 00 00 00 00 00 3a 30 00 00 00 00 00 00 3a 40 00 |.....:0......:@.| -00003d00 00 00 00 00 00 3a 50 00 00 00 00 00 00 3a 60 00 |.....:P......:`.| -00003d10 00 00 00 00 00 3a 70 00 00 00 00 00 00 3a 80 00 |.....:p......:..| -00003d20 00 00 00 00 00 3a 90 00 00 00 00 00 00 3a a0 00 |.....:.......:..| -00003d30 00 00 00 00 00 3a b0 00 00 00 00 00 00 3a c0 00 |.....:.......:..| -00003d40 00 00 00 00 00 3a d0 00 00 00 00 00 00 3a e0 00 |.....:.......:..| -00003d50 00 00 00 00 00 3a f0 00 00 00 00 00 00 3b 00 00 |.....:.......;..| -00003d60 00 00 00 00 00 3b 10 00 00 00 00 00 00 3b 20 00 |.....;.......; .| -00003d70 00 00 00 00 00 3b 30 00 00 00 00 00 00 3b 40 00 |.....;0......;@.| -00003d80 00 00 00 00 00 3b 50 00 00 00 00 00 00 3b 60 00 |.....;P......;`.| -00003d90 00 00 00 00 00 3b 70 00 00 00 00 00 00 3b 80 00 |.....;p......;..| -00003da0 00 00 00 00 00 3b 90 00 00 00 00 00 00 3b a0 00 |.....;.......;..| -00003db0 00 00 00 00 00 3b b0 00 00 00 00 00 00 3b c0 00 |.....;.......;..| -00003dc0 00 00 00 00 00 3b d0 00 00 00 00 00 00 3b e0 00 |.....;.......;..| -00003dd0 00 00 00 00 00 3b f0 00 00 00 00 00 00 3c 00 00 |.....;.......<..| -00003de0 00 00 00 00 00 3c 10 00 00 00 00 00 00 3c 20 00 |.....<.......< .| -00003df0 00 00 00 00 00 3c 30 00 00 00 00 00 00 3c 40 00 |.....<0......<@.| -00003e00 00 00 00 00 00 3c 50 00 00 00 00 00 00 3c 60 00 |.......| -00003ee0 00 00 00 00 00 3e 10 00 00 00 00 00 00 3e 20 00 |.....>.......> .| -00003ef0 00 00 00 00 00 3e 30 00 00 00 00 00 00 3e 40 00 |.....>0......>@.| -00003f00 00 00 00 00 00 3e 50 00 00 00 00 00 00 3e 60 00 |.....>P......>`.| -00003f10 00 00 00 00 00 3e 70 00 00 00 00 00 00 3e 80 00 |.....>p......>..| -00003f20 00 00 00 00 00 3e 90 00 00 00 00 00 00 3e a0 00 |.....>.......>..| -00003f30 00 00 00 00 00 3e b0 00 00 00 00 00 00 3e c0 00 |.....>.......>..| -00003f40 00 00 00 00 00 3e d0 00 00 00 00 00 00 3e e0 00 |.....>.......>..| -00003f50 00 00 00 00 00 3e f0 00 00 00 00 00 00 3f 00 00 |.....>.......?..| -00003f60 00 00 00 00 00 3f 10 00 00 00 00 00 00 3f 20 00 |.....?.......? .| -00003f70 00 00 00 00 00 3f 30 00 00 00 00 00 00 3f 40 00 |.....?0......?@.| -00003f80 00 00 00 00 00 3f 50 00 00 00 00 00 00 3f 60 00 |.....?P......?`.| -00003f90 00 00 00 00 00 3f 70 00 00 00 00 00 00 3f 80 00 |.....?p......?..| -00003fa0 00 00 00 00 00 3f 90 00 00 00 00 00 00 3f a0 00 |.....?.......?..| -00003fb0 00 00 00 00 00 3f b0 00 00 00 00 00 00 3f c0 00 |.....?.......?..| -00003fc0 00 00 00 00 00 3f d0 00 00 00 00 00 00 3f e0 00 |.....?.......?..| -00003fd0 00 00 00 00 00 3f f0 00 00 00 00 00 00 40 00 00 |.....?.......@..| -00003fe0 00 00 00 00 00 40 10 00 00 00 00 00 00 40 20 00 |.....@.......@ .| -00003ff0 00 00 00 00 00 40 30 00 00 00 00 00 00 40 40 00 |.....@0......@@.| -00004000 00 00 00 00 00 40 50 00 00 00 00 00 00 00 00 00 |.....@P.........| -00004010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002000 00 00 00 00 00 00 50 00 00 00 00 00 00 00 00 00 |......P.........| +00002010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00002020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 60 00 |..............`.| +00002030 00 00 00 00 00 00 70 00 00 00 00 00 00 00 80 00 |......p.........| +00002040 00 00 00 00 00 00 90 00 00 00 00 00 00 00 a0 00 |................| +00002050 00 00 00 00 00 00 b0 00 00 00 00 00 00 00 c0 00 |................| +00002060 00 00 00 00 00 00 d0 00 00 00 00 00 00 00 e0 00 |................| +00002070 00 00 00 00 00 00 f0 00 00 00 00 00 00 01 00 00 |................| +00002080 00 00 00 00 00 01 10 00 00 00 00 00 00 01 20 00 |.............. .| +00002090 00 00 00 00 00 01 30 00 00 00 00 00 00 01 40 00 |......0.......@.| +000020a0 00 00 00 00 00 01 50 00 00 00 00 00 00 01 60 00 |......P.......`.| +000020b0 00 00 00 00 00 01 70 00 00 00 00 00 00 01 80 00 |......p.........| +000020c0 00 00 00 00 00 01 90 00 00 00 00 00 00 01 a0 00 |................| +000020d0 00 00 00 00 00 01 b0 00 00 00 00 00 00 01 c0 00 |................| +000020e0 00 00 00 00 00 01 d0 00 00 00 00 00 00 01 e0 00 |................| +000020f0 00 00 00 00 00 01 f0 00 00 00 00 00 00 02 00 00 |................| +00002100 00 00 00 00 00 02 10 00 00 00 00 00 00 02 20 00 |.............. .| +00002110 00 00 00 00 00 02 30 00 00 00 00 00 00 02 40 00 |......0.......@.| +00002120 00 00 00 00 00 02 50 00 00 00 00 00 00 02 60 00 |......P.......`.| +00002130 00 00 00 00 00 02 70 00 00 00 00 00 00 02 80 00 |......p.........| +00002140 00 00 00 00 00 02 90 00 00 00 00 00 00 02 a0 00 |................| +00002150 00 00 00 00 00 02 b0 00 00 00 00 00 00 02 c0 00 |................| +00002160 00 00 00 00 00 02 d0 00 00 00 00 00 00 02 e0 00 |................| +00002170 00 00 00 00 00 02 f0 00 00 00 00 00 00 03 00 00 |................| +00002180 00 00 00 00 00 03 10 00 00 00 00 00 00 03 20 00 |.............. .| +00002190 00 00 00 00 00 03 30 00 00 00 00 00 00 03 40 00 |......0.......@.| +000021a0 00 00 00 00 00 03 50 00 00 00 00 00 00 03 60 00 |......P.......`.| +000021b0 00 00 00 00 00 03 70 00 00 00 00 00 00 03 80 00 |......p.........| +000021c0 00 00 00 00 00 03 90 00 00 00 00 00 00 03 a0 00 |................| +000021d0 00 00 00 00 00 03 b0 00 00 00 00 00 00 03 c0 00 |................| +000021e0 00 00 00 00 00 03 d0 00 00 00 00 00 00 03 e0 00 |................| +000021f0 00 00 00 00 00 03 f0 00 00 00 00 00 00 04 00 00 |................| +00002200 00 00 00 00 00 04 10 00 00 00 00 00 00 04 20 00 |.............. .| +00002210 00 00 00 00 00 04 30 00 00 00 00 00 00 04 40 00 |......0.......@.| +00002220 00 00 00 00 00 04 50 00 00 00 00 00 00 04 60 00 |......P.......`.| +00002230 00 00 00 00 00 04 70 00 00 00 00 00 00 04 80 00 |......p.........| +00002240 00 00 00 00 00 04 90 00 00 00 00 00 00 04 a0 00 |................| +00002250 00 00 00 00 00 04 b0 00 00 00 00 00 00 04 c0 00 |................| +00002260 00 00 00 00 00 04 d0 00 00 00 00 00 00 04 e0 00 |................| +00002270 00 00 00 00 00 04 f0 00 00 00 00 00 00 05 00 00 |................| +00002280 00 00 00 00 00 05 10 00 00 00 00 00 00 05 20 00 |.............. .| +00002290 00 00 00 00 00 05 30 00 00 00 00 00 00 05 40 00 |......0.......@.| +000022a0 00 00 00 00 00 05 50 00 00 00 00 00 00 05 60 00 |......P.......`.| +000022b0 00 00 00 00 00 05 70 00 00 00 00 00 00 05 80 00 |......p.........| +000022c0 00 00 00 00 00 05 90 00 00 00 00 00 00 05 a0 00 |................| +000022d0 00 00 00 00 00 05 b0 00 00 00 00 00 00 05 c0 00 |................| +000022e0 00 00 00 00 00 05 d0 00 00 00 00 00 00 05 e0 00 |................| +000022f0 00 00 00 00 00 05 f0 00 00 00 00 00 00 06 00 00 |................| +00002300 00 00 00 00 00 06 10 00 00 00 00 00 00 06 20 00 |.............. .| +00002310 00 00 00 00 00 06 30 00 00 00 00 00 00 06 40 00 |......0.......@.| +00002320 00 00 00 00 00 06 50 00 00 00 00 00 00 06 60 00 |......P.......`.| +00002330 00 00 00 00 00 06 70 00 00 00 00 00 00 06 80 00 |......p.........| +00002340 00 00 00 00 00 06 90 00 00 00 00 00 00 06 a0 00 |................| +00002350 00 00 00 00 00 06 b0 00 00 00 00 00 00 06 c0 00 |................| +00002360 00 00 00 00 00 06 d0 00 00 00 00 00 00 06 e0 00 |................| +00002370 00 00 00 00 00 06 f0 00 00 00 00 00 00 07 00 00 |................| +00002380 00 00 00 00 00 07 10 00 00 00 00 00 00 07 20 00 |.............. .| +00002390 00 00 00 00 00 07 30 00 00 00 00 00 00 07 40 00 |......0.......@.| +000023a0 00 00 00 00 00 07 50 00 00 00 00 00 00 07 60 00 |......P.......`.| +000023b0 00 00 00 00 00 07 70 00 00 00 00 00 00 07 80 00 |......p.........| +000023c0 00 00 00 00 00 07 90 00 00 00 00 00 00 07 a0 00 |................| +000023d0 00 00 00 00 00 07 b0 00 00 00 00 00 00 07 c0 00 |................| +000023e0 00 00 00 00 00 07 d0 00 00 00 00 00 00 07 e0 00 |................| +000023f0 00 00 00 00 00 07 f0 00 00 00 00 00 00 08 00 00 |................| +00002400 00 00 00 00 00 08 10 00 00 00 00 00 00 08 20 00 |.............. .| +00002410 00 00 00 00 00 08 30 00 00 00 00 00 00 08 40 00 |......0.......@.| +00002420 00 00 00 00 00 08 50 00 00 00 00 00 00 08 60 00 |......P.......`.| +00002430 00 00 00 00 00 08 70 00 00 00 00 00 00 08 80 00 |......p.........| +00002440 00 00 00 00 00 08 90 00 00 00 00 00 00 08 a0 00 |................| +00002450 00 00 00 00 00 08 b0 00 00 00 00 00 00 08 c0 00 |................| +00002460 00 00 00 00 00 08 d0 00 00 00 00 00 00 08 e0 00 |................| +00002470 00 00 00 00 00 08 f0 00 00 00 00 00 00 09 00 00 |................| +00002480 00 00 00 00 00 09 10 00 00 00 00 00 00 09 20 00 |.............. .| +00002490 00 00 00 00 00 09 30 00 00 00 00 00 00 09 40 00 |......0.......@.| +000024a0 00 00 00 00 00 09 50 00 00 00 00 00 00 09 60 00 |......P.......`.| +000024b0 00 00 00 00 00 09 70 00 00 00 00 00 00 09 80 00 |......p.........| +000024c0 00 00 00 00 00 09 90 00 00 00 00 00 00 09 a0 00 |................| +000024d0 00 00 00 00 00 09 b0 00 00 00 00 00 00 09 c0 00 |................| +000024e0 00 00 00 00 00 09 d0 00 00 00 00 00 00 09 e0 00 |................| +000024f0 00 00 00 00 00 09 f0 00 00 00 00 00 00 0a 00 00 |................| +00002500 00 00 00 00 00 0a 10 00 00 00 00 00 00 0a 20 00 |.............. .| +00002510 00 00 00 00 00 0a 30 00 00 00 00 00 00 0a 40 00 |......0.......@.| +00002520 00 00 00 00 00 0a 50 00 00 00 00 00 00 0a 60 00 |......P.......`.| +00002530 00 00 00 00 00 0a 70 00 00 00 00 00 00 0a 80 00 |......p.........| +00002540 00 00 00 00 00 0a 90 00 00 00 00 00 00 0a a0 00 |................| +00002550 00 00 00 00 00 0a b0 00 00 00 00 00 00 0a c0 00 |................| +00002560 00 00 00 00 00 0a d0 00 00 00 00 00 00 0a e0 00 |................| +00002570 00 00 00 00 00 0a f0 00 00 00 00 00 00 0b 00 00 |................| +00002580 00 00 00 00 00 0b 10 00 00 00 00 00 00 0b 20 00 |.............. .| +00002590 00 00 00 00 00 0b 30 00 00 00 00 00 00 0b 40 00 |......0.......@.| +000025a0 00 00 00 00 00 0b 50 00 00 00 00 00 00 0b 60 00 |......P.......`.| +000025b0 00 00 00 00 00 0b 70 00 00 00 00 00 00 0b 80 00 |......p.........| +000025c0 00 00 00 00 00 0b 90 00 00 00 00 00 00 0b a0 00 |................| +000025d0 00 00 00 00 00 0b b0 00 00 00 00 00 00 0b c0 00 |................| +000025e0 00 00 00 00 00 0b d0 00 00 00 00 00 00 0b e0 00 |................| +000025f0 00 00 00 00 00 0b f0 00 00 00 00 00 00 0c 00 00 |................| +00002600 00 00 00 00 00 0c 10 00 00 00 00 00 00 0c 20 00 |.............. .| +00002610 00 00 00 00 00 0c 30 00 00 00 00 00 00 0c 40 00 |......0.......@.| +00002620 00 00 00 00 00 0c 50 00 00 00 00 00 00 0c 60 00 |......P.......`.| +00002630 00 00 00 00 00 0c 70 00 00 00 00 00 00 0c 80 00 |......p.........| +00002640 00 00 00 00 00 0c 90 00 00 00 00 00 00 0c a0 00 |................| +00002650 00 00 00 00 00 0c b0 00 00 00 00 00 00 0c c0 00 |................| +00002660 00 00 00 00 00 0c d0 00 00 00 00 00 00 0c e0 00 |................| +00002670 00 00 00 00 00 0c f0 00 00 00 00 00 00 0d 00 00 |................| +00002680 00 00 00 00 00 0d 10 00 00 00 00 00 00 0d 20 00 |.............. .| +00002690 00 00 00 00 00 0d 30 00 00 00 00 00 00 0d 40 00 |......0.......@.| +000026a0 00 00 00 00 00 0d 50 00 00 00 00 00 00 0d 60 00 |......P.......`.| +000026b0 00 00 00 00 00 0d 70 00 00 00 00 00 00 0d 80 00 |......p.........| +000026c0 00 00 00 00 00 0d 90 00 00 00 00 00 00 0d a0 00 |................| +000026d0 00 00 00 00 00 0d b0 00 00 00 00 00 00 0d c0 00 |................| +000026e0 00 00 00 00 00 0d d0 00 00 00 00 00 00 0d e0 00 |................| +000026f0 00 00 00 00 00 0d f0 00 00 00 00 00 00 0e 00 00 |................| +00002700 00 00 00 00 00 0e 10 00 00 00 00 00 00 0e 20 00 |.............. .| +00002710 00 00 00 00 00 0e 30 00 00 00 00 00 00 0e 40 00 |......0.......@.| +00002720 00 00 00 00 00 0e 50 00 00 00 00 00 00 0e 60 00 |......P.......`.| +00002730 00 00 00 00 00 0e 70 00 00 00 00 00 00 0e 80 00 |......p.........| +00002740 00 00 00 00 00 0e 90 00 00 00 00 00 00 0e a0 00 |................| +00002750 00 00 00 00 00 0e b0 00 00 00 00 00 00 0e c0 00 |................| +00002760 00 00 00 00 00 0e d0 00 00 00 00 00 00 0e e0 00 |................| +00002770 00 00 00 00 00 0e f0 00 00 00 00 00 00 0f 00 00 |................| +00002780 00 00 00 00 00 0f 10 00 00 00 00 00 00 0f 20 00 |.............. .| +00002790 00 00 00 00 00 0f 30 00 00 00 00 00 00 0f 40 00 |......0.......@.| +000027a0 00 00 00 00 00 0f 50 00 00 00 00 00 00 0f 60 00 |......P.......`.| +000027b0 00 00 00 00 00 0f 70 00 00 00 00 00 00 0f 80 00 |......p.........| +000027c0 00 00 00 00 00 0f 90 00 00 00 00 00 00 0f a0 00 |................| +000027d0 00 00 00 00 00 0f b0 00 00 00 00 00 00 0f c0 00 |................| +000027e0 00 00 00 00 00 0f d0 00 00 00 00 00 00 0f e0 00 |................| +000027f0 00 00 00 00 00 0f f0 00 00 00 00 00 00 10 00 00 |................| +00002800 00 00 00 00 00 10 10 00 00 00 00 00 00 10 20 00 |.............. .| +00002810 00 00 00 00 00 10 30 00 00 00 00 00 00 10 40 00 |......0.......@.| +00002820 00 00 00 00 00 10 50 00 00 00 00 00 00 10 60 00 |......P.......`.| +00002830 00 00 00 00 00 10 70 00 00 00 00 00 00 10 80 00 |......p.........| +00002840 00 00 00 00 00 10 90 00 00 00 00 00 00 10 a0 00 |................| +00002850 00 00 00 00 00 10 b0 00 00 00 00 00 00 10 c0 00 |................| +00002860 00 00 00 00 00 10 d0 00 00 00 00 00 00 10 e0 00 |................| +00002870 00 00 00 00 00 10 f0 00 00 00 00 00 00 11 00 00 |................| +00002880 00 00 00 00 00 11 10 00 00 00 00 00 00 11 20 00 |.............. .| +00002890 00 00 00 00 00 11 30 00 00 00 00 00 00 11 40 00 |......0.......@.| +000028a0 00 00 00 00 00 11 50 00 00 00 00 00 00 11 60 00 |......P.......`.| +000028b0 00 00 00 00 00 11 70 00 00 00 00 00 00 11 80 00 |......p.........| +000028c0 00 00 00 00 00 11 90 00 00 00 00 00 00 11 a0 00 |................| +000028d0 00 00 00 00 00 11 b0 00 00 00 00 00 00 11 c0 00 |................| +000028e0 00 00 00 00 00 11 d0 00 00 00 00 00 00 11 e0 00 |................| +000028f0 00 00 00 00 00 11 f0 00 00 00 00 00 00 12 00 00 |................| +00002900 00 00 00 00 00 12 10 00 00 00 00 00 00 12 20 00 |.............. .| +00002910 00 00 00 00 00 12 30 00 00 00 00 00 00 12 40 00 |......0.......@.| +00002920 00 00 00 00 00 12 50 00 00 00 00 00 00 12 60 00 |......P.......`.| +00002930 00 00 00 00 00 12 70 00 00 00 00 00 00 12 80 00 |......p.........| +00002940 00 00 00 00 00 12 90 00 00 00 00 00 00 12 a0 00 |................| +00002950 00 00 00 00 00 12 b0 00 00 00 00 00 00 12 c0 00 |................| +00002960 00 00 00 00 00 12 d0 00 00 00 00 00 00 12 e0 00 |................| +00002970 00 00 00 00 00 12 f0 00 00 00 00 00 00 13 00 00 |................| +00002980 00 00 00 00 00 13 10 00 00 00 00 00 00 13 20 00 |.............. .| +00002990 00 00 00 00 00 13 30 00 00 00 00 00 00 13 40 00 |......0.......@.| +000029a0 00 00 00 00 00 13 50 00 00 00 00 00 00 13 60 00 |......P.......`.| +000029b0 00 00 00 00 00 13 70 00 00 00 00 00 00 13 80 00 |......p.........| +000029c0 00 00 00 00 00 13 90 00 00 00 00 00 00 13 a0 00 |................| +000029d0 00 00 00 00 00 13 b0 00 00 00 00 00 00 13 c0 00 |................| +000029e0 00 00 00 00 00 13 d0 00 00 00 00 00 00 13 e0 00 |................| +000029f0 00 00 00 00 00 13 f0 00 00 00 00 00 00 14 00 00 |................| +00002a00 00 00 00 00 00 14 10 00 00 00 00 00 00 14 20 00 |.............. .| +00002a10 00 00 00 00 00 14 30 00 00 00 00 00 00 14 40 00 |......0.......@.| +00002a20 00 00 00 00 00 14 50 00 00 00 00 00 00 14 60 00 |......P.......`.| +00002a30 00 00 00 00 00 14 70 00 00 00 00 00 00 14 80 00 |......p.........| +00002a40 00 00 00 00 00 14 90 00 00 00 00 00 00 14 a0 00 |................| +00002a50 00 00 00 00 00 14 b0 00 00 00 00 00 00 14 c0 00 |................| +00002a60 00 00 00 00 00 14 d0 00 00 00 00 00 00 14 e0 00 |................| +00002a70 00 00 00 00 00 14 f0 00 00 00 00 00 00 15 00 00 |................| +00002a80 00 00 00 00 00 15 10 00 00 00 00 00 00 15 20 00 |.............. .| +00002a90 00 00 00 00 00 15 30 00 00 00 00 00 00 15 40 00 |......0.......@.| +00002aa0 00 00 00 00 00 15 50 00 00 00 00 00 00 15 60 00 |......P.......`.| +00002ab0 00 00 00 00 00 15 70 00 00 00 00 00 00 15 80 00 |......p.........| +00002ac0 00 00 00 00 00 15 90 00 00 00 00 00 00 15 a0 00 |................| +00002ad0 00 00 00 00 00 15 b0 00 00 00 00 00 00 15 c0 00 |................| +00002ae0 00 00 00 00 00 15 d0 00 00 00 00 00 00 15 e0 00 |................| +00002af0 00 00 00 00 00 15 f0 00 00 00 00 00 00 16 00 00 |................| +00002b00 00 00 00 00 00 16 10 00 00 00 00 00 00 16 20 00 |.............. .| +00002b10 00 00 00 00 00 16 30 00 00 00 00 00 00 16 40 00 |......0.......@.| +00002b20 00 00 00 00 00 16 50 00 00 00 00 00 00 16 60 00 |......P.......`.| +00002b30 00 00 00 00 00 16 70 00 00 00 00 00 00 16 80 00 |......p.........| +00002b40 00 00 00 00 00 16 90 00 00 00 00 00 00 16 a0 00 |................| +00002b50 00 00 00 00 00 16 b0 00 00 00 00 00 00 16 c0 00 |................| +00002b60 00 00 00 00 00 16 d0 00 00 00 00 00 00 16 e0 00 |................| +00002b70 00 00 00 00 00 16 f0 00 00 00 00 00 00 17 00 00 |................| +00002b80 00 00 00 00 00 17 10 00 00 00 00 00 00 17 20 00 |.............. .| +00002b90 00 00 00 00 00 17 30 00 00 00 00 00 00 17 40 00 |......0.......@.| +00002ba0 00 00 00 00 00 17 50 00 00 00 00 00 00 17 60 00 |......P.......`.| +00002bb0 00 00 00 00 00 17 70 00 00 00 00 00 00 17 80 00 |......p.........| +00002bc0 00 00 00 00 00 17 90 00 00 00 00 00 00 17 a0 00 |................| +00002bd0 00 00 00 00 00 17 b0 00 00 00 00 00 00 17 c0 00 |................| +00002be0 00 00 00 00 00 17 d0 00 00 00 00 00 00 17 e0 00 |................| +00002bf0 00 00 00 00 00 17 f0 00 00 00 00 00 00 18 00 00 |................| +00002c00 00 00 00 00 00 18 10 00 00 00 00 00 00 18 20 00 |.............. .| +00002c10 00 00 00 00 00 18 30 00 00 00 00 00 00 18 40 00 |......0.......@.| +00002c20 00 00 00 00 00 18 50 00 00 00 00 00 00 18 60 00 |......P.......`.| +00002c30 00 00 00 00 00 18 70 00 00 00 00 00 00 18 80 00 |......p.........| +00002c40 00 00 00 00 00 18 90 00 00 00 00 00 00 18 a0 00 |................| +00002c50 00 00 00 00 00 18 b0 00 00 00 00 00 00 18 c0 00 |................| +00002c60 00 00 00 00 00 18 d0 00 00 00 00 00 00 18 e0 00 |................| +00002c70 00 00 00 00 00 18 f0 00 00 00 00 00 00 19 00 00 |................| +00002c80 00 00 00 00 00 19 10 00 00 00 00 00 00 19 20 00 |.............. .| +00002c90 00 00 00 00 00 19 30 00 00 00 00 00 00 19 40 00 |......0.......@.| +00002ca0 00 00 00 00 00 19 50 00 00 00 00 00 00 19 60 00 |......P.......`.| +00002cb0 00 00 00 00 00 19 70 00 00 00 00 00 00 19 80 00 |......p.........| +00002cc0 00 00 00 00 00 19 90 00 00 00 00 00 00 19 a0 00 |................| +00002cd0 00 00 00 00 00 19 b0 00 00 00 00 00 00 19 c0 00 |................| +00002ce0 00 00 00 00 00 19 d0 00 00 00 00 00 00 19 e0 00 |................| +00002cf0 00 00 00 00 00 19 f0 00 00 00 00 00 00 1a 00 00 |................| +00002d00 00 00 00 00 00 1a 10 00 00 00 00 00 00 1a 20 00 |.............. .| +00002d10 00 00 00 00 00 1a 30 00 00 00 00 00 00 1a 40 00 |......0.......@.| +00002d20 00 00 00 00 00 1a 50 00 00 00 00 00 00 1a 60 00 |......P.......`.| +00002d30 00 00 00 00 00 1a 70 00 00 00 00 00 00 1a 80 00 |......p.........| +00002d40 00 00 00 00 00 1a 90 00 00 00 00 00 00 1a a0 00 |................| +00002d50 00 00 00 00 00 1a b0 00 00 00 00 00 00 1a c0 00 |................| +00002d60 00 00 00 00 00 1a d0 00 00 00 00 00 00 1a e0 00 |................| +00002d70 00 00 00 00 00 1a f0 00 00 00 00 00 00 1b 00 00 |................| +00002d80 00 00 00 00 00 1b 10 00 00 00 00 00 00 1b 20 00 |.............. .| +00002d90 00 00 00 00 00 1b 30 00 00 00 00 00 00 1b 40 00 |......0.......@.| +00002da0 00 00 00 00 00 1b 50 00 00 00 00 00 00 1b 60 00 |......P.......`.| +00002db0 00 00 00 00 00 1b 70 00 00 00 00 00 00 1b 80 00 |......p.........| +00002dc0 00 00 00 00 00 1b 90 00 00 00 00 00 00 1b a0 00 |................| +00002dd0 00 00 00 00 00 1b b0 00 00 00 00 00 00 1b c0 00 |................| +00002de0 00 00 00 00 00 1b d0 00 00 00 00 00 00 1b e0 00 |................| +00002df0 00 00 00 00 00 1b f0 00 00 00 00 00 00 1c 00 00 |................| +00002e00 00 00 00 00 00 1c 10 00 00 00 00 00 00 1c 20 00 |.............. .| +00002e10 00 00 00 00 00 1c 30 00 00 00 00 00 00 1c 40 00 |......0.......@.| +00002e20 00 00 00 00 00 1c 50 00 00 00 00 00 00 1c 60 00 |......P.......`.| +00002e30 00 00 00 00 00 1c 70 00 00 00 00 00 00 1c 80 00 |......p.........| +00002e40 00 00 00 00 00 1c 90 00 00 00 00 00 00 1c a0 00 |................| +00002e50 00 00 00 00 00 1c b0 00 00 00 00 00 00 1c c0 00 |................| +00002e60 00 00 00 00 00 1c d0 00 00 00 00 00 00 1c e0 00 |................| +00002e70 00 00 00 00 00 1c f0 00 00 00 00 00 00 1d 00 00 |................| +00002e80 00 00 00 00 00 1d 10 00 00 00 00 00 00 1d 20 00 |.............. .| +00002e90 00 00 00 00 00 1d 30 00 00 00 00 00 00 1d 40 00 |......0.......@.| +00002ea0 00 00 00 00 00 1d 50 00 00 00 00 00 00 1d 60 00 |......P.......`.| +00002eb0 00 00 00 00 00 1d 70 00 00 00 00 00 00 1d 80 00 |......p.........| +00002ec0 00 00 00 00 00 1d 90 00 00 00 00 00 00 1d a0 00 |................| +00002ed0 00 00 00 00 00 1d b0 00 00 00 00 00 00 1d c0 00 |................| +00002ee0 00 00 00 00 00 1d d0 00 00 00 00 00 00 1d e0 00 |................| +00002ef0 00 00 00 00 00 1d f0 00 00 00 00 00 00 1e 00 00 |................| +00002f00 00 00 00 00 00 1e 10 00 00 00 00 00 00 1e 20 00 |.............. .| +00002f10 00 00 00 00 00 1e 30 00 00 00 00 00 00 1e 40 00 |......0.......@.| +00002f20 00 00 00 00 00 1e 50 00 00 00 00 00 00 1e 60 00 |......P.......`.| +00002f30 00 00 00 00 00 1e 70 00 00 00 00 00 00 1e 80 00 |......p.........| +00002f40 00 00 00 00 00 1e 90 00 00 00 00 00 00 1e a0 00 |................| +00002f50 00 00 00 00 00 1e b0 00 00 00 00 00 00 1e c0 00 |................| +00002f60 00 00 00 00 00 1e d0 00 00 00 00 00 00 1e e0 00 |................| +00002f70 00 00 00 00 00 1e f0 00 00 00 00 00 00 1f 00 00 |................| +00002f80 00 00 00 00 00 1f 10 00 00 00 00 00 00 1f 20 00 |.............. .| +00002f90 00 00 00 00 00 1f 30 00 00 00 00 00 00 1f 40 00 |......0.......@.| +00002fa0 00 00 00 00 00 1f 50 00 00 00 00 00 00 1f 60 00 |......P.......`.| +00002fb0 00 00 00 00 00 1f 70 00 00 00 00 00 00 1f 80 00 |......p.........| +00002fc0 00 00 00 00 00 1f 90 00 00 00 00 00 00 1f a0 00 |................| +00002fd0 00 00 00 00 00 1f b0 00 00 00 00 00 00 1f c0 00 |................| +00002fe0 00 00 00 00 00 1f d0 00 00 00 00 00 00 1f e0 00 |................| +00002ff0 00 00 00 00 00 1f f0 00 00 00 00 00 00 20 00 00 |............. ..| +00003000 00 00 00 00 00 20 10 00 00 00 00 00 00 20 20 00 |..... ....... .| +00003010 00 00 00 00 00 20 30 00 00 00 00 00 00 20 40 00 |..... 0...... @.| +00003020 00 00 00 00 00 20 50 00 00 00 00 00 00 20 60 00 |..... P...... `.| +00003030 00 00 00 00 00 20 70 00 00 00 00 00 00 20 80 00 |..... p...... ..| +00003040 00 00 00 00 00 20 90 00 00 00 00 00 00 20 a0 00 |..... ....... ..| +00003050 00 00 00 00 00 20 b0 00 00 00 00 00 00 20 c0 00 |..... ....... ..| +00003060 00 00 00 00 00 20 d0 00 00 00 00 00 00 20 e0 00 |..... ....... ..| +00003070 00 00 00 00 00 20 f0 00 00 00 00 00 00 21 00 00 |..... .......!..| +00003080 00 00 00 00 00 21 10 00 00 00 00 00 00 21 20 00 |.....!.......! .| +00003090 00 00 00 00 00 21 30 00 00 00 00 00 00 21 40 00 |.....!0......!@.| +000030a0 00 00 00 00 00 21 50 00 00 00 00 00 00 21 60 00 |.....!P......!`.| +000030b0 00 00 00 00 00 21 70 00 00 00 00 00 00 21 80 00 |.....!p......!..| +000030c0 00 00 00 00 00 21 90 00 00 00 00 00 00 21 a0 00 |.....!.......!..| +000030d0 00 00 00 00 00 21 b0 00 00 00 00 00 00 21 c0 00 |.....!.......!..| +000030e0 00 00 00 00 00 21 d0 00 00 00 00 00 00 21 e0 00 |.....!.......!..| +000030f0 00 00 00 00 00 21 f0 00 00 00 00 00 00 22 00 00 |.....!......."..| +00003100 00 00 00 00 00 22 10 00 00 00 00 00 00 22 20 00 |....."......." .| +00003110 00 00 00 00 00 22 30 00 00 00 00 00 00 22 40 00 |....."0......"@.| +00003120 00 00 00 00 00 22 50 00 00 00 00 00 00 22 60 00 |....."P......"`.| +00003130 00 00 00 00 00 22 70 00 00 00 00 00 00 22 80 00 |....."p......"..| +00003140 00 00 00 00 00 22 90 00 00 00 00 00 00 22 a0 00 |....."......."..| +00003150 00 00 00 00 00 22 b0 00 00 00 00 00 00 22 c0 00 |....."......."..| +00003160 00 00 00 00 00 22 d0 00 00 00 00 00 00 22 e0 00 |....."......."..| +00003170 00 00 00 00 00 22 f0 00 00 00 00 00 00 23 00 00 |.....".......#..| +00003180 00 00 00 00 00 23 10 00 00 00 00 00 00 23 20 00 |.....#.......# .| +00003190 00 00 00 00 00 23 30 00 00 00 00 00 00 23 40 00 |.....#0......#@.| +000031a0 00 00 00 00 00 23 50 00 00 00 00 00 00 23 60 00 |.....#P......#`.| +000031b0 00 00 00 00 00 23 70 00 00 00 00 00 00 23 80 00 |.....#p......#..| +000031c0 00 00 00 00 00 23 90 00 00 00 00 00 00 23 a0 00 |.....#.......#..| +000031d0 00 00 00 00 00 23 b0 00 00 00 00 00 00 23 c0 00 |.....#.......#..| +000031e0 00 00 00 00 00 23 d0 00 00 00 00 00 00 23 e0 00 |.....#.......#..| +000031f0 00 00 00 00 00 23 f0 00 00 00 00 00 00 24 00 00 |.....#.......$..| +00003200 00 00 00 00 00 24 10 00 00 00 00 00 00 24 20 00 |.....$.......$ .| +00003210 00 00 00 00 00 24 30 00 00 00 00 00 00 24 40 00 |.....$0......$@.| +00003220 00 00 00 00 00 24 50 00 00 00 00 00 00 24 60 00 |.....$P......$`.| +00003230 00 00 00 00 00 24 70 00 00 00 00 00 00 24 80 00 |.....$p......$..| +00003240 00 00 00 00 00 24 90 00 00 00 00 00 00 24 a0 00 |.....$.......$..| +00003250 00 00 00 00 00 24 b0 00 00 00 00 00 00 24 c0 00 |.....$.......$..| +00003260 00 00 00 00 00 24 d0 00 00 00 00 00 00 24 e0 00 |.....$.......$..| +00003270 00 00 00 00 00 24 f0 00 00 00 00 00 00 25 00 00 |.....$.......%..| +00003280 00 00 00 00 00 25 10 00 00 00 00 00 00 25 20 00 |.....%.......% .| +00003290 00 00 00 00 00 25 30 00 00 00 00 00 00 25 40 00 |.....%0......%@.| +000032a0 00 00 00 00 00 25 50 00 00 00 00 00 00 25 60 00 |.....%P......%`.| +000032b0 00 00 00 00 00 25 70 00 00 00 00 00 00 25 80 00 |.....%p......%..| +000032c0 00 00 00 00 00 25 90 00 00 00 00 00 00 25 a0 00 |.....%.......%..| +000032d0 00 00 00 00 00 25 b0 00 00 00 00 00 00 25 c0 00 |.....%.......%..| +000032e0 00 00 00 00 00 25 d0 00 00 00 00 00 00 25 e0 00 |.....%.......%..| +000032f0 00 00 00 00 00 25 f0 00 00 00 00 00 00 26 00 00 |.....%.......&..| +00003300 00 00 00 00 00 26 10 00 00 00 00 00 00 26 20 00 |.....&.......& .| +00003310 00 00 00 00 00 26 30 00 00 00 00 00 00 26 40 00 |.....&0......&@.| +00003320 00 00 00 00 00 26 50 00 00 00 00 00 00 26 60 00 |.....&P......&`.| +00003330 00 00 00 00 00 26 70 00 00 00 00 00 00 26 80 00 |.....&p......&..| +00003340 00 00 00 00 00 26 90 00 00 00 00 00 00 26 a0 00 |.....&.......&..| +00003350 00 00 00 00 00 26 b0 00 00 00 00 00 00 26 c0 00 |.....&.......&..| +00003360 00 00 00 00 00 26 d0 00 00 00 00 00 00 26 e0 00 |.....&.......&..| +00003370 00 00 00 00 00 26 f0 00 00 00 00 00 00 27 00 00 |.....&.......'..| +00003380 00 00 00 00 00 27 10 00 00 00 00 00 00 27 20 00 |.....'.......' .| +00003390 00 00 00 00 00 27 30 00 00 00 00 00 00 27 40 00 |.....'0......'@.| +000033a0 00 00 00 00 00 27 50 00 00 00 00 00 00 27 60 00 |.....'P......'`.| +000033b0 00 00 00 00 00 27 70 00 00 00 00 00 00 27 80 00 |.....'p......'..| +000033c0 00 00 00 00 00 27 90 00 00 00 00 00 00 27 a0 00 |.....'.......'..| +000033d0 00 00 00 00 00 27 b0 00 00 00 00 00 00 27 c0 00 |.....'.......'..| +000033e0 00 00 00 00 00 27 d0 00 00 00 00 00 00 27 e0 00 |.....'.......'..| +000033f0 00 00 00 00 00 27 f0 00 00 00 00 00 00 28 00 00 |.....'.......(..| +00003400 00 00 00 00 00 28 10 00 00 00 00 00 00 28 20 00 |.....(.......( .| +00003410 00 00 00 00 00 28 30 00 00 00 00 00 00 28 40 00 |.....(0......(@.| +00003420 00 00 00 00 00 28 50 00 00 00 00 00 00 28 60 00 |.....(P......(`.| +00003430 00 00 00 00 00 28 70 00 00 00 00 00 00 28 80 00 |.....(p......(..| +00003440 00 00 00 00 00 28 90 00 00 00 00 00 00 28 a0 00 |.....(.......(..| +00003450 00 00 00 00 00 28 b0 00 00 00 00 00 00 28 c0 00 |.....(.......(..| +00003460 00 00 00 00 00 28 d0 00 00 00 00 00 00 28 e0 00 |.....(.......(..| +00003470 00 00 00 00 00 28 f0 00 00 00 00 00 00 29 00 00 |.....(.......)..| +00003480 00 00 00 00 00 29 10 00 00 00 00 00 00 29 20 00 |.....).......) .| +00003490 00 00 00 00 00 29 30 00 00 00 00 00 00 29 40 00 |.....)0......)@.| +000034a0 00 00 00 00 00 29 50 00 00 00 00 00 00 29 60 00 |.....)P......)`.| +000034b0 00 00 00 00 00 29 70 00 00 00 00 00 00 29 80 00 |.....)p......)..| +000034c0 00 00 00 00 00 29 90 00 00 00 00 00 00 29 a0 00 |.....).......)..| +000034d0 00 00 00 00 00 29 b0 00 00 00 00 00 00 29 c0 00 |.....).......)..| +000034e0 00 00 00 00 00 29 d0 00 00 00 00 00 00 29 e0 00 |.....).......)..| +000034f0 00 00 00 00 00 29 f0 00 00 00 00 00 00 2a 00 00 |.....).......*..| +00003500 00 00 00 00 00 2a 10 00 00 00 00 00 00 2a 20 00 |.....*.......* .| +00003510 00 00 00 00 00 2a 30 00 00 00 00 00 00 2a 40 00 |.....*0......*@.| +00003520 00 00 00 00 00 2a 50 00 00 00 00 00 00 2a 60 00 |.....*P......*`.| +00003530 00 00 00 00 00 2a 70 00 00 00 00 00 00 2a 80 00 |.....*p......*..| +00003540 00 00 00 00 00 2a 90 00 00 00 00 00 00 2a a0 00 |.....*.......*..| +00003550 00 00 00 00 00 2a b0 00 00 00 00 00 00 2a c0 00 |.....*.......*..| +00003560 00 00 00 00 00 2a d0 00 00 00 00 00 00 2a e0 00 |.....*.......*..| +00003570 00 00 00 00 00 2a f0 00 00 00 00 00 00 2b 00 00 |.....*.......+..| +00003580 00 00 00 00 00 2b 10 00 00 00 00 00 00 2b 20 00 |.....+.......+ .| +00003590 00 00 00 00 00 2b 30 00 00 00 00 00 00 2b 40 00 |.....+0......+@.| +000035a0 00 00 00 00 00 2b 50 00 00 00 00 00 00 2b 60 00 |.....+P......+`.| +000035b0 00 00 00 00 00 2b 70 00 00 00 00 00 00 2b 80 00 |.....+p......+..| +000035c0 00 00 00 00 00 2b 90 00 00 00 00 00 00 2b a0 00 |.....+.......+..| +000035d0 00 00 00 00 00 2b b0 00 00 00 00 00 00 2b c0 00 |.....+.......+..| +000035e0 00 00 00 00 00 2b d0 00 00 00 00 00 00 2b e0 00 |.....+.......+..| +000035f0 00 00 00 00 00 2b f0 00 00 00 00 00 00 2c 00 00 |.....+.......,..| +00003600 00 00 00 00 00 2c 10 00 00 00 00 00 00 2c 20 00 |.....,......., .| +00003610 00 00 00 00 00 2c 30 00 00 00 00 00 00 2c 40 00 |.....,0......,@.| +00003620 00 00 00 00 00 2c 50 00 00 00 00 00 00 2c 60 00 |.....,P......,`.| +00003630 00 00 00 00 00 2c 70 00 00 00 00 00 00 2c 80 00 |.....,p......,..| +00003640 00 00 00 00 00 2c 90 00 00 00 00 00 00 2c a0 00 |.....,.......,..| +00003650 00 00 00 00 00 2c b0 00 00 00 00 00 00 2c c0 00 |.....,.......,..| +00003660 00 00 00 00 00 2c d0 00 00 00 00 00 00 2c e0 00 |.....,.......,..| +00003670 00 00 00 00 00 2c f0 00 00 00 00 00 00 2d 00 00 |.....,.......-..| +00003680 00 00 00 00 00 2d 10 00 00 00 00 00 00 2d 20 00 |.....-.......- .| +00003690 00 00 00 00 00 2d 30 00 00 00 00 00 00 2d 40 00 |.....-0......-@.| +000036a0 00 00 00 00 00 2d 50 00 00 00 00 00 00 2d 60 00 |.....-P......-`.| +000036b0 00 00 00 00 00 2d 70 00 00 00 00 00 00 2d 80 00 |.....-p......-..| +000036c0 00 00 00 00 00 2d 90 00 00 00 00 00 00 2d a0 00 |.....-.......-..| +000036d0 00 00 00 00 00 2d b0 00 00 00 00 00 00 2d c0 00 |.....-.......-..| +000036e0 00 00 00 00 00 2d d0 00 00 00 00 00 00 2d e0 00 |.....-.......-..| +000036f0 00 00 00 00 00 2d f0 00 00 00 00 00 00 2e 00 00 |.....-..........| +00003700 00 00 00 00 00 2e 10 00 00 00 00 00 00 2e 20 00 |.............. .| +00003710 00 00 00 00 00 2e 30 00 00 00 00 00 00 2e 40 00 |......0.......@.| +00003720 00 00 00 00 00 2e 50 00 00 00 00 00 00 2e 60 00 |......P.......`.| +00003730 00 00 00 00 00 2e 70 00 00 00 00 00 00 2e 80 00 |......p.........| +00003740 00 00 00 00 00 2e 90 00 00 00 00 00 00 2e a0 00 |................| +00003750 00 00 00 00 00 2e b0 00 00 00 00 00 00 2e c0 00 |................| +00003760 00 00 00 00 00 2e d0 00 00 00 00 00 00 2e e0 00 |................| +00003770 00 00 00 00 00 2e f0 00 00 00 00 00 00 2f 00 00 |............./..| +00003780 00 00 00 00 00 2f 10 00 00 00 00 00 00 2f 20 00 |...../......./ .| +00003790 00 00 00 00 00 2f 30 00 00 00 00 00 00 2f 40 00 |...../0....../@.| +000037a0 00 00 00 00 00 2f 50 00 00 00 00 00 00 2f 60 00 |...../P....../`.| +000037b0 00 00 00 00 00 2f 70 00 00 00 00 00 00 2f 80 00 |...../p....../..| +000037c0 00 00 00 00 00 2f 90 00 00 00 00 00 00 2f a0 00 |...../......./..| +000037d0 00 00 00 00 00 2f b0 00 00 00 00 00 00 2f c0 00 |...../......./..| +000037e0 00 00 00 00 00 2f d0 00 00 00 00 00 00 2f e0 00 |...../......./..| +000037f0 00 00 00 00 00 2f f0 00 00 00 00 00 00 30 00 00 |...../.......0..| +00003800 00 00 00 00 00 30 10 00 00 00 00 00 00 30 20 00 |.....0.......0 .| +00003810 00 00 00 00 00 30 30 00 00 00 00 00 00 30 40 00 |.....00......0@.| +00003820 00 00 00 00 00 30 50 00 00 00 00 00 00 30 60 00 |.....0P......0`.| +00003830 00 00 00 00 00 30 70 00 00 00 00 00 00 30 80 00 |.....0p......0..| +00003840 00 00 00 00 00 30 90 00 00 00 00 00 00 30 a0 00 |.....0.......0..| +00003850 00 00 00 00 00 30 b0 00 00 00 00 00 00 30 c0 00 |.....0.......0..| +00003860 00 00 00 00 00 30 d0 00 00 00 00 00 00 30 e0 00 |.....0.......0..| +00003870 00 00 00 00 00 30 f0 00 00 00 00 00 00 31 00 00 |.....0.......1..| +00003880 00 00 00 00 00 31 10 00 00 00 00 00 00 31 20 00 |.....1.......1 .| +00003890 00 00 00 00 00 31 30 00 00 00 00 00 00 31 40 00 |.....10......1@.| +000038a0 00 00 00 00 00 31 50 00 00 00 00 00 00 31 60 00 |.....1P......1`.| +000038b0 00 00 00 00 00 31 70 00 00 00 00 00 00 31 80 00 |.....1p......1..| +000038c0 00 00 00 00 00 31 90 00 00 00 00 00 00 31 a0 00 |.....1.......1..| +000038d0 00 00 00 00 00 31 b0 00 00 00 00 00 00 31 c0 00 |.....1.......1..| +000038e0 00 00 00 00 00 31 d0 00 00 00 00 00 00 31 e0 00 |.....1.......1..| +000038f0 00 00 00 00 00 31 f0 00 00 00 00 00 00 32 00 00 |.....1.......2..| +00003900 00 00 00 00 00 32 10 00 00 00 00 00 00 32 20 00 |.....2.......2 .| +00003910 00 00 00 00 00 32 30 00 00 00 00 00 00 32 40 00 |.....20......2@.| +00003920 00 00 00 00 00 32 50 00 00 00 00 00 00 32 60 00 |.....2P......2`.| +00003930 00 00 00 00 00 32 70 00 00 00 00 00 00 32 80 00 |.....2p......2..| +00003940 00 00 00 00 00 32 90 00 00 00 00 00 00 32 a0 00 |.....2.......2..| *** 7605 LINES SKIPPED *** From nobody Thu Oct 19 19:23:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHgG4hT4z4xnBj; Thu, 19 Oct 2023 19:23: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 4SBHgG1Z9Mz3cjl; Thu, 19 Oct 2023 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvyfNBDH/9gTFemfqzMs1rzUkCMlHVvHIoAQSQFoU18=; b=FE1JgsJBqQGyT01MqvWANRi10duhjORYp+S1cTavd9Y7g9aTHs6QA96TwCUXGD7rqz7rmB C3NGwzJF/yAf6cPJA7nA42Mw/n3R5GofsNsZr5Jhui0du0lIgykkj3OlD2NWn41SZsgFJ0 K6ymZtwHISfWavnryMO31RmRYoxhPnhYNRLsjEWo9WDw5/98HDD12NGeuCugryGZ2N2U9A U3fjw/2LUlfpqeDpnTocXYuQGwNaXlFzI0maMDHe6RmCKmKTPMJM1MFpKGHQv0GtOqKW5r Z4k9N8x0WjuMwqDKAM8lFaOnLKfebg0GxTIGsDQO8lwAEVVbgrv1n6SYstGzxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697743386; a=rsa-sha256; cv=none; b=AU9SXGR5CAw2n563geII1/x351uJ+XKiYK42J7WELrvVIbSpuhaPZ3KyJ5l4cRqryxUgrY JJ/jq3qZrFMQm4jcSmE+ibbJwKbs6eQWPnpLKjc0id2hv+D03XaBsL9uCXD7yArz5HKpGp YbNMnuB+pVp5TsLINRYHbDQ80SjCg4gZEl0jB/+sQjXKii1qNNAN4JXxZ5HnW5NYPMH9Sv +dBhy7/9YpqTfcuP3mt7tUkw5D/0Fr/0BLuPBE8aJTw3LeJL4MdUjx06tH9kuKDbfdH1+U 0ha35NvzTlPP7lJkHKfNdGYPhrQ0TbUdpztFaDpZXpoqKx04YAxyYX+Su38izA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697743386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bvyfNBDH/9gTFemfqzMs1rzUkCMlHVvHIoAQSQFoU18=; b=GaqSdcy/+bRCVJY95C9NUbtwIRvpTt68WSzo41bdo2I7oxuRZ+4tWPAAinDbM+Hg1uvBtk YGPLVRpVp4mmUzRTvnbn4ec3JNBHekvVE+RMPFMVKMED5P2Exi1gBnht4JufyKAmmQvhpm Z/s8RKb0+8ibX7ginXFqkbCqzUqwU/S3uNskQhkF3th7UU9+2wOwk1BScDLDkiI8WbLLwt GAOoxceOMV+ABNcE9eh44FoNmAMYDogmdftUivdqdXf7l7TC+TRM4C/C/KJj+CL8Y4kDOo fOLdqP6yhFDEGkKTmgcj+2TixL+Z7F5kZ1zmuvreIDs80d16fxwSle6K5IScAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHgG0RBWz12bh; Thu, 19 Oct 2023 19:23: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 39JJN65C076783; Thu, 19 Oct 2023 19:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJN5HL076780; Thu, 19 Oct 2023 19:23:05 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:23:05 GMT Message-Id: <202310191923.39JJN5HL076780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 84b71a48ea41 - releng/14.0 - Remove $FreeBSD$: one line sh-pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 commit 84b71a48ea415e35aad3bbc8c20f137ed4d0dd79 Author: Jose Luis Duran AuthorDate: 2023-10-18 15:24:00 +0000 Commit: Warner Losh CommitDate: 2023-10-19 18:37:52 +0000 Remove $FreeBSD$: one line sh-pattern Remove the $FreeBSD$ pattern added to the tests, as well as fixing the mkimg_test.sh script to stop adding it when we rebase the tests. Reviewed by: imp, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/870 (cherry picked from commit 3b5c9845727a1b95098379f66223525e85e8a73f) (cherry picked from commit 9ed4f43bc4c39dc5ed2ce1bf6003e4dcb4160bfc) Approved-by: re (cperciva) --- usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex | 1 - usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex | 1 - usr.bin/mkimg/tests/mkimg_test.sh | 4 +--- 29 files changed, 1 insertion(+), 31 deletions(-) diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex index 01ceaae1963c..0de167c0e198 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex index 25e961888b80..bd8601eccc50 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex index 1ff8880a897b..35b354c7310b 100644 --- a/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex index 857c7ea3e4f0..796166f430ee 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 42 f0 00 |....Wi2k.....B..| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex index 76e76c3155c9..93b291550be0 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex index 044e0bc66181..51da710db535 100644 --- a/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-1x1-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex index ae764c000ae7..ab899b3e5ec2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 a0 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex index 7f79015b561f..a2d342d06a42 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex index 32fb00bc17cb..dae6b78a65f8 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex index c3b9496e2870..0103906c9fa2 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex index 6b4ec6c575d6..36210d5dd44d 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex index aadd5841a58e..4d4542d9a686 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex index 2a44596b10fe..bf6ba8b9560e 100644 --- a/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-4096-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex index 69bed4ff417c..510bbf80e208 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 01 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 42 90 00 |.............B..| 00000020 0c 09 00 00 00 00 00 00 00 00 00 00 00 00 10 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex index 7605a6561ee2..9a12f90cb5af 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.qcow2.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 51 46 49 fb 00 00 00 02 00 00 00 00 00 00 00 00 |QFI.............| 00000010 00 00 00 00 00 00 00 10 00 00 00 00 00 43 00 00 |.............C..| 00000020 00 00 00 00 00 00 00 01 00 00 00 00 00 01 00 00 |................| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex index 0d69daf7d37a..b464168daaa4 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.raw.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex index 31451cfb320e..94fbb99cbdb9 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhd.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 63 6f 6e 65 63 74 69 78 00 00 00 02 00 01 00 00 |conectix........| 00000010 00 00 00 00 00 00 02 00 01 23 45 67 2a 69 6d 67 |.........#Eg*img| 00000020 00 02 00 00 57 69 32 6b 00 00 00 00 00 7d 82 00 |....Wi2k.....}..| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex index dbaed6ce1606..3ee432909549 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdf.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a |B.B.B.B.B.B.B.B.| * 000001b0 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 42 0a 00 00 |B.B.B.B.B.B.B...| diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex index cde7a4953009..1aef760fa90a 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vhdx.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 76 68 64 78 66 69 6c 65 00 00 00 00 00 00 00 00 |vhdxfile........| 00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * diff --git a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex index 2ec42edb497d..8311d98ee9c0 100644 --- a/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex +++ b/usr.bin/mkimg/tests/img-63x255-512-gpt.vmdk.hex @@ -1,4 +1,3 @@ -# $FreeBSD$ 00000000 4b 44 4d 56 01 00 00 00 03 00 00 00 00 28 00 00 |KDMV.........(..| 00000010 00 00 00 00 10 00 00 00 00 00 00 00 01 00 00 00 |................| 00000020 00 00 00 00 01 00 00 00 00 00 00 00 00 02 00 00 |................| diff --git a/usr.bin/mkimg/tests/mkimg_test.sh b/usr.bin/mkimg/tests/mkimg_test.sh index 74680c5d2be7..7c6593b219ef 100755 --- a/usr.bin/mkimg/tests/mkimg_test.sh +++ b/usr.bin/mkimg/tests/mkimg_test.sh @@ -86,9 +86,7 @@ mkimg_rebase() fi if test $update = yes; then - # Prevent keyword expansion when writing the keyword. - (echo -n '# $'; echo -n FreeBSD; echo '$') > $baseline - cat $result >> $baseline + cat $result > $baseline fi rm $image $result _tmp-* From nobody Thu Oct 19 19:36:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBHz56Vnvz4xnmZ; Thu, 19 Oct 2023 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBHz561fqz3f3S; Thu, 19 Oct 2023 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1C9BNi73wMUFG+Mx/bYQffdMvV6xvlfJItwosyT2l8=; b=FxD0pgsTvKz/rCA2mYEiQeeU8e/kzXJ+1SWa7LCxcspVRIODFn13QQ182T0gHDhGufGZb/ Y8GcnifMxbKE4QOXCo50VAYHyJCKk305B3+ImUisJko6CZi1yB9HpcjRqqqSngzioOJwJq WqO9AXKDtCzv2H7BGjX/E5fjJQTMrwr2fk1SSSxR3nFhYbGFCnQvIppgF73Myn+/7iu4JJ 77Ko9HX8ix1qT+UzquytmM6SaOmTGotjYMZZHBHqXVOZ8tzSLGZuEPnaQiTiqsjLltSxow a9X2jH8OHA0QAazhDWgzplcEfJgNh5f5cKOMNkZwHObcFndNU24dnvY6UEb+gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697744209; a=rsa-sha256; cv=none; b=oYz9T9sjc6yvzrdiohshtZsJd8dTgCZkoBVk5Kw0YDRyC6RfkevQdLVawWBozUpDuSKvSL W3aGEG8owCwVAIvy+PscYaTMk1SAhdPOeZcFHuExwArDA38n2Kdr2no560vQmqd49OeCgx 5TUehd4fnDlUAIWZ5xMRDxd768Nzb2JRCzhiE2myXyQEnv3xNqpAHAfVyBpN0dLNqkD7Ji uLsR5INVJ3XnIn6i2CgS0R6Y//xQ3sRM88YyK72fEpZmVq1qLZTAFRC0x5Sht2ETDe4BTZ gHi7//UYMvEWR6+FJZ2y1MEUXxBP2i4ArbbcQo5s/qhkFVZB91A8W+CAjBb0YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i1C9BNi73wMUFG+Mx/bYQffdMvV6xvlfJItwosyT2l8=; b=rdwNMuQI6+UyWNVFD/Io3wqUjICDduuAmCLVNrAXVl0E9aSLLS5NLAe2HIHlRMsQ6Bb52X IbtX+jvHYDY8Jncu5IcX76U0o0osFPaOvBzhD7vJPZpBo+A7zJTjmIBOFfD89bM+flbwrZ 6Buxf0Wz0Xq62aYyvvQI1g7ea6pLq6+EhAY5tFD4BfP0PR47NAC0vbi5mihBOXJ/ebwOUh +nay8ry4PFHBvhgI0BIp10qCS5iL0Li/68yuK+kG60N89bfV/fTsg4xx2CU/5v9K4aIdNo jojtjPkje8gWSd7z/Es6HhqosKLxeGb/fcLFOyEFQ+yp/+Ju5IHX8P132qU9ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBHz5545Lz134H; Thu, 19 Oct 2023 19:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JJanw9094349; Thu, 19 Oct 2023 19:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJaniG094346; Thu, 19 Oct 2023 19:36:49 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:36:49 GMT Message-Id: <202310191936.39JJaniG094346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: f300335d9aeb - main - nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f300335d9aebf2e99862bf783978bd44ede23550 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f300335d9aebf2e99862bf783978bd44ede23550 commit f300335d9aebf2e99862bf783978bd44ede23550 Author: Rick Macklem AuthorDate: 2023-10-19 19:35:35 +0000 Commit: Rick Macklem CommitDate: 2023-10-19 19:35:35 +0000 nfsd: Fix NFSv4.1/4.2 Claim_Deleg_Cur_FH When I implemented a test patch using Open Claim_Deleg_Cur_FH I discovered that the NFSv4.1/4.2 server was broken for this Open option. Fortunately it is never used by the FreeBSD client and never used by other clients unless delegations are enabled. (The FreeBSD NFSv4 server does not have delegations enabled by default.) Claim_Deleg_Cur_FH was broken because the code mistakenly assumed a stateID argument, which is not the case. This patch fixes the bug by changing the XDR parser to not expect a stateID and to fill most of the stateID in from the clientID. The clientID is the first two elements of the "other" array for the stateID and is sufficient to identify which client the delegation is issued to. Since there is only one delegation issued to a client per file, this is sufficient to locate the correct delegation. If you are running non-FreeBSD NFSv4.1/4.2 mounts against the FreeBSD server, you need this patch if you have delegations enabled. PR: 274574 MFC after: 2 weeks --- sys/fs/nfsserver/nfs_nfsdserv.c | 10 ++++++++-- sys/fs/nfsserver/nfs_nfsdstate.c | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 7d3ebc683d16..3daee65ab83a 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3000,12 +3000,18 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, */ NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); claim = fxdr_unsigned(int, *tl); - if (claim == NFSV4OPEN_CLAIMDELEGATECUR || claim == - NFSV4OPEN_CLAIMDELEGATECURFH) { + if (claim == NFSV4OPEN_CLAIMDELEGATECUR) { NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID); stateid.seqid = fxdr_unsigned(u_int32_t, *tl++); NFSBCOPY((caddr_t)tl,(caddr_t)stateid.other,NFSX_STATEIDOTHER); stp->ls_flags |= NFSLCK_DELEGCUR; + } else if (claim == NFSV4OPEN_CLAIMDELEGATECURFH) { + /* Fill in most of the stateid from the clientid. */ + stateid.seqid = 0; + stateid.other[0] = clientid.lval[0]; + stateid.other[1] = clientid.lval[1]; + stateid.other[2] = 0; + stp->ls_flags |= NFSLCK_DELEGCUR; } else if (claim == NFSV4OPEN_CLAIMDELEGATEPREV || claim == NFSV4OPEN_CLAIMDELEGATEPREVFH) { stp->ls_flags |= NFSLCK_DELEGPREV; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index c73840277022..da57ebde7a52 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -2568,6 +2568,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2578,8 +2582,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || @@ -2830,6 +2834,10 @@ tryagain: /* * For Delegate_Cur, search for the matching Delegation, * which indicates no conflict. + * For NFSv4.1/4.2 Claim_Deleg_Cur_FH only provides + * the clientid, which is the first two "other" elements + * for the stateid. This should be sufficient, since there + * is only one delegation per client and file. * An old delegation should have been recovered by the * client doing a Claim_DELEGATE_Prev, so I won't let * it match and return NFSERR_EXPIRED. Should I let it @@ -2840,8 +2848,8 @@ tryagain: (((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0) || stateidp->seqid == stp->ls_stateid.seqid) && - !NFSBCMP(stateidp->other, stp->ls_stateid.other, - NFSX_STATEIDOTHER)) + stateidp->other[0] == stp->ls_stateid.other[0] && + stateidp->other[1] == stp->ls_stateid.other[1]) break; } if (stp == LIST_END(&lfp->lf_deleg) || From nobody Thu Oct 19 19:47:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBJCl4952z4xpPk; Thu, 19 Oct 2023 19:47: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 4SBJCl2bxRz3g9m; Thu, 19 Oct 2023 19:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrvjqynIbY7Vudax4LNCNQTNTImLYBJjLma8ezEmq1s=; b=nCcMaJrx/CbR8ihsAKztTEnXa1bkXEXvCqVv5wt8BhXQTX+G1VnRMe65dlSesFSH1xZ7Ao QG7d5wrK1Ak30fHEL0Qj8SccHO9UKcpQaZv7xtzuXv96PXb4Iz4yJRp0KP4WPuV9Lx1MQA g53loyinN0HN+90qdcpZylLEXA1vnk36/1Cngo54WJALmz0O+t71wAF9gytR7/pgOMNbfp zsDWhHZDGQnZZ6gELSxjXi8qTPk1O9idR0fgAsDP0CL+ANUEsb5/hMSYFKsNGVaGLf9cCC JvJ78NebyWmwSjjW4VU3evdt/BH3Ss/xzse0zBBUF7R3YceNjSSeC/L0Mbuj0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697744867; a=rsa-sha256; cv=none; b=YANlBSiN+OYEpdZEkwpkM2Ew/NvNvBMGD7qTn2OkSHV9Vy/04srBuBZoIRD9+0T7chlh1y Iq/0FL90OB8l6aXyjzwvgHpMwjk2UQ6u69DurqrXUmza4DseeRqJk6/9NkaiL8IXCH+mgC TamI1AiWmzLHzTYkwKLPM31XBbiIvVurWekZsO41+gyCpSPy1d8Ouzi+So1WypoCl7C/w8 IabRi+9Q4Jjyfr2Z9s0/VAx2p2I7JANcBZlpdLqZwdtWQ+SlqRpWv5YT8IBhwCMvIWP+Fo j2cKneQnvsE4amUYT8a3EJgM21zk/JXKp1GrAQwF63Qa3jFINikygmKIJj0uEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697744867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrvjqynIbY7Vudax4LNCNQTNTImLYBJjLma8ezEmq1s=; b=aq9UlQxBSZWv4mM7OSXDp3pl9tqc29sLS4+vbXhkHuUm9WLnv5XDCIhHIjw7DDdniW9c45 ktF7NzyhE6jTjcI8lYGtaUbNQk0STO6PQnnrohUIJrWvIXuOtxzoB04Z7A1BMdTia6MzmA mGLyotnjCEtVTMXdSZGowbBGRBywXxREg4qcSifWtv6L8M3FHD1ssO8QdEbnwwI81goefa MJ6wULktKlIRwG0buCkAsexml6OJ9id95NsMcNeW1DzWHptSXBUIqv4iqdYp52rSfkUUqU vu5Yv5ho9TdNvNMFaeBLeCnHwQwGkmCQm+mu47YR54RwXFaJb+p+544bK/LYSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBJCl1V3Sz131f; Thu, 19 Oct 2023 19:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JJllFm010876; Thu, 19 Oct 2023 19:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JJllgc010873; Thu, 19 Oct 2023 19:47:47 GMT (envelope-from git) Date: Thu, 19 Oct 2023 19:47:47 GMT Message-Id: <202310191947.39JJllgc010873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bfbb28f3b1b6 - stable/14 - bsdinstall partedit: Apply changes from scripted installs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bfbb28f3b1b659805364eea580033b4b3afcc0eb Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfbb28f3b1b659805364eea580033b4b3afcc0eb commit bfbb28f3b1b659805364eea580033b4b3afcc0eb Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-19 18:59:57 +0000 bsdinstall partedit: Apply changes from scripted installs I got a check inverted in a previous cleanup commit and as a result partedit was only applying GEOM changes (and generating an /etc/fstab) if it got an error reading the current GEOM mesh. Instead, it needed to do those actions if it succeeded in reading the mesh. The lack of /etc/fstab meant that bsdinstall mount didn't mount anything in a scripted install. PR: 273723 Reported by: Andrey Fesenko Reported by: Michal Nowak Reviewed by: cognet, brooks Fixes: 230990991965 bsdinstall: Handle errors from geom_gettree. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42236 (cherry picked from commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f) --- usr.sbin/bsdinstall/partedit/partedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 6579c22f6068..3c5f552a935c 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -215,7 +215,7 @@ main(int argc, const char **argv) if (prompt == NULL) { error = geom_gettree(&mesh); - if (error != 0) { + if (error == 0) { if (validate_setup()) { error = apply_changes(&mesh); } else { From nobody Thu Oct 19 20:03:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBJYN4y3Gz4xpvC; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@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 4SBJYN4HFlz4F7X; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697745784; 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=z5VcjUBoMMWpNWBCIUAIrmxZq8e9OwIxn1dNsA7IlIY=; b=RSlI6EcPaB9BKNCugaaHEDFw6aRMkqTxLy6C4DB+aVoiL8sIHtE0qpgkuwjIGzPCHhNAeq 5Nue9FXr3FE3Ju+8suD8PQh87/o4oL9pyASL/uITpyA0Uc6jIfkrnLJn3cTZ9cwHBHFVHL VAsYyjVuEV0672dxpCGuScL7AG2tRKY91CuFP35PA7y0Sh1vMG4HXhKmoBPfhR/8a7hdvT aQks9zX5CIBCk2+S1aPfErNjkwSD1mT1j77ZY7eJ7TH1kSM0W8ZClQC0RQmiQxdv+CNVpz E5l9MMRVXUEFL1k5JxChiyxRkZLMzIWRFal/7uSqiQQigdfs1PU4fBuYPtRh5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697745784; a=rsa-sha256; cv=none; b=MFwgC7AD5ffZjOTWwbexia3ICr4R7aECeEOIHQME+3p4FbuA9+rciBYwttpT0CWPqjvFB1 ss/OmTxBPtz3JQ8pATff/+11YHaFp+bwQtA3QJrhfbk7GwYkHvV8VYClHL7IM3MqEBrBlJ j10QUUsfbBGSLHZQ3uEj6rZ+vZokeWguLJYrtJiIg/dCua5e0jTGaq6whouIz+XQJNRxGp tbZ5vHs7B+5/FEMYxzKM8nyAr5iMZCTsYvl1yFZfzfFQJGEkCW8LaBal0XFfGva+SwKCny CJBqmcHcbYUAgjtzhqYNl0pNhJEV1e7yibXHETHB6tssnPbVIpgbHRn7JPg1wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697745784; 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=z5VcjUBoMMWpNWBCIUAIrmxZq8e9OwIxn1dNsA7IlIY=; b=k/UVcPUt15p1SjGL9AnbmUkv6n2GDjIXHIKgehoC5Ob3xbiZ42DpiWFB+reHnk3k5LpR2m HSNG1yAfC8pHoIAY3LKy7CWx14kMML6Mhao1LiX0ict1Sx4mnh4ubqLFBqIh3wNCNYo//k jTkm8DR/WWX705gzDPmTg8ruU2QmDwZP/+pOAUaqL6ZWBYDhC1WqaqAAaxvdguxE+e0doz nxvzEqEkm04N9nfHLU/fDRAerwZ2lTslHFLUe7nRdOm/W0qWPino7tr5I01NofThuwhSk1 mKi+oXxwGtRP2HfPRjXHd+/pw66RUy59M0CYLa25hndlT7UyOfuyHnLHzs7ULg== 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 4SBJYN28JRz1C9J; Thu, 19 Oct 2023 20:03:04 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 9F9D28BA4; Thu, 19 Oct 2023 22:03:02 +0200 (CEST) From: Kristof Provost To: Gleb Smirnoff Cc: Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Date: Thu, 19 Oct 2023 22:03:02 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <86D6E74C-3062-4718-816E-07CBA4F2903F@FreeBSD.org> In-Reply-To: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_=" --=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_= Content-Type: text/plain; format=flowed On 19 Oct 2023, at 18:14, Gleb Smirnoff wrote: > On Thu, Oct 19, 2023 at 12:37:39PM +0000, Kristof Provost wrote: > K> +++ b/sys/netinet/ip_var.h > ... > K> +/* pf specific mtag for divert(4) support */ > K> +enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; > K> +struct pf_divert_mtag { > K> + uint16_t idir; // initial pkt direction > K> + uint16_t ndir; // a) divert(4) port upon initial diversion > K> + // b) new direction upon pkt re-enter > K> +}; > > This can be written as: > > typedef enum { > PF_DIVERT_MTAG_DIR_IN = 1, > PF_DIVERT_MTAG_DIR_OUT = 2, > } pf_mtag_dir; > struct pf_divert_mtag { > pf_mtag_dir idir; /* Initial packet direction. */ > union { > pf_mtag_dir ndir; /* New direction after re-enter. > */ > uint16_t port; /* Initial divert(4) port. */ > }; > }; > > The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN > instead > of 1 when looking at a structure. And compilation time failure if > anybody sets > it to a wrong value. Using "port" instead of "ndir" when assigning a > port > improves readability of code. > > This will grow structure from 4 bytes to 8, as enum is always an int. > However, > uma allocator backing m_tag_alloc() will allocate same amount of > memory. > Something like this? diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ad95a1ce0d76..78ca36fc2a0f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming) (((struct ipfw_rule_ref *)(mtag+1))->info)); } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; - nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + nport = htons(((struct pf_divert_mtag *)(mtag+1))->port); } else { m_freem(m); return; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8c687682af9..0f3facc54d4e 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); /* pf specific mtag for divert(4) support */ -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +__enum_uint8_decl(pf_mtag_dir) { + PF_DIVERT_MTAG_DIR_IN = 1, + PF_DIVERT_MTAG_DIR_OUT = 2 +}; struct pf_divert_mtag { uint16_t idir; // initial pkt direction - uint16_t ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter + union { + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter + uint16_t port; /* Initial divert(4) port */ + }; }; #define MTAG_PF_DIVERT 1262273569 diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a6c7ee359416..1cd8412193dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8022,7 +8022,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); if (mtag != NULL) { - ((struct pf_divert_mtag *)(mtag+1))->ndir = + ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : Best regards, Kristof --=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_= Content-Type: text/html Content-Transfer-Encoding: quoted-printable

On 19 Oct 2023, at 18:14, Gleb Smirnoff wrote:

On Thu, Oct 19, 2023 at 12:37:39PM = +0000, Kristof Provost wrote:
K> +++ b/sys/netinet/ip_var.h
=2E..
K> +/* pf specific mtag for divert(4) support */
K> +enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 };
K> +struct pf_divert_mtag {
K> + uint16_t idir; // initial pkt direction
K> + uint16_t ndir; // a) divert(4) port upon initial diversion
K> + // b) new direction upon pkt re-enter
K> +};

This can be written as:

typedef enum {
PF_DIVERT_MTAG_DIR_IN =3D 1,
PF_DIVERT_MTAG_DIR_OUT =3D 2,
} pf_mtag_dir;
struct pf_divert_mtag {
pf_mtag_dir idir; /* Initial packet direction. */
union {
pf_mtag_dir ndir; /* New direction after re-enter. */=
uint16_t port; /* Initial divert(4) port. */
};
};

The benefit is that in the debugger you will see PF_DIVER= T_MTAG_DIR_IN instead
of 1 when looking at a structure. And compilation time failure if anybody= sets
it to a wrong value. Using "port" instead of "ndir" when assigning a port=
improves readability of code.

This will grow structure from 4 bytes to 8, as enum is al= ways an int. However,
uma allocator backing m_tag_alloc() will allocate same amount of memory.<= /p>

Something like this?

di=
ff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index ad95a1ce0d76..78ca36fc2a0f 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming)
                    (((struct ipfw_rule_ref *)(mtag+1))->info));
        } else if ((mtag =3D m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) !=3D=
 NULL) {
                cookie =3D ((struct pf_divert_mtag *)(mtag+1))->idir;
-               nport =3D htons(((struct pf_divert_mtag *)(mtag+1))->n=
dir);
+               nport =3D htons(((struct pf_divert_mtag *)(mtag+1))->p=
ort);
        } else {
                m_freem(m);
                return;
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index a8c687682af9..0f3facc54d4e 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -328,11 +328,17 @@ extern int        (*ip_dn_ctl_ptr)(struct sockopt *=
);
 extern int     (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *);

 /* pf specific mtag for divert(4) support */
-enum { PF_DIVERT_MTAG_DIR_IN=3D1, PF_DIVERT_MTAG_DIR_OUT=3D2 };
+__enum_uint8_decl(pf_mtag_dir) {
+       PF_DIVERT_MTAG_DIR_IN =3D 1,
+       PF_DIVERT_MTAG_DIR_OUT =3D 2
+};
 struct pf_divert_mtag {
        uint16_t idir;  // initial pkt direction
-       uint16_t ndir;  // a) divert(4) port upon initial diversion
-                       // b) new direction upon pkt re-enter
+       union {
+               __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon=
 initial diversion
+                               // b) new direction upon pkt re-enter
+               uint16_t port;  /* Initial divert(4) port */
+       };
 };
 #define MTAG_PF_DIVERT 1262273569

diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index a6c7ee359416..1cd8412193dc 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -8022,7 +8022,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, str=
uct mbuf **m0,
                mtag =3D m_tag_alloc(MTAG_PF_DIVERT, 0,
                    sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO);
                if (mtag !=3D NULL) {
-                       ((struct pf_divert_mtag *)(mtag+1))->ndir =3D
+                       ((struct pf_divert_mtag *)(mtag+1))->port =3D
                            ntohs(r->divert.port);
                        ((struct pf_divert_mtag *)(mtag+1))->idir =3D
                            (dir =3D=3D PF_IN) ? PF_DIVERT_MTAG_DIR_IN :

Best regards,
Kristof

--=_MailMate_C0B0683C-C6CE-412C-88A4-DEEE8300C497_=-- From nobody Thu Oct 19 20:34:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBKFD71zTz4xrPW; Thu, 19 Oct 2023 20:34:08 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4SBKFD4zyRz4HDk; Thu, 19 Oct 2023 20:34:08 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id EC3FB5B05E; Thu, 19 Oct 2023 13:34:06 -0700 (PDT) Date: Thu, 19 Oct 2023 13:34:06 -0700 From: Gleb Smirnoff To: Kristof Provost Cc: Igor Ostapenko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fabf705f4b5a - main - pf: fix pf divert-to loop Message-ID: References: <202310191237.39JCbdXp094554@gitrepo.freebsd.org> <86D6E74C-3062-4718-816E-07CBA4F2903F@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86D6E74C-3062-4718-816E-07CBA4F2903F@FreeBSD.org> 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:27348, ipnet:162.251.186.0/24, country:US] X-Rspamd-Queue-Id: 4SBKFD4zyRz4HDk On Thu, Oct 19, 2023 at 10:03:02PM +0200, Kristof Provost wrote: K> Something like this? ... K> --- a/sys/netinet/ip_var.h K> +++ b/sys/netinet/ip_var.h K> @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt K> *); K> extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); K> K> /* pf specific mtag for divert(4) support */ K> -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; K> +__enum_uint8_decl(pf_mtag_dir) { K> + PF_DIVERT_MTAG_DIR_IN = 1, K> + PF_DIVERT_MTAG_DIR_OUT = 2 K> +}; K> struct pf_divert_mtag { K> uint16_t idir; // initial pkt direction K> - uint16_t ndir; // a) divert(4) port upon initial diversion K> - // b) new direction upon pkt re-enter K> + union { K> + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon K> initial diversion K> + // b) new direction upon pkt re-enter K> + uint16_t port; /* Initial divert(4) port */ K> + }; K> }; idir should also be __enum_uint8(pf_mtag_dir) or a typedefed type for brevity. -- Gleb Smirnoff From nobody Thu Oct 19 20:43:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBKRZ48Tvz4xrmf; Thu, 19 Oct 2023 20:43: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 4SBKRZ3d0Yz4Hf9; Thu, 19 Oct 2023 20:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697748186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hlpmzCo2EplzHATMqhVqTohJTPg7kabeiXltyWkutg=; b=BDxaDwVa68hSXVjLL9zaT8OPs+SltakSmOMEkSJphSGrb8FjO97aIidP51Uu6D5ipcP9gT gcSElDqGWNKct2eGnw4Q5tsjwrjHto+t9n+vCZESSriT50fYBkEu7MvELDAyr/7YoMR8fO 5AHmg4Oq+tBrUgEjWXu7xI7+EX+5FH96sNo4ZBxFYHj2u0Szf51NJSfVucMAC7f0DogGhp 6lefN/wtU1M7xolRZX84x5WQsF/gIVDPbURY3q5IPgDWUD5qEuz8xyRGmgv7t1B5yT84zX fQlQq2cgsdVTSG15CPAh4EWds6x9efKDSoleE91iXpiqBkxKUvsSRVIMZMCDxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697748186; a=rsa-sha256; cv=none; b=vB18YPA/oz5W9Kw+KK+J6SSU39Y1/MX9nq181rB+ELgwpVZDoUOUkaLT8jnxuH0ce8FT7l W1V3tfKBhWK85v69VO4ndyIJyqMFrvY40DC7rF5GsmppFlL8nGp4A+mYkDzKpcaalFOGFl FOiWWlY7GPjd/5fQ5OKCXOKliNE3ictLVYJF3i2wRACX8w9Oc0E+SO9p/Qn6UDlk9G31+0 uYq96VIdSsUBVm+mcNQ+LAuzV4rnf9qc4s2T0jcOtIKe6ZE/AixNBWSeldObcEPCdfDE9I 05pYGpu2Pb3u4sv25+0VREFLLg+oGTfZrER0gX9RVSyQr6EJbK9JMFKNcXhT6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697748186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hlpmzCo2EplzHATMqhVqTohJTPg7kabeiXltyWkutg=; b=vpXO0yTxo7C5TmfEVpAUpCg5sQsFWNXxU8Go4FetjkAuBLgNbPD6OWMpJbm52769nOfCV5 +ZDZ/+S+1eil+DQP9qN3U3vf4xVh+3AIKkfeIX6zY9SltsQeP9rK3h8o1tmVqDLuZ6VA2W i6bYSUHT/3QoZzJzO8CVtTaQ8jRb3ZFBvmvEn5k+OBTGhHbgDlw+4y7pPF9iS2Bn9T92qm 6pzrTeFNEV50D1ZaRxNSNOZBMPrQeNVZZEumJ44EqiY6erR5/RFD91Hz2vHznyUjsm6ZDz QVJgE/0v0aDcOJ2VwLzGahYHlGSuEDtOyI/F/57iBm1rnPwh7jjCcyEVbcwEFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBKRZ2kMXz14bJ; Thu, 19 Oct 2023 20:43: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 39JKh6PD009389; Thu, 19 Oct 2023 20:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JKh6mq009386; Thu, 19 Oct 2023 20:43:06 GMT (envelope-from git) Date: Thu, 19 Oct 2023 20:43:06 GMT Message-Id: <202310192043.39JKh6mq009386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 929e4723c3f5 - releng/14.0 - bsdinstall partedit: Apply changes from scripted installs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 commit 929e4723c3f5e66dd98fe3f342c6ec393c8eb9a5 Author: John Baldwin AuthorDate: 2023-10-16 22:13:31 +0000 Commit: John Baldwin CommitDate: 2023-10-19 20:42:35 +0000 bsdinstall partedit: Apply changes from scripted installs I got a check inverted in a previous cleanup commit and as a result partedit was only applying GEOM changes (and generating an /etc/fstab) if it got an error reading the current GEOM mesh. Instead, it needed to do those actions if it succeeded in reading the mesh. The lack of /etc/fstab meant that bsdinstall mount didn't mount anything in a scripted install. PR: 273723 Reported by: Andrey Fesenko Reported by: Michal Nowak Reviewed by: cognet, brooks Fixes: 230990991965 bsdinstall: Handle errors from geom_gettree. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42236 (cherry picked from commit 5307bbcc038f878b4b3714f03a2c824a0caeba4f) (cherry picked from commit bfbb28f3b1b659805364eea580033b4b3afcc0eb) Approved by: re (gjb) --- usr.sbin/bsdinstall/partedit/partedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c index 6579c22f6068..3c5f552a935c 100644 --- a/usr.sbin/bsdinstall/partedit/partedit.c +++ b/usr.sbin/bsdinstall/partedit/partedit.c @@ -215,7 +215,7 @@ main(int argc, const char **argv) if (prompt == NULL) { error = geom_gettree(&mesh); - if (error != 0) { + if (error == 0) { if (validate_setup()) { error = apply_changes(&mesh); } else { From nobody Thu Oct 19 21:16:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBL9t19zzz4xskd; Thu, 19 Oct 2023 21:16: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 4SBL9s66DYz4KhW; Thu, 19 Oct 2023 21:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOyDTdeIsmHSNvND4Ez95Tt6BxE9PShgWDCTzVOKqpo=; b=eiRkZzLSr4uNqt5oZzdYSN1r/iWIGn6RDTUoT6IHmGDg5+00hXqYoYrJAQL61dL7xGFN7+ CJA7sIcYbYyJ99aiw+EcFLVh6xw2I1R182vCpWOyr1kp25rWaG67Gn8C/M2tHYoOqs7GHI u2LUv4n7P6j/L+Oug67I99cgQPjERA6Fcg7gmSwpKauJ7qd6x0pvC0likNYMkk8P/1AMy0 LccIs6y1ZrwULjgrn2WHugP08aJeF1+nMiHy50WRXYYj2WndSF3bM+eSkWR7/1Wh0HBizz 0rZRv2UimiwOfi3x1m6VqnKf0chMGG9GJHyMl7q+5B5CnXqKD7SF4ajo1JQ1ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750177; a=rsa-sha256; cv=none; b=bLGPnTmzGL4FH4xEXdtz+lg6cvCJjY8Eg9ZBjaXq0DKhYZEdaUHisepdFD5JMbVu/Fuhhs ZRwcp5pOQlZL2PVmoPNIg+BVgm83zTv/TDgRSly3qD2VZzKKu14elYqp3gbpZH3hWw7yyB sMr3eWg3RsVqFJDEtmAYD12QEzugmgfMlEK9KbfgVz+ouF/vhymmG8U+MSEWdYSku7W9hU c1DWI9xbIq2Kk8mHHrNS4AROFzfUdRA5EZbD1jZ/P9iLLlo2aJVW3Sm6YEVqiTJQdg5J/J P0Aml9UB/JaH5Uq78zdeq2HYI+1xxkSaKdaLho0vHT9kwLXYzTQGhS9pFUnS9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOyDTdeIsmHSNvND4Ez95Tt6BxE9PShgWDCTzVOKqpo=; b=AUxiPLFerusRIlr3OZjv+iEcFYgSo6pKq6g4+NmfOaIvq7a0pvsFz04L/dR02+Lt8gYW3T BPcKOnd5N5DV1iNadjGXwLBEqX4XFav14cT3/MDLKbYsZlFEdoHY6beCQBs92kYIX/HDSm M9xkb2P4y7JSQz63th5lAML5JOI53s7hpm0nuHXxwyptfLPG26xDmhes0eWDNjaTU5PXeY BmRUkvvyOTs2T7DtfE16baRNmrGjYh3i9BpESJLNdgOuqf0Vf0EMLvxDDRZfxYBxgSyXUD ZgJpLHVGECDezCB5B/KKVeS5U7Q8z8fDgeO1IrsZgjERuYggEVLjrotmKPkNuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBL9s54rqz15Td; Thu, 19 Oct 2023 21:16: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 39JLGHub060199; Thu, 19 Oct 2023 21:16:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLGHxX060196; Thu, 19 Oct 2023 21:16:17 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:16:17 GMT Message-Id: <202310192116.39JLGHxX060196@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: 7e02c7074c4c - main - mpi3mr: Move creation of watchdog to interupt config hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7e02c7074c4c6df77b860e0dbcd032a2ea04b98b commit 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b Author: Sumit Saxena AuthorDate: 2023-10-19 21:06:29 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:09:38 +0000 mpi3mr: Move creation of watchdog to interupt config hook Move creation of watchdog process from just before we configure the interrupt config hook to into the config hook itself. This prevents it from racing the config intr hook and doing an extra reset of the card. This extra reset is usually harmless, but sometimes it can prevent discovery of devices if done at just the wrong time. This can lead to no disks being registered in a box full of disks, for example. Starting it later eliminates this race, making discovery reliable. Reviewed by: imp --- sys/dev/mpi3mr/mpi3mr_pci.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d7278e5549e7..4935ac0d519c 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -307,6 +307,7 @@ static void mpi3mr_ich_startup(void *arg) { struct mpi3mr_softc *sc; + int error; sc = (struct mpi3mr_softc *)arg; mpi3mr_dprint(sc, MPI3MR_XINFO, "%s entry\n", __func__); @@ -314,8 +315,16 @@ mpi3mr_ich_startup(void *arg) mtx_lock(&sc->mpi3mr_mtx); mpi3mr_startup(sc); + mtx_unlock(&sc->mpi3mr_mtx); + error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, + &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", + device_get_unit(sc->mpi3mr_dev)); + + if (error) + device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); + mpi3mr_dprint(sc, MPI3MR_XINFO, "disestablish config intrhook\n"); config_intrhook_disestablish(&sc->mpi3mr_ich); sc->mpi3mr_ich.ich_arg = NULL; @@ -443,14 +452,6 @@ mpi3mr_pci_attach(device_t dev) goto load_failed; } - error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, - &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", - device_get_unit(sc->mpi3mr_dev)); - if (error) { - device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); - goto load_failed; - } - sc->mpi3mr_ich.ich_func = mpi3mr_ich_startup; sc->mpi3mr_ich.ich_arg = sc; if (config_intrhook_establish(&sc->mpi3mr_ich) != 0) { From nobody Thu Oct 19 21:24:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLLp6vr2z4xtkF; Thu, 19 Oct 2023 21:24: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 4SBLLp6Lwdz4Lbd; Thu, 19 Oct 2023 21:24:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uS0lEeP0wGPVKiVWjQcWRetVU2rBPManr4Td6XmcxIA=; b=DB76ZD9ex2V8j4+wfnCG3YuAS9g8vaDl+13e/+zbfdVp4FRd54S+6b1L0dSgqxXg8Ndfc8 VjqnWWLS44j4FDzlGuA1vLt3ulmApi0Gk/sKtHkcWdNJI76xtgwTQkDQxRXT82HGpBrQT/ /7yf1fT3Cx5f6fotSY5tMutIS0hqU1J8gMhGAobk36p5mp4sxLS4F+Gx/og8jMMS4k2LUJ 2fHnBKKsuzLpEvsK3bawBSg6RPJX0P9r1n6l4NJCXwGY0alB5PGyKd4ZG0TsweW0rfmEAn Xjz+ONc1Y/6hoJ1TDOIWO2xuOuBMHWDAIUn3Mwx82RyZsCDVRODviQfAMjoF4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750642; a=rsa-sha256; cv=none; b=baTvbx7CS/sEUXJqRmGgTUo/EL7Ysl+PLzO7pLT34lbxpAdnDlvRuuFGFWngmcZdHxOa5F 5a6EdfmBGxsVV26hI/pIQdo04CPTd/KqnQR01YQtilDRNQGayBImbXkGOVqDOOAxlJbBS8 PXY9edZc2uAvZ9svMP9NkGJjUU5ZZC6nkGIO1ld7+5Xqy9z2DdMtvuLSS5/wCbfUcWXa9m 3jXhUku2h22FxXPSOgP5K/5VuGDvchl6anJZoaI8jO4w2dCOrABlR6oXhA6oPpxCg/5R3r RvVL32bNycLkoHzbuTh7GYiHaV88qfwFPxjEJQfw9ZPLTluZAZrDDUtXEY2X9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uS0lEeP0wGPVKiVWjQcWRetVU2rBPManr4Td6XmcxIA=; b=CgPSLOfj+IlmvlT7WRE5rMwMdJOFjv+ozAuTqlan3keYCDE4g5eAMEPFq/wv/dvR1Jypdh 9yqIxa9cyOjZMuA/lZ8pwgTGfziv/TFcbLphvXWi29DlLk8ZcREUxiOmyatXWXZrH+TKAf 4WyCtUxjmswfol/32BtoPm3ogdCOrK4IZ9SKdevtfpGYeUkbYCgq7tmmFg7XaMrnt+rlPl bIhdH1OhZTSzIFbx/ShAb5Nw+ppO3ktCxHzggKc+QVbp/IQyfb8hzapx9EO4du9sq3dgui /5mODOUnxRrKLKAvQBkmoT7dd45Zk3Efvl5xW1y6ymG4MdaK8l3yRc6bzbeuQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLLp5PHkz14dX; Thu, 19 Oct 2023 21:24: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 39JLO2fY076695; Thu, 19 Oct 2023 21:24:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLO22g076692; Thu, 19 Oct 2023 21:24:02 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:24:02 GMT Message-Id: <202310192124.39JLO22g076692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1ad148a68ae7 - stable/14 - smartpqi: Drop spinlock before freeing memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ad148a68ae74f3372b12b6e66fadf5ade384144 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad148a68ae74f3372b12b6e66fadf5ade384144 commit 1ad148a68ae74f3372b12b6e66fadf5ade384144 Author: John F. Carr AuthorDate: 2023-10-19 03:25:31 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:21:11 +0000 smartpqi: Drop spinlock before freeing memory pqisrc_free_device frees the device softc with the os spinlock held. This causes crashes when devices are removed because the memory free might sleep (which is prohibited with spin locks held). Drop the spinlock before releasing the memory. MFC After: 2 days PR: 273289 Reviewed by: imp (cherry picked from commit b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547) --- sys/dev/smartpqi/smartpqi_discovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index 7e084a81cd89..ac37c2233762 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1671,11 +1671,11 @@ pqisrc_free_device(pqisrc_softstate_t * softs, pqi_scsi_dev_t *device) pqisrc_delete_softs_entry(softs, device); DBG_NOTE("Removed memory for device : B %d: T %d: L %d\n", device->bus, device->target, device->lun); + OS_RELEASE_SPINLOCK(&softs->devlist_lock); pqisrc_device_mem_free(softs, device); + } else { + OS_RELEASE_SPINLOCK(&softs->devlist_lock); } - - OS_RELEASE_SPINLOCK(&softs->devlist_lock); - } From nobody Thu Oct 19 21:24:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLLr1mcjz4xt36; Thu, 19 Oct 2023 21:24: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 4SBLLr0Cn2z4LW9; Thu, 19 Oct 2023 21:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wqVbkE9GX95KNC4cr0kPjlWALYCCFDOQJWqpOAZWr0=; b=qM0IIEO4gCcUbP69p+5DCsJmiXqr0FEHYf+n/YJJ68+ucu+MOz+FoSeT7xNL1wTRwWta3E V8Jdj1AkacNm6ImPIV5U+oGXifHRdHZrGmpOskFVUf15xM2wkwSTsJKGoX/lcPEoqs0q9Y HUVe/VdVVjQ4WZ7A2uST2IQoE//UK/l49iTbBDhrNhH+Ehx+6iMnsKLB8i49eWbk2ByFMk rEVtina2CpEDyD+J+4nfHj8Eq4XkR822+zf4Jp95RB7eV3jAEK/TU+X+HJrUdpYvVQ7j63 E6c6HbGxfPe0wJz8Ccpj0xIEb5e3kxVXY+fz25zFfRv74aV8Q3zxEY3HK2yHVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750644; a=rsa-sha256; cv=none; b=o9R8IwdFgJ+7BBsNES63CaXpqOy2xlEnY/nf2uNGayzTM5+5F4jwcz74juwuv1G7td1aP6 tZvVf7cNcXi2drRXI6F9FY4okDmji8XOhGjAAW2JE+obVshTVw8OjSV9hU1yfpKkU+F9vM lGUcDjRbT3Qqwn0C9FE5dIxoV6xAfyIBP4Kb3dv3lCKdI3J8hJ439JntbTEqUenx+Iv/AX iONGVD5Hup/AwU2G5d8SOdgXWkxFFBbP0yReIrAJtRLY9g5ajM64gs9kNxe6Si18/5ZwRa APegXzjV8YWz7x8C2eKtENgL/JgGpqMwZcd4b3LO//BzutWBybViRJi87OGJUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+wqVbkE9GX95KNC4cr0kPjlWALYCCFDOQJWqpOAZWr0=; b=RPPo5IKMzB2PvKvnbRAy5D0ehkOxwIpKanqkERnkr5G1tQ/g0dhqs6lNQqcMhyXX7qU+U2 0MREBekgYemYSq2cRQmOIPN+B6o8rPzKxpzQGkzjI877AV0RXZkRyGGG5h6TXYxO/BfUFp NnWl9UZREScC5su0pwYLjY4470yKoyrhdoiyfRVPWNqYFPxNMdnqlBkDcpwYK03zxDgBoG shKt5JN9FhRhFbJp47goy5aBgzUlEKxAykDh+0YL6E48UUcRMcaD6BhEZah/0ui7I9d7BQ jlq79Epi0OZe8dIsHrWW3BrXN3hekcriCK/ec02/0KTQ7nXBoI4HkNcY6TXWpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLLq6PQyz15f3; Thu, 19 Oct 2023 21:24: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 39JLO3IP076740; Thu, 19 Oct 2023 21:24:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLO3bK076737; Thu, 19 Oct 2023 21:24:03 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:24:03 GMT Message-Id: <202310192124.39JLO3bK076737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 01619a8fafcf - stable/14 - smartpqi: Change alignment for dma tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01619a8fafcfd99d1811b2c14a92bac1a48c6d31 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=01619a8fafcfd99d1811b2c14a92bac1a48c6d31 commit 01619a8fafcfd99d1811b2c14a92bac1a48c6d31 Author: John Hall AuthorDate: 2023-10-19 03:25:32 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:21:11 +0000 smartpqi: Change alignment for dma tags Problem: Under certain I/O conditions, a program doing large block disk reads can cause a controller to crash. Root Cause: The SCSI read request and destination address in the BDMA descriptor is incorrect, causing the BDMA engine in the controller to assert. Fix: Change the alignment for creating bus_dma_tags in the driver from PAGE_SIZE (4k) to 1, which allows the controller to manage it's own address range for BDMA transactions. Risk: Medium Exposure: This reverts a change first made to support NVMe drives on Excalibur. At that time a 4k alignment was necessary. This no longer seems to be the case. PR: 259541 Reported by: Ka Ho Ng Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41619 (cherry picked from commit f07b267d8cc87e88be3c78aa69504b5ebc6571ee) --- sys/dev/smartpqi/smartpqi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index e79a6f0a173f..402841bbf4d6 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -629,8 +629,8 @@ smartpqi_attach(device_t dev) * Create DMA tag for mapping buffers into controller-addressable space. */ if (bus_dma_tag_create(softs->os_specific.pqi_parent_dmat,/* parent */ - PAGE_SIZE, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR,/* lowaddr */ + 1, 0, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ (bus_size_t)softs->pqi_cap.max_sg_elem*PAGE_SIZE,/* maxsize */ From nobody Thu Oct 19 21:24:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLLs1vfRz4xtkV; Thu, 19 Oct 2023 21:24: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 4SBLLs167Cz4LyF; Thu, 19 Oct 2023 21:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfqc8nJi+rcAucZ10vCGyx8YY8dcZm1CJBMa1B8ac/c=; b=s0cIvU6gZAEN1h95XgSffeDyl2bioVa4nzAvVUsdQP7ZEG+GRtQerXx5PMkkqPExrH6QMG xnWzzeHbmznkbyPTNY1PHiM+8SZj5LIKxHrB55lmhgsWp0a6RzHSR1tuGk5SEk3GZtqgkU cEJYk8PEU1vi9vYWO6Q/szmeiXn42vc7pnq2ZgJ4/eu6aLdxa0yk4R79R4IOZlVLA8s+r/ C/XSqGW8RsMvqBhthoeHyLskeKRh/gGoYWE+V1a+ekJlZpVfnLdu/Wb7rHE2nBMAwOIcfE RCgUOQ+8zzIsQlB6GMbRn+vnCV+MgoTCoVpPGasmwI7LU1yDrL1JlacmLvyo6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697750645; a=rsa-sha256; cv=none; b=Ip5KhD66pnJyB1URxhlXFHgmyakKkLT+hwBXZincNSa9WiOU8Zi51qgxiTDJspvp+zAaau NbuQ26wkWgGP+fhqmamnbCTFfy+bxh8doctSX/gdN3m8x+rdtfGbWNOrJryuLANnv9fusN w4AroU+cZkATCVMC6zqba/gQW/XjSgcxecLnR74j2aYBZ8UM1KtTL107vCEScgrXbgZRUn 8dlArTzwONH38gNtuIhp0KkEL53BtT4a2rBQXimi78l0XZzO8Tfz7PceL/4NzV3oXRPAHA z2Lo0zZlSjqzj3asfE/4vbt+y8Np+eCfFrHeEhdFFAr1bc0Cke8DUKw/pEKDAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697750645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfqc8nJi+rcAucZ10vCGyx8YY8dcZm1CJBMa1B8ac/c=; b=U4i7fIdG24Gct874c0cRbjLOgczhysqA0qfAs4u45vpAKSsVuhQpFqVgfPvggz3iB4hct7 YK7gOiaUl+ZEDa2qitVQNTFbmmG2JxFSLEI96au69k33uclKornmR5lG7bugPqYvxae7pq hSZJcP6zxWUhZ6t73ExkaJB1Zk6CylCXYX91lguyyJ4mYeHw2rAIqhgoFp6L5FXIRQayio XGAsiLU+wgkgqF6i2MvhrALNfeuvakO8dngKKKVpRcH8Dt2nROue5YC9x+QxAOJztDYvUA oGB40rLjJliYfWMnrTQXnMd47zNy9RNKwEfwVdeI6jYy3mVtcz1NUJY8QrfsCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLLs059qz15f4; Thu, 19 Oct 2023 21:24: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 39JLO4xH076794; Thu, 19 Oct 2023 21:24:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLO4OL076791; Thu, 19 Oct 2023 21:24:04 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:24:04 GMT Message-Id: <202310192124.39JLO4OL076791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 10bbea2e25ef - stable/14 - mpi3mr: Move creation of watchdog to interupt config hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 10bbea2e25ef95936619b6522bbdeea2317e76a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10bbea2e25ef95936619b6522bbdeea2317e76a5 commit 10bbea2e25ef95936619b6522bbdeea2317e76a5 Author: Sumit Saxena AuthorDate: 2023-10-19 21:15:50 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:21:12 +0000 mpi3mr: Move creation of watchdog to interupt config hook Move creation of watchdog process from just before we configure the interrupt config hook to into the config hook itself. This prevents it from racing the config intr hook and doing an extra reset of the card. This extra reset is usually harmless, but sometimes it can prevent discovery of devices if done at just the wrong time. This can lead to no disks being registered in a box full of disks, for example. Starting it later eliminates this race, making discovery reliable. Reviewed by: imp (cherry picked from commit 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b) --- sys/dev/mpi3mr/mpi3mr_pci.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d7278e5549e7..4935ac0d519c 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -307,6 +307,7 @@ static void mpi3mr_ich_startup(void *arg) { struct mpi3mr_softc *sc; + int error; sc = (struct mpi3mr_softc *)arg; mpi3mr_dprint(sc, MPI3MR_XINFO, "%s entry\n", __func__); @@ -314,8 +315,16 @@ mpi3mr_ich_startup(void *arg) mtx_lock(&sc->mpi3mr_mtx); mpi3mr_startup(sc); + mtx_unlock(&sc->mpi3mr_mtx); + error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, + &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", + device_get_unit(sc->mpi3mr_dev)); + + if (error) + device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); + mpi3mr_dprint(sc, MPI3MR_XINFO, "disestablish config intrhook\n"); config_intrhook_disestablish(&sc->mpi3mr_ich); sc->mpi3mr_ich.ich_arg = NULL; @@ -443,14 +452,6 @@ mpi3mr_pci_attach(device_t dev) goto load_failed; } - error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, - &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", - device_get_unit(sc->mpi3mr_dev)); - if (error) { - device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); - goto load_failed; - } - sc->mpi3mr_ich.ich_func = mpi3mr_ich_startup; sc->mpi3mr_ich.ich_arg = sc; if (config_intrhook_establish(&sc->mpi3mr_ich) != 0) { From nobody Thu Oct 19 21:41:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLkN5svjz4xvWw; Thu, 19 Oct 2023 21:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBLkN5MQYz4Q08; Thu, 19 Oct 2023 21:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIJlqx4jEqZ2JQcY8Vmbl+xM8h4us3hwkJSFQz1DO8o=; b=Ecd0ME2IUshRSpBf7MgUcYe+Q+Ji1ProqWqNoyjzqqdU4MyIs+TaYQw+r1vZQ92UY5pRw7 //ZwmGqv1fPudpWODnU85ndvv1FSDlRLp+lO9mcy/2AKrol4Q99wqWtVfeLrY2hlKwZE+j N2R5gwfYx03e0JpL7X3/noYXVIxJGLS1nCGv/SOE75qfVWdOsVyCfoAdQNpYMSuPIHzdkd H5cRXNWYKp6GXI0q79/YZuASpIkqbDrwqREj/VYnT8xA0LdQ7vZbRcLVawspaYRws6DSVL 2zMEpcZbX6/XyPhI9g+YUyxr3hYzeeeGimKE/FN/JPDj0gWbmJv4c16ZM4WIjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697751660; a=rsa-sha256; cv=none; b=rPxPmZwbKlJMJk94GjxgBG/7ATbBDmqX3LaT0SPtjP1hNOnjQ/jBeztIubp9R9bxOL0h+V FicKuzKz+oj7j+02jNiqlNPiL81eoZeJiL07+ynJ5bXyrwYYZ6iA/sWAv5pkNW0771glOo mSwhwD7csR9HVxEa5msBHBNBYji/jf2QvL9JC7TncJnundNwjhYzcUMIXLCLCHBFilo9GQ FaCJbaFSuLV9VacjWkIXBQ/BYv6SwhyoPYKjpYA2rZijDpzrDHzwY/UPNQJisvhApXQbOf O+kuo2w3zemiCMCIPnfNO3YoQk1rdncmxxgDDWoajafG4CJ35LDWdTt41Scxag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YIJlqx4jEqZ2JQcY8Vmbl+xM8h4us3hwkJSFQz1DO8o=; b=Anmu+o9XjsySDWds6neEJ5BFhm7VnG7FG3YB8XvjykZQPVFnqND3OW328T2SEMoqaR5ZUA 9mAGuh8pKC//o3kFGXh0FIDj8qpI3wFOIfBchSNqTOr1/E6M5dkHdk1V4M+8DoTnweh+SK siOwtJjNliDqQR7qmCN5metbH7qpGnM8eDn3pWQtVgWJYwEQVZf1z11C+O7LmlzUPZPi8+ C0g9WxXHJEiQF71951tW+qjg/xxGy2DGK5KSiuo5CMnJ3ujziraI1plpEmcGzLrR3aNQwM R9eIw7G3sgftEx5X72tZym3PQAMje+URaZWDfsTL/5C9A4eYkrBzRjEGg0FvBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLkN4RHJz15xQ; Thu, 19 Oct 2023 21:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JLf0Xw002595; Thu, 19 Oct 2023 21:41:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLf0Ox002592; Thu, 19 Oct 2023 21:41:00 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:41:00 GMT Message-Id: <202310192141.39JLf0Ox002592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8fe059425a09 - releng/14.0 - smartpqi: Drop spinlock before freeing memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 8fe059425a0919274e2c5b25a6af0568d147518d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8fe059425a0919274e2c5b25a6af0568d147518d commit 8fe059425a0919274e2c5b25a6af0568d147518d Author: John F. Carr AuthorDate: 2023-10-19 03:25:31 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:37:29 +0000 smartpqi: Drop spinlock before freeing memory pqisrc_free_device frees the device softc with the os spinlock held. This causes crashes when devices are removed because the memory free might sleep (which is prohibited with spin locks held). Drop the spinlock before releasing the memory. MFC After: 2 days PR: 273289 Reviewed by: imp (cherry picked from commit b064a4c9eed5b1dd2a40fc4fd2cb7e738b681547) (cherry picked from commit 1ad148a68ae74f3372b12b6e66fadf5ade384144) Approved-by: re (gjb) --- sys/dev/smartpqi/smartpqi_discovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_discovery.c b/sys/dev/smartpqi/smartpqi_discovery.c index 7e084a81cd89..ac37c2233762 100644 --- a/sys/dev/smartpqi/smartpqi_discovery.c +++ b/sys/dev/smartpqi/smartpqi_discovery.c @@ -1671,11 +1671,11 @@ pqisrc_free_device(pqisrc_softstate_t * softs, pqi_scsi_dev_t *device) pqisrc_delete_softs_entry(softs, device); DBG_NOTE("Removed memory for device : B %d: T %d: L %d\n", device->bus, device->target, device->lun); + OS_RELEASE_SPINLOCK(&softs->devlist_lock); pqisrc_device_mem_free(softs, device); + } else { + OS_RELEASE_SPINLOCK(&softs->devlist_lock); } - - OS_RELEASE_SPINLOCK(&softs->devlist_lock); - } From nobody Thu Oct 19 21:41:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLkQ0nk8z4xvLn; Thu, 19 Oct 2023 21:41: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 4SBLkP64bkz4Q0T; Thu, 19 Oct 2023 21:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC6pOcXaRG96ck0lDX2/7aZC3GX6tEth/FjEg4lcSww=; b=NGsfIL0K3QTii0cKf1kOMmdkfgf2fG1uZvG7cIvybNJODPDAHhqYqpmyjFuSbMEAp6cyye oX798Um7QE+7mSNj8RbjW2PGrpv5ZEnfvbFJ4begkqBHU9zVQhIfS9nekN0qRVOE0PQiY1 yU7TF995OIzIUb9/BstofXqUrf9/iJw0hju2xKtUljAJYt/dnITOHQ4F62Y7h579uhxsl6 2etYgqtASp33vifBRok16Rty0OEfYEqCcZLGDbBZc3VsZYX7dBEeBw5vTvuXwbdeCyqDj4 JST2F+1OQE8QYoKS0EWwPdvviGKrMbZK2IaQAdotS4hOc5uCgPTlFLydrvciBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697751661; a=rsa-sha256; cv=none; b=wQ359VjzsWTkBSd82adRshmmonoOtFVi3xWIi/pfbBoqNkh+1kKIZTT+GuRNoFYSRy6aub 5OgVf+RZ3N5cCoMfQmJbksHnHZXKhUHFj5BoCnLITwGS814mfp7NkhcC7mWIh/1E0bLHRo 5qn+yU7Xlo69mDhk75O7PNiZP5clH1IZEmnIcdpASUizOmaj6EzOzusxzR2n9GwyA/vBvR a2cfT4T2UjlS4vJO/BqpPAcR4LJ64rrlMxt7x9ffVwd7g/yD2LVZzkRG9rRwZuH0U4znMF a2wBIy+ZhukpiKWw75/spVYBy9VcEHlDpVt1Xi5YaqjiZHQi/54onOXBiniKGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC6pOcXaRG96ck0lDX2/7aZC3GX6tEth/FjEg4lcSww=; b=kQmoB1q96BA0XMJzmjEcZK4B69sAGBg/YcdCCUZJgITe9wzBc1cE3/yXl9XgkNMrfrfZPK srWVDGAomSeCMkI8qdYFEHJd8kRemiuyX8yKQkUNQDgi/D0ObbuXilTkKmyzZD4PBrhRzU OfipyFKwZP7Oe9XB1f4KF+s3gGUCJFNk/M/4bdnMuBgu6hlKvidbw0X1ivVK/Y5zjztyHj Ur7+Xv2gbnYudrR7s9UfTl7azwOIjGPmAK3OcWjxtedoAoLmF/LmmYJZiO6bLlVvoX1HSi VkJG1jaHUHxePIXsbaRM6gc/E1QJJ27uPIHX9TP27Ry9VshpfTGBFi7S3p3J0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLkP58Pbz15tH; Thu, 19 Oct 2023 21:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JLf1U1002640; Thu, 19 Oct 2023 21:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLf1sY002637; Thu, 19 Oct 2023 21:41:01 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:41:01 GMT Message-Id: <202310192141.39JLf1sY002637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0efd0d6fa7e0 - releng/14.0 - smartpqi: Change alignment for dma tags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 0efd0d6fa7e0d713ea7e4e9a3e3ac7858475f707 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0efd0d6fa7e0d713ea7e4e9a3e3ac7858475f707 commit 0efd0d6fa7e0d713ea7e4e9a3e3ac7858475f707 Author: John Hall AuthorDate: 2023-10-19 03:25:32 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:37:33 +0000 smartpqi: Change alignment for dma tags Problem: Under certain I/O conditions, a program doing large block disk reads can cause a controller to crash. Root Cause: The SCSI read request and destination address in the BDMA descriptor is incorrect, causing the BDMA engine in the controller to assert. Fix: Change the alignment for creating bus_dma_tags in the driver from PAGE_SIZE (4k) to 1, which allows the controller to manage it's own address range for BDMA transactions. Risk: Medium Exposure: This reverts a change first made to support NVMe drives on Excalibur. At that time a 4k alignment was necessary. This no longer seems to be the case. PR: 259541 Reported by: Ka Ho Ng Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41619 (cherry picked from commit f07b267d8cc87e88be3c78aa69504b5ebc6571ee) (cherry picked from commit 01619a8fafcfd99d1811b2c14a92bac1a48c6d31) Approved-by: re (gjb) --- sys/dev/smartpqi/smartpqi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_main.c b/sys/dev/smartpqi/smartpqi_main.c index e79a6f0a173f..402841bbf4d6 100644 --- a/sys/dev/smartpqi/smartpqi_main.c +++ b/sys/dev/smartpqi/smartpqi_main.c @@ -629,8 +629,8 @@ smartpqi_attach(device_t dev) * Create DMA tag for mapping buffers into controller-addressable space. */ if (bus_dma_tag_create(softs->os_specific.pqi_parent_dmat,/* parent */ - PAGE_SIZE, 0, /* algnmnt, boundary */ - BUS_SPACE_MAXADDR,/* lowaddr */ + 1, 0, /* algnmnt, boundary */ + BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ (bus_size_t)softs->pqi_cap.max_sg_elem*PAGE_SIZE,/* maxsize */ From nobody Thu Oct 19 21:41:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLkR1nWZz4xv40; Thu, 19 Oct 2023 21:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBLkR0CXgz4Q97; Thu, 19 Oct 2023 21:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgarciCD37Vz+U0z75ErZ4lQHWnkSCo/HNn8H4JEsx8=; b=potONWHi/wdpbgmpSCWgr/qRBR/aZIoZzGl6hDJdDhpBgVvqZ6CDLAWB68IxavlWIz9JS3 RMnrXO5PSoiE6tHcMefjfNYAtLaT9h1f2xwt7wrYYjvrDPv5eiSBxlZ8UTOVM8UI6TzKfO eXF3BkiNY4WUaPPVmVZ+izyj43CFcgKJj9OQ2dnhkl3p8MCZh5aWllM28XXDp3afQjXqRz quL7ylk1lwWxMS/MWxhgn6zOfiDXBywKD+1gmdF679Ae8/MVoLzwpN4xs1HHyE/bpRTyxO 1GvdF2EOpW69AclaWwkr3oHw8yrqjRQKkcF7P9I5D0cCZMFBc7l+Fe9PvSDN/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697751663; a=rsa-sha256; cv=none; b=P8i3xN+Whj59lIgDfCiNyG3QgmaYP0deJS1klVt3dmn+zSHa1/oP+3x9P03ndYwieq5E5b 92I3pzp10oL4LXzpiF3DUEnXV71gJZXEQ4wDTjmP5XC+TH6XL4+zO+0klV5tImY+X1jHvW weQD/QhxLeKQ8tYHCUykURE+fvRy55jpTSI5LbiKijLFV4G0qglFDYi2m5QDQhPBAiKfom tSNP02m+gLRmsp8/VSG6vIlFm3leycgUuFLCqX7U812ML4V5ix39xzxoHopegYfq8/RswW JdU9OstBtu66fVUYzvE0EnepSE2o6WlhiDEYgYLkXFRzSxcjo2Ti6/cTeiPtnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697751663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bgarciCD37Vz+U0z75ErZ4lQHWnkSCo/HNn8H4JEsx8=; b=st3cKy5jzrLGWeVxde9E03VhjiPSsyNDUmRPpZby09qU8dS4MgrGIcY1Y5DyyDDi5+xd00 BG07h7pj9PwHiAnZKclIlMs1ZxZcYjtKIq0UjHiYmf8gl/BAldwgBC496lESveRzF/SZHG qsMfi8nLstsauomRTD7iKCdorl5vhUAbU9u6GfVvsofthhYzq0ALgigsbRKrIYqJmiwWa1 kdFVUYLM6VCQbKos/5bN1/+Kxg6Jo2h0+6GN8JgfpqFJIgMvNameprIotS94fjohM/xggD al1dDkuuOQcJ9py0d2opwEzIpKaYm5Z1gr7EbjOe/yBwoau3rMi3lfbDeYEhwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLkQ6Qllz15tJ; Thu, 19 Oct 2023 21:41: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 39JLf2U6002698; Thu, 19 Oct 2023 21:41:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLf2fv002696; Thu, 19 Oct 2023 21:41:02 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:41:02 GMT Message-Id: <202310192141.39JLf2fv002696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4c1b67934589 - releng/14.0 - mpi3mr: Move creation of watchdog to interupt config hook List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4c1b679345899a5ba988497bda7585ca15326b60 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1b679345899a5ba988497bda7585ca15326b60 commit 4c1b679345899a5ba988497bda7585ca15326b60 Author: Sumit Saxena AuthorDate: 2023-10-19 21:15:50 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:38:06 +0000 mpi3mr: Move creation of watchdog to interupt config hook Move creation of watchdog process from just before we configure the interrupt config hook to into the config hook itself. This prevents it from racing the config intr hook and doing an extra reset of the card. This extra reset is usually harmless, but sometimes it can prevent discovery of devices if done at just the wrong time. This can lead to no disks being registered in a box full of disks, for example. Starting it later eliminates this race, making discovery reliable. Reviewed by: imp (cherry picked from commit 7e02c7074c4c6df77b860e0dbcd032a2ea04b98b) (cherry picked from commit 10bbea2e25ef95936619b6522bbdeea2317e76a5) Approved-by: re (gjb) --- sys/dev/mpi3mr/mpi3mr_pci.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr_pci.c b/sys/dev/mpi3mr/mpi3mr_pci.c index d7278e5549e7..4935ac0d519c 100644 --- a/sys/dev/mpi3mr/mpi3mr_pci.c +++ b/sys/dev/mpi3mr/mpi3mr_pci.c @@ -307,6 +307,7 @@ static void mpi3mr_ich_startup(void *arg) { struct mpi3mr_softc *sc; + int error; sc = (struct mpi3mr_softc *)arg; mpi3mr_dprint(sc, MPI3MR_XINFO, "%s entry\n", __func__); @@ -314,8 +315,16 @@ mpi3mr_ich_startup(void *arg) mtx_lock(&sc->mpi3mr_mtx); mpi3mr_startup(sc); + mtx_unlock(&sc->mpi3mr_mtx); + error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, + &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", + device_get_unit(sc->mpi3mr_dev)); + + if (error) + device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); + mpi3mr_dprint(sc, MPI3MR_XINFO, "disestablish config intrhook\n"); config_intrhook_disestablish(&sc->mpi3mr_ich); sc->mpi3mr_ich.ich_arg = NULL; @@ -443,14 +452,6 @@ mpi3mr_pci_attach(device_t dev) goto load_failed; } - error = mpi3mr_kproc_create(mpi3mr_watchdog_thread, sc, - &sc->watchdog_thread, 0, 0, "mpi3mr_watchdog%d", - device_get_unit(sc->mpi3mr_dev)); - if (error) { - device_printf(sc->mpi3mr_dev, "Error %d starting OCR thread\n", error); - goto load_failed; - } - sc->mpi3mr_ich.ich_func = mpi3mr_ich_startup; sc->mpi3mr_ich.ich_arg = sc; if (config_intrhook_establish(&sc->mpi3mr_ich) != 0) { From nobody Thu Oct 19 21:52:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBLzH3W4Yz4xwGG; Thu, 19 Oct 2023 21:52: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 4SBLzH33sVz4SCR; Thu, 19 Oct 2023 21:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ROo6vTgwFj70bnBvgJXuIQ7dr0NBkSS1DD+N0ZTwqY=; b=bULQ4G8kP+YUgTd6wxsDtN5IVfPkA8W3kEXyCzb1qrM1eb/j6JQoFV3lfVjC/g3UsqysFG wACK6DGmfyq19/wkj43GrZZYHxHDeaCJ5URdxZbvU66PoFB3Yf+oK9LteONR6TD1o+Lf6j yLRevPvDvcg9re66fsqBqnFtoT13g3u3QM90v1WWeYlpzFSBFf9swiZGfT6JenSPVlG1X3 rg9TFQAUB38MvApwpaAniMi+Sarup2ROLlzOCzgDblMUKBQwMwO6YINRxvPZYW4G3gRkdi OCrYEk78SilQrpowNeYQlmiVIrTRQT/F49AuR/JAd9Gfev7C0Fzjz6tUCryaBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697752331; a=rsa-sha256; cv=none; b=hgmS0i7MDWV54orE/gOOLwIA4V7jESfLxIBMGt2MY6hQdgaT9w5pqXzfYXfhQ7jlPbzJi6 nGKbx3CrAqtaQRX416na6jTl2OFanT/Q2TaAolAappKeyCQre5NFXwmF/j/C4Ffed7pWN3 XgvnHCLH8seU/aFT1YYaYbSy/c69yDQAL2hgImxqxVEMuPH+qZ3As968LxSGQ987OD46d5 7UNnLGISohctS3MCkT2H3ftnJUWYNsU97+2OZEg/aMSJY9JfJ16FgZmeRo5V3jCSzOl9mp J/hzKjCcmvAN2P7gFqldn/UaWKQjy32iHweNZST0eYg7bN5jYyQFS4VMkKwBCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697752331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3ROo6vTgwFj70bnBvgJXuIQ7dr0NBkSS1DD+N0ZTwqY=; b=broXSYZeb3LCQ/iiBuB9sd3dQfZuPJaPP7lwxmQaUKL1WYqfDIO6zh1FGX20TxcnhWMsGA W2Lfk3Dv+hqHo9nJWppfZ0q92hjdBdGfvlDXAK4KzdqhKNcKoSmfI5/ZvI7s2QMhyQW36l ebptyzSck5qpP2m7LWWQurcPI4v6oATV/U3rQjQoHeZ2ti0CWI0kppJDl3YS5S6R2xvHKT cvpAT7KbryymIt1eHJQzK/yNytyXgYNwY5yCUwqksVj5La4pDVMvEwSQvhUXsdDU579t7a mlVlW6LTdjSLdoZn78ApZy7lkOv/WYg5t+AJMLTXtXuPmi8pxp9sjb8VcXnn1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBLzH27KPz15ns; Thu, 19 Oct 2023 21:52: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 39JLqBd0025329; Thu, 19 Oct 2023 21:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JLqBnM025326; Thu, 19 Oct 2023 21:52:11 GMT (envelope-from git) Date: Thu, 19 Oct 2023 21:52:11 GMT Message-Id: <202310192152.39JLqBnM025326@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: b259e74cfd9b - main - Fix Sumit's email address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e commit b259e74cfd9be8a9ffa41a2bf2f3ba05db04430e Author: Warner Losh AuthorDate: 2023-10-19 21:49:05 +0000 Commit: Warner Losh CommitDate: 2023-10-19 21:49:05 +0000 Fix Sumit's email address In my haste to get things in for 14.0, I used the wrong email address for Sumit Saxena. Fix that here so git log is correct. --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 2e4c03966084..b022419e8108 100644 --- a/.mailmap +++ b/.mailmap @@ -14,3 +14,4 @@ Alfonso Gregory <83477269+gAlfonso-bit@users.noreply.githu Jose Luis Duran Val Packett Piotr Paweł Stefaniak +Sumit Saxena From nobody Thu Oct 19 22:45:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBN943yHLz4xy3t; Thu, 19 Oct 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBN943Bvrz4WMq; Thu, 19 Oct 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nuiWdaGui5m2as3dXRRZ1wBZ61FPRihALv5FWmAdzBw=; b=Xob7CfAVjzJc3SU9yF+fWrp0Kvikk5VHKNDmwKQ4S7dm5ixGycwfk+97f01IpHw0/CQKph 9njyGvpbzkFAGSyBim8VS8Rmd9GFE8gJh28BzxziI3s5lBr7u3cuAd2pQwjVc77N4evwyl xg/gPXnWtkqyG18pYbzTbFX8G91PlE41mTkkfGbhd43KrFmazeOL5WExy7quG5K30lEql0 VeChLLzHh7vVMm9zhK46IFlzSRl4M2J90pBDKvnqed5aQsdxRV7zCp/JxDosIKD2nmut4D 7o9tJ8cMry3Qz/gEnW9wsXljBtVbFz8TausJOTKtCYs5wd4WEBArEG8XS4PwJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697755544; a=rsa-sha256; cv=none; b=pHWcwLfeyPbOOdamWcH8wp9siaeO+DaI5mUbXIfeBSjf53sHMJb6CynJe1o8RBAXLJQma7 D0AXCkB0ur3gUn9SWtHUTNxEW3QDBIcQDtCYejaEDJUBGMi2C9artFdHueS5Q6ELDSGwJ9 S/Yv9fLjXu/7Kf/IBDTPLjrrrJchWgdw+PPxf+I+uISu/aezacKDE0CnpJHeKVGiDqM4Lw e8HLQraYGize/bKUzAZ9eSOvmy/URXoo2G97SHyMs3z9zg7E9TgMpTmdOMkD4HXIzbq6Kz aFULNc/tRBiIS9Mhuz9d/HhsVNjVD3nlLu8JIQXAYuUKtXG4KMstv4Mf2HgxJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nuiWdaGui5m2as3dXRRZ1wBZ61FPRihALv5FWmAdzBw=; b=B4jeZ9ZKXfYluFoRGNoMCUurpurjbAlb6sKML/BXt/Mx6G7vbxTSSCVXeSpvU6U9roBKle H6JWkqtDV5jp4KHjaQ07w3skONs3VERg3bWev2Y3+XZ5oro8m+cXms0REbC+kekyP0qPLt Nhb++nWdrR4qm7mgF1NOTibnm61RG5mjunoOaYlYiosILYs94kdlil1vO356r6k32U2nwI QsoWkdtFat3gk6hIKaicFFCvevS52BzUiNMAhmVZ+ie0F+86WxBLgfVwTUWrVJ5Q35y5OS cwrLROOL69yLAIeGpZzlyVrG5Kjy4E7n0rqJ8IAILPeOdJO0FIMw1jU7UZ5SsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBN942Fzlz170t; Thu, 19 Oct 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JMji5x010292; Thu, 19 Oct 2023 22:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMjiZ0010289; Thu, 19 Oct 2023 22:45:44 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:45:44 GMT Message-Id: <202310192245.39JMjiZ0010289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 0e0a03c79254 - stable/14 - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0e0a03c792542a2509702378559622efafc86548 Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0a03c792542a2509702378559622efafc86548 commit 0e0a03c792542a2509702378559622efafc86548 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Glen Barber CommitDate: 2023-10-19 22:45:17 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 (cherry picked from commit ccd0f34d8585cba727dd17a381309855af655b82) --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index e19d845ca66e..1cf8403e0a0e 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -151,8 +151,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -168,8 +172,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit(); From nobody Thu Oct 19 22:48:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNCj4TCHz4xyXH; Thu, 19 Oct 2023 22:48: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 4SBNCj3vH5z4X4K; Thu, 19 Oct 2023 22:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0gtykd7221JI0Ihn8kCuA4Qn1CN6ty/0U35VzyIwAk=; b=fML4ELlOR/cI+6Rm801NMSWvB7k9O/WIatTm0ndHtGEl8CgjBBRYynPwLsp9qoJlcZwAy4 wg8fyLUtMnzEhq76a/v2QIj+fEkIwDJtNgcnZOHOazjQItNEMKXQAr1Z9Sxopb30804gIG gteATGKF9wEpMzFKCQyWpFNkrTTg3NZD6m/fKCG6f1MurCbsK4iHOCScqaZl974yEVr+en 2SMmDxLiiOwS4OUgjtqGCfyKAz1LFF/1R0BuFRH/qogN52I3LeQwCGDiuI29nFYVC9ZXPK OSuu4wPRZS56ClIJRzi2QnAy5vRufA7RqHrWnt+f3MEB+YPi9FbILdSrZy55/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697755681; a=rsa-sha256; cv=none; b=wj3SRMeqaVtDuYUHieLNKgI872/o3ZFYzOyVT9oL/0obnzRqWD9NfWLCWqc5IM6eUI6Acy 6XvhNRlNAyjl7bJslXQ8g99XGTeV7scLanavHZ/3KFXvY9Tj8l9ZUSxhHnwtMoqdO3YbOU nuPt/ItmZFQx1XRQ/wSNnRfETT2SNfzC7zkAZQIIVpxb3HQj6OWGtYnN9H1SJ+QMk2/e2Y 9Z2bZ//8qdbNuqa2JEtw7xSXNDC2Pho7Wm+xvg0sUycDkEtQEGARBAKLSRxjEX4s9rloZF v0FxOEqGOqqLI8RK/8punmd/cr8IJF+GKggK+66eBPbFK8GTG+V4vqOEjbaHMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697755681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0gtykd7221JI0Ihn8kCuA4Qn1CN6ty/0U35VzyIwAk=; b=qUOYcwL0Mi2ii8MorXZb61TCBMw34ICnJa99G3rajOHFcGQcLYoNerHhVq7qX2xtOD9oog /MT/+SjTVZTmOg7cLN5NsI03HJtTDykUgr/6fLOP9kD379hmWay6QWnU1H/tEiZQ+5N/9X X9aUd8bDZ2xVzo+OhqYsXAW+d5a/+KLxyU7y0m8f4NfgVzAwWy4ehYQF2vIghgZgmlpzh9 oe4tsWAhfbAnchHapK0s2blInJbOhGfEefY5yDsP1g/tjcoVkXPiJlwnIh+nbuZdg2pfq6 npinziTHYJXHaADn1Jb//R7+zqdl+6SYLjlwbbv09anHXCmoDj4gc+jeNVYZGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNCj2yZDz17bD; Thu, 19 Oct 2023 22:48: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 39JMm1pf010770; Thu, 19 Oct 2023 22:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMm1FY010767; Thu, 19 Oct 2023 22:48:01 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:48:01 GMT Message-Id: <202310192248.39JMm1FY010767@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: a959ae1c503d - main - releng-gce: Add missing _ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a959ae1c503d104f1e28033522362e5054f52c94 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a959ae1c503d104f1e28033522362e5054f52c94 commit a959ae1c503d104f1e28033522362e5054f52c94 Author: Colin Percival AuthorDate: 2023-10-19 22:46:59 +0000 Commit: Colin Percival CommitDate: 2023-10-19 22:46:59 +0000 releng-gce: Add missing _ Fixes: 1b10bdf0e2fa8 "releng-gce: Add ZFS support to GCE" MFC after: 3 days --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index f7fb0d8dc419..e84b2df809a9 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -53,7 +53,7 @@ gce-do-login: @true .for _FS in ${GCE_FSLIST} -GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +GCE_IMG_${_FS}= ${.OBJDIR}/gce.${_FS}.raw # Really? Uppercase characters are not allowed? Sigh... # And don't even get me started on the '.'. GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} From nobody Thu Oct 19 22:57:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNQt3q1vz4y04K; Thu, 19 Oct 2023 22:57: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 4SBNQt3Ghlz4Xdy; Thu, 19 Oct 2023 22:57:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4QcftZfApdPaU9b/p2z4YYZXL5X4H5Z45GGbZzJY5VE=; b=c2ijINb2PCbHl7MhbJGsLmJDF/AUxm1kg3aOroMYd6/541QdSi92bY/Z97Y3Y/Zea+8Rne diInqzLrqbh7yVHBjkbA6aeHwcHr5ed4R8Aro7V7Yzr3mD7iD3gwy8PTA8bchl1Oz/HCnl ffO+lIfZQpe1i5sfjCK2l/7ycqwWnuVD6iPzpPF1ignAfl+Jzl+AZcdQ/PzTMe1mkEMAhi 1qRfvB1NEK8HY3TZZ4s2f6rGLzDUg9czHbG+q/eB+89HfGjJhf8PYOLc0hGWh3Z2aOZKKq NI6s+Iz+EEgOhbXLWwS6lyk59iDiNHmAjftdj8ZplVcE8aAlsqNFI7xEDiMbjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697756262; a=rsa-sha256; cv=none; b=s39ToMBG2dzRmkXTRE+mJKdboiQ+Zi4aFwHkL2xVsXZv9iHwn5iKPjRet1MvUljN+VMy3C I9+gWKKK+TR/RSXIrnhdN9XBHFEAejMvza8lHhM9+nG7vAJrSXNBmrVbwNIefNpu8yi/Jr PXvtmCqCbLQsYEr70/Gnjv0GaiFmwvRuHfyBaeNtIVC6L6qtpdywZ2pbkyEudxlyBdw96w XthW7sryo0kaKuoIgVQ5tL4ef6YtTZfihOxFg86kraeTOJ8sFgJNUOS0QymDiifqsc5C9M kvV3lJU1g2gAwdSx3+956KeHQpRxaax6UMMrUAhvwxymK7Jr5ZCw9HQxknCTpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4QcftZfApdPaU9b/p2z4YYZXL5X4H5Z45GGbZzJY5VE=; b=VmCue/dH4lO2cYQ26ERZyunyGAU7gbndPtb17hKqKuedbFZRmcmYvqIzKTnxJXIC8/7tag fVj7O/sUewUfhvPcKPm4P8/9X4F5NTs32bXFUSyh7DZX/Y4dNkkfEEJrOSQra27rPrmj3Z tNPiIBeq5CVTkoAyzEQOpp75YC//F0SsgZct5dOj+GH44IA8fsSd9U21/HKgSIMj2Ht4r2 byo3gFx2YrsP7i6ggTeRHf2cm238oOSqawi3gH+zx1dTGPZtRVabeoURqBoVM6cqtaSn8Q FWTkL7qumYSd6T0C8Iw6qiHEaPENtSnZCeLFV7AIELEvDNp4agubCUj9MIwXSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNQt2J7mz17vt; Thu, 19 Oct 2023 22:57: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 39JMvgNq027079; Thu, 19 Oct 2023 22:57:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMvgtt027076; Thu, 19 Oct 2023 22:57:42 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:57:42 GMT Message-Id: <202310192257.39JMvgtt027076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 394e87e634bc - stable/14 - releng-gce: Add missing _ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 394e87e634bc0f5f34d6bde28794746a07f702ec Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=394e87e634bc0f5f34d6bde28794746a07f702ec commit 394e87e634bc0f5f34d6bde28794746a07f702ec Author: Colin Percival AuthorDate: 2023-10-19 22:46:59 +0000 Commit: Colin Percival CommitDate: 2023-10-19 22:57:29 +0000 releng-gce: Add missing _ Fixes: 1b10bdf0e2fa8 "releng-gce: Add ZFS support to GCE" MFC after: 3 days (cherry picked from commit a959ae1c503d104f1e28033522362e5054f52c94) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index f7fb0d8dc419..e84b2df809a9 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -53,7 +53,7 @@ gce-do-login: @true .for _FS in ${GCE_FSLIST} -GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +GCE_IMG_${_FS}= ${.OBJDIR}/gce.${_FS}.raw # Really? Uppercase characters are not allowed? Sigh... # And don't even get me started on the '.'. GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} From nobody Thu Oct 19 22:58:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNSK2Vy9z4xyws; Thu, 19 Oct 2023 22:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBNSK1yBpz4Xsm; Thu, 19 Oct 2023 22:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hL6NCuNc49xAnCRoBPfat43QiashMPqih1Mn0EtcNE=; b=LYyPGC9hOGRJ3p6LRR0voAUFYSeq55sFuktlsaKyzYBTKskMGzKRti5BKYmFqdLazEzMiJ JoeKy2ULg6mluBCJTDi4ncnX3jcrHqHdZPEpthAhxi32Fp+xCF4grRw93OSTx0ZW9iM5CB ZlzjXlWSbwwpz+78Kyqd77dJRnR+C//NkAXDrNdMdzuoOj0rvy/vmU8e9pljCSEXUlPG9o K5jdYIGOM4QR6klp+EidbA+MWy+32+a6DICNnt1njQSdLU9BHoSYX+l0e9dPij2kmRO9YH 62WVYvwHb1Cs1G0TRUgTP8OYcUtDclZKYJ4CMXjBRlVDgTvhVWoFgnO7is1nCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697756337; a=rsa-sha256; cv=none; b=lroUSmtZ1nSoqrEejSXCWPx83Ja7VRLQRwzIlALbL+Vnx9MVV8izgmL0TS0CytDMTy8ykk RdIJcF19RhQvq+aoHKH49QyInW04hxXCT3dA+M2utSX2rcKWRyI/Khk6ILZnB/DGVc1rOe V8XQVzbplXjGSC7bn6B6tYxS9n37ISuTViWoUDlJMs0gcX1wLueCmj9DStQ88nO213ZeQf RWjy9nH7e2pxefLC5Hn0pyyr13H0bvKoPxAO+gbtOTwbBhQHf5xg0mhwYb/fwtbaUkL5sG whAUbIVg7akRu4ArXKw2s2YqYDoh+4EKcjhQ+JRCVLIZ4h6wo6xJezYPojJ7IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hL6NCuNc49xAnCRoBPfat43QiashMPqih1Mn0EtcNE=; b=RFG1RVuc1xO1UmIe3H8cVG+HEnuhXicFAylAfgwSPUzWRA+S3eInd/6gQZRow59JibA8ZN Hw3vWuBYUry3LdpYRxna3Ofkb+G0OlEU62gIX1YPvn7pIFmpDkFVi7jGUoHLYrA9Cjsixw ePAgYI2qqRQqg5KkjSammClQC2RPQkng8x3UL5E0bbUja5C5ayGZ/Frk8iALV3Z+hHjjeQ FaFpy3XRV1y58uBn2IcFLh2Ylo0N7FFnkCwd/EN9iKnKHdmhqUSGegvGmas6X5U532Cv0m +k3GBS895fINW1NiRQ9pY1eMj0uwUVw+NRGiuc2anFFjERMazg6MJCMtrGxrdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNSK11bJz17wy; Thu, 19 Oct 2023 22:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JMwvmI027366; Thu, 19 Oct 2023 22:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JMwv50027363; Thu, 19 Oct 2023 22:58:57 GMT (envelope-from git) Date: Thu, 19 Oct 2023 22:58:57 GMT Message-Id: <202310192258.39JMwv50027363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 5a1dbfb5b644 - releng/14.0 - releng-gce: Add missing _ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5a1dbfb5b644541886b332f1378c39bae8da9d38 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5a1dbfb5b644541886b332f1378c39bae8da9d38 commit 5a1dbfb5b644541886b332f1378c39bae8da9d38 Author: Colin Percival AuthorDate: 2023-10-19 22:46:59 +0000 Commit: Colin Percival CommitDate: 2023-10-19 22:58:37 +0000 releng-gce: Add missing _ Fixes: 1b10bdf0e2fa8 "releng-gce: Add ZFS support to GCE" Approved by: re (gjb) (cherry picked from commit a959ae1c503d104f1e28033522362e5054f52c94) (cherry picked from commit 394e87e634bc0f5f34d6bde28794746a07f702ec) --- release/Makefile.gce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index f7fb0d8dc419..e84b2df809a9 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -53,7 +53,7 @@ gce-do-login: @true .for _FS in ${GCE_FSLIST} -GCE_IMG_${FS}= ${.OBJDIR}/gce.${_FS}.raw +GCE_IMG_${_FS}= ${.OBJDIR}/gce.${_FS}.raw # Really? Uppercase characters are not allowed? Sigh... # And don't even get me started on the '.'. GCE_TARGET_${_FS}= ${OSRELEASE:S,.raw,,:tl:S,.,-,g}-${_FS}${SNAPSHOT_DATE} From nobody Thu Oct 19 23:05:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNbX4kHFz4y0Mn; Thu, 19 Oct 2023 23:05: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 4SBNbX42wDz4YQJ; Thu, 19 Oct 2023 23:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpnEs8PMwEirL5+xtRpMmYzJoG4v2heAbFEpbMcZ3n8=; b=wAGVYU0IxlJ1hm333Y0bO1pTGy2ZADS2w3PWbBblA2yuf0dceI36Vrfs1O8RsaJTnywM3s yWM8mWYbLMSlImyUY+X31GndyXrGRwruKKQwQvSIiX+MXDIrm1TxVzQcOKVHSYJpf6tNMR 8pGJyrUBLTSR7yPJSQGKyDwfSg8vOnVQMK/uMu8iSJRMm8fg3HkUPLZhLa8OLT2Y1Fqca0 IzrfUCL9r/W2J8s+pXgAEHCSMTA+LIFuZftI+5l3zQR0gJh794VMN9P+uOwe/6ELw0B+JU 1/Ff38ZKRdMwJ4XXqxmPOYYsD3BEEHq2pLgkg1JSLJmc3jeXcLDv7wj0Fq/TEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697756712; a=rsa-sha256; cv=none; b=JUjs5pTOPdzDhWvt3A0aA0FrFQixcHyenzDoqO4nZl3Uz+f7whuQqVxzcZodNvXk4Y6YQH gMSlScT0tBcBrfwfG57UeSYCwmRaI2cWbLxexvpC0xmVvTSbcxK3+ly+X17Vq1+PSRtT7F ac0qWXD/KbOJDqO6lelZMXwjE2XQWF5Si5MihRpALKDWJWrmdvT8u0xBs8G9+kuHA40KsZ PUpyZpr3injJiU50AXjOo5dziKC1VL5i2r9vYnqOUZEMmLAUsMPNepjtUHhHComHvX8DN1 GbV83JcTAIP7x4psDS9Gg1wa2IfEkAGdyp5MbaTXnFBWED7Kb9ZxI4JbP5XCzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mpnEs8PMwEirL5+xtRpMmYzJoG4v2heAbFEpbMcZ3n8=; b=Tk19zfFFMMTvyzi2VXke1PeOTNfQnr8IYF62frdpT33kn9fq0af0W8LO/1sCug36tuhYfH gzw3yKwkHQkUonr0z0pip1pzvaOMdYV1GHaU/OZRgAPzEW65DAMJM4zGAFUT/JloIubqNM cvsXuoxdvdFS2iMhwhLVyJplC35Sv3pRpG8VXQ948Cv/Q+ESZrXPU3GHqeuETkqwpOb3Dm RHczuyiVV5luD6ZLqIPF45p4g7WLNTr+izxWb1vYC61ldgnmtUw8US7GQEC5ApipOx9B3t 5d6+qiDbxGLyYwCeUvTLk0BcQudTCqC4YvDKnDikZKNQSgVMtFresHW1jq9DTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNbX2wZyz17xg; Thu, 19 Oct 2023 23:05: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 39JN5CpJ044634; Thu, 19 Oct 2023 23:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JN5Cbv044631; Thu, 19 Oct 2023 23:05:12 GMT (envelope-from git) Date: Thu, 19 Oct 2023 23:05:12 GMT Message-Id: <202310192305.39JN5Cbv044631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: 665838d939f3 - releng/14.0 - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 665838d939f3d32ca851e815506989d80a207f52 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=665838d939f3d32ca851e815506989d80a207f52 commit 665838d939f3d32ca851e815506989d80a207f52 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-19 23:04:16 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 (cherry picked from commit ccd0f34d8585cba727dd17a381309855af655b82) (cherry picked from commit 0e0a03c792542a2509702378559622efafc86548) Approved by: re (cperciva) --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index e19d845ca66e..1cf8403e0a0e 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -151,8 +151,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -168,8 +172,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit(); From nobody Thu Oct 19 23:05:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBNby3VRGz4y01c; Thu, 19 Oct 2023 23:05: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 4SBNby2cT7z4YpY; Thu, 19 Oct 2023 23:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CuPnctkwi/UWzFMHH5LBFCckO5XVGORb6fTA6iDkRi8=; b=wM5Qdd3aITrU9bTwHhMG5Np0f84/GqmR2HJMRlqMf5MO4DiXIjXaMlZ5UKAEbajN0I9nlE 1OuCdBSuyQuwBBlDhBXw9VEnoRmuxy5hjY9uRDnPIh/voijoCK+p/cp+B+IiScQBIHwq3h WA5zNtZyrWey1VRj3E8MmiLqf1K6i3TH2JEnnAkocbJuwXLmG4+1DNeCRYw1Ogs/yGT/ob jgicSC2uClejt26DTEoTEvRtweW38tm4mTunBY2pGfCf7wEVpIbfNkEyZULafvFxJL5vnv T0aDnfCz0U8oV/L78SpAaKD4jYcLDwX1SOyqr7Q8UA5+2rsSAbI+UmGdEFb9ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697756734; a=rsa-sha256; cv=none; b=nUUl0CIp9IqUxF/FB/dKt9aoDObIkanIYIo0t+/nm0SwhXzYV6CD6MfTM/GvehCPY5Yig0 OfSV1cZZwRbvSaPmA3yQA15NbZ7m2bCt1v1YX2ecDb14s4kCRJHVvYKq47ueRO/cq24ONf YhJN8EnYGUDr5ybHcJT5zn+WyE+8C6F5MDOhB2rjMLh/UpY5zy6POv3LXmmx+pYVGOnnVI OhdvoNByd9RcbXwBd6UbZ8BBKWEu9EM6ZMg5i1vbTadl3tLjEthcMWgKBIzLBWDaoB0X/S IWAcA7Z/1gfV1mhATWvjDHGsOQkxuodwt/EfoceyzsZFXr6ubNSt1sQz9DLCTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697756734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CuPnctkwi/UWzFMHH5LBFCckO5XVGORb6fTA6iDkRi8=; b=rvRZyx4heIgPM9nMgy8Hef33gA4s+yOEBmdut2gEWkKYwWvJLa9PNKonJpXkkODKA6fLsP Rb1F9z4GKt4UzKAMvn+xnRr8+NLkmj9wXBZjB3R9oIv+A++H3KcRtiOw9toH53+8KYiGbd bVsPe2Dgr9gubESEqwdqR+BptNNJz3oLu8396PFA0mbj0bbof4LyR87I5+hYAty1/B3obk o35pbpRsXxMNKzmQSOCA71DcZHpgS8jqx7XyVyPZnmtqTXSWgZqFC76reiQYl3LwSFhbv4 nS18FxfjTBMgRCmALPkXLaZl4Y16krfdnDPB8oygk4IUG1MXDXkyNa1lxouBaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBNby1gpQz17gH; Thu, 19 Oct 2023 23:05: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 39JN5YAT044820; Thu, 19 Oct 2023 23:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JN5YcO044817; Thu, 19 Oct 2023 23:05:34 GMT (envelope-from git) Date: Thu, 19 Oct 2023 23:05:34 GMT Message-Id: <202310192305.39JN5YcO044817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: 51be8675416d - stable/13 - arm64/compat32: Fix handling of 32bits FP registers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51be8675416df4aa066e823fec37ea6667494e63 Auto-Submitted: auto-generated The branch stable/13 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=51be8675416df4aa066e823fec37ea6667494e63 commit 51be8675416df4aa066e823fec37ea6667494e63 Author: Olivier Houchard AuthorDate: 2023-10-16 20:18:24 +0000 Commit: Olivier Houchard CommitDate: 2023-10-19 23:05:26 +0000 arm64/compat32: Fix handling of 32bits FP registers. We must consider the aarch32 FP registers as 16 128bits registers, and store that as the first 16 aarch64 FP registers. PR: 267788 (cherry picked from commit ccd0f34d8585cba727dd17a381309855af655b82) (cherry picked from commit 0e0a03c792542a2509702378559622efafc86548) --- sys/arm64/arm64/freebsd32_machdep.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/freebsd32_machdep.c b/sys/arm64/arm64/freebsd32_machdep.c index 731ce8e6d4be..00c9878deb7c 100644 --- a/sys/arm64/arm64/freebsd32_machdep.c +++ b/sys/arm64/arm64/freebsd32_machdep.c @@ -142,8 +142,12 @@ get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) ("Called get_fpcontext32 while the kernel is using the VFP")); KASSERT((pcb->pcb_fpflags & ~PCB_FP_USERMASK) == 0, ("Non-userspace FPU flags set in get_fpcontext32")); - for (i = 0; i < 32; i++) - mcp->mcv_reg[i] = (uint64_t)pcb->pcb_fpustate.vfp_regs[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + mcp->mcv_reg[i * 2] = tmpreg[0]; + mcp->mcv_reg[i * 2 + 1] = tmpreg[1]; + } mcp->mcv_fpscr = VFP_FPSCR_FROM_SRCR(pcb->pcb_fpustate.vfp_fpcr, pcb->pcb_fpustate.vfp_fpsr); } @@ -159,8 +163,12 @@ set_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp) pcb = td->td_pcb; if (td == curthread) vfp_discard(td); - for (i = 0; i < 32; i++) - pcb->pcb_fpustate.vfp_regs[i] = mcp->mcv_reg[i]; + for (i = 0; i < 16; i++) { + uint64_t *tmpreg = (uint64_t *)&pcb->pcb_fpustate.vfp_regs[i]; + + tmpreg[0] = mcp->mcv_reg[i * 2]; + tmpreg[1] = mcp->mcv_reg[i * 2 + 1]; + } pcb->pcb_fpustate.vfp_fpsr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); pcb->pcb_fpustate.vfp_fpcr = VFP_FPSR_FROM_FPSCR(mcp->mcv_fpscr); critical_exit(); From nobody Fri Oct 20 00:09:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBQ1F0hVXz4y2Z0; Fri, 20 Oct 2023 00:09: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 4SBQ1F0B0yz4fJd; Fri, 20 Oct 2023 00:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697760545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O7V2oDOLeXtqVUiItSSzLfwHaeeR3KffWCHkXZTrM/M=; b=NlXE00Qdmy0xv5VIu0gZqoaR+U5iqOCMG6/HMPI3jBTLHqi9dW19trxfHTrey2Asl3Xnfn KVJFXdiu1cnUikMHQiD6CivVENLFljvwLzL6v4P+IP0I3IHYLLLj7P8YrjMFEDQ8W1jzBp zEVFOhXW4SB2lutnqgrhTeeToP7ibreZM4HECbGrhmZXbJAWO9boZoYtUUupc/cR25N6Qt oefKgGIU35869xAYIsG6D/8b0bSX7WGNfymqYYpnP1IDNTCozmn5W6afw18ye9iBanEx0t QXaT7hRme0GBtZs0y810GqoU4uU1qwSErBgFXbU3EIHcUeMPybTdnHfCDIFNCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697760545; a=rsa-sha256; cv=none; b=SvK9h6Q5fNAAthwybvQ0wD2biEuEhL8uJsjyUr5PzrsWu+sz4HAbYQj64m4J6tseRvKh12 XoCVlSN7V2XTLQyAdzwXRS19JEpaO/YeAtxIrlAfMH21BUEBiEX6RbGKIiVXYjhr4ZyZ7n TERe5xOJOsXcoR9Ac3LKiHzNfg3K6PiU+mqhFNnBkiNG1WYgDhmu0VQ+C9QIoUlf+kK1bW pQ3mVEYbLtqpKl2dF5hk5pfyGJ7hoInGJ6EmMoq27mov+oheZG0XoVevXr3/iROz82FYHC 3eH9d0Yo4E7g9AgVmwWiXM2xWieu5eCq7mgObI7eMB4AcNG9Y3fjyHmbGdeqwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697760545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O7V2oDOLeXtqVUiItSSzLfwHaeeR3KffWCHkXZTrM/M=; b=YR40am325RpCj2Ez4f5U7BAl3XKCgW0EMc+d2sl756NFLy6tL1M0XmZmQxgHUP+PByT7kl BSmJ/skkSLwaWPx/tJctkdgzf3D4Q7ccEgU+6bC0MWT0+OypOha3xGyC1tRNO501n78Nlw w1s0LWXV4alRnytdhA4a8RPBx9BYvm3o6EQVIa2sfcMj9H0oPpTfypyIJQaYyCZXdlbtJw as5uzkBwMeZfZdQtpDr7vxU691Pk7o6eupzkJNs2lrmYSwA8nsO6Pa2jVnO0SQaWjwaB4K QdGm4XyWiLV9ws/FryunLEGJJ47HETEPcIXa7UDymnKfD1ZQmYWL0Wtv+8KdNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBQ1D6G62z19G5; Fri, 20 Oct 2023 00:09: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 39K094fo044918; Fri, 20 Oct 2023 00:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K0944x044915; Fri, 20 Oct 2023 00:09:04 GMT (envelope-from git) Date: Fri, 20 Oct 2023 00:09:04 GMT Message-Id: <202310200009.39K0944x044915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 1d2ff5639925 - releng/14.0 - release: update releng/14.0 to RC2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 1d2ff56399256c657dd77381d9fabc60259e4ba3 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=1d2ff56399256c657dd77381d9fabc60259e4ba3 commit 1d2ff56399256c657dd77381d9fabc60259e4ba3 Author: Glen Barber AuthorDate: 2023-10-20 00:08:43 +0000 Commit: Glen Barber CommitDate: 2023-10-20 00:08:43 +0000 release: update releng/14.0 to RC2 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index a876fe20ec49..b2bd54bb1ee9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Oct 20 08:23:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBd085t60z4xVff; Fri, 20 Oct 2023 08:23: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 4SBd085CR0z4D92; Fri, 20 Oct 2023 08:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697790232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+yo4z8TyPreV0AY+HtIDfL0OFY4c3qHWF3XdzcQNBs=; b=FtJSnSOCUZr/6qy+HylNwc9E/P2yo+nqSatP/fmiBwzeWYTVUfyE13h21rtHv/HtMeg5Mx ueWhMD8N4X18DxL0cF/xAalQGVjmwSKSCOumifACbXLLA2zKldnQn/dT+P/zXty2ZL5s1o Kk57DG3GS0VBj68+XP8n9nxF5f8RUsBa7l/hU1tWZSzRBhvS4I8Wil5AlonaQ2HYmuGHSB +3Tl9wNcRfEEUM5wzCEElIDr2Ye4o9KFnV5uX24q7wgISvRnAH6NY6Z92VdDRiclho9KI4 OYZ7JU2kj7rh8poMz0InfqXMYehZxoPIlLOSeR5xLdvzla8UxDijqxtsKAkaYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697790232; a=rsa-sha256; cv=none; b=WcqHSrhnKT8+g+fcKQH9zfDAig0hxSW+AMYdgZoZQYgx1v5/Pz25Je2KctlxWGdDXC6uod ryDjfjFzYyvOVElOh+229EAYra+8NFn7VSKW3LVRoYroRMFcJ1uw2qWb4EcGYItoiTmYrr Fuxa9Pmgvq57ncW4wruG5wK3cGo7U24G8dm1uEZ3QL6MCDwlF3cSgXb/sweY/9nwJLz78X qEjWE+wy/4CitdrxMW0ncXwZ7mWPDALuPJRYaxsoZdJ7+GylXrLwcx4PjlDxMrTK7NfLxJ BJDLKtszy63Y/1MBz8DXDqNufJ5nbms5GQhbFKL/byA7CG7WS8rYwfjIPaPW1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697790232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+yo4z8TyPreV0AY+HtIDfL0OFY4c3qHWF3XdzcQNBs=; b=yj17uxsyGzLE20C7qePfzwC41ngpraWkYpFduYxzcqoYTCyeGq5QO/Cm0TX6OST/f4msJI J691yAX+RwPNI3Yp8ZVz/yThZ09D5L5DFHvvtuub6L1tyZiA2BmRY4HOw1QxyrXG3QWsVo rwrbObakBNc4O7UOy1e64lezXDsspb72uOWf2zTQoqJpuW36BA5N0ZG7kqcKhi+aqZkygZ 2jcIdz0Nbt/btIcOqcbX4kCZvyEqMPlL7ZYHfaXaLY3xs9cIutJ3kCRHJycKlw+9iylTkI XExqdO3IemlNARNEv5XiqsJUPCXm9VnibZGInfHDjEHSiOQV/BBB9ZlqV7EoWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBd084GWSz9v6; Fri, 20 Oct 2023 08:23: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 39K8NqbT072905; Fri, 20 Oct 2023 08:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K8NqoJ072902; Fri, 20 Oct 2023 08:23:52 GMT (envelope-from git) Date: Fri, 20 Oct 2023 08:23:52 GMT Message-Id: <202310200823.39K8NqoJ072902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 6134250f777b - stable/14 - pfsync: Provide documentation regarding message version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6134250f777bb4c32813eb056d4c0775f5f43986 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=6134250f777bb4c32813eb056d4c0775f5f43986 commit 6134250f777bb4c32813eb056d4c0775f5f43986 Author: Kajetan Staszkiewicz AuthorDate: 2023-10-17 04:38:47 +0000 Commit: Kristof Provost CommitDate: 2023-10-20 08:23:41 +0000 pfsync: Provide documentation regarding message version Reviewed by: kp MFC after: 3 days Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42235 (cherry picked from commit 18be782c4e5fcbe4d37a951a6c77c13b3c11b8be) --- sbin/ifconfig/ifconfig.8 | 7 ++++++- share/man/man4/pfsync.4 | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 1dc4c2e1b56d..bd6cbd05210e 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" -.Dd June 20, 2023 +.Dd October 17, 2023 .Dt IFCONFIG 8 .Os .Sh NAME @@ -2886,6 +2886,11 @@ acknowledged that the associated state has been inserted. .It Fl defer Do not defer the first packet in a state. This is the default. +.It Fl version Ar n +Configure message format for compatibility with older versions of FreeBSD. +Refer to +.Xr pfsync 4 +for details. .El .Ss VLAN Parameters The following parameters are specific to diff --git a/share/man/man4/pfsync.4 b/share/man/man4/pfsync.4 index 5a1d576824e6..4decb50feb7b 100644 --- a/share/man/man4/pfsync.4 +++ b/share/man/man4/pfsync.4 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 6, 2018 +.Dd October 17, 2023 .Dt PFSYNC 4 .Os .Sh NAME @@ -113,6 +113,32 @@ dedicated to pfsync messages such as a crossover cable between two firewalls, or specify a peer address and protect the traffic with .Xr ipsec 4 . .Pp +When new features are introduced to +.Xr pf 4 +the format of messages used by +.Nm +might change. +.Nm +will by default use the latest format. +If synchronization with a peer running an older version of FreeBSD is needed the +.Ar version +parameter can be used. +E.g.: +.Bd -literal -offset indent +# ifconfig pfsync0 version 1301 +.Ed +.Pp +.Bd +Currently the following versions are supported: +.Bl -tag -width indent +.It Cm 1301 +FreeBSD releases 13.2 and older. +Compatibility with FreeBSD 13.1 has been verified. +.It Cm 1400 +FreeBSD release 14.0. +.El +.Ed +.Pp .Nm has the following .Xr sysctl 8 From nobody Fri Oct 20 08:42:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBdPZ3jMtz4xW5b; Fri, 20 Oct 2023 08:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBdPZ392Qz4Gt4; Fri, 20 Oct 2023 08:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w1W1bxX+1g0SKQ0LKHh9KIaCk9+GOVPzakruDIqCO0=; b=NwcudPRkwoImAt2eqYLO2/7VvnjHCjukiAq2RDDnFitm+vlxV39nTMZLlc/aFlhKSrTA8F fD8kuLQzY2zpHYVTXpjsZLXpSMlbsItOu3fT7/vMD3XcNEDF78H5qMLHvYUyRN0wCxbiaZ npFq8QDcqVLbMS+QBaURcBCP/tWMaaErvtiPY/GZtsSbDmUigMELS6rqOkPLNNjAkuVSEV gzIFHWYUK9/Qp48V8ew0KSasY/gpzv5p1t2lrI5gB0ejd/xkjsdXVb+7YMSNwtFCvGx6tv zog1JpujIo1aahp6ehODeuyD2ryrj1/IqsQqhg3qG0xbZv60mh3I7R8jL+SihA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697791346; a=rsa-sha256; cv=none; b=TN9UjgYOVx7BVGb20e2lugqj9Cs1tRJFg9KwH2JtFZemfwQ5Ex7LJ8m6od7PudXAWAAnz4 KpwLu2kpIaNmXLWdpibhAOC7xDZdV7RmFbR+d+IYL7XNot9nyu5EcfcazbJCyRpqnyIKhz +XKryWe7E41lC+X72GF/2cHbWJHE/hVB9KLX2RoVuE8h541ANwi5A3KRI8EPnFZR+RdG6z rxdskPfFD2UVCjpiQBZAnNzXXzp6ruvJNlK+l7Kv/wdAEjccy/i9I1L45RjQ8NOhw50Ajw qKD+JSO7OnZ9jdCVFKV8JSWFaqCfOGExKxMD9QecsK0sgrBcbWUFsy9MhjLT4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4w1W1bxX+1g0SKQ0LKHh9KIaCk9+GOVPzakruDIqCO0=; b=oP7TELW6BUkg1oULg2lj5XkaethyeWG9cjSmT08Phxe1E50hr5pA0D219G+CYXiqIyIOsu 7Mdh5/OjLjh1yX1uVcaPOQxI0Z+D6JRIMjWD0Dmliq25DjinDOALt0OoCsGpRA0DGwS43o xDMamhIFex7dJ5DUsQf5bdAlxIFO3VSFBZA1WbDBjujZXv6NanB9V0nDw3ffo2+eblZ9sY AJyIun1LtOqMvfMWTInbBE3ONrc2VrnypFEB70T9yAhgKtDJohNuByV6G79Dbt/Qqr7XzS wgd6UbSDSjKhC2lT3L5o+X92zUOUJ1gmKTu+7B9FSiV6xr/oFc4zIMLJwJWQzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBdPZ1x88zBTP; Fri, 20 Oct 2023 08:42:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39K8gQTL005802; Fri, 20 Oct 2023 08:42:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K8gQfS005799; Fri, 20 Oct 2023 08:42:26 GMT (envelope-from git) Date: Fri, 20 Oct 2023 08:42:26 GMT Message-Id: <202310200842.39K8gQfS005799@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: c1146e6ad67f - main - pf: use an enum for packet direction in divert tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1146e6ad67fb866c2472a1cbe5609fd939fd5ef Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1146e6ad67fb866c2472a1cbe5609fd939fd5ef commit c1146e6ad67fb866c2472a1cbe5609fd939fd5ef Author: Kristof Provost AuthorDate: 2023-10-20 07:13:56 +0000 Commit: Kristof Provost CommitDate: 2023-10-20 07:16:08 +0000 pf: use an enum for packet direction in divert tag The benefit is that in the debugger you will see PF_DIVERT_MTAG_DIR_IN instead of 1 when looking at a structure. And compilation time failure if anybody sets it to a wrong value. Using "port" instead of "ndir" when assigning a port improves readability of code. Suggested by: glebius MFC after: 3 weeks X-MFC-With: fabf705f4b --- sys/netinet/ip_divert.c | 2 +- sys/netinet/ip_var.h | 14 ++++++++++---- sys/netpfil/pf/pf.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index ad95a1ce0d76..78ca36fc2a0f 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -182,7 +182,7 @@ divert_packet(struct mbuf *m, bool incoming) (((struct ipfw_rule_ref *)(mtag+1))->info)); } else if ((mtag = m_tag_locate(m, MTAG_PF_DIVERT, 0, NULL)) != NULL) { cookie = ((struct pf_divert_mtag *)(mtag+1))->idir; - nport = htons(((struct pf_divert_mtag *)(mtag+1))->ndir); + nport = htons(((struct pf_divert_mtag *)(mtag+1))->port); } else { m_freem(m); return; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8c687682af9..a8a9adc1d4c6 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -328,11 +328,17 @@ extern int (*ip_dn_ctl_ptr)(struct sockopt *); extern int (*ip_dn_io_ptr)(struct mbuf **, struct ip_fw_args *); /* pf specific mtag for divert(4) support */ -enum { PF_DIVERT_MTAG_DIR_IN=1, PF_DIVERT_MTAG_DIR_OUT=2 }; +__enum_uint8_decl(pf_mtag_dir) { + PF_DIVERT_MTAG_DIR_IN = 1, + PF_DIVERT_MTAG_DIR_OUT = 2 +}; struct pf_divert_mtag { - uint16_t idir; // initial pkt direction - uint16_t ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter + __enum_uint8(pf_mtag_dir) idir; // initial pkt direction + union { + __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion + // b) new direction upon pkt re-enter + uint16_t port; /* Initial divert(4) port */ + }; }; #define MTAG_PF_DIVERT 1262273569 diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a6c7ee359416..1cd8412193dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8022,7 +8022,7 @@ done: mtag = m_tag_alloc(MTAG_PF_DIVERT, 0, sizeof(struct pf_divert_mtag), M_NOWAIT | M_ZERO); if (mtag != NULL) { - ((struct pf_divert_mtag *)(mtag+1))->ndir = + ((struct pf_divert_mtag *)(mtag+1))->port = ntohs(r->divert.port); ((struct pf_divert_mtag *)(mtag+1))->idir = (dir == PF_IN) ? PF_DIVERT_MTAG_DIR_IN : From nobody Fri Oct 20 09:16:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBf8j53H7z4xXvk; Fri, 20 Oct 2023 09:16: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 4SBf8j4Zm6z4LKP; Fri, 20 Oct 2023 09:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697793381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lk2RxlLEOL2a5imL/EbVeVAuObMrOWsKB49AKAmJySI=; b=ikmcrwiI4qKNO2wYEXNYte4ML6QTN27iehrrkQmfJzZYPRsDa+QRKv1CPbIzE8+WPFXHgl Tsnz+gDgcA8CUzgFXXY2ZH6WIrRo7pIFgerrC9OSjdTYFR/idtdrbVcQpeCH7PcNDrplrv 10qNsO8M8Ja6pdrVUgxV9/ert4t8DSmLRr4VeHIT+NchX5i8gSlHkPvX/S1PNsoDQzyE0G ojIaJq6nByDzUbivdURhpspjcgabO1Nwcb7i3GKl3bzY7PtlHnMuPVcrxmoQmoORwwL2XV T7f9tUK+6zoweqAmVJIXQYiOBs/yLHoBhkus4uJG6IKcvSQLwU4c9U4U9Qw6XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697793381; a=rsa-sha256; cv=none; b=YtzWyGk7mvyrE2ykzShGU8+WI0D5YCS71X1enkmSlsa2Gp241yn3HSj5FjBO/z05cpKdrT 8WgzzuDsDJ/Am3L4PzmNypQRx4glg7XqcW+43xUnpIABoaIUsTV2iqT1Sxcy4SbfGdfJUv jhenWLpewLI4OEmfpyX1fumqRF7XIVDnUyQ8HfgNzR+Q15WI3zePaHAHi8eq3Pc5ZFcXlB 4mXo6m3AUghClx6brAfsVvyaQnTcxJkYR2G2KQlFKHJi0KJIA/rnQyYBszaEBoEzQEwqjI UiQ0+7LGpORSzL2HvVSCibL3oJ1J6Fq4rXR5+BiL4Rvlqar/Ex+XqINnVZuRvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697793381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lk2RxlLEOL2a5imL/EbVeVAuObMrOWsKB49AKAmJySI=; b=FSA/v8Gep1k7j6eerWtXVjeHSaEGUMFlnT+5PAICmDbHrlB6HTK20+uYA8tl4tyUm+Hha4 lFknS9IgVNe2uLYZ4f82hVG+rLPkWuo3lvYndYDJ6N6HESELY9n4k1x11gb6ZE2njEf6Qz qCe27ViEKxQb1JbuAxdrNkbTDdSICEJLbk9rTSO+uqwsFXLsZkX2+9DA3mSnJplNpANLy/ c9FyzsLPxxSMhIlPsPp8Na3P25+OmemWYZZz3YagM65RdHjqqp3PqYX/YsSoISx6XGzoBa M2Mm7L2b/Qs85c8DPh4OU2Vs1LQQU3os17bt1tG6+L/J0LKncHS5lLCsI53Xxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBf8j3f7qzBPy; Fri, 20 Oct 2023 09:16: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 39K9GLRr056708; Fri, 20 Oct 2023 09:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39K9GLn0056705; Fri, 20 Oct 2023 09:16:21 GMT (envelope-from git) Date: Fri, 20 Oct 2023 09:16:21 GMT Message-Id: <202310200916.39K9GLn0056705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 49fa9a64372b - main - Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49fa9a64372b087cfd66459a20f4ffd25464b6a3 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=49fa9a64372b087cfd66459a20f4ffd25464b6a3 commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3 Author: Wei Hu AuthorDate: 2023-10-20 08:58:20 +0000 Commit: Wei Hu CommitDate: 2023-10-20 09:15:21 +0000 Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read It is observed that netvsc's send rings could stall on the latest Azure Boost platforms. This is due to vmbus_rxbr_read() routine doesn't check if host is waiting for more room to put data, which leads to host side sleeping forever on this vmbus channel. The problem was only observed on the latest platform because the host requests larger buffer ring room to be available, which causes the issue to happen much more easily. Fix this by adding check in the vmbus_rxbr_read call and signaling the host in the callers if check returns positively. Reported by: NetApp Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++- sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 27adf71fd6ea..f663bb7c2ba5 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -684,7 +684,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, * We assume (dlen + skip) == sizeof(channel packet). */ int -vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) +vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip, + boolean_t *need_sig) { uint32_t rindex, br_dsize = rbr->rxbr_dsize; @@ -717,5 +718,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) mtx_unlock_spin(&rbr->rxbr_lock); + if (need_sig) { + *need_sig = + vmbus_rxbr_need_signal(rbr, + dlen + skip + sizeof(uint64_t)); + } + return (0); } diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 8593c1886b0f..a04169f3291c 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -129,7 +129,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr); void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen); int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen); int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, - uint32_t skip); + uint32_t skip, boolean_t *need_sig); int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, boolean_t *need_sig); int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index d5c4d357e9ec..ecb2e947c953 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -1205,6 +1205,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, { struct vmbus_chanpkt_hdr pkt; int error, dlen, hlen; + boolean_t sig_event; error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt)); if (error) @@ -1235,9 +1236,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, *dlen0 = dlen; /* Skip packet header */ - error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen); + error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } @@ -1246,6 +1250,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, struct vmbus_chanpkt_hdr *pkt, int *pktlen0) { int error, pktlen, pkt_hlen; + boolean_t sig_event; pkt_hlen = sizeof(*pkt); error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen); @@ -1277,9 +1282,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, * by the above vmbus_rxbr_peek(). */ error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1, - pktlen - pkt_hlen, pkt_hlen); + pktlen - pkt_hlen, pkt_hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } From nobody Fri Oct 20 10:20:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgZj1TgNz4xcBX; Fri, 20 Oct 2023 10:20: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 4SBgZj11YLz4R5D; Fri, 20 Oct 2023 10:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i97uC4cZ7p/nvx1NMZ84240BmMyHthFUMGB48eaS5sQ=; b=RSqZV9LtNratVO4VIKmLh4vC3oT+uSomxLPojIyUH/94ygsBnF/9LAqeQtOhILsJpOMMZ7 evdx3miWbhI7tqVAwrOdCoVRe8xNeYyG3XZHI9goORbDXhqg+WZQfrpd2SEHXxwFoKd9Ku pQYDdABirmeicw4GxEQgSd5T28XGoqdujslv3+j/MYVjweA0DGQX4HY9s5xyt7uA7Sp0i4 2/YOAWDKpieUiEaLynyTnpXJYK39Ct+onKSwUjz4vbySp4toGtGA/C7XiH+QA92E+D3MKk nMiYMm0fF0bKKvtP4XnvDoWo1rKg2ENNf26Rt0mjIrXZFN9gsc9Zc18hW/IVDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697797229; a=rsa-sha256; cv=none; b=DtOCpGs2rbIFMwvVfDujQblEh27ZXvx993V3FBLH3rtZC5jmp6qRoO8pwqWxlb/WQbod+g 3NqYvC8VkPkoHhgyQk7fn+28WgtBT10QU7YnVrZJN/Cuf6BkRd6rA4xeWbjm5bjhqxSFXE 1Ekhg6A1pmgBbaHks713/JAcDnRoOsRJDp3fmBRFNpxSZIKTJxpiJFhxsV6gi9Eh2eowRA hkaB3aqZ0Fgt4+6ILolYYEiiStPmfbOCKTEsfbicRdcJckfByQnRX1yz5buTCeb2tH172O tadfpirdWxllV9QpTXMGV9pfxqaRrVe7rumEBZ5aAY7Di201BwF3T+EOj+Lydw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i97uC4cZ7p/nvx1NMZ84240BmMyHthFUMGB48eaS5sQ=; b=FY2wwqo8aJjymHVAGX6tEVQ+anXwxUo3A7DcYaN/btq8ODOenfvTXtK5TcPhIbMXHOyJCr 7uUuvi3ky91+bT6aB2TpRKG5A3vbyZTZS4dI6tg7TAdoFneVKp49wd07W2D20EsFUCREma KULLV5oh528MGxBm3l04YHMp/vkaVF2ltRFEo9RMPmog4p4ytjRhKj0pr3FrsR0jzk627y paLsslpicfNV/RTpFtXCMhcTmF9j0KnwYFVXErnuX0c7YfPIhdKrDSgn9wzr4kBkbMDTXI ippcqoDc2vDOW+8NUizPm8maIadxDFQgxVQIlvcCXkYOJeULCrznQTDuzdVlkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgZj03rwzDW3; Fri, 20 Oct 2023 10:20: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 39KAKSLo065522; Fri, 20 Oct 2023 10:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KAKSjb065519; Fri, 20 Oct 2023 10:20:28 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:20:28 GMT Message-Id: <202310201020.39KAKSjb065519@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: c81166b018ac - stable/14 - Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c81166b018acfbe521f52415ff37b8c2696d77c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=c81166b018acfbe521f52415ff37b8c2696d77c6 commit c81166b018acfbe521f52415ff37b8c2696d77c6 Author: Wei Hu AuthorDate: 2023-10-20 08:58:20 +0000 Commit: Wei Hu CommitDate: 2023-10-20 10:03:35 +0000 Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read It is observed that netvsc's send rings could stall on the latest Azure Boost platforms. This is due to vmbus_rxbr_read() routine doesn't check if host is waiting for more room to put data, which leads to host side sleeping forever on this vmbus channel. The problem was only observed on the latest platform because the host requests larger buffer ring room to be available, which causes the issue to happen much more easily. Fix this by adding check in the vmbus_rxbr_read call and signaling the host in the callers if check returns positively. Reported by: NetApp Tested by: whu Sponsored by: Microsoft (cherry picked from commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3) --- sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++- sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 27adf71fd6ea..f663bb7c2ba5 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -684,7 +684,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, * We assume (dlen + skip) == sizeof(channel packet). */ int -vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) +vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip, + boolean_t *need_sig) { uint32_t rindex, br_dsize = rbr->rxbr_dsize; @@ -717,5 +718,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) mtx_unlock_spin(&rbr->rxbr_lock); + if (need_sig) { + *need_sig = + vmbus_rxbr_need_signal(rbr, + dlen + skip + sizeof(uint64_t)); + } + return (0); } diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 8593c1886b0f..a04169f3291c 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -129,7 +129,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr); void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen); int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen); int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, - uint32_t skip); + uint32_t skip, boolean_t *need_sig); int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, boolean_t *need_sig); int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index d5c4d357e9ec..ecb2e947c953 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -1205,6 +1205,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, { struct vmbus_chanpkt_hdr pkt; int error, dlen, hlen; + boolean_t sig_event; error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt)); if (error) @@ -1235,9 +1236,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, *dlen0 = dlen; /* Skip packet header */ - error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen); + error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } @@ -1246,6 +1250,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, struct vmbus_chanpkt_hdr *pkt, int *pktlen0) { int error, pktlen, pkt_hlen; + boolean_t sig_event; pkt_hlen = sizeof(*pkt); error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen); @@ -1277,9 +1282,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, * by the above vmbus_rxbr_peek(). */ error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1, - pktlen - pkt_hlen, pkt_hlen); + pktlen - pkt_hlen, pkt_hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } From nobody Fri Oct 20 10:29:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgnL6ctMz4xc6l; Fri, 20 Oct 2023 10:29: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 4SBgnL62tRz4Rnf; Fri, 20 Oct 2023 10:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQdiDtAq3YiEWfqVoTrS9sRKTohhgv/5GrQTciWekFU=; b=FUYQxe2FlRZChl/lqlphMS94r2xvGHp2orf3xBi9OaBF0Z10bv/WIGuB9rl+fYcTzfPLSF ZTqkpehrN1U6dXcfQHi6beYHuZTg5SsZuHvIuQqtIN+Gi0F5kstmp9xhKVEnkeTGYTgRmI qwae8SAxpTndM59Smydt0dJUVytG5fADnibQHbv58E/07KOD5VDXoqPNVHsQYgNkN7u/4P TCKZYLrMzhTG/fAgsTp0NeIW2uyO7QPdqOyWiO0PyPiML/NnTqr6uUF78GLnJbr0tNeUJm cM+Vle5oUscBHFEOKZ3Myk+j4tOEoIwpF2vgBKrj7R1cHZcj3r2X90w1tWBbJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697797782; a=rsa-sha256; cv=none; b=xZB67giLcPwdHSNHaD4CYb6Oxgop0XZ2/xEWXmciB97kxB20Mr+fiuBAer7p7JW/oCsNYI V+NhLFeF40QXArkGx8xz+QyhU1PePNaLmmFA6RC8LuceMJlwDyhn/+Ty0nrOPaNHM96HNG ls3Zw0JwniOdAlJXoH0biLQwZSjO8OXRCxBDhFGOpJ405QSS88LdlnaJbN68YedCkgGUI4 51b12Kn3+PY3Zhx8x7CWsZEZpttcz2XSwpDBG51iqdYSr7ZNJvXHlTrRJ4BFMwpLpipFdJ peQ4Y8ihzRNSmc4kglbj6tWzqapvIGZ+NrqB6sgz6Y6qYXH0l7yn9CZsYNiy6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQdiDtAq3YiEWfqVoTrS9sRKTohhgv/5GrQTciWekFU=; b=dnCuiPnfGu0bAiOa68JeKDxT2NHaW6dJmgckBkHPcoN5i5RSVE9mazRXYaIvEjfs7w7frk ylhg91rg5Mo0qralnHBXzCQuSO0s14CgWJyNxkhGw9ctQWb/fTxB+nu+r3tvQW9PHYBA1+ 9qjErgbsOelwY4/SVQjHV3pEqOjfwDMI0PSkcLaKi97QfVzPG308T37kxMBGUJvlDhanhH Jsu+7AV+wa0ICw4w66NDHKVBB9xPZL1qw4slQgWPCWJkVRZaDRTmNVDkxFHRB/DtN6os6D +pVpkk+RNVoiVamleSojD/96sDUb2cEy9y2if0jOKQheaZ4J1/POb5qE6U6gjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgnL55ZLzTtt; Fri, 20 Oct 2023 10:29: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 39KATg15073740; Fri, 20 Oct 2023 10:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KATgpX073737; Fri, 20 Oct 2023 10:29:42 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:29:42 GMT Message-Id: <202310201029.39KATgpX073737@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: 87945a082980 - main - certctl: Fix recent regressions. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87945a082980260b52507ad5bfb3a0ce773a80da Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=87945a082980260b52507ad5bfb3a0ce773a80da commit 87945a082980260b52507ad5bfb3a0ce773a80da Author: Dag-Erling Smørgrav AuthorDate: 2023-10-20 10:29:06 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-20 10:29:40 +0000 certctl: Fix recent regressions. - If an untrusted certificate is also found in the list of trusted certificate, issue a warning and skip it, but don't fail. - Split on -+BEGIN CERTIFICATE-+ instead of "Certificate:" since that's what we're really looking for. Also fix a long-standing bug: .crl files are not certificates, so we should not include them when searching for certificates. Reported by: madpilot, netchild, tijl Reviewed by: netchild, allanjude Differential Revision: https://reviews.freebsd.org/D42276 --- usr.sbin/certctl/certctl.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index b7d3a95bc7d7..2ffa94bc7db7 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -67,8 +67,7 @@ cert_files_in() find -L "$@" -type f \( \ -name '*.pem' -or \ -name '*.crt' -or \ - -name '*.cer' -or \ - -name '*.crl' \ + -name '*.cer' \ \) 2>/dev/null } @@ -114,7 +113,7 @@ create_trusted() otherhash=$(openssl x509 -sha1 -in "$otherfile" -noout -fingerprint) if [ "$certhash" = "$otherhash" ] ; then info "Skipping untrusted certificate $hash ($otherfile)" - return 1 + return 0 fi done for otherfile in $(find $CERTDESTDIR -name "$hash.*") ; do @@ -182,7 +181,7 @@ do_scan() IFS="$oldIFS" for CFILE in $(cert_files_in "$@") ; do verbose "Reading $CFILE" - case $(grep -c '^Certificate:$' "$CFILE") in + case $(egrep -c '^-+BEGIN CERTIFICATE-+$' "$CFILE") in 0) ;; 1) @@ -191,8 +190,8 @@ do_scan() *) verbose "Multiple certificates found, splitting..." SPLITDIR=$(mktemp -d) - egrep '^[^#]' "$CFILE" | \ - split -p '^Certificate:$' - "$SPLITDIR/x" + egrep '^(---|[0-9A-Za-z/+=]+$)' "$CFILE" | \ + split -p '^-+BEGIN CERTIFICATE-+$' - "$SPLITDIR/x" for CERT in $(find "$SPLITDIR" -type f) ; do "$CFUNC" "$CERT" done From nobody Fri Oct 20 10:29:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgnN0yXVz4xcgY; Fri, 20 Oct 2023 10:29: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 4SBgnN0V9Mz4S5d; Fri, 20 Oct 2023 10:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+1l84JlX6hHhBhChsRa5kSBsIEC1pxRP5XXygzfMU=; b=a5JU0IvNHyT05hGsQfAEFAQS+9936dVVozi6t1zKovy/mAh6tx2aUJZhwtu9ifwqf1lyuu UQ5FNeOB95O/t91nb1nFRyX7iOPqmFb/JitE0X8CrRuo5XIqKuHKHZU8qZCEVL52l/mA9D 4clU0uWDdfm3kI2ZTHmqhyyvJihcBOL+jOTp1nM2+uKjltroW0WFw1qeTDQgenmIP8MI79 hjqNl4TaoB1yzbra/UXrRt3BXfdz6QKviSH9NG+CEm2qLXoyg5vZ9OeM06iyhewAbvoCOp vzweZZbisH2AJJ73xzNr4GjWr0sYS9YyVP/kWAgySMxjEIpMizETHMraveo6HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697797784; a=rsa-sha256; cv=none; b=NGyd5ZyIBqJPnnsxUEGMU4xzHHP6luT1cfNB5C2F9t1m1xuuT7022tKxVCRvQWsuIqp5l4 CRnkzkSCo46mULlPpFkQYNXLRpnSE4zGVZVzXBylL5ez6VGEwCD2uFVX1mCSbhBctzhbtl +PMKqUU9KYJOPkCfdyXxV9VsKDgi+k/42SdBz36lZXS8YiiPfl1S3N++z/93GrrGKzzJAH CpJK4S+vgn1DrWijxK8MYj+tVZYwETeaN6wllydAPA5bsHSuBPNC1/BGnYo1Xd1zS61/ti 19l7xHCxSOqvamIO2KWNc+Il3crTKw7kS+1SIzVfZ80FHrqT+43hExCGMSW1NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697797784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RA+1l84JlX6hHhBhChsRa5kSBsIEC1pxRP5XXygzfMU=; b=CWbUhIfOnUMADHSt23RsBxyeZ61gaCLsKEEdozRRV15oRZrD73M6osjMy6rhis46AjnVxt ZOo0P4cY9EdnTkrZ+lsdYo9ENJEKza1dIG4MSnPbMhZCqbtb0Sv/GyIoavYeAfIb6Q2iFl WwRmfBEvO8VxUwr35cjEINrvgv1Fh6t7yB6xhZTA31mIfhY9ccasj6nlS8gjU5copI9Qeo 91QcLTA4sxFQ5Vy3peueuRkZcFBa+Tg4FB6+1nRUudx9cBXPi+OuFDB5z7HlIfqGDVeYPr KJXM5lTae9yPXgOl/QoPOp6sIjZwgwEHm8JDc9A7AQR7NRWblIsHzXL4u4Raqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgnM6K7szTyk; Fri, 20 Oct 2023 10:29: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 39KAThOk073782; Fri, 20 Oct 2023 10:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KATh1O073779; Fri, 20 Oct 2023 10:29:43 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:29:43 GMT Message-Id: <202310201029.39KATh1O073779@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: ca57a343e86e - main - libc: More missing MLINKS. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca57a343e86ed3015596db68bda17518ad45436a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ca57a343e86ed3015596db68bda17518ad45436a commit ca57a343e86ed3015596db68bda17518ad45436a Author: Dag-Erling Smørgrav AuthorDate: 2023-10-20 10:29:20 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-20 10:29:40 +0000 libc: More missing MLINKS. Differential Revision: https://reviews.freebsd.org/D42292 --- contrib/libc-pwcache/pwcache.3 | 6 +++++- lib/libc/gen/Makefile.inc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/libc-pwcache/pwcache.3 b/contrib/libc-pwcache/pwcache.3 index 32895ce9b54c..f730153d9951 100644 --- a/contrib/libc-pwcache/pwcache.3 +++ b/contrib/libc-pwcache/pwcache.3 @@ -62,7 +62,11 @@ .Sh NAME .Nm pwcache , .Nm user_from_uid , -.Nm group_from_gid +.Nm uid_from_user , +.Nm pwcache_userdb , +.Nm group_from_gid , +.Nm gid_from_group , +.Nm pwcache_groupdb .Nd cache password and group entries .Sh LIBRARY .Lb libc diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 655843f03715..7eaa471a8dc7 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -484,7 +484,11 @@ MLINKS+=posix_spawn.3 posix_spawnp.3 \ MLINKS+=psignal.3 strsignal.3 \ psignal.3 sys_siglist.3 \ psignal.3 sys_signame.3 -MLINKS+=pwcache.3 group_from_gid.3 \ +MLINKS+=pwcache.3 gid_from_group.3 \ + pwcache.3 group_from_gid.3 \ + pwcache.3 pwcache_groupdb.3 \ + pwcache.3 pwcache_userdb.3 \ + pwcache.3 uid_from_user.3 \ pwcache.3 user_from_uid.3 MLINKS+=rand48.3 _rand48.3 \ rand48.3 drand48.3 \ From nobody Fri Oct 20 10:34:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBgv21fRzz4xd2C; Fri, 20 Oct 2023 10:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBgv20cfNz4Syp; Fri, 20 Oct 2023 10:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697798078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8J6umyz+MG71yhfXVIx8yZElTweAETjrew/FJOA5rZg=; b=rSYaVajhzqgYe8r+0FVRh1Y/DWB/oMojsJs19/AGwrl3mUJp5SmsPy6kaaKXH0YgC2r0k9 J+jTCM3guLGXkh+2f6NDbONqxfiRH4vjbWeI9iRUk7IKAbWobAjZsbp5dsqrK+GSGKsj+x FahW6lvw2vYwLyyisaM3XiCD01RZToVJMNJqSyW2eeaaZ4xRU57NsfOVT9QTETOJPHn3dS Hgirt6CmrfxCwUGU5iqxwO9U3cgWEVSZluDbjWOUXqiCcbKg/vwnsNQk45zqw+CA2s2oa2 XfO+wXCZkHr5ecUX+coHvql56qlsrpK2E17fFCQCD0pV7rL7hFQvNhY2ZKokFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697798078; a=rsa-sha256; cv=none; b=G16gYi1TrBeFMB97UTvmOCZtiVAf1hHsvsYLGnT+30fuUo/w1WDGFqg/TXRa+tEOUY95u3 44U67YeS0liZq43sulNNr8aGclNbju85OppCLyNDE92kf1VAE3/v6RlvXe91hfWgd1qvgt kSz09XOcU1DLVVMkOxAx1XNynpH1mBCHQdA6g9jY2SuOmzAls966t63j7gD6dfv/2zW1iT Q4d6dfGx/3nPi/o1IEg5NPYUmdZEDbM6f6v3pzetbNdbw49yoQbBscCUa/yZisFhOxD2ox N4J8VsgqX4i6M6OACdfkWPxqVNV4Pr+Mirhtmd8feo70G2rJTyVXIQFm2+GGUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697798078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8J6umyz+MG71yhfXVIx8yZElTweAETjrew/FJOA5rZg=; b=PEQ0PlVXm/MJWcvzVxWdn/zYmmIYpNSpiQPEKi8wN/BHAaP0Im3aglD2IIySwamgl1ofuK 3/IobiVVbGOgNfoNUU+IY68qDch/c/Mw1wHcHEXzGy7Oek/ZaWc6148yboO6a/XCGWiXKi lfX+/L+FWPbfY04obh7dP7zaZEdMWXntIdHJBmTQztT4QkpK1FyNUkGVuJ/CoYrVKgUfI0 ABsvj2u0T0caaBVcOXCJfabUXfoqkJO8G1p7HhiTpRBZnQziIajVgIZDnYZUSMTR3Ys/mc JJ5tB/htRPPlJJ/Zq0+kfNuEeBgWrLPP3RWWJ9oY3MOlSsNvAdgws/lGvHOy3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBgv16gFYzVMd; Fri, 20 Oct 2023 10:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KAYbPS089839; Fri, 20 Oct 2023 10:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KAYbHL089837; Fri, 20 Oct 2023 10:34:37 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:34:37 GMT Message-Id: <202310201034.39KAYbHL089837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: d0891e9cae62 - stable/13 - Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0891e9cae629afebe1997c8912b79375221d9ac Auto-Submitted: auto-generated The branch stable/13 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=d0891e9cae629afebe1997c8912b79375221d9ac commit d0891e9cae629afebe1997c8912b79375221d9ac Author: Wei Hu AuthorDate: 2023-10-20 08:58:20 +0000 Commit: Wei Hu CommitDate: 2023-10-20 10:22:55 +0000 Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read It is observed that netvsc's send rings could stall on the latest Azure Boost platforms. This is due to vmbus_rxbr_read() routine doesn't check if host is waiting for more room to put data, which leads to host side sleeping forever on this vmbus channel. The problem was only observed on the latest platform because the host requests larger buffer ring room to be available, which causes the issue to happen much more easily. Fix this by adding check in the vmbus_rxbr_read call and signaling the host in the callers if check returns positively. Reported by: NetApp Tested by: whu Sponsored by: Microsoft (cherry picked from commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3) --- sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++- sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +- sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c index 997a5de1b230..6418f8e59cf8 100644 --- a/sys/dev/hyperv/vmbus/vmbus_br.c +++ b/sys/dev/hyperv/vmbus/vmbus_br.c @@ -682,7 +682,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, * We assume (dlen + skip) == sizeof(channel packet). */ int -vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) +vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip, + boolean_t *need_sig) { uint32_t rindex, br_dsize = rbr->rxbr_dsize; @@ -714,5 +715,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip) mtx_unlock_spin(&rbr->rxbr_lock); + if (need_sig) { + *need_sig = + vmbus_rxbr_need_signal(rbr, + dlen + skip + sizeof(uint64_t)); + } + return (0); } diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index 883b74e92d95..97bdc12d80cb 100644 --- a/sys/dev/hyperv/vmbus/vmbus_brvar.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h @@ -127,7 +127,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr); void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen); int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen); int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, - uint32_t skip); + uint32_t skip, boolean_t *need_sig); int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv, boolean_t *need_sig); int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data, diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index 85f87a5dbf99..ff42f75a883f 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -1201,6 +1201,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, { struct vmbus_chanpkt_hdr pkt; int error, dlen, hlen; + boolean_t sig_event; error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt)); if (error) @@ -1231,9 +1232,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0, *dlen0 = dlen; /* Skip packet header */ - error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen); + error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } @@ -1242,6 +1246,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, struct vmbus_chanpkt_hdr *pkt, int *pktlen0) { int error, pktlen, pkt_hlen; + boolean_t sig_event; pkt_hlen = sizeof(*pkt); error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen); @@ -1273,9 +1278,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan, * by the above vmbus_rxbr_peek(). */ error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1, - pktlen - pkt_hlen, pkt_hlen); + pktlen - pkt_hlen, pkt_hlen, &sig_event); KASSERT(!error, ("vmbus_rxbr_read failed")); + if (!error && sig_event) + vmbus_chan_signal_rx(chan); + return (0); } From nobody Fri Oct 20 10:51:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBhGM0DLTz4xdXR; Fri, 20 Oct 2023 10:51: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 4SBhGL6sQdz4VQK; Fri, 20 Oct 2023 10:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697799083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haZnvcLbAnTj7AJ8Tr90RnOOVxQ8EcV2h7yHx3cDQAc=; b=jRVpxfhdgWszZhczYXhZ86h7p16z+4y9C2CesvzpQiCgrOGZWAJ/5LS46hOeY5W27Uvcg5 A4iHwotMpXfG971k8Edc4R6WLxEBPfBRmHJ2gbdHf8TtpF9uF04pSfDLFqALl/Y1RNCZzH +NCJcip3qW2zGAu8hQwVZjMDIqgRLQMopS0UHaqDl8/gYmz0Uc/rWCjnBYkfqOZk0nC3Ia Upq1iLixwy4eoN0RzYB0ugHXE98hpLh727tLj7bhaxsJUcBqSAV9Fw/eUQiiztVCnq8RHo WJ4bEjjlKfWPl5j2wOgbywDCkSdSe9cKgVGVBY9UEN9wRpsx+VR3P2qWRH2hWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697799083; a=rsa-sha256; cv=none; b=sCYREsWaItMVwzvA8eFLKBFXYNoLoGfd4Iua8TkT2xGlI7uDc8m4xIQYlqUPHnmIj1BvWQ fPj8AFchxtrcm2Hr1Q7h8ozRl5ZcUVwR0MpeFrQps1LAIchGRBlFvyDw64f1IWyU0tcmPk GXEmWoSurazPO3D6rh6yriHpO8kuUZjyTDDl3hvlUBWdZt/MsZtV+yY+5UiAH9IraopUgB aFMIb9NdTMO+yggxwQ9nhIjlO+FnUqcIwGfR0EfhiMm3DsbKpEU9bCQ+kHMRHKx4pUOnqy Nk0iqtA7m6NM4k3vY1GC0VllnSVhzOfIJwBnMVix19AdqvLgjWFEjPMp+Gv9mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697799083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haZnvcLbAnTj7AJ8Tr90RnOOVxQ8EcV2h7yHx3cDQAc=; b=YRYyfm0lSSP8t4rstQabgYylERFvhC+t/8Lld4aLXePqSKbRUqC68/dOOlT1GxLOS5nXEk iA0kCpadG2DwrVNqTwrgyHugxgnaj3YDxwcmuMaDrLagyKp7r6oH3jHOGmwWi6veJc3z2r l7eWj4iLX6g/tU2vmMg8kWNDF8B1rdohIZ0qgmK0z0Qb63OvOQ435NiTZaWBdrbRLiEgQA GVw/TcncjTDohmizkVLEEHWtXjWIh3aaV5dvNPsuVbYpy1D0MpoGhRj0EoQtNL8W9PloD6 hOcVD+L0b2XM2q1lylN5wvcHMN91Qb3KVciEI7tVcwSjdGHvtprMUQJMeBpqvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBhGL5wS9zVXT; Fri, 20 Oct 2023 10:51: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 39KApMaM019424; Fri, 20 Oct 2023 10:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KApMNX019407; Fri, 20 Oct 2023 10:51:22 GMT (envelope-from git) Date: Fri, 20 Oct 2023 10:51:22 GMT Message-Id: <202310201051.39KApMNX019407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: da4b0d6eb06d - main - netfront: fix the support for disabling LRO at boot time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da4b0d6eb06d730487d48e15d2d5e10c56266fd9 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=da4b0d6eb06d730487d48e15d2d5e10c56266fd9 commit da4b0d6eb06d730487d48e15d2d5e10c56266fd9 Author: Doug Rabson AuthorDate: 2023-08-12 13:19:47 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 10:50:20 +0000 netfront: fix the support for disabling LRO at boot time The driver has a tunable hw.xn.enable_lro which is intended to control whether LRO is enabled. This is currently non-functional - even if its set to zero, the driver still requests LRO support from the backend. This change fixes the feature so that if enable_lro is set to zero, LRO no longer appears in the interface capabilities and LRO is not requested from the backend. PR: 273046 MFC after: 1 week Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D41439 --- sys/dev/xen/netfront/netfront.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index b4e7722552e6..dafb838cf328 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -2272,7 +2272,7 @@ int create_netdev(device_t dev) { struct netfront_info *np; - int err; + int err, cap_enabled; if_t ifp; np = device_get_softc(dev); @@ -2304,7 +2304,11 @@ create_netdev(device_t dev) if_sethwassist(ifp, XN_CSUM_FEATURES); /* Enable all supported features at device creation. */ if_setcapabilities(ifp, IFCAP_HWCSUM|IFCAP_TSO4|IFCAP_LRO); - if_setcapenable(ifp, if_getcapabilities(ifp)); + cap_enabled = if_getcapabilities(ifp); + if (!xn_enable_lro) { + cap_enabled &= ~IFCAP_LRO; + } + if_setcapenable(ifp, cap_enabled); if_sethwtsomax(ifp, 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ifp, MAX_TX_REQ_FRAGS); From nobody Fri Oct 20 14:07:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBmcN4hcJz4xpmp; Fri, 20 Oct 2023 14:07: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 4SBmcN45zzz4ktC; Fri, 20 Oct 2023 14:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697810836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9zae9zItOh4kWX8HMzzoUwRIMFmOPumBKfqWRWRxUY=; b=QWeZo3wK4xEDlUL3UBev13fDpwmKFWLnx2GPFTt8Dbz21qDh7W25pa0MlKQj4L/b4WaMcd /eQb6OPn/Axs0A+eExVUymgLS7m41nRif6zb2n8+wfwRoGGeAyjaCMHmmXjSBym3zSHVZG ekvTb8wzrGlUYLuVhPJIT0brovyBdsqeqzrh+nrbW3C0FkXz3qrywxNZHDOvxWusqDGz+t IjhV6hFlhpZkF1tGPboITQPErfrGbP7wBgAEZDa2R4lwgYeC7h+/LoeAkerWT/413ABAQj In9+7sh52+QtLRrpuJ+/I/IFMSLqOvCO4oFKtRvoIXEESDwcjrThkNiknoASRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697810836; a=rsa-sha256; cv=none; b=OA5KMtmHAPpqE8B4Xj7/PcGExjqAUH7OkdNx/pdA47lRaEH0i1huWeU9q+EAbA0DuHsVQT esBiTRKmFUwDJHbbXKLV3mjlL4G3WGUSGrpsZKKOgaqYfTHyL6m4riUBNMExpsjcCsCUep /S7JoJ8REZpevyXvx+A/jKFxjEDz5DJq/d3yKsZAdEKbE1ni4xGXAipK4OZp+O6HJfKbE7 mF/2hZIeULAydleAwcNQsMi+ca6L0wLSynuc2i/JZWaSKEQN50MG8I4Ty9W+m3Y+X/b6no cuFNgmuxhb/9JBleJuft3wMGXf1siQyh8mnYFY3kH2aK1urzEDVD+iVAj3Rb5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697810836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x9zae9zItOh4kWX8HMzzoUwRIMFmOPumBKfqWRWRxUY=; b=jUmmMnR6EYA4ciWuik5+ZC4Ye04xUENHSgsx6+TnTVekcHVCMOQkgq03+rLtFwM44WXJqY +svRkeOXnJBvlWf2tFIILPhuIimoOb7OEBAbjOXH3Z4pKwPGDzx43+lLZQ+aky/0F70Qxg wQ51WAHkIbrMHXYtxVWLnVksxhnT7akElmQ5W+WJ7JPxuHlIWjyvnHHwIp6jQK5Kin3LSp BKaLwMiLbTEQsYvxAvjPGHpsSLLnLBs1/n5oTLF9Ez3T4Z4HXXXl9FzaJFhdQYYTSDEg9o 9R4FT5vSfbxEx+oMfiaExwdDq/mXUL0h0nKuIBXox8LjOgbqKp27NiB5NZTzkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBmcN35xSzbtD; Fri, 20 Oct 2023 14:07: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 39KE7Gap039323; Fri, 20 Oct 2023 14:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KE7Gcf039320; Fri, 20 Oct 2023 14:07:16 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:07:16 GMT Message-Id: <202310201407.39KE7Gcf039320@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: 6ad6929974e6 - main - netinet tests: Fix leaks in ip6_v4mapped_test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ad6929974e6394d57a40f7d43c899963c6ae5ec Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ad6929974e6394d57a40f7d43c899963c6ae5ec commit 6ad6929974e6394d57a40f7d43c899963c6ae5ec Author: Mark Johnston AuthorDate: 2023-10-20 14:05:58 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 14:05:58 +0000 netinet tests: Fix leaks in ip6_v4mapped_test Reported by: Coverity MFC after: 1 week --- tests/sys/netinet/ip6_v4mapped_test.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet/ip6_v4mapped_test.c b/tests/sys/netinet/ip6_v4mapped_test.c index d4c4ed526ab5..bbc8d11d63ef 100644 --- a/tests/sys/netinet/ip6_v4mapped_test.c +++ b/tests/sys/netinet/ip6_v4mapped_test.c @@ -294,8 +294,7 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) error = connect(csock, &su_mapped.saddr, su_mapped.saddr.sa_len); if (error != 0 && errno == EADDRINUSE) { /* This is the specific error we were looking for. */ - ATF_REQUIRE_MSG(error == 0, - "client connect %d failed, " + atf_tc_fail("client connect %d failed, " " client had duplicate port: %s", i, strerror(errno)); } @@ -312,6 +311,8 @@ ATF_TC_BODY(tcp_v4mapped_bind, tc) } ATF_REQUIRE_MSG(i >= 1, "No successful connections"); ATF_REQUIRE_MSG(got_bind_error == true, "No expected bind error"); + + ATF_REQUIRE(close(lsock) == 0); } ATF_TC_CLEANUP(tcp_v4mapped_bind, tc) { @@ -365,6 +366,7 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) ATF_REQUIRE_MSG(error == 0, "getaddrinfo: %s", gai_strerror(error)); memcpy(&sin6, aip->ai_addr, sizeof(sin6)); sin6.sin6_port = port; + freeaddrinfo(aip); ch = 0x42; n = sendto(s, &ch, 1, 0, (struct sockaddr *)&sin6, sizeof(sin6)); @@ -383,6 +385,9 @@ ATF_TC_BODY(udp_v4mapped_sendto, tc) n = recv(ls, &ch, 1, 0); ATF_REQUIRE_MSG(n == 1, "recv() failed: %s", strerror(errno)); ATF_REQUIRE(ch == 0x42); + + ATF_REQUIRE(close(s) == 0); + ATF_REQUIRE(close(ls) == 0); } ATF_TP_ADD_TCS(tp) From nobody Fri Oct 20 14:14:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBmmP5rtBz4xqHX; Fri, 20 Oct 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBmmP5Ks1z4mMP; Fri, 20 Oct 2023 14:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6QS9VnA1lCWOBcC468GXTQiEYH14OgHiDyAKr/L6iI=; b=ArqoaXuuA7aFCsMbAtxlTEqvoEJSK2gzfMCdTukhohMmeBIIMhpXNKzU4e/eToOHv7Wx0t UvvRbLjKDO8hLIMt72meI8V7MZFdAcvCldOi2u7cKYEPRZdQEnhExLCjBu7HeRN+VTM/ZF nORc225qMtFnuobYHc/PWv7CGCPyv3avLgCPqXUKsCbmOZozkOBQIgAYAFFewXdHEKYx6e PyNJKRoqCnjq8qjYCHCqnvE1M5oe+/VHZFUrjAeLaQ2xNv9dNttuy8ozIH+n+sLPTgfGTc jSnenef1EQtvKGvcFyxyxgSoOdd2rd57ZmAVoddtFgij9fWyHGetUlZNZgdtyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697811253; a=rsa-sha256; cv=none; b=kCPLs5rBqGpfffyPXVl7K0r04F9NpW7xK9BGiUs+BVEaAgpolIR/PFq06tRA7umTRt+QvJ j9yqyz2hpvLjAb61ewjFyGnCi+KsKajCD60vDASdN/IQfWi3Jh975yHeLIfU9VAy+j0UMo UNaaNY5FQ2WarzCRr1Lgqf09zQHPPZoM+xUBAE9nnKJy2Mjl6atIoSDNFLLBsciFjlvi6s AjlXGvTAlXQ5buuBi4q2kH1KHFYT78h1O1/GsDsSLl6DqAAwfaUpZ6mCZEsnuTPk+RlWRE CIddVfr7ier675d430C3WzA91zNaV/K3TvkbORYz/HNOvF3k7CPBeHGDc69Ubg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6QS9VnA1lCWOBcC468GXTQiEYH14OgHiDyAKr/L6iI=; b=bzHOfWQBQzdhJ+k56fERbI5HIRf5NFbUC4eQCvwJZfEnAgr1mh3rpy7iq15dpigf7aj0ya fRGX2lsu1+ESzEWcUaWFGNBPQ3LjKLu1Dhp6UbwvXDuneB9Oqygm27PXfH5EcNnAHeIU7K 5GpUPH6/8dvhNPN6exY5DW7uKkhz9WoHMkb9NG+oEg9OXWvKLJfx/9qiUHzhu6UJbgWyPZ 5Dp6iVYCm6ue+PjB/BcRPV1vEUMi76dAtEBBL6ypnBvx1OwTyIhHz8msVVvUKGP/xPjo1w gb5tckqzt0aIbDSJvHDmM5EmHn2+6Q016/mqcKaBF7zEtPzvUtf9XsohEkALhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBmmP4PK4zbMk; Fri, 20 Oct 2023 14:14: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 39KEEDau055057; Fri, 20 Oct 2023 14:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KEEDFZ055054; Fri, 20 Oct 2023 14:14:13 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:14:13 GMT Message-Id: <202310201414.39KEEDFZ055054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 8015c5477bd9 - stable/14 - pkgbase: put library links and symlinks in the -dev package List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8015c5477bd9a110f12c77ab9d2bd98a15258ec2 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=8015c5477bd9a110f12c77ab9d2bd98a15258ec2 commit 8015c5477bd9a110f12c77ab9d2bd98a15258ec2 Author: Doug Rabson AuthorDate: 2023-09-13 10:18:09 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 12:16:47 +0000 pkgbase: put library links and symlinks in the -dev package Some libraries (e.g. ncurses) install links to the main library for backwards compatibilty. This change ensures that those links are in the dev package since the files being linked to are in that package. PR: 249143 MFC after: 1 week Reviewed by: emaste, manu Differential Revision: https://reviews.freebsd.org/D41841 (cherry picked from commit 4e899378bf5d89c20430d32982d2635657f34c04) --- share/mk/bsd.lib.mk | 1 + share/mk/bsd.links.mk | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3099c8e205b1..5f328d5378ca 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -568,6 +568,7 @@ LINKGRP?= ${LIBGRP} LINKMODE?= ${LIBMODE} SYMLINKOWN?= ${LIBOWN} SYMLINKGRP?= ${LIBGRP} +LINKTAGS= dev .include .if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY) diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 990c4cb65a29..6070979612bf 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -14,8 +14,16 @@ afterinstall: _installlinks .ORDER: realinstall _installlinks _installlinks: .for s t in ${LINKS} +.if defined(LINKTAGS) + ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${DESTDIR}${s} ${DESTDIR}${t} +.else ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} +.endif .endfor .for s t in ${SYMLINKS} +.if defined(LINKTAGS) + ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${s} ${DESTDIR}${t} +.else ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}${t} +.endif .endfor From nobody Fri Oct 20 14:14:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBmmQ6lcgz4xqYC; Fri, 20 Oct 2023 14:14: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 4SBmmQ63CSz4mvW; Fri, 20 Oct 2023 14:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCeFAN3t4K3bwf4/FC2NbJVHki7Bx0CKUVAQBvfWx5Y=; b=IseSEosbVd96tT9CXOE1cbRltbohoJNL3WGpVD3fU4liEuiWrHOkcSSvD5VWMHR7q6lIkp T5LwvswTX8E1lL53lEqnXo8cKDtNkxqB7joj5QrI7PW5QhKIpJtw6tDly//44bjg7tD7Ig NDJWkfOeoLpU3cmG2p6I//pNhZbJIzYFMFV6vgWkfrF/C0p6sTte9DS8k/KL1U1+46KrvX DlAOwbxxrYdofaNqxfFS7+GMKXDyOkBJBVTIf8RU8XY4342UkKOs7AfZamXGxQ0sWFpQsL NstPm3YPk6K288uqwLWb7e7bDYqRQwCA09fznoh/nBLid4fC+qSgagkceCgA0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697811254; a=rsa-sha256; cv=none; b=kaKORZ04KBVaq3uRB2YZaYg11xmmpcUAKPWAn3yZCyftO+/Dk3JObqMYEgYEFd/dhmhvkg 85FHSWktvMWaaTTXRqG7nQ6GZx/E0P1EZIaFnTEM314W4JvncdhxA8qkKrnXCOJ2E5gqrF 9DBaQPZbJkeHL5qYOf/EAlYnwesC+0PGBXzGOCkp3eTwrgyG6Kx7mbo4K4RIH74rE3htnT 5T2ZYp4zMCd45Uryt1LIQCKioSD9MZJRQETagTWwABtZZENs4QwOrMenHyOfV5k0fTfC8W Bwp/9bJNPGZ3Hqa6cdpYjTNjxg288xxBRO43Fzq4MI51YdA9slpU18p9Rc1JYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RCeFAN3t4K3bwf4/FC2NbJVHki7Bx0CKUVAQBvfWx5Y=; b=Ru2JUPbtaKFDpP6/DFS6BoaHjJ/0zIVyCe2S+cuuHMo0TpgrLuvhpHEpOLxKJcqIlk4oSE z743ZiuEt9IXQd87cIvv5XpbDEqYLbR6C+z1DUaOWa0Pkj5dDNXWodAJm92VbaSDoEVemO e5g6U68ILn6L7vxF9AujTvynFRLjBXT6lEBMnLVCEwHWS+pPx5YGEzSS+oJSpVVOLY+q1o rIhUrAtb8zEJgO7H+oJJALdS8pU2MsY758WflfWlxr1DsOmcWLJCMj11T1EtOlYsqqUbDy cfTE/C6ylYPAH3DMzeMKCQiiJCsp68UGQ0O+wCkzTwqTzdpTqAQy87GIlHCqcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBmmQ58s7zc8n; Fri, 20 Oct 2023 14:14: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 39KEEER0055105; Fri, 20 Oct 2023 14:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KEEEq5055102; Fri, 20 Oct 2023 14:14:14 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:14:14 GMT Message-Id: <202310201414.39KEEEq5055102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 2eab6bc3c08f - stable/14 - pkgbase: Add instructions for upgrading past 78847e1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2eab6bc3c08f8f2238a24df336fcaa019592dca0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=2eab6bc3c08f8f2238a24df336fcaa019592dca0 commit 2eab6bc3c08f8f2238a24df336fcaa019592dca0 Author: Doug Rabson AuthorDate: 2023-09-17 10:06:01 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 12:16:47 +0000 pkgbase: Add instructions for upgrading past 78847e1 The pkg solver gets confused by the file moves and refuses to upgrade without manually upgrading FreeBSD-utilities and FreeBSD-utilities-dev first. PR: 254173, 273859 MFC after: 1 week Reviewed by: Mina Galić Differential Revision: https://reviews.freebsd.org/D41892 (cherry picked from commit 4ff9d270893af757b4348398c887e630d71edf6e) --- UPDATING | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/UPDATING b/UPDATING index fe80f259cb12..4a8ce04b94e9 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,16 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230924: + Move standard include files to the clibs-dev package and move clang + internal libraries and headers to clang and clang-dev. Upgrading systems + installed using pkgbase past this change involves extra steps to allow + for these file moves: + + pkg upgrade -y FreeBSD-utilities + pkg upgrade -y FreeBSD-utilities-dev + pkg upgrade -y + 20230824: __FreeBSD_version 1400097 after the branching stable/14 from main. From nobody Fri Oct 20 14:14:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBmmS0kkKz4xqQH; Fri, 20 Oct 2023 14:14: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 4SBmmS0C5Rz4mqQ; Fri, 20 Oct 2023 14:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZA+Ve7D9fDwxve3WA4EwZEg9ymXm9a4N7D0mVrPIMU=; b=kO0gsZE6UMIo+SzPvmDIYX0hCiOEmai84aM0dRxvmfcK4bxiQKtQUMAFhK4P20rqfBW2wI YV7TsIXWv2EiaFg6oxMrIT3kX8XMFp+vEOAT49j0GDNZ2VcLmact2Y5NkwI1cz1+DElchO YVxUXRbFuZEMwsqgxQThQcE7cD0OiXj9U837PzZTGS9eA7DeMm/V+93l8iEy+2xAhw7OxP Ur40rqKSqAUtWGiMT3Aua1/AFDfFbCzhA8VvQSFu/dEsyRWFC4LIMQHPZPtczBG0HxKq7s PmjuXlGUeDyZ3s0RnLsSzUeCN2clCZ0nL0LjeYgbY3punvl5DGNLpPv+WOUbGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697811256; a=rsa-sha256; cv=none; b=XEJxvRw4A753yC14qzPDg4IKTrfqOf5spGKKsKXf9yg4/vq6JtmdclwLyljDrZh3MovJJI oe0pOMOR3fxXy8ytC8TP4i4UrLAYfdxjB4nxxNuK+QAwypKflK8cxL+eJgZmQ5FJd6yjW6 99qAcV5Mq6LCnbsENLg8i2C1X46dlvPjhYFnM8tFCiqaU71jkLrx+EMNaGhedEJGE+f8aZ JaZmuq9y2ypOWP2DCrZSBjlUD3/YBIqiJIDGL2e9t3ukyEJPLEkwora5+1E0ObJU7aPRj2 fUTSSj/2aQqlAr0GdC2/OYvMCkVHWBZZvmGwIdoJF7FU/QRH+0N2qxpoUJLwmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697811256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZA+Ve7D9fDwxve3WA4EwZEg9ymXm9a4N7D0mVrPIMU=; b=uO8O0Qp5gO0K+jy+si0LS5C7oU1Nf0T2SvpEElKzjXLsKecG0oBEqsmJPJLUI5/jriytri vfdF5QHjIBND93DUiyxTsjbQTkC5cv97sKr6ebBsUyjlZUW1schN0ZJrAY1KRN20sa31vO R/usV7/jP7UlWlujBubk18eEwyfimSg4hvw/k6WImgQvIagaIRYt90u9KatckHJttFC1D3 jxmVHvXfvtjPlIXReO5Bu51f0RqKAbUhgfRHbWMJAzsDULxTbd6U+Qln9oL7YkhbO6Abgv CBHON/RWw+JNBkUy4v93kPI6aapto1ujhTqTY+9dviAbFKxbTAzg+tzLgUrF3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBmmR6QmmzbMl; Fri, 20 Oct 2023 14:14: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 39KEEF44055156; Fri, 20 Oct 2023 14:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KEEFbc055153; Fri, 20 Oct 2023 14:14:15 GMT (envelope-from git) Date: Fri, 20 Oct 2023 14:14:15 GMT Message-Id: <202310201414.39KEEFbc055153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 254f85f060d6 - stable/14 - pkgbase: Split out manpages by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 254f85f060d6542bfcb5fafad9a0e0b7d76abc4b Auto-Submitted: auto-generated The branch stable/14 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=254f85f060d6542bfcb5fafad9a0e0b7d76abc4b commit 254f85f060d6542bfcb5fafad9a0e0b7d76abc4b Author: Doug Rabson AuthorDate: 2023-09-14 14:38:07 +0000 Commit: Doug Rabson CommitDate: 2023-10-20 12:16:47 +0000 pkgbase: Split out manpages by default This helps with building small container images using pkgbase. Reviewed by: manu bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41861 (cherry picked from commit 74da9c39c3460213750477204979989b5c39cbcd) --- UPDATING | 5 +++++ share/man/man5/src.conf.5 | 4 ++-- share/mk/bsd.opts.mk | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/UPDATING b/UPDATING index 4a8ce04b94e9..9858822f4071 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230924: + Enable splitting out pkgbase manpages into separate packages by + default. To disable this, set WITHOUT_MANSPLITPKG=yes in src.conf. + + 20230924: Move standard include files to the clibs-dev package and move clang internal libraries and headers to clang and clang-dev. Upgrading systems diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 82c8752722a1..b31d44abde9f 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1157,8 +1157,8 @@ is set explicitly) .It Va WITHOUT_MANCOMPRESS Do not install compressed man pages. Only the uncompressed versions will be installed. -.It Va WITH_MANSPLITPKG -Split man pages into their own packages during make package. +.It Va WITHOUT_MANSPLITPKG +Do not split man pages into their own packages during make package. .It Va WITHOUT_MAN_UTILS Do not build utilities for manual pages, .Xr apropos 1 , diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index bb9fba38e5a6..b4761333d8c5 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -60,6 +60,7 @@ __DEFAULT_YES_OPTIONS = \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ + MANSPLITPKG \ NIS \ NLS \ OPENSSH \ @@ -78,7 +79,6 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_PATTERN \ INIT_ALL_ZERO \ INSTALL_AS_USER \ - MANSPLITPKG \ PROFILE \ RETPOLINE \ STALE_STAGED \ From nobody Fri Oct 20 15:19:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpCC739Cz4xtSM; Fri, 20 Oct 2023 15:19: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 4SBpCC6VzQz4tHF; Fri, 20 Oct 2023 15:19:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697815143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=Y/+eAchsDt7koXNq8hgbydD6Rhfy9uVRdCzi/cgdUcPf7R61Mi09MEMXcwKgqIl61xijRZ UiKX+1j7BjPZBCZyhnEsxQcWnfcSX+aUpjGJOVwhofRu4iyQw27goCARSK/myE5Il4P1J7 NbzzaMgoRF3PXbtPE4huuK/sCzVjQ67b1XYROjDdgCHkGbqrDk+O8Txknl+hmbdw9/n5/P eBxPRSyf23etKWKGjeC19z2TiPolH15UctTLPMmEvdf3s3njo8TmFYSHcWrTr2uIV8QUQF jGv3ZiVos0YxretacKVp1mpaONL8+yzE4DFZyH5Fux5rQWTzkDEXp5QyF+aj7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697815143; a=rsa-sha256; cv=none; b=JY+H2wN3av/2hFQLHGunqLZuSU1CeFTIEw55Bb8WKZacC3qHHeRvTAKEuBhtyfd2jKRwdj xDEh/umfXaVmJsJfpbSL3DyoNg85tFypuTJDUXTgqSXQcdpyNWXEQCaamTVmplXpPLjoRW y/OeHtV5fLa7UeVwMfq4MxHtmOQdVOeUz6hHID+fEtQrB5ZkAXVpFEb4SmBCX4QyAc+drA 4P11cNglSKggwFI0ilgPuJODHuiNehFCmpxQuSUWAftXAIYFhOtUENKj6IT8ZrUTf5Ci1m iafn35GWZTzGV6ADzLMnk8vLcFQnNIHOewm9EEBgQkQ7BYA+a98Ef6yZDaI5eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697815143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xhOayl6dGlDCjOtbDwZXjPtqQf4R+QJn3u2pPhq85qc=; b=eymf0bmp98V+gUZ1nu4ibupEnnSzCMVQkYysQdtdRmFFIPOPRghvOGER1m8b5wKrvwPShw pIwEoY/+SqX89f4wWzFdfSnb/ZCNHdPNyuP+06afDxBWwciX6qc2l4Ng9FtuGWJg11o+qq iHoHSXmsBZQxC52zoox+lgTHbMW4GI2oDHHoAzeHdY21QRPWqWyg+iqJ3jMxSK/jlI1Kwp qlaeVSYipXgM95y5Q++p2I6Bv4UXhxa9Hs1s0+fPGqi/PDHARAfS/PjPjiKwaDtTfo+njz qT1X8W+LBVl+7/8hqlN7W889S5T56rxqtv4EKP41qLN8Jhw54gmUB+8jux5l3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpCC5c1Fzd39; Fri, 20 Oct 2023 15:19: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 39KFJ3hL055689; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFJ3VP055686; Fri, 20 Oct 2023 15:19:03 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:19:03 GMT Message-Id: <202310201519.39KFJ3VP055686@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: eb875881553b - main - Tweaks to libarchive's upgrade instructions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=eb875881553b5aa0a53ccfb02131ea254f4ee3b1 commit eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Author: Mitchell Horne AuthorDate: 2023-10-20 15:11:21 +0000 Commit: Mitchell Horne CommitDate: 2023-10-20 15:12:02 +0000 Tweaks to libarchive's upgrade instructions I would like to use this file as an example of the FREEBSD-upgrade convention, see D42302. libarchive is picked somewhat arbitrarily as a longstanding piece of contrib software in FreeBSD. - Remove SVN references (HEAD/trunk) - Mention the vendor/libarchive git branch - Update link to import instructions - Remove $FreeBSD$ Reviewed by: mm, imp, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42308 --- contrib/libarchive/FREEBSD-upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/libarchive/FREEBSD-upgrade b/contrib/libarchive/FREEBSD-upgrade index 0689acff2599..0b5d4e921f49 100644 --- a/contrib/libarchive/FREEBSD-upgrade +++ b/contrib/libarchive/FREEBSD-upgrade @@ -1,25 +1,25 @@ -$FreeBSD$ - libarchive The source code is pulled with git: git clone git://github.com/libarchive/libarchive.git +The git branch for imports is named vendor/libarchive. + For the contrib directory files and directories were pruned by: - + sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' You may check if there are any new files that we don't need and add them to FREEBSD-Xlist. -The instructions for importing new release and merging to HEAD can be found -at FreeBSD wiki: +The instructions for importing new release and merging to main can be found +in the Committers' Guide: - http://wiki.freebsd.org/SubversionPrimer/VendorImports + https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git -To make local changes to libarchive, simply patch and commit to the trunk -branch (aka HEAD). Never make local changes on the vendor branch. +To make local changes to libarchive, simply patch and commit to the main +branch. Never make local changes on the vendor branch. mm@FreeBSD.org -27-July-2012 +19-October-2023 From nobody Fri Oct 20 15:45:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpnb3Y4tz4xvnZ; Fri, 20 Oct 2023 15:45: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 4SBpnb34ctz3Ccc; Fri, 20 Oct 2023 15:45:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=MgBef932uGXmIByadVsjt5mh3Vm8ALlJgmgUrStIUUUa+l471nkzenf17019hBUkTpoEMw aTGE8WQ37qaKwdShkuRY3eOG176JmUE8XjpxmPiboNGrHwmkjtby1xLENDYaBhpctuctf9 m+BMJd2d4q799jTw5I7YCPZfwyQWYaxuyxM9eO3hs4rSL//52Izz3qmsNe4qai/tTRFiZx 4vzYY2KOUu0NJqTjJlGL3+BESzruzewn5NdGg5S0DYv73c5peb/0yGI8XyLZPDHZTVQyJv iRy+wB38oS/twFuY3mYLxkm6oJt5GlhvpyMHEnr5PtEc5zNO50MkR45OG6m/gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697816723; a=rsa-sha256; cv=none; b=Q56hznPFAo+BiwvUCdZQ5NDyDVl1Ycx/YorxaOvr1TemhuhfKsd4c4ByCODjR7U3N0x/ov bt/2dRM679XdfR9HTT6qxFXip9QWS6f0xg4AyO1nVqD5OX73pgoGEKGcVV4e/O6u7tDLbL rwQF/eZTR1wjfy09VElXlmz2/vjlQcOFijNGi3vxuWP1mF5u0a7UGd7esh5Tzx81cN4+iR mbjgKBo2X59lokP9LD2m8yguUZABDgSU8D64sOt4kvSpdOejN2wjqxBl5IKyzD5fMDWDSN ngo9BxWZZTh+5RLzNwtr0p/3kg1AXxIvBIbnxt9Oz913NuCJIxMWXa90VCzjUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ivm+Uhf24ZmmIuosdME8F+vXEI7658eyBs4M5cXLyks=; b=tuNLvDpVayy2LEd4b5biyD4XveZxPrQTQG8bBjVMs4oCRrEG8sHBiaHx0imt8GSxKSultH 9FUJm0F9KU4p7AhhrJkxPMNE6C3G+Qsv2y0KTpnnfii/zXPGp2B+LKj+w0Pq4mq0W8Hn26 IY92yVyxrVhr6NIi6cYoVjAD7J8qNQUh5NTm26sHLSmGWMeQjY+ffK+itJ5Zw4n1HUY6X6 yh7JTecEELZbkZqhWPRvGLfuowGz6x8RL7PIVMFQDqs5B2CMk0gDuciYZQQ4+DEkOsmGPK Sp0vCBS+dxIGhRhK/w89jNgV+zKyAEYBikTwo5MVAJ92rxxqKQlophQKVx1heA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpnb27MDzfHw; Fri, 20 Oct 2023 15:45: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 39KFjNH6004980; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFjNZo004977; Fri, 20 Oct 2023 15:45:23 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:45:23 GMT Message-Id: <202310201545.39KFjNZo004977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f39010b1393d - main - sys/sys: Check for __ASSEMBLER__ in elf_common.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f39010b1393d471f1c59195acde5d95cdb66847c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f39010b1393d471f1c59195acde5d95cdb66847c commit f39010b1393d471f1c59195acde5d95cdb66847c Author: Andrew Turner AuthorDate: 2023-10-12 09:45:43 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:36:28 +0000 sys/sys: Check for __ASSEMBLER__ in elf_common.h When preprocessing assembly files with clang or gcc the __ASSEMBLER__ macro is defined. Check for this as an alternative to LOCORE in elf_common.h so it can be included by .S files. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42224 --- sys/sys/elf_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index ce82734833cf..934f66fee953 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -44,7 +44,7 @@ * not include the padding. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t n_namesz; /* Length of name. */ u_int32_t n_descsz; /* Length of descriptor. */ @@ -112,7 +112,7 @@ typedef Elf_Note Elf_Nhdr; * The header for GNU-style hash sections. */ -#ifndef LOCORE +#if !defined(LOCORE) && !defined(__ASSEMBLER__) typedef struct { u_int32_t gh_nbuckets; /* Number of hash buckets. */ u_int32_t gh_symndx; /* First visible symbol in .dynsym. */ From nobody Fri Oct 20 15:45:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBpnc6h5Gz4xw9J; Fri, 20 Oct 2023 15:45: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 4SBpnc4cZYz3D0c; Fri, 20 Oct 2023 15:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80sp9s9+ftXJUEUk69n5Q911SA4AW4QZMXGRh6GespE=; b=Yy3KguKWTwLlHw5FrzfWVmqpeLdSpVIX/ORbbByJdMA1TIlFs/RObvE/1jpx94/kahMPJA s9P2u/GopyvR1Vi9OzWj2ZufftJIAGYsuApn6uA0E4Rj7ZuG0pO2l5xRaNwPf6R2gGlmoS pC5OHvaG6P4vLJ0wsw54ExtbkJmWNAfa8C2DrAqe9iLgU/LLLcg+sAT02OALz3tQ+bFzTn X/Q6RHPek/kbeGkveqTYmkiIDCPIYJWuW+JsrUZmXE94I2FpfzflhNsM398rbad+T2SqT4 J9m3x4ZOrD8TyRCiCcyiYXUrOBS/c8jC7r21ueM0gw55cPX96OPrghtpD7V4pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697816724; a=rsa-sha256; cv=none; b=hYd7jUqWnm86ZP+9r1QMy9SEuKhEmoaqT7Vycj0sL+Lf7X2/ZwYWfLETgT27HM9evNXUNv fTIkLLGvNPW1sZlSO3IQOeqruQh8dM3vrjR6InsGIpM8oUl0CNElNi941x4e/z5eCm/82A 6mIoBrH+V0+eOK305fyf5LacRq3WmDeLOvZXGz2S1hOy4f73dLO2X2SSJ+me5Cf+RXcKqK Wl8o3qlouNdLZX3Y/IqltN9/Zy2/L0DT1kE7j6iwwrQiXXPszPQPWIjczj+ZIbbpZbT1vP j2NFlwWvUMYHwT8+e19xsdRut1HizLJp8H/z7VSYkLxtwBAla3IsN5FwGA+2+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697816724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80sp9s9+ftXJUEUk69n5Q911SA4AW4QZMXGRh6GespE=; b=QTe3I31J6v/0u66Nx0j7ZH4x83UTgp8Cu8dleHWSgbK+z4Cqd43ZHxeMw0Up9a5ZMjmU1C 2NgBkeYSfrR2f8Z3Bsx52HQ2r9CHX9Tm38kUMjggby8/RGDXHi6UWue/+fp60F8dkIUSez R67FccW2m4UjDm7lX7mH69q5mWe8fR7jC+QPDxt7t/Ht25zCQiGn8F1JbvGauEQjFsJLYT 7r8K5oEuFupcg5FwuVy4f641/qZPf/xQvm9kLvI8VpwPzDEWhB2+1NZjzQ+j+lehb0CvRR cxjC8PN+bkDCRn/md17IEn5v9Mav58laQf9VM+aq15RG1S0Lt+tXwHt6pLi48Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBpnc3PfHzf3l; Fri, 20 Oct 2023 15:45: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 39KFjOSI005026; Fri, 20 Oct 2023 15:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFjOLA005023; Fri, 20 Oct 2023 15:45:24 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:45:24 GMT Message-Id: <202310201545.39KFjOLA005023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: ceefd491c7f0 - main - tools/build: Support building with glibc 2.38 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ceefd491c7f0490515fadca2f3740cb24e3f449e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ceefd491c7f0490515fadca2f3740cb24e3f449e commit ceefd491c7f0490515fadca2f3740cb24e3f449e Author: Andrew Turner AuthorDate: 2023-10-20 15:45:06 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:45:06 +0000 tools/build: Support building with glibc 2.38 Ubuntu 23.10 uses glibc 2.38. This adds strlcpy and strlcmp so we need to remove them from the cross build environment. Reviewed by: jrtc27 (earlier version), arichardson Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42303 --- tools/build/Makefile | 10 ++++++++-- tools/build/cross-build/include/linux/string.h | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/build/Makefile b/tools/build/Makefile index a19d2bf64bc6..668a7198e228 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -196,9 +196,15 @@ SRCS+= strtonum.c merge.c heapsort.c reallocf.c SRCS+= rpmatch.c .if ${.MAKE.OS} == "Linux" -# On Linux, glibc does not provide strlcpy,strlcat or strmode. +# On Linux, glibc does not provide strmode. It only provides strlcpy +# and strlcat from glibc 2.38. .PATH: ${LIBC_SRCTOP}/string -SRCS+= strlcpy.c strlcat.c strmode.c +SRCS+= strmode.c +# Assume if strlcpy exists so does strlcat +_WITH_EXPLICIT_STRLCPY!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c strlcpy || true +.if ${_WITH_EXPLICIT_STRLCPY} == 0 +SRCS+= strlcpy.c strlcat.c +.endif # On Linux, glibc provides ffs* but not fls* SRCS+= fls.c flsl.c flsll.c # Compile the fgetln/fgetwln/closefrom fallback code from libbsd: diff --git a/tools/build/cross-build/include/linux/string.h b/tools/build/cross-build/include/linux/string.h index 87347df1e9bf..8fac9e0fe083 100644 --- a/tools/build/cross-build/include/linux/string.h +++ b/tools/build/cross-build/include/linux/string.h @@ -47,8 +47,11 @@ #include __BEGIN_DECLS +#if !defined(__GLIBC__) || \ + (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 38) || !defined(_GNU_SOURCE))) size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz); +#endif char *strnstr(const char *str, const char *find, size_t str_len); void strmode(mode_t mode, char *str); From nobody Fri Oct 20 15:56:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq225bVhz4xw8s; Fri, 20 Oct 2023 15:56: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 4SBq224xkXz3DwV; Fri, 20 Oct 2023 15:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2cBBTEv13yjQXoWhDnCbuLgn8baROzlGN25i/vHWO0=; b=fqJFPywCu+Y/M67fDZfg68AG8gynKjHqCzbck+QrAZ+GWZUtYby1OvTei9Ebl0bNuRP/xI /zgA3zRrx5geGvl0w0nwNGsRxzQyTjfjTasHzEtz8vm3cWf3UPNDwr0bwFQgloBsfQMzt+ S2B5S9/dJlKOVNAz/ghvLgsoZxnvv2lrf05GSvm9WauaNoLD5zFTYIpZVqDh6g79Cuh43d 532LLM0Un0qGUULJ7YF8yECO6KvKhEPLV4gsUmus3EeRXTCyDoH2uMCTkXy6YxIM6Z1L8b Nsopnv418RwTkMUWGbwAeqHLjuHniFf3RB/6bOpzmuDO2ADuhAGGB/TOQN0Gfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817370; a=rsa-sha256; cv=none; b=uHigjVwqnPKJEghsT3Wf9d/y4Uwn5VkbR9a/9gV1fkDpd9VsGZ2gz4YoH/MILqWqeNhOOq jfCFIdLWtRv3uIr5PvrblY2hpDHlqc18OShi98+5qSm6qhjX92F8YEdiVTJ1w5/we4xm0D zy9NEv9YvZtSjQmjsl4EgL/W/5m2eHvsZsqJGR89U+ybtFdWP8OG40T783/yGa4f89zCiC 1v+RmtRqO7hdRly2T0NJDdwXAbV1WUWVpeR1bAR+H8vIFjwXXprMBz1pUtbC7SsU1r79eT KoP86NZuQa8rJAcwu/5q52h3Oe1kBAHvjD123ebI121MZsxKilRjqYUxSN9t0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2cBBTEv13yjQXoWhDnCbuLgn8baROzlGN25i/vHWO0=; b=CrxfA3XLiiCzsz7IWoNIZ2LzxnSasQUT6bfZFfkpCopc35xqNqdLh1ZYqYbUO0MsLdoCrE RijsiVqqUY9Xat6w2Q8VCYiyNh0vl9461qHaL61xlHrKyQo+WaR/99pEgafuYJsq7vYNXH r6kA4oXDzgaa+olTS0UTcIaQ1EtPpSUGDMVLBjbVS3tb6w40XqYRxGdkkYgTNJtRBvZ9fJ OcY7x6JW6g3qRdVSMIUwuRftp6Da10Tfw1KuwSLP0voz73lSenCHZ3/1cTlgMo8X18WorK /HFXa42W6ayDBv1k5ccRjxTD9nb3w1ET4SV9OMdFhU99qxS3ggRNA7C8denOaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq223zNGzfgR; Fri, 20 Oct 2023 15:56: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 39KFuA7K021521; Fri, 20 Oct 2023 15:56:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFuATs021518; Fri, 20 Oct 2023 15:56:10 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:56:10 GMT Message-Id: <202310201556.39KFuATs021518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e857fe22279b - stable/14 - arm64 locore.S: fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e857fe22279b384322faa9d0dafd7896cef871ca Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e857fe22279b384322faa9d0dafd7896cef871ca commit e857fe22279b384322faa9d0dafd7896cef871ca Author: Konstantin Belousov AuthorDate: 2023-10-09 23:55:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:55:44 +0000 arm64 locore.S: fix typos (cherry picked from commit 4095e0bcb9e8fac51eedad89211a5b16af7f55ad) --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 0ceb01eda5c0..d3dfbdf8a76f 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -134,7 +134,7 @@ virtdone: sub sp, sp, #BOOTPARAMS_SIZE mov x0, sp - /* Degate the delda so it is VA -> PA */ + /* Negate the delta so it is VA -> PA */ neg x29, x29 str x1, [x0, #BP_MODULEP] From nobody Fri Oct 20 15:56:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq236DQtz4xw19; Fri, 20 Oct 2023 15:56: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 4SBq235qGXz3DxH; Fri, 20 Oct 2023 15:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SZiHgBVxH5GiL5rBZOi0kHyIHavvEiZYt4LqzY9G30k=; b=azV91ZiLGpwyN2Rn7VTezy3nzVnMzeD5AAl6dRlKTFTFWlyLf45pPl+aYZcj/+vyrDuIxd ZAJZwxLQ192uF3b+NcqmQF3kzmSFqj4KCLmaFA7jDMgM4lbzuXhkXZ//085h4tqVbblneV owAvmPVQ8DcQwTpn14lXc8i81NMDy8yTKB9lYCRVbnjVsDfxOKvhOt2hHz6YUIV08RPqp/ xKB3ZJ+/C7xR8tBWMAC222a+kfKfEjTPL2xk+q0SvWt+bL6TSloyfRov5Vo45gvXPAwG2C o2jv20/wUkHBI7oXV/FJNH3tyAhMgh0C6V+lE5DtZDZYb9l+64+Lli2bC7MVbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817371; a=rsa-sha256; cv=none; b=CC7weM08H+Yq1jXxIBolXaFzTbIdARviTmGu7bZYKSLEg3PnoNomYYe9/+OOyggOM021zs dVjsFL2KH/1ZPYETqQdVu8pz8IlErRuCxpziZfrlWRAks55bG3aBsBBsaz6vVEX4yHytZp iX7z2KZUlchpvlaZulWVhpdN5qfeE5PJd7ipoY0gqdP/xbwc+Kp2T25QFDU2N1XJBkyuHr DTuWVLNtep13lyx5DwnAFJMqHJ+4Qx36MTvcuPrRXgsuT+VDHJJJEPDZhEnsmoP161SRfC xG0gbQwXnQMlLMxPw0HTfC3NceZD0eZ55cecN0qq9ozD9kU38tSJSGHT3CkfEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SZiHgBVxH5GiL5rBZOi0kHyIHavvEiZYt4LqzY9G30k=; b=uLCfwQJUBhG3bnZksked0A1zIlRhImF9Rp9lbhM11vk6GbCzcMUrI8VQuLDKpE1Iwv95ed lFQVmWYmJxFWSHbrlFrrKV4yTD2+XjUXcRCCF8p8bvdO6aXjltyUoA554aU3OaAn1Odal5 VcDkroToF1UneZqLfw1VBDyL6EUSJBINTXeBcrKLW2EjsxCAuf6URxbOheg9P3XWMX+zls 2JuXZKeM1TklCFXygT1P/PTjZSoA/eTRkLcF92N+gEXIi/64yKHv8/YyQuy0yquMita0AJ wiKir8akm1g2ZL0HdsHzJdk1ie/20snP3W5DcuC4d5osvMbisGjUMVn3aA0Elw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq234tWvzfM6; Fri, 20 Oct 2023 15:56: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 39KFuB2I021581; Fri, 20 Oct 2023 15:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFuB8Y021578; Fri, 20 Oct 2023 15:56:11 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:56:11 GMT Message-Id: <202310201556.39KFuB8Y021578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3f5b4dd6cd35 - stable/14 - arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3f5b4dd6cd35e00544c332422918c296ca853162 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5b4dd6cd35e00544c332422918c296ca853162 commit 3f5b4dd6cd35e00544c332422918c296ca853162 Author: Konstantin Belousov AuthorDate: 2023-10-09 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:55:45 +0000 arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator (cherry picked from commit ac63f7534d0102352bf993ebe2c748ce2ffd432e) --- sys/arm64/arm64/machdep.c | 3 ++- sys/riscv/riscv/machdep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 4bfbfcaa91bd..8aa45a86fef4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -26,6 +26,7 @@ */ #include "opt_acpi.h" +#include "opt_kstack_pages.h" #include "opt_platform.h" #include "opt_ddb.h" @@ -380,7 +381,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; #if defined(PERTHREAD_SSP) thread0.td_md.md_canary = boot_canary; #endif diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 6bc0b996948a..261dc8d6d840 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "opt_kstack_pages.h" #include "opt_platform.h" #include @@ -286,7 +287,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; thread0.td_pcb = (struct pcb *)(thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_fpflags = 0; From nobody Fri Oct 20 15:56:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq247464z4xwKh; Fri, 20 Oct 2023 15:56: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 4SBq246VXxz3Dy7; Fri, 20 Oct 2023 15:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=St9DdKc3KElN5BamUSG/EKWnKqxJ6ho8K5POonEw1rg=; b=rLMiHD7SgPVCl16I7hk5WgVACVk6VNCGXmPatDWB0OSbT4KLD/51giadAixu9uhuDb+h7P lwM6JuPkrpd+Fpbw+DJo0W5t/jaahc0+R3czRAZbzQ1HbcIojuYjy7BLZnqa65o0ry/RHR RuEPtztTiTtSxg8COho91kLCw5v8BDCdYa4PNn0ZAF1OYTuQztCo+hrFQZfOLB4wMwuC1d QmeYha2J2nLn/TWq++LuPHWRlzWZiZwRMZVKM+kAqZuxHuQxw7NZqnT0Kqta5TC3dAMndQ RZgUH+GwOXzWJ6ZdckNsVkyH617tYNVA3J8JFupDtwg4WBvMnxfPRhVnjxVWOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817372; a=rsa-sha256; cv=none; b=JTsJ0XpRKa18rm1TG8bj1VqHw+BHMhXapoT08/8995L2pAJ0X0RJsTF59LeGNVvQEcbqT4 50zOcXxpJzGw7l8Pv3Nc/nWvrzBBBAtHSpcfBE465wW4yEPN0pESqw6ElB0/rL87SF+vw7 9t+n7ubXtAEXMjnwo5E9jezKT6wd18ugYhozib8qSZkwmBMcELqYDWSBL3Hlrinqy0Xtt2 5dwp22g7U3UHEV3LO2yQE1tE7Dbahbp6aUk3o3NUoTcWIw5nHl1e/BgXNcYanw05Zz7FGu u4+aYSh2XEagQOGQkU787jafAL00r1srnX6tuub44nX86RK7IW2ynllLyFYvlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=St9DdKc3KElN5BamUSG/EKWnKqxJ6ho8K5POonEw1rg=; b=UT6QADQOdDkax4oyue8kGkMpwgV54zDPiUIooQtRPhV/rA7DdpkvotGJR3WOy2x0LiUJQV vtT+o6HdnB8nmw6kLRyegSQrKig1lD4vbUm7aw3zVSMNMlIzWrqgLZw8CYdYvAirmd5qsH ZHllShKVSdKXFKbyUaDQF367HnJc67kOwSeqJf4UlpxeHeJa0o0DB57dFmvKWGyIIp4wPK bl8JsndtM3INl7cS0kfkpQayt+dlnShF5SaqXsVUPB9kwJtscKtn/3OWeNaFXvPzcR970Z I9vxg8fpCE8sMJjs76i3u5Hw+AjzQsPB0R/Nw9DLyYuRQMZdN9VP8UKAFaX3Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq245Vgtzdh6; Fri, 20 Oct 2023 15:56: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 39KFuCjJ021645; Fri, 20 Oct 2023 15:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFuCi9021642; Fri, 20 Oct 2023 15:56:12 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:56:12 GMT Message-Id: <202310201556.39KFuCi9021642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d4ee047036ce - stable/14 - arm64: do not disable the kern.kstack_pages tunable on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4ee047036cea25334da2157171fecc26f6cb13c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d4ee047036cea25334da2157171fecc26f6cb13c commit d4ee047036cea25334da2157171fecc26f6cb13c Author: Konstantin Belousov AuthorDate: 2023-10-10 00:02:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:55:45 +0000 arm64: do not disable the kern.kstack_pages tunable on arm64 (cherry picked from commit 39cddbd7a07c182c4f121bea5a6effa36862fc63) --- sys/kern/subr_param.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index f7d6cf848424..b7dbf606f492 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -170,9 +170,13 @@ init_param1(void) { TSENTER(); -#if !defined(__arm64__) + + /* + * arm64 and riscv currently hard-code the thread0 kstack size + * to KSTACK_PAGES, ignoring the tunable. + */ TUNABLE_INT_FETCH("kern.kstack_pages", &kstack_pages); -#endif + hz = -1; TUNABLE_INT_FETCH("kern.hz", &hz); if (hz == -1) From nobody Fri Oct 20 15:56:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq261gpfz4xwCT; Fri, 20 Oct 2023 15:56: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 4SBq260Ccvz3FBn; Fri, 20 Oct 2023 15:56:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isLGar7BMNzqFaALeiePwRY5bOxldbbq5P68f8Z2XjM=; b=qDGn1jP9gpHO5Vnhy6rHJ0iKsFeU1TDf0YJXnZPf4eE73Wjj1XzKNg7Q1STKXsk28+YdcS 9oJnHNKJlHqqffRBG1LIWMu6s61QGxKyeiv5Ow90VNoN80J4wUjn9GS6HHRpOi+V87QTPv nbog5MoOXUtnhbuT0WHMqYUlpa7kKZdv2Rel6/nB+5GIM9q6PAFm0BAC6wYaVg1ZjlXpT0 a15mLPoksyQul2ot+ELLmbCS3mrg3Wzmi8aTsxGMXVuCUu9HnXgv+J0TFYqqE7lPL61OSo tGxXJGtw7bjQoOGD5Ipg7TbLGkhRyzeSzDSmIadU1R481gMfnTNBwJyDuvJpQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817374; a=rsa-sha256; cv=none; b=B7++aYwm2TZXes08CSwaQTdalSF2FdSiJSXuwcQgaFfCsqIlkY6FjgyZ1rX6S/Gj5yvmdA Dmg9mVVoe1MPy/On7ycunn6SyVapcSJNI3c3ebvtBaOQ1vJ/WC8twv3VsgUMM6qKFGSC1d x0uc8FxTn1lGVVf9C0e3CYXtNbquV9gfcJGr/TCpuUdUTry1O9ptqPcMsE11AQKiCT9NIs GjtlcxRB9OoNCCCxy4O/j7Mh7WLhMtn1GfXd4kVyVfPrwV1Jf7Esmw/LXMlhe2g3Qna1Ed C9Vt0XUzZxyL/Scj2FZinfxNRdmXVa1wBMQSEnHi1HPF0R+HFbpHz3UOvP2fjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=isLGar7BMNzqFaALeiePwRY5bOxldbbq5P68f8Z2XjM=; b=Fmcr24/W4w+FmGVHZwxqtTWcmfZAdorpqoJQG17xf6jIUGryFvL4p+5xz85FXmUUMrmWJT llRQIB5QHiCvcu663DxJVaZptMw1Cfrlzs9mS11DvGcvtXZ3DUcLXj+XiEMCEO7TRBUFN9 JherT9dgSkLaF0HUiQiw6mCFpkxG6UDHivryQsB3lqIKzWNZBJsPw1Hl+sLeUnJfd3mmzx Qr43sb9cPTEDdaoDkiPe5dvwR4QmasQc+6/pgQ1myEaGmlpHvTXTJkCNbMIHW0jIVFVNsE NfPQahbkBqO22XjJjxsSd9LRacCapLcmBzRG7P2rLitu4OMks5G2s9Bkt56juA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq256QtXzfGC; Fri, 20 Oct 2023 15:56: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 39KFuDJP021697; Fri, 20 Oct 2023 15:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFuDls021694; Fri, 20 Oct 2023 15:56:13 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:56:13 GMT Message-Id: <202310201556.39KFuDls021694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1c02fbf2305a - stable/14 - arm64, risvc: warn about ignored kstack_pages for thread0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1c02fbf2305ac0f058c42f9b81de8543c6e19ff4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c02fbf2305ac0f058c42f9b81de8543c6e19ff4 commit 1c02fbf2305ac0f058c42f9b81de8543c6e19ff4 Author: Konstantin Belousov AuthorDate: 2023-10-11 18:56:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:55:45 +0000 arm64, risvc: warn about ignored kstack_pages for thread0 (cherry picked from commit 6aa641b71d0dd1b26674f0b6dba086410f643595) --- sys/arm64/arm64/machdep.c | 4 ++++ sys/riscv/riscv/machdep.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 8aa45a86fef4..bb7689c19101 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -1049,6 +1049,10 @@ initarm(struct arm64_bootparams *abp) early_boot = 0; + if (bootverbose && kstack_pages != KSTACK_PAGES) + printf("kern.kstack_pages = %d ignored for thread0\n", + kstack_pages); + TSEXIT(); } diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 261dc8d6d840..d5767e240c7e 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -596,5 +596,9 @@ initriscv(struct riscv_bootparams *rvbp) early_boot = 0; + if (bootverbose && kstack_pages != KSTACK_PAGES) + printf("kern.kstack_pages = %d ignored for thread0\n", + kstack_pages); + TSEXIT(); } From nobody Fri Oct 20 15:58:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq521bzgz4xwHN; Fri, 20 Oct 2023 15:58: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 4SBq5211gKz3Fwb; Fri, 20 Oct 2023 15:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ckWEr9Is+rJLhFVDlFykXBBz4VmeNHaHesOFI6atAbw=; b=kftDo79hu6VL9F8g+NP0YoFnvclbOV2MVcwqr6MjAgaQ41MLAi1KxnxauT/GVcvRNV3fRw Hm23Mg7KWUAcWuJXQc846Q5cQlEOuaczrz6zzLx6Uzvuty1zcodAaW4tghc325/crOAgNT cLxxSpwiGKHFB6rEvDeU51JXsU3pmrq4s3MAhE8Kj6C4mdfYmPrNOo5fGw3AzrSIVXfqrg yGxVOKg8WZselA7KDPgLwy+YNpA8ix5H+9Y0UhrXGZX/qnGdZ41EeMAzgzrESeNViFuVZ8 8FDFVVBCox3Wt3Mg4igqkVrleHAEpcgfRYr9BfdkJ3ULf154KqcvCcPylb4QPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817526; a=rsa-sha256; cv=none; b=va7YD0qBKT4zgWrDZvGy1Qy1btrg0IUiCe6px4MMxBtXMAljgI5KGLTKGSKW0VPwTJQOdM fzFjmJj8P9MNR39dHfvvqg7GUg80HbJVg6JtG+IqTqWegORV7i+SDowIOgH0Lp6BuX34ri LVPE43L0OB7FMFWBXgE3RpMG7Z/PQz5pDT0miOK9fqVXxqxfaNNbnrLZVcn+IgE0IJXA4M uL5l89FDCRMfwLbjybG8Zsi2AUgyuf14Y3Vdsi5aG1aFRe2srHSLe6hwE8SbLPVJvx2rrW Q5AzyRdY3e4/LpbKmi09wP1KVjjlRu3qntRM5r+ANDGhOfX9p8RFe6U5k3rHNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ckWEr9Is+rJLhFVDlFykXBBz4VmeNHaHesOFI6atAbw=; b=jVo1DX4crSMYqrLMOs+/vcYRz+PMkc8Am7jDZckNQsl1nnAIHoDomyGbOe9/ITtLw7fRIx i7Dhf65RRxy0y65Bf99JPI0TgxYptlKf5Kv+avMVmoKLCdVbcy3ln9gdhExwAGVUB/P4Qf RO4PMDjFMYuA0vZIRMti6WfzxxbDgYqKzi/DIvSKTn1OUjdKhUIwJyYPMoWp6Q/YffpBJ8 +/fbnWlpqkJm5j6wR1VYl4ja7DZREe0YJu946aespeNyLrSnqiX+kp+ad143XqmP1elHqt C7wvINaVxZtU9qoj7bZttZHoC8wZ6QAUal/daBFs2Uc366VspFYeH74x6I52Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq5205SszfM7; Fri, 20 Oct 2023 15:58: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 39KFwjgl022204; Fri, 20 Oct 2023 15:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFwjE1022201; Fri, 20 Oct 2023 15:58:45 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:58:45 GMT Message-Id: <202310201558.39KFwjE1022201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3676f1a422fa - stable/13 - arm64 locore.S: fix typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3676f1a422faeff4fabaf2d45b3fbc04d9b01d9f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3676f1a422faeff4fabaf2d45b3fbc04d9b01d9f commit 3676f1a422faeff4fabaf2d45b3fbc04d9b01d9f Author: Konstantin Belousov AuthorDate: 2023-10-09 23:55:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:58:14 +0000 arm64 locore.S: fix typos (cherry picked from commit 4095e0bcb9e8fac51eedad89211a5b16af7f55ad) --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index cde28116ff97..4712f8591b8b 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -130,7 +130,7 @@ virtdone: sub sp, sp, #BOOTPARAMS_SIZE mov x0, sp - /* Degate the delda so it is VA -> PA */ + /* Negate the delta so it is VA -> PA */ neg x29, x29 str x1, [x0, #BP_MODULEP] From nobody Fri Oct 20 15:58:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq532PJrz4xwKy; Fri, 20 Oct 2023 15:58: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 4SBq531lvXz3FvC; Fri, 20 Oct 2023 15:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sa+G/c0wcg9IWkWTus+rFhjGoRhoI1OfTjK1GLGxvJc=; b=gQ0WcglnCBFhGNwhw/Abk/1K9SGgrn7PbYvOSySEzWDiBFzEi8mwi03yaum2FL6jFdZPgG /+x5+RtayUtYNApsgrjUbsZW2TNvm0u3y6fA0PrtJzFBI+W3SdA2DTbaCX57nhiKN97aSO u9foJW8xYd1AmvhbMoMvfoFubb+H3LY03aoQG+TeHUm2VRUP5YFGIt6HE9HUMazHdH2WZ9 ve5JuFeuyo0cFOjLl7l7h+rEcdY4g2JCzMeKsv9q5EmBl9SBB1Fb8nO8zJG0Ux/usTDIsr Qx+WeoxtbuMmFg7qplTs40S1NlEIfUOPWQBxELrEdA14sTr4TGlrOYrDRgPRVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817527; a=rsa-sha256; cv=none; b=iLbiLwY02YQy//ZqgArdj554XUUuOLy/pGWpF8T30sSGvqwDIz1TxkmeH/FhadL8wE/orW eZhI3t9tEU7CGVRFJnQTHNmfgeQWjlb4A5LZk3Z0lX5petirpMrBGb1x+5dJk2dY1wJ7Uj yCXKqI74KcCKspHW1qKFrtTo/g1CaEzvmZPzHIoBE8arOrCrZJbtVx1ZpXDCqFvskc6jFL dE2YEmXX3rHZJ7jVcWZvOh5ncSHRDaiD8iy0prLmPC4vpk4pc6N7b1EI8KknA+njGukJYN lpkeXdKT4xjEjKf6Y1h1RGAQr6sRmBD8lmoMhNXykGfZny6VB157skF2DDjb2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sa+G/c0wcg9IWkWTus+rFhjGoRhoI1OfTjK1GLGxvJc=; b=Ga5uHIhHBbQWWS6kIEBBDt55f6hWlsrI1Jhhwjwx0ttdfIvVowgiMCZcdfJ3YOiP3o4MU+ wPP7Dm+a5jomBpEVwSZsgd7LLDByqImzBFx7NycsyBcpceXYTtfsHSXmS/ojMuTErRcNGO h2cztWLo+QjDShGslqluEUqcJcjlcXFu8O0YIjk5wZARm9m7TAbGJHLRZi8EhonZxcxvRK TeSjBP9RneEU1C5lZpD70ervd0yPq4emF+eaHT1j50p1MWuKQIweYqc0YxgHhTcqCdGWhT Gowq8bnlY8RiWX8Wx1XAqtUgX0y9/AQ4+HbjgPPKhffaR02lTkMXyv0McoZ9cQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq530pbjzfdD; Fri, 20 Oct 2023 15:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFwlul022263; Fri, 20 Oct 2023 15:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFwlmw022260; Fri, 20 Oct 2023 15:58:47 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:58:47 GMT Message-Id: <202310201558.39KFwlmw022260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7dd8fb3cd9fc - stable/13 - arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7dd8fb3cd9fccd11082cc82eba68de4c6114e48d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7dd8fb3cd9fccd11082cc82eba68de4c6114e48d commit 7dd8fb3cd9fccd11082cc82eba68de4c6114e48d Author: Konstantin Belousov AuthorDate: 2023-10-09 23:56:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:58:14 +0000 arm64, riscv: Use KSTACK_PAGES for the thread0 kstack size designator (cherry picked from commit ac63f7534d0102352bf993ebe2c748ce2ffd432e) --- sys/arm64/arm64/machdep.c | 3 ++- sys/riscv/riscv/machdep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 0c64160596be..a575ca5eb818 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -26,6 +26,7 @@ */ #include "opt_acpi.h" +#include "opt_kstack_pages.h" #include "opt_platform.h" #include "opt_ddb.h" @@ -363,7 +364,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; #if defined(PERTHREAD_SSP) thread0.td_md.md_canary = boot_canary; #endif diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index 9aeeb4f1252c..b8a60d3a2bff 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -33,6 +33,7 @@ * SUCH DAMAGE. */ +#include "opt_kstack_pages.h" #include "opt_platform.h" #include @@ -289,7 +290,7 @@ init_proc0(vm_offset_t kstack) proc_linkup0(&proc0, &thread0); thread0.td_kstack = kstack; - thread0.td_kstack_pages = kstack_pages; + thread0.td_kstack_pages = KSTACK_PAGES; thread0.td_pcb = (struct pcb *)(thread0.td_kstack + thread0.td_kstack_pages * PAGE_SIZE) - 1; thread0.td_pcb->pcb_fpflags = 0; From nobody Fri Oct 20 15:58:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq543HF9z4xwbn; Fri, 20 Oct 2023 15:58: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 4SBq542mz6z3GM7; Fri, 20 Oct 2023 15:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiiKQap9yxyqWObZydv89IGvVCxcyyfbm+gQSSGtYEY=; b=ypeSt9bhJr4fMAx4NUF/L9MiCWbkfzRUOa8gk67iO7xYz8qyC4GsbkG3L8uz4qg2XGQhpt 11eASXW9lUpP8/8EidYNiRMUlgvPLPM7UtO70QNtDOKtZi0g01cj9k305XEyyqLAIoQ7Gy FPaRZp9qZg+8odDfz/FNSedJHi61Ol+n6PUiAprADuEWWMB1SdMHMRwaMStlg6XPaeMure 6MM7Z1ItvHL/xwZxxZ7EhipYGogAySTCZa6pJyGqlgENPrOSN9ouW60dx8be6Zkgc3mNML sHp8q99JydGZoqivy4NT514zG5A7C2g0jfwETPWOx/jx50AEjV1keg2Y0jPFnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817528; a=rsa-sha256; cv=none; b=xVbbeB5AwFjoJ3dRvmfDgzYLApfV0w99cQj33wbN6Vi0xWrF4cYhBBG6huwCPTTuiVOQAv +S5DFcjTyaEhmISLCVOr3CkMWGvFKxWMqnmY9vsy49+jEvls7Lk4wVJ/+myG00COWU322v TGPdj0pUqE/e2PH4ruZ7uPAoiToFn4yHYfZaUJaxeDomxAg5Eyt0mod6EggZsinWbjfoTv 1oM/Xpha+W9t3kRU3yJD4G6HUAgiTRPGRBCrVlE4LowcQzyghT5qP0JCz94DMZI4I/ApE2 2S7cr8nJaT1mDJVrSaIgXju3A1d5/f2VXpW0hFe0GC65yYTU4AEBlgbdL21W7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yiiKQap9yxyqWObZydv89IGvVCxcyyfbm+gQSSGtYEY=; b=asoQg+lFwklwFC1JEssPwoFSDgwzVIWwn7J7soWW02Zs0Tl4XdpYBd8GGj31CRIA/EDdIN U53DnnV/A3G/q68/DTLk4fX8CUNKIXpH55C8lonYnNbxh1iY9g/VpAsu/S+PKxiAkvaFvg bTxjEY8szP9enq4YA9Fgu003DD1Vcxm3uUgTpsSF/Q7tiH2xH3w5mSY3iFNynl4to42FO6 IjzE4mOcgEoFVHG/KlwaTINJGxNMr8nHYrW+s+jxpnvG5jiEhpALVGFyWoNV77hO6yVg/R XgvNJqpV5AJdNzhxfsA1/FvjU9PBEILefrw4k382n5NokqL/KXv7bFxOOkFSfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq541qyNzdh8; Fri, 20 Oct 2023 15:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFwmg8022317; Fri, 20 Oct 2023 15:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFwmgX022314; Fri, 20 Oct 2023 15:58:48 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:58:48 GMT Message-Id: <202310201558.39KFwmgX022314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1562a8f4b72f - stable/13 - arm64: do not disable the kern.kstack_pages tunable on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1562a8f4b72ff44eef090d07624b9dfce1b02bf8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1562a8f4b72ff44eef090d07624b9dfce1b02bf8 commit 1562a8f4b72ff44eef090d07624b9dfce1b02bf8 Author: Konstantin Belousov AuthorDate: 2023-10-10 00:02:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:58:14 +0000 arm64: do not disable the kern.kstack_pages tunable on arm64 (cherry picked from commit 39cddbd7a07c182c4f121bea5a6effa36862fc63) --- sys/kern/subr_param.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index d26a1902f16c..c2672d98ba8d 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -173,9 +173,16 @@ void init_param1(void) { -#if !defined(__mips__) && !defined(__arm64__) + TSENTER(); + + /* + * arm64 and riscv currently hard-code the thread0 kstack size + * to KSTACK_PAGES, ignoring the tunable. + */ +#if !defined(__mips__) TUNABLE_INT_FETCH("kern.kstack_pages", &kstack_pages); #endif + hz = -1; TUNABLE_INT_FETCH("kern.hz", &hz); if (hz == -1) From nobody Fri Oct 20 15:58:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq556jVlz4xwbs; Fri, 20 Oct 2023 15:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBq553Wd6z3GDL; Fri, 20 Oct 2023 15:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDfTMSA0HQd5pPZXLDsOtGtOpPXjSCS0UG4kS8X4H9I=; b=e9DAQXexciDRB8NIZTx+gp9koFyXC9ydUIQ6v3bTWlm14wJPpXatH3gynI5T1ldVG+2wzK II++bXUkQcizP5j1h8bNCX8wbM69adqKYzruhPYspc9EbFUUiq7OQm16P0hDvkzBkbNxTT IpdCJ0EKFapMl1Dwk7mYWWQhDkUEcj8ghX1Tl0JjMbhMIx9klCnfdB8DnyUOb7VWOf+wMz Fz6MXBFbh5OG2rGnDLcmRz3B+Cc16Zhm3OZ8gZY23TnN6M/L93MV+Yogig3HXNz5rfsZCn ILuGLiN9Eo/1jXDwjxsh1q91gNbfL+yU7DXtB0pYfbQx+9Z1vipbfWEOH1vBow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817529; a=rsa-sha256; cv=none; b=atyN67L/PY+/g/5VXBW2W6MnEdcHGAlMbKtGQ6zMtgtcks0UfxfmdKdVl/B/nX0r7zX04/ pn8Fk6hFoIRZ7bnqN0eDfE8Qe6z4tSlcclIhmNOwluFpMrmr6GBXMze+tIkxUvRcpweMRX s43YnHIKdAzx+sJxVGbmeapZuEj33EGeJJ0hF1IhprcncLfQAEbcgKTq0uDiDz/lnJstfy cxIAAYNfv8UJD//cwJHdnQmvgkzcGeapJ1MiWBgEcO+2o+EwDBLwQ2d7V+tFZqTu4bxOKy p/jsCq+B5NyssQrgUdldxyxJ+IqUkrVTm22gmuMyH9Y69y4vOHdYcLdbDrj7Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jDfTMSA0HQd5pPZXLDsOtGtOpPXjSCS0UG4kS8X4H9I=; b=fqiqIX808latXVBN3zSxuv3lT6eiWwAjI1739oxufCTvzVQD9fQzozL+OLje+eHpi+8VtV n6QD82riKY4kEl67Kp80cumjdZ2j4MtyP/TUJ5CJlZyw9rWOgcVBZbd+sOppDHu9sgYMDu 5rIhH5AvtMk+U2WwJFwaNJgM6nrJw0/4KXmWmVO2HXdMYKshsXSuSVIHVkpi553oTl/Gaf PWrn3zy/4QyjFd6b5jbeq3xrDHpxrvULa2mswqI0CLh7eEyaZLyf0oDNDgImOsjhLuATEK kfbCHGuG3to4dIP7eSV7YenIwcBZgYmCAeJh/vmuCnCBKrO9PohF9KnSAEH0Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq552cynzfk0; Fri, 20 Oct 2023 15:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KFwnAT022368; Fri, 20 Oct 2023 15:58:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KFwnDY022365; Fri, 20 Oct 2023 15:58:49 GMT (envelope-from git) Date: Fri, 20 Oct 2023 15:58:49 GMT Message-Id: <202310201558.39KFwnDY022365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7daf9fd3f4eb - stable/13 - arm64, risvc: warn about ignored kstack_pages for thread0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7daf9fd3f4eb7936fa5bdf238bd7b466e13c0e3a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7daf9fd3f4eb7936fa5bdf238bd7b466e13c0e3a commit 7daf9fd3f4eb7936fa5bdf238bd7b466e13c0e3a Author: Konstantin Belousov AuthorDate: 2023-10-11 18:56:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-20 15:58:14 +0000 arm64, risvc: warn about ignored kstack_pages for thread0 (cherry picked from commit 6aa641b71d0dd1b26674f0b6dba086410f643595) --- sys/arm64/arm64/machdep.c | 4 ++++ sys/riscv/riscv/machdep.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index a575ca5eb818..5c786a58f046 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -895,6 +895,10 @@ initarm(struct arm64_bootparams *abp) early_boot = 0; + if (bootverbose && kstack_pages != KSTACK_PAGES) + printf("kern.kstack_pages = %d ignored for thread0\n", + kstack_pages); + TSEXIT(); } diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index b8a60d3a2bff..79305cbc29d8 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -599,6 +599,10 @@ initriscv(struct riscv_bootparams *rvbp) early_boot = 0; + if (bootverbose && kstack_pages != KSTACK_PAGES) + printf("kern.kstack_pages = %d ignored for thread0\n", + kstack_pages); + TSEXIT(); } From nobody Fri Oct 20 16:01:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq8f2w07z4xxFT; Fri, 20 Oct 2023 16:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SBq8f2SWHz3H5G; Fri, 20 Oct 2023 16:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5V8y86895L5PW619sQ9XDTUVGvQ3P8M6CuxjQQAOP4=; b=BSpp8c3DPSQe5mXRFu8EEquf2kvVGu7GeW+SF9eDrDzdwlPtEDc6KIeBVtUwBm7LBxdOjH p0/OWztmw81U+ojHKsH6bIUqWr/zp+kadSV5H3cPXpPYVCCNZeiWuRXt5bWvRDAq0qkQWQ qbebde9cd7wf+Bk6gab3TzvuMxMS1j25vc8CHoH/7zGFGzB1+Bvocn6i6+hCiPJML0J34k 0KSwaftgGJxc9R4q82skaAT/lPKxhbH8vui9Kv2VxiANZGD1NLLKpDmYrcTwlR7r/piAfR 1uLTlSWbT7MgDOjBDPEwDYokhiOKVx0CFPmR34I9coNLXlgRtonY22MNwGoPXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817714; a=rsa-sha256; cv=none; b=x8Y1FUpkRxJ29BoAckrfLVYVKiHIEtxcWy+EId6rDXwLzHwpvBAK4Wjil5EdMlNQ4L1L/2 F6jxHZkd6riRxxXw0cf9rpeGf6hKLK05guSts/o7MwCcIsxwiR38N436aQPpjHs2vvXIRA QyPzk+JIoKndJdzd7ne6LSGnMVLOXe19KxvP1OCmqWyQg4SJ744ASifahtvYkx4pZXihy/ VAWI2pTpWVXWgN95qCMbQESlgZv1JexI40X40kNPl8VaL/N1CEPlSJcR+PMn68c1Dn08Jj BErn4f1Yxq+JjMP51LMa25tQNfKyQ/z4PY+PfakWCiqjEuqzbxzlPVlb7zAFwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h5V8y86895L5PW619sQ9XDTUVGvQ3P8M6CuxjQQAOP4=; b=iAJixXRXW0VJaS0fms8/5OeDFxTgOaQKmHS+37uaNb6Wj1lLXx9GXZu2wiE0uevlOk5EUP iNO8w8A8xeVrIxXuZa/nmW4Cim2wasL/TYCmub57t3ZzXmw1z5BT67mTN0nHM1/5TE60SO xC46b0wkXxd16ofUG6pz+IWg+D1yrzVgm+fKtowjsPJd/Fr8MfEXFLMnVKGZlhRzSdtRAj yqQTKyX1GcgjPJb0sZlkjePB51fOwtGlgiybSXptZrtMs1ny2hyiEYfDb39VdGym255WzH /YcZCrahDl7H8KGT70w4ngyM93BEgrUu+FdT6T3+1LkQT1M4mFBq8+ZdXyG0Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq8f1Xbczfkj; Fri, 20 Oct 2023 16:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KG1st0037806; Fri, 20 Oct 2023 16:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG1sVM037803; Fri, 20 Oct 2023 16:01:54 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:01:54 GMT Message-Id: <202310201601.39KG1sVM037803@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a861521ac98f - stable/13 - ktrace: Handle uio_resid underflow via MSG_TRUNC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a861521ac98fbcb3ea3c9d21aa06ce5ec1d06b17 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a861521ac98fbcb3ea3c9d21aa06ce5ec1d06b17 commit a861521ac98fbcb3ea3c9d21aa06ce5ec1d06b17 Author: Mark Johnston AuthorDate: 2023-10-16 20:11:55 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 16:01:47 +0000 ktrace: Handle uio_resid underflow via MSG_TRUNC When recvmsg(2) is used with MSG_TRUNC on an atomic socket type (DGRAM or SEQPACKET), soreceive_generic() and uipc_peek_dgram() may intentionally underflow uio_resid so that userspace can find out how many bytes it should have asked for. If this happens, and KTR_GENIO is enabled, ktrgenio() will attempt to copy in beyond the end of the output buffer's iovec. In general this will silently cause the ktrace operation to fail since it'll result in EFAULT from uiomove(). Let's be more careful and make sure not to try and copy more bytes than we have. Fixes: be1f485d7d6b ("sockets: add MSG_TRUNC flag handling for recvfrom()/recvmsg().") Reported by: syzbot+30b4bb0c0bc0f53ac198@syzkaller.appspotmail.com Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42099 (cherry picked from commit 761ae1ce798add862d78728cc5ac5240ce7db779) --- sys/kern/uipc_syscalls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 61f6585fa789..ef3ebeb58176 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -962,7 +962,8 @@ kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, AUDIT_ARG_SOCKADDR(td, AT_FDCWD, fromsa); #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; + /* MSG_TRUNC can trigger underflow of uio_resid. */ + ktruio->uio_resid = MIN(len - auio.uio_resid, len); ktrgenio(s, UIO_READ, ktruio, error); } #endif From nobody Fri Oct 20 16:02:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq9J2MCVz4xwqy; Fri, 20 Oct 2023 16:02: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 4SBq9J0VWsz3HcR; Fri, 20 Oct 2023 16:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5vdzpBpoHMSEMW5Jl6fpkc4iSs+SkJDICaRBrvu0wU=; b=u89UQGaj7vpa/AyTNQ4pRs29neR+nC/xSdYX9zcJz1vM39IJNBdv6EpB8J4gOWwa82VSSR s2CGR1PBsbZv5d826ADHLMU4GEAcRn3Y77/jPkxW339C9yKeZrzyVxf7p+sNvi8DAv4/5b vcqxp79xiRItBxpNeCPii+tUyrrC1DcBbSbh1EddXY4lJPSNYhUGDW8pDv7DAxIRU+f4Pz zrmj+4QQCWtCIsipJegU4tPJT3EmQcw2kQd6u39I4XHr3uDOn5Z7e5/PqaBjMaNnJGAgI4 eEollyTWdO3Wrj2iDTwT+JmBzSc1ZwDeOqQxFxntVc1LhNG4nPmo0yiA0wtPSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817748; a=rsa-sha256; cv=none; b=HCLuQr9aAcoK0p+M3ggNHVAhmD5WHByQ1QsDztoHRyCoGWQ0iPCqI5NvFhOCGSjfhBVIBC rlAfFuCAwyHdHp9HKo2pIRaYdHbIvlls3G5wuymHbEkVkhCOL8oTg2k1H6NcL5TLRKuX7o raTTB/W34njeakTSHMvu220T5qKZvyRsjjEjq4XSz1YWsMIjuV4h19kO9Xl/lVZAKjwr+n VVqMHkNKbJwe+LVVglDtLZQiy1LYlekWF+vGNNkKv0y8INwZTi9opujMhYWLhY2XSKebxn tvchbuBzSivgSFeJ1eatZWVkg7eRTk0F5Kn21AOp5eMDdrCZ3DQpW+5zdLWM2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5vdzpBpoHMSEMW5Jl6fpkc4iSs+SkJDICaRBrvu0wU=; b=D4vvsCsQ9fbsLm3NH9Z0+3qNY1dr+b7xu4TXQ5M3QME/NMbmZhSB9pxZlcObgiKGQApo+Y 6GdFlc9DI2aSDFbuuG0+EFIC9QPwC8eMo28mBljRB2aWzv2UoEr35MwBCg9cXoG6FHQE5T fEEAdwx0rA/68wiDYcZmlyh1l5B7JN1/mF/UedzDdI9YAAcQzg2HQDvYPLHZQI2zkFtgt3 31UMjq7fvbX8O7QlaGpKhTvd2tPtM0KAMEj00GqHUt+eSBsiwPLUm/eY1YNja+qJrWFBPK 9c694gCwzGYwgeq4x+A3hxIz2MkRCciEgsMRSM9Ew81adsPsSm++qneXmFNMHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq9H6j6Zzfl1; Fri, 20 Oct 2023 16:02: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 39KG2R0P038858; Fri, 20 Oct 2023 16:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG2Rk1038855; Fri, 20 Oct 2023 16:02:27 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:02:27 GMT Message-Id: <202310201602.39KG2Rk1038855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c89523d1c4be - stable/14 - kmsan: Set -fno-sanitize-memory-param-retval for now List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c89523d1c4be8f3408fb591261f3093b65dbb675 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c89523d1c4be8f3408fb591261f3093b65dbb675 commit c89523d1c4be8f3408fb591261f3093b65dbb675 Author: Mark Johnston AuthorDate: 2023-10-16 19:45:42 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 16:02:05 +0000 kmsan: Set -fno-sanitize-memory-param-retval for now As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields significantly smaller code, but the KMSAN runtime interceptors need to be updated to stop checking shadow state of parameters. Apply a minimal workaround for now. MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. (cherry picked from commit b6c653c9746342b373af01979319b3cb123b2872) --- sys/conf/files | 2 +- sys/conf/kern.pre.mk | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index f2a31eb24f25..62eb54a0b765 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3872,7 +3872,7 @@ kern/subr_mchain.c optional libmchain kern/subr_memdesc.c standard kern/subr_module.c standard kern/subr_msan.c optional kmsan \ - compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}" + compile-with "${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fstack-protector*}" kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 4d37cd4156f0..158175eb6899 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -122,8 +122,11 @@ SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kcsan \ KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo .if !empty(KMSAN_ENABLED) +# Disable -fno-sanitize-memory-param-retval until interceptors have been +# updated to work properly with it. SAN_CFLAGS+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kmsan \ - -fsanitize=kernel-memory + -fsanitize=kernel-memory \ + -fno-sanitize-memory-param-retval .endif KUBSAN_ENABLED!= grep KUBSAN opt_global.h || true ; echo From nobody Fri Oct 20 16:02:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq9K1l2cz4xxFh; Fri, 20 Oct 2023 16:02: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 4SBq9K18v6z3HZ1; Fri, 20 Oct 2023 16:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKkIO8fI7pgSH12K0TjkxUzJVFTse9HwfQDH0Fsp3vs=; b=qVn+zLfE3GnO8SqA3maVgQZqpeuiX3HY/VjZIlNI5dkPsIQivsBzM6wkKqm/8i4DVtFkt/ DYJEOTULZP2SuZEEjVBYGvnLnZ4C+6waERryjecLEeUAH6lZujdSN2zRQ1MT+UoEwpFNI9 vdSbeo2A5JFSieX66K1XW8eySYF66Uxs+FcLt3PZqPyMHExLWnMZgwwRHSjNqNp5JzGfki epPzDxibIKVGnbHron7T6F4gO/Bax+Owq0zJqxHCaleKCulLL4zRKO1B/JT+prbVKyJeRD AI3v8JXi/Sp4ZfiumfDc7ItRWz1dvY6dMfNvZlhPota9adwTevML2yaypNDSYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817749; a=rsa-sha256; cv=none; b=ysYyMMVuDlw3lAxVcwFGqB0UK5d8Zl1cUjHCMgF7e4qa/mOHvRblPbsPyanNAqAGiZfHu6 lF0IbCyQeaaGBHMIz6K1PDJkyncCwURCekYmp3FZVRZ6FBCNi4TizwmkN8YG7XKOCptl5V qj0v7x4u1GM9M9Znibg7eFTIMYVSfY6sxHrnhnt7hJvpUERzVLLR0vqrU9TFthneL2I4gK 3OvLgsvunafi1LgJwgOFKEXmR9XN1rBnXd6mGObwOq8wXAmb77ctCQei2bZO/AQtlqQC4Z PgURH38mxgKGmrgqdSruVmnShpb7idLrbklHQr0L0E3dtO4SWqsnFHuJsqFBfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jKkIO8fI7pgSH12K0TjkxUzJVFTse9HwfQDH0Fsp3vs=; b=hbCaQBE4gDO1u5/zYt5vBVzzjm0zFg8hea1yGKmqEizyn6OU60pj8VSts+vzHJcHxfe9u3 A1r8cdoPVB5W5AmeOXmWPwNC8f0NU6sdKS6Mp57NZESg9niBF/JyRDESHsCSH0xiYzSeiA TxjTruZ+pYyMBCXb5TCQFVsjsuDns8DASCdsgXTMzR0DLHeA5vXdBK78jLL1DMJGaq1NiA nj7lsFFtcUz1wzGdsXElCyZneEOpcbFE9V87oKOqb5kJuBZNoE4G9We2L46nkIfjwcLMXv VKHM8GZshcPAGSiPYNzi2aSZVMz4JG/XHmbm/sxOytep0QmZ0kyrx0jd5Xwf/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq9K0CY0zfhL; Fri, 20 Oct 2023 16:02: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 39KG2Sns038903; Fri, 20 Oct 2023 16:02:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG2S9Y038900; Fri, 20 Oct 2023 16:02:28 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:02:28 GMT Message-Id: <202310201602.39KG2S9Y038900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: eb965d4f0309 - stable/14 - ktrace: Handle uio_resid underflow via MSG_TRUNC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eb965d4f0309514893745e6cfae998495e76d941 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb965d4f0309514893745e6cfae998495e76d941 commit eb965d4f0309514893745e6cfae998495e76d941 Author: Mark Johnston AuthorDate: 2023-10-16 20:11:55 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 16:02:05 +0000 ktrace: Handle uio_resid underflow via MSG_TRUNC When recvmsg(2) is used with MSG_TRUNC on an atomic socket type (DGRAM or SEQPACKET), soreceive_generic() and uipc_peek_dgram() may intentionally underflow uio_resid so that userspace can find out how many bytes it should have asked for. If this happens, and KTR_GENIO is enabled, ktrgenio() will attempt to copy in beyond the end of the output buffer's iovec. In general this will silently cause the ktrace operation to fail since it'll result in EFAULT from uiomove(). Let's be more careful and make sure not to try and copy more bytes than we have. Fixes: be1f485d7d6b ("sockets: add MSG_TRUNC flag handling for recvfrom()/recvmsg().") Reported by: syzbot+30b4bb0c0bc0f53ac198@syzkaller.appspotmail.com Reviewed by: kib MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42099 (cherry picked from commit 761ae1ce798add862d78728cc5ac5240ce7db779) --- sys/kern/uipc_syscalls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 2dad9d487290..c7c2e6544902 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -948,7 +948,8 @@ kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, AUDIT_ARG_SOCKADDR(td, AT_FDCWD, fromsa); #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = len - auio.uio_resid; + /* MSG_TRUNC can trigger underflow of uio_resid. */ + ktruio->uio_resid = MIN(len - auio.uio_resid, len); ktrgenio(s, UIO_READ, ktruio, error); } #endif From nobody Fri Oct 20 16:02:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBq9M3CVwz4xx69; Fri, 20 Oct 2023 16:02: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 4SBq9L51V7z3HZR; Fri, 20 Oct 2023 16:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wqzGpYtzjhle25n0gSHi8jUP06BnoqJWEw7MwNz7p4k=; b=NXyUvc+ASzOk0H/N4IV6kyYnn6RwSchQetCe7vGyP+XR5rXwSrvYoBtY7IY6YRXqbH127F pv8DajZsXq+ZCE6YzPedne7uxg/1ztynlhB81+SxUua1IauDVxjidQnnKUrTUhEdCkTJs8 h/kHe5EvWowgJj6rq+7Hmw5U+BDVu2xiX+HtswSmHJkVCVx8ikhsGyZaz1ZSsfnl87+Lgd wm6Y2Xjlon7+cIzshA0/wiJ9j6K/gGG0+9XHohvLiDgjtQSjMRUc3xmXiDewpnfLNr/xza TKhc40IfBKu9A4BZtr3yXOEHC34gauB/HR5q/boU7+tw5FUTmlC8Lzaapys3CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817750; a=rsa-sha256; cv=none; b=REOe1CKelNhlZc9WQ3nvJ/9ixzVn04s+vpqEdC6cAVsVH6NNvXzqE//nnn5jqqbJV8KJ5Q TGekJIbNU5Y0bFbYNUgdLIE5UDpmpXcXhxOsslo1yTSz9DHPhUEFKDm5U5zsQJf2jKPnrc 4H2gAZMUpY8wDrmFLX8m95eCfDF1LjsRAv5j68osSNLZOHt+aAvLwBQ+nKDLq4gQqh25oh cnnkA0HEIYvubBxupySy3E17CKNJf9In5ZdAzngCAOisTyoI31pBZD+1RwYG7Tf3Ylhji7 uYGROAHez0IkD1ONBkLPKRLRfKspzXf+ZYWNpcVPQ9EFGjLUL5k0mc+v3AVdZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wqzGpYtzjhle25n0gSHi8jUP06BnoqJWEw7MwNz7p4k=; b=A9eHHv8k4YEZYEJhgdqxQ+/ddLjXWWLjA1PbSvQsVweXvuYeKjqLF9UZXXCsEzU1iCSvE6 bAA0OHVlOqJdRwhrSGHPv4AkUcwjgYstGmSDFsTDy5yfcQvy9Fn9plUt4f52mKVBQL2+28 vQHk+HfkSJiJpm4xE/1he7lLp5DyFvgkKs5RDXQ/DwPVd/zx0Sn5r92lFenj65hwPKZvUD zmPOGJ8kxtDFq9mxx6DXFY/s/LhMFyLKve6SGV0gWSI34is72H2+8D2QBZH2MSKOihOwP7 Sa/TnURlOu9O1EhufhAP+XNMpXlM+BVdnt27wTAwEPwA6R6mg+oSlHSnq/1Hwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBq9L1ZRkzfvQ; Fri, 20 Oct 2023 16:02: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 39KG2U2T038945; Fri, 20 Oct 2023 16:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KG2UJL038942; Fri, 20 Oct 2023 16:02:30 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:02:30 GMT Message-Id: <202310201602.39KG2UJL038942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4533fa42ad91 - stable/14 - amd64: Zero-fill AP PCPU pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4533fa42ad912537a15d72068f2cfca46a465521 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4533fa42ad912537a15d72068f2cfca46a465521 commit 4533fa42ad912537a15d72068f2cfca46a465521 Author: Mark Johnston AuthorDate: 2023-10-16 22:40:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-20 16:02:05 +0000 amd64: Zero-fill AP PCPU pages At least KMSAN relies on zero-initialization of AP PCPU regions, see commit 4b136ef259ce. Prior to commit af1c6d3f3013 these were allocated with allocpages() in the amd64 pmap, which always returns zero-initialized memory. Reviewed by: kib Fixes: af1c6d3f3013 ("amd64: do not leak pcpu pages") MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D42241 (cherry picked from commit a37e484d049758c70f2d61be0d28a115b6f2f01e) --- sys/amd64/amd64/mp_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index ec4501c3aeed..d506ffada4b9 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -300,11 +300,12 @@ amd64_mp_alloc_pcpu(void) m = NULL; if (vm_ndomains > 1) { m = vm_page_alloc_noobj_domain( - acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), 0); + acpi_pxm_get_cpu_locality(cpu_apic_ids[cpu]), + VM_ALLOC_ZERO); } if (m == NULL) #endif - m = vm_page_alloc_noobj(0); + m = vm_page_alloc_noobj(VM_ALLOC_ZERO); if (m == NULL) panic("cannot alloc pcpu page for cpu %d", cpu); pmap_qenter((vm_offset_t)&__pcpu[cpu], &m, 1); From nobody Fri Oct 20 16:04:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqD62TkMz4xxHD; Fri, 20 Oct 2023 16: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 4SBqD61wyDz3Jjd; Fri, 20 Oct 2023 16: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=1697817894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRdecdeUeLQZoynh2P3CuGa2uAfzOMo9Umb1yYNZlAw=; b=oloEUYQHthT5TD8ZsqOGSUYdB+kab9YaT7krwqiE3d0G9GIf0YiRb958otfE5dyTpWUsv6 ftJm1SKmGlv87lfJYE4vXF46WkQ+j4WT9J0GbJGu6G4zbH5FMt74qVYqnwnNTomcKw7P4C ziCX6RZo/pT9og2ybDGSRw94Dp9aaZ6zDfycR4zgkAfFnBBoj0r8fbdJxlVuav0IUVNKjV eupqaBf5rbeuNzW6/LjuhaIA+NYY2Gixxv+Z+j584atyhkvLhO2m3hvWc3zKOKbC5J59gf Ma9yF0lmm+ybBvDgkdjOJ1A8yC5D/iCRDhduJgUoyXcQVUCp3L0IRen5A7Tjig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817894; a=rsa-sha256; cv=none; b=dPVl8tWOpgqUX2LLgB1pOzjhHGF1oENcZzrxAcyrK0QmNEMEQr/pk7W77WO7Ht8eLA7ZNA /EsVgPOoYzRhnUIt6kEtqALe0wIni/t7kNBhotHFiScuJmrJXhAfhosbtY1KHyO850Cmkq nGpwBO7qEGMi5gCu/cU5orH7uBlnk2/CueOlcZAiUyBtBb7g6eaMQrGYfXVnH8HZC4gh3h jP3yudiFBlPuxW3VKDPlFIGPrLx32zjRDeaH+w0NeTIPyUaewO7iEo5+7n3llfUEtUtn/c rsBt/pyX30UyoaT4oUI5tMFoJ/b3Qq+ab3XuimJpWGUD9yi+Wb2in9dU7m3r1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRdecdeUeLQZoynh2P3CuGa2uAfzOMo9Umb1yYNZlAw=; b=yyAMAOXeCv04qimDsFkueuBKfi2m0uQM72SC7xXkv8YFApnGnV+rJ0cVVJAr80ubBVp29r S+tBrnbLiinG9GKQCS5z9guRijiu1Y0lihzsgf7JwlMINZzIZHyD0I6kkLVltfFy+6CCHx wkuqek1LXJhHVuYlHhm1s7X6emO9rRcDaxNpgQIKStphncqBagGmOF6RPIdMlDAZraEToI Kh6oskPrH0elVGnKXAFB2hGwH2b4whXMqxYgzFHFomFCy8aIbKcJopNAD3PNS2b3lPe5u3 bXyisBKpL9ice5m9Q4q6udG8/k45mYjv1pwXFQIaDMXYyagZxd0Qo4P7uOpSVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBqD60zQYzfN1; Fri, 20 Oct 2023 16: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 39KG4s67039369; Fri, 20 Oct 2023 16: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 39KG4sKC039366; Fri, 20 Oct 2023 16:04:54 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:04:54 GMT Message-Id: <202310201604.39KG4sKC039366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 82597d2102a0 - main - arm64: Support creating a BTI & PAC note List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82597d2102a02c4e9e9355717c32867d34b77ef0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=82597d2102a02c4e9e9355717c32867d34b77ef0 commit 82597d2102a02c4e9e9355717c32867d34b77ef0 Author: Andrew Turner AuthorDate: 2023-10-10 13:00:59 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 15:59:25 +0000 arm64: Support creating a BTI & PAC note To detect when an object file is build with the Branch Target Identification (BTI) and Pointer Authentication Code (PAC) extensions there is an elf note the compiler will insert. It will only do so from a high level language, e.g. C or C++. To get the not in assembly add the GNU_PROPERTY_AARCH64_FEATURE_1_NOTE macro that can be used to create it, and the GNU_PROPERTY_AARCH64_FEATURE_1_VAL macro to insert the correct value based on which combination of BTI and PAC are enabled. Reviewed by: markj (earlier version), emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42225 --- sys/arm64/include/asm.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h index 6ebfca6eaf0c..da3c3df5f647 100644 --- a/sys/arm64/include/asm.h +++ b/sys/arm64/include/asm.h @@ -142,6 +142,58 @@ #define BTI_J #endif +/* + * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE can be used to insert a note that + * the current assembly file is built with Pointer Authentication (PAC) or + * Branch Target Identification support (BTI). As the linker requires all + * object files in an executable or library to have the GNU property + * note to emit it in the created elf file we need to add a note to all + * assembly files that support BTI so the kernel and dynamic linker can + * mark memory used by the file as guarded. + * + * The GNU_PROPERTY_AARCH64_FEATURE_1_VAL macro encodes the combination + * of PAC and BTI that have been enabled. It can be used as follows: + * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL); + * + * To use this you need to include for + * GNU_PROPERTY_AARCH64_FEATURE_1_* + */ +#if defined(__ARM_FEATURE_BTI_DEFAULT) +#if defined(__ARM_FEATURE_PAC_DEFAULT) +/* BTI, PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_BTI | GNU_PROPERTY_AARCH64_FEATURE_1_PAC) +#else +/* BTI, no PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_BTI) +#endif +#elif defined(__ARM_FEATURE_PAC_DEFAULT) +/* No BTI, PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL \ + (GNU_PROPERTY_AARCH64_FEATURE_1_PAC) +#else +/* No BTI, no PAC */ +#define GNU_PROPERTY_AARCH64_FEATURE_1_VAL 0 +#endif + +#if defined(__ARM_FEATURE_BTI_DEFAULT) || defined(__ARM_FEATURE_PAC_DEFAULT) +#define GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(x) \ + .section .note.gnu.property, "a"; \ + .balign 8; \ + .4byte 0x4; /* sizeof(vendor) */ \ + .4byte 0x10; /* sizeof(note data) */ \ + .4byte (NT_GNU_PROPERTY_TYPE_0); \ + .asciz "GNU"; /* vendor */ \ + /* note data: */ \ + .4byte (GNU_PROPERTY_AARCH64_FEATURE_1_AND); \ + .4byte 0x4; /* sizeof(property) */ \ + .4byte (x); /* property */ \ + .4byte 0 +#else +#define GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(x) +#endif + #endif /* _MACHINE_ASM_H_ */ #endif /* !__arm__ */ From nobody Fri Oct 20 16:04:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqD73Bhbz4xxMC; Fri, 20 Oct 2023 16: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 4SBqD72mGZz3Jdn; Fri, 20 Oct 2023 16: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=1697817895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1fP8TQTR4hy4eKDw2fBlr38jIN+7sy7q8Ryj1g0ZSA=; b=IvZyHmuIMBEGfouO8Zcgr1iPRAFXCmCT1nYGIp08o8S5rxStAzB+dMlWXUhyHzKXjs0XG4 pX4uvv+leQzRB0xJ53aSI1N83hJEZ7iJI1Gf/op3lPwrl4fz/ZEyW96s8HqhdyfenEZ5X0 /K3bbbmo8eNca8gANrOhvboxbaoYo9egWhT7BE4XW/4HfLnzWNB/+Vf0KWYHXrm/AiDby+ mupSv2bzYpX69nDmst4teB7H8aDbqEadpjgzlOyg/LqmDIaTu3uYVrzFiyWcHFc89br741 /wT0n7r5ZLLNnEzj4MX2Ra1xEJk47EHyO+PLjWu0M4NVTJQiNZdqd5QvaYPVJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697817895; a=rsa-sha256; cv=none; b=PrZgARVLkPdm0E4HigF/5MaHwjoGZwvNes+NDAkDWVOirNKGeCuGoNGRNG2nBun2zv0JTL zkzwomC8uMirig66y14UKO5JA8yraPiMiboL1Kzma/h+GCYwXPeK1kYLQpxrV/Y1fqcbov HVZkflLbPArbbkrVdLmsTc83W8fVODeWVzOs/95E6TClnrgUbJZsx8U64QAaozI4poUSLB Lxi24SXcfR+Zte6RR+DTmTezRrjz50OnJy9wmmtenrC96OuiN/o4KwVPVi+WRR+OnieR0i k+c/zvtsAQ6tz+IN50IKjSj3Fo9AkXFL0fKk25Y89OisR0MwdaP6KFbE/yQDOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697817895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z1fP8TQTR4hy4eKDw2fBlr38jIN+7sy7q8Ryj1g0ZSA=; b=KJOwrrbUquP6dOv54apAF+FgYpYXnGhC9BrFnMX18OnYjletrmvFRUi03P+lk/x+vCLb8V mq4AGWwC5EHd+S7SVQ8y/m1uTfGcggTxeHRnhogZsC7qoULu27G2qKZTAtVK5BF5ykcSUP YR1UTh9c5F0qup4XWNpwrtbOBhBOf3G6gLF75WHMPyoBWWS5g9Mc8meAMVd/pq/OZJwWCH hKlqsFz7SSp1JQ9Cgo9qPi4lp5x1Q66VSrtOhqcdUdPbbJkZYFI52NHJ7tKjO4vMYYMwOt 3wwY/HrX1sZcaumDoXaZ93t6HwNDLN2lojpTe/tFVGQdZeU5j8gWraYlJnl/Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBqD71q3CzfN2; Fri, 20 Oct 2023 16: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 39KG4tbx039411; Fri, 20 Oct 2023 16: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 39KG4tfJ039408; Fri, 20 Oct 2023 16:04:55 GMT (envelope-from git) Date: Fri, 20 Oct 2023 16:04:55 GMT Message-Id: <202310201604.39KG4tfJ039408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2b39a6f68c38 - main - arm64: Add PAC instruction macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b39a6f68c3839454cd255b91978202cd995182a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b39a6f68c3839454cd255b91978202cd995182a commit 2b39a6f68c3839454cd255b91978202cd995182a Author: Andrew Turner AuthorDate: 2023-10-12 09:48:38 +0000 Commit: Andrew Turner CommitDate: 2023-10-20 16:01:05 +0000 arm64: Add PAC instruction macros To support Pointer Authentication (PAC) in assembly files add a pair of macros that sign the link register. When used before storing to the stack it will allow hardware to detect if it has changed before using it in the return instruction. Reviewed by: markj, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42226 --- sys/arm64/include/asm.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/arm64/include/asm.h b/sys/arm64/include/asm.h index da3c3df5f647..16be39b3eae4 100644 --- a/sys/arm64/include/asm.h +++ b/sys/arm64/include/asm.h @@ -142,6 +142,28 @@ #define BTI_J #endif +/* + * To help protect against ROP attacks we can use Pointer Authentication + * to sign the return address before pushing it to the stack. + * + * PAC_LR_SIGN can be used at the start of a function to sign the link + * register with the stack pointer as the modifier. As this is in the hint + * space it is safe to use on CPUs that don't implement pointer + * authentication. It can be used in place of the BTI_C instruction above as + * a valid BTI landing pad instruction. + * + * PAC_LR_AUTH is used to authenticate the link register using the stack + * pointer as the modifier. It should be used in any function that uses + * PAC_LR_SIGN. The stack pointer must be identical in each case. + */ +#ifdef __ARM_FEATURE_PAC_DEFAULT +#define PAC_LR_SIGN hint #25 /* paciasp */ +#define PAC_LR_AUTH hint #29 /* autiasp */ +#else +#define PAC_LR_SIGN +#define PAC_LR_AUTH +#endif + /* * GNU_PROPERTY_AARCH64_FEATURE_1_NOTE can be used to insert a note that * the current assembly file is built with Pointer Authentication (PAC) or From nobody Fri Oct 20 16:35:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBqvH3N2Lz4xyVj; Fri, 20 Oct 2023 16:35:23 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (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 4SBqvG5fDNz3Ptq; Fri, 20 Oct 2023 16:35:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2b95d5ee18dso16900351fa.1; Fri, 20 Oct 2023 09:35:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697819720; x=1698424520; 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=9ayR/ZQvmG95zbyTMcG9eNZgf6fICuNTKGNX17z9wA8=; b=lBAv4BU6ZKFm4JR4n479EufOmibDGckAVvIiyqR2OFtVbXGdOXanvI/sF+qiW74TQ1 eDpyEtEIJ8xH8u+8b0PWS1G+bl0bR+OD/MYvQhJGaqtgSwZTmYxHklIXPUBoR8D75PWs W299EsdSEacYDWEnhq9EsQ4z/eIHWHfDqHeVv4lOaOHytf2xj5lkGSueHXHWxu/6/UFZ EB74zdONpvkRWz2S77cD3xcuoP1ea89XofNd7wSjuvfYilyxe56JiDLiJLPWUELpXa39 lZfOgwAg6C8EN9mdjjxQm1jRF9OTVl/133uL3Knhi1KoQ3jlqvxlCX77cqNQM4gQCwiW 1rbQ== X-Gm-Message-State: AOJu0Ywf7u3nJ6NJ/3849MqTZwwx8H1zwzq/bDUrMMMa04pcWD79OwCW 109Ljsu/RpI2EhJCqOQepqwfmnA3ncGpR6oP4ElQRrBL X-Google-Smtp-Source: AGHT+IESEbWLyTn7YsMt1AvNA9R1SMv8ADs58W1lg81rHA/6JrWK65oy2qAVVcz6sYYdnjCZoy4qYbDfMQKn7O4O2Qo= X-Received: by 2002:a05:6512:3053:b0:507:b0a1:6088 with SMTP id b19-20020a056512305300b00507b0a16088mr1939296lfb.46.1697819719752; Fri, 20 Oct 2023 09:35:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202310171337.39HDb4Xp095686@gitrepo.freebsd.org> In-Reply-To: <202310171337.39HDb4Xp095686@gitrepo.freebsd.org> From: Ed Maste Date: Fri, 20 Oct 2023 12:35:08 -0400 Message-ID: Subject: Re: git: b6c653c97463 - main - kmsan: Set -fno-sanitize-memory-param-retval for now To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: - X-Spamd-Result: default: False [-1.36 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.64)[0.639]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.179:from]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.179:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com] X-Rspamd-Queue-Id: 4SBqvG5fDNz3Ptq On Tue, 17 Oct 2023 at 09:37, Mark Johnston wrote: > > commit b6c653c9746342b373af01979319b3cb123b2872 > Author: Mark Johnston > AuthorDate: 2023-10-16 19:45:42 +0000 > Commit: Mark Johnston > CommitDate: 2023-10-17 13:05:45 +0000 > > kmsan: Set -fno-sanitize-memory-param-retval for now > > As of LLVM 16, -fsanitize-memory-param-retval is the default. It yields > significantly smaller code, but the KMSAN runtime interceptors need to > be updated to stop checking shadow state of parameters. Apply a minimal > workaround for now. What could we do to be more proactive in finding this kind of issue? Is it just a consequence of our (current lack of) LLVM FreeBSD CI/testing infrastructure? From nobody Fri Oct 20 17:47:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBsVV587Dz4y2wJ; Fri, 20 Oct 2023 17:47: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 4SBsVV4YZ4z3WK8; Fri, 20 Oct 2023 17:47:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esuWqVlDqXfVPs9HwjyM/malky9TCcP9vbgvOd8e9zg=; b=GGcmw8h5BYdS6pKOLoXpaFrvBFnh4gVeqFfT/WpDJ/tWMCaF6JU0473EiJy4UW2zKNHQe7 AXARC+K+6ldnpfo2Tpl1gwhbYrU5dElOgrrIRgWujMYaGOMavRvYar7o9H7vk7SUAgjRiG 9pDb9McZaYGlcEg4Rkv7xP2XlMZwx/60+ZZ0WcpyMOAYCRPUms3tWw+jA9AfIrjfXCs4nP 6iSqzbriawXGYf6RZeGY6W8J9MnHQv0bB9wxwj4yaPP1RRsCnxb5pqNvb2pJRN7+ANEj2F djWhz0dYtFMZ+5O8E1N6kn8FvipAiweXSSL0mPCgJQw1fSlVqeCdHzX+cKPZ1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697824050; a=rsa-sha256; cv=none; b=D55De5DTqbjA7vvVysLvotSpBLE8TyWQPhRjAZfsQi4SQhf+5cLu1Eiww7zYt94S5C2sdD ha5CMRkq+OSj7SC/xnvsbg38YHUIKo5pJ/1xwuXzQMIaETCR9saBU7XYvNx9Yr3J8ENOcn 9vI45S7rnQTQS2O3cD9TWLYbyZ2hD05HddB9Z7dB1YwVN8OShDqySaoZqXqX+SphdwJwTe IfsFzoz+xOxgT0cgX9nehFVwrfTgcz5OFCu4AgT/j7LX+o3T7usaWWwsPLg76NqBhRK9Ht UlE03QfwQiBIDz1HedAk6ComBvHgYn7KchjqDCNGSyLgk99whIRrcC2q/E/8kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=esuWqVlDqXfVPs9HwjyM/malky9TCcP9vbgvOd8e9zg=; b=hA9NdyOEeDqiGv/ZqoqaKw30kfYxvGyFDCgjDQSDw0Xf1KmWQI+Qo/amKQ3g/OQPXuWsjK xD0+Kzmle4NpV5VtAp6c9OY+nsip9NFzuOqHNqHPo+pIvDLDk8KpnXqrkenjNvOkQcuO4S kMCvLV0iaIcYuSSXenkeL9ZZHw9xQMCk8AqIeZNnk3/M5EtP+vv0exMMGyMCfmkPXLFsKx tf5zTdHJIQyMILvjBFLDg5gJFFMNCW+OPHyF0WixlNHJ78g6DmYuEnVqK7YlC2dNWE4XPf JJeWx3fenioq/DjHX+M/H08svPcJtRnWZBIT79r4IK/HbLfOMbNzsU3EX5M2Ag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBsVV3c4tzjG4; Fri, 20 Oct 2023 17:47: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 39KHlUnK005436; Fri, 20 Oct 2023 17:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KHlUgB005433; Fri, 20 Oct 2023 17:47:30 GMT (envelope-from git) Date: Fri, 20 Oct 2023 17:47:30 GMT Message-Id: <202310201747.39KHlUgB005433@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: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6120673f7566c35023921540d2d682572d1bf1ce Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6120673f7566c35023921540d2d682572d1bf1ce commit 6120673f7566c35023921540d2d682572d1bf1ce Author: Gleb Smirnoff AuthorDate: 2023-10-20 17:47:08 +0000 Commit: Gleb Smirnoff CommitDate: 2023-10-20 17:47:08 +0000 tests: fix ATF_TESTS_PYTEST no clean build The hack with .xtmp file was effectively making the make to ignore changes to the sources, breaking NO_CLEAN builds. The hack can be actually omitted as setting SCRIPTSNAME_${_T} for every test is sufficient to prevent renaming by bsd.prog.mk. Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D42283 --- share/mk/atf.test.mk | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk index 4b8ac8dedc27..bbc76b7fd97f 100644 --- a/share/mk/atf.test.mk +++ b/share/mk/atf.test.mk @@ -111,39 +111,19 @@ ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}} .endif .if !empty(ATF_TESTS_PYTEST) -# bsd.prog.mk SCRIPTS interface removes file extension unless -# SCRIPTSNAME is set, which is not possible to do here. -# Workaround this by appending another extension (.xtmp) to the -# file name. Use separate loop to avoid dealing with explicitly -# stating expansion for each and every variable. -# -# ATF_TESTS_PYTEST -> contains list of files as is (test_something.py ..) -# _ATF_TESTS_PYTEST -> (test_something.py.xtmp ..) -# -# Former array is iterated to construct Kyuafile, where original file -# names need to be written. -# Latter array is iterated to enable bsd.prog.mk scripts framework - -# namely, installing scripts without .xtmp prefix. Note: this allows to -# not bother about the fact that make target needs to be different from -# the source file. -_TESTS+= ${ATF_TESTS_PYTEST} -_ATF_TESTS_PYTEST= +SCRIPTS+= ${ATF_TESTS_PYTEST} .for _T in ${ATF_TESTS_PYTEST} -_ATF_TESTS_PYTEST += ${_T}.xtmp +SCRIPTSDIR_${_T}= ${TESTSDIR} +SCRIPTSNAME_${_T}= ${_T} TEST_INTERFACE.${_T}= atf TEST_METADATA.${_T}+= required_programs="pytest" -.endfor - -SCRIPTS+= ${_ATF_TESTS_PYTEST} -.for _T in ${_ATF_TESTS_PYTEST} -SCRIPTSDIR_${_T}= ${TESTSDIR} CLEANFILES+= ${_T} ${_T}.tmp # TODO(jmmv): It seems to me that this SED and SRC functionality should # exist in bsd.prog.mk along the support for SCRIPTS. Move it there if # this proves to be useful within the tests. ATF_TESTS_PYTEST_SED_${_T}?= # empty -ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T:S,.xtmp$,,} -${_T}: +ATF_TESTS_PYTEST_SRC_${_T}?= ${.CURDIR}/${_T} +${_T}: ${.CURDIR}/${_T} echo "#! /usr/libexec/atf_pytest_wrapper -P ${TESTSBASE}" > ${.TARGET}.tmp .if empty(ATF_TESTS_PYTEST_SED_${_T}) cat ${ATF_TESTS_PYTEST_SRC_${_T}} >>${.TARGET}.tmp From nobody Fri Oct 20 18:36:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBtZp0K0Jz4y5Y5; Fri, 20 Oct 2023 18:36: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 4SBtZn6y9gz3c4p; Fri, 20 Oct 2023 18:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697826978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY6Hu4U1UomBJ5AVTu9LFWtxEm2LLANMCeV+23VCkC4=; b=AS68VOn9y/3aPBT+tj5uJBDqGnI1tMp/hG/9YcAl188OAKr0FxKpW7F/rHSoMGMu0l5YVm ipfBa/ZFefmeP1KO5hSa5UkwzJW6znn7ppUUcu94EHIOOj1UHTFJV9jTSiXP7bcR5XJkDO 1LMyjZxwajy1ul/wLXknj40LKP35tVUCjyGRupw7bc202yHVRA7A5YqhDgEak3ST+pF1jr 0EocNqvvIGh0KeLD0tLJ357Bqc4ic5hmwOZwB98mbt+wzOObeW6vG86n+r3SAnaf/qRPU9 wwwCACmCV92jllYFyxs0YU9OzUdKQgaPFKao3BhoziPJJGsVHy1qphxdOEd8jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697826978; a=rsa-sha256; cv=none; b=I70337lnWzvkZtZQDW1q/FH1ZGFDdnojdHeBGUOn3Kx6BKb9Lu2i+ytqIhcTCrmpFcLFDg BJWjdzanbWnFvHsGbKkbMXaD0yxU+5TuyPacpEgUJB//icRzWkhC3bAFgvGztU9du3hgH0 y9reqSrIEltb9Dga7ufAQbQeUpemXOqjDf1hRPqJE7gdq694Kw6HPIrQvCawjcvBzAJkIX rl1z6RhDDa/AgqrZ/01/8SwwSmUxQyjUUwrYrmk1D8WQy5AgBi9aH4okSXt/FAufVY4MeS WXVvsya0HbxkX4arRZLamqkh0ocbxuZLk5QynL1SyhJl4cbiYDVzZLn0sLGgGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697826978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kY6Hu4U1UomBJ5AVTu9LFWtxEm2LLANMCeV+23VCkC4=; b=d33cipi8jspwFGF+qrXiBz5NvvqvxuOuinOKZBKH0/TErpvgwg7rnrgnhaw1FGIPbrEEKR f/HKxms9aVBytpfg6MDbMYG9SwZ7ml+OZnWSnANUqd6Wm801BmICxJTz63zcDBr+E2FPPi XjmgR3jL/tOeyYsKsKVYs1wOtuI8NaLTlxyphRwCtLEr1LST7JW1HyItKsV+lhNWO19lmB owvl43s7FuKuuY9AZ9ikfL4xLKN0xGhvgkFdLS+rJk3PjGLQpSHtu4A4KYpN0FhHevkrtm MZTLhVCseDbj0OU1leoc6/NYEAcWfnnE19g1pGps1WEzMfTkPyY6vkzdKtkm9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBtZn63YJzkg3; Fri, 20 Oct 2023 18:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39KIaHpq089247; Fri, 20 Oct 2023 18:36:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KIaHDN089244; Fri, 20 Oct 2023 18:36:17 GMT (envelope-from git) Date: Fri, 20 Oct 2023 18:36:17 GMT Message-Id: <202310201836.39KIaHDN089244@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: f7c4f4964971 - main - ObsoleteFiles.inc: Remove old mixer(8) tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c4f49649717000238184a975b2339bcd8c06d9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f7c4f49649717000238184a975b2339bcd8c06d9 commit f7c4f49649717000238184a975b2339bcd8c06d9 Author: John Baldwin AuthorDate: 2023-10-20 18:33:11 +0000 Commit: John Baldwin CommitDate: 2023-10-20 18:36:04 +0000 ObsoleteFiles.inc: Remove old mixer(8) tests These were removed when the new mixer(3) library was imported. PR: 274602 Fixes: 903873ce1560 Implement and use new mixer(3) library for FreeBSD. --- ObsoleteFiles.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 749b6dfd7ca0..f08785ac77da 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -2779,6 +2779,11 @@ OLD_FILES+=usr/share/man/man4/ng_h4.4.gz # 20210923: rename boot(9) to kern_reboot(9) OLD_FILES+=usr/share/man/man9/boot.9.gz +# 20210922: Old mixer(8) tests removed +OLD_FILES+=usr/tests/usr.sbin/mixer/Kyuafile +OLD_FILES+=usr/tests/usr.sbin/mixer/mixer_test +OLD_DIRS+=usr/tests/usr.sbin/mixer + # 20210921: remove cloudabi OLD_FILES+=usr/share/man/man4/cloudabi.4.gz OLD_FILES+=usr/share/man/man4/cloudabi32.4.gz From nobody Fri Oct 20 19:52:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBwGh16XNz4y8sM; Fri, 20 Oct 2023 19:52: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 4SBwGh0dZzz4MpV; Fri, 20 Oct 2023 19:52:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC9asVcDpxKUYJ84utvzUpLxT+Gd4s0f8YBwHncgYbs=; b=Bd0e+MXWNzNrCWlwnWiyznQeZNfJMTp1gw9W2fS1DxPCLhIu7CZU0MjL2Uo4J+oJCLPxOq 6H4VgF2thn9hFcTpgiNR4J7/4f1VhUmkaTxvlRfq3C2X/390XD6lXnY5Y9NvsPPluWiY1v qv0XVWGzANKa5BYxv6ltbTcQx42uezrwVgnQXYzyJuoWIhDaE44CPcqGB9SNas7/mQwlJ+ GBsnKDJs+2KwkdwfW/G3rGKkWp6FKMAb0qa7Qtdb8EoNw6F+TEe8HD5oD78VhiKsTq+F7/ yYH8579GXlYkaTMH7Lx64mwA5VRrWv5PL7nHXmKNw5X0JNskcVamz1BUnr1XzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697831548; a=rsa-sha256; cv=none; b=H3Xn6ewl9Y02O/rXb5YJ7YM6j64OO5xSObauNC/P/3h8ETGa1s/WFyL/LPr3fORebEG/4n 9eU1n/qC7DPW//UiZ43QaM2ZcfXPoRZUCGk+EaN0QLNzfCJKpgRdEtAJ87rvYjkvbsRwOb zTvH0nN2VuyXGbWG/uE9WToakpL4fLJ67oLU83D84i1jySxOTSJjnDrRH+yxkNGqRhkkHx xhxzQ/dZOpEDcBTAqeMhtqPC2nr1/v/nN7QXAW63Dc2nQ9j/70OOXkR7PlFavmxFLaiWj2 F2jKGlP0iSpnMpwIk/GL6eW7WddHcwC4uDCuOUsLLHOo7DvHlLGxcL6Cg6PxPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iC9asVcDpxKUYJ84utvzUpLxT+Gd4s0f8YBwHncgYbs=; b=sbe09rA9LZGGs5KSKA4G2cr+xRPhemodwykYp00tYnHiymVywqlsF5eUM0LkHXNWahFXJz z2iQIbo/lHt1cwBbg0XMpSLl5Ld4Nc/ZRIFEp+CUOCTOhiTCPlmFuA3tRe3GqbLLxl1NBj CVPginnbCgJ6oaRxP3v78vvR+qmTrFzLY4kRpyTno8ouTNSOhqdgpgDU0unBGhxQn6/1+t T0otJbsjMHWHSVe3yMKH6nQMrLViSH+N7xpJf93SM/DuLToUfig+HBOGxQ+hFMvWyQjw1i 3hbmQVZUxU0SPh8uIIqpuYNQJ6bz2/+LkQp5bUUsE8VK0rz1KSXQVQ+E1lMNew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBwGg6qJrzm6g; Fri, 20 Oct 2023 19:52: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 39KJqRoN021433; Fri, 20 Oct 2023 19:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KJqRat021430; Fri, 20 Oct 2023 19:52:27 GMT (envelope-from git) Date: Fri, 20 Oct 2023 19:52:27 GMT Message-Id: <202310201952.39KJqRat021430@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: def6ee77dbc2 - main - certctl.8: document LOCALBASE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: def6ee77dbc2ab7d4314002f01367e84e69b0a23 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=def6ee77dbc2ab7d4314002f01367e84e69b0a23 commit def6ee77dbc2ab7d4314002f01367e84e69b0a23 Author: Brooks Davis AuthorDate: 2023-10-16 22:35:34 +0000 Commit: Brooks Davis CommitDate: 2023-10-20 19:52:10 +0000 certctl.8: document LOCALBASE Document the LOCALBASE variable and that it's set to user.localbase by default. Update path defaults that depend on it. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D40529 --- usr.sbin/certctl/certctl.8 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/certctl/certctl.8 b/usr.sbin/certctl/certctl.8 index 4ce61916d79a..286072c1b4d6 100644 --- a/usr.sbin/certctl/certctl.8 +++ b/usr.sbin/certctl/certctl.8 @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 13, 2022 +.Dd October 10, 2023 .Dt CERTCTL 8 .Os .Sh NAME @@ -98,18 +98,22 @@ Remove the specified file from the untrusted list. Alternate destination directory to operate on. .It Ev DISTBASE Additional path component to include when operating on certificate directories. +.It Ev LOCALBASE +Location for local programs. +Defaults to the value of the user.localbase sysctl which is usually +.Pa /usr/local . .It Ev TRUSTPATH List of paths to search for trusted certificates. Default: .Pa /usr/share/certs/trusted .Pa /usr/local/share/certs -.Pa /usr/local/etc/ssl/certs +.Pa /etc/ssl/certs .It Ev UNTRUSTPATH List of paths to search for untrusted certificates. Default: .Pa /usr/share/certs/untrusted -.Pa /usr/local/etc/ssl/untrusted -.Pa /usr/local/etc/ssl/blacklisted +.Pa /etc/ssl/untrusted +.Pa /etc/ssl/blacklisted .It Ev CERTDESTDIR Destination directory for symbolic links to trusted certificates. Default: From nobody Fri Oct 20 19:52:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBwGj24qbz4y90K; Fri, 20 Oct 2023 19:52: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 4SBwGj1Z37z4Mq4; Fri, 20 Oct 2023 19:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=WTTamQsX3MgLOraWwXS2skiba/2cglztzvxVameGY1bawg7WbBMacK/hEHlTxo/xEb2CFo uuR0E3YQmT4STHgb+DC+ARU9GCPv3IyRuYCBIogF4hPnSdPIJFd9KxphJ9t/03wjVjvPJy eCHKqhN0fTQ8EOiHYMXW0bYPiZwvKggfQg73D55ESfcIobK9IzBj4l1wD+DJ2hhixqaGdE iVzsCux+OyTurkVs2LQZwJg/Yih/I5Mg7gQlDo99nPqMRpprkL4FprMCWQq6sqN2TW7Zrb AG1mLE1B3ES/R9ADTypTef33NvH/tEcqKqy8NXI550b0xDQTVVGzsJLs2KcMAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697831549; a=rsa-sha256; cv=none; b=Y2irR+Xm+t53Vm7g+2fEtWdbAj6hETcbCJ4Py7Y2kSXO5pA+3soHoyMXBVElVFRAOB2RMi RiVkWtg8tr414qAJteC24c7UkGN1lkqZM2XmXPbaJ3yr8XaiBIvTGyz+wBrMX+w1OxjFlu e26JJazoL3jaq51tAiszgeqaAONzhd/gkgBue128jQ9MYeSHurJ3vZvrp24VnqTldtakQx 2aIymjt7LcSQqFjK5pMTVHB2MG/LENkfUT48uw3dw+BqqgzsDbN5a53CWmIp8xAE6fe/g1 7dTfrRMiXwGfgHqojgGcSAni2suMz3KoTzq30QadDZcNhoVOT09rLV1MAs4krg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697831549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X2JPns9YDUMyf1A0pghCsXOh79asuPf8h8UG/vjYUaw=; b=CZz9jZC6Sr0xLquD5tVQrNguD5FUdXnnSdcW3p/Qbbn9yDZQ/AuFLvi6qE28LbzcZAfvv+ jyjxAbYsNM5Hog3T7Dr+Ccx7ayKXj/uFH/9wCvWB9MC1Uz3ZBvCnAWRuFLItRrl38wFxsv e1Bi5QdGMagemsnWqRGQQGUhFSVVQoIPWtF7JXNHGExBW7Yw4qpWMhJMhoAOll9CymIrAG K1d3y+Hm7MPQrpgBHgerhw+mBef4Ru/WKJu8FmzLM6MVP2Gfa4wn5wvFR2G25J04bJIEP6 NDqv3u6erAGSL32WJJ4s7EIWrOdPfuzkxI8+EEjzdTRBfCLTkH6QMVGDHMK66g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBwGj0gbCzmGW; Fri, 20 Oct 2023 19:52: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 39KJqTdQ021475; Fri, 20 Oct 2023 19:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KJqSdD021472; Fri, 20 Oct 2023 19:52:28 GMT (envelope-from git) Date: Fri, 20 Oct 2023 19:52:28 GMT Message-Id: <202310201952.39KJqSdD021472@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: 0e0c4f58370f - main - certctl: invoke with LOCALBASE set List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e0c4f58370f25cdd824df06f38865b0d455a183 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0e0c4f58370f25cdd824df06f38865b0d455a183 commit 0e0c4f58370f25cdd824df06f38865b0d455a183 Author: Brooks Davis AuthorDate: 2023-10-16 22:35:40 +0000 Commit: Brooks Davis CommitDate: 2023-10-20 19:52:10 +0000 certctl: invoke with LOCALBASE set When invoking certctl as part of installworld, set LOCALBASE in the environment to match the build environment. That ensures that LOCABASE is non-empty on systems without the user.localbase sysctl and avoids allowing a system configuration detail to leak into the build. Users who wish to build targeting a non-standard LOCALBASE should ensure it is set in src.conf or similar. Reviewed by: Mina Galić Differential Revision: https://reviews.freebsd.org/D40530 --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 68549d91598d..512c4049fd76 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1489,6 +1489,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .if !make(packageworld) && ${MK_CAROOT} != "no" @if which openssl>/dev/null; then \ PATH=${TMPPATH:Q}:${PATH:Q} \ + LOCALBASE=${LOCALBASE:Q} \ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \ else \ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \ From nobody Fri Oct 20 21:54:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzc6612z4yGqm; Fri, 20 Oct 2023 21:54: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 4SByzc5ZZyz4fqf; Fri, 20 Oct 2023 21:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGC5y9zfhwNi7MRhdo+ybKn5rgfu9XaeYX5A3VBSDo0=; b=Na3Hf36O6K8AwzlX/WI2yipt/OkYPHjGfaulZpnk2gUeLU1PHvDgcjkWCYoCKfc22znDTT T2ukgUCPovbvSFmmjV4Ouzsbh+FsbInpkm3QsCMbvrxaN32G2yXoPm08PPMR1CfMnZFD+1 OW2d/ChDfL45s+2kDJpQPdK64LjOmak+cpy1Ff/RvBSFe2iXaqsJRrn+5FUi/q8+o93+85 3s4wgMIZRFIEUfrM/UUZPd8YyoAquUYRNUEUH9LHB9QFOa5ZW9H+g4acc5QiQv9kJkSsUJ 3XkpdFYhGDJYN0DFT+gTpFg8IpX3VJRrFD3gNR90RHAVHJuIR6ZwFLk8vpdu/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838876; a=rsa-sha256; cv=none; b=kPPhmTiQS+hwUzA1KaS0HNc0BYvxYAALK/4ccFUmRTi1M7hBNlL0lh1TpnKQRgPJMVrZVg rYLps67h5mS3ZbbWLGY3Y2tuOrrOf+VZ0KWKBY3X7ywoQZGQLkI6qtN3++UbwLFzaYKfiG ZHCcjbbZmXm3d58OL9V0xcdu4+lEROtPEOXKCxjNVmrH7xprnTpGJ2Q7uSfakTK1+YCX/T SUkvdh/6UkdgSEq6xVZ5n6ClSmvdaZ/OTZWoK6XzaReS4AhWX6v8/7PB/TnoHftcmxeixo 4QcfL30vA12fxvsEZtAUn3hY319Yt+qVLdHpzf+f57H4kdsjAzp6T80rsONKEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YGC5y9zfhwNi7MRhdo+ybKn5rgfu9XaeYX5A3VBSDo0=; b=rSQsYZpP0PLiWFzl43Gc72BLPskvLlpLtIkKEdukZ+gJ/8iYRdhz+JvZzHFzk+1Vh6+Fky dCINOXp2vlLsHdWb4q2nMbx4FUvPpaM1SDb10EVvAMwNW96IemgAXesFVq7qLurmaY7jhN gCAc08SAjaj+HpUF8bS8aqr8ZowGUSML5faQnSpoenGNoeGwjyj5upPQ+wWcyGHPTenz8w 8MwU+rp/ZWUCEhUz7VSVsTHJLmIs8+/Fs70t+CsxEZUpsJX5G69dvM5cALHYZomuaHxfpk u144OTQ9elXETx862mCVBoN0XqS+UGXAjKkNY2Rhpe5OQjrUtmbWHPsKbC/Z2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzc4LNHzpdV; Fri, 20 Oct 2023 21:54: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 39KLsaJF022067; Fri, 20 Oct 2023 21:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLsaeA022064; Fri, 20 Oct 2023 21:54:36 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:36 GMT Message-Id: <202310202154.39KLsaeA022064@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: 2d4924892144 - main - x86 msi: Enable/disable IDT vectors for MSI groups all at once List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d4924892144f653a7a7afba27ed1bf536dd7e51 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d4924892144f653a7a7afba27ed1bf536dd7e51 commit 2d4924892144f653a7a7afba27ed1bf536dd7e51 Author: John Baldwin AuthorDate: 2023-10-20 21:52:38 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:52:38 +0000 x86 msi: Enable/disable IDT vectors for MSI groups all at once Unlike MSI-X, when a device uses multiple MSI interrupts, the entire group of interrupts are enabled/disabled at once in the relevant PCI config register. Currently, the interrupt code enables the IDT vector for each MSI interrupt when a handler is first registered. If the PCI device triggers an MSI interrupt which doesn't yet have a handler, this can trigger a panic when the Xrsvd ISR executes rather than treating it as a stray device interrupt. To fix, enable all the IDT vectors for an MSI group when the first interrupt handler is configured, and don't disable the IDT vectors until the last interrupt handler for the group is torn down. When migrating an MSI group between CPUs, enable/disable the entire group of IDT vectors if at least one interrupt handler is configured for the group. Reported by: jhay Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42232 --- sys/x86/x86/msi.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 7f4d87c09453..246645efbc10 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -120,6 +120,7 @@ struct msi_intsrc { u_int msi_cpu; /* Local APIC ID. (g) */ u_int msi_count:8; /* Messages in this group. (g) */ u_int msi_maxcount:8; /* Alignment for this group. (g) */ + u_int msi_enabled:8; /* Enabled messages in this group. (g) */ u_int *msi_irqs; /* Group's IRQ list. (g) */ u_int msi_remap_cookie; }; @@ -204,7 +205,12 @@ msi_enable_intr(struct intsrc *isrc) { struct msi_intsrc *msi = (struct msi_intsrc *)isrc; - apic_enable_vector(msi->msi_cpu, msi->msi_vector); + msi = msi->msi_first; + if (msi->msi_enabled == 0) { + for (u_int i = 0; i < msi->msi_count; i++) + apic_enable_vector(msi->msi_cpu, msi->msi_vector + i); + } + msi->msi_enabled++; } static void @@ -212,7 +218,12 @@ msi_disable_intr(struct intsrc *isrc) { struct msi_intsrc *msi = (struct msi_intsrc *)isrc; - apic_disable_vector(msi->msi_cpu, msi->msi_vector); + msi = msi->msi_first; + msi->msi_enabled--; + if (msi->msi_enabled == 0) { + for (u_int i = 0; i < msi->msi_count; i++) + apic_disable_vector(msi->msi_cpu, msi->msi_vector + i); + } } static int @@ -277,11 +288,8 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) /* Must be set before BUS_REMAP_INTR as it may call back into MSI. */ msi->msi_cpu = apic_id; msi->msi_vector = vector; - if (msi->msi_intsrc.is_handlers > 0) - apic_enable_vector(msi->msi_cpu, msi->msi_vector); - for (i = 1; i < msi->msi_count; i++) { - sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); - if (sib->msi_intsrc.is_handlers > 0) + if (msi->msi_enabled > 0) { + for (i = 0; i < msi->msi_count; i++) apic_enable_vector(apic_id, vector + i); } error = BUS_REMAP_INTR(device_get_parent(msi->msi_dev), msi->msi_dev, @@ -317,15 +325,13 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) * to prevent races where we could miss an interrupt. If BUS_REMAP_INTR * failed then we disable and free the new, unused vector(s). */ - if (msi->msi_intsrc.is_handlers > 0) - apic_disable_vector(old_id, old_vector); - apic_free_vector(old_id, old_vector, msi->msi_irq); - for (i = 1; i < msi->msi_count; i++) { - sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); - if (sib->msi_intsrc.is_handlers > 0) + if (msi->msi_enabled > 0) { + for (i = 0; i < msi->msi_count; i++) apic_disable_vector(old_id, old_vector + i); - apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); } + apic_free_vector(old_id, old_vector, msi->msi_irq); + for (i = 1; i < msi->msi_count; i++) + apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); return (error); } From nobody Fri Oct 20 21:54:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzf0GSYz4yGx0; Fri, 20 Oct 2023 21:54: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 4SByzd6VDZz4g4Z; Fri, 20 Oct 2023 21:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddZfvzM7q3/TZhKHPPyMz33QHfqWZ4i2lPdg1CjwQf4=; b=K9wI6ZNj3lOde8WP6SoPi2FbtUXMf5MDN3fGmctMxoYK4dCXf8JWUdur1Eiaw3Ufs9yFWS XzAjNHBhd9LGznharnE/Ai0vqcY8IJJY4ocEKgKwU0REz0OuXQcPE8/S5MY4Yd815+ZabS VOcwHlvx9Mfep/MIh1CEXOCrS7HU1VpQuTRZ9jsOe2LWJl2J+bZ7R5/OH0BqpzosZA78+w Z3/opiSRM4McphMF9pormqk3MAegLnusKe4jbXrZVdv8/cPe7ZhmbYPtK3WsQEuuK5lqzY maAcL/U0oCmoe1YdrvgmU6YDhwrU4u2cGrpuboBxYMvDCT/lFCdfk+p56MKKTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838877; a=rsa-sha256; cv=none; b=RF+y6ks5Szf9nUKiZSCbq1p99lJFSsPBc1Ns/O/BnEoVFON1xRiNxH/E1f02yYelFSAiPS n928s+YOufP0yIWnXLA7jgvMYsQnH0csxhKU2NbR0g/FHcPYrL9oWnxVuKR5GFaT66aIsR gqc7gXrJ6KpupxVBHtkAtxOTlyGjTHr0uY9XGLv5R2XvsQRvJ9qX6wjptPHFij4DLsXKos yK/KLhlvddRnWhCMQyE3jdN5N6pBN0QEJE0RmjrE/tYqwVUBukYOiG8V897htOrGnTGZzA IcLWr3BgAuQoztYNliQWPLXZDNQuYlKANXYOUpmL0BQx2p2h8IYh36OXnmFGbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ddZfvzM7q3/TZhKHPPyMz33QHfqWZ4i2lPdg1CjwQf4=; b=GEvtWUUnFeoFD3zm/1mi/989rOkosckY9gZonq6DMAF+9sjPEAUyTOhh7LPpINfce0MjNS +RTl2dEwLqrm53SCzZa+RA6j+El2HEUvFCDfqlNxnjORDm/evSshlqMl9rqonvvhMSB+zp PoOUR1FYz6x5z0k4FhimK3yLd3QoNaSfto6sJ1uBiF00Ke5lFNC2JHKQUAP4X1Vt1B5pzW b6Lcw7E/UM+uZgR5tog6knmdXQ9n6mzuBnP1vLOpURJYV8Nox2DRmd9UBtjhD3FG4T8ATG oh3v+VBQcDcWojQOp5vWePjKxB2TDUDWuwKgNMlpaWOXDWxmmEZ6C8LtafIDCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzd5b8jzpqQ; Fri, 20 Oct 2023 21:54: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 39KLsbpO022112; Fri, 20 Oct 2023 21:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLsb8e022109; Fri, 20 Oct 2023 21:54:37 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:37 GMT Message-Id: <202310202154.39KLsb8e022109@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: bfccb4a42979 - main - x86: Cosmetic cleanups to struct msi_intsrc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfccb4a429795954cfeca4ba60a07c0e1ec35e07 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bfccb4a429795954cfeca4ba60a07c0e1ec35e07 commit bfccb4a429795954cfeca4ba60a07c0e1ec35e07 Author: John Baldwin AuthorDate: 2023-10-20 21:53:05 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:53:05 +0000 x86: Cosmetic cleanups to struct msi_intsrc - Sort members by size. - Change msi_msix from a u_int to a bool. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42305 --- sys/x86/x86/msi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 246645efbc10..888635cba3f4 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -114,15 +114,15 @@ struct msi_intsrc { struct intsrc msi_intsrc; device_t msi_dev; /* Owning device. (g) */ struct msi_intsrc *msi_first; /* First source in group. */ + u_int *msi_irqs; /* Group's IRQ list. (g) */ u_int msi_irq; /* IRQ cookie. */ - u_int msi_msix; /* MSI-X message. */ - u_int msi_vector:8; /* IDT vector. */ u_int msi_cpu; /* Local APIC ID. (g) */ + u_int msi_remap_cookie; /* IOMMU cookie. */ + u_int msi_vector:8; /* IDT vector. */ u_int msi_count:8; /* Messages in this group. (g) */ u_int msi_maxcount:8; /* Alignment for this group. (g) */ u_int msi_enabled:8; /* Enabled messages in this group. (g) */ - u_int *msi_irqs; /* Group's IRQ list. (g) */ - u_int msi_remap_cookie; + bool msi_msix; /* MSI-X message. */ }; static void msi_create_source(void); @@ -277,7 +277,7 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) /* Allocate IDT vectors on this cpu. */ if (msi->msi_count > 1) { - KASSERT(msi->msi_msix == 0, ("MSI-X message group")); + KASSERT(!msi->msi_msix, ("MSI-X message group")); vector = apic_alloc_vectors(apic_id, msi->msi_irqs, msi->msi_count, msi->msi_maxcount); } else @@ -733,7 +733,7 @@ again: msi->msi_cpu = cpu; msi->msi_first = msi; msi->msi_vector = vector; - msi->msi_msix = 1; + msi->msi_msix = true; msi->msi_count = 1; msi->msi_maxcount = 1; msi->msi_irqs = NULL; @@ -775,7 +775,7 @@ msix_release(int irq) msi->msi_dev = NULL; apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq); msi->msi_vector = 0; - msi->msi_msix = 0; + msi->msi_msix = false; msi->msi_count = 0; msi->msi_maxcount = 0; From nobody Fri Oct 20 21:54:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SByzg0fLDz4yGlf; Fri, 20 Oct 2023 21:54: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 4SByzg09L4z4gG8; Fri, 20 Oct 2023 21:54:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDwieO9e/iu1uy/z9qGKQGO3IdpLSiqmhD9RRQLx8SY=; b=ZdT1XIWlszp4NAi8zjqued/TG0A8qG6nZ/6ZcmTdDZtAL55+nIiEPLESkhIuFI/6VYL1P5 s4pPXgq2Gr7c6dJzoZcJVQdLh7bWm3pYwR+lHDwdvhQvb5I6jxEhnP3GqpxCc46uLUcfj6 ygcqLws2KtdS0jfsKWiCfhJTidz3i5K50x5BteWrCmTybaohLqwYD0COsoyeYA6+e17tLi vqzz0gcxLf9ba/2WehhGkTP+hqoTDRAnkY7ZKa1anPjvJNLR1hFCUs0awNc4clfN+QAtqd 2SRFI8tGkDFCpJ8m0AAfPMQ1eCngpFDCMK23FA9FhhmXpb0uA1ypedrz+vx4KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697838879; a=rsa-sha256; cv=none; b=hujvN59SWQKcMaWZv0NE2asDtKQ3TDM3IXSfurek76xOc4B6LUv6O9+WyIRgsjWdid1iqj GUY8rk3n3v07roDHc8ic6NKUzmgLWSvAnV7fw9B9LDMBliZxZVYbVKmpL5PEKGwfzpL1qf JkmbyTHY5tojOXLitpqYetfc2k3/6LLms2oVXlGTugJEfwDQBPvo0UsXOGo3Awi9dBKlS9 ePmnG0q2sUEt0+G+1s6li2VmqZd8atV0YIZ36Gi347TPKcqWfv57mWNQCoIkVLOeNXaL/m +4sPTfqoVSh0jTf2zhiBA7mIbanHBrxT201PFOM99Los4HsQL2AY2wLtzWsfiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697838879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDwieO9e/iu1uy/z9qGKQGO3IdpLSiqmhD9RRQLx8SY=; b=LZkSwHubl8sOsaIlq6eMA2M++gY7b1hoZMPFAwkjqFw3Ob3csFUlTTyJeqXgyWsFzBUfBD i96KDCpbt7avVYsJII0VrHFRSn+ubpF8jleyfdzNxJhGi6d2e7GP+DyI/dOW2gSmTJ8o4Y Cj+p0EhUWbzNj8YpVQs3BUdm8xuPKAZoN/3Ady0fBL5/J/ZkGkTFveTskhZUkz+NegheeG WoQKRtmgZ5wijWOQWdD5th7bZ7eUCmcNEe+oWVDNvfGihjQJWUKoC6HX6Cvp5JN0TypKVR hN4ovZbS2Xzpowx6aN38ye+Ay2M+6V1NOpnOafyGZmyZS8x1R4jzm7CdCB4mjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SByzf699dzqCw; Fri, 20 Oct 2023 21:54: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 39KLsc4x022161; Fri, 20 Oct 2023 21:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KLscvU022158; Fri, 20 Oct 2023 21:54:38 GMT (envelope-from git) Date: Fri, 20 Oct 2023 21:54:38 GMT Message-Id: <202310202154.39KLscvU022158@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: f6c2774fe415 - main - acpi_pcib: Rename decoded_bus_range to get_decoded_bus_range List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6c2774fe415f3b79c551b8075c159d6a7d4d0bf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f6c2774fe415f3b79c551b8075c159d6a7d4d0bf commit f6c2774fe415f3b79c551b8075c159d6a7d4d0bf Author: John Baldwin AuthorDate: 2023-10-20 21:53:49 +0000 Commit: John Baldwin CommitDate: 2023-10-20 21:53:49 +0000 acpi_pcib: Rename decoded_bus_range to get_decoded_bus_range While here, change the return value to bool. Discussed by: gibbs --- sys/dev/acpica/acpi_pcib_acpi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c index 02e3a0be5956..a66ca1199af7 100644 --- a/sys/dev/acpica/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -288,18 +288,18 @@ acpi_pcib_producer_handler(ACPI_RESOURCE *res, void *context) #endif #if defined(NEW_PCIB) && defined(PCI_RES_BUS) -static int -decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, +static bool +get_decoded_bus_range(struct acpi_hpcib_softc *sc, rman_res_t *startp, rman_res_t *endp) { struct resource_list_entry *rle; rle = resource_list_find(&sc->ap_host_res.hr_rl, PCI_RES_BUS, 0); if (rle == NULL) - return (ENXIO); + return (false); *startp = rle->start; *endp = rle->end; - return (0); + return (true); } #endif @@ -497,7 +497,7 @@ acpi_pcib_acpi_attach(device_t dev) * If we have a region of bus numbers, use the first * number for our bus. */ - if (decoded_bus_range(sc, &start, &end) == 0) + if (get_decoded_bus_range(sc, &start, &end)) sc->ap_bus = start; else { rid = 0; @@ -517,7 +517,7 @@ acpi_pcib_acpi_attach(device_t dev) * If there is a decoded bus range, assume the bus number is * the first value in the range. Warn if _BBN doesn't match. */ - if (decoded_bus_range(sc, &start, &end) == 0) { + if (get_decoded_bus_range(sc, &start, &end)) { if (sc->ap_bus != start) { device_printf(dev, "WARNING: BIOS configured bus number (%d) is " From nobody Fri Oct 20 22:10:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzKd0LXRz4yHbs; Fri, 20 Oct 2023 22:10: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 4SBzKc6ghsz3DLP; Fri, 20 Oct 2023 22:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697839812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEVRuWJK6y1sBVM7jjODvGcbR9CzP7MmrI6SenDi9vU=; b=ExXX/41fr9Kwc2wj3H8T1lMiMlm38AafBJfcouKbdj0Ply8hozXaI0PdCg/5cABQv+9Ca1 ihHcOJvPUhMqjTldTQpoUiXdkKFv/G9apxBFITQ8zfXdWLiO7g5KvnRbgCn/j+cWTmOYz6 wCmmTG7UoxMt32C4hb7NthGPd3bHzu4L19YCCLTcf5T8mK3o3m1vQHlh7VCWZSd0dwcmvs i2nuSBosxnb2YnbViiW0pk0MPu94eQ1sZCWaI941TZxAnceIewYsHhn9BAGAl7rjPyXlGB 0H19yGOiVEY0/OV1aKZBPCfhOncxd2G/eJiLFbEktqRriw8FVBj6QhA3XOj7sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697839812; a=rsa-sha256; cv=none; b=JdPYp7w76YwA+qIgE+uoUwmK92/i/lHpiT31NdC4K/WLcFOmPpoTA+kw1NAYqeD9jjt3gs k3xwJi4woGMafB4pgUod2sAnxrNcodtq4t58V5UF+JrRwIDD0d4qjwMfU593iZFpOwBH0X OdAr+0tvoPLZNEVz4bVUHMa2FigyO9QPwQwjA7cVi5DuoLy1e4UnM4RyTSMCav9eBXGluc 8c8N0mwX9dQNNq8OE5wLTnSFSeaAPK1sUuHt6n8hb/jbxcK3fymBpCJL4tnOjnWdBW9pg9 ia4FwxkaKn447tDJt0s4hSZ1hRHseeOUXw03ej0OgSNl7fkkQLLC6NLyEAolBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697839812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEVRuWJK6y1sBVM7jjODvGcbR9CzP7MmrI6SenDi9vU=; b=QNuFqole24wXh0WE+Mj6MgVi2IEfFABkb5ulkiyj5iWsJ49ZtC0rq0oYcnkSPnatW5zNvu cVj7oTV/kOG7Pf3Ul0wVY3fE1KwDWuu9v4sSr7Iz6rxOXbSRNJ8uwwDWZwzVe5N2dVZFx3 fqpMrBzrz52qkCj8VOvCFFRnV5mHpRcYo8S0rOe83nwnXw1TqATcWuL7eUijxielUvfxs4 RO12Fm/UUePAzIpeOA8ULcWm8A9iKfF31PuWKv/OGNoJ0BeQMgUqxuoszLsaaDW4CZOFA9 I2XeXU10LIfOwOoy2YJwVV+14yshSbg9pgFFJ+0yEMZgM/hpkqlhL/wf0RO09A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzKc5lGKzqMM; Fri, 20 Oct 2023 22:10: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 39KMACbU046205; Fri, 20 Oct 2023 22:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMACDq046193; Fri, 20 Oct 2023 22:10:12 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:10:12 GMT Message-Id: <202310202210.39KMACDq046193@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: a113f9dd9886 - main - uart: Support EARLY_PRINTF on x86 for port-mapped COM ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 commit a113f9dd9886e48914ba48b1f02ecf3ad0fc00d3 Author: Warner Losh AuthorDate: 2023-10-20 22:07:03 +0000 Commit: Warner Losh CommitDate: 2023-10-20 22:07:24 +0000 uart: Support EARLY_PRINTF on x86 for port-mapped COM ports Support early printf for the ns8250 uart driver. Adding options UART_NS8250_EARLY_PORT=0xYYY options EARLY_PRINTF to your kernel config will enable it. The code is rather simple minded, so caveat emptor. This will enable printf before cninit. cninit automatically disables this and switches to the real routine. It only works for port-mapped COM ports, and only if you know the port's address at compile time. It's intended for be a debugging aide, not a general purpose thing. Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42306 --- sys/conf/options.amd64 | 3 +++ sys/conf/options.i386 | 3 +++ sys/dev/uart/uart_dev_ns8250.c | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 8402c89640f7..df18abfa8e1e 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -65,3 +65,6 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT + +# x86 specific uart options +UART_NS8250_EARLY_PORT opt_uart.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index c827e0bb7a69..b98591a2a7da 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -109,3 +109,6 @@ NO_LEGACY_PCIB opt_cpu.h # Compatibility with Linux MP table bugs. MPTABLE_LINUX_BUG_COMPAT + +# x86 specific uart options +UART_NS8250_EARLY_PORT opt_uart.h diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index de9b67c6bef1..3787c6ed4c9b 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -78,6 +78,27 @@ static int broken_txfifo = 0; SYSCTL_INT(_hw, OID_AUTO, broken_txfifo, CTLFLAG_RWTUN, &broken_txfifo, 0, "UART FIFO has QEMU emulation bug"); +/* + * To use early printf on x86, add the following to your kernel config: + * + * options UART_NS8250_EARLY_PORT=0x3f8 + * options EARLY_PRINTF +*/ +#if defined(EARLY_PRINTF) && (defined(__amd64__) || defined(__i386__)) +static void +uart_ns8250_early_putc(int c) +{ + u_int stat = UART_NS8250_EARLY_PORT + REG_LSR; + u_int tx = UART_NS8250_EARLY_PORT + REG_DATA; + int limit = 10000; /* 10ms is plenty of time */ + + while ((inb(stat) & LSR_THRE) == 0 && --limit > 0) + continue; + outb(tx, c); +} +early_putc_t *early_putc = uart_ns8250_early_putc; +#endif /* EARLY_PRINTF */ + /* * Clear pending interrupts. THRE is cleared by reading IIR. Data * that may have been received gets lost here. From nobody Fri Oct 20 22:16:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzSM10Nlz4yHnp; Fri, 20 Oct 2023 22:16: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 4SBzSM0M0Pz3FSk; Fri, 20 Oct 2023 22:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697840163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8/6I6yNFGPikmcEa1lG2+jposMVZlLS3vxT0fBO5/A=; b=SlXGUmweK066y4RX1tHySepIo3taNORJu9TlXJ0YyKoYjH7bihdbu0PAYrQ4k3tXqPrpZb Z9mQ7W5CPGeWTSl8PGEK018/x1CY9+SLUxVdn+vWCJB+dGDUpre5YlRKrLfvslr4vd5cuy 5csHnw4ivLpDaQtV/J6hF/wRHnhls/aj/zkr3MLQkDqefBWpTn49EpukPCpXAM4SuvYklt jQTXLUMbx7yVXrRBs0mKkqD5Et/rGO8vvaYFY5InG0xBKB/zGi2YHbNvaoW84+0k5ytjTv PZ41tjI6A4GgKUVyw6N68lWqXQqWpHa9aWtimSwuJV/z0gjMi5U7qBbjBryK7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697840163; a=rsa-sha256; cv=none; b=FJgotNoAZX3FAaEB2GV2/9U3O+vlLD+CS82m7Jfpr+/JETXXZKbdVIMlafbRBI4wougK0l cVm6rBQDZIGdh9yJjv7yijMS5KLR5xHozgQWnVugGYU/94I7ICD3bSCVp7WL7CS5Rah7D9 bBNJmVlyzrMW1o3BnXTIhCqzLl59xGo9pMCgGLz6XgAywsKnvx/1WeOmjO8eUDMpMF3qX6 oVOaZ6MM92pqogQLNPd/soM/cLMTZjsXDVIY5SGmjPHgis+sCgkv5KaW4rrsb4lBZbtzwA Bc8BGjdV7q17byJCNuUEpSJFjjDp/UBoBicsXYs+A1LljQlSfI54CeCbPj5C9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697840163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U8/6I6yNFGPikmcEa1lG2+jposMVZlLS3vxT0fBO5/A=; b=GgFPSNAQ2RSverq75gzJVU6HNZlTZ0ZFKGAL6r3RgiaRpHKBn3eXWSHz6KgK1gy7ylvZsn jd2sdIMp1QMp7LiJaYF/TCEhpRQotND4HL+MSLMgSxtiGu6FgouDSJyoUTnFSJVgW3Dl9h 89K3crpbXw0HBVnCeuOa97M+Y/5O6iz3ynDbJ6AlJqMjDRun3qB6/7FVafsxgu8ubiOl2q RptEgv91pB/T/+Zhn571djjaUB6vUDkdF8lyjHoXh5BcqmMD7ReDRex5AzmVQLWQGCRO/U aKolQpjm2g78ngt6axcOoKdJ0R2e8YwYyYsUTlz2jRalgN8UO9g0MLEO0gEztw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzSL6Rtzzr2V; Fri, 20 Oct 2023 22:16: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 39KMG2oc056514; Fri, 20 Oct 2023 22:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMG2rO056511; Fri, 20 Oct 2023 22:16:02 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:16:02 GMT Message-Id: <202310202216.39KMG2rO056511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 1e39a0886e09 - main - Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 commit 1e39a0886e0999520a7e7136e3f7d09e9cd9a5f2 Author: Kirk McKusick AuthorDate: 2023-10-20 22:14:46 +0000 Commit: Kirk McKusick CommitDate: 2023-10-20 22:15:40 +0000 Fix a bug in fsck_ffs(8) triggered by corrupted filesystems. Add missing check for failed block read when checking information about a snapshot file. Reported-by: Andreas Bock PR: 274404 MFC-after: 1 week --- sbin/fsck_ffs/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 49e89f9221b0..d1d09d07b43a 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -299,6 +299,8 @@ checksnapinfo(struct inode *snapip) size = fragroundup(fs, DIP(snapip->i_dp, di_size) - lblktosize(fs, lbn)); bp = getdatablk(idesc.id_parent, size, BT_DATA); + if (bp->b_errs != 0) + return (0); snapblklist = (daddr_t *)bp->b_un.b_buf; /* * snapblklist[0] is the size of the list From nobody Fri Oct 20 22:33:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SBzrX6s9zz4yJgV; Fri, 20 Oct 2023 22:33: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 4SBzrX6GNXz3Gk0; Fri, 20 Oct 2023 22:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697841212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1YVNrf1Jsl/iA8qUcRkB+brfptOTljBAlnkKCKvyz8=; b=DLHz0jflALEBkNA/up6rbimUCIYMVd8C0WbeQhgcqMpnVaQdOU9bxSabv3BZrlktDBDaNl x34oc9tsTq1lpJo0IyKm+GuBLDXB7FC/6mdV39nCriLs1M8t3J40ata7X/fA9g6jBlll9Y MFAGIs+IKLh6innD3Zm7bDxpvYWfdlkRLTlG8qLuDz/mR/lOhcEMvf34aR6KVBhrETGSCq WTlFeNAyyhMPtS5TAGqQkXemhhV6/IzRuass14DIbdRj9NzTtCmW7Hlx781YlrnzqE8N/L MnOgEu8SCWL1wADTk8l7stjUosHOnBxXlU3NfQUfhZ+1XckG/tjWhtWwJjYC7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697841212; a=rsa-sha256; cv=none; b=O0LwsBhjkawze+HaVXJuQchYQv2YQCs6KwHTlOLFU0hLrJ7DX6q9KBAxPT1eNIoSO2KyQg 5pdVEITY4VNeZo3iTHI3LeGz8JOvFr76B2YqnzDSScSsfVUamlyxhxw6mXrDXn7q25n7bD hEHtYox3EyOQrulmyrwoS/tgQMJVMVaDLI1MPHs8e65YzR9bWM7TYNn9vXqC00L0KC0jEh EhH4K3rEPeBr8n6DJIY/c3rGkSUPXXg1BS2mHY0IxzaYPdYf9Y40wIgDBitMDHcT75F63g 4QsulrqBE0UrdIa9gD5u3FkBtqcIXiokC9FB8s7rmEBVb7HG1/B3rnohP25XKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697841212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1YVNrf1Jsl/iA8qUcRkB+brfptOTljBAlnkKCKvyz8=; b=HzjztUGDN9DKj0I1A8cCbk2IUc2rqNv1sR5Gpz5jPI8dNMfXUu9Z6UKdk37VZaYQ/x+hbT Xo7Jz4RNqmOj75W3hNAX6dRMji/js1e4ClDkSsXT4gmIHpBxoLxtuzrXS6Xp8yFC9/ssm4 c5NlpMVLkUhPc66eBlxOGKd6mUWmjaGhLNrkIjLIGazt1fdcbysldh7eGYzPMDZSDslDuq jhPri1VIS3DEio0zD1MiEiFk9G6HmP9QM2fLM08JPtG+oIZZnNhGObc4N5pfhRCB4EaMdB MMayMaDrYT7L2zpM/4l15SeHC8feBloVaXKh+iV9jumlxmyNcn7nW4wAUpHSmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SBzrX5KwRzqrq; Fri, 20 Oct 2023 22:33: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 39KMXWIR088993; Fri, 20 Oct 2023 22:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KMXWj2088990; Fri, 20 Oct 2023 22:33:32 GMT (envelope-from git) Date: Fri, 20 Oct 2023 22:33:32 GMT Message-Id: <202310202233.39KMXWj2088990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 3943698c6dbe - main - Minor sysctl description cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3943698c6dbed0f4ef1b2e34c89035155e813533 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=3943698c6dbed0f4ef1b2e34c89035155e813533 commit 3943698c6dbed0f4ef1b2e34c89035155e813533 Author: Kirk McKusick AuthorDate: 2023-10-20 22:32:05 +0000 Commit: Kirk McKusick CommitDate: 2023-10-20 22:32:05 +0000 Minor sysctl description cleanup. No functional change. Agreed-by: Mateusz Guzik --- sys/kern/vfs_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 0fe2bc46446c..881e9452a6db 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1506,7 +1506,7 @@ static int vnlruproc_sig; static u_long vnlruproc_kicks; SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, kicks, CTLFLAG_RD, &vnlruproc_kicks, 0, - "Number of times vnlru got woken up due to vnode shortage"); + "Number of times vnlru awakened due to vnode shortage"); #define VNLRU_COUNT_SLOP 100 From nobody Fri Oct 20 23:12:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC0jY44Fqz4yLZc; Fri, 20 Oct 2023 23:12: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 4SC0jY3YlTz3LGY; Fri, 20 Oct 2023 23:12:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697843553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPxsOrG1WHSQm0TdLZlRwQtHrKe9ux91cFdGE8Hnlhc=; b=Jvkm9xiKbkM4ySIAG2X1D1NUU9nGMRwOf+7bHpAKNNG/IDcyL54e4CZ4WUYfsk2+wRKPCZ VBAgTRKPCArGM7If6q1Upnhf7lbtM8XYWa4rXhSTP5egiM+r2gYd75sc0G1dduVVGTiqO/ 5C+4GpYVPT/sO3ZvWVd1IvKmDowCUhT2ZbeMngB1PWGjWlqosuL99Yb1QH/xKcfcz0fPv+ dU3pDz4kfAiICf5DJC063IBUQ61vEqBxrholgBIrWFKP8ZUhDaWvaNPZrs79hOjk7w024b YEI/+Ug4gfGPqqH6WCM5pkUWIdyeDVP3tY0h1oohuMqFdssRRdjww84J3Cyelg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697843553; a=rsa-sha256; cv=none; b=NCxpcLCVUDRQK8VeTy6yNGNWag92gAuwxVrr/VuIjQ6oP5zKtM0+U1roODUbr/GzHIQeDJ 9DUqPzx6s8Fu59/W7OVL2GM9wCgSw7jtwH/e8qwZDsNsoDeGaehH5ajRuCcyv14HYq5XGV gwlbFnsPTfsxU7YXmuROv1lR+D/WkuZOfJrnEWMRRdI3WUJmoxbdKgOL3ATC7oV/YwdoWV ye/WU2+3jh6E2IvJsQ1GIEBClbvxIjBkbps7GzLjH5lABhS4Unw6g8bt2IJSdcshptE1tB 8rgJt627MeZtAyjDwEAqK8O73nMPFmjxrqEpWnUZxhGQutYLc3KGNiLtnCxW1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697843553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kPxsOrG1WHSQm0TdLZlRwQtHrKe9ux91cFdGE8Hnlhc=; b=lSA2GWv9jWDQ53TivPEmjMpCse1B1yoySvJN8gvxSLIfi7mqJEJeLoy6/UQXaiHQ0zrU1L xyQBLue5iLMgb23EepzD0lQp/eGPnlBlhW2Z4V1xeMtMXhJOjyU6syfBbMtF/3USz0J+21 ETv7k4vIuHsqv23RGgsvGuTiIG7UYCVgneezDAy+FUt2ficA1hdGOTkRbqMZ9cQhDnXhNO MKWCeiczQjiMpeqGGXFVXysM/U+6zjSMP5TO9SB4hadC+0CEMh2Ji21PVTZibQYmIdcoex yRRHX0dIO0+Jdw3x8jKxiyI2Ttk3bGdRVQQIYl0ZWSnqOfICkWK1MR5GVpGZiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC0jY2d1Szs7l; Fri, 20 Oct 2023 23:12: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 39KNCXsC056116; Fri, 20 Oct 2023 23:12:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39KNCX0G056113; Fri, 20 Oct 2023 23:12:33 GMT (envelope-from git) Date: Fri, 20 Oct 2023 23:12:33 GMT Message-Id: <202310202312.39KNCX0G056113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 196787f79e67 - main - nfscl: Use Claim_Null_FH and Claim_Deleg_Cur_FH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 196787f79e67374527a1d528a42efa8b31acd9af Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=196787f79e67374527a1d528a42efa8b31acd9af commit 196787f79e67374527a1d528a42efa8b31acd9af Author: Rick Macklem AuthorDate: 2023-10-20 23:10:25 +0000 Commit: Rick Macklem CommitDate: 2023-10-20 23:10:25 +0000 nfscl: Use Claim_Null_FH and Claim_Deleg_Cur_FH For NFSv4.1/4.2, there are two new options for the Open operation. These two options use the file handle for the file instead of the file handle for the directory plus a file name. By doing so, the client code is simplified (it no longer needs the "nfsv4node" structure attached to the NFS vnode). It also avoids problems caused by another NFS client (or process running locally in the NFS server) doing a rename or remove of the file name between the Lookup and Open. Unfortunately, there was a bug (fixed recently by commit X) in the NFS server which mis-parsed the Claim_Deleg_Cur_FH arguments. To allow this patch to work with the broken FreeBSD NFSv4.1/4.2 server, NFSMNTP_BUGGYFBSDSRV is defined and is set when a correctly formatted Claim_Deleg_Cur_FH fails with NFSERR_EXPIRED. (This is what the old, broken NFS server does, since it erroneously uses the Getattr arguments as a stateID.) Once this flag is set, the client fills in a stateID, to make the broken NFS server happy. Tested at a recent IETF NFSv4 Bakeathon. MFC after: 1 month --- sys/fs/nfsclient/nfs_clport.c | 4 +- sys/fs/nfsclient/nfs_clrpcops.c | 92 +++++++++++++++++++++++++++++++---------- sys/fs/nfsclient/nfs_clstate.c | 47 +++++++++++++++++---- sys/fs/nfsclient/nfs_clvnops.c | 16 ------- sys/fs/nfsclient/nfsmount.h | 1 + 5 files changed, 114 insertions(+), 46 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 8ea50d80ae19..c0318b692d86 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -264,10 +264,10 @@ nfscl_nget(struct mount *mntp, struct vnode *dvp, struct nfsfh *nfhp, np->n_fhp = nfhp; /* - * For NFSv4, we have to attach the directory file handle and + * For NFSv4.0, we have to attach the directory file handle and * file name, so that Open Ops can be done later. */ - if (nmp->nm_flag & NFSMNT_NFSV4) { + if (NFSHASNFSV4(nmp) && !NFSHASNFSV4N(nmp)) { np->n_v4 = malloc(sizeof (struct nfsv4node) + dnp->n_fhp->nfh_len + cnp->cn_namelen - 1, M_NFSV4NODE, M_WAITOK); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 14351d915ba2..2276e09f6e7e 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -392,16 +392,6 @@ nfsrpc_open(vnode_t vp, int amode, struct ucred *cred, NFSPROC_T *p) nfhp = np->n_fhp; retrycnt = 0; -#ifdef notdef -{ char name[100]; int namel; -namel = (np->n_v4->n4_namelen < 100) ? np->n_v4->n4_namelen : 99; -bcopy(NFS4NODENAME(np->n_v4), name, namel); -name[namel] = '\0'; -printf("rpcopen p=0x%x name=%s",p->p_pid,name); -if (nfhp->nfh_len > 0) printf(" fh=0x%x\n",nfhp->nfh_fh[12]); -else printf(" fhl=0\n"); -} -#endif do { dp = NULL; error = nfscl_open(vp, nfhp->nfh_fh, nfhp->nfh_len, mode, 1, @@ -452,6 +442,39 @@ else printf(" fhl=0\n"); op->nfso_own->nfsow_clp, nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); } + } else if (NFSHASNFSV4N(nmp)) { + /* + * For the first attempt, try and get a layout, if + * pNFS is enabled for the mount. + */ + if (!NFSHASPNFS(nmp) || nfscl_enablecallb == 0 || + nfs_numnfscbd == 0 || + (np->n_flag & NNOLAYOUT) != 0 || retrycnt > 0) + error = nfsrpc_openrpc(nmp, vp, nfhp->nfh_fh, + nfhp->nfh_len, nfhp->nfh_fh, nfhp->nfh_len, + mode, op, NULL, 0, &dp, 0, 0x0, cred, p, 0, + 0); + else + error = nfsrpc_getopenlayout(nmp, vp, + nfhp->nfh_fh, nfhp->nfh_len, nfhp->nfh_fh, + nfhp->nfh_len, mode, op, NULL, 0, &dp, + cred, p); + if (dp != NULL) { + NFSLOCKNODE(np); + np->n_flag &= ~NDELEGMOD; + /* + * Invalidate the attribute cache, so that + * attributes that pre-date the issue of a + * delegation are not cached, since the + * cached attributes will remain valid while + * the delegation is held. + */ + NFSINVALATTRCACHE(np); + NFSUNLOCKNODE(np); + (void) nfscl_deleg(nmp->nm_mountp, + op->nfso_own->nfsow_clp, + nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); + } } else { error = EIO; } @@ -538,19 +561,40 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, *tl = txdr_unsigned(delegtype); } else { if (dp != NULL) { - *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); - NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); - if (NFSHASNFSV4N(nmp)) - *tl++ = 0; - else + if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned( + NFSV4OPEN_CLAIMDELEGATECURFH); + NFSLOCKMNT(nmp); + if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) != + 0) { + NFSUNLOCKMNT(nmp); + /* + * Add a stateID argument to make old + * broken FreeBSD NFSv4.1/4.2 servers + * happy. + */ + NFSM_BUILD(tl, uint32_t *,NFSX_STATEID); + *tl++ = 0; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + } else + NFSUNLOCKMNT(nmp); + } else { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMDELEGATECUR); + NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID); *tl++ = dp->nfsdl_stateid.seqid; - *tl++ = dp->nfsdl_stateid.other[0]; - *tl++ = dp->nfsdl_stateid.other[1]; - *tl = dp->nfsdl_stateid.other[2]; + *tl++ = dp->nfsdl_stateid.other[0]; + *tl++ = dp->nfsdl_stateid.other[1]; + *tl = dp->nfsdl_stateid.other[2]; + (void)nfsm_strtom(nd, name, namelen); + } + } else if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } else { *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); + (void)nfsm_strtom(nd, name, namelen); } - (void) nfsm_strtom(nd, name, namelen); } NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); @@ -2713,6 +2757,8 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, if ((rflags & NFSV4OPEN_RESULTCONFIRM) && (owp->nfsow_clp->nfsc_flags & NFSCLFLAGS_GOTDELEG) && !error && dp == NULL) { + KASSERT(!NFSHASNFSV4N(nmp), + ("nfsrpc_createv4: result confirm")); do { ret = nfsrpc_openrpc(VFSTONFS(dvp->v_mount), dvp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len, @@ -8009,8 +8055,12 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, nfsm_strtom(nd, op->nfso_own->nfsow_owner, NFSV4CL_LOCKNAMELEN); NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(NFSV4OPEN_NOCREATE); - *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); - nfsm_strtom(nd, name, namelen); + if (NFSHASNFSV4N(nmp)) { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); + } else { + *tl = txdr_unsigned(NFSV4OPEN_CLAIMNULL); + nfsm_strtom(nd, name, namelen); + } NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSZERO_ATTRBIT(&attrbits); diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 74d6a14fc4c4..579210941802 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -4383,9 +4383,15 @@ nfscl_moveopen(vnode_t vp, struct nfsclclient *clp, struct nfsmount *nmp, nfscl_newopen(clp, NULL, &owp, NULL, &op, &nop, owp->nfsow_owner, lop->nfso_fh, lop->nfso_fhlen, cred, &newone); ndp = dp; - error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, np->n_v4->n4_fhlen, - lop->nfso_fh, lop->nfso_fhlen, lop->nfso_mode, op, - NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, &ndp, 0, 0, cred, p); + if (NFSHASNFSV4N(nmp)) + error = nfscl_tryopen(nmp, vp, lop->nfso_fh, lop->nfso_fhlen, + lop->nfso_fh, lop->nfso_fhlen, lop->nfso_mode, op, + NULL, 0, &ndp, 0, 0, cred, p); + else + error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, + np->n_v4->n4_fhlen, lop->nfso_fh, lop->nfso_fhlen, + lop->nfso_mode, op, NFS4NODENAME(np->n_v4), + np->n_v4->n4_namelen, &ndp, 0, 0, cred, p); if (error) { if (newone) nfscl_freeopen(op, 0, true); @@ -4476,14 +4482,16 @@ nfsrpc_reopen(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, if (error) return (error); vp = NFSTOV(np); - if (np->n_v4 != NULL) { + if (NFSHASNFSV4N(nmp)) + error = nfscl_tryopen(nmp, vp, fhp, fhlen, fhp, fhlen, mode, op, + NULL, 0, dpp, 0, 0, cred, p); + else if (np->n_v4 != NULL) error = nfscl_tryopen(nmp, vp, np->n_v4->n4_data, np->n_v4->n4_fhlen, fhp, fhlen, mode, op, NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, dpp, 0, 0, cred, p); - } else { + else error = EINVAL; - } vrele(vp); return (error); } @@ -4500,18 +4508,43 @@ nfscl_tryopen(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen, int reclaim, u_int32_t delegtype, struct ucred *cred, NFSPROC_T *p) { int error; + struct nfscldeleg *dp; + bool try_busted_xdr; + dp = *ndpp; do { + *ndpp = dp; /* *ndpp needs to be set for retries. */ error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 0, 0); + try_busted_xdr = false; if (error == NFSERR_DELAY) (void) nfs_catnap(PZERO, error, "nfstryop"); - } while (error == NFSERR_DELAY); + else if (error == NFSERR_EXPIRED && NFSHASNFSV4N(nmp) && + reclaim == 0 && dp != NULL) { + /* This case is a Claim_Deleg_Cur_FH Open. */ + NFSLOCKMNT(nmp); + if ((nmp->nm_privflag & NFSMNTP_BUGGYFBSDSRV) == 0) { + /* + * Old FreeBSD NFSv4.1/4.2 servers erroneously + * expect a stateID argument for Open + * Claim_Deleg_Cur_FH and interpret the + * Getattr reply as a stateID. This results + * in an NFSERR_EXPIRED failure. + * Setting NFSMNTP_BUGGYFBSDSRV makes the Open + * send a stateID, in violation of RFC8881. + */ + try_busted_xdr = true; + nmp->nm_privflag |= NFSMNTP_BUGGYFBSDSRV; + } + NFSUNLOCKMNT(nmp); + } + } while (error == NFSERR_DELAY || try_busted_xdr); if (error == EAUTH || error == EACCES) { /* Try again using system credentials */ newnfs_setroot(cred); do { + *ndpp = dp; /* *ndpp needs to be set for retries. */ error = nfsrpc_openrpc(nmp, vp, fhp, fhlen, newfhp, newfhlen, mode, op, name, namelen, ndpp, reclaim, delegtype, cred, p, 1, 0); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index fd88531789d9..00b6c7617101 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2052,14 +2052,6 @@ nfs_rename(struct vop_rename_args *ap) tdnp->n_fhp->nfh_len != fnp->n_v4->n4_fhlen || NFSBCMP(tdnp->n_fhp->nfh_fh, fnp->n_v4->n4_data, tdnp->n_fhp->nfh_len))) { -#ifdef notdef -{ char nnn[100]; int nnnl; -nnnl = (tcnp->cn_namelen < 100) ? tcnp->cn_namelen : 99; -bcopy(tcnp->cn_nameptr, nnn, nnnl); -nnn[nnnl] = '\0'; -printf("ren replace=%s\n",nnn); -} -#endif free(fnp->n_v4, M_NFSV4NODE); fnp->n_v4 = newv4; newv4 = NULL; @@ -2713,14 +2705,6 @@ nfs_lookitup(struct vnode *dvp, char *name, int len, struct ucred *cred, dnp->n_fhp->nfh_len != np->n_v4->n4_fhlen || NFSBCMP(dnp->n_fhp->nfh_fh, np->n_v4->n4_data, dnp->n_fhp->nfh_len))) { -#ifdef notdef -{ char nnn[100]; int nnnl; -nnnl = (len < 100) ? len : 99; -bcopy(name, nnn, nnnl); -nnn[nnnl] = '\0'; -printf("replace=%s\n",nnn); -} -#endif free(np->n_v4, M_NFSV4NODE); np->n_v4 = malloc( sizeof (struct nfsv4node) + diff --git a/sys/fs/nfsclient/nfsmount.h b/sys/fs/nfsclient/nfsmount.h index 37b84a015dab..7571add27b9c 100644 --- a/sys/fs/nfsclient/nfsmount.h +++ b/sys/fs/nfsclient/nfsmount.h @@ -124,6 +124,7 @@ struct nfsmount { #define NFSMNTP_DELEGISSUED 0x00000400 #define NFSMNTP_NODEALLOCATE 0x00000800 #define NFSMNTP_FAKEROOTFH 0x00001000 +#define NFSMNTP_BUGGYFBSDSRV 0x00002000 /* New mount flags only used by the kernel via nmount(2). */ #define NFSMNT_TLS 0x00000001 From nobody Sat Oct 21 01:32:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC3qG3swGz4xFYC; Sat, 21 Oct 2023 01:32: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 4SC3qG3L4Sz3Xxn; Sat, 21 Oct 2023 01:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gb68wf2l06WR0x7Sp4CSLNqakXBALTPe3NBMwyvVqQ=; b=mbGHFGfMvdmpme+Ybo7ffmQ4T1nwe6cGQjbDEkwaSknjBdr5bre9pTnlZpk/9zQNytvVWt wH+Jmq4uyFLmi4HQqY5PtObsoJmzfcs5TSn0NCLRe72PljRzcBHQcJ+DcYAcVtvpf0mY8F eeGQZ3VzRlFjRRppf7Z1up4uZcVF9o8LpLwXhzUGzFnP1CmScklqgq85WNYfRXkazggc00 4q5A1BQPzCHGOYQ7CRW/tdok2b9SFwwXTEoTaFkgyF+dl+d6Azk929HDa9oERSMIdq/PvR 1Om8Jh6zVt8IGe2kC78q3BnST7qmEwHSRnAH3bIMVvcbmd/psaqz9ZJusWTffg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697851962; a=rsa-sha256; cv=none; b=DZ7w7RvlVZFEwytPwOqpCAsxIVvkSKSxcxpsFYGa9PSUfDsjt3tDyELQ0CLZxjq+gjaR2U 4WnCcYD0/jjmN/15iG1QgqJPC2ikOZ3PpOKGgayPLsaNatKwIAixZ4iRqHI+iXbegm5cUA oq1ZZJhM9vj8/75oFj3Iy1LYFI2Btbrx5hD2Fmfcgk+75IztyFPDMo33mtV4Whx3N6EqLG QdxTNIhlGwykbNMahwsK7OzKJjNyj2ILU6EtJjHtGm1ptxubwLuPOo2vJpK7MlActf2PJy ZO8rHFpwH8aSXnWVIZ/vMv4wHZvSAOnC1YDyFgZAiyVPYjeJWeTP1UigB0+Geg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gb68wf2l06WR0x7Sp4CSLNqakXBALTPe3NBMwyvVqQ=; b=B55lmerIIJ1nbcOV0syyw5zc3YUP/ue9edIpp9KzTZ4fao0/74EiDXM+plIiHeouhjQo58 WrrdUYhCXfQeA0s5/fbxzm3ONHuJlTzR6gF5+q4GnI+22Gxaow6J3dvq46GPYTXcUHHzrs pw8HWce8NNE8T3nQxocYNvACjj0aTRB3SZKqE8a0bwUYnNT0yAuDjs/tn6uzl+zDvTRewx XW0FVtRohHPf99KyPudvPQzy+h/QYOLd86iuH1sCCtTiebIPoCeRwkf23qPSd+tNl+/kEy g5c/pMYrTRdQfXZCyDf5+DKszLJBjaKDi/iGsAoYfsXQvz3ZzZTuKM+Nqkel9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC3qG2NbHzwnq; Sat, 21 Oct 2023 01:32: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 39L1Wg3C088498; Sat, 21 Oct 2023 01:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L1WgSu088494; Sat, 21 Oct 2023 01:32:42 GMT (envelope-from git) Date: Sat, 21 Oct 2023 01:32:42 GMT Message-Id: <202310210132.39L1WgSu088494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 9e7f349ff106 - main - amd64 pmap: Prefer consistent naming for loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e7f349ff10691c2e3fb03898dbc942794a47566 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7f349ff10691c2e3fb03898dbc942794a47566 commit 9e7f349ff10691c2e3fb03898dbc942794a47566 Author: Zhenlei Huang AuthorDate: 2023-10-20 07:31:44 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 01:31:58 +0000 amd64 pmap: Prefer consistent naming for loader tunable The sysctl knob 'vm.pmap.allow_2m_x_ept' is loader tunable and have public document entry in security(7) but is fetched from kernel environment 'hw.allow_2m_x_ept'. That is inconsistent and obscure. As there is public security advisory FreeBSD-SA-19:25.mcepsc [1], people may refer to it and use 'hw.allow_2m_x_ept', let's keep old name for compatibility. [1] https://www.freebsd.org/security/advisories/FreeBSD-SA-19:25.mcepsc.asc Reviewed by: kib Fixes: c08973d09c95 Workaround for Intel SKL002/SKL012S errata MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42311 --- sys/amd64/amd64/pmap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8c438cfb4639..cc463832babf 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2342,7 +2342,10 @@ pmap_allow_2m_x_ept_recalculate(void) CPUID_TO_MODEL(cpu_id) == 0x57 || /* Knights */ CPUID_TO_MODEL(cpu_id) == 0x85)))) pmap_allow_2m_x_ept = 1; +#ifndef BURN_BRIDGES TUNABLE_INT_FETCH("hw.allow_2m_x_ept", &pmap_allow_2m_x_ept); +#endif + TUNABLE_INT_FETCH("vm.pmap.allow_2m_x_ept", &pmap_allow_2m_x_ept); } static bool From nobody Sat Oct 21 01:32:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC3qH501Kz4xFl0; Sat, 21 Oct 2023 01: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 4SC3qH4X5Jz3Y5y; Sat, 21 Oct 2023 01: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=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=ZMMK/Hr/ODJO0oO7hPDJVqfiHuAKBhnHN9ecTRXLfl5b4SJfEvvp9L3htfkGjVisVym7cH DOwZGoGpnfLXXa8w2x8tweZBTLLG6a6RGYsj20+KdUNFpTNs3eeelWYzNJrdsocMHTXbWX FDzfgAYOT+UsvD3A3PMkXEs1MdPuFKjV6H1jtatgoFsEBZSKBbcDZBc+aDCFtPQuANqF0I MWvHhGnpqVq5QIOAsd9iJvOseT0q5tPh4X2lXp79qKWC/ZCR5S2aqhKwCKw207aqh0VSzW zvcFTcm+6wVxirejgCGvpesB2w8ST/ne+QDkPPLekV8B/1kX3Iv0ryfgEbe72Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697851963; a=rsa-sha256; cv=none; b=oQJxva7Whsbh6yi/6M14JwzUrdDRLlzfREQ7L9aZf71zn7mW4ectu0t3Wh2nfzoKVx12sP reBk7z5fRmQGNAgeGOMhybmMp5BiKWRnyT56jLSZwIxf4hIVQtpa7uQRtdXlpTxMI8Tkwb YoO+yOyFaCoPnEKeQzn2wfhEshfuuCJJtX3VxIgFnGSzo29vq63AVherw8NyepHOmOar2K 4/Bgb3uNPhlrSd61owgKFwnTJ1gItvDgmoFR5li90XvvGrhoKdxXNvbzRJi1QkuWYNqb7Q 3wxkNgm0tL1mjJdbe3LGdjPq2JhvOcoNuzxA3NJO/kXK9nYqD6Sv4hh7eBMI8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=dbFYywknbgwitv82bG4nuEmhugpydqNi7VwBL4azZx7mEDjPDq4bwjUBtlyLzGHQlM6GCp BIeNPTXrDzzY/IZ/HWc/TVqMdOWYRQRRY/TANj1IWRcIGcOH+nqQjZnnJp5VMDmC0EmVAk cS2UWKwmFoF3GGpsMHd3WdYqC5Ivw7WiJqu5vRX5X9JXb2jJykKnDIJ/co5wMrF7P19z79 5vyvjzlzgA1WjdxwlZj3g3FqqBFg2fDVOiceqSi8E+m6miV0V9WwVQO8ce0eJmJebeBw23 PtGG84jLalq2F2uhh5+uJPecOjNZCU0Vxp/Tw47q4FusBR8388LoN1Sm34X1FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC3qH3dvzzwcG; Sat, 21 Oct 2023 01: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 39L1WhRE088552; Sat, 21 Oct 2023 01: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 39L1Wh7R088549; Sat, 21 Oct 2023 01:32:43 GMT (envelope-from git) Date: Sat, 21 Oct 2023 01:32:43 GMT Message-Id: <202310210132.39L1Wh7R088549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 12cce5994b92 - main - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12cce5994b92f8235f379d660ccb28da8e69f55b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=12cce5994b92f8235f379d660ccb28da8e69f55b commit 12cce5994b92f8235f379d660ccb28da8e69f55b Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 01:31:58 +0000 x86: Prefer consistent naming for loader tunables The following loader tunables do have corresponding sysctl MIBs but with inconsistent naming. That may be historical reason. Let's prefer consistent naming for them so that it will be easier to maintain. 1. hw.dmar.timeout -> hw.iommu.dmar.timeout 2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression 3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline 4. hw.x2apic_enable -> hw.apic.x2apic_mode Those tunables are for field debugging, no need to keep old names for compatibility. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D42248 --- sys/x86/acpica/madt.c | 2 +- sys/x86/iommu/intel_drv.c | 2 +- sys/x86/x86/local_apic.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 3d7c5a67375b..200eec1fbb28 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -221,7 +221,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index a5821df6b835..ebdf24976504 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -429,7 +429,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 43fe4625cd08..6a913883cc5c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -493,7 +493,7 @@ lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -526,7 +526,7 @@ lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } From nobody Sat Oct 21 04:54:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC8JQ1H8Pz4xTDQ; Sat, 21 Oct 2023 04:54: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 4SC8JQ0SVfz4Q9M; Sat, 21 Oct 2023 04:54:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697864086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N7Bq85wE9SCub5FR4DsKhRQDF9fJ9fgUO71acBagYU=; b=gwWw+vK5l79PXs2kdJSAaLrnZ+j94ZM8AKeuJFX5H7hFJFBIElR4vCSVGJadknEDiITqB/ dk/NCknJ93dENaSvD/lxfCuSxCDuk6FAhB9W4vaKMgwe7vpHVtRUREPVhxobzMKXaLDJE5 trNiyCBMg2WpRag2v7wleceBepYASNdG43WF45CF/dHr+OYihhIzf88HBDO63bX+Hg5gjS junVlk+5hP+4DQJ3lphmd5LKWn9GmXlZqpjTNOa4IXGzO4gLl/cDlQ0hdEXEt49GLWQBbk i+GJ44CHTte3oxfAHbmc851hy/oeC/tsicSY7G6BbQJeYL+Y+2y95WRJ79wNGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697864086; a=rsa-sha256; cv=none; b=R8GpdOWwgmqRZ1UboCaMyVx7oHj+n9Uzzg/fRjtHDhdsmgU79O5zC5pmApUHBb66dFJTkA rpaUFufSg5KqAbuf/KWZN0p1RN1OjXP4U6hJAV+IPsh5FDmyri9aPZxGICsFM5UtwPLxUE C/lp/+Z2tA7FZc7mdWZ00plxymcwfeQNP6ujAPRsXw9qZgjojp9t5eA4o8Iy593kCS8S5J +UMT0foPj8ZQth2rAn7tNzMiMcU7pOk1ygf73rwcOOt1124Td8nkwfoq8iMwkzyD4059tf iRZ7m9z4qyFoOA0cfdOcnZIlZcIuz5XhS6Y3gx1rt4OJcqwxdesam/G+MfjacQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697864086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8N7Bq85wE9SCub5FR4DsKhRQDF9fJ9fgUO71acBagYU=; b=YmHm3QMf4o+M7azH6tcbiNpqpP6BPugeZOaHmshNCp5Djekl7kE/855b+ZJ8Nb3krw6zM5 JwoHWdQG6D5RoBnyf9UF3/sio97SDqP/ohs5EbPKuLrZ5AcYJaMgydICMFYMwmQ6oz9swB gIfvOaGSqpdv0S5LS4egu6MYwMM2Lrer/FX6hp6r5pUkz6qq9EGPgoOo6EKmuVV4ClpEjR s6bxGTo1U0zGVX9SjTM0bNwHjqdnKvazFOX4QD/dh+g4FQBKEH7DY9w1t9eeiQ4I3xDr1K v/u0iwMnLzTdoR1AX/VFHyukZ9pa21CuR7HUkGn4uB4vX2tyg/b/RHLm5Cr/HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC8JP6bsGz127W; Sat, 21 Oct 2023 04:54: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 39L4sjgQ023567; Sat, 21 Oct 2023 04:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L4sjoj023564; Sat, 21 Oct 2023 04:54:45 GMT (envelope-from git) Date: Sat, 21 Oct 2023 04:54:45 GMT Message-Id: <202310210454.39L4sjoj023564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 7a974a649848 - main - bpf: Make dead_bpf_if const List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a974a649848e1222a49d0d49726d06bd5c1dbd9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7a974a649848e1222a49d0d49726d06bd5c1dbd9 commit 7a974a649848e1222a49d0d49726d06bd5c1dbd9 Author: Zhenlei Huang AuthorDate: 2023-10-21 04:52:27 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 04:52:27 +0000 bpf: Make dead_bpf_if const The dead_bpf_if is not subjected to be written. Make it const so that on destructive writing to it the kernel will panic instead of silent memory corruption. No functional change intended. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42189 --- sys/net/bpf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 96420b709911..9e135b90614b 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -100,7 +100,7 @@ MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); -static struct bpf_if_ext dead_bpf_if = { +static const struct bpf_if_ext dead_bpf_if = { .bif_dlist = CK_LIST_HEAD_INITIALIZER() }; @@ -2859,7 +2859,7 @@ bpfdetach(struct ifnet *ifp) continue; CK_LIST_REMOVE(bp, bif_next); - *bp->bif_bpf = (struct bpf_if *)&dead_bpf_if; + *bp->bif_bpf = __DECONST(struct bpf_if *, &dead_bpf_if); CTR4(KTR_NET, "%s: sheduling free for encap %d (%p) for if %p", @@ -3162,7 +3162,7 @@ void bpfattach2(struct ifnet *ifp, u_int dlt, u_int hdrlen, struct bpf_if **driverp) { - *driverp = (struct bpf_if *)&dead_bpf_if; + *driverp = __DECONST(struct bpf_if *, &dead_bpf_if); } void From nobody Sat Oct 21 06:10:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC9zs0w3wz4xYb1; Sat, 21 Oct 2023 06:10: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 4SC9zs0632z4W5C; Sat, 21 Oct 2023 06:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697868633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AtP2kkdb+tZprMTZQOqBACMlrrNyxz1mljFJKoiSYc=; b=gURV7wQiQF8GJOqe9N3Yr0qPLws3OR+Dpk+qwSy5qFdDUDUsa7BcFN2YtshVWWyQbBFmHh yPdsTEmkoDc8Liv3dNgV7vTy8kxGONfcYzg3vPGKxp+jgTB8kClXg4EQoeWz3l26mZrjJt IilJa2o191Ham2nPiZktpR0evd7BhtATt6O1lF1Ka3D8ISJjDdUxqHOYkK7kNvk2Uax31x kBMA9jJ71zBS4unpOyV1YuB3adftv5he1RJYBmjNHL4xGTACIRKP6Ti/gk2rpMGaTuTEYn WjIzg4QG/nZgwSc+WKxpolG72e3ErkCkjncZq6EORoVpRKxUZDu188Il3AkxAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697868633; a=rsa-sha256; cv=none; b=hbvchQbrl2vcq96IxD7tUWZvNtIzZ2rlD3EtiQUKB/ARjsd57+sdg1J77RumCp5OMAg2Xh UwytE9WhsvOD+JqKgWz4Fh2ZVp3TSWXy+raU/uCnJQiD8iGg1BvdagzRv1Jky2FK2TlJgQ NBJ/vMddDnKm8kdxv/JXlvzQD/er3wVQ2FHlGOS8sZsA8G5/zvbJw6/04ZFRjWEVbg/UjO uIOyds5cSIYhSfhsvqwJLgfgspWsqzy8V0WWmMhA0O9peeG0woZu2exkm92OqdqrO4bRWC 8PnLW9uh/0gbQ5Q988aWdl6wev+fM2nxa4TZwZpEvP1ISnmwXE6sATAsYVPMvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697868633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7AtP2kkdb+tZprMTZQOqBACMlrrNyxz1mljFJKoiSYc=; b=xrNrkewB4WREIdPTtlnj72pBnZoAzRUsM/fvn1XUl67qIMKXj1Zukv1uEPLfZISI4rkfsE huwufVTHR2mLdDi6OoPzY44AMOkgeaq1SoBhUoZYi53f+wm9u2LCKFyN5D2O8+t4SVbGK9 vBroorLBWZJ3wjUU0RmG5TpOaU8JDi4Kd9Cv5Q/+Diq5n2g4d2MaU7NSMqNgFVWkXh9B1g /voySnr49PXVuEWi1Yire4rNINnX3yqS4Mh1xsOqHIahmKptGb7aZLtbf8p8p0gYhYPNXx 1sF3dt/rxW4SX2NIls1F8dDOYhU5WSyNWgHnV0hudX40E+t7SFFjjryD4CKOGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC9zr6GWYz14Jp; Sat, 21 Oct 2023 06:10: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 39L6AWNj050352; Sat, 21 Oct 2023 06:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L6AWUh050349; Sat, 21 Oct 2023 06:10:32 GMT (envelope-from git) Date: Sat, 21 Oct 2023 06:10:32 GMT Message-Id: <202310210610.39L6AWUh050349@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: 2fee3974603b - main - ufs quotas: fix configuring soft quota grace time List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fee3974603bce6f2dc153eb6af459cb4f864ab4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2fee3974603bce6f2dc153eb6af459cb4f864ab4 commit 2fee3974603bce6f2dc153eb6af459cb4f864ab4 Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-21 06:08:38 +0000 ufs quotas: fix configuring soft quota grace time The QTF_CLOSING flag needs to be cleared earlier to allow dqget() to work. PR: 274552 MFC after: 1 week --- sys/ufs/ufs/ufs_quota.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 8f77fb3a95d2..78f539bcabd2 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -580,6 +580,15 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, VN_LOCK_DSHARE(vp); VOP_UNLOCK(vp); *vpp = vp; + + /* + * Allow the getdq from getinoquota below to read the quota + * from file. + */ + UFS_LOCK(ump); + ump->um_qflags[type] &= ~QTF_CLOSING; + UFS_UNLOCK(ump); + /* * Save the credential of the process that turned on quotas. * Set up the time limits for this quota. @@ -594,13 +603,6 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname, ump->um_itime[type] = dq->dq_itime; dqrele(NULLVP, dq); } - /* - * Allow the getdq from getinoquota below to read the quota - * from file. - */ - UFS_LOCK(ump); - ump->um_qflags[type] &= ~QTF_CLOSING; - UFS_UNLOCK(ump); /* * Search vnodes associated with this mount point, * adding references to quota file being opened. From nobody Sat Oct 21 13:29:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCMkD21Ycz4y1rx for ; Sat, 21 Oct 2023 13:29: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 4SCMkD1Dlzz3dXY; Sat, 21 Oct 2023 13:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697894964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUtx0MnbXF+pOVnyAVje1OaEO7sRtrN8yFT0oIbL3r8=; b=snZU9w1moMgZejEtiRwlMVIx6ASN+1QcY9rxq/mgT458o/QaXz9oeVi+Wcl3XwLZ8u3F3b Sgxo4qpzCaLql21kbEsra8kjghTtXAytNNwc71RfjHHWCHF75GW0/VDLN7VwQjB0wkkkXF 0vAnbQVtuunTapMXh3GvbyLrYsnBLKJfvQUVP9BfAAX3nbfPfbj26fPTSkcgGn4VEVT3sI APJvHFwWdpo3j67L6F8p6Y63BJJdgDIHoiPXV77lmX6HWLR3n9tRV5PxGNqQoUI56iE/6U J42Xgh6ROf8YmRHhFKo00yrhSUT/PTcdxVpsNX4TxL1lLHr/ffolfnxAlk1Pcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697894964; a=rsa-sha256; cv=none; b=VeH3usFgc2aJcwaqK2Wnj5DSoPwHR+QAoq651Kai0G5JMybyLOVu5hA47HcSYBOFaYfICZ j4aOb4ziw8LIdHL39sabkoYrLHcut3HKQkuiGX9EjvZapZEyKoKvgnR9N97iluttLd+31u sjccEpTH1lHcjGyyeSgLm4jQRnlZ5jRLGL8iao8TEpShDZPlyKhjNBoSmosa/jqQ7vT08L SshFH7e9BxrGwgAHo8mLgc9Ozc3yQRDdnFP5DQAheahYccDPKjaGoOWNbGVOHoV11Cnpwi pbLEX947H+DnT3vDDu/nG0VUCzWXBk04kF/TcmPb6MUODMUgFEbeKyR5bglXDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697894964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUtx0MnbXF+pOVnyAVje1OaEO7sRtrN8yFT0oIbL3r8=; b=A9AAqht7IzHdoB3Eo9kTHTFRqw+BvJYOcJ7WS71RASp1t48M6zXmKGnPkRLdvSHbnldFG5 hfpic7GPFMVniyOZiW0CUxeNGPyDd0ttlgffBPCXmyzs3FM4V7bO+0th7pOeIsosaBMF7r QbVbLBxWMg9ua9HQiPWJDg0avIjLQ9fFDvb3GRfk9fCm/ud1fOcxrXywuJ7/tE/oHV0bn/ fPh4Lyw135imkv+UQsREbPuw9T2dUUOjjbzQkFwAl79Lpiy+ScpNTOkzYtQzcPWKFH2ouK 8dXU6MrqDlBhMH21Y6AExNw+ARx856Qu+l15QPI0NmIMDGH6Rx4le3tcMY3uwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCMkC73xcz2qs; Sat, 21 Oct 2023 13:29: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 39LDTNTJ071191; Sat, 21 Oct 2023 13:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LDTNWl071190; Sat, 21 Oct 2023 13:29:23 GMT (envelope-from git) Date: Sat, 21 Oct 2023 13:29:23 GMT Message-Id: <202310211329.39LDTNWl071190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: 7d1b50167725..cd255c5cf244 - vendor/llvm-project/release-17.x - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-17.x X-Git-Reftype: branch X-Git-Commit: cd255c5cf2441442b46200d298c0cbccf83caba5 X-Git-Oldrev: 7d1b50167725e83cd4b07401b6916b7f0b6919f1 X-Git-Newrev: cd255c5cf2441442b46200d298c0cbccf83caba5 Auto-Submitted: auto-generated The branch vendor/llvm-project/release-17.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=7d1b50167725..cd255c5cf244 cd255c5cf244 Vendor import of llvm-project branch release/17.x llvmorg-17.0.3-0-g888437e1b600. From nobody Sat Oct 21 13:29:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCMkD2BhCz4y1Wn for ; Sat, 21 Oct 2023 13:29: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 4SCMkD1dmCz3dXZ; Sat, 21 Oct 2023 13:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697894964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JpE8LnhoBxzTwStvNCDvXp1w8ouzBL/4n5UZ7UrErIw=; b=nhCMU22QAdTVIWqSNgNZHuKmrA/XWyoksTOSfo+bdovkv0xHgDCswPTmsHkMrbGl8KmQpm eUd4ly1liblCqSViS0al/qfrEJ9BYgigWa9wjqM5Osf4r7jym4aJvkeHyxHp1Q2l35D566 SwQO9qZWbDpTk0EJlishp49K0moz2fy1xiUYlYoL2aidOfCZQXZrH8wmxaQ72nxKU+eeNe KJLdkEtOuzg5i2womT73ydLFO59Wo27h4voplOaP2HOY0ov2aGyEP0OLqT8paYX+HIbu9/ M7xnsTVbA2f2bbtYXrRquBMkr1sk6Rn9p3PzYVjkO8uckI7mWO52waKf5zreJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697894964; a=rsa-sha256; cv=none; b=EBG8KDh/q3uA5zGBMeceLNQaL4LJ3xApZ2M/DQqKDUXxFst9AI8bSMhEezG4+zuNAODlxR ZXR0HStBdywCnYkKLbgcVBC/aHmdzj5mHMUq/jBo0dqRopuUYSIaYeO36mwsIFmsJRXX2Z Qq8DrL2q6hSi7khq/k6JYdl9WDzijeVjPZqRsusEImCbYYBNm+uSCRE19KXKBylFclDwNE +Teu7c5dYJouiJMGMLmG99Ya0gMXVGyZilqfstOAFJQuO1kfS/8KoeNP9iZpsUlnkGVb+G l5CWIpLggn9/OO+S+IFREHexvpVGi2PQgtZ2uBbIqCKz62vwjCorJlW7d90EsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697894964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JpE8LnhoBxzTwStvNCDvXp1w8ouzBL/4n5UZ7UrErIw=; b=uVZNNU9tTcrsHBFirHeD1rouXTz1e4aMWachejsV9mrY2SjjaEmfE2SdxbQWEkUk7kzH+r S7aQRzNujC+dlEWMeZ3kT2oIROaTGIzZm4VtsPLFKKgxJR251qVJzTIKW66Cn7tzN1cECC CXkEHCwV2jz16Mklkqs/USBHT0FSMVNJD+ZNDUWYb3miU1PDbkYLzDqMrUhIu8zfBMmnHz 8VTL5juRA+uupbD8VsAJVFdtGlAuwI+kdBfH0m+g9KWbM7uV1eMiiRPim6I1HrR+Xh0qug /OvJwS3dV4TZv5rbmF1Lyg9ywze66mNu9cenko6426bZ6SR7LRhMvIYFCT6VQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCMkD0Qhbz2tQ; Sat, 21 Oct 2023 13:29: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 39LDTNWS071210; Sat, 21 Oct 2023 13:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LDTNpa071209; Sat, 21 Oct 2023 13:29:23 GMT (envelope-from git) Date: Sat, 21 Oct 2023 13:29:23 GMT Message-Id: <202310211329.39LDTNpa071209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: dd4fe68f116e - Create tag vendor/llvm-project/llvmorg-17.0.3-0-g888437e1b600 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-17.0.3-0-g888437e1b600 X-Git-Reftype: annotated tag X-Git-Commit: dd4fe68f116e5de6a0ea25480131aaa0362fe7db Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-17.0.3-0-g888437e1b600 has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-17.0.3-0-g888437e1b600 tag vendor/llvm-project/llvmorg-17.0.3-0-g888437e1b600 Tagger: Dimitry Andric TaggerDate: 2023-10-21 13:28:58 +0000 Tag llvm-project branch release/17.x llvmorg-17.0.3-0-g888437e1b600. commit cd255c5cf2441442b46200d298c0cbccf83caba5 Author: Dimitry Andric AuthorDate: 2023-10-21 13:28:43 +0000 Commit: Dimitry Andric CommitDate: 2023-10-21 13:28:43 +0000 Vendor import of llvm-project branch release/17.x llvmorg-17.0.3-0-g888437e1b600. From nobody Sat Oct 21 14:29:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3c6jrRz4y5Bj; Sat, 21 Oct 2023 14:29: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 4SCP3c696pz4Fh6; Sat, 21 Oct 2023 14:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXxJhCBb07vbsMUV2yeJ13miKTDoMTYaECKz8PBdPXo=; b=mN+po/d97YxEoqzXSfVGNJ6sNwYlqMoL5K2HdImK3n7OeJoPvEbOjOz7mn2eCt2gmD6E9N oElaXx7Iy8GXCn7eFGA+xMC2oD01eWUoisFahXjFlbnrFZhDo+oPs5rll3AHAQhxNLuoxV xlsNLO3JVlhwZrnpmBP6Gl+f4fn5h3d7Wufg+yvD35N8o+e235NgHOXqBAqYBWGNic9EQG xTPkWNsNBWpgfwEXLc4lRTPhkfbj0vNGZICoa1T2Ds3XdnZ0RR7w56sWIIrRQnn/ZxATaX RRbjLVNJFQErkhu5Q3qz+J04Deu2G0j7Q17ep140VPPV+thY/PFc55rSzHwaiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898572; a=rsa-sha256; cv=none; b=da/ClmvQTx/ueIIQzqRe5nQyheeqdSxUZaB1m8/x7+exeAl0kzdEt3jFts1zp722tGgq2o NaDqzc89WA2Nhasq59tJFj71vo5LyMeCb7F0zmef7PBnqW1Pw2c4g3WHH4wamuqWXQhSG2 euDScakMx6T244Q9FPvz+yWI+CNK1legqIZ9jzv86nKQpD7UxTqDKAMYVlasEmT4Ey/oJG PzD5PaGoI0J76ykpVorKyuaKDSfc9RUDh2WDLIxYNUT8H6/Iutv1EgQRlKNbKCoFPuGr3a XY5rNZ5mFTk5ZjzSzPeoFDi2qCUobfjGqehmiBZR1XppJKwhihtd4lY2VMv6kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXxJhCBb07vbsMUV2yeJ13miKTDoMTYaECKz8PBdPXo=; b=WCnrn8iucxRGu57wQBe0ja2B58bCuHecGwPwgxcjqjVx4Dsc2TILp+icRSdo4mj/DXQD8C dgaAqKmc5GY5RoQ8/hptIDUyJzGlGuqSgzh82OUX/31x41+2KF2nvcoakc89OZdhH8XLMz RLU+6S4SjC3xwdTvo5UyF7PNuMAj7f4/+jXLX2okSlKhn1870qrtSRF9c90/f/aYEfzxoL qJMHj9coHNm7sLGes/AOKsxBlBl9pGz6Dt/g6mFxY5UNms2ZQ7lEiaIvqpEAnEO4C7AshW bBad5d3A5Nl7achHUu/JC4VFCSweMX8DB2tspeJS8B3zqu5XfWTz9KPbrwe6jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3c5DX4z4BW; Sat, 21 Oct 2023 14:29: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 39LETWEB071509; Sat, 21 Oct 2023 14:29:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETWb2071506; Sat, 21 Oct 2023 14:29:32 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:32 GMT Message-Id: <202310211429.39LETWb2071506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b53fe14843ab - stable/14 - (s)tty: add support for IUTF8 input flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b53fe14843ab1d5fc73d3e0ae2b14c182c6ee577 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b53fe14843ab1d5fc73d3e0ae2b14c182c6ee577 commit b53fe14843ab1d5fc73d3e0ae2b14c182c6ee577 Author: Bojan Novković AuthorDate: 2023-10-07 17:59:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:34 +0000 (s)tty: add support for IUTF8 input flag This patch adds the necessary kernel and stty code to support setting the IUTF8 flag for ttys. It is the first of two patches that fix backspace behaviour for UTF-8 encoded characters when in canonical mode. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42066 (cherry picked from commit 128f63cedc14ae21b35f74e11e2fe1a5659c58e8) --- bin/stty/modes.c | 2 ++ bin/stty/print.c | 1 + bin/stty/stty.1 | 3 +++ share/man/man4/termios.4 | 2 ++ sys/kern/tty.c | 4 ++-- sys/sys/_termios.h | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/stty/modes.c b/bin/stty/modes.c index ce39083d7d63..3818677ddc4e 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -126,6 +126,8 @@ static const struct modes imodes[] = { { "-decctlq", IXANY, 0 }, { "imaxbel", IMAXBEL, 0 }, { "-imaxbel", 0, IMAXBEL }, + { "iutf8", IUTF8, 0 }, + { "-iutf8", 0, IUTF8 }, { NULL, 0, 0 }, }; diff --git a/bin/stty/print.c b/bin/stty/print.c index 07a3c2058474..33472bbccea1 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -127,6 +127,7 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt) put("-inpck", INPCK, 0); put("-ignpar", IGNPAR, 0); put("-parmrk", PARMRK, 0); + put("-iutf8", IUTF8, 1); /* output flags */ tmp = tp->c_oflag; diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index 9e9405928c67..c572a657a997 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -224,6 +224,9 @@ if .Cm imaxbel is unset and the input queue is full, the next input character causes the entire input and output queues to be discarded. +.It Cm iutf8 Pq Fl iutf8 +Assume that input characters are UTF-8 encoded. Setting this flag +causes backspace to properly delete multibyte characters in canonical mode. .El .Ss Output Modes: This corresponds to the c_oflag of the termios structure. diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4 index d3a5c8fa582d..80015025345e 100644 --- a/share/man/man4/termios.4 +++ b/share/man/man4/termios.4 @@ -884,6 +884,8 @@ following masks: /* any char will restart after stop */ .It Dv IMAXBEL /* ring bell on input queue full */ +.It Dv IUTF8 +/* assume input is UTF-8 encoded */ .El .Pp In the context of asynchronous serial data transmission, a break diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 134c1dfba98b..620233947410 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -85,8 +85,8 @@ static const char *dev_console_filename; /* * Flags that are supported and stored by this implementation. */ -#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|\ - INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL) +#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|\ + IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL|IUTF8) #define TTYSUP_OFLAG (OPOST|ONLCR|TAB3|ONOEOT|OCRNL|ONOCR|ONLRET) #define TTYSUP_LFLAG (ECHOKE|ECHOE|ECHOK|ECHO|ECHONL|ECHOPRT|\ ECHOCTL|ISIG|ICANON|ALTWERASE|IEXTEN|TOSTOP|\ diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h index 327ffcb2f98b..823752732ee2 100644 --- a/sys/sys/_termios.h +++ b/sys/sys/_termios.h @@ -97,6 +97,7 @@ #endif #if __BSD_VISIBLE #define IMAXBEL 0x00002000 /* ring bell on input queue full */ +#define IUTF8 0x00004000 /* assume input is utf-8 encoded */ #endif /* From nobody Sat Oct 21 14:29:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3f1C11z4y559; Sat, 21 Oct 2023 14:29: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 4SCP3f0Xtnz4FmG; Sat, 21 Oct 2023 14:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM6VAX6iW5nrMfI7ujgkgOc3GF5nTG1LvTfyWtEm/Zs=; b=GJK1sjXn6TfmqcbCwC1hhImbgkd90HxxII/SGV4usOKSpi+zXuymP3KA7LM2Th/KI+CfUR bW2Z2S29ZVXRfnuJcfUB4xCsW9uZ4V2YpY23H8/9EbxryeWL+YA+5BvOsl5OcpP4awzv0f AW/6WHNDNHIuHJz+4QhuUlr5+GNSI2lM4SLJNYJ4XyM+b8GKhrHWWtcazMFjWOm1ZEOvvJ uJIqincoqhiT+x4GdgVlJxfn5tKECV8DILhemOCyrPYHNftWoVFVhq4JnOszeRCGod3tOf T2fmXp4FMT7hOyQvixygEjFUyJs0vxv9ZAgjiMQOAgjKKWYA93swpYa+kGX7Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898574; a=rsa-sha256; cv=none; b=EXc7pJH9rh+pdlareh7wk4Z1fY55zHFJpYN5HE1pMqdCBjyh+Zw9drgNtouJJGj+aI6cLl HKuOMN9uREf0DFpLgQFcZK+pfY2YmsYj7UDs6YUPDFz4PG+rDW4ARr/PrUY1jHohyqfbkd sjZWNyB09zHoRoEIMg//2Yh/csZNx3eRp/6jrTnS/E2Ne1qVgeOh3dR4xt4naXA/SvomSz 6tfzz9FN0d5kU4/NvNCmgBCQleCGamILLfmILCzEdCwifO1mpt4ZWZfX6240Jz9lRskTsr xPDt5eVJnv2Eb2oA+Lf0F2JEyybNmuLwK5bYJlIxujgdwwZSn3Ztv1b/yQZ3mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eM6VAX6iW5nrMfI7ujgkgOc3GF5nTG1LvTfyWtEm/Zs=; b=LSa8CJMVfsB1BFjXPCNHZyoCQWDPaJ7uKdFG78cgrQ30KNoiTRqHU9USCJboLcrvJjGkw5 tjXC+X7l4aYkJGf+vKf6AUFcqg/JW+a8MG2CN5S/B5xWU+njrAmy526WlfJeTFicQM5QMz hN5K2A2h/5oSLJ6ESaJxKUVB7g0Woa22ncLs3AGMljknma0bmYMQcQrJutUYzsPj4brLQY w/pu0Fuk1VC6buS4AJ42IpY5icqmpqHKNb8qbS4ZZa1ZKXNkfr7jZfSMTTij9XpcCYP5Ym hLxIU4RxISVhxPHEpxKA+gtLtd9j6XuQKpGv7SVjrg5QNsSY7YZFNM7oKkzaqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3d6Wjgz4SP; Sat, 21 Oct 2023 14:29: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 39LETXQa071575; Sat, 21 Oct 2023 14:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETXmx071572; Sat, 21 Oct 2023 14:29:33 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:33 GMT Message-Id: <202310211429.39LETXmx071572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 817701123233 - stable/14 - tty: fix improper backspace behaviour for UTF8 characters when in canonical mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81770112323383f1bcb93c7d038fe195b5872b8f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=81770112323383f1bcb93c7d038fe195b5872b8f commit 81770112323383f1bcb93c7d038fe195b5872b8f Author: Bojan Novković AuthorDate: 2023-10-07 18:00:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:34 +0000 tty: fix improper backspace behaviour for UTF8 characters when in canonical mode This patch adds additional logic in ttydisc_rubchar() to properly handle backspace behaviour for UTF-8 characters. Currently, typing in a backspace after a UTF8 character will delete only one byte from the byte sequence, leaving garbled output in the tty's output queue. With this change all of the character's bytes are deleted. This change is only active when the IUTF8 flag is set (see 19054eb6053189144aa962b2ecc1bf5087758a3e "(s)tty: add support for IUTF8 input flag") The code uses the teken_wcwidth() function to properly handle character column widths for different code points, and adds the teken_utf8_bytes_to_codepoint() function that converts a UTF-8 byte sequence to a codepoint, as specified in RFC3629. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42067 (cherry picked from commit 9e589b0938579f3f4d89fa5c051f845bf754184d) --- sys/kern/tty_ttydisc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ sys/teken/teken_wcwidth.h | 30 +++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index 665275ee93e7..eae7162e31c0 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -43,6 +43,9 @@ #include #include +#include +#include + /* * Standard TTYDISC `termios' line discipline. */ @@ -78,8 +81,13 @@ SYSCTL_ULONG(_kern, OID_AUTO, tty_nout, CTLFLAG_RD, /* Character is alphanumeric. */ #define CTL_ALNUM(c) (((c) >= '0' && (c) <= '9') || \ ((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) +/* Character is UTF8-encoded. */ +#define CTL_UTF8(c) (!!((c) & 0x80)) +/* Character is a UTF8 continuation byte. */ +#define CTL_UTF8_CONT(c) (((c) & 0xc0) == 0x80) #define TTY_STACKBUF 256 +#define UTF8_STACKBUF 4 void ttydisc_open(struct tty *tp) @@ -800,6 +808,72 @@ ttydisc_rubchar(struct tty *tp) ttyoutq_write_nofrag(&tp->t_outq, "\b\b\b\b\b\b\b\b", tablen); return (0); + } else if ((tp->t_termios.c_iflag & IUTF8) != 0 && + CTL_UTF8(c)) { + uint8_t bytes[UTF8_STACKBUF] = { 0 }; + int curidx = UTF8_STACKBUF - 1, cwidth = 1, + nb = 0; + teken_char_t codepoint; + + /* Save current byte. */ + bytes[curidx] = c; + curidx--; + nb++; + /* Loop back through inq until we hit the + * leading byte. */ + while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { + ttyinq_peekchar(&tp->t_inq, &c, "e); + ttyinq_unputchar(&tp->t_inq); + bytes[curidx] = c; + curidx--; + nb++; + } + /* + * Shift array so that the leading + * byte ends up at idx 0. + */ + if (nb < UTF8_STACKBUF) + memmove(&bytes[0], &bytes[curidx + 1], + nb * sizeof(uint8_t)); + /* Check for malformed UTF8 characters. */ + if (nb == UTF8_STACKBUF && + CTL_UTF8_CONT(bytes[0])) { + /* + * Place all bytes back into the inq and + * delete the last byte only. + */ + ttyinq_write(&tp->t_inq, bytes, + UTF8_STACKBUF, 0); + } else { + /* Find codepoint and width. */ + codepoint = + teken_utf8_bytes_to_codepoint(bytes, + nb); + if (codepoint != + TEKEN_UTF8_INVALID_CODEPOINT) { + cwidth = teken_wcwidth( + codepoint); + } else { + /* + * Place all bytes back into the + * inq and fall back to + * default behaviour. + */ + ttyinq_write(&tp->t_inq, bytes, + nb, 0); + } + } + tp->t_column -= cwidth; + /* + * Delete character by punching + * 'cwidth' spaces over it. + */ + if (cwidth == 1) + ttyoutq_write_nofrag(&tp->t_outq, + "\b \b", 3); + else if (cwidth == 2) + ttyoutq_write_nofrag(&tp->t_outq, + "\b\b \b\b", 6); } else { /* * Remove a regular character by diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f57a185c2433..f5a23dbc9679 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -8,6 +8,8 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ +#define TEKEN_UTF8_INVALID_CODEPOINT -1 + struct interval { teken_char_t first; teken_char_t last; @@ -116,3 +118,31 @@ static int teken_wcwidth(teken_char_t ucs) (ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd))); } + +/* + * Converts an UTF-8 byte sequence to a codepoint as specified in + * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function + * expects the 'bytes' array to start with the leading character. + */ +static teken_char_t +teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) +{ + + /* Check for malformed characters. */ + if (bitcount(bytes[0] & 0xf0) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); + + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } +} From nobody Sat Oct 21 14:29:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3g2QJyz4y5Km; Sat, 21 Oct 2023 14:29: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 4SCP3g1LYbz4G1r; Sat, 21 Oct 2023 14:29:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4VaYtnOtJ26OGtwl+XVhSZNXb9RoijzJX+2iEPLTO8=; b=pSQFxc/tkf2Ov6xdLFvDUzkFcedqDZ7iq222Ziyj3s0PFMvTDVq00XnhMRh30RbxqXA4Jr AsVc+60OfAZW3s81lI6EIAiL6z8NZQ+7oHlyEW36maL/Bxr5Q5Ethe/Jto6V+5wC3N1eCR TN40MmdqHuLJxzy17iSBBM59DB6oV0g2tDKfsbCWC8GeQDEykW8fUgVMhxrqCcfxsN8Hbi 6azRlBvmTPjS3ARmIrdu7GflLbjqKP/w0bQGuAE7D4i6vcaccDSt5CVz/DDU9u421iHizw +uA7UM3ttu2B92MwLouvIrx8Hbb9Ve6k0Z5kZa8IpmRL7GMtviO7dvpm1zC+6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898575; a=rsa-sha256; cv=none; b=h6hehhgBYWKDJF2bH8I/rv6VWHvQ0N7kUA3IgJ3LFOvwEzbNEQHfgnaM4vWntvzVZhpT+g RoIdQbev22bBx/mpbJ2iFRrjY44exTOxDu4tIWtLDs3vj1jAg85TzcpxajDfIajolahsIg tvAap7k9z5pxfBJs+Jt+12nCmqzP1RSa6TXu1gTiLVZC2BLCfBvoJ3oKEZZBd5izodwfrR hysl+zc2+gsbppZYi6ZjELX0yaZgTXvydXRqUy+XzGHySxMCDPes20MUNP7EXaHn+zr7FG grvCFgoqLcEGQoddOrfHNNll+C/lt3RE/63WU4SUbGrbQVRpbVb1wyqzxWHQ2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g4VaYtnOtJ26OGtwl+XVhSZNXb9RoijzJX+2iEPLTO8=; b=ZUvlPSYz46aWSb83SuqLY8wVEuZZMYVOmAPua+9BKI2Tc93Rj+zqFZmjRzkdaW6WxcUjHV CozlVSY372kv/J3+Q4GZ1IRCj+5EL+Y467PtO5KGno5mHiupXg5NbAxJpUIk5xNNYttbCY SPs0CWrVoXYwtBisiKurkGzMPZ2ba9eIn6xwIkL8K1L69YyhkzyyPVrLq/hHd0tkfpDhtD 0d8gGVpFJ1XriDYxERxZ/MNYkOT2LfqqbxW3r855KMjzuXRhXb97Dz2Nls0dQL6GQQFo9o xFdeXy7oV09nACL2YqJ/9ch7STxcIqJPnV/BNUSbpN03Gq2P5qOCQzuayHR9Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3g0Qt3z3y2; Sat, 21 Oct 2023 14:29: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 39LETY7W071622; Sat, 21 Oct 2023 14:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETY4e071619; Sat, 21 Oct 2023 14:29:34 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:34 GMT Message-Id: <202310211429.39LETY4e071619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: dbe34ab6df0b - stable/14 - teken: use __bitcount() instead of bitcount() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dbe34ab6df0b84335e207adcb331dc0c7f507cd4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=dbe34ab6df0b84335e207adcb331dc0c7f507cd4 commit dbe34ab6df0b84335e207adcb331dc0c7f507cd4 Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:34 +0000 teken: use __bitcount() instead of bitcount() The use of bitcount() triggered a build error because it couldn't be located. __bitcount() on the other hand is defined in sys/types.h, which is included in teken/teken.h. MFC after: 2 weeks (cherry picked from commit 6d3296f16a06bcaa49918799e683936711dcf9c9) --- sys/teken/teken_wcwidth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f5a23dbc9679..bc992e1ef5d8 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -129,7 +129,7 @@ teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { /* Check for malformed characters. */ - if (bitcount(bytes[0] & 0xf0) != nbytes) + if (__bitcount(bytes[0] & 0xf0) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { From nobody Sat Oct 21 14:29:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3h2zMqz4y58l; Sat, 21 Oct 2023 14:29: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 4SCP3h2QwGz4GFf; Sat, 21 Oct 2023 14:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIsq4dlBIZLbuzEhK+eZqo2pl6AMapOkfYBiiFmWLIc=; b=S2aevm/xU3o6nNIBLXaw99TT8XpWEuMJ6+b53glp1ENLX4w9oA1/npKOKx3tJCj+GR+yKT NYl6lG0yKCm1GgnkkLBJrDcp4i1bAqZygrqfA/H04Mkh1w2ofXmY+6Z9HosI0XqEp5QaTQ BzVBzgpEx7WyaQXTVVEbxi13W4czfa8tHhwEUuAxxtx2aPGdH4RtloUJl8Qp4QXfvBi7e4 WxubnODv5+Mfclui+9F+OpR9yap3RMMdyCk4HnOrY/yvg/gMu1l7wVHLSjhMbnTD9BnP0D b7xRFQZJxRLcZ18aVTa/27Lppd1V50/ktQ3W9nVUXUNBgaM4IaNAIMDvrNSxkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898576; a=rsa-sha256; cv=none; b=Og6DcypjqAn4x1GrBE3qbJMtzcT+E+vXGF9c+JyXh+ISz9XqGCrYt0ReP7Ca6Hinr/1N2A yP9ugudYw7GxzyOL0Pzmf5yryeyd1uhA3s7ymVPpYtQ4LgGdu2LrDvf1aoleKgV4rYofwE hQtBCgpWAFv5aHfeceb2TVqiI9emQWOcJa1/pJ4KmT5AKz3/1sgCyx4U/iN9dzOR9PqzqH pDUw3ZQrbm4yC5fME/yy/3uNdx9OvEMj3xIi4J+sZCM8xdArRjlbfdlLl2nuYibR4np7NT SvGrDYDTxDauoKEVzI5MoK5Lh3gkMgrDplDt/Kbl3PVD5CR5TTJ8RGxO990s3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kIsq4dlBIZLbuzEhK+eZqo2pl6AMapOkfYBiiFmWLIc=; b=CXLS8FpShdiL8hYz11c+HnUc/yv0MOKxciwQIWoiFJbSyTXrwx8wGfUKscAQyqjSZrnmj9 OvCMg5gh+joD8xS37QPvB5gcNAFP4ZU+Beh3cYFu0d3rcRB2OkYkQXTRL4QGw438IWjw8P TQf4aichRC9fFy0Ydv5XzXrzXwxjgChsSBzgte/E+tl4jNsxkECfHKtEjEPlL+2IAw299/ f+oTYFnPzc5GC2OvB6rX1x089HB61ov6pISECYIDHIHmh/wt/Cx0P9QP9EVFKOTtK35bvG XHo/OgJ8fnCLSwYDqyTwO/mdLhQw0wtaecqRTsWuq///KxidJrK++DLE6V5JUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3h1Qnyz4S4; Sat, 21 Oct 2023 14:29: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 39LETa3c071677; Sat, 21 Oct 2023 14:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETaXu071674; Sat, 21 Oct 2023 14:29:36 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:36 GMT Message-Id: <202310211429.39LETaXu071674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d25f8c1bdcdc - stable/14 - teken: fix up unused func warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d25f8c1bdcdcadf17c542dc457b13220cb20d768 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d25f8c1bdcdcadf17c542dc457b13220cb20d768 commit d25f8c1bdcdcadf17c542dc457b13220cb20d768 Author: Mateusz Guzik AuthorDate: 2023-10-08 13:54:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:35 +0000 teken: fix up unused func warnings Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4b9aa38ef0e5bedcdd90b6627cc1c215037a1121) --- sys/teken/teken_wcwidth.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc992e1ef5d8..bc40c23a6eb7 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -16,7 +16,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(teken_char_t ucs, const struct interval *table, int max) { +static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -35,7 +35,7 @@ static int bisearch(teken_char_t ucs, const struct interval *table, int max) { return 0; } -static int teken_wcwidth(teken_char_t ucs) +static inline int teken_wcwidth(teken_char_t ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ @@ -124,7 +124,7 @@ static int teken_wcwidth(teken_char_t ucs) * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function * expects the 'bytes' array to start with the leading character. */ -static teken_char_t +static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { From nobody Sat Oct 21 14:29:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3j5SWmz4y5F7; Sat, 21 Oct 2023 14:29: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 4SCP3j3M1Wz4G2h; Sat, 21 Oct 2023 14:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WUDsoqn3Xs1dDcAIz9juvgkkwI2F2aG0d9Oux1P20fU=; b=l6mTcmY8zc9mZyJJVfhk9Jgju9EEvnVdjVesI6JHea1CodhMApaiogq83YBXm2ksvG4Lu0 gjShOPqrHtEYylxkADTw16W2U5Hstv0aKF1fpxzGvRP239I87IZ5u3NNYjf121sBo5t9im YhaYNPcPfdUN6Q9fKDpiNCZGxdXoGc6LPcOg2FxwsEWA3LiH/RXxXFhD+eh1FW7QZIknV+ pXnmwh8wDeVzsu6awLrRbD8vNkddX1lvegl5ykNHt0MGkFMdXymdGDredWxi/b+E6YumCj jQd40x3BCtX3bm9ZOZPiHKsdDVPQoH6xKMsDo7kkJ6vqa0xrJU3bopFRRRx7jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898577; a=rsa-sha256; cv=none; b=gdFncFkEB59ztYQGpDSsqdWlypnzH6n8fwedQHigW4jXyppUT4l2RCuVW2A1JEx3CWz9uR u9d7mPPHrZJ7Uw7lJsItpYIPZrn6/cJqIYivASEmAe+FcNQopL79BvXPiQnOZ687KNmMnI Ki7QLrZQ3BRQi2hL/H6vGK2b3RywFGBLvr+mU7EbXhXPXJsWstq6aL7tesiGL/tI/1NGEG dWHf4LAcCHDl0RcBrRNcTGMhvbBo4o0C0q2nTyiCCO9wUGljmQJSy0u+bMp9XPgk5cOhDS dTy3+hYANqo309+/ILh9Q+oIj7vmb0RFMadTWb66AWCuld5FwY3hceyXxpG2OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WUDsoqn3Xs1dDcAIz9juvgkkwI2F2aG0d9Oux1P20fU=; b=k97K2msf8TTVtGOLgaDpKWEUf2qRweRazNCYgeCzS+6LJP1GKBHQMIGWLe2dB6igAtSLWf PS22LGAVBW7grr2hIahVrCVvmI4hEYLwmB4TFHLBgSRHiYP7VEK+9vLpwt3vjq5aI/c5MO gMvHKEwXf0d7IITeV/HeJIwUmoP1uRBU8Z89Zfu3wwh8yQLgBaDiqaaN8tojd+pGtMlqAw RercgvtqEYLpN4raOgDVxY3E6nNNQ70BAWg0Vp6Czzq+zwHTrkz6xz2AjdISlM0izJGBYA 9bfghi2KkfquHbDYsY9DiKpXNE1+94e2RRcNFl5TZDTWm9mhDdLL3izIQHqRMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3j2BLhz4Dg; Sat, 21 Oct 2023 14:29: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 39LETbud071727; Sat, 21 Oct 2023 14:29:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETbrH071724; Sat, 21 Oct 2023 14:29:37 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:37 GMT Message-Id: <202310211429.39LETbrH071724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 72a8e373f2d1 - stable/14 - tty/teken: fix UTF8 sequence validation logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72a8e373f2d1886f27d1f724aa9e8e55e08809eb Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=72a8e373f2d1886f27d1f724aa9e8e55e08809eb commit 72a8e373f2d1886f27d1f724aa9e8e55e08809eb Author: Bojan Novković AuthorDate: 2023-10-13 05:14:36 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:35 +0000 tty/teken: fix UTF8 sequence validation logic This patch fixes UTF-8 sequence validation logic in teken_utf8_bytes_to_codepoint() and fixes fallback behaviour in ttydisc_rubchar() when an invalid UTF8 sequence is encountered. The code previously used __bitcount() to extract sequence length information from the leading byte. However, this assumption breaks for certain code points that have additional bits set in the first half of the leading byte (e.g. Cyrillic characters). This lead to incorrect behaviour when deleting those characters using backspaces. The code now checks the number of consecutive set bits in the leading byte starting from the MSB, as per RFC 3629. Reviewed by: christos MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42147 (cherry picked from commit 2fed1c579c52d63b72fc08ffcc652ba0183f9254) --- sys/kern/tty_ttydisc.c | 12 +++++++----- sys/teken/teken_wcwidth.h | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index eae7162e31c0..c46579cefbb1 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -844,23 +844,25 @@ ttydisc_rubchar(struct tty *tp) */ ttyinq_write(&tp->t_inq, bytes, UTF8_STACKBUF, 0); + ttyinq_unputchar(&tp->t_inq); } else { /* Find codepoint and width. */ codepoint = teken_utf8_bytes_to_codepoint(bytes, nb); - if (codepoint != - TEKEN_UTF8_INVALID_CODEPOINT) { - cwidth = teken_wcwidth( - codepoint); - } else { + if (codepoint == + TEKEN_UTF8_INVALID_CODEPOINT || + (cwidth = teken_wcwidth( + codepoint)) == -1) { /* * Place all bytes back into the * inq and fall back to * default behaviour. */ + cwidth = 1; ttyinq_write(&tp->t_inq, bytes, nb, 0); + ttyinq_unputchar(&tp->t_inq); } } tp->t_column -= cwidth; diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc40c23a6eb7..14af2c6f9530 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -128,15 +128,32 @@ static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { - /* Check for malformed characters. */ - if (__bitcount(bytes[0] & 0xf0) != nbytes) + /* + * Check for malformed characters by comparing 'nbytes' + * to the byte length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different + * values indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in + * the leading octet (except in the first case, where an MSB + * of 0 means a byte length of 1). Here we flip the 4 upper + * bits and count the leading zeros using __builtin_clz() + * to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { case 1: return (bytes[0] & 0x7f); case 2: - return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); case 3: return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); case 4: From nobody Sat Oct 21 14:29:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCP3k6HL8z4y5NG; Sat, 21 Oct 2023 14:29: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 4SCP3k43L4z4G9y; Sat, 21 Oct 2023 14:29:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eh74q98wL7Ok+lCPm58vzB1DE0musBuESQoPdtWlWo=; b=GMwmEdbQ0RW8coGtYaxuAq+77bS3v+fQAKmdSWJ0wedOic4Zqcd4lAexp6JhhyNiP0n2rN MLT0JenWoCaIUBOTxHDs4srLdWml5g89/XZbll1BMhso4SuYHoe82PtSjkrZ+tdkX54SYB 3c5X/MLvIQLS2fJs1pILuenPAfxdbz/9QM5GQEYJwCGFS/3TevGsEWYlT/A1S9+VXHVm9B dMXeIHIjsyVawz5YnjS/6rZ4VywJfZZFdxvT1nl3FQPIdkiTYgSTu0pnuv9GYwHBPZcrvn Dk/u7NXQL6oWxls/6tcELzQamqb0EvNK+gWh+PMPkZkXoA/5CFjoF1+Ukbwk4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898578; a=rsa-sha256; cv=none; b=Qu+A0Fh4ieKNW2apZaPLldxIy2pMLCc2Es2IVh5pkW0zxGdLu3Awq02F1pGHDLdWhG1P/w MJHBCKv1XDvB2EKGFMDMJ4OP1n0DYob9pf5y3xmr1WauZjD8jE5n3CQJIU/xuMeXb3nNuo kLgY/P5azS1mcwz/JVx4Ox18zlkw9SSYMowf4HCdX9Z8fqmQuEBfPAYcDCYy0SS7+2pSJf IQzv42kTi9Ii0LxW9U2wCxEZk00yH9C/P/47Dl+++3aUiQHK7y4LJpAaDv533GWz59C+u7 lVdPzzloNJVnhDa2+HfG2UmzAlwp89HgI7DP8kqzoaPoYU+7NJJonc42VkXcXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6eh74q98wL7Ok+lCPm58vzB1DE0musBuESQoPdtWlWo=; b=cyEp8eu6V+g2ybkZRfUueTIktLMC4ksh5bRhCBiOGeMjA9PnhGU437QANjvbd6gCto4ltR +ADILzwez1IWnggdRCNKCbG63KoXrdkgkZF10N2ODt23KCUK/HaWlsppimEpwljqY2FnoK yJvFNhVeYplIDVsvjFOwNKN9SbM5DXDqJif0xlAXRB3hPLfA+Fd0H0XOCFfHZ2Cz8jGoHA Q22YI8jc4mAwJW8Qiey6xjFyKsbQelPKc9fLVtf47a8Q3J96Gp842soOOqNVIjhn1wAvXb ynlltRs2Nj9TuesIDPwtDU/Z+c+uM0dETC2JaS52ieMovvFuseNKSqarbJ8+Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCP3k38N0z3y3; Sat, 21 Oct 2023 14:29: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 39LETcxi071769; Sat, 21 Oct 2023 14:29:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LETcUx071767; Sat, 21 Oct 2023 14:29:38 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:29:38 GMT Message-Id: <202310211429.39LETcUx071767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 5f4f00adf34c - stable/14 - teken: fix style in teken_wcwidth.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5f4f00adf34c7f4abeb4a2d408bbe98c6e392e25 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4f00adf34c7f4abeb4a2d408bbe98c6e392e25 commit 5f4f00adf34c7f4abeb4a2d408bbe98c6e392e25 Author: Christos Margiolis AuthorDate: 2023-10-13 05:14:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:28:35 +0000 teken: fix style in teken_wcwidth.h Reviewed by: bojan.novkovic_fer.hr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42164 (cherry picked from commit 90367ba750bcbf3f9ac4609c3ec8df4ab95a22af) --- sys/teken/teken_wcwidth.h | 265 +++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 130 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index 14af2c6f9530..72df62704d73 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -11,112 +11,118 @@ #define TEKEN_UTF8_INVALID_CODEPOINT -1 struct interval { - teken_char_t first; - teken_char_t last; + teken_char_t first; + teken_char_t last; }; -/* auxiliary function for binary search in interval table */ -static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { - int min = 0; - int mid; +/* Auxiliary function for binary search in interval table */ +static inline int +bisearch(teken_char_t ucs, const struct interval *table, int max) +{ + int min = 0; + int mid; - if (ucs < table[0].first || ucs > table[max].last) - return 0; - while (max >= min) { - mid = (min + max) / 2; - if (ucs > table[mid].last) - min = mid + 1; - else if (ucs < table[mid].first) - max = mid - 1; - else - return 1; - } + if (ucs < table[0].first || ucs > table[max].last) + return (0); + while (max >= min) { + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return (1); + } - return 0; + return (0); } -static inline int teken_wcwidth(teken_char_t ucs) +static inline int +teken_wcwidth(teken_char_t ucs) { - /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ - static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, - { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, - { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, - { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, - { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, - { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, - { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, - { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, - { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, - { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, - { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, - { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } - }; - - /* test for 8-bit control characters */ - if (ucs == 0) - return 0; - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) - return -1; + /* + * Sorted list of non-overlapping intervals of non-spacing characters. + * Generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" + */ + static const struct interval combining[] = { + { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, + { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, + { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, + { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, + { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, + { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, + { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, + { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, + { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, + { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, + { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, + { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, + { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, + { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, + { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, + { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, + { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, + { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, + { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, + { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, + { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, + { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, + { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, + { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, + { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, + { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, + { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, + { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, + { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0xE0100, 0xE01EF } + }; - /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1)) - return 0; + /* Test for 8-bit control characters */ + if (ucs == 0) + return (0); + if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) + return (-1); - /* if we arrive here, ucs is not a combining or C0/C1 control character */ + /* Binary search in table of non-spacing characters */ + if (bisearch(ucs, combining, sizeof(combining) / + sizeof(struct interval) - 1)) + return (0); - return 1 + - (ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) || /* CJK ... Yi */ - (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ - (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ - (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ - (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ - (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || - (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); + /* + * If we arrive here, ucs is not a combining or C0/C1 control character + */ + return (1 + + (ucs >= 0x1100 && + (ucs <= 0x115f || /* Hangul Jamo init. consonants */ + ucs == 0x2329 || ucs == 0x232a || + (ucs >= 0x2e80 && ucs <= 0xa4cf && + ucs != 0x303f) || /* CJK ... Yi */ + (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ + (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ + (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ + (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ + (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ + (ucs >= 0xffe0 && ucs <= 0xffe6) || + (ucs >= 0x20000 && ucs <= 0x2fffd) || + (ucs >= 0x30000 && ucs <= 0x3fffd)))); } /* @@ -127,39 +133,38 @@ static inline int teken_wcwidth(teken_char_t ucs) static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { + /* + * Check for malformed characters by comparing 'nbytes' to the byte + * length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different values + * indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in the leading + * octet (except in the first case, where an MSB of 0 means a byte + * length of 1). Here we flip the 4 upper bits and count the leading + * zeros using __builtin_clz() to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); - /* - * Check for malformed characters by comparing 'nbytes' - * to the byte length of the character. - * - * The table in section 3 of RFC 3629 defines 4 different - * values indicating the length of a UTF-8 byte sequence. - * - * 0xxxxxxx -> 1 byte - * 110xxxxx -> 2 bytes - * 1110xxxx -> 3 bytes - * 11110xxx -> 4 bytes - * - * The length is determined by the higher-order bits in - * the leading octet (except in the first case, where an MSB - * of 0 means a byte length of 1). Here we flip the 4 upper - * bits and count the leading zeros using __builtin_clz() - * to determine the number of bytes. - */ - if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) - return (TEKEN_UTF8_INVALID_CODEPOINT); - - switch (nbytes) { - case 1: - return (bytes[0] & 0x7f); - case 2: - return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); - case 3: - return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); - case 4: - return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | - (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); - default: - return (TEKEN_UTF8_INVALID_CODEPOINT); - } + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | + (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } } From nobody Sat Oct 21 14:35:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBm5S9fz4y5k5; Sat, 21 Oct 2023 14:35: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 4SCPBm3gLlz4Hgk; Sat, 21 Oct 2023 14:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6W7kOhT7cmNlON8bDEF6kplrt2COkIkIwHwfgwq0Nig=; b=pLwranD67hSQ/1ZeUmvsc3QzUaHPJmEmxZqvmPiTfzokoZxW/gMBz1ky6AYtIVTf/Fulxt xuXTY4VkoGWZl/Hc2vguXRzeGYRmfWby8d9iQm3Kahb6fpAgdUyk/w18OGSzdzFKuhYseK fbneHXD1615D3YQQyxPeIHvGlC60Cin+qvPsNxdgN9flMyJX82sKvMXGuT7ZJXLYRqbOEh kdterQCjzH1c0rXKSNWNggu4hWUBjNtTbRCc18BX6nlKwZZPzgUycBXQpAvki7+PNwYFnj uZcyHtmhT718F9vS/10MHb3I6qYMTsVUjWpdAlRMAhrKYdRDR0bM+75iBPbMaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898944; a=rsa-sha256; cv=none; b=i6/BAMuFcxWSrmQ7C9eEVYmUWFsCuqLk77wHXmHupDhBDetRqUndqr1KdV7mfSWoSVzJKK wuy0BxsSUbqYgpBvz643eJ9CBrzTR2Q7S8x0e0m608vx8rsHpPrPFnj/68aA9AdLKb82VU vFir+s8FI6x+hD0/3PM93n/7uXN7KKaYGVzlEiqSX1QQlYg4AClgrBrtz1wvcHj0FMcNnP FkejTfW7Z5J4utl1YG/CM7lVImV1T8nfERsuEi/eI9r4pXxfodLCso1DrmpXncm7LNm+Tv 3fMn4kE6Pp8wYMLWan6WRz5o0xTJECjyUnvew0jdt09wgdlL9GcJIih3O7wBfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6W7kOhT7cmNlON8bDEF6kplrt2COkIkIwHwfgwq0Nig=; b=fLwbVBPwT5xXmyNa7zd6DuH5f28uUh8kKBjnWF10kBMcvMhNH5FGIqFi8fC35npnOGjsT2 sUAR+1kXnPDdvPzc8/1U0kFidfQl48rNWCKz5b0w6l7YDPdeJ3c9H9ddhhy8m0HP9Oav/f M7hJc1PioxEtjhJvCTsw7YYiKSQ7eF3Mn/WTEs/WX61FX0J+y15R3CuAQJsKmMQu1Ip0J7 UxDuUwKjvDeVLJrcNHFXaAEQmCmJEFaPLKTM2eZYtliauDBI1QTUkoVRFPf49tXwZYfn24 G8jwUXBAOFYgUqwUBh3XSB1iSeve9p4uGcNZAE1a4PhFZc7cNj6OXXWjnoCfOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPBm2kLNz4C0; Sat, 21 Oct 2023 14:35: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 39LEZiwT087454; Sat, 21 Oct 2023 14:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZiVd087451; Sat, 21 Oct 2023 14:35:44 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:44 GMT Message-Id: <202310211435.39LEZiVd087451@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 55bf2ae43ce0 - stable/13 - (s)tty: add support for IUTF8 input flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55bf2ae43ce0b92a080086ec587be05d763ee2ea Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=55bf2ae43ce0b92a080086ec587be05d763ee2ea commit 55bf2ae43ce0b92a080086ec587be05d763ee2ea Author: Bojan Novković AuthorDate: 2023-10-07 17:59:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:21 +0000 (s)tty: add support for IUTF8 input flag This patch adds the necessary kernel and stty code to support setting the IUTF8 flag for ttys. It is the first of two patches that fix backspace behaviour for UTF-8 encoded characters when in canonical mode. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42066 (cherry picked from commit 128f63cedc14ae21b35f74e11e2fe1a5659c58e8) --- bin/stty/modes.c | 2 ++ bin/stty/print.c | 1 + bin/stty/stty.1 | 3 +++ share/man/man4/termios.4 | 2 ++ sys/kern/tty.c | 4 ++-- sys/sys/_termios.h | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/stty/modes.c b/bin/stty/modes.c index ce39083d7d63..3818677ddc4e 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -126,6 +126,8 @@ static const struct modes imodes[] = { { "-decctlq", IXANY, 0 }, { "imaxbel", IMAXBEL, 0 }, { "-imaxbel", 0, IMAXBEL }, + { "iutf8", IUTF8, 0 }, + { "-iutf8", 0, IUTF8 }, { NULL, 0, 0 }, }; diff --git a/bin/stty/print.c b/bin/stty/print.c index 07a3c2058474..33472bbccea1 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -127,6 +127,7 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt) put("-inpck", INPCK, 0); put("-ignpar", IGNPAR, 0); put("-parmrk", PARMRK, 0); + put("-iutf8", IUTF8, 1); /* output flags */ tmp = tp->c_oflag; diff --git a/bin/stty/stty.1 b/bin/stty/stty.1 index d81b9e1e3ece..58e1a1476abf 100644 --- a/bin/stty/stty.1 +++ b/bin/stty/stty.1 @@ -224,6 +224,9 @@ if .Cm imaxbel is unset and the input queue is full, the next input character causes the entire input and output queues to be discarded. +.It Cm iutf8 Pq Fl iutf8 +Assume that input characters are UTF-8 encoded. Setting this flag +causes backspace to properly delete multibyte characters in canonical mode. .El .Ss Output Modes: This corresponds to the c_oflag of the termios structure. diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4 index 79a0090587e6..8abe1fce4402 100644 --- a/share/man/man4/termios.4 +++ b/share/man/man4/termios.4 @@ -884,6 +884,8 @@ following masks: /* any char will restart after stop */ .It Dv IMAXBEL /* ring bell on input queue full */ +.It Dv IUTF8 +/* assume input is UTF-8 encoded */ .El .Pp In the context of asynchronous serial data transmission, a break diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 748f353c4fe4..00a5670d84cf 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -85,8 +85,8 @@ static const char *dev_console_filename; /* * Flags that are supported and stored by this implementation. */ -#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|\ - INLCR|IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL) +#define TTYSUP_IFLAG (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK|ISTRIP|INLCR|\ + IGNCR|ICRNL|IXON|IXOFF|IXANY|IMAXBEL|IUTF8) #define TTYSUP_OFLAG (OPOST|ONLCR|TAB3|ONOEOT|OCRNL|ONOCR|ONLRET) #define TTYSUP_LFLAG (ECHOKE|ECHOE|ECHOK|ECHO|ECHONL|ECHOPRT|\ ECHOCTL|ISIG|ICANON|ALTWERASE|IEXTEN|TOSTOP|\ diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h index 327ffcb2f98b..823752732ee2 100644 --- a/sys/sys/_termios.h +++ b/sys/sys/_termios.h @@ -97,6 +97,7 @@ #endif #if __BSD_VISIBLE #define IMAXBEL 0x00002000 /* ring bell on input queue full */ +#define IUTF8 0x00004000 /* assume input is utf-8 encoded */ #endif /* From nobody Sat Oct 21 14:35:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBn5v7Rz4y5Sh; Sat, 21 Oct 2023 14:35: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 4SCPBn51cGz4Hsf; Sat, 21 Oct 2023 14:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sj7njNUqVxGJ48GUVoVEaiEmFutUp3uTLUT/rh8mrtQ=; b=WH2Au3YS+o0wVudBWtT3rn61ag9NcTskC+hpb0/rgRWqOsRjcBtLOUWyJ2CAX8OG2FqNaU YcmXPD2xmh1HxPlyIyohy87rCTfAK9PcbcgfBUOBkMVwHlIDs2gPP4VbZxBv8GIBIlSddT ic9iUsU+ddmBZ1dlhIVAEidUn/s33rn/E82ca38H90aAaJeas3jSlv+2DaktZs/zUKzR1q 0Iz51b6xigYy1Q/o81bdCWLPfwcyF6VKuqPsJH3mtP21mYNwMEt/Ebkr6ODJGuqOEApcgZ DdYxmwJblFZXwt+fRjJ4UGxrCJwZkf3k0rSS9CUyfXHA9G9IRoTuYw5Vur894Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898945; a=rsa-sha256; cv=none; b=IyV+wM++86WxOh2OYfwGEtOkKuFB937zi4w/RwewCxD+U1JRuI4/tVS6PLXiyxx/rqVlgx asMqUsLqr2tQ5XDxLwAIYU/Yv4uQPCKVCPmvbWZsIXieZtBNXVtKuRYI0RVvhHfQgLobq/ asWyZ7BHlHxIlMBZdxvAwMeMUDrtb/lau0MTJ1zEGhT01Kivzct8EuA+Cw/ANVH+XznMBF 5CbeNudV3wWM7ToLw/fX6beAxUh6RaSIYlejBx/zGoGcA7tmZMiyxOO8uDR4Fqj/kLCQg0 aXnj3gPIfvebpSCyprEH7ll93ANNUw9wttS1P0LC6Q9zmiyd1nbN/Q+JsLHOXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sj7njNUqVxGJ48GUVoVEaiEmFutUp3uTLUT/rh8mrtQ=; b=vZ+b/4M+IT5DNFlRchd2uowbxZXeNFPgjKbTmPHTAs/rvn++i7OSsIlQIJj/URAtbLDIRM 8zkhStGQtkYfjCT0RgUePel9hO1WGj2F3USFOjoL0xcs8TVRTbQa0BpfM+N5zrkHtVb6a8 hLDaXFtvVYv+W1n39D3TCi66NLszhJ1M3JFMyX34KUPWMyrmui2UTfxNgZ1NeKfMRDcgq9 a8sjzdNdGgV1vUQbPgxsFBjC0aKROQvPlNdJB0C7DGKOc3Nc83Se+asFkO65ZRO/kO/hxT E9RTXrgBjpz4paBlEKozy+0rs4RCmVNzJ1Y1y7MNF7MEl9/mnqcSUATIZRe2xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPBn3pDrz4m8; Sat, 21 Oct 2023 14:35: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 39LEZjd6087517; Sat, 21 Oct 2023 14:35:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZjOh087514; Sat, 21 Oct 2023 14:35:45 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:45 GMT Message-Id: <202310211435.39LEZjOh087514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: f859afb57fd8 - stable/13 - tty: fix improper backspace behaviour for UTF8 characters when in canonical mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f859afb57fd87715ab80fc00635016949a5daf0e Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f859afb57fd87715ab80fc00635016949a5daf0e commit f859afb57fd87715ab80fc00635016949a5daf0e Author: Bojan Novković AuthorDate: 2023-10-07 18:00:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:21 +0000 tty: fix improper backspace behaviour for UTF8 characters when in canonical mode This patch adds additional logic in ttydisc_rubchar() to properly handle backspace behaviour for UTF-8 characters. Currently, typing in a backspace after a UTF8 character will delete only one byte from the byte sequence, leaving garbled output in the tty's output queue. With this change all of the character's bytes are deleted. This change is only active when the IUTF8 flag is set (see 19054eb6053189144aa962b2ecc1bf5087758a3e "(s)tty: add support for IUTF8 input flag") The code uses the teken_wcwidth() function to properly handle character column widths for different code points, and adds the teken_utf8_bytes_to_codepoint() function that converts a UTF-8 byte sequence to a codepoint, as specified in RFC3629. Reported by: christos Reviewed by: christos, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42067 (cherry picked from commit 9e589b0938579f3f4d89fa5c051f845bf754184d) --- sys/kern/tty_ttydisc.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ sys/teken/teken_wcwidth.h | 30 +++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index 665275ee93e7..eae7162e31c0 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -43,6 +43,9 @@ #include #include +#include +#include + /* * Standard TTYDISC `termios' line discipline. */ @@ -78,8 +81,13 @@ SYSCTL_ULONG(_kern, OID_AUTO, tty_nout, CTLFLAG_RD, /* Character is alphanumeric. */ #define CTL_ALNUM(c) (((c) >= '0' && (c) <= '9') || \ ((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z')) +/* Character is UTF8-encoded. */ +#define CTL_UTF8(c) (!!((c) & 0x80)) +/* Character is a UTF8 continuation byte. */ +#define CTL_UTF8_CONT(c) (((c) & 0xc0) == 0x80) #define TTY_STACKBUF 256 +#define UTF8_STACKBUF 4 void ttydisc_open(struct tty *tp) @@ -800,6 +808,72 @@ ttydisc_rubchar(struct tty *tp) ttyoutq_write_nofrag(&tp->t_outq, "\b\b\b\b\b\b\b\b", tablen); return (0); + } else if ((tp->t_termios.c_iflag & IUTF8) != 0 && + CTL_UTF8(c)) { + uint8_t bytes[UTF8_STACKBUF] = { 0 }; + int curidx = UTF8_STACKBUF - 1, cwidth = 1, + nb = 0; + teken_char_t codepoint; + + /* Save current byte. */ + bytes[curidx] = c; + curidx--; + nb++; + /* Loop back through inq until we hit the + * leading byte. */ + while (CTL_UTF8_CONT(c) && nb < UTF8_STACKBUF) { + ttyinq_peekchar(&tp->t_inq, &c, "e); + ttyinq_unputchar(&tp->t_inq); + bytes[curidx] = c; + curidx--; + nb++; + } + /* + * Shift array so that the leading + * byte ends up at idx 0. + */ + if (nb < UTF8_STACKBUF) + memmove(&bytes[0], &bytes[curidx + 1], + nb * sizeof(uint8_t)); + /* Check for malformed UTF8 characters. */ + if (nb == UTF8_STACKBUF && + CTL_UTF8_CONT(bytes[0])) { + /* + * Place all bytes back into the inq and + * delete the last byte only. + */ + ttyinq_write(&tp->t_inq, bytes, + UTF8_STACKBUF, 0); + } else { + /* Find codepoint and width. */ + codepoint = + teken_utf8_bytes_to_codepoint(bytes, + nb); + if (codepoint != + TEKEN_UTF8_INVALID_CODEPOINT) { + cwidth = teken_wcwidth( + codepoint); + } else { + /* + * Place all bytes back into the + * inq and fall back to + * default behaviour. + */ + ttyinq_write(&tp->t_inq, bytes, + nb, 0); + } + } + tp->t_column -= cwidth; + /* + * Delete character by punching + * 'cwidth' spaces over it. + */ + if (cwidth == 1) + ttyoutq_write_nofrag(&tp->t_outq, + "\b \b", 3); + else if (cwidth == 2) + ttyoutq_write_nofrag(&tp->t_outq, + "\b\b \b\b", 6); } else { /* * Remove a regular character by diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f57a185c2433..f5a23dbc9679 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -8,6 +8,8 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ +#define TEKEN_UTF8_INVALID_CODEPOINT -1 + struct interval { teken_char_t first; teken_char_t last; @@ -116,3 +118,31 @@ static int teken_wcwidth(teken_char_t ucs) (ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd))); } + +/* + * Converts an UTF-8 byte sequence to a codepoint as specified in + * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function + * expects the 'bytes' array to start with the leading character. + */ +static teken_char_t +teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) +{ + + /* Check for malformed characters. */ + if (bitcount(bytes[0] & 0xf0) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); + + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } +} From nobody Sat Oct 21 14:35:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBp6tMNz4y5Mx; Sat, 21 Oct 2023 14:35: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 4SCPBp5sZ3z4J44; Sat, 21 Oct 2023 14:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vTUzX7UHjHP/rcRDmQH1kb9fWxDsJUrcEruKrJeAzc=; b=POmhU3e6F8MTTmTjcr27e6zcgHRebnUFaV9Uv3BcwViFRkJoG1S7jAg1xvxGJD5hk8010S tqCO4s/szMf5kmjYKFXdgt0YZm2f8uCKWnsnxKUq9hvoTt9Z9J4o7E7iJXBttFZj0O/zHX u90uCHPnU8moEGfY5femx0614q9NzRekFfS2kJCKg1uhGnZ/CKavZJzHVM1pDK++ueqqGM FcrQOyfMZ2N38fhHugpfeUiKbqyTUAbiQG7ADA2I38P8vLscFsinkjCDnI2Ju9rpQVCi5/ nNtSto6s7XGX4DzRUN4AaTa2HZR9trCefQHKRiSqMLbU4NVghx8KPlELZ10E5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898946; a=rsa-sha256; cv=none; b=q0q3n235/qoZt1HkO4O2WX/Jw64RHxrUoWS+smQjD499tQVZN2TVzRjWdC6WWfOir6u+IL xh/QHvpxnZG9AXx5gyQE88UYPOwqeRJSL+gq2FIU4sSWB/d/klZM6u9nMCOC9R3YbUY1AN zsNypi34mklkbY9WgVGL4LwHWxuFiE2kcb/iEUfdPEVAjrlh3KBttz6bw4Th7dFAN7pdGj K+w0DLwOuRyO6Hg8qfm3SQlFVCjkBqRysG8xIRGD455PEs1qLtj5/ZBs2OJIxbR0nQzPxT E8je7snBCfoAt4RBX9thyKeZg/5sM0WZbtL3rZywea1VTm/Z87eLhvNcx4b7LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5vTUzX7UHjHP/rcRDmQH1kb9fWxDsJUrcEruKrJeAzc=; b=PcwGoLTvYg2wP5HyYoAl3YLilosJ2pDYb66a/mrzPDj+PAiESA0snHHjS3hoB3fkjHBeHm ap2qaHNqWYBmPp/gJdHD/r04pQxkQUWMdVsqYAV002OPjzKtPl61gahCDixTkPq2IjlP8A 2UZommZBC8vdVtHqYhm/TCWVMyWEZCV+Dc1a+FPWKnWiAqP9YMWVTCweJ3h54mlFdnkSa+ 09FO0CSTZdbBLG/0H9mafB3vTSNknoW7Q97jhlZ0lkHCH4RDyeuuO3xmnU+5vcM6egjYHl bvBLXjLjQm/8IpI3laZHRJei60Rp8WvBIf1hmipF/Ly0tv4uW8jBkG3UrjEb+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 4SCPBp4pSMz4YY; Sat, 21 Oct 2023 14:35: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 39LEZkWw087562; Sat, 21 Oct 2023 14:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZk8t087559; Sat, 21 Oct 2023 14:35:46 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:46 GMT Message-Id: <202310211435.39LEZk8t087559@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 0514cca9e44c - stable/13 - teken: use __bitcount() instead of bitcount() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0514cca9e44c80e098efd5bdcf461b9e0c36fdfb Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=0514cca9e44c80e098efd5bdcf461b9e0c36fdfb commit 0514cca9e44c80e098efd5bdcf461b9e0c36fdfb Author: Christos Margiolis AuthorDate: 2023-10-07 21:36:59 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:21 +0000 teken: use __bitcount() instead of bitcount() The use of bitcount() triggered a build error because it couldn't be located. __bitcount() on the other hand is defined in sys/types.h, which is included in teken/teken.h. MFC after: 2 weeks (cherry picked from commit 6d3296f16a06bcaa49918799e683936711dcf9c9) --- sys/teken/teken_wcwidth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index f5a23dbc9679..bc992e1ef5d8 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -129,7 +129,7 @@ teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { /* Check for malformed characters. */ - if (bitcount(bytes[0] & 0xf0) != nbytes) + if (__bitcount(bytes[0] & 0xf0) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { From nobody Sat Oct 21 14:35:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBr0jm0z4y5mf; Sat, 21 Oct 2023 14:35: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 4SCPBq6vMxz4Hx7; Sat, 21 Oct 2023 14:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mSo19iyFzBc7c5If8d22j28bcl0g+Fpvf4a02YvChKc=; b=l+xaMIIgkRE+K/SHkdQ3uLMzXt2CTJR5mii9xyCMrHKfao5hjoz7IRvi1OVtyrTbanagXI WiO5wDla8aEEOHkKzs9qbHbzHiNQUVl7P6BNIMJrSJb1wmPegZjx37qB/yVDW4PmdKBS81 neIHLQL8acOnKGvd82yiyaJA3yWOwxK+GvmWusY+uLrKF/2bjAW+x5nbYO68zoBCnrpE8K Q8bGopFEcEtOmQbt48BaEiPW3Er9ajoEIpF7TzK5mdlH2ktx1Sztok/Hraz1nLvuP+aN5U 54XG1TFRpD1siszwE0rGPnfFKzbyl4iZs/ZhV0U+2By7yALPcgvxxNrwLtgBzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898948; a=rsa-sha256; cv=none; b=P+7JmESrO/c8eJFqnejQiufh80jDZt8lXKVZy2k4uPIPdQfTTix024GFmCEd4ACyizVk6Y zsxf7OQDvqAHiFnJY04kVZ4sWCuBumcKPDYCjSryrkip3vBV+QauWHtstOqR+iAOgID7Kz zdnk9SZMmyTeMjjNYnrtrMKkyeqO7gVRZazKwxgYmOqnpXGxdcTVYx7BmzmwtDWgn5z68X iZb4aggbETVYMOWXjECcLKRCzxLKyg3qih7LWC4rpAozwfOEQz7XQgrYREWd1H1dvRA9T5 88I6q+G4jXLeBSQcyha7nnjQMAXpXwE/hxcsv7W7TcTm0XkAvzFpTLPvWgL5fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mSo19iyFzBc7c5If8d22j28bcl0g+Fpvf4a02YvChKc=; b=mxSY7c4xhRO4SayraXug3MIKmjgaII0D9cROHRnlhLUWY5oWJxeOcdUaT1jpXnn50qzo/R y/FMhJBwigO6vvTQSIZP8JrRP8PjJxX8dnRoj0+A2/ssV7/CFKx0QcDB3TIjU4wl2GsB4A o8tzc27KtLWk4RjrWY4PnEAIP0UPcQIMZe3orX/JXY4djSBxNTN8bCMqrEwLdCcfyIQ75P CJs5PDHKTRvtvCcA7ymqVTYKqv6xyrLK1LZAoBRJi1UZ65CSr5D2vEx9KpHmpERVZeN869 PvL1aISPVLVpzifp3j01AsKmaJ1PWsLLu8bXTp06L30HBVqfRGlQAtzgVEbJbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPBq5pbRz4C1; Sat, 21 Oct 2023 14:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39LEZlnV087607; Sat, 21 Oct 2023 14:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZl7C087604; Sat, 21 Oct 2023 14:35:47 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:47 GMT Message-Id: <202310211435.39LEZl7C087604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7efbe98526f1 - stable/13 - teken: fix up unused func warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7efbe98526f18317420785fd989f617c482846a7 Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7efbe98526f18317420785fd989f617c482846a7 commit 7efbe98526f18317420785fd989f617c482846a7 Author: Mateusz Guzik AuthorDate: 2023-10-08 13:54:11 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:22 +0000 teken: fix up unused func warnings Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 4b9aa38ef0e5bedcdd90b6627cc1c215037a1121) --- sys/teken/teken_wcwidth.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc992e1ef5d8..bc40c23a6eb7 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -16,7 +16,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(teken_char_t ucs, const struct interval *table, int max) { +static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -35,7 +35,7 @@ static int bisearch(teken_char_t ucs, const struct interval *table, int max) { return 0; } -static int teken_wcwidth(teken_char_t ucs) +static inline int teken_wcwidth(teken_char_t ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ @@ -124,7 +124,7 @@ static int teken_wcwidth(teken_char_t ucs) * https://datatracker.ietf.org/doc/html/rfc3629#section-3 . The function * expects the 'bytes' array to start with the leading character. */ -static teken_char_t +static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { From nobody Sat Oct 21 14:35:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBs1Sgtz4y5kG; Sat, 21 Oct 2023 14:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SCPBs0TvCz4J4s; Sat, 21 Oct 2023 14:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P8Qfg2D8EPhBr4gVyxTQiteXR7uTn24jTz/igvhoyY=; b=VdegxjelU7HH9f/FcGvaReBqcz863sA8wX+u+F7KclygDZvuaAWX3BF6ycdtO26xnPbGVE onRrUoTULdQ7DEqhQSw9k2f5ld5kXxYXHDi+hgrdaK/HYIE/T+IOQ91XL6/rySZCg3ob7o rSf3DCUR5ielDsUNGo1Od1G+sPbzazPIFbA0EwyVzA84MwPbQmZt1VkhjJUIgXmvl/0yDp T+put5c36DGfJustHF8lb+tAeEW0dDUND4gs7ra9J5KvAXN6RRtJH40CXkuwzvSpNAJslv N6FqjBakPC+pv6Os499wHD9JPQcCMlJBCBAFb2FYweL9uzHbPUgh7asO1xkMXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898949; a=rsa-sha256; cv=none; b=jxMdvbLfKx/ehHdYLXPYoBFt8Q2oDVHyVgCAewg7+0yApXJwFyBsN1PCgiaSm2sR2kZokK EnAlXdCjd/sE9XC7l4k3vBCWW/A+MqoL8lgtkefLu++M8u/gtzDJIecz7RYxue31PbQP+G iAzx1eLJ/oEAqDfh8oX/gmF/47ZZMcs+j+TqIxzF/6uELm2/DEEl82DbcXnCKHvhdpsQG+ IBjPt5egrDLROXQHJ4l7BFg0UZ5a9SktORngm7zeERkAky7t3yrHCOTq0P78pPptC/lUgg g3sD/dcyuFnoMGlLACQoQvzw1BPPSkg7aLZC6lOurhaP62jM8NDTSSTQDpNy1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5P8Qfg2D8EPhBr4gVyxTQiteXR7uTn24jTz/igvhoyY=; b=rAvrp327tSZvm5mgYIXOmzYOFSOD3UBV1iJGUjtgUBwQgadqu/fvnx+TnFjwZPhNL3GbsJ 2oT0KBsG+FdHFBXO6PmsEUpIc6t1D1OtqTfecBZmUlbk01h0x5aRZ3AAJDfhv1P71ish22 7rErypPz0U5QeUCV2KJWPBynhsc+UB4SCxCRqyaPkQN0hmONn8xF0hF3uJY67A4VN7nIAa 7SQ2uigAepR+lrcNiFqTmDPD7beIq1NMR+0yn33/NlkIJQM6gQAOV5FTzpNHimQxP4CpbW rWS/CQbvj3UE5eyr2w3tJZiiU8Epj9Py6hSpKOinVMssVhi4DP7mGgmIe0mlDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPBr6cqfz4TC; Sat, 21 Oct 2023 14:35: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 39LEZmnv087652; Sat, 21 Oct 2023 14:35:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZms3087649; Sat, 21 Oct 2023 14:35:48 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:48 GMT Message-Id: <202310211435.39LEZms3087649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 376c2ff8981a - stable/13 - tty/teken: fix UTF8 sequence validation logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 376c2ff8981a9b818e7a61149feeb4961ed970d2 Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=376c2ff8981a9b818e7a61149feeb4961ed970d2 commit 376c2ff8981a9b818e7a61149feeb4961ed970d2 Author: Bojan Novković AuthorDate: 2023-10-13 05:14:36 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:22 +0000 tty/teken: fix UTF8 sequence validation logic This patch fixes UTF-8 sequence validation logic in teken_utf8_bytes_to_codepoint() and fixes fallback behaviour in ttydisc_rubchar() when an invalid UTF8 sequence is encountered. The code previously used __bitcount() to extract sequence length information from the leading byte. However, this assumption breaks for certain code points that have additional bits set in the first half of the leading byte (e.g. Cyrillic characters). This lead to incorrect behaviour when deleting those characters using backspaces. The code now checks the number of consecutive set bits in the leading byte starting from the MSB, as per RFC 3629. Reviewed by: christos MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42147 (cherry picked from commit 2fed1c579c52d63b72fc08ffcc652ba0183f9254) --- sys/kern/tty_ttydisc.c | 12 +++++++----- sys/teken/teken_wcwidth.h | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/sys/kern/tty_ttydisc.c b/sys/kern/tty_ttydisc.c index eae7162e31c0..c46579cefbb1 100644 --- a/sys/kern/tty_ttydisc.c +++ b/sys/kern/tty_ttydisc.c @@ -844,23 +844,25 @@ ttydisc_rubchar(struct tty *tp) */ ttyinq_write(&tp->t_inq, bytes, UTF8_STACKBUF, 0); + ttyinq_unputchar(&tp->t_inq); } else { /* Find codepoint and width. */ codepoint = teken_utf8_bytes_to_codepoint(bytes, nb); - if (codepoint != - TEKEN_UTF8_INVALID_CODEPOINT) { - cwidth = teken_wcwidth( - codepoint); - } else { + if (codepoint == + TEKEN_UTF8_INVALID_CODEPOINT || + (cwidth = teken_wcwidth( + codepoint)) == -1) { /* * Place all bytes back into the * inq and fall back to * default behaviour. */ + cwidth = 1; ttyinq_write(&tp->t_inq, bytes, nb, 0); + ttyinq_unputchar(&tp->t_inq); } } tp->t_column -= cwidth; diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index bc40c23a6eb7..14af2c6f9530 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -128,15 +128,32 @@ static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { - /* Check for malformed characters. */ - if (__bitcount(bytes[0] & 0xf0) != nbytes) + /* + * Check for malformed characters by comparing 'nbytes' + * to the byte length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different + * values indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in + * the leading octet (except in the first case, where an MSB + * of 0 means a byte length of 1). Here we flip the 4 upper + * bits and count the leading zeros using __builtin_clz() + * to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) return (TEKEN_UTF8_INVALID_CODEPOINT); switch (nbytes) { case 1: return (bytes[0] & 0x7f); case 2: - return (bytes[0] & 0xf) << 6 | (bytes[1] & 0x3f); + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); case 3: return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); case 4: From nobody Sat Oct 21 14:35:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPBt3kGGz4y5j0; Sat, 21 Oct 2023 14:35: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 4SCPBt1h4Qz4JD7; Sat, 21 Oct 2023 14:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aZ9HMGVdYCBvw7WCUOAXgkpvIKZsjXWKsQ88GGbvi4=; b=WRMBFmtFqoIfQTHJqOiD0aoZAmE9y16tHSy+tedmNmhv7zglUOA0CyjzJFXgYwrAzUWOUA Lv+ht0aaf6EqlUUxsPfgWGrnhvI1nk7Sxz6GVvWJoYCX/yvEQ4pK+WHCy9kdgQeKdCognO 6Sksnyq0YkTGsXz4fL5bdb72E/J+ofZO6ek173F6dpt6D3mbhgt7UqyxjOzH/3yfdvPSaT suC7evegIoAuAY1L9ZR0SUyjI7/ruSYGawWElWO6ImGM225FpuOX6GpGFK77JPxe5HvgAe UN9mp/514yEZ90y60Um5V4//4Rhh9Md4h6gsO+MmgTMRhC3BTesJMqQcWr28xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697898950; a=rsa-sha256; cv=none; b=upvfaFZ5wsUqd1dWeJuthEfrHh9acf9lkV/0dq4BwvZ1JqNYsnKoew78+bmf7TzN0BlZzy /dOAefS7afbZ557ZAoJKP6DMeKxgwRdzWbUkHiVax/oczQVI9B7M7A3QubLRoU6V+m5Kpg utlt3onXUOP2JgdTcpi0IhvUXXpbPfKN9EJ+RkMNGtymZF8Uzqo84wDt8JTZbkMYYy2P7q 9Ce6J/pCwqd3bj0lXvVdmVcOtJmNZ5hpzFlfxSgCx08enS1TYxAFNjY39YvXe7vZupfzD8 3OhvUOhy2/+o2gV9tesEP+OzbNrGwATme68qZS8WWLOiTTLD8zFevMdiv1DubQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697898950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aZ9HMGVdYCBvw7WCUOAXgkpvIKZsjXWKsQ88GGbvi4=; b=DzLUTov4ASE3KZylBruAot+qC8csR+vqSpsZFrsaMS035qH2AUI6QbxYog70VkPNBVxmNx gkF/TcVxGQPZ6Q+jfCCGmgT4STSkC0ZRK7TDQ6f9dyKNGY6SN/b/zE+G12fqXnH45r58LQ zhUidpLW89ThTtWWWXDuCdHDQHwwvS3/mAYzXxFvH5RpOFv/+bPsNd/lkkuq6OM+nptGh0 rZq7uoNsyWy+/BzUNhXSu0HgjQrst0j4ik/muhSK6u/lXLrMmViulNJ7ro9a60Gk7A4QoA jcSu1BQFJsdAWhYmCq5QR857aet5NuSsrVIMVwarx2JxwQIvTpFMwtTCAUSs1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPBt09YKz4cK; Sat, 21 Oct 2023 14:35: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 39LEZnCv087703; Sat, 21 Oct 2023 14:35:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEZnEc087700; Sat, 21 Oct 2023 14:35:49 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:35:49 GMT Message-Id: <202310211435.39LEZnEc087700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 9856a16ee49e - stable/13 - teken: fix style in teken_wcwidth.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9856a16ee49e5c634358d206ea208328bd5ab5fe Auto-Submitted: auto-generated The branch stable/13 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=9856a16ee49e5c634358d206ea208328bd5ab5fe commit 9856a16ee49e5c634358d206ea208328bd5ab5fe Author: Christos Margiolis AuthorDate: 2023-10-13 05:14:57 +0000 Commit: Christos Margiolis CommitDate: 2023-10-21 14:34:22 +0000 teken: fix style in teken_wcwidth.h Reviewed by: bojan.novkovic_fer.hr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D42164 (cherry picked from commit 90367ba750bcbf3f9ac4609c3ec8df4ab95a22af) --- sys/teken/teken_wcwidth.h | 265 +++++++++++++++++++++++----------------------- 1 file changed, 135 insertions(+), 130 deletions(-) diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h index 14af2c6f9530..72df62704d73 100644 --- a/sys/teken/teken_wcwidth.h +++ b/sys/teken/teken_wcwidth.h @@ -11,112 +11,118 @@ #define TEKEN_UTF8_INVALID_CODEPOINT -1 struct interval { - teken_char_t first; - teken_char_t last; + teken_char_t first; + teken_char_t last; }; -/* auxiliary function for binary search in interval table */ -static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) { - int min = 0; - int mid; +/* Auxiliary function for binary search in interval table */ +static inline int +bisearch(teken_char_t ucs, const struct interval *table, int max) +{ + int min = 0; + int mid; - if (ucs < table[0].first || ucs > table[max].last) - return 0; - while (max >= min) { - mid = (min + max) / 2; - if (ucs > table[mid].last) - min = mid + 1; - else if (ucs < table[mid].first) - max = mid - 1; - else - return 1; - } + if (ucs < table[0].first || ucs > table[max].last) + return (0); + while (max >= min) { + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return (1); + } - return 0; + return (0); } -static inline int teken_wcwidth(teken_char_t ucs) +static inline int +teken_wcwidth(teken_char_t ucs) { - /* sorted list of non-overlapping intervals of non-spacing characters */ - /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ - static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, - { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, - { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, - { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, - { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, - { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, - { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, - { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, - { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, - { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, - { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, - { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } - }; - - /* test for 8-bit control characters */ - if (ucs == 0) - return 0; - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) - return -1; + /* + * Sorted list of non-overlapping intervals of non-spacing characters. + * Generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" + */ + static const struct interval combining[] = { + { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, + { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, + { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, + { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, + { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, + { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, + { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, + { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, + { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, + { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, + { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, + { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, + { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, + { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, + { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, + { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, + { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, + { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, + { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, + { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, + { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, + { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, + { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, + { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, + { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, + { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, + { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, + { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, + { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, + { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, + { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, + { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, + { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, + { 0xE0100, 0xE01EF } + }; - /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1)) - return 0; + /* Test for 8-bit control characters */ + if (ucs == 0) + return (0); + if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) + return (-1); - /* if we arrive here, ucs is not a combining or C0/C1 control character */ + /* Binary search in table of non-spacing characters */ + if (bisearch(ucs, combining, sizeof(combining) / + sizeof(struct interval) - 1)) + return (0); - return 1 + - (ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) || /* CJK ... Yi */ - (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ - (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ - (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ - (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ - (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || - (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); + /* + * If we arrive here, ucs is not a combining or C0/C1 control character + */ + return (1 + + (ucs >= 0x1100 && + (ucs <= 0x115f || /* Hangul Jamo init. consonants */ + ucs == 0x2329 || ucs == 0x232a || + (ucs >= 0x2e80 && ucs <= 0xa4cf && + ucs != 0x303f) || /* CJK ... Yi */ + (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ + (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ + (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */ + (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ + (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ + (ucs >= 0xffe0 && ucs <= 0xffe6) || + (ucs >= 0x20000 && ucs <= 0x2fffd) || + (ucs >= 0x30000 && ucs <= 0x3fffd)))); } /* @@ -127,39 +133,38 @@ static inline int teken_wcwidth(teken_char_t ucs) static inline teken_char_t teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes) { + /* + * Check for malformed characters by comparing 'nbytes' to the byte + * length of the character. + * + * The table in section 3 of RFC 3629 defines 4 different values + * indicating the length of a UTF-8 byte sequence. + * + * 0xxxxxxx -> 1 byte + * 110xxxxx -> 2 bytes + * 1110xxxx -> 3 bytes + * 11110xxx -> 4 bytes + * + * The length is determined by the higher-order bits in the leading + * octet (except in the first case, where an MSB of 0 means a byte + * length of 1). Here we flip the 4 upper bits and count the leading + * zeros using __builtin_clz() to determine the number of bytes. + */ + if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) + return (TEKEN_UTF8_INVALID_CODEPOINT); - /* - * Check for malformed characters by comparing 'nbytes' - * to the byte length of the character. - * - * The table in section 3 of RFC 3629 defines 4 different - * values indicating the length of a UTF-8 byte sequence. - * - * 0xxxxxxx -> 1 byte - * 110xxxxx -> 2 bytes - * 1110xxxx -> 3 bytes - * 11110xxx -> 4 bytes - * - * The length is determined by the higher-order bits in - * the leading octet (except in the first case, where an MSB - * of 0 means a byte length of 1). Here we flip the 4 upper - * bits and count the leading zeros using __builtin_clz() - * to determine the number of bytes. - */ - if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes) - return (TEKEN_UTF8_INVALID_CODEPOINT); - - switch (nbytes) { - case 1: - return (bytes[0] & 0x7f); - case 2: - return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); - case 3: - return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f); - case 4: - return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | - (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); - default: - return (TEKEN_UTF8_INVALID_CODEPOINT); - } + switch (nbytes) { + case 1: + return (bytes[0] & 0x7f); + case 2: + return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f); + case 3: + return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | + (bytes[2] & 0x3f); + case 4: + return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 | + (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f); + default: + return (TEKEN_UTF8_INVALID_CODEPOINT); + } } From nobody Sat Oct 21 14:42:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPM40yRfz4y6PT; Sat, 21 Oct 2023 14:42: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 4SCPM403pMz4KwN; Sat, 21 Oct 2023 14:42:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6HTcGRw7p5ksbe/s/jQVRUo02CHyo7uInYhAQ4NCWY=; b=mYkvRMhjnQda4tSVFErrNbuPPZYOIQCugyld/FwmwCaL/Avtzp+7PcH06FAy9zBuvlzC8Y Lq7CmGPirKCFYEqQYxPp7t7J0XV+pSUp0iEL5Z96CR30JZqsVFjdum0Je7CA7zvrjVJswO VkWNgFO2CGzjYNdnV7rMhDme0xuKCgiqUPMX7aKVSL+Ky1a+2OBBT+Lidyx4MWO/Z4VTk2 aJ8gY6H7jtaz8D8/d+k2XYJn78QQDdnAJJ36FAxsTLR5P+j+/dWx/ghPZmM7geMaobiic+ yfEXgPmpW48VL9HUz9AGHgN1dN8w41MnixbmyYyyzFADlAYCSRZ0AbuzSzs5ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899376; a=rsa-sha256; cv=none; b=XOQaO3bNk8HRvES9q6v1giXBkL+S+K/GrrRM2n7ehKqdNWst1fc/IR6MZsi23IypDGM6iG 7upS90CymXzcozDqQID7dWj5C7iMl6lX29q8tBdEH1Hq4sLW2mlud1RRuPk3xtCwA9MlAl MHH8BEdzhgld4/cjTI4XPc1FWxsLsW96LCBz95wqWkFMXurkbnjRmfrIbXYjrOXWsG/xDZ BPrajBc6rx6iWmspjr8WY4TZXErjWB3J5/3B0t5IGYMHP5cpCoA94s80a1pUZ+KYL0HVH2 K2Pb70kzivn1ndWVHEpyXkZyYjcvAl+IcMuQ2jA3V6S4lboMpTci+b6/lOJgGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B6HTcGRw7p5ksbe/s/jQVRUo02CHyo7uInYhAQ4NCWY=; b=gyzUbwfrUJMoYxFRNDFpvfjP814PcL4EQT7SwVKV+/616Bl2DshFpPMjgUPO/4sjz+j0kN 9/7/ud8ee1d+/RnwJX9jCTXH3Pn4U4agXW5DahVKb21rfGiEzFLGsL+053G7YealOspjku KrcJd8zfZZkqG7TIg2RVuD7EwmgZ/Kj/WCckBab6B7NSpQjGS16NG/Wf7v408TrsNVtyZi V4H+VVueHGFVlybj8ld57i0YNoRQWh70gOW1DdbXZAdMZyNUXQSjD9zMynWt+F/jd+8xZf CayPWaZHs9e4/sdhMzVn8ONn51BUhCxAlEnvyFvbOyTpzf+DkJpiNqbQASPOpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPM36DDtz4pr; Sat, 21 Oct 2023 14:42: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 39LEgtXF004642; Sat, 21 Oct 2023 14:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEgtSY004639; Sat, 21 Oct 2023 14:42:55 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:42:55 GMT Message-Id: <202310211442.39LEgtSY004639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c878532881d6 - stable/14 - kasan.9: Mention the loader tunable 'debug.kasan.disable' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c878532881d639ff50fded05bca37595d8b9d00d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c878532881d639ff50fded05bca37595d8b9d00d commit c878532881d639ff50fded05bca37595d8b9d00d Author: Zhenlei Huang AuthorDate: 2023-10-13 14:42:34 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:41:09 +0000 kasan.9: Mention the loader tunable 'debug.kasan.disable' Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42165 (cherry picked from commit 2df97575088d2efe71d6ee136a677cf50249f96d) --- share/man/man9/kasan.9 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man9/kasan.9 b/share/man/man9/kasan.9 index 1db6e187da46..209fbb06506c 100644 --- a/share/man/man9/kasan.9 +++ b/share/man/man9/kasan.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 23, 2023 +.Dd October 13, 2023 .Dt KASAN 9 .Os .Sh NAME @@ -90,6 +90,12 @@ sysctl/tunable. .Pp The .Nm +runtime in a KASAN-configured kernel can be disabled by +setting the loader tunable +.Sy debug.kasan.disable=1 . +.Pp +The +.Nm runtime works by maintaining a shadow map for the kernel map. There exists a linear mapping between addresses in the kernel map and addresses in the shadow map. From nobody Sat Oct 21 14:42:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPM51bPQz4y66R; Sat, 21 Oct 2023 14:42: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 4SCPM511rmz4Kpd; Sat, 21 Oct 2023 14:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HCFKJ2njOx0FBwFldDAa7QOKNDn79rPJHr2yJdiKWU=; b=DRul0Uz4P+vounaWTExeKPAOPr4Au88ZOgCx8BCceudbLInXWUooRiXXvFQBn60sITNC6e a8ffsA3EKS/lMX1spJ71JDsLuHceRclQ7lESOoZ6m1MeW5KeTzKfmrZXUXS+RACoNvdYvX y6fg2kjLtljIEzh5reQLIe0Rj13K/L7K3RebqmjxY9agOBXIozRAZjBcbYRfb6EUcQbSPa z8Ut7PN1GZCmcf4QAPH8Nfzv6ZRFy+aD8DHyOWz2aYuto7f4e9ArmLCgAhqmYSM+mcbNZN wWHOBCnTOlVa81GNmpLdSWv10y8S79XJwh+WvlyeQ95Pf32lExKPOil61CDJtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899377; a=rsa-sha256; cv=none; b=Iinpsb1zuZZKjWGnyzjXv8+ESYrN/UZaqN6fx1q+lfQFeZXGa6HYY7QQF1/6TwvKkDee8b OM+UA6R60ybtUVa6+toq3WwlAguUb9fsUnjtKEbo5tms3vKTc2jHcPGeZH0i12eFgbZSIO 7EDI0+rA8+Hh40mXJjL/vxNHXNnzWfLWrGmH+KIbTdQD6rig8JAzkDhRPr8OW5fowD2SM1 eKwmPK/2FJMu86I0RFoA/Ul7e/HtXx9crC9zPiUF9Z/wNN9ckwxRQFYoNVpsHR/Bbf6xu9 g4IrwRveiztn73V+T4xVh0NVsTXIGCVt3iGX9dmsUSR+Tp5zRa8FPJpH196otQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0HCFKJ2njOx0FBwFldDAa7QOKNDn79rPJHr2yJdiKWU=; b=us6ejGJmiM8/HjbG0gSO66UK5Bn/Ey7ZljjHLXFsIlB8CZf0lEWu9J3YX3NXyZsznAicHx RFB9fqsyr6156j7Y9jLU05HBPNa5aFgFRyTEkj6uHsv9YLrWeRgBGUqio1pFfWOvZ4U/zB c4WJz/XOerjqpkL5yvCoEkfHUpUOMlcKg4J0CkCXYMclt4z+zluquueJFmzwLpgelFN/nW zygxa4m5qYGOu6/OIzP263aKAezx99CV2VosYO9sSuUBJcZIARJrvslAi6pb+fnHmLzoWI pzCt+z3QVXLLTYvjm/4CyPS5pmlQWvjXwtbiLyq7of6rOnag5RceomnjVXVYrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPM504yzz4ps; Sat, 21 Oct 2023 14:42: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 39LEgugG004688; Sat, 21 Oct 2023 14:42:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEgu3r004685; Sat, 21 Oct 2023 14:42:56 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:42:56 GMT Message-Id: <202310211442.39LEgu3r004685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e022d8e4edbf - stable/14 - kmsan.9: Mention the loader tunable 'debug.kmsan.disable' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e022d8e4edbf17f1c12bfd55af98541962354f34 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e022d8e4edbf17f1c12bfd55af98541962354f34 commit e022d8e4edbf17f1c12bfd55af98541962354f34 Author: Zhenlei Huang AuthorDate: 2023-10-13 14:42:34 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:41:09 +0000 kmsan.9: Mention the loader tunable 'debug.kmsan.disable' Reviewed by: gbe (manpages), markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42166 (cherry picked from commit 7ca90db2f3ee15d9d0343d76f06a90efb8426d92) --- share/man/man9/kmsan.9 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/man/man9/kmsan.9 b/share/man/man9/kmsan.9 index ae9dbdc7a052..714442e4d9fe 100644 --- a/share/man/man9/kmsan.9 +++ b/share/man/man9/kmsan.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 10, 2021 +.Dd October 13, 2023 .Dt KMSAN 9 .Os .Sh NAME @@ -108,6 +108,10 @@ should be used only for kernel testing and development. It is not recommended to enable .Nm in systems with less than 8GB of physical RAM. +.Pp +The sanitizer in a KMSAN-configured kernel can be disabled by setting the loader +tunable +.Sy debug.kmsan.disable=1 . .Sh FUNCTIONS The .Fn kmsan_mark From nobody Sat Oct 21 14:42:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPM70Gf4z4y6Q1; Sat, 21 Oct 2023 14:42: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 4SCPM639n4z4KgW; Sat, 21 Oct 2023 14:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bP5wR6d7wxH4RDTvO/wJmX5pFtfcqBDMdF2lDSCJdYM=; b=b476D4UymwIldBvCF/CYhh1XE8GCEm1o+NGOun974tK4LRmh3TxwFr4o3vyQVtvno82LZ7 ziOuduUyaJUnRty94GZsVljFkunLibAE1TtxP2PU+vPmYn9DkgHCnrKMKtlcLAM22SJ3/F BcGsaZ/e5zMJ/TqwqslIU23IYznejjTb+Z008CSf+DCl00GFRmVobHHYCfUWsz7+FaIZi1 slb+7+bCq6s0YkUewxCn/dgd58A3M3W4Jg4dcWChv7KSMeC7qUx2FQo5ZazXvg+/m1nkoE /CpINHAG0jOLoGzHbHk6F5IZcYe22nHO2KXWGuFCYMDLfBsuLQluo2x4h4z7cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899378; a=rsa-sha256; cv=none; b=qjHK3RnEVpbH8mMwTWQYO3cuQx+B/jYy25BLuftwjkZVqQeOEEWBfOwHxkVUYbsi9j5tE5 0zi4OR/KZAcg0wJFeJlsyGjR5u5Q/swQ6G01Shr8/iYcgRNjMjhvFfxXLtY845ptmVTLy8 STMd0nhKRMB6QoJnI6wq8ENIXSSrNe+dmivhZEbs/c4stkoP4VCk4WRsJy1u/+7PvYLFGW TXyUSgyHQLXG9D9QAjVlTJry2ByVsolDF6Dgs7e+fzQUj4YssQbXC34jS3DKa8JJRxZfpA 3aqcubzRc/mo/4Pj/WZNDf5LJ99cI3RL4iaeSugYOE2AWnK7UwBCl7nFZmoKIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bP5wR6d7wxH4RDTvO/wJmX5pFtfcqBDMdF2lDSCJdYM=; b=tmLEIP65ZNnVcqKhQvJKvlxMFqs6hy3gNQbiGknnNThvyUPzu+ZSJRzFQukotyD0peWCxI DdIk+Ifgh0KJw2diPpn61yXhAc6Ip60q55fMWw7P3uvoHMhpkdE/jHQ+A9FFvbWjpYnHgi nI/7OaONvFI/geO/dPQ0OktCRm0MetphA9rofyfYLIgt0oky6u0m3MqRrmouuOibQB9qyO E85bPDsDMsi4bC77fXx4wnzNqrZYNIFQG3y5Qz3epmuIrzt62YmiqehGvs0yq/fdUO/VYD UYWj4UC2MSKtsWDe+N1mVj2zQv4jHXJ5tv/OADfkrirASH0SZzs2O3u5osOFig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPM61yYWz514; Sat, 21 Oct 2023 14:42: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 39LEgwnc004736; Sat, 21 Oct 2023 14:42:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LEgwjb004733; Sat, 21 Oct 2023 14:42:58 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:42:58 GMT Message-Id: <202310211442.39LEgwjb004733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 032a0b44541f - stable/14 - amd64: Fix two typos of loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 032a0b44541ffb669a4553105c6f6343ab4e3a67 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=032a0b44541ffb669a4553105c6f6343ab4e3a67 commit 032a0b44541ffb669a4553105c6f6343ab4e3a67 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:41:09 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 (cherry picked from commit afbb8041a0633c97acb51ac895c9ae3cde4fe540) --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 4b81f5b9671e..512f960926a2 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1484,7 +1484,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); @@ -1492,7 +1492,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); TUNABLE_INT_FETCH("machdep.mitigations.zenbleed.enable", From nobody Sat Oct 21 14:47:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPS34fYqz4y6Fw; Sat, 21 Oct 2023 14:47: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 4SCPS33tMmz4Mbk; Sat, 21 Oct 2023 14:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xckaHLn/jdLBO5NKs3FQkdTAnDbZcT5OB0mO1ZmYEyc=; b=ZtdkjjDGJZRjlQ7ifrSbT+1UzglxdMIFWdodY3hxQfhFJ//966AXQ/3jvMGYiSXbKT0NrE ygeMm/AX5zuXdO8iOg0yYxcuOpKbuiEj7WJNZmHrv00k/rz6reAF8QneGmg2f3R51Ulc96 9mvknYW2XojiYai3kaCDqTlfKKwRrWisCVsIz2YuMcu6KfW/oYMPAtQVPznHnWVzWsI/Mi BdGiKu4QXVyAte6Vl1kgrJXvG0/28ZvdXCE9r7R6Fd52ra7KY0bE+YJw4J0Raemk2w3qEU lk8FfGKMnz9sy7j/Ge00nPrGx1Z8StdtcELw34ETPyyZzlnZikwYQgzXAMOEew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899635; a=rsa-sha256; cv=none; b=JSjcQNVW3f3c9o5XXEOwvdOkWlNCANKk890jzrR1hrAM/6TyU7XQcMZIz2CAa0kLXzjdu1 gZKVXm7A4ukbtPOb27brJH7JLJ+VHIjcJ8THIu5ashrCO1k3t2b2bWUvMunH8ZG6wlSHLo nkneL6lguh1Ba6rnJl6wP541YGC4545sz0/MuxRL4uQ5mGra89SJa7SDAW121qYnbxIYzv 9SRTHtpK/nwtAW4wjNQaBv4oLhG8+ZzFMhfTjnXtwSeh8MsxcW4eORdcyVTX2vrAr3JooK +KxxcJdDPOP+PrPeevFvyUIjjcQ19HQJHt3AQv7NfqqWc2kWMc8kdDFyBFRVfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xckaHLn/jdLBO5NKs3FQkdTAnDbZcT5OB0mO1ZmYEyc=; b=W2Tk/mKT6as6ZvM7ki04yUiMSb4rpXF+BHiRh5nnyVnGJNVQ43MvZ+HFGBK/mGL60Dtrmz sS98bmdtZB/SEJAQASevi1v3NPUupQFGqaCdD8b+z1qRxOKxaOXmkP+QMMaWhEXgV7/snA /grjrlp6p5qSveQ84e2nvjxXeLgGr/pZ+dQvjNUaR92IoplEJ68IKPZOESULsRvkhWhtNa HCk2lvKR+ehsbQU2FICvEnmPUfySz8jsNc9iAJLBAB6obCRqgvqQ4RKpcHJjUXZL2xuCi/ ELncLhwx4NLC4tA66csb2CvuxODOeNYzGXGlOpcZPpbbroHfWYgGHsF7qpNqGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPS32rGPz4XW; Sat, 21 Oct 2023 14:47: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 39LElF5V006025; Sat, 21 Oct 2023 14:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LElF1b006022; Sat, 21 Oct 2023 14:47:15 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:47:15 GMT Message-Id: <202310211447.39LElF1b006022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5de5f2de6e1d - stable/13 - kasan.9: Mention the loader tunable 'debug.kasan.disable' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5de5f2de6e1d3b40557fea25d14c68135409556d Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5de5f2de6e1d3b40557fea25d14c68135409556d commit 5de5f2de6e1d3b40557fea25d14c68135409556d Author: Zhenlei Huang AuthorDate: 2023-10-13 14:42:34 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:45:45 +0000 kasan.9: Mention the loader tunable 'debug.kasan.disable' Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42165 (cherry picked from commit 2df97575088d2efe71d6ee136a677cf50249f96d) (cherry picked from commit c878532881d639ff50fded05bca37595d8b9d00d) --- share/man/man9/kasan.9 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/man/man9/kasan.9 b/share/man/man9/kasan.9 index 9b13cf28aa59..d196ea6a218b 100644 --- a/share/man/man9/kasan.9 +++ b/share/man/man9/kasan.9 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 13, 2021 +.Dd October 13, 2023 .Dt KASAN 9 .Os .Sh NAME @@ -84,6 +84,12 @@ sysctl/tunable. .Pp The .Nm +runtime in a KASAN-configured kernel can be disabled by +setting the loader tunable +.Sy debug.kasan.disable=1 . +.Pp +The +.Nm runtime works by maintaining a shadow map for the kernel map. There exists a linear mapping between addresses in the kernel map and addresses in the shadow map. From nobody Sat Oct 21 14:47:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPS45j3Sz4y6G0; Sat, 21 Oct 2023 14:47: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 4SCPS455RGz4Mbw; Sat, 21 Oct 2023 14:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aoF5h2l0V/FfGK0RKIKS5OintKC/4F/4KrKny4IuHWo=; b=TFGxrjyYeB/45lm8dUsoqjTX2GlNQ2cPzVqqhvs/5bS9Bgovnh94KX6Inz4FKMFw7B+gRx 6844wHsYV3sWz64jyV+8RpxKsIcrjrUYwrvrKcVy7OLkbLl0Jaa6RbDCsnyMNEuJae2K9g liKlyUUMRWXtx7Y37Y6A01+cpa7t6u0Wou1kjKEIB1u4tWe3689+wqQaRmtX7pbEyGjWFc Yd+rKha3FbEwtELLkCKVLt031lLJSsfLicO1oMKPvCfWmHfmSP5PbPGGZLOAliwTSj1Yxy YkWiO+8y4xpO8CLfsQUlfCxAt6aS8wF6syWB7/fkxHpfYsqZhJehOZvLXPvoCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697899636; a=rsa-sha256; cv=none; b=gx/2gYoba90Zb87iOse/JavZPcgo2JUfqS8WY+103m/OxVgSoBDS4yin5GPkil8B7YWO26 u7Oej+vBI1xb9Qha/MT/H3iej08Fj2GyOEZHd6BJJW3B8xxOJ3In2bLVkokr/2Q+67pbb9 Mc0QLsV3LiVeWLJU/3ZzV+IN74gq4DtB2nNO5uuRdU6O60iDRoxim+qy3w+uaTKjHQnePT HUBhIT7xj0Z6JfkrUMtrnk5+TQpyF1DDdK84Oi85+F6VQVSp9FCPrAlusFQbGzF19XqpEb qP3gIkbrQr4r8JW8QLQJoiSt67G65/RKmTJaMLikkq8vB1H5nJx1KeaW7bjhfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697899636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aoF5h2l0V/FfGK0RKIKS5OintKC/4F/4KrKny4IuHWo=; b=pVZ1YxhRCBSkhlSGcYJztnvYWJLOMeVOA6Fhc6laH/PS9IYRyGnxxgL29vuSQaTZ8Orhkk drXyKcYREEwPAZvvJoJg2K30PsOawRqsUIbWwBUZOrU0Xryd3y43IMPX2GGcxPqSlFdrfG rnSo5r4SGAV+WXAIhQAHDcHwpvlavLxg2ii039BkGpk6irBYi7KMNaWkXZ/YwGAz0KS8pV BMz7ZE/PrYMxfAaNvSfrqeJaqa7E9nxzAKZa2TT6bM+m2YNUBtQbZo9/lrfL7IGWRu1yZ1 QEuxAjH9Xhbqj1/s1g5wROYuQ1/crbqvrYEUog40on1Iivban1C8Aa6GgzwUWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPS43s7mz4xh; Sat, 21 Oct 2023 14:47: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 39LElGAD006073; Sat, 21 Oct 2023 14:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LElGli006070; Sat, 21 Oct 2023 14:47:16 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:47:16 GMT Message-Id: <202310211447.39LElGli006070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a72ab19000bd - stable/13 - amd64: Fix two typos of loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 commit a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95 Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:45:45 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 (cherry picked from commit afbb8041a0633c97acb51ac895c9ae3cde4fe540) (cherry picked from commit 032a0b44541ffb669a4553105c6f6343ab4e3a67) --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 145d373b1117..b0b7824c4b4b 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1486,7 +1486,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); TUNABLE_INT_FETCH("machdep.mitigations.ssb.disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); @@ -1494,7 +1494,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); finishidentcpu(); /* Final stage of CPU initialization */ From nobody Sat Oct 21 14:53:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCPbc0j2Nz4y6dx; Sat, 21 Oct 2023 14:53: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 4SCPbb71TDz4N9j; Sat, 21 Oct 2023 14:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697900028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LmN58rkB2x76K4itQTIwgICLaP02iqfw1Jn2C45BIU=; b=XCcsBZ2pBxFdAnLeXqkXmcYVmHuAnBcZNydhmo20MbzBvRmCKBoJ8qmzEVszZMIpy5iJss HcpI4rMGiQfajfz2yW/CPUM6xJnROH3IYHEpQ8ohesYnhOYb1At1DcQHt9Dkcptppd1Mnd mwgjikc7Ajyt0VMpzg5G8pyRVZttaGlGGIEgGpascp1droUt3/KqcmTxmHBzBGN9PDMsyd P5Eh1k+rnAWpfFO5Wb7+lV9GPsAtsklplOsyH9e6Ue7D7KewlLV2lbeMVOSKyZE2J9/JK0 0XjQTFughhNf6L21cppcUPnWFgpEK6exlxcnrTmYGNDKUKgs4uUZSL76zHTXrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697900028; a=rsa-sha256; cv=none; b=fiGFfIwcvxVybZbio4Oey+ph8tw00L2ZUFwyJW8HGs0AWrkVQYI9+bjiBz4l5ovuukrskY Z7V8xZeJoPWl+UDgTWEK4s9zxrVRH2f/fPhCLWetktAOaBnsdAVUxnQdd1ZyIRNSYeWfax 0eV/6tl7uHy512pyR4RMwEeelXdreVbl29ciL25LG/A8gd5AaXua5tLBEShkAMq5qm74Cy kaOWu9i30nTPopRnZNPD1JPFOb4HGCoMxe8bFH6WZo/6cnX3RC30rR0VWfdCi7OJ7MtTY+ ds25X9Yvf9IvokBM6DVJjpHSVYIdIckUqfpjvVN4t4r0j67hua7yh3ikljjwAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697900028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1LmN58rkB2x76K4itQTIwgICLaP02iqfw1Jn2C45BIU=; b=JC/kucGNIg56VZcm0z4+Tx5TkZ+GFb/aq3BYNA1aMNtCiU9ZOhKyxoKunaPgf2j0RDYVel 7Cpp4pPIksUX/vfw/vB22YdZ8yGDzteoevxnfr0p5+UpFMKGxStD3zQIZXdEwDo3JBOW+a xB3bAl3ZuEDhDcqwpTKKTi0dI7ZcQgAQfn8OigQeu1/xPWJ6b23leDYI/hsnqwaA1imMJl h0zUgb4d2vEgjJP/mEM3X2PzTFmNwQBQ2yNmq1yrQJWNfR/kzVjfVt1TfDqxDjL63jqbNm demkYQENMMuPYUksbjwafTw0Wh9Q9Hw2Bse0j/7bOoIqrS27dVQ68hXxo7QmGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCPbb648Rz521; Sat, 21 Oct 2023 14:53:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39LErlQk022103; Sat, 21 Oct 2023 14:53:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LErl7T022100; Sat, 21 Oct 2023 14:53:47 GMT (envelope-from git) Date: Sat, 21 Oct 2023 14:53:47 GMT Message-Id: <202310211453.39LErl7T022100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 5173f00ae2e6 - stable/12 - amd64: Fix two typos of loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5173f00ae2e6c02b65ec95c428e7b50aafee1e5c Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5173f00ae2e6c02b65ec95c428e7b50aafee1e5c commit 5173f00ae2e6c02b65ec95c428e7b50aafee1e5c Author: Zhenlei Huang AuthorDate: 2023-10-19 15:23:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 14:50:51 +0000 amd64: Fix two typos of loader tunables To match the sysctl MIBs and document entries in security(7). Fixes: 2dec2b4a34b4 amd64: flush L1 data cache on syscall return with an error Fixes: 17edf152e556 Control for Special Register Buffer Data Sampling mitigation Reviewed by: kib MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D42249 (cherry picked from commit afbb8041a0633c97acb51ac895c9ae3cde4fe540) (cherry picked from commit 032a0b44541ffb669a4553105c6f6343ab4e3a67) (cherry picked from commit a72ab19000bd4b0a0c7ae0b69f8cf92343c73b95) --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 1e663382f140..c0d501707bb9 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1797,12 +1797,12 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) TUNABLE_INT_FETCH("hw.ibrs_disable", &hw_ibrs_disable); TUNABLE_INT_FETCH("hw.spec_store_bypass_disable", &hw_ssb_disable); - TUNABLE_INT_FETCH("machdep.syscall_ret_l1d_flush", + TUNABLE_INT_FETCH("machdep.syscall_ret_flush_l1d", &syscall_ret_l1d_flush_mode); TUNABLE_INT_FETCH("hw.mds_disable", &hw_mds_disable); TUNABLE_INT_FETCH("machdep.mitigations.taa.enable", &x86_taa_enable); - TUNABLE_INT_FETCH("machdep.mitigations.rndgs.enable", + TUNABLE_INT_FETCH("machdep.mitigations.rngds.enable", &x86_rngds_mitg_enable); finishidentcpu(); /* Final stage of CPU initialization */ From nobody Sat Oct 21 15:42:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCQgm1mnFz4y91h; Sat, 21 Oct 2023 15:42: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 4SCQgm1K4lz4Ryp; Sat, 21 Oct 2023 15:42:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697902948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vap1AD1zWF4i4A6wc6UbW8TO/YabGwQqHIs9aZB7zvc=; b=SP6rnP6C3j1+tu34Jq65Z9Uyik1Y6BgK9ZmydFOGG8T426/oeAidFi2ijwvasOjG38Hrca +ZR7SMnk7gjyZBvrDHlYlEyGjCR9YswS0sERyBMebTVfaYknXGsBvKaOT3s6RJXH6FZAJm 0YGn8EIg8uZxqEodoVCt6NNtf3yBf06qNOW1CAWy5ubnKh78dyHjISF+a1+LQhlpgsFfF5 0nUjzNmauf8reMH8icD3WtBcCNb0xltwDWUszxc51hZVK8QhozDFD6fjrESZgFa3QhDWQw 3bumkPwvnBlhLfNKWj8mb0alIjpn7ZAc5D0xx1CQGBfqDCjAi8G821ltdFNimA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697902948; a=rsa-sha256; cv=none; b=As/lzpT9P97JdsbkRjrbxaWAiJZFEkDu6jS+wzY5v8EBp+oByZY4j9r9c9lHTY2ZJVITyw 6QUmEX0w/ymvcCsrjMY9y4DnBXSgsnrsp0iELGOHa0ociTBKqLT+5HAy6TaF5nahaRzeor OBnyI/T2UYoXg+zwImaNDIA6LeeyZikDEt04F+lkuPAAZ1cR6dR00tJpGwpto7gEMol2pW xUJvnoVwz0DctugALmX4ASE2Kd2IZth2nZ+t/W8atLw/ziSMJg4D0DBEfELOlsTq6sFoLZ xLDmkHqqAoUNxfO6AR7BRDMhXqrxIorkOHA08ekO3gmA8iCMdkNfQlcmk7HtDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697902948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vap1AD1zWF4i4A6wc6UbW8TO/YabGwQqHIs9aZB7zvc=; b=MtjChD6QN8hWRFF5ptrxu2UtPc/PhKv3Pmqk14of/PUdqyqRjqcSPAvWGnEy3b5sHiTFau loFyoMSlZ34+LUFa33MRe6UAiHiPJb4iJqNGdjMkX7zFyw9+0CpDgNxzu4jPuWIY6+o3mU Vh58AVs1LOUNu4ZvMRFiJgj3RJTZrcv3XIvTkdQZ5ifOs6Qdm4+ABA6S2uffp6ndJsMrvR itpXT2WmVA/bYN5GNnjkXBPKK5pBOVcDmPDSoOxLRh9G4jTtTsu7Q75RGF8+cAte8Rn8Yp jTDg3eCVRngsK2VmQDh1MxOdGkV5EWvbqI1IjoWDtmmid/+og96pNbwAiywabg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SCQgm0MvTz6ZP; Sat, 21 Oct 2023 15:42: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 39LFgRJg004727; Sat, 21 Oct 2023 15:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LFgR3U004724; Sat, 21 Oct 2023 15:42:27 GMT (envelope-from git) Date: Sat, 21 Oct 2023 15:42:27 GMT Message-Id: <202310211542.39LFgR3U004724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: af20b2201669 - stable/14 - Fix intermittency in the sys.fs.fusefs.mknod.main test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af20b2201669ea493de58ba7a5e5ff1138b80cd7 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=af20b2201669ea493de58ba7a5e5ff1138b80cd7 commit af20b2201669ea493de58ba7a5e5ff1138b80cd7 Author: Alan Somers AuthorDate: 2023-10-06 19:46:42 +0000 Commit: Alan Somers CommitDate: 2023-10-21 15:14:32 +0000 Fix intermittency in the sys.fs.fusefs.mknod.main test In the Mknod.parent_inode test case, the kernel sends an extra FUSE_FORGET message. But because it gets sent asynchronously with the failing syscall, it doesn't always get received before the test ends. So we never setup an expectation for it. And 90+% of the time the test would exit successfully. Fix the intermittency by always waiting to receive the FUSE_FORGET message. Sponsored by: Axcient (cherry picked from commit 86885b18689889e9b9142fd31d8c67f21334ba32) Fix intermittency in the sys.fs.fusefs.symlink.main test This change is identical to 86885b18689 but for symlink instead of mknod. The kernel sends a FUSE_FORGET asynchronously with the final syscall. The lack of an expectation caused this test to occasionally fail. Also, remove a sleep that accidentally snuck into a different test. Sponsored by: Axcient (cherry picked from commit 8399d764c929a4b2fa98dbfae0ca7359810e4668) --- tests/sys/fs/fusefs/mkdir.cc | 1 - tests/sys/fs/fusefs/mknod.cc | 7 +++++++ tests/sys/fs/fusefs/symlink.cc | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc index 48453ff8bb8a..f020feb94ed8 100644 --- a/tests/sys/fs/fusefs/mkdir.cc +++ b/tests/sys/fs/fusefs/mkdir.cc @@ -241,7 +241,6 @@ TEST_F(Mkdir, parent_inode) ASSERT_EQ(-1, mkdir(FULLPATH, mode)); ASSERT_EQ(EIO, errno); - usleep(100000); } TEST_F(Mkdir_7_8, ok) diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index 223d38f8acb1..1fb855f44f29 100644 --- a/tests/sys/fs/fusefs/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc @@ -32,6 +32,7 @@ extern "C" { #include #include #include +#include } #include "mockfs.hh" @@ -255,14 +256,18 @@ TEST_F(Mknod, parent_inode) const char RELPATH[] = "some_node"; mode_t mode = S_IFSOCK | 0755; struct sockaddr_un sa; + sem_t sem; int fd; dev_t rdev = -1; /* Really it's a don't care */ uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_mknod(ino, RELPATH, ino, mode, rdev); + expect_forget(ino, 1, &sem); fd = socket(AF_UNIX, SOCK_STREAM, 0); ASSERT_LE(0, fd) << strerror(errno); @@ -273,6 +278,8 @@ TEST_F(Mknod, parent_inode) ASSERT_EQ(EIO, errno); leak(fd); + sem_wait(&sem); + sem_destroy(&sem); } /* diff --git a/tests/sys/fs/fusefs/symlink.cc b/tests/sys/fs/fusefs/symlink.cc index 19286a446fc3..bd355497a8bd 100644 --- a/tests/sys/fs/fusefs/symlink.cc +++ b/tests/sys/fs/fusefs/symlink.cc @@ -29,6 +29,7 @@ */ extern "C" { +#include #include } @@ -174,15 +175,22 @@ TEST_F(Symlink, parent_ino) const char PPATH[] = "parent"; const char RELPATH[] = "src"; const char dst[] = "dst"; + sem_t sem; const uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_symlink(ino, dst, RELPATH); + expect_forget(ino, 1, &sem); EXPECT_EQ(-1, symlink(dst, FULLPATH)); EXPECT_EQ(EIO, errno); + + sem_wait(&sem); + sem_destroy(&sem); } TEST_F(Symlink_7_8, ok) From nobody Sat Oct 21 19:07:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCWDc0Xvdz4xQN4; Sat, 21 Oct 2023 19:07:44 +0000 (UTC) (envelope-from dim@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 4SCWDc02h4z3FxX; Sat, 21 Oct 2023 19:07:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697915264; 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=+bNQWu2Dx/1h/gmdxiIFbRol9Sp5JWQGGSTTfrxJGx0=; b=xnM94k9evC1afxeqtiY5z7J26/TjeVlriC4akFPH5AS0vkvKk2sFo06Tlp9gkOGkUocbjF pKDKGrBJrFrzeSl6ocVCYpTIk4oFRhVMVLflKbg0ecjmPnkdWK6IXWJcM7IUDdrFkvzWY4 nsXfhdAxFD/EkUt4KMfZtWnmSLKEqnhPHIM4+7ygjMa2ezFq+a33+zNONZsYU+4jMmEgxz fOh2ix5THd+oXmg55ySdOaSV2vCx/ZHsfpCSyy3ko/HcCoNbUACVTFt2aHC9TUg79HVaAZ 7pPFkt7G2/lfI26Y+297zmCnKlKQ1XOylij3niE6OvEKBNL7xZDZhz7EJ2F53Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697915264; a=rsa-sha256; cv=none; b=dpiBLs/hqC21SHPESXirP8hKlk6kSvFJ0i6+EPHje43uC89KWpQoj/7U4xPEyO6JL0gGHD VPoDQfa4TjG4SxTpblF2N8+UJnL+dKD8+E0azdTvNHtfIfC/Z4tlyHd8anGHlOkM+ocX8Z 5/SBf2mfEQ2SUn3XG7aL3ZTUz+L8HyNNZf3zqLoXWBQnAn7W/f0ogOXrgdSqFy28Dyk7GR Tx0ODrNhs4zqKSOiv2ihr1UO2VDI85FnOzDeAHNUKEVaTf/WVT7FRexh8zZAhb8/bF8O56 iDkYsQfUVg8bYa0gXZhvhS1OsqspZY+2TzwXxYcZSOzPSdhM76x6ZHbYJ5kMlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697915264; 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=+bNQWu2Dx/1h/gmdxiIFbRol9Sp5JWQGGSTTfrxJGx0=; b=YJDqRuw555caOM30ozhVPgyc2NRhEyMQQjftkMRELsb5lxunOuSK+sdsBUGaLznOBVe2IW Bd2ZCHmxz9rm5q1hauF9/BXkNGrQ+4NB2laDXCTRQZCb1c1XIhEfSykQJV8AMiALS9EAz7 Mnnbp+S9NMOfnI+bdmVKIXRSgS/3qjnWntkXBJv4y1cfwRuczwcbTAliZuwUWqDZB8MXOY y4r2CdK+L7tQHpWAJ2XJkQ/gc06ssAFFKNK7AAxabwMfw/ktO/zrFFPAeQaRtLJie/PFZ2 7sO2CS/+0H+4/dfOgy2O8i3v8P6yY6FtndSKYHGa88K49ApN/75hTnq8Ea2Xow== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SCWDb5TCYz16JC; Sat, 21 Oct 2023 19:07:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 858344B47A; Sat, 21 Oct 2023 21:07:42 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268"; protocol="application/pgp-signature"; micalg=pgp-sha1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build From: Dimitry Andric In-Reply-To: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> Date: Sat, 21 Oct 2023 21:07:26 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3731.700.6) --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 20 Oct 2023, at 19:47, Gleb Smirnoff wrote: >=20 > The branch main has been updated by glebius: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6120673f7566c35023921540d2d68257= 2d1bf1ce >=20 > commit 6120673f7566c35023921540d2d682572d1bf1ce > Author: Gleb Smirnoff > AuthorDate: 2023-10-20 17:47:08 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-10-20 17:47:08 +0000 >=20 > tests: fix ATF_TESTS_PYTEST no clean build >=20 > The hack with .xtmp file was effectively making the make to > ignore changes to the sources, breaking NO_CLEAN builds. The > hack can be actually omitted as setting SCRIPTSNAME_${_T} for > every test is sufficient to prevent renaming by bsd.prog.mk. >=20 > Reviewed by: melifaro > Differential Revision: https://reviews.freebsd.org/D42283 This appears to break clean builds, in that it now deletes files mentioned in ATF_TESTS_PYTEST in the _source_ directories, leaving your git checkout looking as follows: Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) deleted: sbin/ping/tests/test_ping.py deleted: tests/examples/test_examples.py deleted: tests/examples/test_ktest_example.py deleted: tests/sys/net/routing/test_routing_l3.py deleted: tests/sys/net/routing/test_rtsock_multipath.py deleted: tests/sys/netinet/carp.py deleted: tests/sys/netinet6/test_ip6_output.py deleted: tests/sys/netlink/test_netlink_message_writer.py deleted: tests/sys/netlink/test_nl_core.py deleted: tests/sys/netlink/test_rtnl_iface.py deleted: tests/sys/netlink/test_rtnl_ifaddr.py deleted: tests/sys/netlink/test_rtnl_neigh.py deleted: tests/sys/netlink/test_rtnl_route.py deleted: tests/sys/netpfil/pf/frag6.py deleted: tests/sys/netpfil/pf/sctp.py Then of course when buildworld arrives at the point where the tests are built, it errors out with "don't know how to make sbin/ping/tests/test_ping.py", and similar. Do you mind if I revert this for now? -Dimitry --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCZTQhbgAKCRCwXqMKLiCW o9N8AKDKzBJQ+HXri5P5hyaghceDBEZHQwCg0gWmyB/rdY0ZoWPZe5X+piHLXY8= =G191 -----END PGP SIGNATURE----- --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268-- From nobody Sat Oct 21 21:40:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCZd41jHsz4xbJR; Sat, 21 Oct 2023 21:40: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 4SCZd36Knjz3ScY; Sat, 21 Oct 2023 21:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697924439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25OHeQl+kiLEyt8P1Ys762vR3WinCyvQCHZwAEmGolE=; b=MFDxI9q9PcwjxGnD+INb749aOeNRUsSbBuEtJikI/MvnQFlReFaA34bMt8Zn5fvkD6RgSa YAx4FRdzMroCW5hni0gCD7y3SIUF0aIi0aV+2eHsnSgdn/9T8/a6ZgkkIfWP24uY69HnWe 1Vg3r4+kKl/AIsW3xnhpejBvw6OZY+WDfZBNP0ilcXQTnnR4d9hSEaLL87/FDPvhlpMIty xhrXDYmn45ArTRUXVHF+yyNw1egMoYP3eH8sXnHqSNxhnIgR2YUyQwYQlIcKlQ7Dyymh3x csc76veA2wsXBXQIM1FwId01+NDzSnsBjBu1p/jYaazEehZN7rfQJN8bnIh75g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697924439; a=rsa-sha256; cv=none; b=m3QAexPw7wT2MB5E/IsLbQaw+gklCmNq2XkfQ3Q2p9hsZ3JBUyeMVwraBTqWvGuWz3kaN0 DbKcXyoboyj4rOgi+G0R5VyIPT2UJXYFg5opYF6cTBWDyaENS/RnEK6aswONYSwh/V7dro +maf1z83zIM1XMkHbi2Sd/EpQrs3IMZ74JRiEiNbp8KOsroQA1hOCdoiR124edyID46TqJ dFx2pGDg+WqFG3X+g/FY06rXklkLj8OjbxAjsUgZR9neqmfOKr6uFsgNTxJkWK9NH4mtut xl2+tVxlxETF65INtNsq9b0sMfXjoYtLl/UXiseL2ESHWEryJ5SPJSi/sxqiAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697924439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=25OHeQl+kiLEyt8P1Ys762vR3WinCyvQCHZwAEmGolE=; b=REggazZ5yNZAXwqKI1JnEwAQ/RD3rXrki+A91JkiwE2nDi1m+gEhgQpKLS44+h+zvsT4+m wCWdFB8iChnHZ6sz+Xgfkd7ETBMHycBsacFe6j8OAEm+pWEdy26Sw1VK1P6MHrIgbYYeNi z/EVo5nEFG7ziYmcYFj+UuqJYwk/APCiU8bbiilfHdlUEw9ZYNuEGyO/X7WRpkehLs9Gfe o6Vazvpw3vCqDEvVTySD5djLfE3oLbTN5ZE944Gg6co7izVhZ4qwuaab14ookJrCSOQRRn k1/6cPRdWsPmEBuJOw1a1rmrEzsGernMu/zHdwLMFziK+RDY3towvrDG0/F1/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 4SCZd35PbSzXGg; Sat, 21 Oct 2023 21:40: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 39LLedxl095795; Sat, 21 Oct 2023 21:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39LLed88095792; Sat, 21 Oct 2023 21:40:39 GMT (envelope-from git) Date: Sat, 21 Oct 2023 21:40:39 GMT Message-Id: <202310212140.39LLed88095792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: bc417deae52a - releng/14.0 - Fix intermittency in the sys.fs.fusefs.mknod.main test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bc417deae52aa6a75003687d4f78cff89a3e569e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=bc417deae52aa6a75003687d4f78cff89a3e569e commit bc417deae52aa6a75003687d4f78cff89a3e569e Author: Alan Somers AuthorDate: 2023-10-06 19:46:42 +0000 Commit: Alan Somers CommitDate: 2023-10-21 21:40:11 +0000 Fix intermittency in the sys.fs.fusefs.mknod.main test In the Mknod.parent_inode test case, the kernel sends an extra FUSE_FORGET message. But because it gets sent asynchronously with the failing syscall, it doesn't always get received before the test ends. So we never setup an expectation for it. And 90+% of the time the test would exit successfully. Fix the intermittency by always waiting to receive the FUSE_FORGET message. Sponsored by: Axcient (cherry picked from commit 86885b18689889e9b9142fd31d8c67f21334ba32) Fix intermittency in the sys.fs.fusefs.symlink.main test This change is identical to 86885b18689 but for symlink instead of mknod. The kernel sends a FUSE_FORGET asynchronously with the final syscall. The lack of an expectation caused this test to occasionally fail. Also, remove a sleep that accidentally snuck into a different test. Sponsored by: Axcient (cherry picked from commit 8399d764c929a4b2fa98dbfae0ca7359810e4668) (cherry picked from commit af20b2201669ea493de58ba7a5e5ff1138b80cd7) Approved by: cperciva (re) --- tests/sys/fs/fusefs/mkdir.cc | 1 - tests/sys/fs/fusefs/mknod.cc | 7 +++++++ tests/sys/fs/fusefs/symlink.cc | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/sys/fs/fusefs/mkdir.cc b/tests/sys/fs/fusefs/mkdir.cc index 48453ff8bb8a..f020feb94ed8 100644 --- a/tests/sys/fs/fusefs/mkdir.cc +++ b/tests/sys/fs/fusefs/mkdir.cc @@ -241,7 +241,6 @@ TEST_F(Mkdir, parent_inode) ASSERT_EQ(-1, mkdir(FULLPATH, mode)); ASSERT_EQ(EIO, errno); - usleep(100000); } TEST_F(Mkdir_7_8, ok) diff --git a/tests/sys/fs/fusefs/mknod.cc b/tests/sys/fs/fusefs/mknod.cc index 223d38f8acb1..1fb855f44f29 100644 --- a/tests/sys/fs/fusefs/mknod.cc +++ b/tests/sys/fs/fusefs/mknod.cc @@ -32,6 +32,7 @@ extern "C" { #include #include #include +#include } #include "mockfs.hh" @@ -255,14 +256,18 @@ TEST_F(Mknod, parent_inode) const char RELPATH[] = "some_node"; mode_t mode = S_IFSOCK | 0755; struct sockaddr_un sa; + sem_t sem; int fd; dev_t rdev = -1; /* Really it's a don't care */ uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_mknod(ino, RELPATH, ino, mode, rdev); + expect_forget(ino, 1, &sem); fd = socket(AF_UNIX, SOCK_STREAM, 0); ASSERT_LE(0, fd) << strerror(errno); @@ -273,6 +278,8 @@ TEST_F(Mknod, parent_inode) ASSERT_EQ(EIO, errno); leak(fd); + sem_wait(&sem); + sem_destroy(&sem); } /* diff --git a/tests/sys/fs/fusefs/symlink.cc b/tests/sys/fs/fusefs/symlink.cc index 19286a446fc3..bd355497a8bd 100644 --- a/tests/sys/fs/fusefs/symlink.cc +++ b/tests/sys/fs/fusefs/symlink.cc @@ -29,6 +29,7 @@ */ extern "C" { +#include #include } @@ -174,15 +175,22 @@ TEST_F(Symlink, parent_ino) const char PPATH[] = "parent"; const char RELPATH[] = "src"; const char dst[] = "dst"; + sem_t sem; const uint64_t ino = 42; + ASSERT_EQ(0, sem_init(&sem, 0, 0)) << strerror(errno); + expect_lookup(PPATH, ino, S_IFDIR | 0755, 0, 1); EXPECT_LOOKUP(ino, RELPATH) .WillOnce(Invoke(ReturnErrno(ENOENT))); expect_symlink(ino, dst, RELPATH); + expect_forget(ino, 1, &sem); EXPECT_EQ(-1, symlink(dst, FULLPATH)); EXPECT_EQ(EIO, errno); + + sem_wait(&sem); + sem_destroy(&sem); } TEST_F(Symlink_7_8, ok)